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/03/31 18:08:29 UTC
[isis] branch master updated: ISIS-2593: also handle missing
eclipselink.* configuration
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 c111a61 ISIS-2593: also handle missing eclipselink.* configuration
c111a61 is described below
commit c111a612d190915640956bff273765cfcf4a7f86
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Mar 31 20:08:16 2021 +0200
ISIS-2593: also handle missing eclipselink.* configuration
---
.../isis/persistence/jdo/datanucleus/config/DnSettings.java | 11 ++++++++---
.../isis/persistence/jpa/eclipselink/config/ElSettings.java | 8 ++++++--
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/config/DnSettings.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/config/DnSettings.java
index 06e3f47..55d4bed 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/config/DnSettings.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/config/DnSettings.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.persistence.jdo.datanucleus.config;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -40,15 +41,19 @@ import lombok.extern.log4j.Log4j2;
@Named("isis.persistence.jdo.DnSettings")
@Primary
@Qualifier("Dn5")
-@ConfigurationProperties(prefix = "")
+@ConfigurationProperties(
+ prefix = "",
+ ignoreUnknownFields = true)
@Log4j2
public class DnSettings {
+ /** mapped by {@code datanucleus.*} */
@Getter @Setter
- private Map<String, String> datanucleus; //mapped by "datanucleus"
+ private Map<String, String> datanucleus = Collections.emptyMap();
+ /** mapped by {@code javax.*} filtered later for {@code javax.jdo.*} */
@Getter @Setter
- private Map<String, String> javax; //mapped by "javax" filtered later for "javax.jdo"
+ private Map<String, String> javax = Collections.emptyMap();
private final Object lock = new Object();
private Map<String, Object> properties;
diff --git a/persistence/jpa/eclipselink/src/main/java/org/apache/isis/persistence/jpa/eclipselink/config/ElSettings.java b/persistence/jpa/eclipselink/src/main/java/org/apache/isis/persistence/jpa/eclipselink/config/ElSettings.java
index ed0fe91..7a4fc72 100644
--- a/persistence/jpa/eclipselink/src/main/java/org/apache/isis/persistence/jpa/eclipselink/config/ElSettings.java
+++ b/persistence/jpa/eclipselink/src/main/java/org/apache/isis/persistence/jpa/eclipselink/config/ElSettings.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.persistence.jpa.eclipselink.config;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -46,13 +47,16 @@ import lombok.val;
@Named("isis.persistence.jpa.ElSettings")
@Primary
@Qualifier("Eclipselink")
-@ConfigurationProperties(prefix = "")
+@ConfigurationProperties(
+ prefix = "",
+ ignoreUnknownFields = true)
public class ElSettings {
@Inject private Provider<ServiceInjector> serviceInjectorProvider;
+ /** mapped by {@code eclipselink.*} */
@Getter @Setter
- private Map<String, String> eclipselink; //mapped by "eclipselink"
+ private Map<String, String> eclipselink = Collections.emptyMap();
public Map<String, Object> asMap() {
return map.get();