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/causeway.git
commit a7e9b3fda5ce89dd7341dcdc7453cddfe1f0c10a Author: Andi Huber <[email protected]> AuthorDate: Tue Apr 4 17:45:40 2023 +0200 Merge remote-tracking branch 'origin/master' into spring6 --- .../DomainObjectLayoutCssClassPage_objects.java | 2 +- .../DomainObjectLayoutCssClassSeeding.java | 2 +- .../DomainObjectLayout/cssClass/Status.java | 10 ++++---- .../jpa/DomainObjectLayoutCssClassJpa.java | 27 +++++++++++----------- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage_objects.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage_objects.java index d1a244096e..a0f03d6baf 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage_objects.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage_objects.java @@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.causeway.applib.annotation.Collection; import org.apache.causeway.applib.annotation.CollectionLayout; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassSeeding.java index 510ffccddf..ad6405197c 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassSeeding.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassSeeding.java @@ -21,7 +21,7 @@ package demoapp.dom.domain.objects.DomainObjectLayout.cssClass; import demoapp.dom._infra.seed.SeedServiceAbstract; import demoapp.dom._infra.values.ValueHolderRepository; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/Status.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/Status.java index 65241c98a3..5d9804a9f4 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/Status.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/Status.java @@ -20,11 +20,11 @@ package demoapp.dom.domain.objects.DomainObjectLayout.cssClass; import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription; -import javax.inject.Named; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.inject.Named; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import org.apache.causeway.applib.annotation.DomainObject; import org.apache.causeway.applib.annotation.DomainObjectLayout; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jpa/DomainObjectLayoutCssClassJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jpa/DomainObjectLayoutCssClassJpa.java index 512a9576f9..554bf0a46e 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jpa/DomainObjectLayoutCssClassJpa.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jpa/DomainObjectLayoutCssClassJpa.java @@ -18,24 +18,23 @@ */ package demoapp.dom.domain.objects.DomainObjectLayout.cssClass.jpa; -import demoapp.dom.domain.objects.DomainObjectLayout.bookmarking.jpa.DomainObjectLayoutBookmarkingChildJpa; -import demoapp.dom.domain.objects.DomainObjectLayout.cssClass.DomainObjectLayoutCssClass; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.util.Set; -import java.util.TreeSet; +import jakarta.inject.Named; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; -import javax.inject.Named; -import javax.persistence.*; +import org.springframework.context.annotation.Profile; -import org.apache.causeway.applib.annotation.Collection; import org.apache.causeway.applib.annotation.DomainObject; -import org.apache.causeway.applib.annotation.DomainObjectLayout; import org.apache.causeway.applib.annotation.Nature; import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener; -import org.springframework.context.annotation.Profile; + +import demoapp.dom.domain.objects.DomainObjectLayout.cssClass.DomainObjectLayoutCssClass; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; @Profile("demo-jpa") @Entity @@ -53,7 +52,7 @@ public class DomainObjectLayoutCssClassJpa extends DomainObjectLayoutCssClass { // ... //end::class[] - public DomainObjectLayoutCssClassJpa(String value) { + public DomainObjectLayoutCssClassJpa(final String value) { setName(value); }
