You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/04 13:58:42 UTC
[isis] 02/03: ISIS-2158: organize imports in core using IntelliJ
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 94224c404b50b97359c84bd76ad7125ec73191b4
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 4 13:57:49 2020 +0000
ISIS-2158: organize imports in core using IntelliJ
---
.../main/doc/modules/applib-ant/examples/annotation/HomePage.java | 2 --
.../apache/isis/commons/internal/concurrent/_ConcurrentTaskList.java | 2 +-
.../isis/commons/internal/environment/IsisSystemEnvironment.java | 2 +-
.../org/apache/isis/commons/internal/ioc/cdi/_CDI_Lifecycle.java | 2 +-
.../java/org/apache/isis/commons/internal/ioc/spring/_Spring.java | 2 +-
.../isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java | 2 +-
.../main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java | 2 +-
.../metamodel/authorization/standard/AuthorizationFacetAbstract.java | 2 +-
.../java/org/apache/isis/metamodel/facets/DependentArgUtils.java | 2 +-
.../facets/object/title/annotation/TitleFacetViaTitleAnnotation.java | 2 +-
.../facets/object/title/methods/TitleFacetViaTitleMethod.java | 2 +-
.../objectmanager/create/ObjectCreator_builtinHandlers.java | 2 +-
.../isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java | 2 +-
.../org/apache/isis/metamodel/services/ServiceInjectorLegacy.java | 2 +-
.../services/appfeat/ApplicationFeatureRepositoryDefault.java | 2 +-
.../apache/isis/metamodel/services/layout/LayoutServiceDefault.java | 2 +-
.../apache/isis/metamodel/services/title/TitleServiceDefault.java | 2 +-
.../isis/metamodel/specloader/ProgrammingModelServiceDefault.java | 2 +-
.../apache/isis/metamodel/specloader/SpecificationLoaderDefault.java | 2 +-
.../isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java | 2 +-
.../metamodel/specloader/specimpl/ObjectSpecificationAbstract.java | 2 +-
.../specloader/specimpl/dflt/ObjectSpecificationDefault.java | 2 +-
.../java/org/apache/isis/metamodel/util/snapshot/XmlSnapshot.java | 2 +-
.../apache/isis/persistence/jdo/applib/services/IsisJdoSupport.java | 5 +++--
.../jdo/datanucleus5/datanucleus/DataNucleusContextUtil.java | 2 +-
.../persistence/commands/DataNucleusCreateObjectCommand.java | 2 +-
.../queries/PersistenceQueryFindAllInstancesProcessor.java | 2 +-
.../queries/PersistenceQueryFindUsingApplibQueryProcessor.java | 2 +-
.../datanucleus/service/JdoPersistenceLifecycleService.java | 2 +-
.../jdo/datanucleus5/objectadapter/ObjectAdapterContext.java | 2 +-
.../datanucleus5/persistence/DataNucleusApplicationComponents5.java | 2 +-
.../jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java | 2 +-
.../persistence/IsisPlatformTransactionManagerForJdo.java | 2 +-
.../persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java | 2 +-
.../jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java | 2 +-
.../jdo/datanucleus5/persistence/PersistenceSession5.java | 2 +-
.../jdo/datanucleus5/persistence/PersistenceSessionFactory5.java | 2 +-
.../isis/runtime/services/background/BackgroundCommandExecution.java | 2 +-
.../runtime/services/bookmarks/BookmarkServiceInternalDefault.java | 2 +-
.../isis/runtime/services/command/CommandExecutorServiceDefault.java | 2 +-
.../runtime/services/confmenu/ConfigurationViewServiceDefault.java | 2 +-
.../apache/isis/runtime/services/factory/FactoryServiceDefault.java | 2 +-
.../runtime/services/homepage/HomePageResolverServiceDefault.java | 2 +-
.../isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java | 2 +-
.../runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java | 2 +-
.../isis/runtime/services/repository/RepositoryServiceDefault.java | 2 +-
.../apache/isis/runtime/services/routing/RoutingServiceDefault.java | 2 +-
.../runtime/services/sessmgmt/SessionManagementServiceDefault.java | 2 +-
.../apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java | 2 +-
.../apache/isis/runtime/services/xactn/TransactionServiceSpring.java | 2 +-
.../isis/runtime/persistence/session/events/TimestampService.java | 2 +-
.../isis/runtime/persistence/transaction/AuditerDispatchService.java | 2 +-
.../isis/runtime/persistence/transaction/ChangedObjectsService.java | 2 +-
.../org/apache/isis/runtime/session/IsisSessionFactoryDefault.java | 2 +-
.../src/main/java/org/apache/isis/schema/IsisModuleSchema.java | 4 ++--
.../org/apache/isis/security/shiro/webmodule/WebModuleShiro.java | 2 +-
.../unittestsupport/config/internal/_Config_LifecycleResource.java | 2 +-
.../apache/isis/unittestsupport/config/internal/_Config_Parsers.java | 2 +-
.../restfulobjects/rendering/domainobjects/JsonValueEncoder.java | 2 +-
.../isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java | 2 +-
.../ui/components/actionmenu/serviceactions/ServiceActionUtil.java | 2 +-
.../widgets/themepicker/IsisWicketThemeSupportDefault.java | 2 +-
.../ui/components/widgets/themepicker/ThemeProviderComposite.java | 2 +-
.../org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java | 2 +-
.../viewer/wicket/viewer/integration/WebRequestCycleForIsis.java | 2 +-
.../registries/components/ComponentFactoryRegistryDefault.java | 2 +-
.../viewer/wicket/viewer/services/TranslationsResolverWicket.java | 2 +-
.../viewer/wicket/viewer/services/mementos/ObjectMarshaller.java | 2 +-
.../viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java | 2 +-
.../isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java | 5 +++--
.../main/java/org/apache/isis/webapp/modules/WebModuleContext.java | 2 +-
.../isis/webapp/modules/templresources/TemplateResourceServlet.java | 2 +-
.../org/apache/isis/webapp/webappctx/IsisWebAppContextListener.java | 2 +-
73 files changed, 77 insertions(+), 77 deletions(-)
diff --git a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/HomePage.java b/core/applib/src/main/doc/modules/applib-ant/examples/annotation/HomePage.java
index 05b4954..c29c668 100644
--- a/core/applib/src/main/doc/modules/applib-ant/examples/annotation/HomePage.java
+++ b/core/applib/src/main/doc/modules/applib-ant/examples/annotation/HomePage.java
@@ -25,8 +25,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.isis.applib.ViewModel;
-
/**
* Indicates that the (no-arg) action (on a domain service) to be invoked automatically
* and the contents used for the home page.
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTaskList.java b/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTaskList.java
index bc6295f..38ea8a4 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTaskList.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTaskList.java
@@ -37,8 +37,8 @@ import org.apache.isis.commons.internal.collections._Lists;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@RequiredArgsConstructor(staticName = "named")
@Log4j2
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java b/core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java
index 611a473..ad2e7cd 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java
@@ -39,8 +39,8 @@ import org.apache.isis.commons.internal.ioc.IocContainer;
import org.apache.isis.commons.internal.ioc.spring.IocContainerSpring;
import lombok.Getter;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* Represents configuration, that is required in an early bootstrapping phase.
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI_Lifecycle.java b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI_Lifecycle.java
index 8f5c49a..21db9cd 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI_Lifecycle.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI_Lifecycle.java
@@ -21,8 +21,8 @@ package org.apache.isis.commons.internal.ioc.cdi;
import org.apache.isis.commons.internal.functions._Functions.CheckedRunnable;
import lombok.RequiredArgsConstructor;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@RequiredArgsConstructor(staticName="of") @Log4j2
final class _CDI_Lifecycle implements AutoCloseable {
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java
index b2ea841..117b701 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java
@@ -41,8 +41,8 @@ import org.apache.isis.commons.internal.collections._Maps;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* <h1>- internal use only -</h1>
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
index b8eb257..bbc8c07 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
+++ b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
@@ -31,8 +31,8 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.ViewModel;
import lombok.Getter;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* The framework's stereotypes {@link DomainService}, {@link DomainObject}, {@link ViewModel}, etc.
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
index 34855cd..5c94661 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
+++ b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
@@ -46,8 +46,8 @@ import static org.apache.isis.commons.internal.reflection._Annotations.findNeare
import lombok.Getter;
import lombok.NoArgsConstructor;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* Holds the set of domain services, persistent entities and fixture scripts etc.
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/authorization/standard/AuthorizationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/authorization/standard/AuthorizationFacetAbstract.java
index 641ad6f..b424fd8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/authorization/standard/AuthorizationFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/authorization/standard/AuthorizationFacetAbstract.java
@@ -28,8 +28,8 @@ import org.apache.isis.metamodel.interactions.UsabilityContext;
import org.apache.isis.metamodel.interactions.VisibilityContext;
import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Log4j2
public abstract class AuthorizationFacetAbstract extends FacetAbstract implements AuthorizationFacet {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DependentArgUtils.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DependentArgUtils.java
index cd760e0..7cff5de 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DependentArgUtils.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/DependentArgUtils.java
@@ -34,9 +34,9 @@ import lombok.Builder;
import lombok.Getter;
import lombok.NonNull;
import lombok.Value;
-import lombok.val;
import lombok.experimental.UtilityClass;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
index 06d8065..9a5ba1f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
@@ -32,8 +32,8 @@ import org.apache.isis.metamodel.facets.Annotations;
import org.apache.isis.metamodel.facets.object.title.TitleFacetAbstract;
import org.apache.isis.metamodel.spec.ManagedObject;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Log4j2
public class TitleFacetViaTitleAnnotation extends TitleFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java
index 6e9a8f1..330403c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java
@@ -31,8 +31,8 @@ import org.apache.isis.metamodel.facets.ImperativeFacet;
import org.apache.isis.metamodel.facets.object.title.TitleFacetAbstract;
import org.apache.isis.metamodel.spec.ManagedObject;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Log4j2
public class TitleFacetViaTitleMethod extends TitleFacetAbstract implements ImperativeFacet {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java
index 43228a3..249e648 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java
@@ -37,8 +37,8 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.Contributed;
import lombok.Data;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
index 8f3251b..9967aa1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
@@ -32,8 +32,8 @@ import org.apache.isis.metamodel.facets.FacetFactory;
import org.apache.isis.metamodel.progmodel.ProgrammingModel.Marker;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java
index e9ee83e..312a6cc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServiceInjectorLegacy.java
@@ -45,8 +45,8 @@ import org.apache.isis.metamodel.commons.ToString;
import org.apache.isis.metamodel.exceptions.MetaModelException;
import org.apache.isis.metamodel.spec.InjectorMethodEvaluator;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Log4j2
public class ServiceInjectorLegacy implements ServiceInjector {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index be2030b..c1ef00d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -61,8 +61,8 @@ import org.apache.isis.metamodel.specloader.specimpl.ContributeeMember;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Repository
@Named("isisMetaModel.ApplicationFeatureRepositoryDefault")
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
index 90fc923..a41d431 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
@@ -45,8 +45,8 @@ import org.apache.isis.metamodel.facets.object.grid.GridFacet;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Service
@Named("isisMetaModel.LayoutServiceDefault")
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitleServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitleServiceDefault.java
index 7be0891..b030ebf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitleServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitleServiceDefault.java
@@ -33,8 +33,8 @@ import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Service
@Named("isisMetaModel.TitleServiceDefault")
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java
index 8b0541b..54782c5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java
@@ -37,8 +37,8 @@ import org.apache.isis.metamodel.progmodel.ProgrammingModelInitFilter;
import org.apache.isis.metamodel.progmodel.ProgrammingModelService;
import org.apache.isis.metamodel.progmodels.dflt.ProgrammingModelFacetsJava8;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Service
@Named("isisMetaModel.ProgrammingModelServiceDefault")
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
index da510c2..5ca4d65 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
@@ -69,8 +69,8 @@ import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
import static org.apache.isis.commons.internal.base._With.requires;
import lombok.Getter;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* <p>
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
index 08c3c07..7e4d42e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
@@ -57,8 +57,8 @@ import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.specloader.facetprocessor.FacetProcessor;
import org.apache.isis.metamodel.specloader.traverser.TypeExtractorMethodReturn;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Log4j2
public class FacetedMethodsBuilder {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index c9f8129..1d084e6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -94,8 +94,8 @@ import static org.apache.isis.commons.internal.base._NullSafe.stream;
import lombok.EqualsAndHashCode;
import lombok.Getter;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Log4j2 @EqualsAndHashCode(of = "correspondingClass", callSuper = false)
public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implements ObjectSpecification {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index 66b4120..90cd1e3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -72,8 +72,8 @@ import org.apache.isis.metamodel.specloader.specimpl.OneToOneAssociationDefault;
import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Log4j2
public class ObjectSpecificationDefault extends ObjectSpecificationAbstract implements FacetHolder {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/XmlSnapshot.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/XmlSnapshot.java
index d6aa532..60bb5ee 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/XmlSnapshot.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/util/snapshot/XmlSnapshot.java
@@ -65,8 +65,8 @@ import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* Traverses object graph from specified root, so that an XML representation of
diff --git a/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/services/IsisJdoSupport.java b/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/services/IsisJdoSupport.java
index cf15989..3a6ff62 100644
--- a/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/services/IsisJdoSupport.java
+++ b/core/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/services/IsisJdoSupport.java
@@ -23,12 +23,13 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
-//import javax.jdo.JDOQLTypedQuery;
import javax.jdo.PersistenceManager;
-//import javax.jdo.query.BooleanExpression;
import org.apache.isis.applib.annotation.Programmatic;
+//import javax.jdo.JDOQLTypedQuery;
+//import javax.jdo.query.BooleanExpression;
+
/**
* Service that provides a number of workarounds when using JDO/DataNucleus.<br/><br/>
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusContextUtil.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusContextUtil.java
index dd8099e..a86c048 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusContextUtil.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusContextUtil.java
@@ -25,8 +25,8 @@ import org.datanucleus.ExecutionContext;
import org.apache.isis.metamodel.context.MetaModelContext;
-import lombok.val;
import lombok.experimental.UtilityClass;
+import lombok.val;
/**
*
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
index 541a0e7..1171aaf 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
@@ -24,8 +24,8 @@ import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.CreateObjectCommand;
import org.apache.isis.runtime.persistence.session.PersistenceSession;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Log4j2
public class DataNucleusCreateObjectCommand
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
index d600c9a..ccb2beb 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
@@ -24,8 +24,8 @@ import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSession5;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQueryFindAllInstances;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Log4j2
public class PersistenceQueryFindAllInstancesProcessor extends PersistenceQueryProcessorAbstract<PersistenceQueryFindAllInstances> {
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
index 6727263..11bc46b 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
@@ -35,8 +35,8 @@ import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.metamodel.JdoPro
import org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSession5;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Log4j2
public class PersistenceQueryFindUsingApplibQueryProcessor extends PersistenceQueryProcessorAbstract<PersistenceQueryFindUsingApplibQueryDefault> {
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
index bcfa101..116ec00 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
@@ -39,8 +39,8 @@ import org.apache.isis.runtime.persistence.session.PersistenceSession;
import org.apache.isis.runtime.persistence.session.PersistenceSessionFactory;
import org.apache.isis.runtime.session.IsisSession;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Service
@Named("isisJdoDn5.JdoPersistenceLifecycleService")
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
index 8c0f3dd..1ae31c7 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
@@ -43,8 +43,8 @@ import org.apache.isis.runtime.persistence.session.PersistenceSession;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.Getter;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* Encapsulate ObjectAdpater life-cycling.
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
index 7e23788..be7c45b 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
@@ -50,8 +50,8 @@ import org.apache.isis.runtime.context.IsisContext;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
import lombok.Getter;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Vetoed
@Log4j2
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
index 25d0281..16c068a 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
@@ -47,8 +47,8 @@ import org.apache.isis.runtime.persistence.transaction.ChangedObjectsService;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.Getter;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Log4j2
abstract class IsisPersistenceSessionJdoBase implements IsisPersistenceSessionJdo {
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
index ee989f4..7bdba5d 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
@@ -40,8 +40,8 @@ import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.runtime.session.init.InitialisationSession;
import org.apache.isis.security.api.authentication.AuthenticationSession;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Service
@Named("isisJdoDn5.IsisPlatformTransactionManagerForJdo")
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
index 550cb40..c86026e 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
@@ -44,8 +44,8 @@ import org.apache.isis.runtime.persistence.transaction.IsisTransactionFlushExcep
import org.apache.isis.runtime.persistence.transaction.IsisTransactionManagerException;
import lombok.Getter;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* Used by the {@link IsisTransactionManagerJdo} to captures a set of changes to be
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
index 948f069..1c8fcd5 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
@@ -33,8 +33,8 @@ import org.apache.isis.runtime.persistence.transaction.IsisTransactionManagerExc
import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
import lombok.Getter;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Vetoed @Log4j2
class IsisTransactionManagerJdo {
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
index 20dfc98..dd2a647 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
@@ -97,8 +97,8 @@ import org.apache.isis.security.api.authentication.AuthenticationSession;
import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
import lombok.Getter;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* A wrapper around the JDO {@link PersistenceManager}.
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
index 19ef0da..45b2cb9 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
@@ -55,8 +55,8 @@ import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.Getter;
import lombok.Setter;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
*
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/BackgroundCommandExecution.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/BackgroundCommandExecution.java
index 80ca677..4a346e2 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/BackgroundCommandExecution.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/BackgroundCommandExecution.java
@@ -25,8 +25,8 @@ import org.apache.isis.applib.services.command.CommandExecutorService;
import org.apache.isis.applib.services.command.CommandWithDto;
import org.apache.isis.commons.internal.collections._Lists;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* Intended to be used as a base class for executing queued up {@link Command background action}s.
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
index 4b5db02..e5c9e27 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
@@ -49,8 +49,8 @@ import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* This service enables a serializable 'bookmark' to be created for an entity.
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandExecutorServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandExecutorServiceDefault.java
index 3df691f..96bb3f1 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandExecutorServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandExecutorServiceDefault.java
@@ -71,8 +71,8 @@ import org.apache.isis.schema.common.v1.OidDto;
import org.apache.isis.schema.common.v1.OidsDto;
import org.apache.isis.schema.common.v1.ValueWithTypeDto;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Service
@Named("isisRuntimeServices.CommandExecutorServiceDefault")
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
index 6b60725..e5146ef 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
@@ -44,8 +44,8 @@ import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.RestEasyConfiguration;
import org.apache.isis.config.util.ConfigUtil;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* @since 2.0
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java
index 49d8748..e28e7d7 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java
@@ -45,8 +45,8 @@ import org.apache.isis.runtime.session.IsisSessionFactory;
import static org.apache.isis.commons.internal.base._With.requires;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Service
@Named("isisRuntimeServices.FactoryServiceDefault")
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/homepage/HomePageResolverServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/homepage/HomePageResolverServiceDefault.java
index 8427e9c..a00efb9 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/homepage/HomePageResolverServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/homepage/HomePageResolverServiceDefault.java
@@ -50,8 +50,8 @@ import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Service
@Named("isisRuntimeServices.HomePageResolverServiceDefault")
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
index 4d6f63c..b8a0013 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
@@ -39,8 +39,8 @@ import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Service
@Named("isisRuntimeServices.MenuBarsLoaderServiceDefault")
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
index dd2a14a..a6e5135 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
@@ -64,8 +64,8 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Service
@Named("isisRuntimeServices.MenuBarsServiceBS3")
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java
index 3f9d33d..721c0af 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java
@@ -47,8 +47,8 @@ import org.apache.isis.metamodel.objectmanager.ObjectManager;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.runtime.persistence.session.PersistenceSession;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Repository
@Named("isisRuntimeServices.RepositoryServiceDefault")
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java
index 42254cd..8b4901e 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java
@@ -26,8 +26,8 @@ import org.springframework.stereotype.Controller;
import org.apache.isis.applib.services.routing.RoutingService;
import org.apache.isis.metamodel.services.homepage.HomePageResolverService;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Controller
@Named("isisRuntimeServices.RoutingServiceDefault")
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java
index 43ccfef..5f5905e 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java
@@ -32,8 +32,8 @@ import org.apache.isis.applib.services.sessmgmt.SessionManagementService;
import org.apache.isis.runtime.session.IsisSession;
import org.apache.isis.runtime.session.IsisSessionFactory;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Service
@Named("isisRuntimeServices.SessionManagementServiceDefault")
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java
index 6f55fad..cdfcaf9 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java
@@ -68,8 +68,8 @@ import org.apache.isis.runtime.services.wrapper.handlers.ProxyContextHandler;
import org.apache.isis.runtime.services.wrapper.proxy.ProxyCreator;
import org.apache.isis.runtime.session.IsisSessionFactory;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* This service provides the ability to 'wrap' a domain object such that it can
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java
index b9f2e7b..6215cce 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java
@@ -42,8 +42,8 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.runtime.persistence.transaction.IsisTransactionAspectSupport;
import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Service
@Named("isisRuntimeServices.TransactionServiceSpring")
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java
index f5577aa..154837a 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java
@@ -33,8 +33,8 @@ import org.apache.isis.applib.mixins.timestamp.HoldsUpdatedBy;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.user.UserService;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Service
@Named("isisRuntime.TimestampService")
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java
index 9263f22..b091c9d 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java
@@ -41,8 +41,8 @@ import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.actions.action.invocation.CommandUtil;
import org.apache.isis.metamodel.facets.object.audit.AuditableFacet;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* Wrapper around {@link org.apache.isis.applib.services.audit.AuditerService}.
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java
index b905d55..60e8fe9 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java
@@ -45,8 +45,8 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Service
@Named("isisRuntime.ChangedObjectsService")
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
index cad97ec..8e91395 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
@@ -53,8 +53,8 @@ import org.apache.isis.security.api.authentication.manager.AuthenticationManager
import static org.apache.isis.commons.internal.base._With.requires;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* Is the factory of {@link IsisSession}s, also holding a reference to the current session using
diff --git a/core/schema/src/main/java/org/apache/isis/schema/IsisModuleSchema.java b/core/schema/src/main/java/org/apache/isis/schema/IsisModuleSchema.java
index 2650cb5..e5c361d 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/IsisModuleSchema.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/IsisModuleSchema.java
@@ -18,11 +18,11 @@
*/
package org.apache.isis.schema;
-import org.apache.isis.commons.IsisModuleCommons;
-import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.isis.commons.IsisModuleCommons;
+
@Configuration
@Import({
IsisModuleCommons.class
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
index 1204514..3bec52d 100644
--- a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
+++ b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
@@ -52,8 +52,8 @@ import org.apache.isis.webapp.modules.WebModuleContext;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* WebModule to enable support for Shiro.
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java
index 1cff5bb..d112c01 100644
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java
+++ b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java
@@ -26,8 +26,8 @@ import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import static org.apache.isis.commons.internal.base._With.requires;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Log4j2
class _Config_LifecycleResource {
diff --git a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java
index d451773..b0b8888 100644
--- a/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java
+++ b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java
@@ -26,8 +26,8 @@ import javax.annotation.Nullable;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Arrays;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Log4j2
final class _Config_Parsers {
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
index 8a29500..a496e23 100644
--- a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
@@ -48,8 +48,8 @@ import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import static org.apache.isis.commons.internal.base._With.requires;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java b/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java
index 082481b..07f43c8 100644
--- a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java
+++ b/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java
@@ -27,8 +27,8 @@ import org.apache.wicket.model.Model;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.webapp.context.memento.ObjectMemento;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* For widgets that use a <tt>org.wicketstuff.select2.Select2MultiChoice</tt>;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
index 3200ec8..c246679 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
@@ -49,8 +49,8 @@ import org.apache.isis.webapp.context.IsisWebAppCommonContext;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationConfig;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Log4j2
public final class ServiceActionUtil {
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
index 7a682c3..f192fd8 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
@@ -40,8 +40,8 @@ import org.apache.isis.config.IsisConfiguration;
import de.agilecoders.wicket.core.settings.ThemeProvider;
import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchTheme;
import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchThemeProvider;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* @since 2.0
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeProviderComposite.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeProviderComposite.java
index 242d6a0..816bd51 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeProviderComposite.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeProviderComposite.java
@@ -32,8 +32,8 @@ import org.apache.isis.commons.internal.collections._Maps;
import de.agilecoders.wicket.core.settings.ITheme;
import de.agilecoders.wicket.core.settings.ThemeProvider;
import lombok.RequiredArgsConstructor;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
*
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
index 6c08b9f..6996d9c 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
@@ -65,8 +65,8 @@ import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
import org.apache.isis.webapp.context.memento.ObjectMemento;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
@Log4j2
public final class FormExecutorDefault<M extends BookmarkableModel<ManagedObject> & ParentEntityModelProvider>
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
index 6ead0fd..77b9676 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
@@ -68,8 +68,8 @@ import org.apache.isis.viewer.wicket.ui.pages.mmverror.MmvErrorPage;
import org.apache.isis.viewer.wicket.ui.panels.PromptFormAbstract;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* Isis-specific implementation of the Wicket's {@link RequestCycle},
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
index 4783d39..0de7f78 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
@@ -50,8 +50,8 @@ import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar.C
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* Implementation of {@link ComponentFactoryRegistry} that delegates to a
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
index 1777e33..6aa29f2 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
@@ -41,8 +41,8 @@ import org.apache.isis.applib.services.i18n.TranslationsResolver;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.viewer.wicket.viewer.wicketapp.IsisWicketApplication;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMarshaller.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMarshaller.java
index 1a33734..e1ec967 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMarshaller.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMarshaller.java
@@ -35,8 +35,8 @@ import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* converts a {@link ManagedObject} to serializable {@link Data}
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java
index 44a25c8..53f9311 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java
@@ -36,8 +36,8 @@ import static org.apache.isis.commons.internal.functions._Predicates.not;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* Converts serializable {@link Data} back to a {@link ManagedObject}.
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
index ee92132..ebbd881 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
@@ -105,11 +105,12 @@ import de.agilecoders.wicket.webjars.WicketWebjars;
import de.agilecoders.wicket.webjars.settings.IWebjarsSettings;
import de.agilecoders.wicket.webjars.settings.WebjarsSettings;
import lombok.Getter;
-import lombok.val;
-//import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
import net.ftlines.wicketsource.WicketSource;
+//import lombok.val;
+
/**
* Main application, subclassing the Wicket {@link Application} and
* bootstrapping Isis.
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java b/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
index 618bd68..1f94521 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
@@ -37,8 +37,8 @@ import org.apache.isis.webapp.webappctx.IsisWebAppContextInitializer.ServletCont
import lombok.Getter;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
*
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java b/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
index 8cb2411..9805aea 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
@@ -41,8 +41,8 @@ import org.apache.isis.metamodel.commons.StringExtensions;
import static org.apache.isis.commons.internal.base._Strings.pair;
import static org.apache.isis.commons.internal.base._With.ifPresentElseGet;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
* Handles HTML-templates, where template's placeholders get replaced by their values.
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextListener.java b/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextListener.java
index e40d472..5cc6cac 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextListener.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextListener.java
@@ -30,8 +30,8 @@ import org.apache.isis.webapp.modules.WebModule;
import org.apache.isis.webapp.modules.WebModuleContext;
import org.apache.isis.webapp.webappctx.IsisWebAppContextInitializer.ServletContextResource;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
*