You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/12/12 17:56:45 UTC
[isis] 01/03: ISIS-2225: removes metadata, adds comment instead.
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 ccea01fd4d1174cc8eb3090822a987f22104b1a5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Dec 12 15:20:59 2019 +0000
ISIS-2225: removes metadata, adds comment instead.
Also uses list format for demo.
---
.../org/apache/isis/config/IsisConfiguration.java | 15 ++++++---
.../additional-spring-configuration-metadata.json | 39 ----------------------
examples/demo/src/main/resources/application.yml | 9 +++--
3 files changed, 15 insertions(+), 48 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
index 98495e8..ee10966 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
@@ -907,10 +907,17 @@ public class IsisConfiguration {
*/
private boolean showChooser = true;
}
-
-
- //TODO no meta data yet ... https://docs.spring.io/spring-boot/docs/current/reference/html/appendix-configuration-metadata.html#configuration-metadata-property-attributes
- private List<Credit> credit = _Lists.newArrayList();
+
+
+ /**
+ * IntelliJ unfortunately does not provide IDE completion for lists of classes; YMMV.
+ *
+ * For further discussion, see for example this stackoverflow question:
+ * https://stackoverflow.com/questions/41417933/spring-configuration-properties-metadata-json-for-nested-list-of-objects
+ * and this wiki page: https://github.com/spring-projects/spring-boot/wiki/IDE-binding-features#simple-pojo and
+ *
+ */
+ private List<Credit> credit = new ArrayList<>();
@Data
public static class Credit {
diff --git a/core/config/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/core/config/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 5237e2d..20dc25c 100644
--- a/core/config/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/core/config/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -66,45 +66,6 @@
},
{
"name": "isis.persistor.datanucleus.impl.javax.jdo.PersistenceManagerFactoryClass"
- },
- {
- "name": "isis.viewer.wicket.credit.url[0]",
- "type": "java.net.URL"
- },
- {
- "name": "isis.viewer.wicket.credit[0].name",
- "type": "java.lang.String"
- },
- {
- "name": "isis.viewer.wicket.credit[0].image",
- "type": "java.lang.String",
- "description": "Path of image, relative to webapp root."
- },
- {
- "name": "isis.viewer.wicket.credit.url[1]",
- "type": "java.net.URL"
- },
- {
- "name": "isis.viewer.wicket.credit[1].name",
- "type": "java.lang.String"
- },
- {
- "name": "isis.viewer.wicket.credit[1].image",
- "type": "java.lang.String",
- "description": "Path of image, relative to webapp root."
- },
- {
- "name": "isis.viewer.wicket.credit.url[2]",
- "type": "java.net.URL"
- },
- {
- "name": "isis.viewer.wicket.credit[2].name",
- "type": "java.lang.String"
- },
- {
- "name": "isis.viewer.wicket.credit[2].image",
- "type": "java.lang.String",
- "description": "Path of image, relative to webapp root."
}
],
"hints": [
diff --git a/examples/demo/src/main/resources/application.yml b/examples/demo/src/main/resources/application.yml
index 7a422a7..584b7c1 100644
--- a/examples/demo/src/main/resources/application.yml
+++ b/examples/demo/src/main/resources/application.yml
@@ -58,11 +58,10 @@ isis:
js: scripts/application.js
about: Apache Isis Hello World
-
- credit[0]:
- image: /images/apache-isis/logo-48x48.png
- name: Apache Isis
- url: http://isis.apache.org
+ credit:
+ - url: http://isis.apache.org
+ image: /images/apache-isis/logo-48x48.png
+ name: Apache Isis
themes:
initial: bootstrap-theme