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 91675c4a3a7e1be7ad6835f4eadf2ba417621ced Merge: 547dac2e16 e86d3543a0 Author: Andi Huber <[email protected]> AuthorDate: Thu Nov 17 05:23:04 2022 +0100 ISIS-3275: Merge remote-tracking branch 'origin/master' into spring6 .../ROOT/pages/2022/2.0.0-RC1/relnotes.adoc | 1 + .../proxy/_ProxyFactoryServiceAbstract.java | 3 +- .../core/config/EclipselinkConfiguration.java | 90 +++++++++++----------- .../causeway/core/metamodel/facets/Evaluators.java | 1 - ...nChoicesForCollectionParameterFacetFactory.java | 1 - .../ContributingFacetFromMixinFacetFactory.java | 1 - .../actions/layout/ActionLayoutFacetFactory.java | 1 - .../position/ActionPositionFacetAbstract.java | 1 - .../method/ActionValidationFacetViaMethod.java | 1 - .../ActionValidationFacetViaMethodFactory.java | 1 - ...MemberDescribedFacetWithStaticTextAbstract.java | 1 - .../facets/all/named/ObjectNamedFacetAbstract.java | 1 - .../all/named/ObjectNamedFacetSynthesized.java | 1 - .../CollectionAccessorFacetViaAccessor.java | 1 - .../layout/CollectionLayoutFacetFactory.java | 1 - .../annotation/SortedByFacetAnnotationFactory.java | 1 - .../metamodel/facets/fallback/TitleFacetNone.java | 1 - .../method/DisableForContextFacetViaMethod.java | 1 - .../DisableForContextFacetViaMethodFactory.java | 1 - .../group/LayoutGroupFacetForActionAnnotation.java | 1 - .../NamedFacetForMemberViaMethodFactory.java | 1 - .../DomainObjectAnnotationFacetFactory.java | 2 - .../editing/ImmutableFacetFromConfiguration.java | 1 - .../hidden/HiddenTypeFacetFromAuthorization.java | 1 - .../RemoveAnnotatedMethodsFacetFactory.java | 1 - .../RemoveDnPrefixedMethodsFacetFactory.java | 1 - .../ignore/javalang/RemoveMethodsFacetFactory.java | 1 - .../jdo/RemoveJdoPrefixedMethodsFacetFactory.java | 1 - .../IntrospectionPolicyFacetAbstract.java | 1 - .../LogicalTypeFacetFromClassNameFactory.java | 2 - .../methods/TitleFacetFromToStringMethod.java | 2 - .../ViewModelFacetForSerializableInterface.java | 1 - ...ctionParameterChoicesFacetFromChoicesFacet.java | 1 - .../annotderived/ParamDescribedFacetFromType.java | 1 - .../MandatoryFacetOnParametersDefaultFactory.java | 1 - .../PropertyAutoCompleteFacetMethodFactory.java | 1 - .../PropertyChoicesFacetFromChoicesFacet.java | 1 - .../defaults/PropertyDefaultFacetNone.java | 1 - .../validating/PropertyValidateFacetNone.java | 1 - .../core/metamodel/object/_ManagedObjectMixin.java | 1 - .../objectmanager/memento/_RecreatableLookup.java | 1 - .../progmodel/ProgrammingModelAbstract.java | 2 - .../temporal/LocalDateValueSemantics.java | 2 - .../temporal/OffsetTimeValueSemantics.java | 2 - .../temporal/ZonedDateTimeValueSemantics.java | 2 - ...notationFacetFactoryTest_commandPublishing.java | 1 - .../command/CommandExecutorServiceDefault.java | 10 --- .../wrapper/WrapperFactoryDefault.java | 2 - .../core/errorreportingservice/EmailTicket.java | 16 ++-- .../applib/job/RunBackgroundCommandsJob.java | 32 +++----- .../BackgroundService_IntegTestAbstract.java | 36 +++++---- .../integtests/BackgroundService_IntegTest.java | 21 ++--- .../integtests/BackgroundService_IntegTest.java | 9 ++- .../executionlog/applib/dom/ExecutionLogEntry.java | 1 - .../applib/dom/ExecutionOutboxEntry.java | 1 - .../restclient/integtests/RestEndpointService.java | 4 +- .../audittrail/applib/dom/AuditTrailEntry.java | 1 - .../CollectionContentsAsExcelFactory.java | 1 - .../CalendaredCollectionFactoryAbstract.java | 1 - .../PdfJsViewerFacetFromAnnotationFactory.java | 2 - .../PdfJsViewerPanelComponentFactory.java | 1 - .../facets/SseAnnotationFacetFactory.java | 1 - .../secondary/job/JobExecutionData.java | 9 +-- .../secondary/job/SecondaryStatusData.java | 1 - .../javafx/ui/components/UiComponentFactoryFx.java | 3 - .../disabling/DisablingDecoratorForButton.java | 1 - .../disabling/DisablingDecoratorForFormField.java | 1 - .../decorator/icon/IconDecoratorForMenuItem.java | 1 - .../prototyping/PrototypingDecoratorForButton.java | 3 +- .../PrototypingDecoratorForFormField.java | 1 - .../viewer/vaadin/model/decorator/Decorators.java | 6 +- .../ui/components/UiComponentFactoryVaa.java | 3 - .../metamodel/facets/entity/JdoEntityFacet.java | 1 - ...JdoDatastoreIdentityAnnotationFacetFactory.java | 1 - .../JdoPersistenceCapableFacetFactory.java | 1 - .../query/JdoQueryAnnotationFacetFactory.java | 1 - .../version/JdoVersionAnnotationFacetFactory.java | 1 - ...BigDecimalFromColumnAnnotationFacetFactory.java | 1 - ...andatoryFacetFromAbsenceOfColumnAnnotation.java | 1 - .../MandatoryFromColumnAnnotationFacetFactory.java | 1 - ...xLengthFromJdoColumnAnnotationFacetFactory.java | 1 - .../JdoNotPersistentAnnotationFacetFactory.java | 1 - .../JdoPrimaryKeyAnnotationFacetFactory.java | 1 - .../OptionalFacetFromJdoPrimaryKeyAnnotation.java | 1 - .../jpa/integration/entity/JpaEntityFacet.java | 2 - .../integration/entity/JpaEntityFacetFactory.java | 1 - ...DecimalFromJpaColumnAnnotationFacetFactory.java | 1 - ...ndatoryFromJpaColumnAnnotationFacetFactory.java | 1 - .../JpaTransientAnnotationFacetFactory.java | 1 - .../interaction/DomainObjectTesterFactory.java | 2 - .../applib/CausewayInteractionHandler.java | 1 - .../causeway/tooling/j2adoc/format/Snippets.java | 1 - .../demoshowcases/value/ValueTypeGenTemplate.java | 1 - .../ui/components/about/AboutPanelFactory.java | 1 - .../serviceactions/TertiaryMenuPanelFactory.java | 1 - .../actions/ActionParametersFormPanelFactory.java | 1 - .../actions/ActionParametersPanelFactory.java | 1 - .../CollectionContentsAsAjaxTablePanelFactory.java | 1 - .../CollectionContentsAsIconsPanelFactory.java | 1 - ...ollectionContentsMultipleViewsPanelFactory.java | 1 - .../CollectionContentsAsSummaryFactory.java | 1 - .../CollectionContentsHiddenPanelFactory.java | 1 - .../empty/EmptyCollectionPanelFactory.java | 1 - .../entity/EntityComponentFactoryAbstract.java | 1 - .../icontitle/EntityIconAndTitlePanelFactory.java | 1 - .../ui/components/footer/FooterPanelFactory.java | 1 - .../components/layout/bs/BSGridPanelFactory.java | 1 - .../scalars/ComponentFactoryScalarAbstract.java | 1 - .../ScalarPanelTextFieldTextualAbstract.java | 1 - .../scalars/image/JavaAwtImagePanelFactory.java | 1 - .../scalars/string/ScalarTitleBadgePanel.java | 1 - .../ui/components/tree/TreePanelFactories.java | 1 - .../unknown/UnknownModelPanelFactory.java | 1 - .../value/StandaloneValuePanelFactory.java | 1 - .../voidreturn/VoidReturnPanelFactory.java | 1 - .../EntityLinkSimplePanelFactory.java | 1 - .../causeway-file-upload-nesting-fix.nocompress.js | 17 +++- .../ComponentFactoryRegistrarDefault.java | 1 - 118 files changed, 120 insertions(+), 256 deletions(-) diff --cc core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/WrapperFactoryDefault.java index 180c8e84a1,0133daca74..59ae186769 --- 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 @@@ -30,15 -30,13 +30,13 @@@ import java.util.UUID import java.util.concurrent.Callable; 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; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; diff --cc extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/job/RunBackgroundCommandsJob.java index e81541f80c,1f31236783..b06e61d677 --- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/job/RunBackgroundCommandsJob.java +++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/job/RunBackgroundCommandsJob.java @@@ -1,24 -1,18 +1,18 @@@ package org.apache.causeway.extensions.commandlog.applib.job; - import lombok.RequiredArgsConstructor; - import lombok.extern.log4j.Log4j2; - import lombok.val; - - import java.sql.Timestamp; - import java.util.ArrayList; - import java.util.List; - import java.util.Optional; import java.util.UUID; - import java.util.concurrent.Callable; - import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; - import org.apache.causeway.applib.jaxb.JavaSqlJaxbAdapters; - import org.apache.causeway.applib.services.bookmark.Bookmark; + import org.quartz.DisallowConcurrentExecution; + import org.quartz.Job; + import org.quartz.JobExecutionContext; + import org.quartz.PersistJobDataAfterExecution; + import org.springframework.stereotype.Component; + import org.springframework.transaction.annotation.Propagation; + import org.apache.causeway.applib.services.command.CommandExecutorService; - import org.apache.causeway.applib.services.command.CommandOutcomeHandler; import org.apache.causeway.applib.services.iactnlayer.InteractionContext; import org.apache.causeway.applib.services.iactnlayer.InteractionService; import org.apache.causeway.applib.services.user.UserMemento; diff --cc extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/BackgroundService_IntegTestAbstract.java index 720a1e3e97,ec4589d21a..d9c59670eb --- a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/BackgroundService_IntegTestAbstract.java +++ b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/BackgroundService_IntegTestAbstract.java @@@ -18,26 -18,10 +18,10 @@@ */ package org.apache.causeway.extensions.commandlog.applib.integtest; - import lombok.SneakyThrows; - import lombok.val; - import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; - import org.apache.causeway.applib.services.command.Command; - import org.apache.causeway.core.config.environment.CausewaySystemEnvironment; - import org.apache.causeway.extensions.commandlog.applib.dom.*; - import org.apache.causeway.extensions.commandlog.applib.integtest.model.Counter; - import org.apache.causeway.extensions.commandlog.applib.integtest.model.CounterRepository; - import org.apache.causeway.extensions.commandlog.applib.integtest.model.Counter_bumpUsingMixin; - import org.apache.causeway.extensions.commandlog.applib.job.RunBackgroundCommandsJob; - import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract; - import org.apache.causeway.applib.services.bookmark.Bookmark; - import org.apache.causeway.applib.services.bookmark.BookmarkService; - import org.apache.causeway.applib.services.wrapper.WrapperFactory; - import org.apache.causeway.applib.services.wrapper.control.AsyncControl; - import org.apache.causeway.applib.services.xactn.TransactionService; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; diff --cc extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/RestEndpointService.java index 301ac8741c,311c8aa8ff..271426c7b8 --- a/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/RestEndpointService.java +++ b/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/RestEndpointService.java @@@ -20,12 -20,10 +20,10 @@@ package org.apache.causeway.extensions.executionoutbox.restclient.integtests; -import javax.inject.Inject; +import jakarta.inject.Inject; - import org.springframework.core.env.Environment; import org.springframework.stereotype.Service; - import org.apache.causeway.applib.services.iactnlayer.InteractionService; import org.apache.causeway.core.config.RestEasyConfiguration; import org.apache.causeway.core.config.viewer.web.WebAppContextPath; import org.apache.causeway.extensions.executionoutbox.restclient.api.OutboxClient;
