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
commit 637f4f5df9f12a9c8b910bdd4cadd254fdecf290 Author: Andi Huber <[email protected]> AuthorDate: Sun Nov 13 10:22:34 2022 +0100 ISIS-3275: migrate config --- core/config/src/main/java/module-info.java | 10 ++-- .../core/config/CausewayConfiguration.java | 59 +++++++++++----------- .../core/config/DatanucleusConfiguration.java | 5 +- .../core/config/RestEasyConfiguration.java | 2 +- .../core/config/applib/RestfulPathProvider.java | 2 +- .../CausewayBeanFactoryPostProcessorForSpring.java | 2 +- .../beans/CausewayBeanTypeClassifierDefault.java | 4 +- .../beans/CausewayBeanTypeRegistryDefault.java | 6 +-- .../core/config/beans/aoppatch/AopPatch.java | 2 +- .../core/config/converters/PatternsConverter.java | 2 +- .../DataSourceIntrospectionService.java | 4 +- .../environment/CausewayLocaleInitializer.java | 4 +- .../environment/CausewaySystemEnvironment.java | 12 ++--- .../environment/CausewayTimeZoneInitializer.java | 4 +- .../progmodel/ProgrammingModelConstants.java | 4 +- .../PatternOptionalStringConstraintValidator.java | 10 ++-- .../core/config/viewer/web/WebAppContextPath.java | 6 +-- 17 files changed, 68 insertions(+), 70 deletions(-) diff --git a/core/config/src/main/java/module-info.java b/core/config/src/main/java/module-info.java index b1e40e92d1..6179e1b5c1 100644 --- a/core/config/src/main/java/module-info.java +++ b/core/config/src/main/java/module-info.java @@ -35,12 +35,12 @@ module org.apache.causeway.core.config { exports org.apache.causeway.core.config.viewer.web; requires jakarta.activation; - requires java.annotation; - requires java.persistence; + requires jakarta.annotation; + requires jakarta.persistence; requires java.sql; - requires java.validation; - requires java.ws.rs; - requires java.inject; + requires jakarta.validation; + requires jakarta.ws.rs; + requires jakarta.inject; requires lombok; requires org.apache.causeway.applib; requires org.apache.causeway.commons; 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 810bdf6726..c08092974b 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,18 +40,6 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import javax.activation.DataSource; -import javax.inject.Named; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; -import javax.validation.Valid; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.validation.annotation.Validated; @@ -83,6 +71,17 @@ 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; @@ -1519,14 +1518,14 @@ public class CausewayConfiguration { /** * If set, then ensures that for all properties of JAXB-style view models where the property's type * is an entity, then that entity's type has been correctly annotated with - * @{@link javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter} (so that the property's value can + * @{@link jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter} (so that the property's value can * be converted into a serializable form). */ private boolean referenceTypeAdapter = true; /** * If set, then ensures that for all properties of JAXB-style view models where the property's type * is a date or time, then that property has been correctly annotated with - * @{@link javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter} (so that the property's value can + * @{@link jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter} (so that the property's value can * be converted into a serializable form). */ private boolean dateTimeTypeAdapter = true; @@ -1603,19 +1602,19 @@ public class CausewayConfiguration { * Intended for testing purposes only, if set then the requested <code>to:</code> of the email will * be ignored, and instead sent to this email address instead. */ - @javax.validation.constraints.Email + @jakarta.validation.constraints.Email private String to; /** * Intended for testing purposes only, if set then the requested <code>cc:</code> of the email will * be ignored, and instead sent to this email address instead. */ - @javax.validation.constraints.Email + @jakarta.validation.constraints.Email private String cc; /** * Intended for testing purposes only, if set then the requested <code>bcc:</code> of the email will * be ignored, and instead sent to this email address instead. */ - @javax.validation.constraints.Email + @jakarta.validation.constraints.Email private String bcc; } @@ -1662,7 +1661,7 @@ public class CausewayConfiguration { * {@link org.apache.causeway.applib.services.email.EmailService}, at least). * </p> */ - @javax.validation.constraints.Email + @jakarta.validation.constraints.Email private String address; } @@ -1874,7 +1873,7 @@ public class CausewayConfiguration { * If not specified, the application.name is used instead. * </p> */ - @javax.validation.constraints.Pattern(regexp="^[^/].*$") + @jakarta.validation.constraints.Pattern(regexp="^[^/].*$") private Optional<String> brandLogoHeader = Optional.empty(); /** @@ -1886,7 +1885,7 @@ public class CausewayConfiguration { * If not specified, the {@link Application#getName() application name} is used instead. * </p> */ - @javax.validation.constraints.Pattern(regexp="^[^/].*$") + @jakarta.validation.constraints.Pattern(regexp="^[^/].*$") private Optional<String> brandLogoSignin = Optional.empty(); /** @@ -1896,7 +1895,7 @@ public class CausewayConfiguration { * This is expected to be a local resource. * </p> */ - @javax.validation.constraints.Pattern(regexp="^[^/].*$") + @jakarta.validation.constraints.Pattern(regexp="^[^/].*$") private Optional<String> faviconUrl = Optional.empty(); /** @@ -1955,7 +1954,7 @@ public class CausewayConfiguration { * {@link #getName() name} and/or {@link #getImage() image}. * </p> */ - @javax.validation.constraints.Pattern(regexp="^http[s]?://[^:]+?(:\\d+)?.*$") + @jakarta.validation.constraints.Pattern(regexp="^http[s]?://[^:]+?(:\\d+)?.*$") private String url; /** * URL of an organisation or individual to give credit to, appearing as text in the footer. @@ -1974,7 +1973,7 @@ public class CausewayConfiguration { * {@link #getName() name} and/or {@link #getImage() image}. * </p> */ - @javax.validation.constraints.Pattern(regexp="^[^/].*$") + @jakarta.validation.constraints.Pattern(regexp="^[^/].*$") private String image; /** @@ -2106,7 +2105,7 @@ public class CausewayConfiguration { * If set, eg <code>https://dev.myapp.com/</code>, then this value will be used instead. * </p> */ - @javax.validation.constraints.Pattern(regexp="^http[s]?://[^:]+?(:\\d+)?/([^/]+/)*+$") + @jakarta.validation.constraints.Pattern(regexp="^http[s]?://[^:]+?(:\\d+)?/([^/]+/)*+$") private Optional<String> baseUri = Optional.empty(); } @@ -2133,7 +2132,7 @@ public class CausewayConfiguration { /** * The base path at which the Wicket viewer is mounted. */ - @javax.validation.constraints.Pattern(regexp="^[/](.*[/]|)$") @NotNull @NotEmpty + @jakarta.validation.constraints.Pattern(regexp="^[/](.*[/]|)$") @NotNull @NotEmpty private String basePath = "/wicket/"; /** @@ -2166,7 +2165,7 @@ public class CausewayConfiguration { * Spring by default under <code>static</code> package). * </p> */ - @javax.validation.constraints.Pattern(regexp="^[^/].*$") + @jakarta.validation.constraints.Pattern(regexp="^[^/].*$") private Optional<String> css = Optional.empty(); /** @@ -2198,7 +2197,7 @@ public class CausewayConfiguration { * Spring by default under <code>static</code> package). * </p> */ - @javax.validation.constraints.Pattern(regexp="^[^/].*$") + @jakarta.validation.constraints.Pattern(regexp="^[^/].*$") private Optional<String> js = Optional.empty(); /** @@ -2911,18 +2910,18 @@ public class CausewayConfiguration { private final PrimaryAccess primaryAccess = new PrimaryAccess(); @Data public static class PrimaryAccess { - @javax.validation.constraints.Pattern(regexp="^http[s]?://[^:]+?(:\\d+)?.*([^/]+/)$") + @jakarta.validation.constraints.Pattern(regexp="^http[s]?://[^:]+?(:\\d+)?.*([^/]+/)$") 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+)?.*([^/]+/)$") + @jakarta.validation.constraints.Pattern(regexp="^http[s]?://[^:]+?(:\\d+)?.*([^/]+/)$") 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+)?.*([^/]+/)$") + @jakarta.validation.constraints.Pattern(regexp="^http[s]?://[^:]+?(:\\d+)?.*([^/]+/)$") private Optional<String> baseUrlWicket = Optional.empty(); } diff --git a/core/config/src/main/java/org/apache/causeway/core/config/DatanucleusConfiguration.java b/core/config/src/main/java/org/apache/causeway/core/config/DatanucleusConfiguration.java index 80637fd821..9d32ccacc5 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/DatanucleusConfiguration.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/DatanucleusConfiguration.java @@ -18,12 +18,11 @@ */ package org.apache.causeway.core.config; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.validation.annotation.Validated; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Data; /** diff --git a/core/config/src/main/java/org/apache/causeway/core/config/RestEasyConfiguration.java b/core/config/src/main/java/org/apache/causeway/core/config/RestEasyConfiguration.java index 766dd2df0c..7e654e92da 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/RestEasyConfiguration.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/RestEasyConfiguration.java @@ -54,7 +54,7 @@ public class RestEasyConfiguration { * * @see <a href="https://github.com/resteasy/resteasy-spring-boot/blob/master/mds/USAGE.md";>resteasy-spring-boot-starter docs</a> */ - @javax.validation.constraints.Pattern(regexp="^[/].*[^/]$") + @jakarta.validation.constraints.Pattern(regexp="^[/].*[^/]$") private String defaultPath = "/restful"; private final App app = new App(); diff --git a/core/config/src/main/java/org/apache/causeway/core/config/applib/RestfulPathProvider.java b/core/config/src/main/java/org/apache/causeway/core/config/applib/RestfulPathProvider.java index 0374f6116a..50c4690311 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/applib/RestfulPathProvider.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/applib/RestfulPathProvider.java @@ -20,7 +20,7 @@ package org.apache.causeway.core.config.applib; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanFactoryPostProcessorForSpring.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanFactoryPostProcessorForSpring.java index d2c2df8816..9e3125feeb 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanFactoryPostProcessorForSpring.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanFactoryPostProcessorForSpring.java @@ -20,7 +20,7 @@ package org.apache.causeway.core.config.beans; import java.util.Objects; -import javax.inject.Named; +import jakarta.inject.Named; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifierDefault.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifierDefault.java index 36f53d989c..c984fe1135 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifierDefault.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifierDefault.java @@ -21,8 +21,8 @@ package org.apache.causeway.core.config.beans; import java.io.Serializable; import java.lang.reflect.Modifier; -import javax.persistence.Entity; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Entity; +import jakarta.xml.bind.annotation.XmlRootElement; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeRegistryDefault.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeRegistryDefault.java index c7bdc27763..8fc0ec647c 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeRegistryDefault.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeRegistryDefault.java @@ -23,9 +23,9 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Stream; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/aoppatch/AopPatch.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/aoppatch/AopPatch.java index 7f1defa404..c5d5c0ddb3 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/beans/aoppatch/AopPatch.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/aoppatch/AopPatch.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.core.config.beans.aoppatch; -import javax.inject.Named; +import jakarta.inject.Named; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanDefinition; diff --git a/core/config/src/main/java/org/apache/causeway/core/config/converters/PatternsConverter.java b/core/config/src/main/java/org/apache/causeway/core/config/converters/PatternsConverter.java index 3e46f6e905..d39ce21682 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/converters/PatternsConverter.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/converters/PatternsConverter.java @@ -23,7 +23,7 @@ import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Named; +import jakarta.inject.Named; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.core.convert.converter.Converter; diff --git a/core/config/src/main/java/org/apache/causeway/core/config/datasources/DataSourceIntrospectionService.java b/core/config/src/main/java/org/apache/causeway/core/config/datasources/DataSourceIntrospectionService.java index fa1ab17ef1..da3a782044 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/datasources/DataSourceIntrospectionService.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/datasources/DataSourceIntrospectionService.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; import javax.sql.DataSource; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayLocaleInitializer.java b/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayLocaleInitializer.java index 4959e5656f..5f04214e81 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayLocaleInitializer.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayLocaleInitializer.java @@ -21,8 +21,8 @@ package org.apache.causeway.core.config.environment; import java.util.Locale; import java.util.Optional; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewaySystemEnvironment.java b/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewaySystemEnvironment.java index 0cbb89de7d..9e38a2ec51 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewaySystemEnvironment.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewaySystemEnvironment.java @@ -18,12 +18,12 @@ */ package org.apache.causeway.core.config.environment; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.context.event.ApplicationFailedEvent; diff --git a/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayTimeZoneInitializer.java b/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayTimeZoneInitializer.java index d6e2725090..95647726e9 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayTimeZoneInitializer.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewayTimeZoneInitializer.java @@ -20,8 +20,8 @@ package org.apache.causeway.core.config.environment; import java.util.TimeZone; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.springframework.stereotype.Component; diff --git a/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java b/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java index dc7c1b9a52..d483ab9be3 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java @@ -127,8 +127,8 @@ public final class ProgrammingModelConstants { @RequiredArgsConstructor public enum MethodExcludeMarker { DOMAIN_EXCLUDE(Domain.Exclude.class), - PRE_DESTROY_JAVAX(javax.annotation.PreDestroy.class), - POST_CONSTRUCT_JAVAX(javax.annotation.PostConstruct.class), + PRE_DESTROY_JAVAX(jakarta.annotation.PreDestroy.class), + POST_CONSTRUCT_JAVAX(jakarta.annotation.PostConstruct.class), //PRE_DESTROY__JAKARTA(jakarta.annotation.PreDestroy.class), //POST_CONSTRUCT_JAKARTA(jakarta.annotation.PreDestroy.class) ; diff --git a/core/config/src/main/java/org/apache/causeway/core/config/validators/PatternOptionalStringConstraintValidator.java b/core/config/src/main/java/org/apache/causeway/core/config/validators/PatternOptionalStringConstraintValidator.java index 0c848dacfc..3328e7a449 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/validators/PatternOptionalStringConstraintValidator.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/validators/PatternOptionalStringConstraintValidator.java @@ -20,15 +20,15 @@ package org.apache.causeway.core.config.validators; import java.util.Optional; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - import org.hibernate.validator.internal.constraintvalidators.bv.PatternValidator; import org.springframework.stereotype.Component; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; + @Component public class PatternOptionalStringConstraintValidator - implements ConstraintValidator<javax.validation.constraints.Pattern, Optional<String>> { + implements ConstraintValidator<jakarta.validation.constraints.Pattern, Optional<String>> { private final PatternValidator patternValidator = new PatternValidator(); @@ -37,7 +37,7 @@ public class PatternOptionalStringConstraintValidator } @Override - public void initialize(javax.validation.constraints.Pattern constraintAnnotation) { + public void initialize(final jakarta.validation.constraints.Pattern constraintAnnotation) { patternValidator.initialize(constraintAnnotation); } diff --git a/core/config/src/main/java/org/apache/causeway/core/config/viewer/web/WebAppContextPath.java b/core/config/src/main/java/org/apache/causeway/core/config/viewer/web/WebAppContextPath.java index adf583b52f..6c7f152b19 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/viewer/web/WebAppContextPath.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/viewer/web/WebAppContextPath.java @@ -22,9 +22,9 @@ import java.io.Serializable; import java.util.Optional; import java.util.regex.Pattern; -import javax.annotation.Priority; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.annotation.Priority; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.lang.Nullable;
