This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch spring6 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 50af4d49c522c7d4bcf1715f7446f0118f3a1758 Author: andi-huber <[email protected]> AuthorDate: Tue Mar 12 09:08:08 2024 +0100 Merge remote-tracking branch 'origin/master' into spring6 --- .../services/command/CommandExecutorService.java | 1 - .../annotation/HomePageFacetAnnotationFactory.java | 1 - .../layout/HiddenFacetForActionLayoutXml.java | 1 - .../position/ActionPositionFacetFallback.java | 1 - .../named/MemberNamedFacetForStaticMemberName.java | 1 - .../CollectionAccessorFacetViaAccessorFactory.java | 1 - .../CssClassFacetForCollectionLayoutXml.java | 1 - .../layout/HiddenFacetForCollectionLayoutXml.java | 1 - .../layout/PagedFacetForCollectionLayoutXml.java | 1 - .../ParentedFacetSinceCollectionFactory.java | 1 - .../method/DisableForContextFacetNone.java | 1 - .../hidden/method/HideForContextFacetNone.java | 1 - .../HideForContextFacetViaMethodFactory.java | 1 - .../layout/group/LayoutGroupFacetForLayoutXml.java | 1 - .../CommandPublishingFacetForActionFallback.java | 1 - .../choices/enums/ChoicesFacetFromEnumFactory.java | 1 - ...EventDefaultFacetForDomainObjectAnnotation.java | 1 - .../editing/ImmutableFacetFromConfiguration.java | 1 - ...ookmarkPolicyFacetForDomainObjectLayoutXml.java | 1 - .../object/entity/_EntityFacetForTesting.java | 1 - .../ignore/javalang/RemoveMethodsFacetFactory.java | 1 - .../ObjectValidPropertiesFacetImplFactory.java | 1 - .../ViewModelFacetForSerializableInterface.java | 1 - .../DateRenderAdjustFacetAbstract.java | 1 - .../objectvalue/labelat/LabelAtFacetAbstract.java | 1 - .../mandatory/MandatoryFacetAbstract.java | 1 - .../ActionParameterChoicesFacetFromAction.java | 1 - .../parameter/ParameterAnnotationFacetFactory.java | 1 - ...ActionParameterSupportFacetFactoryAbstract.java | 1 - .../PropertyChoicesFacetViaMethodFactory.java | 1 - .../MandatoryFacetOnProperyDefaultFactory.java | 1 - .../MandatoryFacetForPropertyAnnotation.java | 1 - .../HiddenFacetForPropertyLayoutXml.java | 1 - .../MemberDescribedFacetForPropertyLayoutXml.java | 1 - .../RenderedAdjustedFacetForPropertyLayoutXml.java | 1 - .../TypicalLengthFacetOnPropertyFromType.java | 1 - .../PropertyValidateFacetViaMethodFactory.java | 1 - .../specimpl/ObjectSpecificationAbstract.java | 1 - .../commandlog/applib/dom/CommandLogEntry.java | 1 - .../BackgroundService_IntegTestAbstract.java | 1 - .../executionlog/applib/dom/ExecutionLogEntry.java | 1 - .../applib/dom/ExecutionOutboxEntry.java | 1 - .../audittrail/applib/dom/AuditTrailEntry.java | 1 - .../CalendaredCollectionFactoryAbstract.java | 1 - .../PdfJsViewerFacetFromAnnotationFactory.java | 2 -- .../PdfJsViewerPanelComponentFactory.java | 1 - .../facets/SseAnnotationFacetFactory.java | 1 - .../metamodel/facets/entity/JdoEntityFacet.java | 3 +-- .../CmdExecAuditSessLog_IntegTestAbstract.java | 1 - .../integtests/WrapperFactory_async_IntegTest.java | 1 - .../applib/fixturescripts/FixtureScripts.java | 1 - .../h2console/ui/webmodule/WebModuleH2Console.java | 1 - .../applib/validate/DomainModelValidator.java | 4 ---- .../causeway/tooling/j2adoc/format/Snippets.java | 1 - .../demoshowcases/value/ValueTypeGenTemplate.java | 1 - .../viewer/test/domain/UniversityModule.java | 5 ----- .../viewer/test/domain/admin/AdminMenu.java | 21 ++++++++--------- .../graphql/viewer/test/domain/dept/Grade.java | 26 ---------------------- .../viewer/test/domain/i18n/I18nCalculator.java | 6 ++--- ...sewayViewerRestfulObjectsIntegTestAbstract.java | 9 +++----- .../test/scenarios/dept/Department_IntegTest.java | 14 +++++------- .../ui/test/ComponentFactoryAbstractTest_init.java | 1 - .../collection/EntityCollectionPanelFactory.java | 1 - .../components/layout/bs/BSGridPanelFactory.java | 1 - .../ComponentFactoryRegistrarDefault.java | 1 - 65 files changed, 23 insertions(+), 123 deletions(-) diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandExecutorService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandExecutorService.java index 12a42918c7..981148cf19 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandExecutorService.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandExecutorService.java @@ -24,7 +24,6 @@ import java.util.function.BiFunction; import org.apache.causeway.applib.clock.VirtualClock; import org.apache.causeway.applib.jaxb.JavaSqlXMLGregorianCalendarMarshalling; import org.apache.causeway.applib.services.bookmark.Bookmark; -import org.apache.causeway.applib.services.command.CommandExecutorService.InteractionContextPolicy; import org.apache.causeway.applib.services.iactn.Interaction; import org.apache.causeway.applib.services.iactnlayer.InteractionContext; import org.apache.causeway.applib.services.user.UserMemento; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java index b40064923a..766c22c973 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java @@ -32,7 +32,6 @@ import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.FacetUtil; import org.apache.causeway.core.metamodel.facetapi.FeatureType; import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner; -import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext; import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; import org.apache.causeway.core.metamodel.facets.FacetedMethod; import org.apache.causeway.core.metamodel.facets.actions.homepage.HomePageFacet; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutXml.java index b3425ddc39..39ab3bf49e 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutXml.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutXml.java @@ -22,7 +22,6 @@ import java.util.Optional; import org.apache.causeway.applib.annotation.Where; import org.apache.causeway.applib.layout.component.ActionLayoutData; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.all.hide.HiddenFacet; import org.apache.causeway.core.metamodel.facets.members.hidden.HiddenFacetAbstract; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/position/ActionPositionFacetFallback.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/position/ActionPositionFacetFallback.java index b7106ca413..62c07a59f3 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/position/ActionPositionFacetFallback.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/position/ActionPositionFacetFallback.java @@ -19,7 +19,6 @@ package org.apache.causeway.core.metamodel.facets.actions.position; import org.apache.causeway.applib.annotation.ActionLayout; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; public class ActionPositionFacetFallback extends ActionPositionFacetAbstract { diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacetForStaticMemberName.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacetForStaticMemberName.java index fc2fb8d729..1c9e6def0e 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacetForStaticMemberName.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/named/MemberNamedFacetForStaticMemberName.java @@ -18,7 +18,6 @@ */ package org.apache.causeway.core.metamodel.facets.all.named; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; public class MemberNamedFacetForStaticMemberName diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java index d68c531d48..052dc70af9 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessorFactory.java @@ -29,7 +29,6 @@ import org.apache.causeway.core.metamodel.commons.MethodUtil; import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.FeatureType; import org.apache.causeway.core.metamodel.facetapi.MethodRemover; -import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext; import org.apache.causeway.core.metamodel.facets.PropertyOrCollectionIdentifyingFacetFactoryAbstract; import lombok.val; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutXml.java index ded9a4b9d1..7c2fe96f49 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutXml.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutXml.java @@ -22,7 +22,6 @@ import java.util.Optional; import org.apache.causeway.applib.layout.component.CollectionLayoutData; import org.apache.causeway.commons.internal.base._Strings; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.members.cssclass.CssClassFacet; import org.apache.causeway.core.metamodel.facets.members.cssclass.CssClassFacetSimple; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/HiddenFacetForCollectionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/HiddenFacetForCollectionLayoutXml.java index 7eddc25b15..c7262bbbcd 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/HiddenFacetForCollectionLayoutXml.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/HiddenFacetForCollectionLayoutXml.java @@ -22,7 +22,6 @@ import java.util.Optional; import org.apache.causeway.applib.annotation.Where; import org.apache.causeway.applib.layout.component.CollectionLayoutData; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.all.hide.HiddenFacet; import org.apache.causeway.core.metamodel.facets.members.hidden.HiddenFacetAbstract; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutXml.java index c1c9f91a8c..2f88d757bb 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutXml.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutXml.java @@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.collections.layout; import java.util.Optional; import org.apache.causeway.applib.layout.component.CollectionLayoutData; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.object.paged.PagedFacet; import org.apache.causeway.core.metamodel.facets.object.paged.PagedFacetAbstract; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/parented/ParentedFacetSinceCollectionFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/parented/ParentedFacetSinceCollectionFactory.java index 7a6f0a3fb2..4bf7cf6d0e 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/parented/ParentedFacetSinceCollectionFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/parented/ParentedFacetSinceCollectionFactory.java @@ -23,7 +23,6 @@ import jakarta.inject.Inject; import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.FacetUtil; import org.apache.causeway.core.metamodel.facetapi.FeatureType; -import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext; import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; import org.apache.causeway.core.metamodel.facets.collections.CollectionFacet; import org.apache.causeway.core.metamodel.facets.collections.javautilcollection.CollectionFacetFactory; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetNone.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetNone.java index 61fad59e59..e9efc58671 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetNone.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetNone.java @@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.members.disabled.method; import java.util.Optional; import org.apache.causeway.core.metamodel.consent.Consent.VetoReason; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.interactions.UsabilityContext; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/method/HideForContextFacetNone.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/method/HideForContextFacetNone.java index 0ffc81a8a7..463804cb27 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/method/HideForContextFacetNone.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/method/HideForContextFacetNone.java @@ -18,7 +18,6 @@ */ package org.apache.causeway.core.metamodel.facets.members.hidden.method; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.interactions.VisibilityContext; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java index df6f8d1800..d857fb2f99 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java @@ -23,7 +23,6 @@ import jakarta.inject.Inject; import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.MemberSupportPrefix; import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.FeatureType; -import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext; import org.apache.causeway.core.metamodel.facets.members.support.MemberSupportFacetFactoryAbstract; import org.apache.causeway.core.metamodel.methods.MethodFinder; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/layout/group/LayoutGroupFacetForLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/layout/group/LayoutGroupFacetForLayoutXml.java index b148d1b5c8..4ed1f6f0d6 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/layout/group/LayoutGroupFacetForLayoutXml.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/layout/group/LayoutGroupFacetForLayoutXml.java @@ -23,7 +23,6 @@ import java.util.Optional; import org.springframework.lang.Nullable; import org.apache.causeway.applib.layout.component.FieldSet; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import lombok.NonNull; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionFallback.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionFallback.java index 4c535a17a5..9c254341e9 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionFallback.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionFallback.java @@ -19,7 +19,6 @@ package org.apache.causeway.core.metamodel.facets.members.publish.command; import org.apache.causeway.applib.services.inject.ServiceInjector; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; public class CommandPublishingFacetForActionFallback extends CommandPublishingFacetAbstract { diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/choices/enums/ChoicesFacetFromEnumFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/choices/enums/ChoicesFacetFromEnumFactory.java index 452064a0be..e787cfbbaf 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/choices/enums/ChoicesFacetFromEnumFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/choices/enums/ChoicesFacetFromEnumFactory.java @@ -22,7 +22,6 @@ import jakarta.inject.Inject; import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.FeatureType; -import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext; import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; import lombok.val; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/domainevents/PropertyDomainEventDefaultFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/domainevents/PropertyDomainEventDefaultFacetForDomainObjectAnnotation.java index 124399d3e8..3827e1f7a9 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/domainevents/PropertyDomainEventDefaultFacetForDomainObjectAnnotation.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/domainevents/PropertyDomainEventDefaultFacetForDomainObjectAnnotation.java @@ -24,7 +24,6 @@ import org.apache.causeway.applib.events.domain.PropertyDomainEvent; import org.apache.causeway.core.metamodel.facetapi.Facet; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.DomainEventFacetAbstract; -import org.apache.causeway.core.metamodel.facets.DomainEventFacetAbstract.EventTypeOrigin; import org.apache.causeway.core.metamodel.facets.actions.action.invocation.ActionDomainEventFacet; /** diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java index 4525d2e9c3..f9a0a38231 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetFromConfiguration.java @@ -19,7 +19,6 @@ package org.apache.causeway.core.metamodel.facets.object.domainobject.editing; import org.apache.causeway.core.metamodel.consent.Consent.VetoReason; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.object.immutable.ImmutableFacet; import org.apache.causeway.core.metamodel.facets.object.immutable.ImmutableFacetAbstract; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectLayoutXml.java index 2477348aa4..de5983adfa 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectLayoutXml.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectLayoutXml.java @@ -23,7 +23,6 @@ import java.util.Optional; import org.apache.causeway.applib.annotation.BookmarkPolicy; import org.apache.causeway.applib.layout.component.DomainObjectLayoutData; import org.apache.causeway.core.metamodel.facetapi.Facet; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet; import org.apache.causeway.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetAbstract; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/entity/_EntityFacetForTesting.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/entity/_EntityFacetForTesting.java index 44c6e26ffb..38ba7c8848 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/entity/_EntityFacetForTesting.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/entity/_EntityFacetForTesting.java @@ -29,7 +29,6 @@ import org.apache.causeway.commons.collections.Can; import org.apache.causeway.commons.internal.exceptions._Exceptions; import org.apache.causeway.core.config.beans.PersistenceStack; import org.apache.causeway.core.metamodel.facetapi.Facet; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.object.ManagedObject; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java index 864bd51bd2..4b2af8327d 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java @@ -27,7 +27,6 @@ import org.apache.causeway.commons.internal.reflection._Reflect; import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.Facet; import org.apache.causeway.core.metamodel.facetapi.FeatureType; -import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext; import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; import org.apache.causeway.core.metamodel.spec.ObjectSpecification; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImplFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImplFactory.java index 856c77dc71..512ffb1028 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImplFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImplFactory.java @@ -22,7 +22,6 @@ import jakarta.inject.Inject; import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.FeatureType; -import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext; import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; public class ObjectValidPropertiesFacetImplFactory diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForSerializableInterface.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForSerializableInterface.java index 1056eb3f17..b0dcf7a6e1 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForSerializableInterface.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForSerializableInterface.java @@ -29,7 +29,6 @@ import java.util.Optional; import org.apache.causeway.applib.services.bookmark.Bookmark; import org.apache.causeway.commons.internal.base._Bytes; import org.apache.causeway.commons.internal.base._Strings; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.object.ManagedObject; import org.apache.causeway.core.metamodel.spec.ObjectSpecification; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/daterenderedadjust/DateRenderAdjustFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/daterenderedadjust/DateRenderAdjustFacetAbstract.java index 1d32eeafd2..4a8f98a0f6 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/daterenderedadjust/DateRenderAdjustFacetAbstract.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/daterenderedadjust/DateRenderAdjustFacetAbstract.java @@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.objectvalue.daterenderedadjust import java.util.function.BiConsumer; import org.apache.causeway.core.metamodel.facetapi.Facet; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetAbstract; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/labelat/LabelAtFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/labelat/LabelAtFacetAbstract.java index 4aa5e0fdbe..40fe33231e 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/labelat/LabelAtFacetAbstract.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/labelat/LabelAtFacetAbstract.java @@ -22,7 +22,6 @@ import java.util.function.BiConsumer; import org.apache.causeway.applib.annotation.LabelPosition; import org.apache.causeway.core.metamodel.facetapi.Facet; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetAbstract; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java index 323c855b23..0ab89fb336 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java @@ -32,7 +32,6 @@ import org.apache.causeway.commons.internal.primitives._Ints; import org.apache.causeway.commons.internal.primitives._Ints.Range; import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants; import org.apache.causeway.core.metamodel.facetapi.Facet; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetAbstract; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.interactions.ActionArgValidityContext; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromAction.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromAction.java index 038e1990f3..73d244099e 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromAction.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromAction.java @@ -23,7 +23,6 @@ import java.util.Optional; import org.apache.causeway.commons.collections.Can; import org.apache.causeway.commons.internal.assertions._Assert; import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.actions.action.choicesfrom.ChoicesFromFacet; import org.apache.causeway.core.metamodel.facets.collections.CollectionFacet; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java index fc5a3689bc..d7baa9a1d3 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java @@ -24,7 +24,6 @@ import jakarta.validation.constraints.Pattern; import org.apache.causeway.applib.annotation.Parameter; import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.FeatureType; -import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessParameterContext; import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; import org.apache.causeway.core.metamodel.facets.param.ascii.AsciiFacetForParameterAnnotation; import org.apache.causeway.core.metamodel.facets.param.parameter.fileaccept.FileAcceptFacetForParameterAnnotation; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/support/ActionParameterSupportFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/support/ActionParameterSupportFacetFactoryAbstract.java index dc9a90d024..e4988d6dbc 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/support/ActionParameterSupportFacetFactoryAbstract.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/support/ActionParameterSupportFacetFactoryAbstract.java @@ -24,7 +24,6 @@ import org.apache.causeway.commons.collections.Can; import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.MemberSupportPrefix; import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.FeatureType; -import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext; import org.apache.causeway.core.metamodel.facets.FacetedMethodParameter; import org.apache.causeway.core.metamodel.facets.ParameterSupport; import org.apache.causeway.core.metamodel.facets.ParameterSupport.ParamSupportingMethodSearchRequest; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java index 7f175c2d6b..de2109202c 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java @@ -23,7 +23,6 @@ import jakarta.inject.Inject; import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.MemberSupportPrefix; import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.FeatureType; -import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext; import org.apache.causeway.core.metamodel.facets.members.support.MemberSupportFacetFactoryAbstract; import org.apache.causeway.core.metamodel.methods.MethodFinder; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/mandatory/dflt/MandatoryFacetOnProperyDefaultFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/mandatory/dflt/MandatoryFacetOnProperyDefaultFactory.java index 1872111557..5badcb5ff8 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/mandatory/dflt/MandatoryFacetOnProperyDefaultFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/mandatory/dflt/MandatoryFacetOnProperyDefaultFactory.java @@ -24,7 +24,6 @@ import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.FacetUtil; import org.apache.causeway.core.metamodel.facetapi.FeatureType; import org.apache.causeway.core.metamodel.facets.FacetFactory; -import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext; import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; import org.apache.causeway.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet; import org.apache.causeway.core.metamodel.facets.objectvalue.mandatory.MandatoryFacetDefault; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/mandatory/MandatoryFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/mandatory/MandatoryFacetForPropertyAnnotation.java index 3c6e560590..572a39e5d0 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/mandatory/MandatoryFacetForPropertyAnnotation.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/mandatory/MandatoryFacetForPropertyAnnotation.java @@ -22,7 +22,6 @@ import org.apache.causeway.applib.annotation.Optionality; import org.apache.causeway.applib.annotation.Property; import org.apache.causeway.commons.internal.reflection._MethodFacades.MethodFacade; import org.apache.causeway.core.metamodel.facetapi.Facet; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet; import org.apache.causeway.core.metamodel.facets.objectvalue.mandatory.MandatoryFacetAbstract; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyLayoutXml.java index a1e9be730a..2e3ded06dd 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyLayoutXml.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyLayoutXml.java @@ -22,7 +22,6 @@ import java.util.Optional; import org.apache.causeway.applib.annotation.Where; import org.apache.causeway.applib.layout.component.PropertyLayoutData; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.all.hide.HiddenFacet; import org.apache.causeway.core.metamodel.facets.members.hidden.HiddenFacetAbstract; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/MemberDescribedFacetForPropertyLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/MemberDescribedFacetForPropertyLayoutXml.java index f3cc4d2bf0..9919682538 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/MemberDescribedFacetForPropertyLayoutXml.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/MemberDescribedFacetForPropertyLayoutXml.java @@ -22,7 +22,6 @@ import java.util.Optional; import org.apache.causeway.applib.layout.component.PropertyLayoutData; import org.apache.causeway.commons.internal.base._Strings; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.all.described.MemberDescribedFacet; import org.apache.causeway.core.metamodel.facets.all.described.MemberDescribedFacetWithStaticTextAbstract; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutXml.java index 594f25d943..0bda7c5cb7 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutXml.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutXml.java @@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.properties.propertylayout; import java.util.Optional; import org.apache.causeway.applib.layout.component.PropertyLayoutData; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.objectvalue.daterenderedadjust.DateRenderAdjustFacet; import org.apache.causeway.core.metamodel.facets.objectvalue.daterenderedadjust.DateRenderAdjustFacetAbstract; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyFromType.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyFromType.java index 4f7728170f..9abe7bb098 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyFromType.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyFromType.java @@ -20,7 +20,6 @@ package org.apache.causeway.core.metamodel.facets.properties.typicallen.fromtype import java.util.function.BiConsumer; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.FacetedMethod; import org.apache.causeway.core.metamodel.facets.objectvalue.multiline.MultiLineFacet; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java index ca5480dda2..e7e8177c67 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java @@ -23,7 +23,6 @@ import jakarta.inject.Inject; import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.MemberSupportPrefix; import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.FeatureType; -import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext; import org.apache.causeway.core.metamodel.facets.members.support.MemberSupportFacetFactoryAbstract; import org.apache.causeway.core.metamodel.methods.MethodFinder; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java index a53e0287ca..e66d4fdd75 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java @@ -81,7 +81,6 @@ import org.apache.causeway.core.metamodel.interactions.ObjectValidityContext; import org.apache.causeway.core.metamodel.object.ManagedObject; import org.apache.causeway.core.metamodel.object.ManagedObjects; import org.apache.causeway.core.metamodel.spec.ActionScope; -import org.apache.causeway.core.metamodel.spec.Hierarchical.Depth; import org.apache.causeway.core.metamodel.spec.IntrospectionState; import org.apache.causeway.core.metamodel.spec.ObjectSpecification; import org.apache.causeway.core.metamodel.spec.feature.MixedIn; diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.java index 64ed5222e5..01d32f2da0 100644 --- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.java +++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.java @@ -52,7 +52,6 @@ import org.apache.causeway.applib.annotation.Publishing; import org.apache.causeway.applib.annotation.Where; import org.apache.causeway.applib.jaxb.JavaSqlXMLGregorianCalendarMarshalling; import org.apache.causeway.applib.mixins.system.DomainChangeRecord; -import org.apache.causeway.applib.mixins.system.DomainChangeRecord.ChangeType; import org.apache.causeway.applib.mixins.system.HasInteractionId; import org.apache.causeway.applib.services.bookmark.Bookmark; import org.apache.causeway.applib.services.command.Command; diff --git 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 index 574a4e75d6..218bf226d0 100644 --- 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 @@ -32,7 +32,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.quartz.JobExecutionContext; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertThat; import org.springframework.transaction.annotation.Propagation; diff --git a/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/dom/ExecutionLogEntry.java b/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/dom/ExecutionLogEntry.java index 9748b2b69d..913f904746 100644 --- a/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/dom/ExecutionLogEntry.java +++ b/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/dom/ExecutionLogEntry.java @@ -46,7 +46,6 @@ import org.apache.causeway.applib.annotation.Property; import org.apache.causeway.applib.annotation.Publishing; import org.apache.causeway.applib.annotation.ValueSemantics; import org.apache.causeway.applib.mixins.system.DomainChangeRecord; -import org.apache.causeway.applib.mixins.system.DomainChangeRecord.ChangeType; import org.apache.causeway.applib.mixins.system.HasInteractionId; import org.apache.causeway.applib.mixins.system.HasInteractionIdAndSequence; import org.apache.causeway.applib.services.bookmark.Bookmark; diff --git a/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java b/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java index a739156c2d..bd75a2809e 100644 --- a/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java +++ b/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java @@ -47,7 +47,6 @@ import org.apache.causeway.applib.annotation.PropertyLayout; import org.apache.causeway.applib.annotation.Publishing; import org.apache.causeway.applib.annotation.Where; import org.apache.causeway.applib.mixins.system.DomainChangeRecord; -import org.apache.causeway.applib.mixins.system.DomainChangeRecord.ChangeType; import org.apache.causeway.applib.mixins.system.HasInteractionId; import org.apache.causeway.applib.mixins.system.HasInteractionIdAndSequence; import org.apache.causeway.applib.services.bookmark.Bookmark; diff --git a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntry.java b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntry.java index 2c81b870b6..8459230c72 100644 --- a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntry.java +++ b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntry.java @@ -38,7 +38,6 @@ import org.apache.causeway.applib.annotation.PropertyLayout; import org.apache.causeway.applib.annotation.Publishing; import org.apache.causeway.applib.annotation.Where; import org.apache.causeway.applib.mixins.system.DomainChangeRecord; -import org.apache.causeway.applib.mixins.system.DomainChangeRecord.ChangeType; import org.apache.causeway.applib.mixins.system.HasInteractionId; import org.apache.causeway.applib.mixins.system.HasInteractionIdAndSequence; import org.apache.causeway.applib.services.bookmark.Bookmark; diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/CalendaredCollectionFactoryAbstract.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/CalendaredCollectionFactoryAbstract.java index 07fefcf30f..d7ee7c13b1 100644 --- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/CalendaredCollectionFactoryAbstract.java +++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/CalendaredCollectionFactoryAbstract.java @@ -26,7 +26,6 @@ import org.apache.causeway.core.metamodel.spec.ObjectSpecification; import org.apache.causeway.viewer.commons.model.components.UiComponentType; import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel; import org.apache.causeway.viewer.wicket.ui.CollectionContentsAsFactory; -import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice; import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract; public abstract class CalendaredCollectionFactoryAbstract<T> diff --git a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotationFactory.java b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotationFactory.java index ecdb795276..c2761c98cf 100644 --- a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotationFactory.java +++ b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/causeway/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotationFactory.java @@ -26,8 +26,6 @@ import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.FacetUtil; import org.apache.causeway.core.metamodel.facetapi.FeatureType; import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner; -import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext; -import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessParameterContext; import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel; import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailureUtils; diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanelComponentFactory.java b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanelComponentFactory.java index 95473c0c5a..09b9231bbe 100644 --- a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanelComponentFactory.java +++ b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanelComponentFactory.java @@ -29,7 +29,6 @@ import org.apache.causeway.core.metamodel.object.ManagedObject; import org.apache.causeway.extensions.pdfjs.metamodel.facet.PdfJsViewerFacet; import org.apache.causeway.viewer.commons.model.components.UiComponentType; import org.apache.causeway.viewer.wicket.model.models.ScalarModel; -import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice; import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract; import lombok.val; diff --git a/extensions/vw/sse/metamodel/src/main/java/org/apache/causeway/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java b/extensions/vw/sse/metamodel/src/main/java/org/apache/causeway/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java index 6d2137764e..3276a72d31 100644 --- a/extensions/vw/sse/metamodel/src/main/java/org/apache/causeway/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java +++ b/extensions/vw/sse/metamodel/src/main/java/org/apache/causeway/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java @@ -26,7 +26,6 @@ import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.FacetUtil; import org.apache.causeway.core.metamodel.facetapi.FeatureType; import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner; -import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext; import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel; import org.apache.causeway.extensions.sse.applib.annotations.ServerSentEvents; diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java index 1cab780e18..c7bfdef422 100644 --- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java +++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java @@ -55,7 +55,6 @@ import org.apache.causeway.core.config.beans.PersistenceStack; import org.apache.causeway.core.metamodel.facetapi.FacetAbstract; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.object.entity.EntityFacet; -import org.apache.causeway.core.metamodel.facets.object.entity.EntityFacet.PrimaryKeyType; import org.apache.causeway.core.metamodel.facets.object.entity.EntityOrmMetadata; import org.apache.causeway.core.metamodel.object.ManagedObject; import org.apache.causeway.core.metamodel.objectmanager.ObjectManager; @@ -372,7 +371,7 @@ implements EntityFacet { } @Override - public Object versionOf(Object pojo) { + public Object versionOf(final Object pojo) { if (getEntityState(pojo).isAttached()) { return JDOHelper.getVersion(pojo); } diff --git a/regressiontests/cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java b/regressiontests/cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java index d1032e3355..edf3589619 100644 --- a/regressiontests/cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java +++ b/regressiontests/cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java @@ -28,7 +28,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertThat; import org.apache.causeway.applib.mixins.system.DomainChangeRecord; import org.apache.causeway.applib.services.bookmark.Bookmark; diff --git a/regressiontests/core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/WrapperFactory_async_IntegTest.java b/regressiontests/core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/WrapperFactory_async_IntegTest.java index 6270b8b772..832bcf04ed 100644 --- a/regressiontests/core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/WrapperFactory_async_IntegTest.java +++ b/regressiontests/core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/WrapperFactory_async_IntegTest.java @@ -33,7 +33,6 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.causeway.applib.services.bookmark.Bookmark; diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java index 524e59a37b..e099c6970d 100644 --- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java +++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java @@ -60,7 +60,6 @@ import org.apache.causeway.commons.internal.exceptions._Exceptions; import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib; import org.apache.causeway.testing.fixtures.applib.events.FixturesInstalledEvent; import org.apache.causeway.testing.fixtures.applib.events.FixturesInstallingEvent; -import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript.ExecutionContext; import org.apache.causeway.testing.fixtures.applib.personas.BuilderScriptAbstract; import org.apache.causeway.testing.fixtures.applib.personas.PersonaWithBuilderScript; diff --git a/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java b/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java index a7ecda92f0..ae090a2d09 100644 --- a/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java +++ b/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java @@ -43,7 +43,6 @@ import org.apache.causeway.core.config.environment.CausewaySystemEnvironment; import org.apache.causeway.core.security.authentication.standard.RandomCodeGenerator; import org.apache.causeway.core.webapp.modules.WebModuleAbstract; import org.apache.causeway.core.webapp.modules.WebModuleContext; -import org.apache.causeway.testing.h2console.ui.webmodule.WebModuleH2Console.H2WebServlet; import lombok.Getter; import lombok.val; diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java index 43e8d68b27..7056b8ce1a 100644 --- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java +++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java @@ -31,12 +31,8 @@ import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.opentest4j.AssertionFailedError; -import static org.assertj.core.api.Assertions.filter; - import org.springframework.lang.Nullable; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.log; - import org.apache.causeway.applib.Identifier; import org.apache.causeway.applib.exceptions.unrecoverable.DomainModelException; import org.apache.causeway.applib.services.registry.ServiceRegistry; diff --git a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/Snippets.java b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/Snippets.java index 6682e68fd0..0d839c9e66 100644 --- a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/Snippets.java +++ b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/Snippets.java @@ -26,7 +26,6 @@ import com.github.javaparser.ast.nodeTypes.NodeWithJavadoc; import org.apache.causeway.commons.collections.Can; import org.apache.causeway.tooling.j2adoc.J2AdocContext; import org.apache.causeway.tooling.j2adoc.J2AdocUnit; -import org.apache.causeway.tooling.j2adoc.format.Snippets.Callout; import org.apache.causeway.tooling.javamodel.ast.AnnotationMemberDeclarations; import org.apache.causeway.tooling.javamodel.ast.ConstructorDeclarations; import org.apache.causeway.tooling.javamodel.ast.EnumConstantDeclarations; diff --git a/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java b/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java index 7682562a93..138da90ca7 100644 --- a/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java +++ b/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java @@ -34,7 +34,6 @@ import org.apache.causeway.commons.internal.base._Strings; import org.apache.causeway.commons.internal.exceptions._Exceptions; import org.apache.causeway.commons.io.FileUtils; import org.apache.causeway.commons.io.TextUtils; -import org.apache.causeway.tooling.metaprog.demoshowcases.value.ValueTypeGenTemplate.TemplateVariant; import lombok.Builder; import lombok.Getter; diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/UniversityModule.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/UniversityModule.java index b33257e149..1d163cd829 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/UniversityModule.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/UniversityModule.java @@ -18,16 +18,11 @@ */ package org.apache.causeway.viewer.graphql.viewer.test.domain; -import jakarta.inject.Inject; - import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript; -import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures; - @Configuration @ComponentScan @EnableJpaRepositories diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/admin/AdminMenu.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/admin/AdminMenu.java index 66509fff79..16aa679095 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/admin/AdminMenu.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/admin/AdminMenu.java @@ -18,19 +18,20 @@ */ package org.apache.causeway.viewer.graphql.viewer.test.domain.admin; -import lombok.RequiredArgsConstructor; - -import java.util.List; - import jakarta.annotation.Priority; import jakarta.inject.Inject; import jakarta.inject.Named; -import org.apache.causeway.applib.annotation.*; - +import org.apache.causeway.applib.annotation.Action; +import org.apache.causeway.applib.annotation.ActionLayout; +import org.apache.causeway.applib.annotation.DomainService; +import org.apache.causeway.applib.annotation.NatureOfService; +import org.apache.causeway.applib.annotation.PriorityPrecedence; +import org.apache.causeway.applib.annotation.SemanticsOf; +import org.apache.causeway.applib.annotation.Where; import org.apache.causeway.commons.internal.base._Strings; -import org.springframework.lang.Nullable; +import lombok.RequiredArgsConstructor; @Named("university.admin.AdminMenu") @DomainService(nature=NatureOfService.VIEW) @@ -54,19 +55,19 @@ public class AdminMenu { @Action(semantics = SemanticsOf.NON_IDEMPOTENT) - public void actionWithDisabledParam(String firstParam, String secondParam, String thirdParameter) { + public void actionWithDisabledParam(final String firstParam, final String secondParam, final String thirdParameter) { } public String disable0ActionWithDisabledParam() { return "yup, disabled!"; } - public String disable2ActionWithDisabledParam(String firstParam, String secondParam) { + public String disable2ActionWithDisabledParam(final String firstParam, final String secondParam) { return _Strings.isNullOrEmpty(secondParam) ? null : "Disabled because secondParam is not empty"; } @Action(semantics = SemanticsOf.NON_IDEMPOTENT) - public void actionWithHiddenParam(String firstParam, String secondParam) { + public void actionWithHiddenParam(final String firstParam, final String secondParam) { } public boolean hide0ActionWithHiddenParam() { return true; diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/Grade.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/Grade.java index 4393d9b3ad..484ff0940c 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/Grade.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/Grade.java @@ -18,32 +18,6 @@ */ package org.apache.causeway.viewer.graphql.viewer.test.domain.dept; -import java.util.Comparator; -import java.util.List; -import java.util.stream.Collectors; - -import jakarta.inject.Inject; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.OneToOne; -import jakarta.persistence.Table; -import jakarta.persistence.Transient; - -import org.apache.causeway.applib.annotation.Action; -import org.apache.causeway.applib.annotation.DomainObject; -import org.apache.causeway.applib.annotation.Nature; -import org.apache.causeway.applib.annotation.Property; -import org.apache.causeway.applib.annotation.SemanticsOf; - -import static org.apache.causeway.applib.annotation.Editing.ENABLED; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - public enum Grade { PROFESSOR, diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/i18n/I18nCalculator.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/i18n/I18nCalculator.java index 4e4db46f22..77c8b39bbd 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/i18n/I18nCalculator.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/i18n/I18nCalculator.java @@ -1,8 +1,8 @@ package org.apache.causeway.viewer.graphql.viewer.test.domain.i18n; -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.applib.annotation.Action; import org.apache.causeway.applib.annotation.DomainService; diff --git a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/CausewayViewerRestfulObjectsIntegTestAbstract.java b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/CausewayViewerRestfulObjectsIntegTestAbstract.java index 62253ef708..fd91c31a00 100644 --- a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/CausewayViewerRestfulObjectsIntegTestAbstract.java +++ b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/CausewayViewerRestfulObjectsIntegTestAbstract.java @@ -26,11 +26,6 @@ import jakarta.inject.Inject; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.causeway.core.config.presets.CausewayPresets; -import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib; - -import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy; - import org.approvaltests.Approvals; import org.approvaltests.core.Options; import org.junit.jupiter.api.BeforeEach; @@ -53,13 +48,15 @@ import org.springframework.test.context.ActiveProfiles; import org.apache.causeway.applib.services.xactn.TransactionService; import org.apache.causeway.applib.value.Blob; import org.apache.causeway.core.config.environment.CausewaySystemEnvironment; +import org.apache.causeway.core.config.presets.CausewayPresets; import org.apache.causeway.core.metamodel.specloader.SpecificationLoader; import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices; import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass; +import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib; import org.apache.causeway.viewer.restfulobjects.client.AuthenticationMode; import org.apache.causeway.viewer.restfulobjects.client.RestfulClient; import org.apache.causeway.viewer.restfulobjects.client.RestfulClientConfig; -import org.apache.causeway.viewer.restfulobjects.viewer.CausewayModuleViewerRestfulObjectsViewer; +import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy; import static org.apache.causeway.commons.internal.assertions._Assert.assertNotNull; diff --git a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/scenarios/dept/Department_IntegTest.java b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/scenarios/dept/Department_IntegTest.java index a5559ab82a..008a0095f5 100644 --- a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/scenarios/dept/Department_IntegTest.java +++ b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/scenarios/dept/Department_IntegTest.java @@ -18,17 +18,9 @@ */ package org.apache.causeway.viewer.restfulobjects.test.scenarios.dept; -import lombok.val; - -import java.util.Optional; - import jakarta.ws.rs.client.Invocation; import jakarta.ws.rs.core.Response; -import org.apache.causeway.applib.services.bookmark.Bookmark; - -import org.apache.causeway.viewer.restfulobjects.test.domain.dom.Department; - import org.approvaltests.Approvals; import org.approvaltests.reporters.DiffReporter; import org.approvaltests.reporters.UseReporter; @@ -36,9 +28,13 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; +import org.springframework.transaction.annotation.Propagation; + +import org.apache.causeway.applib.services.bookmark.Bookmark; +import org.apache.causeway.viewer.restfulobjects.test.domain.dom.Department; import org.apache.causeway.viewer.restfulobjects.test.scenarios.Abstract_IntegTest; -import org.springframework.transaction.annotation.Propagation; +import lombok.val; public class Department_IntegTest extends Abstract_IntegTest { diff --git a/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/ComponentFactoryAbstractTest_init.java b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/ComponentFactoryAbstractTest_init.java index 054f0a75c5..8389f63566 100644 --- a/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/ComponentFactoryAbstractTest_init.java +++ b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/ComponentFactoryAbstractTest_init.java @@ -27,7 +27,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting; import org.apache.causeway.core.metamodel.context.MetaModelContext; -import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice; import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract; class ComponentFactoryAbstractTest_init { diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java index 911a4c8c16..54363ad9b6 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java +++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java @@ -27,7 +27,6 @@ import org.apache.causeway.applib.layout.component.CollectionLayoutData; import org.apache.causeway.viewer.commons.model.components.UiComponentType; import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt; import org.apache.causeway.viewer.wicket.ui.ComponentFactory; -import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice; import org.apache.causeway.viewer.wicket.ui.components.entity.EntityComponentFactoryAbstract; import lombok.Getter; diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/BSGridPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/BSGridPanelFactory.java index 7a8dce0b7d..902723e6a9 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/BSGridPanelFactory.java +++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/BSGridPanelFactory.java @@ -25,7 +25,6 @@ import org.apache.causeway.core.metamodel.util.Facets; import org.apache.causeway.viewer.commons.model.components.UiComponentType; import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt; import org.apache.causeway.viewer.wicket.ui.ComponentFactory; -import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice; import org.apache.causeway.viewer.wicket.ui.components.entity.EntityComponentFactoryAbstract; import lombok.val; diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java index 02c7254424..c515f57c32 100644 --- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java +++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java @@ -43,7 +43,6 @@ import org.apache.causeway.core.metamodel.tabular.simple.CollectionContentsExpor import org.apache.causeway.viewer.wicket.model.models.ScalarModel; import org.apache.causeway.viewer.wicket.ui.ComponentFactory; import org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar; -import org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar.ComponentFactoryList; import org.apache.causeway.viewer.wicket.ui.components.about.AboutPanelFactory; import org.apache.causeway.viewer.wicket.ui.components.actioninfo.ActionInfoPanelFactory; import org.apache.causeway.viewer.wicket.ui.components.actionmenu.serviceactions.ServiceActionsPanelFactory;
