You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2026/06/08 04:17:54 UTC

(causeway-app-referenceapp) branch master updated: prepare removal of @ValueSemantics(dateRenderAdjustDays=..)

This is an automated email from the ASF dual-hosted git repository.

andi-huber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway-app-referenceapp.git


The following commit(s) were added to refs/heads/master by this push:
     new f467292  prepare removal of @ValueSemantics(dateRenderAdjustDays=..)
f467292 is described below

commit f4672928bea613862be6330bbe8730d67851aa65
Author: andi-huber <ah...@apache.org>
AuthorDate: Mon Jun 8 06:17:41 2026 +0200

    prepare removal of @ValueSemantics(dateRenderAdjustDays=..)
---
 .../ValueSemanticsDateRenderAdjustDaysPage.java    | 10 ++++----
 ...ticsDateRenderAdjustDaysPage_updateEndDate.java |  4 +++-
 .../demoapp/dom/types/SampleValueSemantics.java    | 28 ++++++++++++++++++++++
 .../javasqldate/holder/JavaSqlDateHolder3.java     | 24 ++++++++++---------
 .../holder/JavaSqlTimestampHolder3.java            | 24 ++++++++++---------
 .../javautildate/holder/JavaUtilDateHolder3.java   | 24 ++++++++++---------
 6 files changed, 75 insertions(+), 39 deletions(-)

diff --git a/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage.java b/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage.java
index f4f9b77..3917b56 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage.java
@@ -38,11 +38,13 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.ValueSemantics;
 import org.apache.causeway.applib.jaxb.JavaTimeJaxbAdapters;
 
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.SampleValueSemantics;
+
 //tag::class[]
 @XmlRootElement(name = "root")
 @XmlType
@@ -72,9 +74,7 @@ public class ValueSemanticsDateRenderAdjustDaysPage implements HasAsciiDocDescri
 //tag::render-as-day-before[]
     @Property(optionality = Optionality.OPTIONAL)
     @PropertyLayout(describedAs = "end date of the date range (up to and including)")
-    @ValueSemantics(
-            dateRenderAdjustDays = ValueSemantics.AS_DAY_BEFORE         // <.>
-    )
+    @ValueSemantics(provider = SampleValueSemantics.DATE_RENDER_AS_DAY_BEFORE) // <.>
     @XmlElement(required = false)
     @XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class)
     @Getter @Setter
@@ -84,7 +84,7 @@ public class ValueSemanticsDateRenderAdjustDaysPage implements HasAsciiDocDescri
 //tag::render-as-day[]
     @Property(optionality = Optionality.OPTIONAL)
     @PropertyLayout(describedAs = "end date of the date range (excluding)")
-    @ValueSemantics(dateRenderAdjustDays = 0)                           // <.>
+    @ValueSemantics()                           // <.>
     public LocalDate getEndDateNotAdjusted() {
         return getEndDate();
     }
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage_updateEndDate.java b/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage_updateEndDate.java
index 0975d2d..5b75025 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage_updateEndDate.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage_updateEndDate.java
@@ -30,6 +30,8 @@ import org.apache.causeway.applib.annotation.ValueSemantics;
 
 import lombok.RequiredArgsConstructor;
 
+import demoapp.dom.types.SampleValueSemantics;
+
 @Action(semantics = SemanticsOf.IDEMPOTENT
 )
 @ActionLayout(associateWith = "endDate", sequence = "1")
@@ -41,7 +43,7 @@ public class ValueSemanticsDateRenderAdjustDaysPage_updateEndDate {
 //tag::annotation[]
     @MemberSupport public ValueSemanticsDateRenderAdjustDaysPage act(
             @Parameter(optionality = Optionality.OPTIONAL)
-            @ValueSemantics(dateRenderAdjustDays = ValueSemantics.AS_DAY_BEFORE)          // <.>
+            @ValueSemantics(provider = SampleValueSemantics.DATE_RENDER_AS_DAY_BEFORE) // <.>
             final LocalDate endDate) {
         page.setEndDate(endDate);
         return page;
diff --git a/domain/src/main/java/demoapp/dom/types/SampleValueSemantics.java b/domain/src/main/java/demoapp/dom/types/SampleValueSemantics.java
new file mode 100644
index 0000000..549ab9a
--- /dev/null
+++ b/domain/src/main/java/demoapp/dom/types/SampleValueSemantics.java
@@ -0,0 +1,28 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package demoapp.dom.types;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class SampleValueSemantics {
+
+    public final String DATE_RENDER_AS_DAY_BEFORE = "todo";
+
+}
diff --git a/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder3.java b/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder3.java
index cc18432..cc24f03 100644
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder3.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder3.java
@@ -24,11 +24,13 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.ValueSemantics;
 import org.apache.causeway.applib.annotation.Where;
 
+import demoapp.dom.types.SampleValueSemantics;
+
 //tag::class[]
 public interface JavaSqlDateHolder3 extends JavaSqlDateHolder2 {
 
     @Property
-    @ValueSemantics(dateRenderAdjustDays = -1)                    // <.>
+    @ValueSemantics(provider = SampleValueSemantics.DATE_RENDER_AS_DAY_BEFORE) // <.>
     @PropertyLayout(
             describedAs = "@ValueSemantics(dateRenderAdjustDays = -1)",
             labelPosition = LabelPosition.TOP,
@@ -38,16 +40,16 @@ public interface JavaSqlDateHolder3 extends JavaSqlDateHolder2 {
         return getReadOnlyProperty();
     }
 
-    @Property
-    @ValueSemantics(dateRenderAdjustDays = 0)                     // <.>
-    @PropertyLayout(
-            describedAs = "@ValueSemantics(dateRenderAdjustDays = 0)",
-            labelPosition = LabelPosition.TOP,
-            hidden = Where.ALL_TABLES,
-            fieldSetId = "render-day", sequence = "2")
-    default java.sql.Date getReadOnlyPropertyDerivedRenderDayAsDay() {
-        return getReadOnlyProperty();
-    }
+//    @Property
+//    @ValueSemantics(dateRenderAdjustDays = 0)                     // <.>
+//    @PropertyLayout(
+//            describedAs = "@ValueSemantics(dateRenderAdjustDays = 0)",
+//            labelPosition = LabelPosition.TOP,
+//            hidden = Where.ALL_TABLES,
+//            fieldSetId = "render-day", sequence = "2")
+//    default java.sql.Date getReadOnlyPropertyDerivedRenderDayAsDay() {
+//        return getReadOnlyProperty();
+//    }
 
     @Property
     @ValueSemantics                                               // <.>
diff --git a/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder3.java b/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder3.java
index 2fb875e..fb32215 100644
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder3.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder3.java
@@ -24,11 +24,13 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.ValueSemantics;
 import org.apache.causeway.applib.annotation.Where;
 
+import demoapp.dom.types.SampleValueSemantics;
+
 //tag::class[]
 public interface JavaSqlTimestampHolder3 extends JavaSqlTimestampHolder2 {
 
     @Property
-    @ValueSemantics(dateRenderAdjustDays = -1)                    // <.>
+    @ValueSemantics(provider = SampleValueSemantics.DATE_RENDER_AS_DAY_BEFORE) // <.>
     @PropertyLayout(
             describedAs = "@ValueSemantics(dateRenderAdjustDays = -1)",
             labelPosition = LabelPosition.TOP,
@@ -38,16 +40,16 @@ public interface JavaSqlTimestampHolder3 extends JavaSqlTimestampHolder2 {
         return getReadOnlyProperty();
     }
 
-    @Property
-    @ValueSemantics(dateRenderAdjustDays = 0)                     // <.>
-    @PropertyLayout(
-            describedAs = "@ValueSemantics(dateRenderAdjustDays = 0)",
-            labelPosition = LabelPosition.TOP,
-            hidden = Where.ALL_TABLES,
-            fieldSetId = "render-day", sequence = "2")
-    default java.sql.Timestamp getReadOnlyPropertyDerivedRenderDayAsDay() {
-        return getReadOnlyProperty();
-    }
+//    @Property
+//    @ValueSemantics(dateRenderAdjustDays = 0)                     // <.>
+//    @PropertyLayout(
+//            describedAs = "@ValueSemantics(dateRenderAdjustDays = 0)",
+//            labelPosition = LabelPosition.TOP,
+//            hidden = Where.ALL_TABLES,
+//            fieldSetId = "render-day", sequence = "2")
+//    default java.sql.Timestamp getReadOnlyPropertyDerivedRenderDayAsDay() {
+//        return getReadOnlyProperty();
+//    }
 
     @Property
     @ValueSemantics                                               // <.>
diff --git a/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder3.java b/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder3.java
index 910995c..b50a48e 100644
--- a/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder3.java
+++ b/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder3.java
@@ -24,11 +24,13 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.ValueSemantics;
 import org.apache.causeway.applib.annotation.Where;
 
+import demoapp.dom.types.SampleValueSemantics;
+
 //tag::class[]
 public interface JavaUtilDateHolder3 extends JavaUtilDateHolder2 {
 
     @Property
-    @ValueSemantics(dateRenderAdjustDays = -1)                    // <.>
+    @ValueSemantics(provider = SampleValueSemantics.DATE_RENDER_AS_DAY_BEFORE) // <.>
     @PropertyLayout(
             describedAs = "@ValueSemantics(dateRenderAdjustDays = -1)",
             labelPosition = LabelPosition.TOP,
@@ -38,16 +40,16 @@ public interface JavaUtilDateHolder3 extends JavaUtilDateHolder2 {
         return getReadOnlyProperty();
     }
 
-    @Property
-    @ValueSemantics(dateRenderAdjustDays = 0)                     // <.>
-    @PropertyLayout(
-            describedAs = "@ValueSemantics(dateRenderAdjustDays = 0)",
-            labelPosition = LabelPosition.TOP,
-            hidden = Where.ALL_TABLES,
-            fieldSetId = "render-day", sequence = "2")
-    default java.util.Date getReadOnlyPropertyDerivedRenderDayAsDay() {
-        return getReadOnlyProperty();
-    }
+//    @Property
+//    @ValueSemantics(dateRenderAdjustDays = 0)                     // <.>
+//    @PropertyLayout(
+//            describedAs = "@ValueSemantics(dateRenderAdjustDays = 0)",
+//            labelPosition = LabelPosition.TOP,
+//            hidden = Where.ALL_TABLES,
+//            fieldSetId = "render-day", sequence = "2")
+//    default java.util.Date getReadOnlyPropertyDerivedRenderDayAsDay() {
+//        return getReadOnlyProperty();
+//    }
 
     @Property
     @ValueSemantics                                               // <.>