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 34de6de1452b908d51c9bfa62ccb2433ff8dc957 Author: Andi Huber <[email protected]> AuthorDate: Sun Nov 13 10:23:33 2022 +0100 ISIS-3275: migrate runtime-services --- .../runtimeservices/src/main/java/module-info.java | 6 ++--- .../CausewayModuleCoreRuntimeServices.java | 2 +- .../bookmarks/BookmarkServiceDefault.java | 6 ++--- .../command/CommandDtoFactoryDefault.java | 6 ++--- .../command/CommandExecutorServiceDefault.java | 6 ++--- .../command/SchemaValueMarshallerDefault.java | 6 ++--- .../runtimeservices/email/EmailServiceDefault.java | 30 ++++++++++++---------- .../eventbus/EventBusServiceSpring.java | 6 ++--- .../executor/MemberExecutorServiceDefault.java | 8 +++--- .../factory/FactoryServiceDefault.java | 8 +++--- .../homepage/HomePageResolverServiceDefault.java | 8 +++--- .../i18n/po/TranslationServicePo.java | 10 ++++---- .../i18n/po/TranslationServicePoMenu.java | 6 ++--- .../icons/ObjectIconServiceDefault.java | 6 ++--- .../interaction/InteractionDtoFactoryDefault.java | 8 +++--- .../runtimeservices/jaxb/JaxbServiceDefault.java | 16 ++++++------ .../locale/LanguageProviderDefault.java | 6 ++--- .../locale/LocaleChoiceProviderDefault.java | 6 ++--- .../menubars/MenuBarsLoaderServiceDefault.java | 6 ++--- .../MenuBarsMarshallerServiceBootstrap.java | 8 +++--- .../bootstrap/MenuBarsServiceBootstrap.java | 6 ++--- .../message/MessageServiceDefault.java | 8 +++--- .../PlaceholderRenderServiceDefault.java | 6 ++--- .../publish/CommandPublisherDefault.java | 6 ++--- .../publish/EntityChangesPublisherDefault.java | 8 +++--- .../EntityPropertyChangePublisherDefault.java | 10 ++++---- .../publish/ExecutionPublisherDefault.java | 8 +++--- .../publish/LifecycleCallbackNotifier.java | 6 ++--- .../publish/ObjectLifecyclePublisherDefault.java | 8 +++--- .../ExceptionRecognizerServiceDefault.java | 6 ++--- .../ExceptionRecognizerForDataAccessException.java | 6 ++--- .../repository/RepositoryServiceDefault.java | 6 ++--- .../routing/RoutingServiceDefault.java | 6 ++--- .../scratchpad/ScratchpadDefault.java | 4 +-- .../serializing/SerializingAdapterDefault.java | 6 ++--- .../session/InteractionServiceDefault.java | 8 +++--- .../sitemap/SitemapServiceDefault.java | 6 ++--- .../runtimeservices/spring/SpringBeansService.java | 6 ++--- .../transaction/TransactionServiceSpring.java | 6 ++--- .../UrlEncodingServiceWithCompression.java | 4 +-- .../user/ImpersonateMenuAdvisorDefault.java | 4 +-- .../user/ImpersonatedUserHolderDefault.java | 6 ++--- .../UserCurrentSessionTimeZoneHolderDefault.java | 6 ++--- .../userreg/EmailNotificationServiceDefault.java | 8 +++--- .../wrapper/WrapperFactoryDefault.java | 10 ++++---- .../runtimeservices/xml/XmlServiceDefault.java | 4 +-- .../xmlsnapshot/XmlSnapshotServiceDefault.java | 6 ++--- .../runtimeservices/menubars/bootstrap/Bar.java | 2 +- 48 files changed, 171 insertions(+), 169 deletions(-) diff --git a/core/runtimeservices/src/main/java/module-info.java b/core/runtimeservices/src/main/java/module-info.java index 69986102e3..8de6f638f0 100644 --- a/core/runtimeservices/src/main/java/module-info.java +++ b/core/runtimeservices/src/main/java/module-info.java @@ -57,12 +57,12 @@ module org.apache.causeway.core.runtimeservices { requires commons.email; requires jakarta.activation; requires jakarta.mail; - requires java.annotation; + requires jakarta.annotation; requires java.desktop; requires java.sql; requires java.xml; - requires java.xml.bind; - requires java.inject; + requires jakarta.xml.bind; + requires jakarta.inject; requires lombok; requires org.apache.causeway.applib; requires org.apache.causeway.commons; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/CausewayModuleCoreRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/CausewayModuleCoreRuntimeServices.java index 6fd8fbdacb..c2628b3c6a 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/CausewayModuleCoreRuntimeServices.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/CausewayModuleCoreRuntimeServices.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.core.runtimeservices; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/bookmarks/BookmarkServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/bookmarks/BookmarkServiceDefault.java index a88f244ecb..6c80672c99 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/bookmarks/BookmarkServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/bookmarks/BookmarkServiceDefault.java @@ -20,9 +20,9 @@ package org.apache.causeway.core.runtimeservices.bookmarks; import java.util.Optional; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.lang.Nullable; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/CommandDtoFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/CommandDtoFactoryDefault.java index 6323ca3bb3..99a27e82d8 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/CommandDtoFactoryDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/CommandDtoFactoryDefault.java @@ -20,9 +20,9 @@ package org.apache.causeway.core.runtimeservices.command; import java.util.UUID; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/CommandExecutorServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/CommandExecutorServiceDefault.java index c536c815e0..5bf77848f5 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/CommandExecutorServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/CommandExecutorServiceDefault.java @@ -25,9 +25,9 @@ import java.util.function.Consumer; import java.util.regex.Pattern; import java.util.stream.Stream; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.apache.causeway.commons.functional.Try; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/SchemaValueMarshallerDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/SchemaValueMarshallerDefault.java index 7fa07664dd..d768e4f1b5 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/SchemaValueMarshallerDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/SchemaValueMarshallerDefault.java @@ -18,9 +18,9 @@ */ package org.apache.causeway.core.runtimeservices.command; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/email/EmailServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/email/EmailServiceDefault.java index 15115cddeb..0e55baf5f1 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/email/EmailServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/email/EmailServiceDefault.java @@ -22,13 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Properties; -import javax.activation.DataSource; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; - -import org.apache.commons.mail.DefaultAuthenticator; import org.apache.commons.mail.EmailException; import org.apache.commons.mail.ImageHtmlEmail; import org.apache.commons.mail.resolver.DataSourceClassPathResolver; @@ -41,6 +34,11 @@ import org.apache.causeway.commons.internal.base._Strings; import org.apache.causeway.core.config.CausewayConfiguration; import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices; +import jakarta.activation.DataSource; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import lombok.extern.log4j.Log4j2; /** @@ -163,11 +161,12 @@ public class EmailServiceDefault implements EmailService { final int socketTimeout = getSocketTimeout(); final int socketConnectionTimeout = getSocketConnectionTimeout(); - if (senderEmailUsername != null) { - email.setAuthenticator(new DefaultAuthenticator(senderEmailUsername, senderEmailPassword)); - } else { - email.setAuthenticator(new DefaultAuthenticator(senderEmailAddress, senderEmailPassword)); - } +//TODO[ISIS-3275] commons email not available for jakarta API +// if (senderEmailUsername != null) { +// email.setAuthenticator(new DefaultAuthenticator(senderEmailUsername, senderEmailPassword)); +// } else { +// email.setAuthenticator(new DefaultAuthenticator(senderEmailAddress, senderEmailPassword)); +// } email.setHostName(senderEmailHostName); email.setSmtpPort(senderEmailPort); email.setStartTLSEnabled(senderEmailTlsEnabled); @@ -176,7 +175,9 @@ public class EmailServiceDefault implements EmailService { email.setSocketTimeout(socketTimeout); email.setSocketConnectionTimeout(socketConnectionTimeout); - final Properties properties = email.getMailSession().getProperties(); +//TODO[ISIS-3275] commons email not available for jakarta API +// final Properties properties = email.getMailSession().getProperties(); + final var properties = new Properties(); properties.put("mail.smtps.auth", "true"); properties.put("mail.debug", "true"); @@ -193,7 +194,8 @@ public class EmailServiceDefault implements EmailService { if (attachments != null && attachments.length > 0) { for (DataSource attachment : attachments) { - email.attach(attachment, attachment.getName(), ""); + //TODO[ISIS-3275] commons email not available for jakarta API + //email.attach(attachment, attachment.getName(), ""); } } diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/eventbus/EventBusServiceSpring.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/eventbus/EventBusServiceSpring.java index 6e93f3910b..5b7ee2bd09 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/eventbus/EventBusServiceSpring.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/eventbus/EventBusServiceSpring.java @@ -18,9 +18,9 @@ */ package org.apache.causeway.core.runtimeservices.eventbus; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationEventPublisher; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/executor/MemberExecutorServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/executor/MemberExecutorServiceDefault.java index b200a05bbb..4a107263bc 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/executor/MemberExecutorServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/executor/MemberExecutorServiceDefault.java @@ -21,10 +21,10 @@ package org.apache.causeway.core.runtimeservices.executor; import java.lang.reflect.Method; import java.util.Optional; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/factory/FactoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/factory/FactoryServiceDefault.java index ad94b06aa2..0b48c22eb5 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/factory/FactoryServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/factory/FactoryServiceDefault.java @@ -20,10 +20,10 @@ package org.apache.causeway.core.runtimeservices.factory; import java.util.Optional; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.lang.Nullable; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/homepage/HomePageResolverServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/homepage/HomePageResolverServiceDefault.java index 75a76e3595..327ef44538 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/homepage/HomePageResolverServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/homepage/HomePageResolverServiceDefault.java @@ -20,9 +20,9 @@ package org.apache.causeway.core.runtimeservices.homepage; import java.util.Optional; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.stereotype.Service; @@ -39,7 +39,7 @@ import lombok.val; @Service @Named(CausewayModuleCoreRuntimeServices.NAMESPACE + ".HomePageResolverServiceDefault") [email protected](PriorityPrecedence.MIDPOINT) [email protected](PriorityPrecedence.MIDPOINT) public class HomePageResolverServiceDefault implements HomePageResolverService { private final FactoryService factoryService; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/TranslationServicePo.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/TranslationServicePo.java index 8ea8edfb0d..202434e779 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/TranslationServicePo.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/TranslationServicePo.java @@ -20,11 +20,11 @@ package org.apache.causeway.core.runtimeservices.i18n.po; import java.util.Optional; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/TranslationServicePoMenu.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/TranslationServicePoMenu.java index 7d3193d458..1502e3691f 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/TranslationServicePoMenu.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/TranslationServicePoMenu.java @@ -18,8 +18,8 @@ */ package org.apache.causeway.core.runtimeservices.i18n.po; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Action; @@ -42,7 +42,7 @@ import lombok.RequiredArgsConstructor; named = "Prototyping", menuBar = DomainServiceLayout.MenuBar.SECONDARY ) [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class TranslationServicePoMenu { diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/icons/ObjectIconServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/icons/ObjectIconServiceDefault.java index b6df381570..55a717e13e 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/icons/ObjectIconServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/icons/ObjectIconServiceDefault.java @@ -22,9 +22,9 @@ import java.net.URL; import java.util.Map; import java.util.Optional; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.io.ResourceLoader; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/interaction/InteractionDtoFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/interaction/InteractionDtoFactoryDefault.java index db7235193d..5974e68d06 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/interaction/InteractionDtoFactoryDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/interaction/InteractionDtoFactoryDefault.java @@ -20,9 +20,9 @@ package org.apache.causeway.core.runtimeservices.interaction; import java.util.List; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -68,7 +68,7 @@ public class InteractionDtoFactoryDefault implements InteractionDtoFactory { @Inject private CommandDtoFactory commandDtoServiceInternal; @Inject private SchemaValueMarshaller valueMarshaller; - @Inject private javax.inject.Provider<InteractionProvider> interactionProviderProvider; + @Inject private jakarta.inject.Provider<InteractionProvider> interactionProviderProvider; @Inject private UserService userService; @Override diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/jaxb/JaxbServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/jaxb/JaxbServiceDefault.java index 84b9f9edab..32c3c4bbeb 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/jaxb/JaxbServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/jaxb/JaxbServiceDefault.java @@ -20,14 +20,14 @@ package org.apache.causeway.core.runtimeservices.jaxb; import java.util.Map; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/locale/LanguageProviderDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/locale/LanguageProviderDefault.java index 7bc0623239..cd64124c51 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/locale/LanguageProviderDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/locale/LanguageProviderDefault.java @@ -21,9 +21,9 @@ package org.apache.causeway.core.runtimeservices.locale; import java.util.Locale; import java.util.Optional; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/locale/LocaleChoiceProviderDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/locale/LocaleChoiceProviderDefault.java index 37f3172bd8..ebc1ed58ee 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/locale/LocaleChoiceProviderDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/locale/LocaleChoiceProviderDefault.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.Locale; import java.util.stream.Stream; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java index 319d518fd6..e0364dc0a9 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java @@ -24,9 +24,9 @@ import java.nio.charset.StandardCharsets; import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.io.AbstractResource; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsMarshallerServiceBootstrap.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsMarshallerServiceBootstrap.java index e6c63da24d..313a0a8d90 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsMarshallerServiceBootstrap.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsMarshallerServiceBootstrap.java @@ -20,10 +20,10 @@ package org.apache.causeway.core.runtimeservices.menubars.bootstrap; import java.util.EnumSet; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; -import javax.xml.bind.Marshaller; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.xml.bind.Marshaller; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.lang.Nullable; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java index 502e226ecd..8cbb4b7041 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java @@ -25,9 +25,9 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/message/MessageServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/message/MessageServiceDefault.java index 8a04b9fab3..4ccc1f5a6a 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/message/MessageServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/message/MessageServiceDefault.java @@ -20,10 +20,10 @@ package org.apache.causeway.core.runtimeservices.message; import java.util.Optional; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/placeholder/PlaceholderRenderServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/placeholder/PlaceholderRenderServiceDefault.java index 7c6e86e8cd..0ffde6fa0f 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/placeholder/PlaceholderRenderServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/placeholder/PlaceholderRenderServiceDefault.java @@ -18,9 +18,9 @@ */ package org.apache.causeway.core.runtimeservices.placeholder; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/CommandPublisherDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/CommandPublisherDefault.java index e56288f116..711f2b10e0 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/CommandPublisherDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/CommandPublisherDefault.java @@ -20,9 +20,9 @@ package org.apache.causeway.core.runtimeservices.publish; import java.util.List; -import javax.annotation.Priority; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.annotation.Priority; +import jakarta.inject.Named; +import jakarta.inject.Provider; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.lang.Nullable; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/EntityChangesPublisherDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/EntityChangesPublisherDefault.java index 3fcb439a2a..82310f2351 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/EntityChangesPublisherDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/EntityChangesPublisherDefault.java @@ -21,10 +21,10 @@ package org.apache.causeway.core.runtimeservices.publish; import java.util.List; import java.util.Optional; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.lang.Nullable; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/EntityPropertyChangePublisherDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/EntityPropertyChangePublisherDefault.java index 8d9996a54c..484049fafe 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/EntityPropertyChangePublisherDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/EntityPropertyChangePublisherDefault.java @@ -20,11 +20,11 @@ package org.apache.causeway.core.runtimeservices.publish; import java.util.List; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.lang.Nullable; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/ExecutionPublisherDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/ExecutionPublisherDefault.java index 525f4af6b6..585f17b9b3 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/ExecutionPublisherDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/ExecutionPublisherDefault.java @@ -22,10 +22,10 @@ import java.util.List; import java.util.concurrent.atomic.LongAdder; import java.util.function.Supplier; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.lang.Nullable; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/LifecycleCallbackNotifier.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/LifecycleCallbackNotifier.java index fe8092077d..b68814e116 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/LifecycleCallbackNotifier.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/LifecycleCallbackNotifier.java @@ -20,9 +20,9 @@ package org.apache.causeway.core.runtimeservices.publish; import java.util.function.UnaryOperator; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java index ae12fc6bde..ed60e5e01c 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java @@ -18,10 +18,10 @@ */ package org.apache.causeway.core.runtimeservices.publish; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.lang.Nullable; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/recognizer/ExceptionRecognizerServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/recognizer/ExceptionRecognizerServiceDefault.java index a30e8018a8..ac60d10f37 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/recognizer/ExceptionRecognizerServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/recognizer/ExceptionRecognizerServiceDefault.java @@ -20,9 +20,9 @@ package org.apache.causeway.core.runtimeservices.recognizer; import java.util.Optional; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessException.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessException.java index 43969af032..c760a914dc 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessException.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessException.java @@ -20,8 +20,8 @@ package org.apache.causeway.core.runtimeservices.recognizer.dae; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.dao.ConcurrencyFailureException; @@ -50,7 +50,7 @@ import lombok.val; */ @Service @Named(ExceptionRecognizerForDataAccessException.LOGICAL_TYPE_NAME) [email protected](PriorityPrecedence.MIDPOINT) [email protected](PriorityPrecedence.MIDPOINT) @Qualifier("Default") public class ExceptionRecognizerForDataAccessException implements ExceptionRecognizer { diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/repository/RepositoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/repository/RepositoryServiceDefault.java index efe2d4f42f..5abc86c0a5 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/repository/RepositoryServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/repository/RepositoryServiceDefault.java @@ -25,9 +25,9 @@ import java.util.Optional; import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Priority; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.lang.Nullable; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/routing/RoutingServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/routing/RoutingServiceDefault.java index bf39063b55..94b363e90d 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/routing/RoutingServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/routing/RoutingServiceDefault.java @@ -18,9 +18,9 @@ */ package org.apache.causeway.core.runtimeservices.routing; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/scratchpad/ScratchpadDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/scratchpad/ScratchpadDefault.java index 65c5defb8d..4463285b15 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/scratchpad/ScratchpadDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/scratchpad/ScratchpadDefault.java @@ -20,8 +20,8 @@ package org.apache.causeway.core.runtimeservices.scratchpad; import java.util.Map; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/serializing/SerializingAdapterDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/serializing/SerializingAdapterDefault.java index 4b94b04073..3450cd600f 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/serializing/SerializingAdapterDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/serializing/SerializingAdapterDefault.java @@ -21,9 +21,9 @@ package org.apache.causeway.core.runtimeservices.serializing; import java.io.Serializable; import java.util.Optional; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Lazy; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/session/InteractionServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/session/InteractionServiceDefault.java index 7a75891927..1ab63e2562 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/session/InteractionServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/session/InteractionServiceDefault.java @@ -27,10 +27,10 @@ import java.util.Stack; import java.util.UUID; import java.util.concurrent.Callable; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/sitemap/SitemapServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/sitemap/SitemapServiceDefault.java index 256d931e6b..c5086090fe 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/sitemap/SitemapServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/sitemap/SitemapServiceDefault.java @@ -21,9 +21,9 @@ package org.apache.causeway.core.runtimeservices.sitemap; import java.util.Optional; import java.util.Stack; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/spring/SpringBeansService.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/spring/SpringBeansService.java index 5a22fb0c82..20b18133f6 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/spring/SpringBeansService.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/spring/SpringBeansService.java @@ -21,8 +21,8 @@ package org.apache.causeway.core.runtimeservices.spring; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationContext; @@ -40,7 +40,7 @@ import lombok.experimental.UtilityClass; */ @Service @Named("causeway.sub.spring.SpringBeansService") [email protected](PriorityPrecedence.MIDPOINT) [email protected](PriorityPrecedence.MIDPOINT) @Qualifier("Default") public class SpringBeansService { diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/transaction/TransactionServiceSpring.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/transaction/TransactionServiceSpring.java index c01151740a..ce97ee5b5a 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/transaction/TransactionServiceSpring.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/transaction/TransactionServiceSpring.java @@ -23,9 +23,9 @@ import java.util.Optional; import java.util.concurrent.Callable; import java.util.concurrent.atomic.LongAdder; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.event.EventListener; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/urlencoding/UrlEncodingServiceWithCompression.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/urlencoding/UrlEncodingServiceWithCompression.java index f4f57107b7..db2046fb77 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/urlencoding/UrlEncodingServiceWithCompression.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/urlencoding/UrlEncodingServiceWithCompression.java @@ -20,8 +20,8 @@ package org.apache.causeway.core.runtimeservices.urlencoding; import java.nio.charset.StandardCharsets; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/user/ImpersonateMenuAdvisorDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/user/ImpersonateMenuAdvisorDefault.java index a2a7b44f99..6cc14446f0 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/user/ImpersonateMenuAdvisorDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/user/ImpersonateMenuAdvisorDefault.java @@ -21,7 +21,7 @@ package org.apache.causeway.core.runtimeservices.user; import java.util.Collections; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -42,7 +42,7 @@ import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeService */ @Service @Named(CausewayModuleCoreRuntimeServices.NAMESPACE + ".ImpersonateMenuAdvisorDefault") [email protected](PriorityPrecedence.LAST) [email protected](PriorityPrecedence.LAST) @Qualifier("Default") public class ImpersonateMenuAdvisorDefault implements ImpersonateMenuAdvisor { diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/user/ImpersonatedUserHolderDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/user/ImpersonatedUserHolderDefault.java index 959108db22..07d4b6685f 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/user/ImpersonatedUserHolderDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/user/ImpersonatedUserHolderDefault.java @@ -20,8 +20,8 @@ package org.apache.causeway.core.runtimeservices.user; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.stereotype.Service; @@ -33,7 +33,7 @@ import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeService @Service @Named(CausewayModuleCoreRuntimeServices.NAMESPACE + ".ImpersonatedUserHolderDefault") [email protected](PriorityPrecedence.MIDPOINT) [email protected](PriorityPrecedence.MIDPOINT) public class ImpersonatedUserHolderDefault implements ImpersonatedUserHolder { private static final String SESSION_KEY_IMPERSONATED_USER = diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/user/UserCurrentSessionTimeZoneHolderDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/user/UserCurrentSessionTimeZoneHolderDefault.java index 6504b7a3f7..80555ad53b 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/user/UserCurrentSessionTimeZoneHolderDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/user/UserCurrentSessionTimeZoneHolderDefault.java @@ -21,8 +21,8 @@ package org.apache.causeway.core.runtimeservices.user; import java.time.ZoneId; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.stereotype.Service; @@ -35,7 +35,7 @@ import lombok.NonNull; @Service @Named(CausewayModuleCoreRuntimeServices.NAMESPACE + ".UserCurrentSessionTimeZoneHolderDefault") [email protected](PriorityPrecedence.MIDPOINT) [email protected](PriorityPrecedence.MIDPOINT) public class UserCurrentSessionTimeZoneHolderDefault implements UserCurrentSessionTimeZoneHolder { diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/userreg/EmailNotificationServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/userreg/EmailNotificationServiceDefault.java index b6f6ceb7b3..6a7a040474 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/userreg/EmailNotificationServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/userreg/EmailNotificationServiceDefault.java @@ -27,10 +27,10 @@ import java.util.regex.Pattern; import static java.util.regex.Pattern.compile; import static java.util.regex.Pattern.quote; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/WrapperFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/WrapperFactoryDefault.java index 7e9ec26b4b..180c8e84a1 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/WrapperFactoryDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/WrapperFactoryDefault.java @@ -32,11 +32,11 @@ import java.util.concurrent.ExecutorService; import java.util.function.BiConsumer; import java.util.function.Function; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import org.apache.causeway.commons.functional.Try; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/xml/XmlServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/xml/XmlServiceDefault.java index 3550991ef6..dc551cb843 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/xml/XmlServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/xml/XmlServiceDefault.java @@ -21,8 +21,8 @@ package org.apache.causeway.core.runtimeservices.xml; import java.io.StringReader; import java.io.StringWriter; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerConfigurationException; diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java index 747b071d0e..fe04843ab9 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java @@ -24,9 +24,9 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.Locale; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/Bar.java b/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/Bar.java index 576701515d..e75af47c50 100644 --- a/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/Bar.java +++ b/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/Bar.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.core.runtimeservices.menubars.bootstrap; -import javax.inject.Named; +import jakarta.inject.Named; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.DomainService;
