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 2022/04/13 16:26:10 UTC
[isis] branch master updated: ISIS-3003: isis-config fixes; optionals need to be initialized
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 77345ac139 ISIS-3003: isis-config fixes; optionals need to be initialized
77345ac139 is described below
commit 77345ac1392112ff4b093ffa7b751f7ee39399ec
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Apr 13 18:26:04 2022 +0200
ISIS-3003: isis-config fixes; optionals need to be initialized
---
.../java/org/apache/isis/core/config/IsisConfiguration.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 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 2ee158a35f..59a29d53a2 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
@@ -69,6 +69,7 @@ import org.apache.isis.applib.services.userui.UserMenu;
import org.apache.isis.applib.value.semantics.TemporalValueSemantics.TemporalEditingPattern;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.core.config.IsisConfiguration.Core;
import org.apache.isis.core.config.IsisConfiguration.Viewer;
import org.apache.isis.core.config.metamodel.facets.DefaultViewConfiguration;
import org.apache.isis.core.config.metamodel.facets.EditingObjectsConfiguration;
@@ -2784,18 +2785,18 @@ public class IsisConfiguration {
@Data
public static class PrimaryAccess {
@javax.validation.constraints.Pattern(regexp="^http[s]?://[^:]+?(:\\d+)?.*([^/]+/)$")
- private Optional<String> baseUrlRestful;
- private Optional<String> user;
- private Optional<String> password;
+ private Optional<String> baseUrlRestful = Optional.empty();
+ private Optional<String> user = Optional.empty();
+ private Optional<String> password = Optional.empty();
@javax.validation.constraints.Pattern(regexp="^http[s]?://[^:]+?(:\\d+)?.*([^/]+/)$")
- private Optional<String> baseUrlWicket;
+ private Optional<String> baseUrlWicket = Optional.empty();
}
private final SecondaryAccess secondaryAccess = new SecondaryAccess();
@Data
public static class SecondaryAccess {
@javax.validation.constraints.Pattern(regexp="^http[s]?://[^:]+?(:\\d+)?.*([^/]+/)$")
- private Optional<String> baseUrlWicket;
+ private Optional<String> baseUrlWicket = Optional.empty();
}
private Integer batchSize = 10;