This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch v3 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit dc66bcc5cf5afd47cba586d3e93da156581e6a89 Merge: 5f1a1f6038 055a2a5f48 Author: Dan Haywood <[email protected]> AuthorDate: Thu Jul 11 08:00:02 2024 +0100 Merge branch 'master' into v3 .../value/semantics/TemporalValueSemantics.java | 25 +++++++ .../value/semantics/ValueSemanticsAbstract.java | 16 +++-- .../core/config/CausewayConfiguration.java | 76 ++++++++++++++++++++++ .../valuesemantics/BigDecimalValueSemantics.java | 15 ++++- .../temporal/LocalDateTimeValueSemantics.java | 8 ++- .../temporal/LocalDateValueSemantics.java | 9 ++- .../temporal/TemporalValueSemanticsProvider.java | 17 ++++- .../BigDecimalValueSemanticsProviderTest.java | 3 +- .../JavaSqlDateValueSemanticsProviderTest.java | 2 +- .../value/JavaTimeValueSemanticsProviderTest.java | 2 +- .../ValueSemanticsProviderAbstractTestCase.java | 8 +++ .../testdomain/value/ValueSemanticsTest.java | 3 +- .../scalars/jdkmath/BigDecimalConverterTest.java | 2 +- 13 files changed, 170 insertions(+), 16 deletions(-) diff --cc core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java index 9aec38bf40,73e3d3ced3..5e4fc25221 --- 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 @@@ -44,20 -44,24 +44,24 @@@ import static java.lang.annotation.Elem import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import javax.activation.DataSource; -import javax.inject.Named; -import javax.persistence.Column; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; -import javax.validation.Valid; -import javax.validation.constraints.Digits; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.activation.DataSource; +import jakarta.inject.Named; +import jakarta.persistence.Column; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; + import org.apache.causeway.applib.value.semantics.TemporalValueSemantics; + + import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.TemporalDisplayPattern; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.DeprecatedConfigurationProperty; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateTimeValueSemantics.java index f508d1b1f2,30ba34155e..3c601e55ae --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateTimeValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateTimeValueSemantics.java @@@ -22,8 -22,10 +22,10 @@@ import java.time.Duration import java.time.LocalDateTime; import java.util.Optional; -import javax.inject.Named; +import jakarta.inject.Named; + import org.apache.causeway.core.metamodel.context.MetaModelContext; + import org.springframework.lang.Nullable; import org.springframework.stereotype.Component; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateValueSemantics.java index 5b038789e6,114a96138d..9c78c8de66 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateValueSemantics.java @@@ -22,8 -22,10 +22,10 @@@ import java.time.Duration import java.time.LocalDate; import java.util.Optional; -import javax.inject.Named; +import jakarta.inject.Named; + import org.apache.causeway.core.metamodel.context.MetaModelContext; + import org.springframework.lang.Nullable; import org.springframework.stereotype.Component;
