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 aef56860246dc8094a75e5e5231857d3de5f6a20 Author: Andi Huber <[email protected]> AuthorDate: Sun Nov 13 10:22:17 2022 +0100 ISIS-3275: migrate applib --- api/applib/pom.xml | 14 ++++++++++++-- api/applib/src/main/java/module-info.java | 20 ++++++++------------ .../causeway/applib/annotation/ActionLayout.java | 4 ++-- .../causeway/applib/annotation/BookmarkPolicy.java | 2 +- .../causeway/applib/annotation/DomainObject.java | 2 -- .../causeway/applib/annotation/DomainService.java | 6 +++--- .../causeway/applib/annotation/LabelPosition.java | 2 +- .../causeway/applib/annotation/LogicalTypeName.java | 2 -- .../apache/causeway/applib/annotation/Nature.java | 2 -- .../applib/annotation/PriorityPrecedence.java | 8 ++++---- .../causeway/applib/annotation/PromptStyle.java | 2 +- .../apache/causeway/applib/annotation/Redirect.java | 2 +- .../causeway/applib/annotation/Repainting.java | 2 +- .../causeway/applib/annotation/SemanticsOf.java | 4 ++-- .../org/apache/causeway/applib/annotation/Value.java | 2 -- .../causeway/applib/annotation/ValueSemantics.java | 2 -- .../org/apache/causeway/applib/annotation/Where.java | 4 ++-- .../causeway/applib/domain/DomainObjectList.java | 13 ++++++------- .../org/apache/causeway/applib/graph/SimpleEdge.java | 4 ++-- .../apache/causeway/applib/graph/tree/TreeNode.java | 3 +-- .../org/apache/causeway/applib/id/LogicalType.java | 5 ++--- .../causeway/applib/jaxb/JavaSqlJaxbAdapters.java | 2 +- .../causeway/applib/jaxb/JavaTimeJaxbAdapters.java | 3 +-- .../causeway/applib/jaxb/JavaUtilJaxbAdapters.java | 3 +-- .../applib/jaxb/PersistentEntitiesAdapter.java | 5 ++--- .../applib/jaxb/PersistentEntityAdapter.java | 5 ++--- .../causeway/applib/jaxb/PrimitiveJaxbAdapters.java | 4 ++-- .../applib/layout/component/ActionLayoutData.java | 12 ++++++------ .../layout/component/CollectionLayoutData.java | 12 ++++++------ .../applib/layout/component/CssClassFaPosition.java | 2 +- .../layout/component/DomainObjectLayoutData.java | 12 ++++++------ .../causeway/applib/layout/component/FieldSet.java | 12 ++++++------ .../applib/layout/component/HasBookmarking.java | 4 ++-- .../applib/layout/component/HasCssClass.java | 2 +- .../applib/layout/component/HasCssClassFa.java | 2 +- .../applib/layout/component/HasDescribedAs.java | 2 +- .../causeway/applib/layout/component/HasHidden.java | 4 ++-- .../causeway/applib/layout/component/HasNamed.java | 2 +- .../applib/layout/component/PropertyLayoutData.java | 12 ++++++------ .../layout/component/ServiceActionLayoutData.java | 11 +++++------ .../applib/layout/component/TableDecoration.java | 2 +- .../applib/layout/component/package-info.java | 6 +++--- .../causeway/applib/layout/grid/GridAbstract.java | 4 ++-- .../layout/grid/bootstrap/BSClearFixHidden.java | 4 ++-- .../layout/grid/bootstrap/BSClearFixVisible.java | 6 +++--- .../causeway/applib/layout/grid/bootstrap/BSCol.java | 12 ++++++------ .../layout/grid/bootstrap/BSElementAbstract.java | 2 +- .../applib/layout/grid/bootstrap/BSGrid.java | 12 ++++++------ .../causeway/applib/layout/grid/bootstrap/BSRow.java | 14 +++++++------- .../applib/layout/grid/bootstrap/BSRowContent.java | 6 +++--- .../causeway/applib/layout/grid/bootstrap/BSTab.java | 10 +++++----- .../applib/layout/grid/bootstrap/BSTabGroup.java | 10 +++++----- .../applib/layout/grid/bootstrap/SizeSpan.java | 4 ++-- .../applib/layout/grid/bootstrap/package-info.java | 6 +++--- .../apache/causeway/applib/layout/links/Link.java | 8 ++++---- .../causeway/applib/layout/links/package-info.java | 6 +++--- .../applib/layout/menubars/MenuBarsAbstract.java | 3 +-- .../applib/layout/menubars/bootstrap/BSMenu.java | 7 +++---- .../applib/layout/menubars/bootstrap/BSMenuBar.java | 6 +++--- .../applib/layout/menubars/bootstrap/BSMenuBars.java | 8 ++++---- .../layout/menubars/bootstrap/BSMenuSection.java | 6 +++--- .../layout/menubars/bootstrap/package-info.java | 6 +++--- .../org/apache/causeway/applib/mixins/dto/Dto.java | 2 +- .../causeway/applib/mixins/dto/Dto_downloadXml.java | 3 +-- .../causeway/applib/mixins/dto/Dto_downloadXsd.java | 3 +-- .../applib/mixins/layout/Object_downloadLayout.java | 3 +-- .../metamodel/Object_downloadMetamodelXml.java | 3 +-- .../mixins/metamodel/Object_logicalTypeName.java | 5 ++--- .../mixins/metamodel/Object_objectIdentifier.java | 3 +-- .../mixins/metamodel/Object_rebuildMetamodel.java | 3 +-- .../applib/mixins/rest/Object_openRestApi.java | 3 +-- .../mixins/system/HasTarget_openTargetObject.java | 3 +-- .../services/acceptheader/AcceptHeaderService.java | 2 +- .../applib/services/appfeat/ApplicationFeature.java | 4 ++-- .../services/appfeat/ApplicationFeatureSort.java | 4 ++-- .../services/appfeatui/ApplicationFeatureMenu.java | 8 ++++---- .../appfeatui/ApplicationFeatureViewModel.java | 5 ++--- .../services/appfeatui/ApplicationNamespace.java | 4 ++-- .../applib/services/appfeatui/ApplicationType.java | 4 ++-- .../services/appfeatui/ApplicationTypeAction.java | 4 ++-- .../appfeatui/ApplicationTypeCollection.java | 4 ++-- .../services/appfeatui/ApplicationTypeMember.java | 3 +-- .../services/appfeatui/ApplicationTypeProperty.java | 3 +-- .../causeway/applib/services/bookmark/Bookmark.java | 3 +-- .../services/bookmark/BookmarkHolder_lookup.java | 3 +-- .../services/bookmark/BookmarkHolder_object.java | 3 +-- .../causeway/applib/services/clock/ClockService.java | 9 ++++----- .../conmap/ContentMappingServiceForCommandDto.java | 9 ++++----- .../conmap/ContentMappingServiceForCommandsDto.java | 12 ++++++------ .../spi/CommandDtoProcessorServiceIdentity.java | 6 +++--- .../applib/services/confview/ConfigurationMenu.java | 7 +++---- .../services/confview/ConfigurationProperty.java | 13 ++++++------- .../services/confview/ConfigurationViewmodel.java | 4 ++-- .../services/conmap/ContentMappingService.java | 4 ++-- .../causeway/applib/services/email/EmailService.java | 4 ++-- .../exceprecog/ExceptionRecognizerAbstract.java | 3 +-- .../applib/services/inject/ServiceInjector.java | 2 +- .../jaxb/CatalogingSchemaOutputResolver.java | 3 ++- .../applib/services/jaxb/CausewaySchemas.java | 4 ++-- .../causeway/applib/services/jaxb/JaxbService.java | 9 ++++----- .../services/keyvaluestore/KeyValueSessionStore.java | 2 +- .../applib/services/layout/LayoutServiceMenu.java | 9 +++++---- .../services/metamodel/MetaModelServiceMenu.java | 7 +++---- .../services/publishing/log/CommandLogger.java | 5 ++--- .../services/publishing/log/EntityChangesLogger.java | 5 ++--- .../publishing/log/EntityPropertyChangeLogger.java | 5 ++--- .../services/publishing/log/ExecutionLogger.java | 5 ++--- .../queryresultscache/QueryResultsCache.java | 5 ++--- .../registry/InstanceByPriorityComparator.java | 5 ++--- .../applib/services/registry/ServiceRegistry.java | 2 -- .../applib/services/session/SessionLogger.java | 5 ++--- .../applib/services/sitemap/SitemapServiceMenu.java | 6 +++--- .../causeway/applib/services/sudo/SudoService.java | 7 +++---- .../causeway/applib/services/swagger/Format.java | 4 ++-- .../causeway/applib/services/swagger/Visibility.java | 4 ++-- .../applib/services/user/ImpersonateMenu.java | 7 +++---- .../applib/services/user/ImpersonateStopMenu.java | 7 +++---- .../applib/services/user/ImpersonatedUserHolder.java | 2 +- .../causeway/applib/services/user/RoleMemento.java | 3 +-- .../causeway/applib/services/user/UserMemento.java | 3 +-- .../causeway/applib/services/user/UserService.java | 9 ++++----- .../causeway/applib/services/userui/UserMenu.java | 7 +++---- .../org/apache/causeway/applib/util/JaxbUtil.java | 7 +++---- .../causeway/applib/util/schema/ChangesDtoUtils.java | 10 +++++----- .../causeway/applib/util/schema/CommandDtoUtils.java | 10 +++++----- .../applib/util/schema/InteractionDtoUtils.java | 10 +++++----- .../applib/util/schema/InteractionsDtoUtils.java | 11 +++++------ .../applib/util/schema/MemberExecutionDtoUtils.java | 3 +-- .../java/org/apache/causeway/applib/value/Blob.java | 11 +++++------ .../java/org/apache/causeway/applib/value/Clob.java | 11 +++++------ .../causeway/applib/value/LocalResourcePath.java | 7 +++---- .../org/apache/causeway/applib/value/Markup.java | 7 +++---- .../causeway/applib/value/NamedWithMimeType.java | 5 ++--- .../org/apache/causeway/applib/value/Password.java | 10 +++++----- .../jaxbadapters/JaxbXmlAdaptersContractTest.java | 2 +- .../bootstrap/BSMenuBars_roundtrip_Test.java | 2 +- .../applib/services/jaxb/JaxbServiceTest.java | 2 +- 137 files changed, 351 insertions(+), 409 deletions(-) diff --git a/api/applib/pom.xml b/api/applib/pom.xml index 7ee1f8d562..6470f9ca35 100644 --- a/api/applib/pom.xml +++ b/api/applib/pom.xml @@ -70,7 +70,7 @@ <dependencies> - <!-- JDK11+ SUPPORT AND JEE API --> + <!-- JDK17+ SUPPORT AND JEE API --> <dependency> <groupId>org.apache.causeway.core</groupId> <artifactId>causeway-jdk-supplemental</artifactId> @@ -87,12 +87,22 @@ <groupId>org.apache.causeway.core</groupId> <artifactId>causeway-schema</artifactId> </dependency> - + + <!-- provides @Table, ... --> + <dependency> + <groupId>jakarta.persistence</groupId> + <artifactId>jakarta.persistence-api</artifactId> + </dependency> <!-- provides @Digits --> <dependency> <groupId>jakarta.validation</groupId> <artifactId>jakarta.validation-api</artifactId> </dependency> + <!-- provides MediaType for content negotiation --> + <dependency> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> + </dependency> <!-- marked for deprecation --> <dependency> diff --git a/api/applib/src/main/java/module-info.java b/api/applib/src/main/java/module-info.java index 7385177345..5bb86b67b4 100644 --- a/api/applib/src/main/java/module-info.java +++ b/api/applib/src/main/java/module-info.java @@ -123,25 +123,21 @@ module org.apache.causeway.applib { requires com.fasterxml.jackson.core; requires com.fasterxml.jackson.databind; - requires transitive jakarta.activation; - requires transitive java.annotation; - requires transitive java.desktop; - requires transitive java.instrument; - requires transitive java.persistence; - requires transitive java.sql; - requires transitive java.ws.rs; - requires transitive java.xml.bind; - requires transitive java.xml; - requires transitive java.inject; requires lombok; requires org.apache.causeway.commons; - requires transitive org.apache.causeway.schema; requires org.apache.logging.log4j; + requires spring.tx; + requires transitive jakarta.activation; + requires transitive jakarta.annotation; + requires transitive jakarta.inject; + requires transitive jakarta.persistence; + requires transitive jakarta.ws.rs; + requires transitive jakarta.xml.bind; + requires transitive org.apache.causeway.schema; requires transitive org.joda.time; requires transitive spring.beans; requires transitive spring.context; requires transitive spring.core; - requires spring.tx; // JAXB viewmodels opens org.apache.causeway.applib.layout.component; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/ActionLayout.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/ActionLayout.java index 50da957abc..df1160acee 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/ActionLayout.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/ActionLayout.java @@ -24,10 +24,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.xml.bind.annotation.XmlType; - import org.apache.causeway.applib.layout.component.CssClassFaPosition; +import jakarta.xml.bind.annotation.XmlType; + /** * Layout hints for actions. * diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/BookmarkPolicy.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/BookmarkPolicy.java index 2b96b65547..c212e4ae93 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/BookmarkPolicy.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/BookmarkPolicy.java @@ -19,7 +19,7 @@ package org.apache.causeway.applib.annotation; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; /** * diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainObject.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainObject.java index 263bd985ff..6e52768075 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainObject.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainObject.java @@ -24,8 +24,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Named; - import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainService.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainService.java index f15b2c0b96..a1856fbb19 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainService.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainService.java @@ -24,13 +24,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Named; -import javax.inject.Singleton; - import org.springframework.stereotype.Service; import org.apache.causeway.applib.services.bookmark.Bookmark; +import jakarta.inject.Named; +import jakarta.inject.Singleton; + /** * Indicates that the class should be automatically recognized as a domain service. * diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/LabelPosition.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/LabelPosition.java index 728ef08fee..ea358694db 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/LabelPosition.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/LabelPosition.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.applib.annotation; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; /** * The positioning of a label for a property or action parameter. diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/LogicalTypeName.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/LogicalTypeName.java index 64e56aee3f..5555723c5e 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/LogicalTypeName.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/LogicalTypeName.java @@ -24,8 +24,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Named; - /** * Introduced to allow for abstract types to be mapped to a logical-type-name, * for the security model to apply permission checks against. diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Nature.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Nature.java index f635f1fcd9..22b70beafd 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Nature.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Nature.java @@ -18,8 +18,6 @@ */ package org.apache.causeway.applib.annotation; -import javax.xml.bind.annotation.XmlRootElement; - import org.springframework.cglib.proxy.Mixin; import org.apache.causeway.applib.ViewModel; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/PriorityPrecedence.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/PriorityPrecedence.java index bff6ab0ee9..67836f7516 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/PriorityPrecedence.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/PriorityPrecedence.java @@ -23,11 +23,11 @@ import org.springframework.core.Ordered; import lombok.experimental.UtilityClass; /** - * Constants for use with {@link javax.annotation.Priority}, used both to determine which service to inject into a + * Constants for use with {@link jakarta.annotation.Priority}, used both to determine which service to inject into a * scalar field when there are multiple candidates, and also to order services if injecting into a vector field (in * other words, into a {@link java.util.List}). * - * @see javax.annotation.Priority + * @see jakarta.annotation.Priority * @see org.springframework.core.annotation.Order * * @since 2.0 {@index} @@ -44,13 +44,13 @@ public class PriorityPrecedence { * </p> * * <p> - * Note that this is a non-negative value, because {@link javax.annotation.Priority}'s javadoc states: + * Note that this is a non-negative value, because {@link jakarta.annotation.Priority}'s javadoc states: * "priority values should generally be non-negative, with negative values * reserved for special meanings * such as <i>undefined</i> or <i>not specified</i>.". In particular, it is <i>not</i> the same as * {@link Ordered#HIGHEST_PRECEDENCE}. * </p> * - * @see javax.annotation.Priority + * @see jakarta.annotation.Priority */ public static final int FIRST = 0; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/PromptStyle.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/PromptStyle.java index 24cf6dddb6..b5d2120589 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/PromptStyle.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/PromptStyle.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.applib.annotation; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; /** * How prompting for new values of a property/arguments for an action should be performed diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Redirect.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Redirect.java index b452023911..67c79b6b1f 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Redirect.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Redirect.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.applib.annotation; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; /** * The available policies for rendering the next page if the result is the same as the target diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Repainting.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Repainting.java index cc1acb0aed..c260e8b850 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Repainting.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Repainting.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.applib.annotation; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; /** * Whether a component is unchanging and so does not require repainting. diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/SemanticsOf.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/SemanticsOf.java index b339bf9054..1cdc7827c8 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/SemanticsOf.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/SemanticsOf.java @@ -18,11 +18,11 @@ */ package org.apache.causeway.applib.annotation; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.util.Enums; +import jakarta.inject.Named; + /** * @since 1.x {@index} * @see <a href="https://causeway.apache.org/guides/rgant/rgant.html#_rgant-Action_semantics";>Reference Guide</a> diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Value.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Value.java index 9063cfa6b8..d4fb5914d9 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Value.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Value.java @@ -25,8 +25,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Named; - import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/ValueSemantics.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/ValueSemantics.java index 33b51e2a9a..677217a307 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/ValueSemantics.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/ValueSemantics.java @@ -27,8 +27,6 @@ import java.math.BigDecimal; import java.time.format.FormatStyle; import java.util.Locale; -import javax.persistence.Column; - import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java index 412d1e095d..d46cf6914c 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java @@ -18,10 +18,10 @@ */ package org.apache.causeway.applib.annotation; -import javax.xml.bind.annotation.XmlType; - import org.apache.causeway.applib.util.Enums; +import jakarta.xml.bind.annotation.XmlType; + /** * Represents the location in the user interface where a class member is to be rendered. * diff --git a/api/applib/src/main/java/org/apache/causeway/applib/domain/DomainObjectList.java b/api/applib/src/main/java/org/apache/causeway/applib/domain/DomainObjectList.java index 9656510ca8..d41b92051b 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/domain/DomainObjectList.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/domain/DomainObjectList.java @@ -21,13 +21,6 @@ package org.apache.causeway.applib.domain; import java.util.ArrayList; import java.util.List; -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 javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Collection; import org.apache.causeway.applib.annotation.DomainObject; @@ -39,6 +32,12 @@ import org.apache.causeway.applib.annotation.Optionality; import org.apache.causeway.applib.annotation.Property; import org.apache.causeway.applib.jaxb.PersistentEntitiesAdapter; +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 jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import lombok.Getter; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/graph/SimpleEdge.java b/api/applib/src/main/java/org/apache/causeway/applib/graph/SimpleEdge.java index bde7c82d32..dce42053bc 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/graph/SimpleEdge.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/graph/SimpleEdge.java @@ -18,11 +18,11 @@ */ package org.apache.causeway.applib.graph; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Value; +import jakarta.inject.Named; + /** * Fundamental building block for graph structures. diff --git a/api/applib/src/main/java/org/apache/causeway/applib/graph/tree/TreeNode.java b/api/applib/src/main/java/org/apache/causeway/applib/graph/tree/TreeNode.java index 60037fde2c..ab99218f7b 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/graph/tree/TreeNode.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/graph/tree/TreeNode.java @@ -27,8 +27,6 @@ import java.util.concurrent.atomic.LongAdder; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import javax.inject.Named; - import org.springframework.lang.Nullable; import org.apache.causeway.applib.CausewayModuleApplib; @@ -41,6 +39,7 @@ import org.apache.causeway.commons.internal.base._Lazy; import org.apache.causeway.commons.internal.base._NullSafe; import org.apache.causeway.commons.internal.exceptions._Exceptions; +import jakarta.inject.Named; import lombok.SneakyThrows; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java b/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java index bdb5d66c9d..d25452561c 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java @@ -26,9 +26,6 @@ import java.util.Objects; import java.util.Optional; import java.util.function.Supplier; -import javax.inject.Named; -import javax.persistence.Table; - import org.springframework.lang.Nullable; import org.apache.causeway.applib.annotation.DomainObject; @@ -38,6 +35,8 @@ import org.apache.causeway.commons.internal.base._Strings; import org.apache.causeway.commons.internal.exceptions._Exceptions; import org.apache.causeway.commons.internal.reflection._Annotations; +import jakarta.persistence.Table; +import jakarta.inject.Named; import lombok.Getter; import lombok.NonNull; import lombok.Synchronized; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaSqlJaxbAdapters.java b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaSqlJaxbAdapters.java index a9128dcf7d..a13628cbb6 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaSqlJaxbAdapters.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaSqlJaxbAdapters.java @@ -21,9 +21,9 @@ package org.apache.causeway.applib.jaxb; import java.sql.Date; import java.sql.Timestamp; -import javax.xml.bind.annotation.adapters.XmlAdapter; import javax.xml.datatype.XMLGregorianCalendar; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import lombok.experimental.UtilityClass; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaTimeJaxbAdapters.java b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaTimeJaxbAdapters.java index 8d2db4f0e8..340a8edca7 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaTimeJaxbAdapters.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaTimeJaxbAdapters.java @@ -27,8 +27,7 @@ import java.time.OffsetTime; import java.time.Period; import java.time.ZonedDateTime; -import javax.xml.bind.annotation.adapters.XmlAdapter; - +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import lombok.experimental.UtilityClass; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaUtilJaxbAdapters.java b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaUtilJaxbAdapters.java index c2431d3335..a8528f1536 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaUtilJaxbAdapters.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/JavaUtilJaxbAdapters.java @@ -20,8 +20,7 @@ package org.apache.causeway.applib.jaxb; import java.util.Date; -import javax.xml.bind.annotation.adapters.XmlAdapter; - +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import lombok.experimental.UtilityClass; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PersistentEntitiesAdapter.java b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PersistentEntitiesAdapter.java index 7936a897d8..e8d2879711 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PersistentEntitiesAdapter.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PersistentEntitiesAdapter.java @@ -21,13 +21,12 @@ package org.apache.causeway.applib.jaxb; import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; -import javax.xml.bind.annotation.adapters.XmlAdapter; - import org.apache.causeway.applib.services.bookmark.Bookmark; import org.apache.causeway.applib.services.bookmark.BookmarkService; import org.apache.causeway.schema.common.v2.OidsDto; +import jakarta.inject.Inject; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import lombok.AccessLevel; import lombok.Getter; import lombok.val; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PersistentEntityAdapter.java b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PersistentEntityAdapter.java index 6247f8d8ba..3029debaad 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PersistentEntityAdapter.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PersistentEntityAdapter.java @@ -16,13 +16,12 @@ */ package org.apache.causeway.applib.jaxb; -import javax.inject.Inject; -import javax.xml.bind.annotation.adapters.XmlAdapter; - import org.apache.causeway.applib.services.bookmark.Bookmark; import org.apache.causeway.applib.services.bookmark.BookmarkService; import org.apache.causeway.schema.common.v2.OidDto; +import jakarta.inject.Inject; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import lombok.val; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PrimitiveJaxbAdapters.java b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PrimitiveJaxbAdapters.java index 5737677dcf..6227295bda 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PrimitiveJaxbAdapters.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/jaxb/PrimitiveJaxbAdapters.java @@ -20,11 +20,11 @@ package org.apache.causeway.applib.jaxb; import java.nio.charset.StandardCharsets; -import javax.xml.bind.annotation.adapters.XmlAdapter; - import org.apache.causeway.commons.internal.base._Bytes; import org.apache.causeway.commons.internal.base._Strings; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; + /** * @since 2.0 {@index} */ diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/ActionLayoutData.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/ActionLayoutData.java index 0b2fd4e522..d7029fa4bb 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/ActionLayoutData.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/ActionLayoutData.java @@ -20,18 +20,18 @@ package org.apache.causeway.applib.layout.component; import java.io.Serializable; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - import org.apache.causeway.applib.annotation.BookmarkPolicy; import org.apache.causeway.applib.annotation.PromptStyle; import org.apache.causeway.applib.annotation.Redirect; import org.apache.causeway.applib.annotation.Where; import org.apache.causeway.applib.layout.links.Link; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; + /** * Describes the layout of a single action, broadly corresponding to * {@link org.apache.causeway.applib.annotation.ActionLayout}. diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/CollectionLayoutData.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/CollectionLayoutData.java index a612abcfd3..90cbbfa7a1 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/CollectionLayoutData.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/CollectionLayoutData.java @@ -22,15 +22,15 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - import org.apache.causeway.applib.annotation.Where; import org.apache.causeway.applib.layout.links.Link; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; + /** * Describes the layout of a single collection, broadly corresponds to the * {@link org.apache.causeway.applib.annotation.CollectionLayout} annotation. diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/CssClassFaPosition.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/CssClassFaPosition.java index 7724cd7790..557cd4260f 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/CssClassFaPosition.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/CssClassFaPosition.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.applib.layout.component; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; /** * @since 1.x {@index} diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/DomainObjectLayoutData.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/DomainObjectLayoutData.java index 1a0bd630f2..613f691812 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/DomainObjectLayoutData.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/DomainObjectLayoutData.java @@ -20,15 +20,15 @@ package org.apache.causeway.applib.layout.component; import java.io.Serializable; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - import org.apache.causeway.applib.annotation.BookmarkPolicy; import org.apache.causeway.applib.layout.links.Link; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; + /** * Describes the layout of the title and icon of a domain object, broadly corresponding to {@link org.apache.causeway.applib.annotation.DomainObjectLayout}. * diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/FieldSet.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/FieldSet.java index 7af3e8097a..2b4bf9b402 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/FieldSet.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/FieldSet.java @@ -22,15 +22,15 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - import org.apache.causeway.applib.annotation.PropertyLayout; import org.apache.causeway.applib.layout.grid.bootstrap.BSCol; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; + /** * A {@link MemberRegion region} of the page containing a set of * related {@link PropertyLayoutData properties} and associated diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasBookmarking.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasBookmarking.java index 5574e6e274..76ff6bcf38 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasBookmarking.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasBookmarking.java @@ -18,10 +18,10 @@ */ package org.apache.causeway.applib.layout.component; -import javax.xml.bind.annotation.XmlAttribute; - import org.apache.causeway.applib.annotation.BookmarkPolicy; +import jakarta.xml.bind.annotation.XmlAttribute; + /** * @since 2.0 {@index} */ diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasCssClass.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasCssClass.java index 053b6e7b00..9390cfd472 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasCssClass.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasCssClass.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.applib.layout.component; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; /** * @since 2.0 {@index} diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasCssClassFa.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasCssClassFa.java index 52406417e5..d2c8735935 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasCssClassFa.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasCssClassFa.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.applib.layout.component; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; /** * @since 2.0 {@index} diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasDescribedAs.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasDescribedAs.java index 4b91426907..dd3bf4cdcf 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasDescribedAs.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasDescribedAs.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.applib.layout.component; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElement; /** * @since 2.0 {@index} diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasHidden.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasHidden.java index 5653164343..9b53cab89a 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasHidden.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasHidden.java @@ -18,10 +18,10 @@ */ package org.apache.causeway.applib.layout.component; -import javax.xml.bind.annotation.XmlAttribute; - import org.apache.causeway.applib.annotation.Where; +import jakarta.xml.bind.annotation.XmlAttribute; + /** * @since 2.0 {@index} */ diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasNamed.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasNamed.java index 4700ebdfd5..73b14ad0cf 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasNamed.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/HasNamed.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.applib.layout.component; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElement; /** * @since 1.x {@index} diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/PropertyLayoutData.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/PropertyLayoutData.java index d70338d030..c2725f63bd 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/PropertyLayoutData.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/PropertyLayoutData.java @@ -22,18 +22,18 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - import org.apache.causeway.applib.annotation.LabelPosition; import org.apache.causeway.applib.annotation.PromptStyle; import org.apache.causeway.applib.annotation.Repainting; import org.apache.causeway.applib.annotation.Where; import org.apache.causeway.applib.layout.links.Link; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; + /** * Describes the layout of a single property, broadly corresponds to the {@link org.apache.causeway.applib.annotation.PropertyLayout} annotation. * diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/ServiceActionLayoutData.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/ServiceActionLayoutData.java index bbac911b44..0867877087 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/ServiceActionLayoutData.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/ServiceActionLayoutData.java @@ -20,15 +20,14 @@ package org.apache.causeway.applib.layout.component; import java.io.Serializable; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - import org.apache.causeway.applib.annotation.BookmarkPolicy; import org.apache.causeway.applib.layout.links.Link; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import lombok.Getter; import lombok.Setter; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/TableDecoration.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/TableDecoration.java index 34452ce0c7..71fd7d3a5c 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/TableDecoration.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/TableDecoration.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.applib.layout.component; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; /** * @since 1.x {@index} diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/package-info.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/package-info.java index 15d5237f0e..0257d3f7c8 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/package-info.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/package-info.java @@ -27,11 +27,11 @@ * </p> * */ [email protected]( [email protected]( namespace = "http://causeway.apache.org/applib/layout/component";, - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( namespaceURI = "http://causeway.apache.org/applib/layout/component";, prefix = "cpt") } // specifying the location seems to cause JaxbService#toXsd() to not generate the schema; not sure why... //, location = ..."http://causeway.apache.org/schema/metamodel/layout/common/common.xsd"; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/GridAbstract.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/GridAbstract.java index 16ea3798f9..21088eafe2 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/GridAbstract.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/GridAbstract.java @@ -22,8 +22,6 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; -import javax.xml.bind.annotation.XmlTransient; - import org.apache.causeway.applib.annotation.Programmatic; import org.apache.causeway.applib.layout.component.ActionLayoutData; import org.apache.causeway.applib.layout.component.ActionLayoutDataOwner; @@ -35,6 +33,8 @@ import org.apache.causeway.applib.layout.component.PropertyLayoutData; import org.apache.causeway.applib.layout.grid.bootstrap.BSGrid; import org.apache.causeway.applib.services.layout.LayoutService; +import jakarta.xml.bind.annotation.XmlTransient; + /** * All top-level page layout classes should implement this interface. * diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSClearFixHidden.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSClearFixHidden.java index c79b703ab1..08458d72d5 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSClearFixHidden.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSClearFixHidden.java @@ -18,8 +18,8 @@ */ package org.apache.causeway.applib.layout.grid.bootstrap; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * One of the <a href="http://getbootstrap.com/css/#responsive-utilities";>Responsive utility classes</a>. diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSClearFixVisible.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSClearFixVisible.java index 8408be8546..8c6ee1b29e 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSClearFixVisible.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSClearFixVisible.java @@ -18,9 +18,9 @@ */ package org.apache.causeway.applib.layout.grid.bootstrap; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * One of the <a href="http://getbootstrap.com/css/#responsive-utilities";>Responsive utility classes</a>. diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSCol.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSCol.java index 0de70c675d..332965523f 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSCol.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSCol.java @@ -21,12 +21,6 @@ package org.apache.causeway.applib.layout.grid.bootstrap; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - import org.apache.causeway.applib.layout.component.ActionLayoutData; import org.apache.causeway.applib.layout.component.ActionLayoutDataOwner; import org.apache.causeway.applib.layout.component.CollectionLayoutData; @@ -38,6 +32,12 @@ import org.apache.causeway.applib.layout.component.FieldSetOwner; import org.apache.causeway.commons.internal.primitives._Ints; import org.apache.causeway.commons.internal.primitives._Ints.Bound; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** * A column within a row which, depending on its {@link #getSpan()}, could be as narrow as 1/12th of the page's width, all the way up to spanning the entire page. * diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSElementAbstract.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSElementAbstract.java index 96f9e09581..ae07d8c51a 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSElementAbstract.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSElementAbstract.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.applib.layout.grid.bootstrap; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; /** * Superclass for all layout classes, factoring out the common {@link #getCssClass()} attribute. diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSGrid.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSGrid.java index e0f4ec9be2..740dda3ba5 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSGrid.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSGrid.java @@ -22,12 +22,6 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - import org.apache.causeway.applib.annotation.Programmatic; import org.apache.causeway.applib.layout.component.ActionLayoutData; import org.apache.causeway.applib.layout.component.CollectionLayoutData; @@ -38,6 +32,12 @@ import org.apache.causeway.applib.layout.grid.Grid; import org.apache.causeway.applib.layout.grid.GridAbstract; import org.apache.causeway.applib.mixins.dto.Dto; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; + /** * This is the top-level for rendering the domain object's properties, collections and actions. It simply consists * of a number of rows. diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSRow.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSRow.java index 28cac228d5..f6a5848750 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSRow.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSRow.java @@ -21,15 +21,15 @@ package org.apache.causeway.applib.layout.grid.bootstrap; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - import org.apache.causeway.applib.annotation.Programmatic; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; + /** * Contains a row of content, either on the top-level {@link BSGrid page} or at any other lower-level element that can * contain rows, eg {@link BSTab tabs}. diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSRowContent.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSRowContent.java index 423b7f8039..af15c5ab8a 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSRowContent.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSRowContent.java @@ -18,11 +18,11 @@ */ package org.apache.causeway.applib.layout.grid.bootstrap; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlTransient; - import org.apache.causeway.applib.annotation.Programmatic; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlTransient; + /** * Common superclass for any content of a row. * diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSTab.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSTab.java index 6901c6fb38..10b03f888f 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSTab.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSTab.java @@ -23,17 +23,17 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Predicate; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - import org.apache.causeway.applib.annotation.Programmatic; import org.apache.causeway.applib.layout.component.ActionLayoutData; import org.apache.causeway.applib.layout.component.CollectionLayoutData; import org.apache.causeway.applib.layout.component.DomainObjectLayoutData; import org.apache.causeway.applib.layout.component.PropertyLayoutData; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; + /** * Represents a tab within a {@link BSTabGroup tab group}. * diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSTabGroup.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSTabGroup.java index 7d942d09a2..c9bef88542 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSTabGroup.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSTabGroup.java @@ -21,13 +21,13 @@ package org.apache.causeway.applib.layout.grid.bootstrap; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - import org.apache.causeway.applib.annotation.Programmatic; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; + /** * Represents a tab group containing one or more {@link BSTab tab}s. * diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/SizeSpan.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/SizeSpan.java index f294d519ca..504f2c49df 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/SizeSpan.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/SizeSpan.java @@ -20,8 +20,8 @@ package org.apache.causeway.applib.layout.grid.bootstrap; import java.io.Serializable; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** * diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/package-info.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/package-info.java index 58f146988e..80c7147f8e 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/package-info.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/package-info.java @@ -27,11 +27,11 @@ * verbosity. * </p> */ [email protected]( [email protected]( namespace = "http://causeway.apache.org/applib/layout/grid/bootstrap3";, - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( namespaceURI = "http://causeway.apache.org/applib/layout/grid/bootstrap3";, prefix = "bs") }) package org.apache.causeway.applib.layout.grid.bootstrap; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/links/Link.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/links/Link.java index b51d50a683..1c020b3cf2 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/links/Link.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/links/Link.java @@ -20,10 +20,10 @@ package org.apache.causeway.applib.layout.links; import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** * @since 1.x {@index} diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/links/package-info.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/links/package-info.java index bfacb28d40..8f473c9165 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/links/package-info.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/links/package-info.java @@ -27,11 +27,11 @@ * </p> * */ [email protected]( [email protected]( namespace = "http://causeway.apache.org/applib/layout/links";, - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( namespaceURI = "http://causeway.apache.org/applib/layout/links";, prefix = "lnk") } ) diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/MenuBarsAbstract.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/MenuBarsAbstract.java index 0962dd320c..5b9a23b75d 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/MenuBarsAbstract.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/MenuBarsAbstract.java @@ -21,11 +21,10 @@ package org.apache.causeway.applib.layout.menubars; import java.io.Serializable; import java.util.LinkedHashMap; -import javax.xml.bind.annotation.XmlTransient; - import org.apache.causeway.applib.annotation.Programmatic; import org.apache.causeway.applib.layout.component.ServiceActionLayoutData; +import jakarta.xml.bind.annotation.XmlTransient; import lombok.val; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenu.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenu.java index fb9a8b9f2b..cece4fec9e 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenu.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenu.java @@ -22,13 +22,12 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - import org.apache.causeway.applib.annotation.DomainServiceLayout; import org.apache.causeway.applib.layout.menubars.Menu; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import lombok.ToString; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBar.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBar.java index e14f75fdb1..71e9125487 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBar.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBar.java @@ -22,12 +22,12 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - import org.apache.causeway.applib.annotation.DomainServiceLayout; import org.apache.causeway.applib.layout.menubars.MenuBar; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; + /** * Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information of {@link org.apache.causeway.applib.annotation.DomainServiceLayout} that have the same value of {@link DomainServiceLayout#named()}. diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBars.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBars.java index 58bdd4826f..8e45c627d0 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBars.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBars.java @@ -21,14 +21,14 @@ package org.apache.causeway.applib.layout.menubars.bootstrap; import java.util.List; import java.util.function.Consumer; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - import org.apache.causeway.applib.annotation.DomainServiceLayout; import org.apache.causeway.applib.layout.component.ServiceActionLayoutData; import org.apache.causeway.commons.internal.exceptions._Exceptions; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** * Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information within {@link org.apache.causeway.applib.annotation.DomainServiceLayout}. * diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuSection.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuSection.java index 6aca2a35b5..c942be1b73 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuSection.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuSection.java @@ -22,13 +22,13 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - import org.apache.causeway.applib.layout.component.ServiceActionLayoutData; import org.apache.causeway.applib.layout.component.ServiceActionLayoutDataOwner; import org.apache.causeway.applib.layout.menubars.MenuSection; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; + /** * Corresponds to a domain service that contributes its serviceActions under a particular {@link BSMenuBar}. diff --git a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/package-info.java b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/package-info.java index be2bd6a9ff..721aaae0af 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/package-info.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/package-info.java @@ -27,11 +27,11 @@ * </p> * */ [email protected]( [email protected]( namespace = "http://causeway.apache.org/applib/layout/menubars/bootstrap3";, - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( namespaceURI = "http://causeway.apache.org/applib/layout/menubars/bootstrap3";, prefix = "mb3") } ) diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto.java index 580df3a336..18fe9c0a80 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto.java @@ -24,7 +24,7 @@ package org.apache.causeway.applib.mixins.dto; * * <p> * A JAXB view model is one annotated with - * {@link javax.xml.bind.annotation.XmlRootElement}. + * {@link jakarta.xml.bind.annotation.XmlRootElement}. * </p> * * <p> diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto_downloadXml.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto_downloadXml.java index 8f90df0165..d4eee17795 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto_downloadXml.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto_downloadXml.java @@ -18,8 +18,6 @@ */ package org.apache.causeway.applib.mixins.dto; -import javax.inject.Inject; - import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; import org.apache.causeway.applib.annotation.MemberSupport; @@ -30,6 +28,7 @@ import org.apache.causeway.applib.services.jaxb.JaxbService; import org.apache.causeway.applib.value.Clob; import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType; +import jakarta.inject.Inject; import lombok.RequiredArgsConstructor; import lombok.val; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto_downloadXsd.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto_downloadXsd.java index 4d54b6fe8e..c028810ca3 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto_downloadXsd.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/dto/Dto_downloadXsd.java @@ -20,8 +20,6 @@ package org.apache.causeway.applib.mixins.dto; import java.util.Map; -import javax.inject.Inject; - import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; import org.apache.causeway.applib.annotation.MemberSupport; @@ -36,6 +34,7 @@ import org.apache.causeway.applib.value.Blob; import org.apache.causeway.applib.value.Clob; import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType; +import jakarta.inject.Inject; import lombok.RequiredArgsConstructor; import lombok.val; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/layout/Object_downloadLayout.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/layout/Object_downloadLayout.java index 6350671c4e..a5060ce8f5 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/layout/Object_downloadLayout.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/layout/Object_downloadLayout.java @@ -20,8 +20,6 @@ package org.apache.causeway.applib.mixins.layout; import java.util.Set; -import javax.inject.Inject; - import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; import org.apache.causeway.applib.annotation.MemberSupport; @@ -36,6 +34,7 @@ import org.apache.causeway.applib.services.layout.LayoutService; import org.apache.causeway.applib.value.Clob; import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType; +import jakarta.inject.Inject; import lombok.RequiredArgsConstructor; import lombok.val; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_downloadMetamodelXml.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_downloadMetamodelXml.java index ca2b95e408..630da658ab 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_downloadMetamodelXml.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_downloadMetamodelXml.java @@ -21,8 +21,6 @@ package org.apache.causeway.applib.mixins.metamodel; import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; - import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; import org.apache.causeway.applib.annotation.MemberSupport; @@ -40,6 +38,7 @@ import org.apache.causeway.applib.services.metamodel.MetaModelService; import org.apache.causeway.applib.value.Clob; import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType; +import jakarta.inject.Inject; import lombok.RequiredArgsConstructor; import lombok.val; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_logicalTypeName.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_logicalTypeName.java index e12abd3e72..6ac715781f 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_logicalTypeName.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_logicalTypeName.java @@ -18,8 +18,6 @@ */ package org.apache.causeway.applib.mixins.metamodel; -import javax.inject.Inject; - import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.DomainObject; import org.apache.causeway.applib.annotation.MemberSupport; @@ -30,12 +28,13 @@ import org.apache.causeway.applib.layout.LayoutConstants; import org.apache.causeway.applib.services.bookmark.BookmarkService; import org.apache.causeway.applib.services.metamodel.MetaModelService; +import jakarta.inject.Inject; import lombok.RequiredArgsConstructor; import lombok.val; /** * Contributes a property exposing the logical object type of the domain - * object, typically as specified by {@link javax.inject.Named}. + * object, typically as specified by {@link jakarta.inject.Named}. * * <p> * The logical type name is also accessible from the diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_objectIdentifier.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_objectIdentifier.java index 9a40fd08eb..61b78a313e 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_objectIdentifier.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_objectIdentifier.java @@ -18,8 +18,6 @@ */ package org.apache.causeway.applib.mixins.metamodel; -import javax.inject.Inject; - import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.DomainObject; import org.apache.causeway.applib.annotation.MemberSupport; @@ -30,6 +28,7 @@ import org.apache.causeway.applib.layout.LayoutConstants; import org.apache.causeway.applib.services.bookmark.BookmarkService; import org.apache.causeway.applib.services.metamodel.MetaModelService; +import jakarta.inject.Inject; import lombok.RequiredArgsConstructor; import lombok.val; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_rebuildMetamodel.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_rebuildMetamodel.java index 70cdcc5c42..677b71a29a 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_rebuildMetamodel.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_rebuildMetamodel.java @@ -18,8 +18,6 @@ */ package org.apache.causeway.applib.mixins.metamodel; -import javax.inject.Inject; - import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; import org.apache.causeway.applib.annotation.MemberSupport; @@ -29,6 +27,7 @@ import org.apache.causeway.applib.annotation.SemanticsOf; import org.apache.causeway.applib.layout.LayoutConstants; import org.apache.causeway.applib.services.metamodel.MetaModelService; +import jakarta.inject.Inject; import lombok.RequiredArgsConstructor; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/rest/Object_openRestApi.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/rest/Object_openRestApi.java index 275c19177a..73022cbe46 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/rest/Object_openRestApi.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/rest/Object_openRestApi.java @@ -20,8 +20,6 @@ package org.apache.causeway.applib.mixins.rest; import java.util.Optional; -import javax.inject.Inject; - import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; import org.apache.causeway.applib.annotation.MemberSupport; @@ -32,6 +30,7 @@ import org.apache.causeway.applib.layout.LayoutConstants; import org.apache.causeway.applib.services.bookmark.BookmarkService; import org.apache.causeway.applib.value.LocalResourcePath; +import jakarta.inject.Inject; import lombok.RequiredArgsConstructor; import lombok.val; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/system/HasTarget_openTargetObject.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/system/HasTarget_openTargetObject.java index dc3a6663d9..5693b350b5 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/system/HasTarget_openTargetObject.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/system/HasTarget_openTargetObject.java @@ -18,8 +18,6 @@ */ package org.apache.causeway.applib.mixins.system; -import javax.inject.Inject; - import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; import org.apache.causeway.applib.annotation.MemberSupport; @@ -30,6 +28,7 @@ import org.apache.causeway.applib.services.message.MessageService; import org.apache.causeway.applib.services.metamodel.BeanSort; import org.apache.causeway.applib.services.metamodel.MetaModelService; +import jakarta.inject.Inject; import lombok.RequiredArgsConstructor; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/acceptheader/AcceptHeaderService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/acceptheader/AcceptHeaderService.java index 6b3f00f305..217ec19f0e 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/acceptheader/AcceptHeaderService.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/acceptheader/AcceptHeaderService.java @@ -20,7 +20,7 @@ package org.apache.causeway.applib.services.acceptheader; import java.util.List; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; /** * This service simply exposes the HTTP `Accept` header to the domain. diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeature.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeature.java index 6015dca48e..4b8e0a3d44 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeature.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeature.java @@ -23,12 +23,12 @@ import java.util.Optional; import java.util.OptionalInt; import java.util.SortedSet; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.SemanticsOf; import org.apache.causeway.applib.annotation.Value; +import jakarta.inject.Named; + /** * * @since 1.x revised for 2.0 {@index} diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureSort.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureSort.java index 13ac7a1bee..f3528967aa 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureSort.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureSort.java @@ -18,11 +18,11 @@ */ package org.apache.causeway.applib.services.appfeat; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Value; +import jakarta.inject.Named; + /** * * @since 1.x revised for 2.0 {@index} diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureMenu.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureMenu.java index ac94307bef..c777dd589e 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureMenu.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureMenu.java @@ -21,9 +21,6 @@ package org.apache.causeway.applib.services.appfeatui; import java.util.Collection; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; @@ -40,6 +37,9 @@ import org.apache.causeway.applib.services.factory.FactoryService; import org.apache.causeway.applib.services.repository.RepositoryService; import org.apache.causeway.commons.internal.collections._Lists; +import jakarta.inject.Inject; +import jakarta.inject.Named; + /** * @since 2.x {@index} */ @@ -51,7 +51,7 @@ import org.apache.causeway.commons.internal.collections._Lists; menuBar = DomainServiceLayout.MenuBar.SECONDARY ) @Named(ApplicationFeatureMenu.LOGICAL_TYPE_NAME) [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) public class ApplicationFeatureMenu { public static final String LOGICAL_TYPE_NAME = diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureViewModel.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureViewModel.java index ed37d3dd7e..76ee10570b 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureViewModel.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureViewModel.java @@ -26,9 +26,6 @@ import java.util.List; import java.util.Optional; import java.util.function.Function; -import javax.inject.Inject; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.ViewModel; import org.apache.causeway.applib.annotation.DomainObject; @@ -55,6 +52,8 @@ import org.apache.causeway.commons.internal.assertions._Assert; import org.apache.causeway.commons.internal.base._Casts; import org.apache.causeway.commons.internal.collections._Lists; +import jakarta.inject.Inject; +import jakarta.inject.Named; import lombok.Getter; import lombok.NonNull; import lombok.Setter; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationNamespace.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationNamespace.java index 1cdc23a0a7..4519e702ec 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationNamespace.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationNamespace.java @@ -25,8 +25,6 @@ import java.lang.annotation.Target; import java.util.List; import java.util.SortedSet; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Collection; import org.apache.causeway.applib.annotation.CollectionLayout; @@ -36,6 +34,8 @@ import org.apache.causeway.applib.annotation.MemberSupport; import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId; import org.apache.causeway.applib.services.appfeat.ApplicationFeatureSort; +import jakarta.inject.Named; + /** * @since 2.x {@index} */ diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationType.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationType.java index 7b8360f8db..2fa344e8f9 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationType.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationType.java @@ -25,8 +25,6 @@ import java.lang.annotation.Target; import java.util.List; import java.util.SortedSet; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.BookmarkPolicy; import org.apache.causeway.applib.annotation.Collection; @@ -35,6 +33,8 @@ import org.apache.causeway.applib.annotation.DomainObject; import org.apache.causeway.applib.annotation.DomainObjectLayout; import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId; +import jakarta.inject.Named; + /** * @since 2.x {@index} */ diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeAction.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeAction.java index c0c132aa37..4328914177 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeAction.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeAction.java @@ -23,8 +23,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.DomainObject; import org.apache.causeway.applib.annotation.DomainObjectLayout; @@ -33,6 +31,8 @@ import org.apache.causeway.applib.annotation.PropertyLayout; import org.apache.causeway.applib.annotation.SemanticsOf; import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId; +import jakarta.inject.Named; + /** * @since 2.x {@index} */ diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeCollection.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeCollection.java index 6380a6cfd8..c6f7d0d497 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeCollection.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeCollection.java @@ -22,8 +22,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.DomainObject; import org.apache.causeway.applib.annotation.DomainObjectLayout; @@ -31,6 +29,8 @@ import org.apache.causeway.applib.annotation.Property; import org.apache.causeway.applib.annotation.PropertyLayout; import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId; +import jakarta.inject.Named; + /** * @since 2.x {@index} */ diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeMember.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeMember.java index ff03bfba34..ded418b881 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeMember.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeMember.java @@ -23,8 +23,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.BookmarkPolicy; import org.apache.causeway.applib.annotation.DomainObject; @@ -33,6 +31,7 @@ import org.apache.causeway.applib.annotation.Property; import org.apache.causeway.applib.annotation.PropertyLayout; import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId; +import jakarta.inject.Named; import lombok.NoArgsConstructor; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeProperty.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeProperty.java index 53a7d7c407..57ed3f440e 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeProperty.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeProperty.java @@ -23,8 +23,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.DomainObject; import org.apache.causeway.applib.annotation.DomainObjectLayout; @@ -34,6 +32,7 @@ import org.apache.causeway.applib.annotation.Property; import org.apache.causeway.applib.annotation.PropertyLayout; import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId; +import jakarta.inject.Named; import lombok.val; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/Bookmark.java b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/Bookmark.java index 88fcd4805f..a2a5085d8a 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/Bookmark.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/Bookmark.java @@ -22,8 +22,6 @@ import java.util.Objects; import java.util.Optional; import java.util.StringTokenizer; -import javax.inject.Named; - import org.springframework.lang.Nullable; import org.apache.causeway.applib.CausewayModuleApplib; @@ -33,6 +31,7 @@ import org.apache.causeway.commons.internal.codec._UrlDecoderUtil; import org.apache.causeway.commons.internal.exceptions._Exceptions; import org.apache.causeway.schema.common.v2.OidDto; +import jakarta.inject.Named; import lombok.AccessLevel; import lombok.Getter; import lombok.NonNull; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkHolder_lookup.java b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkHolder_lookup.java index 0308d4a219..e8591685c4 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkHolder_lookup.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkHolder_lookup.java @@ -18,14 +18,13 @@ */ package org.apache.causeway.applib.services.bookmark; -import javax.inject.Inject; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; import org.apache.causeway.applib.annotation.MemberSupport; import org.apache.causeway.applib.annotation.SemanticsOf; +import jakarta.inject.Inject; import lombok.RequiredArgsConstructor; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkHolder_object.java b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkHolder_object.java index dc0c5aad1d..6bebe50f10 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkHolder_object.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/BookmarkHolder_object.java @@ -18,12 +18,11 @@ */ package org.apache.causeway.applib.services.bookmark; -import javax.inject.Inject; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.MemberSupport; import org.apache.causeway.applib.annotation.Property; +import jakarta.inject.Inject; import lombok.RequiredArgsConstructor; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/clock/ClockService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/clock/ClockService.java index ea89dab185..3ad7a0ae9d 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/clock/ClockService.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/clock/ClockService.java @@ -18,10 +18,6 @@ */ package org.apache.causeway.applib.services.clock; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; - import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -31,6 +27,9 @@ import org.apache.causeway.applib.clock.VirtualClock; import org.apache.causeway.applib.services.iactnlayer.InteractionContext; import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import lombok.RequiredArgsConstructor; /** @@ -43,7 +42,7 @@ import lombok.RequiredArgsConstructor; */ @Service @Named(ClockService.LOGICAL_TYPE_NAME) [email protected](PriorityPrecedence.MIDPOINT) [email protected](PriorityPrecedence.MIDPOINT) @Qualifier("Default") @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class ClockService { diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.java b/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.java index 313aca906b..eec2c70a17 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.java @@ -20,11 +20,6 @@ package org.apache.causeway.applib.services.commanddto.conmap; import java.util.List; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; -import javax.ws.rs.core.MediaType; - import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.lang.Nullable; import org.springframework.stereotype.Service; @@ -38,6 +33,10 @@ import org.apache.causeway.applib.services.conmap.ContentMappingService; import org.apache.causeway.applib.services.metamodel.MetaModelService; import org.apache.causeway.schema.cmd.v2.CommandDto; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.ws.rs.core.MediaType; import lombok.val; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/conmap/ContentMappingServiceForCommandsDto.java b/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/conmap/ContentMappingServiceForCommandsDto.java index 316c26e848..679e6b0dfe 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/conmap/ContentMappingServiceForCommandsDto.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/conmap/ContentMappingServiceForCommandsDto.java @@ -20,11 +20,6 @@ package org.apache.causeway.applib.services.commanddto.conmap; import java.util.List; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; -import javax.ws.rs.core.MediaType; - import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -34,6 +29,11 @@ import org.apache.causeway.applib.services.conmap.ContentMappingService; import org.apache.causeway.schema.cmd.v2.CommandDto; import org.apache.causeway.schema.cmd.v2.CommandsDto; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.ws.rs.core.MediaType; + /** * * @since 2.0 {@index} @@ -47,7 +47,7 @@ public class ContentMappingServiceForCommandsDto implements ContentMappingServic static final String LOGICAL_TYPE_NAME = CausewayModuleApplib.NAMESPACE + ".ContentMappingServiceForCommandsDto"; @Override - public Object map(Object object, final List<MediaType> acceptableMediaTypes) { + public Object map(final Object object, final List<MediaType> acceptableMediaTypes) { final boolean supported = isSupported(CommandsDto.class, acceptableMediaTypes); if(!supported) { return null; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/processor/spi/CommandDtoProcessorServiceIdentity.java b/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/processor/spi/CommandDtoProcessorServiceIdentity.java index 24706855ae..9172c8a862 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/processor/spi/CommandDtoProcessorServiceIdentity.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/processor/spi/CommandDtoProcessorServiceIdentity.java @@ -18,14 +18,14 @@ */ package org.apache.causeway.applib.services.commanddto.processor.spi; -import javax.inject.Named; - import org.springframework.stereotype.Service; import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.schema.cmd.v2.CommandDto; +import jakarta.inject.Named; + /** * At least one implementation is required. * @@ -33,7 +33,7 @@ import org.apache.causeway.schema.cmd.v2.CommandDto; */ @Service @Named(CommandDtoProcessorServiceIdentity.LOGICAL_TYPE_NAME) [email protected](PriorityPrecedence.LAST) [email protected](PriorityPrecedence.LAST) public class CommandDtoProcessorServiceIdentity implements CommandDtoProcessorService { static final String LOGICAL_TYPE_NAME = CausewayModuleApplib.NAMESPACE + ".CommandDtoProcessorServiceIdentity"; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationMenu.java b/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationMenu.java index fbea163c23..68c644d148 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationMenu.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationMenu.java @@ -18,9 +18,6 @@ */ package org.apache.causeway.applib.services.confview; -import javax.inject.Inject; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; @@ -32,6 +29,8 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.annotation.SemanticsOf; import org.apache.causeway.applib.services.factory.FactoryService; +import jakarta.inject.Inject; +import jakarta.inject.Named; import lombok.RequiredArgsConstructor; /** @@ -47,7 +46,7 @@ import lombok.RequiredArgsConstructor; menuBar = DomainServiceLayout.MenuBar.TERTIARY ) @Named(ConfigurationMenu.LOGICAL_TYPE_NAME) [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = { @Inject }) public class ConfigurationMenu { diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationProperty.java b/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationProperty.java index f1a66666dc..8fb7276899 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationProperty.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationProperty.java @@ -18,13 +18,6 @@ */ package org.apache.causeway.applib.services.confview; -import javax.inject.Named; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.DomainObject; import org.apache.causeway.applib.annotation.DomainObjectLayout; @@ -32,6 +25,12 @@ import org.apache.causeway.applib.annotation.Editing; import org.apache.causeway.applib.annotation.Title; import org.apache.causeway.commons.internal.base._Objects; +import jakarta.inject.Named; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationViewmodel.java b/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationViewmodel.java index 7ba8c465a3..a73c90d5c1 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationViewmodel.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationViewmodel.java @@ -21,8 +21,6 @@ package org.apache.causeway.applib.services.confview; import java.util.Collections; import java.util.Set; -import javax.inject.Named; - import org.springframework.beans.factory.annotation.Autowired; import org.apache.causeway.applib.CausewayModuleApplib; @@ -31,6 +29,8 @@ import org.apache.causeway.applib.annotation.DomainObject; import org.apache.causeway.applib.annotation.Nature; import org.apache.causeway.applib.annotation.ObjectSupport; +import jakarta.inject.Named; + /** * As returned by {@link ConfigurationMenu.configuration#act() ConfigurationMenu}. * diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/conmap/ContentMappingService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/conmap/ContentMappingService.java index c37d24f1e7..3748413bb4 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/conmap/ContentMappingService.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/conmap/ContentMappingService.java @@ -22,10 +22,10 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.ws.rs.core.MediaType; - import org.apache.causeway.commons.internal.base._NullSafe; +import jakarta.ws.rs.core.MediaType; + /** * * @since 1.x {@index} diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/email/EmailService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/email/EmailService.java index e9548810d8..87e37f39af 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/email/EmailService.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/email/EmailService.java @@ -21,8 +21,8 @@ package org.apache.causeway.applib.services.email; import java.io.Serializable; import java.util.List; -import javax.activation.DataSource; -import javax.annotation.PostConstruct; +import jakarta.activation.DataSource; +import jakarta.annotation.PostConstruct; /** * diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/exceprecog/ExceptionRecognizerAbstract.java b/api/applib/src/main/java/org/apache/causeway/applib/services/exceprecog/ExceptionRecognizerAbstract.java index e45e1ec089..37ba2b2e98 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/exceprecog/ExceptionRecognizerAbstract.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/exceprecog/ExceptionRecognizerAbstract.java @@ -23,13 +23,12 @@ import java.util.Optional; import java.util.function.Function; import java.util.function.Predicate; -import javax.inject.Inject; - import org.apache.causeway.applib.exceptions.TranslatableException; import org.apache.causeway.applib.services.i18n.TranslationService; import org.apache.causeway.commons.internal.base._NullSafe; import org.apache.causeway.commons.internal.exceptions._Exceptions; +import jakarta.inject.Inject; import lombok.Getter; import lombok.Setter; import lombok.val; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/inject/ServiceInjector.java b/api/applib/src/main/java/org/apache/causeway/applib/services/inject/ServiceInjector.java index e2c084e687..078028e775 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/inject/ServiceInjector.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/inject/ServiceInjector.java @@ -24,7 +24,7 @@ import org.springframework.lang.Nullable; * Resolves injection points using the * {@link org.apache.causeway.applib.services.registry.ServiceRegistry} (in other * words provides a domain service instance to all fields and setters that are - * annotated with {@link javax.inject.Inject}). + * annotated with {@link jakarta.inject.Inject}). * * @since 1.x extended in 2.0 {@index} */ diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CatalogingSchemaOutputResolver.java b/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CatalogingSchemaOutputResolver.java index 873502f3a0..6e3806e922 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CatalogingSchemaOutputResolver.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CatalogingSchemaOutputResolver.java @@ -25,7 +25,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import javax.xml.bind.SchemaOutputResolver; import javax.xml.parsers.DocumentBuilder; import javax.xml.transform.Result; import javax.xml.transform.Transformer; @@ -43,6 +42,8 @@ import org.apache.causeway.commons.internal.codec._DocumentFactories; import org.apache.causeway.commons.internal.collections._Lists; import org.apache.causeway.commons.internal.collections._Maps; +import jakarta.xml.bind.SchemaOutputResolver; + /** * An implementation of {@link SchemaOutputResolver} that keeps track of all the schemas for which it has * {@link #createOutput(String, String) created} an output {@link StreamResult} containing the content diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CausewaySchemas.java b/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CausewaySchemas.java index d47c3b91ce..f5a7330515 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CausewaySchemas.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/CausewaySchemas.java @@ -18,12 +18,12 @@ */ package org.apache.causeway.applib.services.jaxb; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Value; import org.apache.causeway.applib.mixins.dto.Dto_downloadXsd; +import jakarta.inject.Named; + /** * Controls whether, when generating {@link JaxbService#toXsd(Object, CausewaySchemas) XML schemas}, * any of the common Causeway schemas (in the namespace <code>http://org.apache.causeway.schema</code>) should be included diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/JaxbService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/JaxbService.java index 8f5999be24..3d96c03338 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/JaxbService.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/JaxbService.java @@ -22,17 +22,16 @@ import java.io.StringReader; import java.io.StringWriter; import java.util.Map; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; - import org.springframework.lang.Nullable; import org.apache.causeway.commons.internal.base._Casts; import org.apache.causeway.commons.internal.base._NullSafe; import org.apache.causeway.commons.internal.resources._Xml; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import lombok.NonNull; import lombok.SneakyThrows; import lombok.val; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/keyvaluestore/KeyValueSessionStore.java b/api/applib/src/main/java/org/apache/causeway/applib/services/keyvaluestore/KeyValueSessionStore.java index 3cdb25d497..71bf2f07cc 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/keyvaluestore/KeyValueSessionStore.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/keyvaluestore/KeyValueSessionStore.java @@ -27,7 +27,7 @@ import lombok.NonNull; /** * Defines a mechanism for viewers to store arbitrary key value pairs - * on a per-session basis. That is usually a {@link javax.servlet.http.HttpSession}. + * on a per-session basis. That is usually a {@link jakarta.servlet.http.HttpSession}. * <p> * This store <i>is</i> used by the Wicket viewer. For example, the viewer * remembers which time-zone the user has logged in. Or when impersonating. diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/layout/LayoutServiceMenu.java b/api/applib/src/main/java/org/apache/causeway/applib/services/layout/LayoutServiceMenu.java index 4dcf37c5e5..f16a95e997 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/layout/LayoutServiceMenu.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/layout/LayoutServiceMenu.java @@ -20,9 +20,8 @@ package org.apache.causeway.applib.services.layout; import java.util.Set; -import javax.activation.MimeType; -import javax.activation.MimeTypeParseException; -import javax.inject.Named; +import jakarta.activation.MimeType; +import jakarta.activation.MimeTypeParseException; import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Action; @@ -39,6 +38,8 @@ import org.apache.causeway.applib.value.Blob; import org.apache.causeway.applib.value.Clob; import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType; +import jakarta.inject.Named; + /** * Provides a UI to allow layouts (obtained from {@link LayoutService}) to be downloaded. * @@ -50,7 +51,7 @@ import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType; named = "Prototyping", menuBar = DomainServiceLayout.MenuBar.SECONDARY ) [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) public class LayoutServiceMenu { public static final String LOGICAL_TYPE_NAME = CausewayModuleApplib.NAMESPACE + ".LayoutServiceMenu"; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java b/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java index 4cc0d804e3..c2d90f27c2 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java @@ -25,9 +25,6 @@ import java.util.SortedSet; import static java.nio.charset.StandardCharsets.UTF_8; -import javax.inject.Inject; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; @@ -48,6 +45,8 @@ import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType; import org.apache.causeway.commons.internal.collections._Sets; import org.apache.causeway.schema.metamodel.v2.MetamodelDto; +import jakarta.inject.Inject; +import jakarta.inject.Named; import lombok.val; /** @@ -63,7 +62,7 @@ import lombok.val; named = "Prototyping", menuBar = DomainServiceLayout.MenuBar.SECONDARY ) [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) public class MetaModelServiceMenu { static final String LOGICAL_TYPE_NAME = CausewayModuleApplib.NAMESPACE + ".MetaModelServiceMenu"; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/CommandLogger.java b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/CommandLogger.java index 5284660085..6792b97806 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/CommandLogger.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/CommandLogger.java @@ -18,9 +18,6 @@ */ package org.apache.causeway.applib.services.publishing.log; -import javax.annotation.Priority; -import javax.inject.Named; - import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -30,6 +27,8 @@ import org.apache.causeway.applib.services.command.Command; import org.apache.causeway.applib.services.publishing.spi.CommandSubscriber; import org.apache.causeway.applib.util.schema.CommandDtoUtils; +import jakarta.annotation.Priority; +import jakarta.inject.Named; import lombok.val; import lombok.extern.log4j.Log4j2; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityChangesLogger.java b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityChangesLogger.java index e88f79d591..668d1cec07 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityChangesLogger.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityChangesLogger.java @@ -18,9 +18,6 @@ */ package org.apache.causeway.applib.services.publishing.log; -import javax.annotation.Priority; -import javax.inject.Named; - import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -31,6 +28,8 @@ import org.apache.causeway.applib.services.publishing.spi.EntityChangesSubscribe import org.apache.causeway.applib.util.schema.ChangesDtoUtils; import org.apache.causeway.schema.chg.v2.ChangesDto; +import jakarta.annotation.Priority; +import jakarta.inject.Named; import lombok.extern.log4j.Log4j2; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityPropertyChangeLogger.java b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityPropertyChangeLogger.java index fb0b6292c9..e618689106 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityPropertyChangeLogger.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityPropertyChangeLogger.java @@ -18,9 +18,6 @@ */ package org.apache.causeway.applib.services.publishing.log; -import javax.annotation.Priority; -import javax.inject.Named; - import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -29,6 +26,8 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.services.publishing.spi.EntityPropertyChange; import org.apache.causeway.applib.services.publishing.spi.EntityPropertyChangeSubscriber; +import jakarta.annotation.Priority; +import jakarta.inject.Named; import lombok.extern.log4j.Log4j2; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/ExecutionLogger.java b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/ExecutionLogger.java index 3ab7954634..b0f7a0dffd 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/ExecutionLogger.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/ExecutionLogger.java @@ -18,9 +18,6 @@ */ package org.apache.causeway.applib.services.publishing.log; -import javax.annotation.Priority; -import javax.inject.Named; - import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -31,6 +28,8 @@ import org.apache.causeway.applib.services.publishing.spi.ExecutionSubscriber; import org.apache.causeway.applib.util.schema.InteractionDtoUtils; import org.apache.causeway.schema.ixn.v2.InteractionDto; +import jakarta.annotation.Priority; +import jakarta.inject.Named; import lombok.extern.log4j.Log4j2; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/queryresultscache/QueryResultsCache.java b/api/applib/src/main/java/org/apache/causeway/applib/services/queryresultscache/QueryResultsCache.java index 5c4425744b..9eaf870168 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/queryresultscache/QueryResultsCache.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/queryresultscache/QueryResultsCache.java @@ -23,9 +23,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Callable; -import javax.annotation.Priority; -import javax.inject.Named; - import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -38,6 +35,8 @@ import org.apache.causeway.commons.internal.base._Casts; import org.apache.causeway.commons.internal.base._NullSafe; import org.apache.causeway.commons.internal.collections._Maps; +import jakarta.annotation.Priority; +import jakarta.inject.Named; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/registry/InstanceByPriorityComparator.java b/api/applib/src/main/java/org/apache/causeway/applib/services/registry/InstanceByPriorityComparator.java index 922038d4dc..915cab4e2a 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/registry/InstanceByPriorityComparator.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/registry/InstanceByPriorityComparator.java @@ -20,13 +20,12 @@ package org.apache.causeway.applib.services.registry; import java.util.Comparator; -import javax.annotation.Priority; - import org.springframework.context.annotation.Primary; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.commons.internal.reflection._Reflect; +import jakarta.annotation.Priority; import lombok.val; /** @@ -44,7 +43,7 @@ public class InstanceByPriorityComparator implements Comparator<Object> { } @Override - public int compare(Object o1, Object o2) { + public int compare(final Object o1, final Object o2) { if (o1 == null) { if (o2 == null) { diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/registry/ServiceRegistry.java b/api/applib/src/main/java/org/apache/causeway/applib/services/registry/ServiceRegistry.java index e20bda5add..a979ab4ade 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/registry/ServiceRegistry.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/registry/ServiceRegistry.java @@ -24,8 +24,6 @@ import java.util.NoSuchElementException; import java.util.Optional; import java.util.stream.Stream; -import javax.annotation.Priority; - import org.apache.causeway.applib.id.LogicalType; import org.apache.causeway.commons.collections.Can; import org.apache.causeway.commons.internal._Constants; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/session/SessionLogger.java b/api/applib/src/main/java/org/apache/causeway/applib/services/session/SessionLogger.java index ca70f6ff35..ebc3e04bad 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/session/SessionLogger.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/session/SessionLogger.java @@ -21,15 +21,14 @@ package org.apache.causeway.applib.services.session; import java.util.Date; import java.util.UUID; -import javax.annotation.Priority; -import javax.inject.Named; - import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.PriorityPrecedence; +import jakarta.annotation.Priority; +import jakarta.inject.Named; import lombok.val; import lombok.extern.log4j.Log4j2; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/sitemap/SitemapServiceMenu.java b/api/applib/src/main/java/org/apache/causeway/applib/services/sitemap/SitemapServiceMenu.java index 61bd0e675d..6c3fdf14ea 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/sitemap/SitemapServiceMenu.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/sitemap/SitemapServiceMenu.java @@ -18,8 +18,6 @@ */ package org.apache.causeway.applib.services.sitemap; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; @@ -34,6 +32,8 @@ import org.apache.causeway.applib.annotation.SemanticsOf; import org.apache.causeway.applib.value.Clob; import org.apache.causeway.commons.internal.base._Strings; +import jakarta.inject.Named; + /** * Simply provides a UI to allow a site-map (obtained from {@link SitemapService}) to be downloaded. * @@ -45,7 +45,7 @@ import org.apache.causeway.commons.internal.base._Strings; named = "Prototyping", menuBar = DomainServiceLayout.MenuBar.SECONDARY ) [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) public class SitemapServiceMenu { public static final String LOGICAL_TYPE_NAME = CausewayModuleApplib.NAMESPACE + ".SitemapServiceMenu"; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/sudo/SudoService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/sudo/SudoService.java index c2dc751fe7..7418763c3c 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/sudo/SudoService.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/sudo/SudoService.java @@ -22,10 +22,6 @@ import java.util.List; import java.util.concurrent.Callable; import java.util.function.UnaryOperator; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; - import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -38,6 +34,9 @@ import org.apache.causeway.applib.services.user.RoleMemento; import org.apache.causeway.applib.services.user.UserService; import org.apache.causeway.commons.functional.ThrowingRunnable; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.val; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/swagger/Format.java b/api/applib/src/main/java/org/apache/causeway/applib/services/swagger/Format.java index 0fc5dace9a..d0d0a91f78 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/swagger/Format.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/swagger/Format.java @@ -18,11 +18,11 @@ */ package org.apache.causeway.applib.services.swagger; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Value; +import jakarta.inject.Named; + /** * The format to generate the representation of the swagger spec. * diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/swagger/Visibility.java b/api/applib/src/main/java/org/apache/causeway/applib/services/swagger/Visibility.java index eff6d580c1..2a86ec8813 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/swagger/Visibility.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/swagger/Visibility.java @@ -18,8 +18,6 @@ */ package org.apache.causeway.applib.services.swagger; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.DomainObject; @@ -28,6 +26,8 @@ import org.apache.causeway.applib.annotation.NatureOfService; import org.apache.causeway.applib.annotation.RestrictTo; import org.apache.causeway.applib.annotation.Value; +import jakarta.inject.Named; + /** * Specifies which elements of the metamodel are included within the generated * swagger spec. diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonateMenu.java b/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonateMenu.java index d1a77072b1..2e7e6b1047 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonateMenu.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonateMenu.java @@ -22,9 +22,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; @@ -39,6 +36,8 @@ import org.apache.causeway.applib.annotation.SemanticsOf; import org.apache.causeway.applib.services.factory.FactoryService; import org.apache.causeway.applib.services.message.MessageService; +import jakarta.inject.Inject; +import jakarta.inject.Named; import lombok.RequiredArgsConstructor; import lombok.val; @@ -65,7 +64,7 @@ import lombok.val; named = "Security", menuBar = DomainServiceLayout.MenuBar.TERTIARY ) [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class ImpersonateMenu { diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonateStopMenu.java b/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonateStopMenu.java index 308b11df19..af341bc43f 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonateStopMenu.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonateStopMenu.java @@ -18,9 +18,6 @@ */ package org.apache.causeway.applib.services.user; -import javax.inject.Inject; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; @@ -35,6 +32,8 @@ import org.apache.causeway.applib.annotation.RestrictTo; import org.apache.causeway.applib.annotation.SemanticsOf; import org.apache.causeway.applib.services.message.MessageService; +import jakarta.inject.Inject; +import jakarta.inject.Named; import lombok.RequiredArgsConstructor; /** @@ -60,7 +59,7 @@ import lombok.RequiredArgsConstructor; named = "Security", menuBar = DomainServiceLayout.MenuBar.TERTIARY ) [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class ImpersonateStopMenu { diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonatedUserHolder.java b/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonatedUserHolder.java index e14c841f32..11b3ff47bd 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonatedUserHolder.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/ImpersonatedUserHolder.java @@ -27,7 +27,7 @@ import java.util.Optional; * <p> * The intention is that viewers provide an implementation of this service. * Note that the Wicket viewer <i>does</i> implement this service and - * uses an {@link javax.servlet.http.HttpSession}; this will have the side-effect + * uses an {@link jakarta.servlet.http.HttpSession}; this will have the side-effect * </p> * * @since 2.0 {@index} diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/user/RoleMemento.java b/api/applib/src/main/java/org/apache/causeway/applib/services/user/RoleMemento.java index ce3399dd5d..23b8385991 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/RoleMemento.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/RoleMemento.java @@ -20,8 +20,6 @@ package org.apache.causeway.applib.services.user; import java.io.Serializable; -import javax.inject.Named; - import org.springframework.context.event.EventListener; import org.springframework.core.annotation.Order; @@ -32,6 +30,7 @@ import org.apache.causeway.applib.annotation.Nature; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.annotation.PropertyLayout; +import jakarta.inject.Named; import lombok.Getter; import lombok.NonNull; import lombok.Value; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java index caa631138d..11edcaa6c4 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java @@ -27,8 +27,6 @@ import java.util.Locale; import java.util.Objects; import java.util.stream.Stream; -import javax.inject.Named; - import org.springframework.context.event.EventListener; import org.springframework.core.annotation.Order; import org.springframework.lang.Nullable; @@ -50,6 +48,7 @@ import org.apache.causeway.applib.services.iactnlayer.InteractionContext; import org.apache.causeway.commons.collections.Can; import org.apache.causeway.commons.internal.base._Strings; +import jakarta.inject.Named; import lombok.Builder; import lombok.Getter; import lombok.NonNull; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserService.java index ff01139c70..4f952fdad3 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserService.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserService.java @@ -21,11 +21,6 @@ package org.apache.causeway.applib.services.user; import java.util.List; import java.util.Optional; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; - import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.lang.Nullable; import org.springframework.stereotype.Service; @@ -37,6 +32,10 @@ import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker; import org.apache.causeway.applib.services.sudo.SudoService; import org.apache.causeway.commons.internal.exceptions._Exceptions; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import lombok.RequiredArgsConstructor; import lombok.val; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/userui/UserMenu.java b/api/applib/src/main/java/org/apache/causeway/applib/services/userui/UserMenu.java index a3217cf2f7..f2d8a60c58 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/userui/UserMenu.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/userui/UserMenu.java @@ -18,9 +18,6 @@ */ package org.apache.causeway.applib.services.userui; -import javax.inject.Inject; -import javax.inject.Named; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; @@ -33,6 +30,8 @@ import org.apache.causeway.applib.annotation.SemanticsOf; import org.apache.causeway.applib.services.user.UserMemento; import org.apache.causeway.applib.services.user.UserService; +import jakarta.inject.Inject; +import jakarta.inject.Named; import lombok.RequiredArgsConstructor; /** @@ -47,7 +46,7 @@ import lombok.RequiredArgsConstructor; @DomainServiceLayout( menuBar = DomainServiceLayout.MenuBar.TERTIARY ) [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = { @Inject }) public class UserMenu { diff --git a/api/applib/src/main/java/org/apache/causeway/applib/util/JaxbUtil.java b/api/applib/src/main/java/org/apache/causeway/applib/util/JaxbUtil.java index f1a3b65a8f..6947c44a11 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/util/JaxbUtil.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/util/JaxbUtil.java @@ -24,22 +24,21 @@ import java.io.Reader; import java.io.StringReader; import java.io.Writer; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; - import org.apache.causeway.commons.functional.Try; import org.apache.causeway.commons.internal.resources._Resources; import org.apache.causeway.commons.internal.resources._Xml; import org.apache.causeway.commons.internal.resources._Xml.ReadOptions; import org.apache.causeway.commons.internal.resources._Xml.WriteOptions; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import lombok.NonNull; import lombok.val; import lombok.experimental.UtilityClass; /** - * Helper methods for converting {@link javax.xml.bind.annotation.XmlRootElement}-annotated class to-and-from XML. + * Helper methods for converting {@link jakarta.xml.bind.annotation.XmlRootElement}-annotated class to-and-from XML. * * <p> * For example usage, see <a href="https://github.com/causewayaddons/causeway-module-publishmq";>Causeway addons' publishmq module</a> diff --git a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/ChangesDtoUtils.java b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/ChangesDtoUtils.java index db89e68ac3..de481f9182 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/ChangesDtoUtils.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/ChangesDtoUtils.java @@ -26,15 +26,15 @@ import java.io.StringReader; import java.io.Writer; import java.nio.charset.Charset; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; - import org.apache.causeway.applib.util.JaxbUtil; import org.apache.causeway.commons.internal.resources._Resources; import org.apache.causeway.schema.chg.v2.ChangesDto; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; + /** * @since 1.x {@index} */ diff --git a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/CommandDtoUtils.java b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/CommandDtoUtils.java index 9771d7d42c..28177fa4bc 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/CommandDtoUtils.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/CommandDtoUtils.java @@ -25,11 +25,6 @@ import java.io.StringReader; import java.io.Writer; import java.nio.charset.Charset; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; - import org.apache.causeway.applib.services.bookmark.Bookmark; import org.apache.causeway.applib.util.JaxbUtil; import org.apache.causeway.commons.internal.base._Strings; @@ -41,6 +36,11 @@ import org.apache.causeway.schema.cmd.v2.ParamsDto; import org.apache.causeway.schema.common.v2.OidsDto; import org.apache.causeway.schema.common.v2.PeriodDto; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; + /** * @since 1.x {@index} */ diff --git a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionDtoUtils.java b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionDtoUtils.java index 7334ef9e69..baa07c874e 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionDtoUtils.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionDtoUtils.java @@ -29,11 +29,6 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; - import org.apache.causeway.applib.services.bookmark.Bookmark; import org.apache.causeway.applib.services.iactn.Execution; import org.apache.causeway.applib.services.iactn.Interaction; @@ -53,6 +48,11 @@ import org.apache.causeway.schema.ixn.v2.InteractionDto; import org.apache.causeway.schema.ixn.v2.MemberExecutionDto; import org.apache.causeway.schema.ixn.v2.PropertyEditDto; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; + /** * @since 1.x {@index} */ diff --git a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionsDtoUtils.java b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionsDtoUtils.java index 67ed848308..963a1ddc44 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionsDtoUtils.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionsDtoUtils.java @@ -27,17 +27,16 @@ import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; - import org.apache.causeway.applib.util.JaxbUtil; import org.apache.causeway.commons.internal.base._Strings; import org.apache.causeway.commons.internal.resources._Resources; import org.apache.causeway.schema.ixn.v2.InteractionDto; import org.apache.causeway.schema.ixn.v2.InteractionsDto; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import lombok.val; /** @@ -103,7 +102,7 @@ public final class InteractionsDtoUtils { // -- other - public static List<InteractionDto> split(InteractionsDto interactionsDto) { + public static List<InteractionDto> split(final InteractionsDto interactionsDto) { List<InteractionDto> interactionDtos = new ArrayList<>(); interactionsDto.getInteractionDto().forEach(interactionDto -> { copyVersion(interactionsDto, interactionDto); diff --git a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/MemberExecutionDtoUtils.java b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/MemberExecutionDtoUtils.java index 52b6c4fb95..98525cd7b0 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/MemberExecutionDtoUtils.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/MemberExecutionDtoUtils.java @@ -20,8 +20,6 @@ package org.apache.causeway.applib.util.schema; import java.io.Writer; -import javax.xml.bind.JAXBException; - import org.apache.causeway.commons.internal.resources._Xml; import org.apache.causeway.commons.internal.resources._Xml.WriteOptions; import org.apache.causeway.schema.common.v2.DifferenceDto; @@ -30,6 +28,7 @@ import org.apache.causeway.schema.ixn.v2.MemberExecutionDto; import org.apache.causeway.schema.ixn.v2.MetricsDto; import org.apache.causeway.schema.ixn.v2.ObjectCountsDto; +import jakarta.xml.bind.JAXBException; import lombok.NonNull; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java b/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java index 2acada6c29..67e371ebba 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java @@ -30,12 +30,6 @@ import java.util.Optional; import java.util.function.Consumer; import java.util.function.Function; -import javax.activation.MimeType; -import javax.activation.MimeTypeParseException; -import javax.inject.Named; -import javax.xml.bind.annotation.adapters.XmlAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Value; import org.apache.causeway.applib.jaxb.PrimitiveJaxbAdapters; @@ -46,6 +40,11 @@ import org.apache.causeway.commons.internal.base._Strings; import org.apache.causeway.commons.internal.exceptions._Exceptions; import org.apache.causeway.commons.internal.image._Images; +import jakarta.activation.MimeType; +import jakarta.activation.MimeTypeParseException; +import jakarta.inject.Named; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import lombok.NonNull; import lombok.SneakyThrows; import lombok.val; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/Clob.java b/api/applib/src/main/java/org/apache/causeway/applib/value/Clob.java index 80a047ab76..44287599d2 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/value/Clob.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/value/Clob.java @@ -25,17 +25,16 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Objects; -import javax.activation.MimeType; -import javax.activation.MimeTypeParseException; -import javax.inject.Named; -import javax.xml.bind.annotation.adapters.XmlAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Value; import org.apache.causeway.applib.jaxb.PrimitiveJaxbAdapters; import org.apache.causeway.commons.internal.base._Strings; +import jakarta.activation.MimeType; +import jakarta.activation.MimeTypeParseException; +import jakarta.inject.Named; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import lombok.NonNull; import lombok.SneakyThrows; import lombok.val; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/LocalResourcePath.java b/api/applib/src/main/java/org/apache/causeway/applib/value/LocalResourcePath.java index a460c5204a..26ccc6c823 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/value/LocalResourcePath.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/value/LocalResourcePath.java @@ -21,10 +21,6 @@ package org.apache.causeway.applib.value; import java.io.Serializable; import java.util.function.UnaryOperator; -import javax.inject.Named; -import javax.xml.bind.annotation.adapters.XmlAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import org.springframework.lang.Nullable; import org.apache.causeway.applib.CausewayModuleApplib; @@ -32,6 +28,9 @@ import org.apache.causeway.applib.annotation.Value; import org.apache.causeway.commons.internal.base._Blackhole; import org.apache.causeway.commons.internal.hardening._Hardening; +import jakarta.inject.Named; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import lombok.Getter; import lombok.NonNull; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/Markup.java b/api/applib/src/main/java/org/apache/causeway/applib/value/Markup.java index abfd94979d..d8b0bddf8f 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/value/Markup.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/value/Markup.java @@ -23,15 +23,14 @@ import java.nio.charset.StandardCharsets; import java.util.Base64; import java.util.stream.Collectors; -import javax.inject.Named; -import javax.xml.bind.annotation.adapters.XmlAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Value; import org.apache.causeway.commons.internal.base._Strings; import org.apache.causeway.commons.internal.base._Text; +import jakarta.inject.Named; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import lombok.EqualsAndHashCode; /** diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/NamedWithMimeType.java b/api/applib/src/main/java/org/apache/causeway/applib/value/NamedWithMimeType.java index 73a7df0e48..90be701cdf 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/value/NamedWithMimeType.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/value/NamedWithMimeType.java @@ -22,14 +22,13 @@ import java.io.Serializable; import java.util.Optional; import java.util.stream.Stream; -import javax.activation.MimeType; -import javax.activation.MimeTypeParseException; - import org.springframework.lang.Nullable; import org.apache.causeway.commons.collections.Can; import org.apache.causeway.commons.internal.base._Strings; +import jakarta.activation.MimeType; +import jakarta.activation.MimeTypeParseException; import lombok.Getter; import lombok.val; diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/Password.java b/api/applib/src/main/java/org/apache/causeway/applib/value/Password.java index 41a048abcb..bd1acb4126 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/value/Password.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/value/Password.java @@ -21,15 +21,15 @@ package org.apache.causeway.applib.value; import java.io.Serializable; import java.util.Objects; -import javax.inject.Named; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Value; import org.apache.causeway.applib.services.placeholder.PlaceholderRenderService; import org.apache.causeway.applib.services.placeholder.PlaceholderRenderService.PlaceholderLiteral; +import jakarta.inject.Named; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; + /** * Represents a password that will not displayed to the UI but can be persisted. * @@ -70,7 +70,7 @@ public class Password implements Serializable { } public static class JaxbToStringAdapter - extends javax.xml.bind.annotation.adapters.XmlAdapter<String, Password> { + extends jakarta.xml.bind.annotation.adapters.XmlAdapter<String, Password> { @Override public Password unmarshal(final String str) throws Exception { return str != null diff --git a/api/applib/src/test/java/org/apache/causeway/applib/jaxbadapters/JaxbXmlAdaptersContractTest.java b/api/applib/src/test/java/org/apache/causeway/applib/jaxbadapters/JaxbXmlAdaptersContractTest.java index fad8640e2d..96faa4aa1f 100644 --- a/api/applib/src/test/java/org/apache/causeway/applib/jaxbadapters/JaxbXmlAdaptersContractTest.java +++ b/api/applib/src/test/java/org/apache/causeway/applib/jaxbadapters/JaxbXmlAdaptersContractTest.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.applib.jaxbadapters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/api/applib/src/test/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBars_roundtrip_Test.java b/api/applib/src/test/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBars_roundtrip_Test.java index cfbd916484..038b251d2c 100644 --- a/api/applib/src/test/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBars_roundtrip_Test.java +++ b/api/applib/src/test/java/org/apache/causeway/applib/layout/menubars/bootstrap/BSMenuBars_roundtrip_Test.java @@ -16,7 +16,7 @@ */ package org.apache.causeway.applib.layout.menubars.bootstrap; -import javax.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/api/applib/src/test/java/org/apache/causeway/applib/services/jaxb/JaxbServiceTest.java b/api/applib/src/test/java/org/apache/causeway/applib/services/jaxb/JaxbServiceTest.java index 335f968779..eafb54a057 100644 --- a/api/applib/src/test/java/org/apache/causeway/applib/services/jaxb/JaxbServiceTest.java +++ b/api/applib/src/test/java/org/apache/causeway/applib/services/jaxb/JaxbServiceTest.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.applib.services.jaxb; -import javax.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach;
