This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git
commit e86d3543a0e7c3969ba527bbcb20ed62e96ad196 Author: Andi Huber <[email protected]> AuthorDate: Thu Nov 17 05:12:46 2022 +0100 ISIS-2297: more organize import --- .../proxy/_ProxyFactoryServiceAbstract.java | 3 +- .../_testing/MetaModelContext_forTesting.java | 1 - .../causeway/core/metamodel/facets/Evaluators.java | 2 -- .../facets/actcoll/typeof/TypeOfFacetFromType.java | 1 - ...nChoicesForCollectionParameterFacetFactory.java | 1 - .../ContributingFacetFromMixinFacetFactory.java | 1 - .../annotation/HomePageFacetAnnotationFactory.java | 1 - .../actions/layout/ActionLayoutFacetFactory.java | 1 - .../layout/CssClassFaFacetForMenuBarXml.java | 1 - .../MemberDescribedFacetForActionLayoutXml.java | 1 - .../position/ActionPositionFacetAbstract.java | 1 - .../ActionParameterValidationFacetViaMethod.java | 1 - .../ActionValidationFacetViaMethodFactory.java | 1 - .../i8n/staatic/HasStaticTextFacetAbstract.java | 1 - .../CollectionAccessorFacetViaAccessor.java | 1 - .../javautilcollection/CollectionFacetFactory.java | 1 - .../layout/CollectionLayoutFacetFactory.java | 1 - .../facets/fallback/FallbackFacetFactory.java | 3 -- .../facets/fallback/MultiLineFacetNone.java | 1 - .../metamodel/facets/jaxb/JaxbFacetFactory.java | 2 -- .../annotprop/MemberDescribedFacetFromType.java | 1 - .../DisableForContextFacetViaMethodFactory.java | 1 - .../method/DisabledObjectFacetViaMethod.java | 1 - ...inObjectLayoutAnnotationUsingLayoutUiEvent.java | 1 - ...ainObjectLayoutAnnotationUsingTitleUiEvent.java | 1 - .../facets/object/grid/GridFacetFactory.java | 1 - .../icon/method/IconFacetViaIconNameMethod.java | 1 - .../RemoveAnnotatedMethodsFacetFactory.java | 1 - .../RemoveDnPrefixedMethodsFacetFactory.java | 1 - .../ignore/javalang/RemoveMethodsFacetFactory.java | 1 - .../LogicalTypeFacetFromClassNameFactory.java | 2 -- .../annotation/TitleFacetViaTitleAnnotation.java | 1 - .../methods/TitleFacetFromToStringMethod.java | 2 -- .../title/methods/TitleFacetViaTitleMethod.java | 1 - .../vsp/ValueFacetUsingSemanticsProvider.java | 1 - .../ViewModelFacetForSerializableInterface.java | 1 - .../ViewModelFacetForViewModelInterface.java | 1 - ...ctionParameterChoicesFacetFromChoicesFacet.java | 1 - .../ActionParameterDefaultsFacetViaMethod.java | 1 - .../ActionParameterHiddenFacetViaMethod.java | 1 - .../PropertyAccessorFacetViaAccessorFactory.java | 1 - .../PropertyChoicesFacetFromChoicesFacet.java | 1 - .../method/PropertyChoicesFacetViaMethod.java | 1 - .../PropertyDefaultFacetViaMethodFactory.java | 1 - .../dflt/PropertyValidateFacetDefaultFactory.java | 2 -- .../ValueSemanticsAnnotationFacetFactory.java | 2 -- .../objectmanager/memento/_RecreatableLookup.java | 2 -- .../objectmanager/memento/_RecreatableValue.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 +++++----- .../ui/custom/WhereInTheWorldPanelFactory.java | 2 +- .../applib/job/RunBackgroundCommandsJob.java | 32 +++++++------------ .../BackgroundService_IntegTestAbstract.java | 36 ++++++++++++---------- .../integtests/BackgroundService_IntegTest.java | 21 +++---------- .../commandlog/jpa/dom/CommandLogEntry.java | 27 +++++++++++----- .../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 -- .../h2console/ui/webmodule/WebModuleH2Console.java | 1 - .../applib/CausewayInteractionHandler.java | 1 - .../causeway/tooling/j2adoc/format/Snippets.java | 1 - .../demoshowcases/value/ValueTypeGenTemplate.java | 1 - .../ComponentFactoryRegistrarDefault.java | 1 - 104 files changed, 80 insertions(+), 210 deletions(-) diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/proxy/_ProxyFactoryServiceAbstract.java b/commons/src/main/java/org/apache/causeway/commons/internal/proxy/_ProxyFactoryServiceAbstract.java index 9fd850822f..9bdc27e39d 100644 --- a/commons/src/main/java/org/apache/causeway/commons/internal/proxy/_ProxyFactoryServiceAbstract.java +++ b/commons/src/main/java/org/apache/causeway/commons/internal/proxy/_ProxyFactoryServiceAbstract.java @@ -24,7 +24,6 @@ import java.util.WeakHashMap; import org.apache.causeway.commons.internal.base._Casts; import org.apache.causeway.commons.internal.collections._Arrays; -import org.apache.causeway.commons.internal.proxy._ProxyFactoryService.ProxyEnhanced; import lombok.NonNull; @@ -38,7 +37,7 @@ public abstract class _ProxyFactoryServiceAbstract implements _ProxyFactoryServi private final Map<Class<?>, _ProxyFactory<?>> proxyFactoryByClass = Collections.synchronizedMap(new WeakHashMap<>()); @Override - public <T> _ProxyFactory<T> factory(Class<T> toProxyClass, Class<?> additionalClass) { + public <T> _ProxyFactory<T> factory(final Class<T> toProxyClass, final Class<?> additionalClass) { _ProxyFactory<T> proxyFactory = _Casts.uncheckedCast(proxyFactoryByClass.get(toProxyClass)); if(proxyFactory == null) { proxyFactory = createFactory(toProxyClass, additionalClass); diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MetaModelContext_forTesting.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MetaModelContext_forTesting.java index dff36154a2..23205ff485 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MetaModelContext_forTesting.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MetaModelContext_forTesting.java @@ -71,7 +71,6 @@ import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistryDefault; import org.apache.causeway.core.config.environment.CausewaySystemEnvironment; import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants; import org.apache.causeway.core.config.viewer.web.WebAppContextPath; -import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting.ServiceInstance; import org.apache.causeway.core.metamodel.commons.ClassUtil; import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.execution.MemberExecutorService; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/Evaluators.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/Evaluators.java index 7ba8b54beb..27865f7d1a 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/Evaluators.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/Evaluators.java @@ -38,8 +38,6 @@ import org.apache.causeway.commons.internal.reflection._Reflect.InterfacePolicy; import org.apache.causeway.commons.internal.reflection._Reflect.TypeHierarchyPolicy; import org.apache.causeway.core.metamodel.commons.MethodUtil; import org.apache.causeway.core.metamodel.commons.ThrowableExtensions; -import org.apache.causeway.core.metamodel.facets.Evaluators.MethodEvaluator; - import lombok.AccessLevel; import lombok.Getter; import lombok.NonNull; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actcoll/typeof/TypeOfFacetFromType.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actcoll/typeof/TypeOfFacetFromType.java index fb6b5c41dc..dfa0285471 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actcoll/typeof/TypeOfFacetFromType.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actcoll/typeof/TypeOfFacetFromType.java @@ -18,7 +18,6 @@ */ package org.apache.causeway.core.metamodel.facets.actcoll.typeof; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.spec.TypeOfAnyCardinality; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java index 75039a7be6..3561f2e4ce 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java @@ -24,7 +24,6 @@ import org.apache.causeway.commons.internal.exceptions._Exceptions; import org.apache.causeway.core.metamodel.context.MetaModelContext; 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.actcoll.typeof.TypeOfFacet; import org.apache.causeway.core.metamodel.facets.object.autocomplete.AutoCompleteFacet; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/contributing/derived/ContributingFacetFromMixinFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/contributing/derived/ContributingFacetFromMixinFacetFactory.java index 5f052b6680..45add474d4 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/contributing/derived/ContributingFacetFromMixinFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/contributing/derived/ContributingFacetFromMixinFacetFactory.java @@ -25,7 +25,6 @@ import org.apache.causeway.applib.annotation.ActionLayout; 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.ProcessMethodContext; import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; import org.apache.causeway.core.metamodel.facets.actions.contributing.ContributingFacet.Contributing; import org.apache.causeway.core.metamodel.facets.actions.contributing.ContributingFacetAbstract; 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 b9e9e41c65..50c0942a23 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/ActionLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java index 10fbc5de78..a0de7cd03f 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import org.apache.causeway.applib.annotation.ActionLayout; 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.FacetFactoryAbstract; import org.apache.causeway.core.metamodel.facets.actions.position.ActionPositionFacetFallback; import org.apache.causeway.core.metamodel.facets.actions.redirect.RedirectFacetFallback; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFaFacetForMenuBarXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFaFacetForMenuBarXml.java index abd435aa2a..0ddbc7f5c6 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFaFacetForMenuBarXml.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/CssClassFaFacetForMenuBarXml.java @@ -25,7 +25,6 @@ import org.springframework.lang.Nullable; import org.apache.causeway.applib.layout.component.CssClassFaPosition; import org.apache.causeway.applib.layout.component.ServiceActionLayoutData; 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.cssclassfa.CssClassFaFacet; import org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaStaticFacetAbstract; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberDescribedFacetForActionLayoutXml.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberDescribedFacetForActionLayoutXml.java index ac175472cd..b4f330a0de 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberDescribedFacetForActionLayoutXml.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/MemberDescribedFacetForActionLayoutXml.java @@ -22,7 +22,6 @@ import java.util.Optional; import org.apache.causeway.applib.layout.component.ActionLayoutData; 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/actions/position/ActionPositionFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/position/ActionPositionFacetAbstract.java index 1e7ae6fb1a..2e9b43089a 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/position/ActionPositionFacetAbstract.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/position/ActionPositionFacetAbstract.java @@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.actions.position; import java.util.function.BiConsumer; import org.apache.causeway.applib.annotation.ActionLayout; -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/actions/validate/method/ActionParameterValidationFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/method/ActionParameterValidationFacetViaMethod.java index 4933ee8cb8..6200ec6d67 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/method/ActionParameterValidationFacetViaMethod.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/method/ActionParameterValidationFacetViaMethod.java @@ -27,7 +27,6 @@ import org.apache.causeway.applib.services.i18n.TranslationService; import org.apache.causeway.commons.collections.Can; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.ImperativeFacet; -import org.apache.causeway.core.metamodel.facets.ImperativeFacet.Intent; import org.apache.causeway.core.metamodel.facets.actions.validate.ActionParameterValidationFacetAbstract; import org.apache.causeway.core.metamodel.object.ManagedObject; import org.apache.causeway.core.metamodel.object.MmInvokeUtil; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java index 55a5a5bad0..59e56a99fc 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java @@ -27,7 +27,6 @@ import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.FeatureType; import org.apache.causeway.core.metamodel.facets.ActionSupport; import org.apache.causeway.core.metamodel.facets.ActionSupport.SearchAlgorithm; -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/all/i8n/staatic/HasStaticTextFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/staatic/HasStaticTextFacetAbstract.java index d18307f0d5..90e3bcbf03 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/staatic/HasStaticTextFacetAbstract.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/all/i8n/staatic/HasStaticTextFacetAbstract.java @@ -24,7 +24,6 @@ import java.util.function.BiConsumer; import org.apache.causeway.applib.services.i18n.TranslationContext; import org.apache.causeway.commons.internal.base._Lazy; 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/collections/accessor/CollectionAccessorFacetViaAccessor.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java index e0c8bdbd4d..18d5ac1a24 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java @@ -25,7 +25,6 @@ import org.apache.causeway.commons.collections.Can; import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.ImperativeFacet; -import org.apache.causeway.core.metamodel.facets.ImperativeFacet.Intent; import org.apache.causeway.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacetAbstract; import org.apache.causeway.core.metamodel.object.ManagedObject; import org.apache.causeway.core.metamodel.object.MmInvokeUtil; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/javautilcollection/CollectionFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/javautilcollection/CollectionFacetFactory.java index 198d93f0f5..24bedc492f 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/javautilcollection/CollectionFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/javautilcollection/CollectionFacetFactory.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants; 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 org.apache.causeway.core.metamodel.facets.actcoll.typeof.TypeOfFacet; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java index 126e4eb69e..db05f031f1 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import org.apache.causeway.applib.annotation.CollectionLayout; 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.FacetFactoryAbstract; import org.apache.causeway.core.metamodel.facets.collections.layout.tabledec.CollectionLayoutTableDecorationFacet; import org.apache.causeway.core.metamodel.facets.members.layout.order.LayoutOrderFacetFromCollectionLayoutAnnotation; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/FallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/FallbackFacetFactory.java index a168c21749..02bd8e8497 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/FallbackFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/FallbackFacetFactory.java @@ -26,9 +26,6 @@ import javax.inject.Inject; 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.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.facets.FacetedMethod; import org.apache.causeway.core.metamodel.facets.TypedHolder; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/MultiLineFacetNone.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/MultiLineFacetNone.java index 1e982887f2..bbaac9d605 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/MultiLineFacetNone.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/MultiLineFacetNone.java @@ -18,7 +18,6 @@ */ package org.apache.causeway.core.metamodel.facets.fallback; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facetapi.HasSemanticEqualityByClass; import org.apache.causeway.core.metamodel.facets.objectvalue.multiline.MultiLineFacetAbstract; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/jaxb/JaxbFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/jaxb/JaxbFacetFactory.java index f2c0998540..2486bbd2cd 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/jaxb/JaxbFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/jaxb/JaxbFacetFactory.java @@ -40,8 +40,6 @@ import org.apache.causeway.core.config.CausewayConfiguration; import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.FeatureType; import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner; -import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext; -import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext; import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; import org.apache.causeway.core.metamodel.facets.object.viewmodel.ViewModelFacet; import org.apache.causeway.core.metamodel.facets.object.viewmodel.ViewModelFacetForXmlRootElementAnnotation; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/described/annotprop/MemberDescribedFacetFromType.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/described/annotprop/MemberDescribedFacetFromType.java index 31d483b250..e6a6d002ef 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/described/annotprop/MemberDescribedFacetFromType.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/described/annotprop/MemberDescribedFacetFromType.java @@ -21,7 +21,6 @@ package org.apache.causeway.core.metamodel.facets.members.described.annotprop; import java.util.Optional; 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/members/disabled/method/DisableForContextFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java index f548967c98..d06f8c78b4 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java @@ -23,7 +23,6 @@ import javax.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/object/disabled/method/DisabledObjectFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethod.java index 778b9f3c49..3eb082517f 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethod.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethod.java @@ -29,7 +29,6 @@ import org.apache.causeway.applib.services.i18n.TranslationContext; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.HasImperativeAspect; import org.apache.causeway.core.metamodel.facets.ImperativeAspect; -import org.apache.causeway.core.metamodel.facets.ImperativeFacet.Intent; import org.apache.causeway.core.metamodel.facets.object.disabled.DisabledObjectFacet; import org.apache.causeway.core.metamodel.facets.object.disabled.DisabledObjectFacetAbstract; import org.apache.causeway.core.metamodel.object.ManagedObject; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java index 869a914f24..46ba23e5d9 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java @@ -25,7 +25,6 @@ import org.apache.causeway.applib.annotation.DomainObjectLayout; import org.apache.causeway.applib.events.EventObjectBase; import org.apache.causeway.applib.events.ui.LayoutUiEvent; import org.apache.causeway.commons.internal.base._Casts; -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.layout.LayoutFacet; import org.apache.causeway.core.metamodel.facets.object.layout.LayoutFacetAbstract; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java index 4774cb5311..cc84cbe2e6 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java @@ -28,7 +28,6 @@ import org.apache.causeway.applib.services.i18n.TranslatableString; import org.apache.causeway.applib.services.i18n.TranslationContext; import org.apache.causeway.applib.services.i18n.TranslationService; import org.apache.causeway.commons.internal.base._Casts; -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.title.TitleFacet; import org.apache.causeway.core.metamodel.facets.object.title.TitleFacetAbstract; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/grid/GridFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/grid/GridFacetFactory.java index 3133baa54e..cf82e33881 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/grid/GridFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/grid/GridFacetFactory.java @@ -22,7 +22,6 @@ import org.apache.causeway.applib.services.grid.GridService; import org.apache.causeway.commons.internal.base._Lazy; 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/icon/method/IconFacetViaIconNameMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/icon/method/IconFacetViaIconNameMethod.java index b6bb805115..6c3e99eb06 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/icon/method/IconFacetViaIconNameMethod.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/icon/method/IconFacetViaIconNameMethod.java @@ -27,7 +27,6 @@ import org.springframework.lang.Nullable; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.HasImperativeAspect; import org.apache.causeway.core.metamodel.facets.ImperativeAspect; -import org.apache.causeway.core.metamodel.facets.ImperativeFacet.Intent; import org.apache.causeway.core.metamodel.facets.object.icon.IconFacet; import org.apache.causeway.core.metamodel.facets.object.icon.IconFacetAbstract; import org.apache.causeway.core.metamodel.object.ManagedObject; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java index 829fec2595..0a0e08ffb0 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java @@ -24,7 +24,6 @@ import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants; import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.MethodExcludeMarker; 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/ignore/datanucleus/RemoveDnPrefixedMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/datanucleus/RemoveDnPrefixedMethodsFacetFactory.java index e23fef6323..886b1e84d9 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/datanucleus/RemoveDnPrefixedMethodsFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/datanucleus/RemoveDnPrefixedMethodsFacetFactory.java @@ -22,7 +22,6 @@ import javax.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; /** 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 a8b3c18e22..3407a9d829 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 @@ -31,7 +31,6 @@ import org.apache.causeway.core.metamodel.commons.ClassExtensions; 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/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java index ff21988e25..247b427f7e 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java @@ -24,10 +24,8 @@ import javax.xml.bind.annotation.XmlType; import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.FeatureType; import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner; -import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext; import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; import org.apache.causeway.core.metamodel.facets.ObjectTypeFacetFactory; -import org.apache.causeway.core.metamodel.facets.ObjectTypeFacetFactory.ProcessObjectTypeContext; import org.apache.causeway.core.metamodel.facets.object.domainservice.DomainServiceFacet; import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel; import org.apache.causeway.core.metamodel.spec.ObjectSpecification; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java index 478321803c..e22b065821 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java @@ -40,7 +40,6 @@ import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.Evaluators; import org.apache.causeway.core.metamodel.facets.Evaluators.MethodEvaluator; import org.apache.causeway.core.metamodel.facets.ImperativeFacet; -import org.apache.causeway.core.metamodel.facets.ImperativeFacet.Intent; import org.apache.causeway.core.metamodel.facets.object.title.TitleFacet; import org.apache.causeway.core.metamodel.facets.object.title.TitleFacetAbstract; import org.apache.causeway.core.metamodel.facets.object.title.TitleRenderRequest; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/methods/TitleFacetFromToStringMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/methods/TitleFacetFromToStringMethod.java index e6fe6a2a8d..66d61d7edc 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/methods/TitleFacetFromToStringMethod.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/methods/TitleFacetFromToStringMethod.java @@ -25,11 +25,9 @@ import java.util.function.BiConsumer; import org.springframework.lang.Nullable; import org.apache.causeway.core.metamodel.commons.ClassExtensions; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.HasImperativeAspect; import org.apache.causeway.core.metamodel.facets.ImperativeAspect; -import org.apache.causeway.core.metamodel.facets.ImperativeFacet.Intent; import org.apache.causeway.core.metamodel.facets.object.title.TitleFacet; import org.apache.causeway.core.metamodel.facets.object.title.TitleFacetAbstract; import org.apache.causeway.core.metamodel.facets.object.title.TitleRenderRequest; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java index 1635f974a1..e6da67e37e 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java @@ -31,7 +31,6 @@ import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.HasImperativeAspect; import org.apache.causeway.core.metamodel.facets.ImperativeAspect; -import org.apache.causeway.core.metamodel.facets.ImperativeFacet.Intent; import org.apache.causeway.core.metamodel.facets.object.title.TitleFacet; import org.apache.causeway.core.metamodel.facets.object.title.TitleFacetAbstract; import org.apache.causeway.core.metamodel.facets.object.title.TitleRenderRequest; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProvider.java index 72391e7a94..aadfcb895d 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProvider.java @@ -20,7 +20,6 @@ package org.apache.causeway.core.metamodel.facets.object.value.vsp; import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider; import org.apache.causeway.commons.collections.Can; -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.value.ValueFacetAbstract; 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 fe2cdc4f78..2ea28f3aa9 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.facets.HasPostConstructMethodCache; import org.apache.causeway.core.metamodel.object.ManagedObject; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForViewModelInterface.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForViewModelInterface.java index 6de9dfc091..55d2a2364c 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForViewModelInterface.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForViewModelInterface.java @@ -25,7 +25,6 @@ import org.springframework.lang.Nullable; import org.apache.causeway.applib.ViewModel; import org.apache.causeway.applib.services.bookmark.Bookmark; import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants; -import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.HasPostConstructMethodCache; import org.apache.causeway.core.metamodel.object.ManagedObject; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromChoicesFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromChoicesFacet.java index 659b574018..19a8cdb12d 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromChoicesFacet.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromChoicesFacet.java @@ -22,7 +22,6 @@ import java.util.Optional; import org.apache.causeway.commons.collections.Can; 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.objectvalue.choices.ChoicesFacet; import org.apache.causeway.core.metamodel.interactions.managed.ActionInteractionHead; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java index 0f0f0a4e04..cf6d7d7bd4 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java @@ -27,7 +27,6 @@ import org.apache.causeway.commons.collections.Can; import org.apache.causeway.commons.internal.base._NullSafe; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.ImperativeFacet; -import org.apache.causeway.core.metamodel.facets.ImperativeFacet.Intent; import org.apache.causeway.core.metamodel.facets.param.defaults.ActionParameterDefaultsFacetAbstract; import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel; import org.apache.causeway.core.metamodel.object.ManagedObject; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethod.java index f9f8ef0244..5799e2725d 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethod.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethod.java @@ -27,7 +27,6 @@ import org.apache.causeway.commons.collections.Can; import org.apache.causeway.core.metamodel.facetapi.Facet; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.ImperativeFacet; -import org.apache.causeway.core.metamodel.facets.ImperativeFacet.Intent; import org.apache.causeway.core.metamodel.facets.param.hide.ActionParameterHiddenFacetAbstract; import org.apache.causeway.core.metamodel.object.ManagedObject; import org.apache.causeway.core.metamodel.object.MmInvokeUtil; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java index 1f87a4ca3f..288eba978d 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java @@ -31,7 +31,6 @@ import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facetapi.FacetUtil; 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 org.apache.causeway.core.metamodel.spec.ObjectSpecification; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetFromChoicesFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetFromChoicesFacet.java index a975f3c887..58c9125620 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetFromChoicesFacet.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetFromChoicesFacet.java @@ -22,7 +22,6 @@ import java.util.Optional; import org.apache.causeway.commons.collections.Can; 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.objectvalue.choices.ChoicesFacet; import org.apache.causeway.core.metamodel.facets.properties.choices.PropertyChoicesFacetAbstract; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java index 1bd9075422..90e19a9889 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java @@ -26,7 +26,6 @@ import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facets.FacetedMethod; import org.apache.causeway.core.metamodel.facets.ImperativeFacet; -import org.apache.causeway.core.metamodel.facets.ImperativeFacet.Intent; import org.apache.causeway.core.metamodel.facets.properties.choices.PropertyChoicesFacetAbstract; import org.apache.causeway.core.metamodel.object.ManagedObject; import org.apache.causeway.core.metamodel.object.ManagedObjects; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java index d10b3b8d3c..f622386105 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java @@ -23,7 +23,6 @@ import javax.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/validating/dflt/PropertyValidateFacetDefaultFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/validating/dflt/PropertyValidateFacetDefaultFactory.java index 51429a6615..dd650eb01b 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/validating/dflt/PropertyValidateFacetDefaultFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/validating/dflt/PropertyValidateFacetDefaultFactory.java @@ -23,8 +23,6 @@ import javax.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; -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.facets.properties.validating.PropertyValidateFacet; import org.apache.causeway.core.metamodel.specloader.facetprocessor.FacetProcessor; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/value/semantics/ValueSemanticsAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/value/semantics/ValueSemanticsAnnotationFacetFactory.java index 63aa6d70cf..8384b99d6d 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/value/semantics/ValueSemanticsAnnotationFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/value/semantics/ValueSemanticsAnnotationFacetFactory.java @@ -26,8 +26,6 @@ import javax.validation.constraints.Digits; import org.apache.causeway.applib.annotation.ValueSemantics; 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.FacetFactory.ProcessParameterContext; import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; import org.apache.causeway.core.metamodel.facets.TypedHolderAbstract; import org.apache.causeway.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacetAbstract; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/memento/_RecreatableLookup.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/memento/_RecreatableLookup.java index 267a117510..4451eabe1c 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/memento/_RecreatableLookup.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/memento/_RecreatableLookup.java @@ -23,8 +23,6 @@ import org.springframework.lang.Nullable; import org.apache.causeway.commons.internal.exceptions._Exceptions; import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.object.ManagedObject; -import org.apache.causeway.core.metamodel.objectmanager.memento._Recreatable.RecreateStrategy; - import lombok.val; import lombok.extern.log4j.Log4j2; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/memento/_RecreatableValue.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/memento/_RecreatableValue.java index d3573a6d9b..3a67d5b191 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/memento/_RecreatableValue.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/memento/_RecreatableValue.java @@ -20,7 +20,6 @@ package org.apache.causeway.core.metamodel.objectmanager.memento; import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.object.ManagedObject; -import org.apache.causeway.core.metamodel.objectmanager.memento._Recreatable.RecreateStrategy; class _RecreatableValue implements _Recreatable{ diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/progmodel/ProgrammingModelAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/progmodel/ProgrammingModelAbstract.java index 9c66f39eae..6f1db4990a 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/progmodel/ProgrammingModelAbstract.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/progmodel/ProgrammingModelAbstract.java @@ -32,8 +32,6 @@ import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner; import org.apache.causeway.core.metamodel.facets.FacetFactory; import org.apache.causeway.core.metamodel.postprocessors.ObjectSpecificationPostProcessor; -import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel.FacetProcessingOrder; -import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel.PostProcessingOrder; import org.apache.causeway.core.metamodel.specloader.validator.MetaModelValidator; import lombok.EqualsAndHashCode; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateValueSemantics.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateValueSemantics.java index 330ea0a73a..558a34f396 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateValueSemantics.java @@ -26,8 +26,6 @@ import javax.inject.Named; import org.springframework.stereotype.Component; import org.apache.causeway.applib.value.semantics.OrderRelation; -import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.OffsetCharacteristic; -import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.TemporalCharacteristic; import org.apache.causeway.commons.collections.Can; import org.apache.causeway.commons.internal.base._Temporals; import org.apache.causeway.schema.common.v2.ValueType; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/OffsetTimeValueSemantics.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/OffsetTimeValueSemantics.java index 88cca6d915..fd51232454 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/OffsetTimeValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/OffsetTimeValueSemantics.java @@ -25,8 +25,6 @@ import javax.inject.Named; import org.springframework.stereotype.Component; -import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.OffsetCharacteristic; -import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.TemporalCharacteristic; import org.apache.causeway.commons.collections.Can; import org.apache.causeway.commons.internal.base._Temporals; import org.apache.causeway.schema.common.v2.ValueType; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/ZonedDateTimeValueSemantics.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/ZonedDateTimeValueSemantics.java index 96794d114f..3c578992d9 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/ZonedDateTimeValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/ZonedDateTimeValueSemantics.java @@ -25,8 +25,6 @@ import javax.inject.Named; import org.springframework.stereotype.Component; -import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.OffsetCharacteristic; -import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.TemporalCharacteristic; import org.apache.causeway.commons.collections.Can; import org.apache.causeway.commons.internal.base._Temporals; import org.apache.causeway.schema.common.v2.ValueType; diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_commandPublishing.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_commandPublishing.java index 7666df7bb0..9414fdb9e0 100644 --- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_commandPublishing.java +++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_commandPublishing.java @@ -30,7 +30,6 @@ import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.Publishing; import org.apache.causeway.core.metamodel.facetapi.Facet; import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext; -import org.apache.causeway.core.metamodel.facets.actions.action.ActionAnnotationFacetFactoryTest.SomeHasInteractionId; import org.apache.causeway.core.metamodel.facets.members.publish.command.CommandPublishingFacet; import org.apache.causeway.core.metamodel.facets.members.publish.command.CommandPublishingFacetForActionAnnotation; 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..115d1f38be 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 @@ -18,10 +18,7 @@ */ package org.apache.causeway.core.runtimeservices.command; -import java.sql.Timestamp; -import java.util.List; import java.util.Optional; -import java.util.function.Consumer; import java.util.regex.Pattern; import java.util.stream.Stream; @@ -33,7 +30,6 @@ import org.apache.causeway.commons.functional.Try; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; -import org.apache.causeway.applib.Identifier; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.services.bookmark.Bookmark; import org.apache.causeway.applib.services.bookmark.BookmarkService; @@ -41,7 +37,6 @@ import org.apache.causeway.applib.services.clock.ClockService; import org.apache.causeway.applib.services.command.Command; import org.apache.causeway.applib.services.command.CommandExecutorService; import org.apache.causeway.applib.services.command.CommandOutcomeHandler; -import org.apache.causeway.applib.services.iactn.Execution; import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker; import org.apache.causeway.applib.services.iactnlayer.InteractionService; import org.apache.causeway.applib.services.sudo.SudoService; @@ -52,7 +47,6 @@ import org.apache.causeway.commons.functional.IndexedFunction; import org.apache.causeway.commons.internal.base._NullSafe; import org.apache.causeway.commons.internal.exceptions._Exceptions; import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy; -import org.apache.causeway.core.metamodel.interactions.InteractionHead; import org.apache.causeway.core.metamodel.object.ManagedObject; import org.apache.causeway.core.metamodel.object.ManagedObjects; import org.apache.causeway.core.metamodel.services.schema.SchemaValueMarshaller; @@ -64,14 +58,10 @@ import org.apache.causeway.core.metamodel.specloader.SpecificationLoader; import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices; import org.apache.causeway.schema.cmd.v2.ActionDto; import org.apache.causeway.schema.cmd.v2.CommandDto; -import org.apache.causeway.schema.cmd.v2.MemberDto; import org.apache.causeway.schema.cmd.v2.ParamDto; import org.apache.causeway.schema.cmd.v2.ParamsDto; import org.apache.causeway.schema.cmd.v2.PropertyDto; import org.apache.causeway.schema.common.v2.InteractionType; -import org.apache.causeway.schema.common.v2.OidDto; -import org.apache.causeway.schema.common.v2.OidsDto; - import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.val; 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..0133daca74 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 @@ -30,7 +30,6 @@ 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; @@ -38,7 +37,6 @@ import javax.inject.Inject; import javax.inject.Named; import javax.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 --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/EmailTicket.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/EmailTicket.java index 6621e9410c..a48c7a6489 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/EmailTicket.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/EmailTicket.java @@ -67,7 +67,7 @@ public class EmailTicket extends SimpleTicket { // -- STACKTRACE FORMATTING - public static String mailBodyOf(ErrorDetails errorDetails) { + public static String mailBodyOf(final ErrorDetails errorDetails) { return "Stacktrace:%0D%0A=================%0D%0A" + stream(errorDetails.getStackTraceDetailPerCause()) .map(MailTo::causeToString) @@ -75,7 +75,7 @@ public class EmailTicket extends SimpleTicket { ; } - private static String causeToString(List<String> list) { + private static String causeToString(final List<String> list) { return "Cause%0D%0A------------%0D%0A" + stream(list) .map(entry->String.format("# %s", entry)) @@ -92,12 +92,12 @@ public class EmailTicket extends SimpleTicket { private MailTo mailTo; public EmailTicket( - MailTo mailTo, - String reference, - String userMessage, - String details, - StackTracePolicy stackTracePolicy, - String kittenUrl) { + final MailTo mailTo, + final String reference, + final String userMessage, + final String details, + final StackTracePolicy stackTracePolicy, + final String kittenUrl) { super(reference, userMessage, details, stackTracePolicy, kittenUrl); this.mailTo = mailTo; } diff --git a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanelFactory.java b/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanelFactory.java index f55fe4795b..3e701784ec 100644 --- a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanelFactory.java +++ b/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanelFactory.java @@ -48,7 +48,7 @@ public class WhereInTheWorldPanelFactory extends EntityComponentFactoryAbstract } @Override - protected ApplicationAdvice doAppliesTo(UiObjectWkt entityModel) { // <.> + protected ApplicationAdvice doAppliesTo(final UiObjectWkt entityModel) { // <.> final ManagedObject managedObject = entityModel.getObject(); // <.> final Object domainObject = managedObject.getPojo(); // <.> return ApplicationAdvice.appliesIf( diff --git 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 index f956f97828..1f31236783 100644 --- 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,40 +1,29 @@ 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 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; import org.apache.causeway.applib.services.xactn.TransactionService; import org.apache.causeway.applib.util.JaxbUtil; import org.apache.causeway.commons.functional.ThrowingRunnable; -import org.apache.causeway.commons.functional.Try; import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntry; import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntryRepository; -import org.apache.causeway.schema.cmd.v2.CommandDto; -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 lombok.val; +import lombok.extern.log4j.Log4j2; /** * An implementation of a Quartz {@link Job} that queries for {@link CommandLogEntry}s that have been persisted by @@ -54,6 +43,7 @@ public class RunBackgroundCommandsJob implements Job { @Inject CommandLogEntryRepository<? extends CommandLogEntry> commandLogEntryRepository; @Inject CommandExecutorService commandExecutorService; + @Override public void execute(final JobExecutionContext quartzContext) { val user = UserMemento.ofNameAndRoleNames("scheduler_user", "admin_role"); val interactionContext = InteractionContext.builder().user(user).build(); 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 3fe4e08a8b..ec4589d21a 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 @@ -18,26 +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 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; @@ -50,6 +34,26 @@ import org.springframework.transaction.annotation.Propagation; import static org.assertj.core.api.Assertions.assertThat; +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.apache.causeway.core.config.environment.CausewaySystemEnvironment; +import org.apache.causeway.extensions.commandlog.applib.dom.BackgroundService; +import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntry; +import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntryRepository; +import org.apache.causeway.extensions.commandlog.applib.dom.ExecuteIn; +import org.apache.causeway.extensions.commandlog.applib.dom.ReplayState; +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 lombok.SneakyThrows; +import lombok.val; + @ExtendWith(MockitoExtension.class) public abstract class BackgroundService_IntegTestAbstract extends CausewayIntegrationTestAbstract { diff --git a/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/BackgroundService_IntegTest.java b/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/BackgroundService_IntegTest.java index 136df64701..22e20a42d1 100644 --- a/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/BackgroundService_IntegTest.java +++ b/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/BackgroundService_IntegTest.java @@ -18,24 +18,12 @@ */ package org.apache.causeway.extensions.commandlog.jdo.integtests; -import org.apache.causeway.core.config.presets.CausewayPresets; -import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices; -import org.apache.causeway.extensions.commandlog.applib.integtest.BackgroundService_IntegTestAbstract; -import org.apache.causeway.extensions.commandlog.applib.integtest.CommandLog_IntegTestAbstract; -import org.apache.causeway.extensions.commandlog.applib.integtest.model.CommandLogTestDomainModel; -import org.apache.causeway.extensions.commandlog.jdo.CausewayModuleExtCommandLogPersistenceJdo; -import org.apache.causeway.extensions.commandlog.jdo.integtests.model.Counter; -import org.apache.causeway.extensions.commandlog.jdo.integtests.model.CounterRepository; -import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass; -import org.springframework.boot.SpringBootConfiguration; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Import; -import org.springframework.context.annotation.PropertySource; -import org.springframework.context.annotation.PropertySources; import org.springframework.test.context.ActiveProfiles; +import org.apache.causeway.extensions.commandlog.applib.integtest.BackgroundService_IntegTestAbstract; +import org.apache.causeway.extensions.commandlog.jdo.integtests.model.Counter; + @SpringBootTest( classes = AppManifest.class ) @@ -43,7 +31,8 @@ import org.springframework.test.context.ActiveProfiles; public class BackgroundService_IntegTest extends BackgroundService_IntegTestAbstract { - protected org.apache.causeway.extensions.commandlog.applib.integtest.model.Counter newCounter(String name) { + @Override + protected org.apache.causeway.extensions.commandlog.applib.integtest.model.Counter newCounter(final String name) { return Counter.builder().name(name).build(); } diff --git a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java index 641c55632f..de36b0f1ca 100644 --- a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java +++ b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java @@ -18,15 +18,24 @@ */ package org.apache.causeway.extensions.commandlog.jpa.dom; -import lombok.AccessLevel; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - import java.util.UUID; import javax.inject.Named; -import javax.persistence.*; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Convert; +import javax.persistence.EmbeddedId; +import javax.persistence.Entity; +import javax.persistence.EntityListeners; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.FetchType; +import javax.persistence.Index; +import javax.persistence.Lob; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.Table; +import javax.persistence.Transient; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.apache.causeway.applib.annotation.Domain; @@ -42,6 +51,10 @@ import org.apache.causeway.persistence.jpa.integration.typeconverters.java.util. import org.apache.causeway.persistence.jpa.integration.typeconverters.schema.v2.CausewayCommandDtoConverter; import org.apache.causeway.schema.cmd.v2.CommandDto; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + @Entity @Table( schema = CommandLogEntry.SCHEMA, @@ -238,7 +251,7 @@ public class CommandLogEntry extends org.apache.causeway.extensions.commandlog.a } @Transient @Override - public void setInteractionId(UUID interactionId) { + public void setInteractionId(final UUID interactionId) { this.pk = new CommandLogEntryPK(interactionId); } diff --git a/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/BackgroundService_IntegTest.java b/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/BackgroundService_IntegTest.java index 613480fb7f..40c88f3d53 100644 --- a/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/BackgroundService_IntegTest.java +++ b/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/BackgroundService_IntegTest.java @@ -18,12 +18,12 @@ */ package org.apache.causeway.extensions.commandlog.jpa.integtests; -import org.apache.causeway.extensions.commandlog.applib.integtest.BackgroundService_IntegTestAbstract; -import org.apache.causeway.extensions.commandlog.applib.integtest.CommandLog_IntegTestAbstract; -import org.apache.causeway.extensions.commandlog.jpa.integtests.model.Counter; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; +import org.apache.causeway.extensions.commandlog.applib.integtest.BackgroundService_IntegTestAbstract; +import org.apache.causeway.extensions.commandlog.jpa.integtests.model.Counter; + @SpringBootTest( classes = AppManifest.class ) @@ -31,7 +31,8 @@ import org.springframework.test.context.ActiveProfiles; public class BackgroundService_IntegTest extends BackgroundService_IntegTestAbstract { - protected org.apache.causeway.extensions.commandlog.applib.integtest.model.Counter newCounter(String name) { + @Override + protected org.apache.causeway.extensions.commandlog.applib.integtest.model.Counter newCounter(final String name) { return Counter.builder().name(name).build(); } 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 f6adad4c50..2d210b09db 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 @@ -45,7 +45,6 @@ import org.apache.causeway.applib.annotation.Programmatic; import org.apache.causeway.applib.annotation.Property; import org.apache.causeway.applib.annotation.Publishing; 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 cbe93c5747..720694ea04 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/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 index 5c71ebf9a5..311c8aa8ff 100644 --- 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 @@ -22,10 +22,8 @@ package org.apache.causeway.extensions.executionoutbox.restclient.integtests; import javax.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; @@ -42,7 +40,7 @@ public class RestEndpointService { private final RestEasyConfiguration restEasyConfiguration; private final WebAppContextPath webAppContextPath; - public OutboxClient newClient(int port, String username, String password) { + public OutboxClient newClient(final int port, final String username, final String password) { val restRootPath = String.format("http://localhost:%d%s/";, 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 58162c9495..8bf817eafc 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/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.java b/extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.java index 08649efcae..19a1a55a16 100644 --- a/extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.java +++ b/extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.java @@ -30,7 +30,6 @@ 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; -import org.apache.causeway.viewer.wicket.ui.ComponentFactory.ApplicationAdvice; import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract; /** diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionFactoryAbstract.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionFactoryAbstract.java index e7bd5995f5..4e11d76d8b 100644 --- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionFactoryAbstract.java +++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/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 20ec3c7a6e..2f02366d8e 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.extensions.pdfjs.applib.annotations.PdfJsViewer; 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 0f04e33b9b..6f397ba0f4 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 b86465ae3e..defbf35700 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/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/JobExecutionData.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/JobExecutionData.java index 2c2cceb359..a5e72746e8 100644 --- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/JobExecutionData.java +++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/JobExecutionData.java @@ -18,11 +18,10 @@ */ package org.apache.causeway.extensions.commandreplay.secondary.job; -import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; - import org.quartz.JobExecutionContext; +import lombok.RequiredArgsConstructor; + /** * Requires that the job is annotated with the {@link org.quartz.PersistJobDataAfterExecution} annotation. * @@ -36,7 +35,7 @@ class JobExecutionData { /** * Lookup property from the job detail. */ - public String getString(String key, final String defaultValue) { + public String getString(final String key, final String defaultValue) { try { String v = context.getJobDetail().getJobDataMap().getString(key); return v != null ? v : defaultValue; @@ -48,7 +47,7 @@ class JobExecutionData { /** * Save key into the job detail obtained from context. */ - public void setString(String key, String value) { + public void setString(final String key, final String value) { context.getJobDetail().getJobDataMap().put(key, value); } diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/SecondaryStatusData.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/SecondaryStatusData.java index 10bc63906b..5952584ca5 100644 --- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/SecondaryStatusData.java +++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/SecondaryStatusData.java @@ -23,7 +23,6 @@ import org.quartz.JobExecutionContext; import org.apache.causeway.extensions.commandreplay.secondary.status.SecondaryStatus; import lombok.val; -import lombok.extern.log4j.Log4j2; /** * @since 2.0 {@index} diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java index c2d84b1a7b..f150dc4af6 100644 --- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java +++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java @@ -32,9 +32,6 @@ import org.apache.causeway.core.metamodel.interactions.managed.ManagedMember; import org.apache.causeway.core.metamodel.util.Facets; import org.apache.causeway.incubator.viewer.javafx.model.context.UiContextFx; import org.apache.causeway.viewer.commons.model.components.UiComponentFactory; -import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.ButtonRequest; -import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.ComponentRequest; -import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.LabelAndPosition; import org.apache.causeway.viewer.commons.model.decorators.PrototypingDecorator.PrototypingDecorationModel; import javafx.scene.Node; diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForButton.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForButton.java index d8776eead9..01b189a079 100644 --- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForButton.java +++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForButton.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import org.springframework.stereotype.Component; import org.apache.causeway.viewer.commons.model.decorators.DisablingDecorator; -import org.apache.causeway.viewer.commons.model.decorators.DisablingDecorator.DisablingDecorationModel; import javafx.scene.control.Button; import javafx.scene.control.Tooltip; diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForFormField.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForFormField.java index 1b9066c786..567051d28e 100644 --- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForFormField.java +++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/disabling/DisablingDecoratorForFormField.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import org.springframework.stereotype.Component; import org.apache.causeway.viewer.commons.model.decorators.DisablingDecorator; -import org.apache.causeway.viewer.commons.model.decorators.DisablingDecorator.DisablingDecorationModel; import javafx.scene.Node; import lombok.RequiredArgsConstructor; diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForMenuItem.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForMenuItem.java index 93dfdb9144..33b4c67e96 100644 --- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForMenuItem.java +++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForMenuItem.java @@ -27,7 +27,6 @@ import org.springframework.stereotype.Component; import org.apache.causeway.incubator.viewer.javafx.model.icon.IconService; import org.apache.causeway.incubator.viewer.javafx.model.util._fx; import org.apache.causeway.viewer.commons.model.decorators.IconDecorator; -import org.apache.causeway.viewer.commons.model.decorators.IconDecorator.FontAwesomeDecorationModel; import javafx.scene.control.MenuItem; import javafx.scene.image.Image; diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForButton.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForButton.java index 41131a75aa..1ac4cb80fd 100644 --- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForButton.java +++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForButton.java @@ -24,7 +24,6 @@ import org.springframework.stereotype.Component; import org.apache.causeway.incubator.viewer.javafx.model.util._fx; import org.apache.causeway.viewer.commons.model.decorators.PrototypingDecorator; -import org.apache.causeway.viewer.commons.model.decorators.PrototypingDecorator.PrototypingDecorationModel; import javafx.scene.Node; import javafx.scene.control.Button; @@ -41,7 +40,7 @@ public class PrototypingDecoratorForButton implements PrototypingDecorator<Butto private final PrototypingInfoPopupProvider prototypingInfoService; @Override - public Node decorate(Button uiButton, PrototypingDecorationModel prototypingDecorationModel) { + public Node decorate(final Button uiButton, final PrototypingDecorationModel prototypingDecorationModel) { val span = new HBox(); val prototypingLabel = _fx.add(span, new Label("ⓘ")); _fx.add(span, uiButton); diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForFormField.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForFormField.java index 059e25ea65..bbccdd0985 100644 --- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForFormField.java +++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingDecoratorForFormField.java @@ -24,7 +24,6 @@ import org.springframework.stereotype.Component; import org.apache.causeway.incubator.viewer.javafx.model.util._fx; import org.apache.causeway.viewer.commons.model.decorators.PrototypingDecorator; -import org.apache.causeway.viewer.commons.model.decorators.PrototypingDecorator.PrototypingDecorationModel; import javafx.scene.Node; import javafx.scene.control.Label; diff --git a/incubator/viewers/vaadin/model/src/main/java/org/apache/causeway/incubator/viewer/vaadin/model/decorator/Decorators.java b/incubator/viewers/vaadin/model/src/main/java/org/apache/causeway/incubator/viewer/vaadin/model/decorator/Decorators.java index c0e4a6a3b4..5e40dce30d 100644 --- a/incubator/viewers/vaadin/model/src/main/java/org/apache/causeway/incubator/viewer/vaadin/model/decorator/Decorators.java +++ b/incubator/viewers/vaadin/model/src/main/java/org/apache/causeway/incubator/viewer/vaadin/model/decorator/Decorators.java @@ -60,7 +60,7 @@ public class Decorators { public final static class Tooltip implements TooltipDecorator<Component> { @Override - public void decorate(Component uiComponent, TooltipDecorationModel tooltipDecorationModel) { + public void decorate(final Component uiComponent, final TooltipDecorationModel tooltipDecorationModel) { log.warn("not implemented yet"); } @@ -107,7 +107,7 @@ public class Decorators { val icon = getTopLevelMenuIcon(); val layout = new HorizontalLayout(label, icon); layout.setVerticalComponentAlignment(Alignment.END, icon); - return (Component) layout; + return layout; } private Component getTopLevelMenuIcon() { @@ -155,7 +155,7 @@ public class Decorators { } - private Component getUserIcon(URL avatarUrl) { + private Component getUserIcon(final URL avatarUrl) { return new Image(avatarUrl.toExternalForm(), "avatar"); } diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/UiComponentFactoryVaa.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/UiComponentFactoryVaa.java index f3cb2afe8a..a55b953d82 100644 --- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/UiComponentFactoryVaa.java +++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/components/UiComponentFactoryVaa.java @@ -31,9 +31,6 @@ import org.apache.causeway.commons.handler.ChainOfResponsibility; import org.apache.causeway.commons.internal.exceptions._Exceptions; import org.apache.causeway.incubator.viewer.vaadin.model.util.Vaa; import org.apache.causeway.viewer.commons.model.components.UiComponentFactory; -import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.ButtonRequest; -import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.ComponentRequest; -import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.LabelAndPosition; import lombok.Getter; import lombok.val; 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 3d807d72a5..a8214806f9 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 @@ -52,7 +52,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.object.ManagedObject; import org.apache.causeway.core.metamodel.objectmanager.ObjectManager; import org.apache.causeway.core.metamodel.services.idstringifier.IdStringifierLookupService; diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java index 34c1486c86..1c7b3f44a4 100644 --- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java +++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java @@ -25,7 +25,6 @@ import javax.jdo.annotations.DatastoreIdentity; 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.persistence.jdo.provider.entities.JdoFacetContext; diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFactory.java index e590e5cbeb..93169fc813 100644 --- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFactory.java +++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFactory.java @@ -30,7 +30,6 @@ import org.apache.causeway.core.metamodel.facetapi.FacetUtil; import org.apache.causeway.core.metamodel.facetapi.FeatureType; import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; import org.apache.causeway.core.metamodel.facets.ObjectTypeFacetFactory; -import org.apache.causeway.core.metamodel.facets.ObjectTypeFacetFactory.ProcessObjectTypeContext; import org.apache.causeway.core.metamodel.facets.object.domainobject.DomainObjectAnnotationFacetFactory; import org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext; diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java index 0da090cc89..b8932b2477 100644 --- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java +++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java @@ -29,7 +29,6 @@ import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facetapi.FacetHolder; import org.apache.causeway.core.metamodel.facetapi.FeatureType; import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner; -import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext; import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel; import org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext; diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java index ba12d121ed..d1fa7d626b 100644 --- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java +++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java @@ -28,7 +28,6 @@ import org.apache.causeway.commons.internal.reflection._Reflect.InterfacePolicy; 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.specloader.validator.ValidationFailure; import org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext; diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromColumnAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromColumnAnnotationFacetFactory.java index 827b1a7725..a35aeb5bdd 100644 --- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromColumnAnnotationFacetFactory.java +++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromColumnAnnotationFacetFactory.java @@ -26,7 +26,6 @@ import javax.jdo.annotations.IdentityType; import org.apache.causeway.core.metamodel.context.MetaModelContext; 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.objectvalue.digits.MaxFractionalDigitsFacet; diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromAbsenceOfColumnAnnotation.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromAbsenceOfColumnAnnotation.java index 747b96228e..07cff0ff3e 100644 --- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromAbsenceOfColumnAnnotation.java +++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromAbsenceOfColumnAnnotation.java @@ -18,7 +18,6 @@ */ package org.apache.causeway.persistence.jdo.metamodel.facets.prop.column; -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.MandatoryFacetAbstract; diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFromColumnAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFromColumnAnnotationFacetFactory.java index a97e9545f1..8fdfbd88dc 100644 --- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFromColumnAnnotationFacetFactory.java +++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFromColumnAnnotationFacetFactory.java @@ -28,7 +28,6 @@ import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence; 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.objectvalue.mandatory.MandatoryFacet; diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MaxLengthFromJdoColumnAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MaxLengthFromJdoColumnAnnotationFacetFactory.java index 3ec42519ff..1f8764d541 100644 --- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MaxLengthFromJdoColumnAnnotationFacetFactory.java +++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MaxLengthFromJdoColumnAnnotationFacetFactory.java @@ -27,7 +27,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.objectvalue.maxlen.MaxLengthFacet; import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel; diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java index a5fac061bf..f508e272c8 100644 --- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java +++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java @@ -25,7 +25,6 @@ import javax.persistence.Transient; 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.ProcessMethodContext; import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; import org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext; diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java index eddbc5b68c..fe4be757ce 100644 --- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java +++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java @@ -23,7 +23,6 @@ import javax.jdo.annotations.PrimaryKey; 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.FacetFactoryAbstract; import org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext; diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/OptionalFacetFromJdoPrimaryKeyAnnotation.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/OptionalFacetFromJdoPrimaryKeyAnnotation.java index ff31256408..bdb6b30982 100644 --- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/OptionalFacetFromJdoPrimaryKeyAnnotation.java +++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/OptionalFacetFromJdoPrimaryKeyAnnotation.java @@ -20,7 +20,6 @@ package org.apache.causeway.persistence.jdo.metamodel.facets.prop.primarykey; import javax.jdo.annotations.PrimaryKey; -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.MandatoryFacetAbstract; import org.apache.causeway.core.metamodel.facets.properties.defaults.PropertyDefaultFacet; diff --git a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacet.java b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacet.java index 3f483df1f9..9f6aa8ea26 100644 --- a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacet.java +++ b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacet.java @@ -42,11 +42,9 @@ import org.apache.causeway.commons.internal.base._Casts; import org.apache.causeway.commons.internal.base._Lazy; import org.apache.causeway.commons.internal.exceptions._Exceptions; import org.apache.causeway.core.config.beans.PersistenceStack; -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.facets.object.entity.EntityFacet; -import org.apache.causeway.core.metamodel.facets.object.entity.EntityFacet.PrimaryKeyType; import org.apache.causeway.core.metamodel.object.ManagedObject; import org.apache.causeway.core.metamodel.services.idstringifier.IdStringifierLookupService; diff --git a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacetFactory.java b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacetFactory.java index 72429ba2c7..22db90f358 100644 --- a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacetFactory.java +++ b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacetFactory.java @@ -24,7 +24,6 @@ import javax.persistence.Entity; import org.apache.causeway.commons.collections.ImmutableEnumSet; 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/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/column/BigDecimalFromJpaColumnAnnotationFacetFactory.java b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/column/BigDecimalFromJpaColumnAnnotationFacetFactory.java index 46d4d1b118..583b32b06e 100644 --- a/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/column/BigDecimalFromJpaColumnAnnotationFacetFactory.java +++ b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/column/BigDecimalFromJpaColumnAnnotationFacetFactory.java @@ -25,7 +25,6 @@ import javax.persistence.Column; 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.FacetFactoryAbstract; import org.apache.causeway.core.metamodel.facets.FacetedMethod; diff --git a/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/column/MandatoryFromJpaColumnAnnotationFacetFactory.java b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/column/MandatoryFromJpaColumnAnnotationFacetFactory.java index f30cb7eb39..5a486c93a0 100644 --- a/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/column/MandatoryFromJpaColumnAnnotationFacetFactory.java +++ b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/column/MandatoryFromJpaColumnAnnotationFacetFactory.java @@ -27,7 +27,6 @@ import javax.persistence.JoinColumn; 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.ProcessMethodContext; import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; import lombok.val; diff --git a/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/transients/JpaTransientAnnotationFacetFactory.java b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/transients/JpaTransientAnnotationFacetFactory.java index bb610771a7..d16ac4a903 100644 --- a/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/transients/JpaTransientAnnotationFacetFactory.java +++ b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/facets/prop/transients/JpaTransientAnnotationFacetFactory.java @@ -24,7 +24,6 @@ import javax.persistence.Transient; 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.ProcessMethodContext; import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; import org.apache.causeway.core.metamodel.facets.FacetedMethod; diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/DomainObjectTesterFactory.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/DomainObjectTesterFactory.java index 3a58cf0940..1ec8aa3b2a 100644 --- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/DomainObjectTesterFactory.java +++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/DomainObjectTesterFactory.java @@ -32,13 +32,11 @@ import org.junit.jupiter.api.function.ThrowingSupplier; import org.springframework.lang.Nullable; import org.springframework.stereotype.Service; -import static org.hamcrest.CoreMatchers.either; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.Mockito.when; import org.apache.causeway.applib.Identifier; import org.apache.causeway.applib.annotation.Where; 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 23d5bd7bf3..16f417726b 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 @@ -42,7 +42,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/CausewayInteractionHandler.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayInteractionHandler.java index b02223a010..d0aefbc1b4 100644 --- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayInteractionHandler.java +++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayInteractionHandler.java @@ -18,7 +18,6 @@ */ package org.apache.causeway.testing.integtestsupport.applib; -import org.apache.causeway.core.config.environment.CausewaySystemEnvironment; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeEachCallback; import org.junit.jupiter.api.extension.ExtensionContext; 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 7bc3228972..7ba50d9e99 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._Refs; import org.apache.causeway.commons.internal.base._Strings; import org.apache.causeway.commons.internal.base._Text; import org.apache.causeway.commons.internal.exceptions._Exceptions; -import org.apache.causeway.tooling.metaprog.demoshowcases.value.ValueTypeGenTemplate.TemplateVariant; import lombok.Builder; import lombok.Getter; 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 b7ce96b209..bda9f59ba2 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 @@ -40,7 +40,6 @@ import org.apache.causeway.commons.internal.functions._Predicates; 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;
