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
The following commit(s) were added to refs/heads/master by this push:
new d0244c49e5 ISIS-3112: minor: some batch 'organize imports'
d0244c49e5 is described below
commit d0244c49e56319846b69de3ee8ac3b029cef6b5d
Author: andi-huber <[email protected]>
AuthorDate: Mon Aug 8 10:13:28 2022 +0200
ISIS-3112: minor: some batch 'organize imports'
---
.../metamodel/Object_downloadMetamodelXml.java | 2 +-
.../mixins/metamodel/Object_logicalTypeName.java | 1 -
.../services/appfeat/ApplicationFeatureId.java | 8 +++----
.../conmap/ContentMappingServiceForCommandDto.java | 20 ++++++++--------
.../services/metamodel/MetaModelServiceMenu.java | 4 ++--
.../services/publishing/log/CommandLogger.java | 2 +-
.../apache/isis/applib/services/wrapper/Mixin.java | 2 --
.../applib/value/semantics/DefaultsProvider.java | 2 ++
.../isis/applib/value/semantics/OrderRelation.java | 2 ++
.../apache/isis/core/config/IsisConfiguration.java | 1 -
.../config/environment/IsisLocaleInitializer.java | 3 +--
.../config/environment/IsisSystemEnvironment.java | 27 +++++++++++-----------
.../environment/IsisTimeZoneInitializer.java | 3 +--
.../_testing/MetaModelContext_forTesting.java | 4 ++--
.../_testing/ServiceInjector_forTesting.java | 4 ++--
.../actions/action/invocation/IdentifierUtil.java | 4 ++--
.../metamodel/facets/jaxb/JaxbFacetFactory.java | 2 +-
.../DomainObjectAnnotationFacetFactory.java | 3 +--
.../LogicalTypeFacetFromClassNameFactory.java | 14 ++---------
.../ValueSemanticsSelectingFacet.java | 2 --
.../objectmanager/ObjectManagerDefault.java | 2 +-
.../ProgrammingModelInitFilterDefault.java | 2 +-
.../dflt/ProgrammingModelFacetsJava11.java | 4 +---
.../metamodel/services/ServiceInjectorDefault.java | 9 ++++----
.../services/grid/GridLoaderServiceDefault.java | 2 +-
.../grid/bootstrap/GridSystemServiceBootstrap.java | 2 +-
.../objectlifecycle/ObjectLifecyclePublisher.java | 11 ---------
.../objectlifecycle/PropertyChangeRecordId.java | 7 ------
.../services/registry/ServiceRegistryDefault.java | 1 -
.../specloader/specimpl/IntrospectionState.java | 2 --
.../specloader/validator/ValidationFailure.java | 6 ++---
.../idstringifier/IdStringifierLookupService.java | 15 ++++++------
.../publish/ExecutionPublisherDefault.java | 3 +--
.../publish/ObjectLifecyclePublisherDefault.java | 15 +++---------
.../wrapper/proxy/ProxyCreator.java | 6 ++++-
.../excel/applib/service/ExcelServiceDefault.java | 2 +-
.../excel/applib/service/_ExcelConverter.java | 11 ++++-----
.../excel/applib/service/_ExcelServiceHelper.java | 4 ++--
.../excel/applib/util/ExcelFileBlobConverter.java | 11 ++++-----
.../demoapp/todomodule/dom/ExcelDemoToDoItem.java | 1 -
.../extensions/excel/testing/ExcelFixture2.java | 4 ++--
.../excel/testing/FixtureAwareRowHandler.java | 2 +-
.../applib/IsisModuleExtCommandLogApplib.java | 1 -
.../HasInteractionId_commandLogEntry.java | 1 -
.../contributions/Object_recentCommands.java | 1 -
.../commandlog/jdo/dom/CommandLogEntry.java | 4 +---
.../contributions/Object_recentExecutions.java | 1 -
.../executionlog/applib/dom/ExecutionLogEntry.java | 2 --
.../ExecutionLogEntry_siblingExecutions.java | 1 -
.../executionlog/jdo/dom/ExecutionLogEntry.java | 1 -
.../applib/restapi/OutboxRestApi.java | 1 -
.../jdo/dom/ExecutionOutboxEntry.java | 4 +---
.../jdo/dom/ExecutionOutboxEntryRepository.java | 1 -
.../Object_recentAuditTrailEntries.java | 1 -
.../audittrail/jpa/dom/AuditTrailEntry.java | 1 -
.../permission/dom/ApplicationPermission.java | 1 -
.../ApplicationPermissionRepositoryAbstract.java | 1 -
.../applib/tenancy/dom/ApplicationTenancy.java | 2 --
.../secman/applib/tenancy/dom/HasAtPath.java | 3 ---
.../jdo/permission/dom/ApplicationPermission.java | 1 -
.../secman/jdo/role/dom/ApplicationRole.java | 1 -
.../secman/jdo/tenancy/dom/ApplicationTenancy.java | 1 -
.../secman/jdo/user/dom/ApplicationUser.java | 1 -
.../jpa/permission/dom/ApplicationPermission.java | 4 +---
.../secman/jpa/tenancy/dom/ApplicationTenancy.java | 1 -
.../applib/IsisModuleExtSessionLogApplib.java | 2 +-
.../oauth2/IsisModuleExtSpringSecurityOAuth2.java | 2 +-
.../fullcalendar/applib/value/CalendarEvent.java | 1 -
.../fullcalendar/res/FullCalendarCssReference.java | 3 +--
.../fullcalendar/res/FullCalendarJsReference.java | 3 +--
.../wkt/viewer/CalendaredCollectionAbstract.java | 3 +--
.../wkt/viewer/FullCalendarWithEventHandling.java | 3 +--
72 files changed, 102 insertions(+), 183 deletions(-)
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetamodelXml.java
b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetamodelXml.java
index d182e3f907..adc102ee7e 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetamodelXml.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetamodelXml.java
@@ -31,8 +31,8 @@ import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.id.LogicalType;
-import org.apache.isis.applib.mixins.dto.DtoMixinConstants;
import org.apache.isis.applib.layout.LayoutConstants;
+import org.apache.isis.applib.mixins.dto.DtoMixinConstants;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.metamodel.Config;
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java
b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java
index 5309b28819..980d9aea7f 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java
@@ -21,7 +21,6 @@ package org.apache.isis.applib.mixins.metamodel;
import javax.inject.Inject;
import org.apache.isis.applib.annotation.Action;
-import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Property;
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java
b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java
index cc3eee3fe9..0ae4cc67e2 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java
@@ -22,10 +22,6 @@ import java.io.Serializable;
import java.util.Comparator;
import java.util.function.Consumer;
-import static java.util.Comparator.comparing;
-import static java.util.Comparator.naturalOrder;
-import static java.util.Comparator.nullsFirst;
-
import org.springframework.lang.Nullable;
import org.apache.isis.applib.Identifier;
@@ -43,6 +39,10 @@ import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.exceptions._Exceptions;
+import static java.util.Comparator.comparing;
+import static java.util.Comparator.naturalOrder;
+import static java.util.Comparator.nullsFirst;
+
import lombok.Getter;
import lombok.NonNull;
import lombok.Synchronized;
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.java
b/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.java
index 077b22ceba..a339d6bd4d 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.java
@@ -18,7 +18,16 @@
*/
package org.apache.isis.applib.services.commanddto.conmap;
-import lombok.val;
+import java.util.List;
+
+import javax.annotation.Priority;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.ws.rs.core.MediaType;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.lang.Nullable;
+import org.springframework.stereotype.Service;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotation.PriorityPrecedence;
@@ -28,15 +37,8 @@ import
org.apache.isis.applib.services.commanddto.processor.spi.CommandDtoProces
import org.apache.isis.applib.services.conmap.ContentMappingService;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.schema.cmd.v2.CommandDto;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-import org.springframework.lang.Nullable;
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.ws.rs.core.MediaType;
-import java.util.List;
+import lombok.val;
/**
*
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServiceMenu.java
b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServiceMenu.java
index 3b4dd66b6c..eb24c411d1 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServiceMenu.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServiceMenu.java
@@ -23,8 +23,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.SortedSet;
-import static java.nio.charset.StandardCharsets.UTF_8;
-
import javax.inject.Inject;
import javax.inject.Named;
@@ -48,6 +46,8 @@ import
org.apache.isis.applib.value.NamedWithMimeType.CommonMimeType;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.schema.metamodel.v2.MetamodelDto;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
/**
* Provides a UI to allow domain model metadata (obtained from {@link
MetaModelService}) to be downloaded.
*
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/CommandLogger.java
b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/CommandLogger.java
index 3d6422f1bd..ced3e75f0c 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/CommandLogger.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/CommandLogger.java
@@ -30,8 +30,8 @@ import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.publishing.spi.CommandSubscriber;
import org.apache.isis.applib.util.schema.CommandDtoUtils;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Simple implementation of {@link CommandSubscriber} that just logs out the
{@link Command Command}'s
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/Mixin.java
b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/Mixin.java
index 68d9c90066..e980659ce8 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/Mixin.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/Mixin.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.applib.services.wrapper;
-import org.apache.isis.applib.services.wrapper.control.SyncControl;
-
/**
* Marker interface that mixins can optionally implement, to indicate the type
of the mixee that they require.
*
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/DefaultsProvider.java
b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/DefaultsProvider.java
index 822ad8b559..36bfd16099 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/DefaultsProvider.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/DefaultsProvider.java
@@ -18,6 +18,8 @@
*/
package org.apache.isis.applib.value.semantics;
+import org.apache.isis.commons.internal.memento._Mementos.EncoderDecoder;
+
/**
* Provides a mechanism for providing a default value for an object.
*
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/OrderRelation.java
b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/OrderRelation.java
index 3a9f22d0db..9aeb425c5a 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/OrderRelation.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/OrderRelation.java
@@ -18,6 +18,8 @@
*/
package org.apache.isis.applib.value.semantics;
+import org.apache.isis.commons.internal.memento._Mementos.EncoderDecoder;
+
/**
* Provides an ordering relation for a given value-type.
* <p>
diff --git
a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index 5fa784bd5b..a92b7796ae 100644
---
a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++
b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -62,7 +62,6 @@ import org.apache.isis.applib.services.userui.UserMenu;
import
org.apache.isis.applib.value.semantics.TemporalValueSemantics.TemporalEditingPattern;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.core.config.IsisConfiguration.Viewer;
import org.apache.isis.core.config.metamodel.facets.DefaultViewConfiguration;
import
org.apache.isis.core.config.metamodel.facets.EditingObjectsConfiguration;
import
org.apache.isis.core.config.metamodel.facets.PublishingPolicies.ActionPublishingPolicy;
diff --git
a/core/config/src/main/java/org/apache/isis/core/config/environment/IsisLocaleInitializer.java
b/core/config/src/main/java/org/apache/isis/core/config/environment/IsisLocaleInitializer.java
index 2bbdc810c3..983123302c 100644
---
a/core/config/src/main/java/org/apache/isis/core/config/environment/IsisLocaleInitializer.java
+++
b/core/config/src/main/java/org/apache/isis/core/config/environment/IsisLocaleInitializer.java
@@ -27,9 +27,8 @@ import org.springframework.stereotype.Component;
import org.apache.isis.core.config.IsisConfiguration;
-import lombok.extern.log4j.Log4j2;
-
import jakarta.annotation.PostConstruct;
+import lombok.extern.log4j.Log4j2;
@Component
@Log4j2
diff --git
a/core/config/src/main/java/org/apache/isis/core/config/environment/IsisSystemEnvironment.java
b/core/config/src/main/java/org/apache/isis/core/config/environment/IsisSystemEnvironment.java
index 4c632e060f..80cc83bdbb 100644
---
a/core/config/src/main/java/org/apache/isis/core/config/environment/IsisSystemEnvironment.java
+++
b/core/config/src/main/java/org/apache/isis/core/config/environment/IsisSystemEnvironment.java
@@ -18,13 +18,12 @@
*/
package org.apache.isis.core.config.environment;
-import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
-import lombok.val;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.ioc._IocContainer;
-import org.apache.isis.core.config.IsisModuleCoreConfig;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.annotation.Priority;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.context.event.ApplicationFailedEvent;
@@ -34,12 +33,14 @@ import
org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.commons.internal.ioc._IocContainer;
+import org.apache.isis.core.config.IsisModuleCoreConfig;
+
+import lombok.Getter;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Represents configuration, that is required in an early bootstrapping phase.
diff --git
a/core/config/src/main/java/org/apache/isis/core/config/environment/IsisTimeZoneInitializer.java
b/core/config/src/main/java/org/apache/isis/core/config/environment/IsisTimeZoneInitializer.java
index 9bf964aa79..d134f03cf2 100644
---
a/core/config/src/main/java/org/apache/isis/core/config/environment/IsisTimeZoneInitializer.java
+++
b/core/config/src/main/java/org/apache/isis/core/config/environment/IsisTimeZoneInitializer.java
@@ -26,9 +26,8 @@ import org.springframework.stereotype.Component;
import org.apache.isis.core.config.IsisConfiguration;
-import lombok.extern.log4j.Log4j2;
-
import jakarta.annotation.PostConstruct;
+import lombok.extern.log4j.Log4j2;
@Component
@Log4j2
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/MetaModelContext_forTesting.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/MetaModelContext_forTesting.java
index e47fdbf7e2..819067aa0a 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/MetaModelContext_forTesting.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/MetaModelContext_forTesting.java
@@ -27,8 +27,6 @@ import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Stream;
-import static java.util.Objects.requireNonNull;
-
import org.springframework.core.env.AbstractEnvironment;
import org.apache.isis.applib.services.factory.FactoryService;
@@ -94,6 +92,8 @@ import
org.apache.isis.core.metamodel.valuetypes.ValueSemanticsResolverDefault;
import
org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import
org.apache.isis.core.security.authorization.manager.AuthorizationManager;
+import static java.util.Objects.requireNonNull;
+
import lombok.Builder;
import lombok.Getter;
import lombok.NonNull;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/ServiceInjector_forTesting.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/ServiceInjector_forTesting.java
index f3f30b61ef..7db3c941b7 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/ServiceInjector_forTesting.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/ServiceInjector_forTesting.java
@@ -18,11 +18,11 @@
*/
package org.apache.isis.core.metamodel._testing;
-import static java.util.Objects.requireNonNull;
-
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.metamodel.context.MetaModelContext;
+import static java.util.Objects.requireNonNull;
+
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/IdentifierUtil.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/IdentifierUtil.java
index 497d1dcdc8..e557699196 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/IdentifierUtil.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/IdentifierUtil.java
@@ -28,7 +28,6 @@ import
org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.commons.StringExtensions;
import org.apache.isis.core.metamodel.interactions.InteractionHead;
import
org.apache.isis.core.metamodel.interactions.managed.ActionInteractionHead;
-import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
@@ -105,7 +104,8 @@ public class IdentifierUtil {
ObjectAction objectAction = (ObjectAction) objectMember;
if (objectAction.isDeclaredOnMixin()) {
if (interactionHead instanceof ActionInteractionHead) {
- ObjectAction objectActionOnMixee =
((ActionInteractionHead) interactionHead).getMetaModel();
+ ObjectAction objectActionOnMixee =
+ ((ActionInteractionHead)
interactionHead).getMetaModel();
ObjectSpecification specificationOfMixee =
interactionHead.getOwner().getSpecification();
return logicalMemberIdentifierFor(specificationOfMixee,
objectActionOnMixee);
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/JaxbFacetFactory.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/JaxbFacetFactory.java
index 28adae515f..7c04e8404c 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/JaxbFacetFactory.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/JaxbFacetFactory.java
@@ -41,8 +41,8 @@ import
org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import
org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacetForXmlRootElementAnnotation;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
+import
org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacetForXmlRootElementAnnotation;
import
org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index 41252a92b0..79b10d397d 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -46,7 +46,6 @@ import
org.apache.isis.applib.events.lifecycle.ObjectRemovingEvent;
import org.apache.isis.applib.events.lifecycle.ObjectUpdatedEvent;
import org.apache.isis.applib.events.lifecycle.ObjectUpdatingEvent;
import org.apache.isis.applib.id.LogicalType;
-import org.apache.isis.applib.mixins.system.HasInteractionId;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Multimaps;
import org.apache.isis.core.config.progmodel.ProgrammingModelConstants;
@@ -195,7 +194,7 @@ implements
void processEntityChangePublishing(
final Optional<DomainObject> domainObjectIfAny,
final ProcessClassContext processClassContext) {
- val cls = processClassContext.getCls();
+ //val cls = processClassContext.getCls();
val facetHolder = processClassContext.getFacetHolder();
// check for @DomainObject(entityChangePublishing=....)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java
index 4cc5aff593..d57c508e1c 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.core.metamodel.facets.object.logicaltype.classname;
-import java.util.Collections;
-
import javax.inject.Inject;
import javax.xml.bind.annotation.XmlType;
@@ -30,8 +28,6 @@ import
org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.ObjectTypeFacetFactory;
import
org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
-import
org.apache.isis.core.metamodel.services.classsubstitutor.ClassSubstitutorDefault;
-import
org.apache.isis.core.metamodel.services.classsubstitutor.ClassSubstitutorRegistry;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.MixedIn;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailure;
@@ -44,23 +40,17 @@ implements
ObjectTypeFacetFactory,
MetaModelRefiner {
- private ClassSubstitutorRegistry classSubstitutorRegistry;
-
@Inject
public LogicalTypeFacetFromClassNameFactory(
- final MetaModelContext mmc,
- final ClassSubstitutorRegistry classSubstitutorRegistry) {
+ final MetaModelContext mmc) {
super(mmc, FeatureType.OBJECTS_ONLY);
- this.classSubstitutorRegistry = classSubstitutorRegistry;
}
// -- JUNIT SUPPORT
public static LogicalTypeFacetFromClassNameFactory forTesting(
final MetaModelContext mmc) {
- return new LogicalTypeFacetFromClassNameFactory(
- mmc,
- new ClassSubstitutorRegistry(Collections.singletonList(new
ClassSubstitutorDefault())));
+ return new LogicalTypeFacetFromClassNameFactory(mmc);
}
@Override
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/valuesemantics/ValueSemanticsSelectingFacet.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/valuesemantics/ValueSemanticsSelectingFacet.java
index a0e8bc174a..2889d13cd2 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/valuesemantics/ValueSemanticsSelectingFacet.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/valuesemantics/ValueSemanticsSelectingFacet.java
@@ -22,8 +22,6 @@ import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.value.Blob;
-import org.apache.isis.applib.value.Clob;
import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
/**
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java
index 50f77587a0..eb8e58db25 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java
@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.PriorityPrecedence;
+import org.apache.isis.core.metamodel.IsisModuleCoreMetamodel;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.create.ObjectCreator;
import org.apache.isis.core.metamodel.objectmanager.detach.ObjectDetacher;
@@ -40,7 +41,6 @@ import
org.apache.isis.core.metamodel.objectmanager.serialize.ObjectSerializer;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.val;
-import org.apache.isis.core.metamodel.IsisModuleCoreMetamodel;
/**
*
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
index 9f75974de6..2aac01ddff 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
@@ -28,6 +28,7 @@ import javax.inject.Named;
import org.springframework.stereotype.Component;
import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.IsisModuleCoreMetamodel;
import org.apache.isis.core.metamodel.facets.FacetFactory;
import
org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProcessor;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
@@ -36,7 +37,6 @@ import static
org.apache.isis.core.metamodel.progmodel.ProgrammingModelInitFilte
import static
org.apache.isis.core.metamodel.progmodel.ProgrammingModelInitFilter.excludingNone;
import lombok.val;
-import org.apache.isis.core.metamodel.IsisModuleCoreMetamodel;
/**
*
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava11.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava11.java
index 440154c976..53133affc2 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava11.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava11.java
@@ -95,7 +95,6 @@ import
org.apache.isis.core.metamodel.postprocessors.param.ChoicesAndDefaultsPos
import
org.apache.isis.core.metamodel.postprocessors.param.TypicalLengthFromTypePostProcessor;
import
org.apache.isis.core.metamodel.postprocessors.properties.DisabledFromImmutablePostProcessor;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModelAbstract;
-import
org.apache.isis.core.metamodel.services.classsubstitutor.ClassSubstitutorRegistry;
import
org.apache.isis.core.metamodel.services.title.TitlesAndTranslationsValidator;
import lombok.val;
@@ -119,13 +118,12 @@ extends ProgrammingModelAbstract {
private void addFacetFactories() {
val mmc = getMetaModelContext();
- val classSubstitutorRegistry =
mmc.getServiceRegistry().lookupServiceElseFail(ClassSubstitutorRegistry.class);
// must be first, so any Facets created can be replaced by other
// FacetFactorys later.
addFactory(FacetProcessingOrder.A1_FALLBACK_DEFAULTS, new
FallbackFacetFactory(mmc));
- addFactory(FacetProcessingOrder.B1_OBJECT_NAMING, new
LogicalTypeFacetFromClassNameFactory(mmc, classSubstitutorRegistry));
+ addFactory(FacetProcessingOrder.B1_OBJECT_NAMING, new
LogicalTypeFacetFromClassNameFactory(mmc));
addFactory(FacetProcessingOrder.B1_OBJECT_NAMING, new
DomainServiceFacetAnnotationFactory(mmc));
addFactory(FacetProcessingOrder.B1_OBJECT_NAMING, new
ValueFacetForValueAnnotationOrAnyMatchingValueSemanticsFacetFactory(mmc));
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
index 14729076d7..5ca2acc885 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
@@ -18,18 +18,19 @@
*/
package org.apache.isis.core.metamodel.services;
-import org.springframework.lang.Nullable;
import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
+import org.springframework.lang.Nullable;
+import org.springframework.stereotype.Service;
+
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.metamodel.IsisModuleCoreMetamodel;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
-import org.springframework.stereotype.Service;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
index 7aaf53f85c..c4c9cfa688 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
@@ -24,12 +24,12 @@ import java.util.Objects;
import java.util.Optional;
import java.util.stream.Stream;
-import org.springframework.lang.Nullable;
import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.PriorityPrecedence;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
index 2c47c082e4..535b9eec7b 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
@@ -37,6 +37,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.PriorityPrecedence;
+import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.layout.component.ActionLayoutData;
import org.apache.isis.applib.layout.component.ActionLayoutDataOwner;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
@@ -50,7 +51,6 @@ import org.apache.isis.applib.layout.grid.bootstrap.BSRow;
import org.apache.isis.applib.layout.grid.bootstrap.BSTab;
import org.apache.isis.applib.layout.grid.bootstrap.BSTabGroup;
import org.apache.isis.applib.layout.grid.bootstrap.Size;
-import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.message.MessageService;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/objectlifecycle/ObjectLifecyclePublisher.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/objectlifecycle/ObjectLifecyclePublisher.java
index 006f1a0b16..b81cd333b9 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/objectlifecycle/ObjectLifecyclePublisher.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/objectlifecycle/ObjectLifecyclePublisher.java
@@ -18,23 +18,12 @@
*/
package org.apache.isis.core.metamodel.services.objectlifecycle;
-import java.sql.Timestamp;
-
import org.springframework.lang.Nullable;
import org.apache.isis.applib.services.factory.FactoryService;
-import org.apache.isis.applib.services.publishing.spi.EntityPropertyChange;
-import org.apache.isis.applib.services.xactn.TransactionId;
import org.apache.isis.commons.collections.Can;
-import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import
org.apache.isis.core.metamodel.facets.object.publish.entitychange.EntityChangePublishingFacet;
-import
org.apache.isis.core.metamodel.facets.properties.property.entitychangepublishing.EntityPropertyChangePublishingPolicyFacet;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.metamodel.spec.ManagedObjects;
-import org.apache.isis.core.metamodel.spec.feature.MixedIn;
-
-import lombok.NonNull;
/**
* Responsible for collecting and then passing along changes (to the
EntityChangeTracker, in persistence commons) so
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/objectlifecycle/PropertyChangeRecordId.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/objectlifecycle/PropertyChangeRecordId.java
index 57674953be..3fc9856ab3 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/objectlifecycle/PropertyChangeRecordId.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/objectlifecycle/PropertyChangeRecordId.java
@@ -18,22 +18,15 @@
*/
package org.apache.isis.core.metamodel.services.objectlifecycle;
-import java.sql.Timestamp;
-
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.applib.services.publishing.spi.EntityPropertyChange;
-import org.apache.isis.applib.services.xactn.TransactionId;
-import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ManagedObjects;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NonNull;
import lombok.ToString;
-import lombok.val;
@EqualsAndHashCode(of = {"bookmarkStr", "propertyId"})
@ToString(of = {"bookmarkStr", "propertyId"})
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
index 95c6c97376..9979c4089b 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
@@ -36,7 +36,6 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.ioc._IocContainer;
import org.apache.isis.commons.internal.ioc._ManagedBeanAdapter;
import org.apache.isis.core.config.beans.IsisBeanTypeRegistry;
import org.apache.isis.core.config.environment.IsisSystemEnvironment;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/IntrospectionState.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/IntrospectionState.java
index 9163ef62dc..b1b8f8de1a 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/IntrospectionState.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/IntrospectionState.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.core.metamodel.specloader.specimpl;
-import org.apache.isis.core.metamodel.facets.object.logicaltype.AliasedFacet;
-
public enum IntrospectionState implements Comparable<IntrospectionState> {
/**
* At this stage, {@link LogicalTypeFacet} only.
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/ValidationFailure.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/ValidationFailure.java
index 29307b353e..270b5c0c0d 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/ValidationFailure.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/ValidationFailure.java
@@ -21,13 +21,13 @@ package org.apache.isis.core.metamodel.specloader.validator;
import java.util.Comparator;
import java.util.Objects;
-import static java.util.Comparator.naturalOrder;
-import static java.util.Comparator.nullsFirst;
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import static java.util.Comparator.naturalOrder;
+import static java.util.Comparator.nullsFirst;
+
import lombok.NonNull;
import lombok.Value;
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/idstringifier/IdStringifierLookupService.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/idstringifier/IdStringifierLookupService.java
index 6fd2a151dc..21b36353ea 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/idstringifier/IdStringifierLookupService.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/idstringifier/IdStringifierLookupService.java
@@ -37,15 +37,12 @@ import
org.apache.isis.applib.services.bookmark.IdStringifier;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.core.runtime.IsisModuleCoreRuntime;
-import lombok.Builder;
-import lombok.EqualsAndHashCode;
import lombok.RequiredArgsConstructor;
-import lombok.ToString;
import lombok.val;
/**
- * Convenience service that looks up (and caches) the {@link IdStringifier}
available for a given value class, and
- * optionally the class of the owning entity.
+ * Convenience service that looks up (and caches) the {@link IdStringifier}
+ * available for a given value class, and optionally the class of the owning
entity.
*
* <p>
* This is intended for framework use, there is little reason to call it
or override it.
@@ -64,7 +61,7 @@ public class IdStringifierLookupService {
private final List<IdStringifier<?>> idStringifiers;
private final Map<Class<?>, IdStringifier<?>> stringifierByClass = new
ConcurrentHashMap<>();
- public <T> IdStringifier<T> lookupElseFail(Class<T> candidateValueClass) {
+ public <T> IdStringifier<T> lookupElseFail(final Class<T>
candidateValueClass) {
val idStringifier =
stringifierByClass.computeIfAbsent(candidateValueClass, aClass -> {
for (val candidateStringifier : idStringifiers) {
if (candidateStringifier.handles(candidateValueClass)) {
@@ -74,10 +71,12 @@ public class IdStringifierLookupService {
return null;
});
return
Optional.<IdStringifier<T>>ofNullable(_Casts.uncheckedCast(idStringifier))
- .orElseThrow(() -> new
IllegalStateException(String.format("Could not locate an IdStringifier to
handle '%s'", candidateValueClass)));
+ .orElseThrow(() -> new IllegalStateException(
+ String.format("Could not locate an IdStringifier to
handle '%s'",
+ candidateValueClass)));
}
- public <T> Optional<IdStringifier<T>> lookup(Class<T> candidateValueClass)
{
+ public <T> Optional<IdStringifier<T>> lookup(final Class<T>
candidateValueClass) {
val idStringifier =
stringifierByClass.computeIfAbsent(candidateValueClass, aClass -> {
for (val candidateStringifier : idStringifiers) {
if (candidateStringifier.handles(candidateValueClass)) {
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ExecutionPublisherDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ExecutionPublisherDefault.java
index c8e641a8b5..f8ae1d65cf 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ExecutionPublisherDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ExecutionPublisherDefault.java
@@ -22,14 +22,13 @@ import java.util.List;
import java.util.concurrent.atomic.LongAdder;
import java.util.function.Supplier;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.lang.Nullable;
import javax.annotation.PostConstruct;
import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.InteractionScope;
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java
index 91a6473f28..431f464998 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java
@@ -30,22 +30,11 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.iactnlayer.InteractionService;
import org.apache.isis.commons.collections.Can;
-import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackFacet;
-import
org.apache.isis.core.metamodel.facets.object.callbacks.LoadedCallbackFacet;
-import
org.apache.isis.core.metamodel.facets.object.callbacks.LoadedLifecycleEventFacet;
-import
org.apache.isis.core.metamodel.facets.object.callbacks.PersistedCallbackFacet;
-import
org.apache.isis.core.metamodel.facets.object.callbacks.PersistedLifecycleEventFacet;
-import
org.apache.isis.core.metamodel.facets.object.callbacks.RemovingCallbackFacet;
-import
org.apache.isis.core.metamodel.facets.object.callbacks.RemovingLifecycleEventFacet;
-import
org.apache.isis.core.metamodel.facets.object.callbacks.UpdatedCallbackFacet;
-import
org.apache.isis.core.metamodel.facets.object.callbacks.UpdatedLifecycleEventFacet;
-import
org.apache.isis.core.metamodel.facets.object.publish.entitychange.EntityChangePublishingFacet;
import
org.apache.isis.core.metamodel.services.objectlifecycle.ObjectLifecyclePublisher;
import
org.apache.isis.core.metamodel.services.objectlifecycle.PropertyChangeRecord;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.core.transaction.changetracking.EntityChangeTracker;
-import org.apache.isis.core.transaction.changetracking.events.PostStoreEvent;
import lombok.RequiredArgsConstructor;
@@ -70,7 +59,9 @@ public class ObjectLifecyclePublisherDefault implements
ObjectLifecyclePublisher
}
private EntityChangeTracker entityChangeTracker() {
- return interactionService().isInInteraction() ?
entityChangeTrackerProvider.get() : EntityChangeTracker.NOOP;
+ return interactionService().isInInteraction()
+ ? entityChangeTrackerProvider.get()
+ : EntityChangeTracker.NOOP;
}
LifecycleCallbackNotifier lifecycleCallbackNotifier() {
diff --git
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreator.java
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreator.java
index a8a99c5d40..5a11461e91 100644
---
a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreator.java
+++
b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreator.java
@@ -42,7 +42,11 @@ public class ProxyCreator {
final Class<T> base = _Casts.uncheckedCast(toProxy.getClass());
if (base.isInterface()) {
- return (T) Proxy.newProxyInstance(base.getClassLoader(),
_Arrays.combine(base, (Class<?>[]) new Class[]{WrappingObject.class}) ,
handler);
+ return _Casts.uncheckedCast(
+ Proxy.newProxyInstance(
+ base.getClassLoader(),
+ _Arrays.combine(base, (Class<?>[]) new
Class[]{WrappingObject.class}),
+ handler));
} else {
final _ProxyFactory<T> proxyFactory =
proxyFactoryService.factory(base, WrappingObject.class);
return proxyFactory.createInstance(handler, false);
diff --git
a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/ExcelServiceDefault.java
b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/ExcelServiceDefault.java
index dd50f5f61c..0ba36a5630 100644
---
a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/ExcelServiceDefault.java
+++
b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/ExcelServiceDefault.java
@@ -38,9 +38,9 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.extensions.excel.applib.ExcelService;
+import org.apache.isis.extensions.excel.applib.Mode;
import org.apache.isis.extensions.excel.applib.WorksheetContent;
import org.apache.isis.extensions.excel.applib.WorksheetSpec;
-import org.apache.isis.extensions.excel.applib.Mode;
@Service
diff --git
a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelConverter.java
b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelConverter.java
index a4f29111aa..8479d5a84e 100644
---
a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelConverter.java
+++
b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelConverter.java
@@ -33,8 +33,6 @@ import java.util.UUID;
import java.util.function.Predicate;
import java.util.stream.Collectors;
-import org.springframework.lang.Nullable;
-
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
@@ -45,6 +43,7 @@ import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.lang.Nullable;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.bookmark.BookmarkService;
@@ -65,15 +64,15 @@ import
org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.extensions.excel.applib.AggregationType;
import org.apache.isis.extensions.excel.applib.ExcelMetaDataEnabled;
+import org.apache.isis.extensions.excel.applib.Mode;
+import org.apache.isis.extensions.excel.applib.RowHandler;
+import org.apache.isis.extensions.excel.applib.WorksheetContent;
+import org.apache.isis.extensions.excel.applib.WorksheetSpec;
import org.apache.isis.extensions.excel.applib.annotation.HyperLink;
import org.apache.isis.extensions.excel.applib.annotation.PivotColumn;
import org.apache.isis.extensions.excel.applib.annotation.PivotDecoration;
import org.apache.isis.extensions.excel.applib.annotation.PivotRow;
import org.apache.isis.extensions.excel.applib.annotation.PivotValue;
-import org.apache.isis.extensions.excel.applib.RowHandler;
-import org.apache.isis.extensions.excel.applib.WorksheetContent;
-import org.apache.isis.extensions.excel.applib.WorksheetSpec;
-import org.apache.isis.extensions.excel.applib.Mode;
import org.apache.isis.extensions.excel.applib.util.PivotUtils;
import org.apache.isis.extensions.excel.applib.util.SheetPivoter;
diff --git
a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelServiceHelper.java
b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelServiceHelper.java
index 7998c41edf..0c873bedd6 100644
---
a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelServiceHelper.java
+++
b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelServiceHelper.java
@@ -33,11 +33,11 @@ import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.extensions.excel.applib.WorksheetContent;
+import org.apache.isis.extensions.excel.applib.WorksheetSpec;
import org.apache.isis.extensions.excel.applib.annotation.PivotColumn;
import org.apache.isis.extensions.excel.applib.annotation.PivotRow;
import org.apache.isis.extensions.excel.applib.annotation.PivotValue;
-import org.apache.isis.extensions.excel.applib.WorksheetContent;
-import org.apache.isis.extensions.excel.applib.WorksheetSpec;
import org.apache.isis.extensions.excel.applib.util.ExcelFileBlobConverter;
import lombok.SneakyThrows;
diff --git
a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/ExcelFileBlobConverter.java
b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/ExcelFileBlobConverter.java
index 3caa4bd315..ca0083edd6 100644
---
a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/ExcelFileBlobConverter.java
+++
b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/ExcelFileBlobConverter.java
@@ -22,6 +22,7 @@ import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import org.apache.poi.util.IOUtils;
@@ -31,8 +32,6 @@ import org.apache.isis.commons.internal.base._Bytes;
import org.apache.isis.extensions.excel.applib.ExcelService;
import org.apache.isis.extensions.excel.applib.service.ExcelServiceDefault;
-import lombok.val;
-
/**
* @since 2.0 {@index}
*/
@@ -63,21 +62,19 @@ public class ExcelFileBlobConverter {
private byte[] bytes;
- private byte[] getBytes(URL resource) {
+ private byte[] getBytes(final URL resource) {
if (bytes == null) {
bytes = readBytes(resource);
}
return bytes;
}
- private byte[] readBytes(URL resource) {
- try(val is = resource.openStream()) {
+ private byte[] readBytes(final URL resource) {
+ try(final InputStream is = resource.openStream()) {
return _Bytes.of(is);
} catch (Exception e) {
throw new IllegalArgumentException("Could not read from resource:
" + resource);
}
}
-
-
}
diff --git
a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
index 41c07c9db3..d880d26f3f 100644
---
a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
+++
b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
@@ -45,7 +45,6 @@ import org.apache.isis.applib.annotation.MinLength;
import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.message.MessageService;
diff --git
a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java
b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java
index 1c168361f7..fdae70bd84 100644
---
a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java
+++
b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.extensions.excel.testing;
+import java.io.InputStream;
import java.net.URL;
import java.util.Arrays;
import java.util.List;
@@ -37,7 +38,6 @@ import
org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
import lombok.Setter;
-import lombok.val;
/**
* This class should be executed using
@@ -119,7 +119,7 @@ public class ExcelFixture2 extends FixtureScript {
}
private byte[] readBytes() {
- try(val is = getExcelResource().openStream()) {
+ try(final InputStream is = getExcelResource().openStream()) {
return _Bytes.of(is);
} catch (Exception e) {
throw new IllegalArgumentException("Could not read from resource:
" + getExcelResource());
diff --git
a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/FixtureAwareRowHandler.java
b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/FixtureAwareRowHandler.java
index 69e3ca9075..2ff8f39a16 100644
---
a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/FixtureAwareRowHandler.java
+++
b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/FixtureAwareRowHandler.java
@@ -19,8 +19,8 @@
package org.apache.isis.extensions.excel.testing;
-import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.extensions.excel.applib.RowHandler;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
/**
* @since 2.0 {@index}
diff --git
a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/IsisModuleExtCommandLogApplib.java
b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/IsisModuleExtCommandLogApplib.java
index 90431a5a10..8f17b7ca8a 100644
---
a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/IsisModuleExtCommandLogApplib.java
+++
b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/IsisModuleExtCommandLogApplib.java
@@ -21,7 +21,6 @@ package org.apache.isis.extensions.commandlog.applib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.applib.mixins.security.HasUsername;
import org.apache.isis.core.config.util.SpringProfileUtil;
import org.apache.isis.extensions.commandlog.applib.app.CommandLogMenu;
import
org.apache.isis.extensions.commandlog.applib.contributions.HasInteractionId_commandLogEntry;
diff --git
a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/HasInteractionId_commandLogEntry.java
b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/HasInteractionId_commandLogEntry.java
index 7df0cdee83..b1dbb38d0d 100644
---
a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/HasInteractionId_commandLogEntry.java
+++
b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/HasInteractionId_commandLogEntry.java
@@ -28,7 +28,6 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.mixins.system.HasInteractionId;
-import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
import
org.apache.isis.extensions.commandlog.applib.IsisModuleExtCommandLogApplib;
import org.apache.isis.extensions.commandlog.applib.dom.CommandLogEntry;
diff --git
a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/Object_recentCommands.java
b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/Object_recentCommands.java
index a6353ae813..21b339f2e0 100644
---
a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/Object_recentCommands.java
+++
b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/Object_recentCommands.java
@@ -27,7 +27,6 @@ import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.mixins.system.HasInteractionId;
diff --git
a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/dom/CommandLogEntry.java
b/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/dom/CommandLogEntry.java
index 176145e2d7..506a09bdee 100644
---
a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/dom/CommandLogEntry.java
+++
b/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/dom/CommandLogEntry.java
@@ -37,11 +37,9 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.applib.services.command.Command;
+import org.apache.isis.extensions.commandlog.applib.dom.CommandLogEntry.Nq;
import org.apache.isis.schema.cmd.v2.CommandDto;
-import static
org.apache.isis.extensions.commandlog.applib.dom.CommandLogEntry.Nq;
-
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
diff --git
a/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/contributions/Object_recentExecutions.java
b/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/contributions/Object_recentExecutions.java
index e47e16c754..d44bcab135 100644
---
a/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/contributions/Object_recentExecutions.java
+++
b/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/contributions/Object_recentExecutions.java
@@ -27,7 +27,6 @@ import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.mixins.system.HasInteractionId;
diff --git
a/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/ExecutionLogEntry.java
b/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/ExecutionLogEntry.java
index 346fbbd485..d5247f6ce0 100644
---
a/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/ExecutionLogEntry.java
+++
b/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/ExecutionLogEntry.java
@@ -42,9 +42,7 @@ import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.mixins.system.DomainChangeRecord;
import org.apache.isis.applib.mixins.system.HasInteractionId;
import org.apache.isis.applib.mixins.system.HasInteractionIdAndSequence;
diff --git
a/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/mixins/ExecutionLogEntry_siblingExecutions.java
b/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/mixins/ExecutionLogEntry_siblingExecutions.java
index ba6e671483..cbd338b50f 100644
---
a/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/mixins/ExecutionLogEntry_siblingExecutions.java
+++
b/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/mixins/ExecutionLogEntry_siblingExecutions.java
@@ -22,7 +22,6 @@ import java.util.List;
import javax.inject.Inject;
-
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.MemberSupport;
import
org.apache.isis.extensions.executionlog.applib.IsisModuleExtExecutionLogApplib;
diff --git
a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntry.java
b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntry.java
index 0d5ed3918f..f0ce8392e0 100644
---
a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntry.java
+++
b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntry.java
@@ -35,7 +35,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.applib.jaxb.PersistentEntitiesAdapter;
import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.extensions.executionlog.applib.dom.ExecutionLogEntry.Nq;
diff --git
a/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/restapi/OutboxRestApi.java
b/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/restapi/OutboxRestApi.java
index 5e323b4d35..4eaa30c470 100644
---
a/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/restapi/OutboxRestApi.java
+++
b/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/restapi/OutboxRestApi.java
@@ -30,7 +30,6 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.factory.FactoryService;
-import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.util.schema.InteractionsDtoUtils;
import
org.apache.isis.extensions.executionoutbox.applib.IsisModuleExtExecutionOutboxApplib;
import
org.apache.isis.extensions.executionoutbox.applib.dom.ExecutionOutboxEntry;
diff --git
a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntry.java
b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntry.java
index 63f60e1dfa..9a79bd3bcc 100644
---
a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntry.java
+++
b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntry.java
@@ -35,14 +35,12 @@ import
javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.applib.jaxb.PersistentEntitiesAdapter;
import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
import org.apache.isis.applib.services.bookmark.Bookmark;
+import
org.apache.isis.extensions.executionoutbox.applib.dom.ExecutionOutboxEntry.Nq;
import
org.apache.isis.extensions.executionoutbox.applib.dom.ExecutionOutboxEntryType;
import org.apache.isis.schema.ixn.v2.InteractionDto;
-import static
org.apache.isis.extensions.executionoutbox.applib.dom.ExecutionOutboxEntry.*;
-
import lombok.Getter;
import lombok.Setter;
diff --git
a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryRepository.java
b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryRepository.java
index e2da998b4e..14a196a97a 100644
---
a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryRepository.java
+++
b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/isis/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryRepository.java
@@ -27,7 +27,6 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.repository.RepositoryService;
-import
org.apache.isis.extensions.executionoutbox.jdo.IsisModuleExtExecutionOutboxPersistenceJdo;
import lombok.Builder;
diff --git
a/extensions/security/audittrail/applib/src/main/java/org/apache/isis/extensions/audittrail/applib/contributions/Object_recentAuditTrailEntries.java
b/extensions/security/audittrail/applib/src/main/java/org/apache/isis/extensions/audittrail/applib/contributions/Object_recentAuditTrailEntries.java
index 117ab43a6b..785c96bf5e 100644
---
a/extensions/security/audittrail/applib/src/main/java/org/apache/isis/extensions/audittrail/applib/contributions/Object_recentAuditTrailEntries.java
+++
b/extensions/security/audittrail/applib/src/main/java/org/apache/isis/extensions/audittrail/applib/contributions/Object_recentAuditTrailEntries.java
@@ -25,7 +25,6 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
-
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.MemberSupport;
diff --git
a/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/isis/extensions/audittrail/jpa/dom/AuditTrailEntry.java
b/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/isis/extensions/audittrail/jpa/dom/AuditTrailEntry.java
index 1cb0481b5c..8d7d6243eb 100644
---
a/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/isis/extensions/audittrail/jpa/dom/AuditTrailEntry.java
+++
b/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/isis/extensions/audittrail/jpa/dom/AuditTrailEntry.java
@@ -20,7 +20,6 @@
package org.apache.isis.extensions.audittrail.jpa.dom;
-import java.sql.Timestamp;
import java.util.UUID;
import javax.inject.Named;
diff --git
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/dom/ApplicationPermission.java
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/dom/ApplicationPermission.java
index f8905a391b..d03e27e891 100644
---
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/dom/ApplicationPermission.java
+++
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/dom/ApplicationPermission.java
@@ -36,7 +36,6 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
-import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
diff --git
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/dom/ApplicationPermissionRepositoryAbstract.java
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/dom/ApplicationPermissionRepositoryAbstract.java
index 0f94b8ab4a..599c5e7316 100644
---
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/dom/ApplicationPermissionRepositoryAbstract.java
+++
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/dom/ApplicationPermissionRepositoryAbstract.java
@@ -44,7 +44,6 @@ import
org.apache.isis.commons.internal.collections._Multimaps;
import org.apache.isis.commons.internal.collections._Multimaps.ListMultimap;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.extensions.secman.applib.role.dom.ApplicationRole;
-import
org.apache.isis.extensions.secman.applib.role.dom.ApplicationRoleRepository;
import org.apache.isis.extensions.secman.applib.user.dom.ApplicationUser;
import lombok.NonNull;
diff --git
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/tenancy/dom/ApplicationTenancy.java
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/tenancy/dom/ApplicationTenancy.java
index 91e7ef74ed..fbd82be24e 100644
---
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/tenancy/dom/ApplicationTenancy.java
+++
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/tenancy/dom/ApplicationTenancy.java
@@ -43,8 +43,6 @@ import org.apache.isis.applib.util.Hashing;
import org.apache.isis.applib.util.ObjectContracts;
import org.apache.isis.applib.util.ToString;
import org.apache.isis.extensions.secman.applib.IsisModuleExtSecmanApplib;
-import
org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermission;
-import org.apache.isis.extensions.secman.applib.role.dom.ApplicationRole;
import lombok.experimental.UtilityClass;
diff --git
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/tenancy/dom/HasAtPath.java
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/tenancy/dom/HasAtPath.java
index 9363852dff..53e4f5ddbc 100644
---
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/tenancy/dom/HasAtPath.java
+++
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/tenancy/dom/HasAtPath.java
@@ -27,11 +27,8 @@ import java.lang.annotation.Target;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
-import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.annotation.PropertyLayout;
import
org.apache.isis.extensions.secman.applib.tenancy.spi.ApplicationTenancyEvaluator;
-import org.apache.isis.extensions.secman.applib.user.dom.ApplicationUser;
/**
* Role interface for domain objects to implement, indicating that these are
characteristics of the entity that
diff --git
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/permission/dom/ApplicationPermission.java
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/permission/dom/ApplicationPermission.java
index 16a11c519b..4f3573a7df 100644
---
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/permission/dom/ApplicationPermission.java
+++
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/permission/dom/ApplicationPermission.java
@@ -37,7 +37,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureSort;
import org.apache.isis.commons.internal.base._Casts;
diff --git
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/role/dom/ApplicationRole.java
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/role/dom/ApplicationRole.java
index 29ffd0f36f..25d1c23319 100644
---
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/role/dom/ApplicationRole.java
+++
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/role/dom/ApplicationRole.java
@@ -45,7 +45,6 @@ import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.extensions.secman.applib.role.dom.ApplicationRole.Nq;
-import org.apache.isis.extensions.secman.jdo.user.dom.ApplicationUser;
import lombok.Getter;
import lombok.Setter;
diff --git
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java
index d3a9e9f98c..4f0c46aab3 100644
---
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java
+++
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java
@@ -45,7 +45,6 @@ import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
import org.apache.isis.commons.internal.base._Casts;
import
org.apache.isis.extensions.secman.applib.tenancy.dom.ApplicationTenancy.Nq;
-import org.apache.isis.extensions.secman.applib.tenancy.dom.HasAtPath;
import lombok.Getter;
import lombok.Setter;
diff --git
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/user/dom/ApplicationUser.java
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/user/dom/ApplicationUser.java
index f290912a97..b9218037e7 100644
---
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/user/dom/ApplicationUser.java
+++
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/user/dom/ApplicationUser.java
@@ -47,7 +47,6 @@ import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.extensions.secman.applib.user.dom.ApplicationUser.Nq;
import org.apache.isis.extensions.secman.applib.user.dom.ApplicationUserStatus;
-import org.apache.isis.extensions.secman.jdo.role.dom.ApplicationRole;
import lombok.Getter;
import lombok.Setter;
diff --git
a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/permission/dom/ApplicationPermission.java
b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/permission/dom/ApplicationPermission.java
index c5aee951e5..d6a5a45b40 100644
---
a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/permission/dom/ApplicationPermission.java
+++
b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/permission/dom/ApplicationPermission.java
@@ -38,17 +38,15 @@ import
javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureSort;
import org.apache.isis.commons.internal.base._Casts;
+import
org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermission.Nq;
import
org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import
org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
import org.apache.isis.extensions.secman.applib.role.dom.ApplicationRole;
import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
-import static
org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermission.*;
-
import lombok.Getter;
import lombok.Setter;
diff --git
a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java
b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java
index bcb7857b37..5a183096e9 100644
---
a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java
+++
b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java
@@ -19,7 +19,6 @@
package org.apache.isis.extensions.secman.jpa.tenancy.dom;
import java.util.Set;
-import java.util.SortedSet;
import java.util.TreeSet;
import javax.inject.Named;
diff --git
a/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/extensions/sessionlog/applib/IsisModuleExtSessionLogApplib.java
b/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/extensions/sessionlog/applib/IsisModuleExtSessionLogApplib.java
index 270dcfbcd9..a6376c76d2 100644
---
a/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/extensions/sessionlog/applib/IsisModuleExtSessionLogApplib.java
+++
b/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/extensions/sessionlog/applib/IsisModuleExtSessionLogApplib.java
@@ -24,8 +24,8 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.extensions.sessionlog.applib.app.SessionLogMenu;
-import
org.apache.isis.extensions.sessionlog.applib.spiimpl.SessionSubscriberForSessionLog;
import
org.apache.isis.extensions.sessionlog.applib.spiimpl.SessionLogServiceInitializer;
+import
org.apache.isis.extensions.sessionlog.applib.spiimpl.SessionSubscriberForSessionLog;
@Configuration
diff --git
a/extensions/security/spring-oauth2/src/main/java/org/apache/isis/extensions/spring/security/oauth2/IsisModuleExtSpringSecurityOAuth2.java
b/extensions/security/spring-oauth2/src/main/java/org/apache/isis/extensions/spring/security/oauth2/IsisModuleExtSpringSecurityOAuth2.java
index 7dd210e1d7..5e9e82f627 100644
---
a/extensions/security/spring-oauth2/src/main/java/org/apache/isis/extensions/spring/security/oauth2/IsisModuleExtSpringSecurityOAuth2.java
+++
b/extensions/security/spring-oauth2/src/main/java/org/apache/isis/extensions/spring/security/oauth2/IsisModuleExtSpringSecurityOAuth2.java
@@ -21,8 +21,8 @@ package org.apache.isis.extensions.spring.security.oauth2;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.security.spring.IsisModuleSecuritySpring;
import
org.apache.isis.extensions.spring.security.oauth2.authconverters.AuthenticationConverterOfOAuth2UserPrincipal;
+import org.apache.isis.security.spring.IsisModuleSecuritySpring;
import lombok.extern.log4j.Log4j2;
diff --git
a/extensions/vw/fullcalendar/applib/src/main/java/org/apache/isis/extensions/fullcalendar/applib/value/CalendarEvent.java
b/extensions/vw/fullcalendar/applib/src/main/java/org/apache/isis/extensions/fullcalendar/applib/value/CalendarEvent.java
index eb4a12c63a..a5e77aa71e 100644
---
a/extensions/vw/fullcalendar/applib/src/main/java/org/apache/isis/extensions/fullcalendar/applib/value/CalendarEvent.java
+++
b/extensions/vw/fullcalendar/applib/src/main/java/org/apache/isis/extensions/fullcalendar/applib/value/CalendarEvent.java
@@ -30,7 +30,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.springframework.lang.Nullable;
-import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.value.semantics.ValueDecomposition;
import
org.apache.isis.extensions.fullcalendar.applib.IsisModuleExtFullCalendarApplib;
diff --git
a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarCssReference.java
b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarCssReference.java
index 9af4b2ef65..9cb3240f26 100644
---
a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarCssReference.java
+++
b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarCssReference.java
@@ -21,11 +21,10 @@ package
org.apache.isis.extensions.fullcalendar.wkt.fullcalendar.res;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
+import
de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
import lombok.Getter;
import lombok.experimental.Accessors;
-import
de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
-
public class FullCalendarCssReference
extends WebjarsCssResourceReference {
diff --git
a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarJsReference.java
b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarJsReference.java
index cfa2d86d50..0b0d59e37f 100644
---
a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarJsReference.java
+++
b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarJsReference.java
@@ -21,11 +21,10 @@ package
org.apache.isis.extensions.fullcalendar.wkt.fullcalendar.res;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import
de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
import lombok.Getter;
import lombok.experimental.Accessors;
-import
de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
-
public class FullCalendarJsReference
extends WebjarsJavaScriptResourceReference {
diff --git
a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer/CalendaredCollectionAbstract.java
b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer/CalendaredCollectionAbstract.java
index 05db86ff97..a2d17d4269 100644
---
a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer/CalendaredCollectionAbstract.java
+++
b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer/CalendaredCollectionAbstract.java
@@ -36,9 +36,8 @@ import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
-import lombok.val;
-
import
de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import lombok.val;
/**
* {@link PanelAbstract Panel} that represents a {@link EntityCollectionModel
diff --git
a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer/FullCalendarWithEventHandling.java
b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer/FullCalendarWithEventHandling.java
index e6d02040e6..2e01d7b032 100644
---
a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer/FullCalendarWithEventHandling.java
+++
b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer/FullCalendarWithEventHandling.java
@@ -34,9 +34,8 @@ import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.util.WktContext;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
-import lombok.val;
-
import
de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import lombok.val;
final class FullCalendarWithEventHandling extends FullCalendar {
