This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/spring6 by this push:
new 9e20677ff5 ISIS-3275: re-enable validation for CausewayConfiguration
9e20677ff5 is described below
commit 9e20677ff5c983f2348b14903d6ddc750dc30a3d
Author: Andi Huber <[email protected]>
AuthorDate: Mon Dec 5 12:04:44 2022 +0100
ISIS-3275: re-enable validation for CausewayConfiguration
---
.../core/config/CausewayConfiguration.java | 27 ++++++++++++----------
...ator => jakarta.validation.ConstraintValidator} | 0
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git
a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
index e08530d1f6..55d72d47df 100644
---
a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
+++
b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
@@ -40,6 +40,18 @@ import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import jakarta.activation.DataSource;
+import jakarta.inject.Named;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.Payload;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.core.env.ConfigurableEnvironment;
@@ -62,6 +74,8 @@ import org.apache.causeway.applib.services.userui.UserMenu;
import
org.apache.causeway.applib.value.semantics.TemporalValueSemantics.TemporalEditingPattern;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.context._Context;
+import org.apache.causeway.core.config.CausewayConfiguration.Core;
+import org.apache.causeway.core.config.CausewayConfiguration.Viewer;
import org.apache.causeway.core.config.metamodel.facets.ActionConfigOptions;
import
org.apache.causeway.core.config.metamodel.facets.CollectionLayoutConfigOptions;
import
org.apache.causeway.core.config.metamodel.facets.DomainObjectConfigOptions;
@@ -72,17 +86,6 @@ import
org.apache.causeway.core.config.metamodel.services.ApplicationFeaturesIni
import org.apache.causeway.core.config.metamodel.specloader.IntrospectionMode;
import org.apache.causeway.core.config.viewer.web.DialogMode;
-import jakarta.activation.DataSource;
-import jakarta.inject.Named;
-import jakarta.validation.Constraint;
-import jakarta.validation.ConstraintValidator;
-import jakarta.validation.ConstraintValidatorContext;
-import jakarta.validation.Payload;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -99,7 +102,7 @@ import lombok.val;
*/
@ConfigurationProperties(CausewayConfiguration.ROOT_PREFIX)
@Data
-//@Validated //TODO[ISIS-3275] re-enable validation
+@Validated
public class CausewayConfiguration {
public static final String ROOT_PREFIX = "causeway";
diff --git
a/core/config/src/main/resources/META-INF/services/javax.validation.ConstraintValidator
b/core/config/src/main/resources/META-INF/services/jakarta.validation.ConstraintValidator
similarity index 100%
rename from
core/config/src/main/resources/META-INF/services/javax.validation.ConstraintValidator
rename to
core/config/src/main/resources/META-INF/services/jakarta.validation.ConstraintValidator
