You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/12/12 19:38:30 UTC
[isis] branch master updated: ISIS-2177: fix some trivial compiler
warnings
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 0974001 ISIS-2177: fix some trivial compiler warnings
0974001 is described below
commit 0974001e1029072189d31c8ba0f6036cecd3dd77
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 12 20:38:20 2019 +0100
ISIS-2177: fix some trivial compiler warnings
---
.../java/org/apache/isis/applib/annotation/Action.java | 4 ++--
.../java/org/apache/isis/applib/annotation/Module.java | 15 ++++++---------
.../apache/isis/applib/annotation/OrderPrecedence.java | 4 ++--
.../org/apache/isis/applib/annotation/Property.java | 4 ++--
.../org/apache/isis/applib/events/ui/IconUiEvent.java | 1 +
.../org/apache/isis/applib/events/ui/LayoutUiEvent.java | 2 ++
.../org/apache/isis/applib/events/ui/TitleUiEvent.java | 2 ++
.../apache/isis/applib/mixins/dto/DtoMappingHelper.java | 3 ---
.../org/apache/isis/applib/query/QueryAbstract.java | 4 ++--
.../applib/services/audit/AuditerServiceLogging.java | 2 +-
.../apache/isis/applib/services/clock/ClockService.java | 5 +----
.../isis/applib/services/command/CommandContext.java | 6 ++----
.../applib/services/confview/ConfigurationMenu.java | 1 -
.../command/ContentMappingServiceForCommandDto.java | 16 +++++-----------
.../command/ContentMappingServiceForCommandsDto.java | 14 +++++---------
.../conmap/command/spi/CommandDtoProcessorService.java | 2 +-
.../apache/isis/applib/services/iactn/Interaction.java | 2 +-
.../isis/applib/services/iactn/InteractionContext.java | 5 +----
.../isis/applib/services/jaxb/JaxbServiceDefault.java | 9 +++------
.../isis/applib/services/layout/LayoutServiceMenu.java | 1 -
.../services/metamodel/MetaModelServicesMenu.java | 1 -
.../services/publish/PublisherServiceLogging.java | 10 +++++-----
.../queryresultscache/QueryResultsCacheDefault.java | 12 +++++-------
.../isis/applib/services/scratchpad/Scratchpad.java | 10 +++-------
.../services/tablecol/TableColumnOrderService.java | 8 ++------
.../urlencoding/UrlEncodingServiceWithCompression.java | 10 ++++------
.../org/apache/isis/config/ConfigurationConstants.java | 7 ++-----
.../java/org/apache/isis/config/IsisConfiguration.java | 1 -
.../java/org/apache/isis/config/IsisModuleConfig.java | 6 ++----
.../beans/IsisBeanFactoryPostProcessorForSpring.java | 4 ++--
.../java/org/apache/isis/config/util/ConfigUtil.java | 4 ++--
.../isis/config/viewer/wicket/WebAppConfiguration.java | 4 +---
.../isis/config/util/ConfigUtil_isProtected_Test.java | 1 -
.../apache/isis/config/util/ConfigUtil_mask_Test.java | 1 -
.../unittestsupport/sortedsets/SomeDomainObject.java | 1 +
.../security/keycloak/IsisModuleSecurityKeycloak.java | 8 ++------
.../keycloak/authorization/AuthorizorKeycloak.java | 11 ++++++-----
.../security/keycloak/webmodule/KeycloakFilter.java | 17 ++++++++++++-----
.../security/keycloak/webmodule/WebModuleKeycloak.java | 13 +++++++------
.../shiro/authentication/AuthenticatorShiro.java | 10 ++++------
.../java/org/apache/isis/webapp/IsisModuleWebapp.java | 8 ++++----
.../health/HealthIndicatorUsingHealthCheckService.java | 9 ++++-----
.../modules/logonlog/WebModuleLogOnExceptionLogger.java | 7 ++-----
.../templresources/WebModuleTemplateResources.java | 5 +----
.../webapp/webappctx/IsisWebAppContextListener.java | 2 +-
.../webapp/wormhole/AuthenticationSessionWormhole.java | 4 ++--
examples/demo/src/main/resources/application.yml | 5 +++--
47 files changed, 116 insertions(+), 165 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Action.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
index 5b52150..85590ab 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
@@ -25,12 +25,12 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.isis.applib.services.conmap.command.ContentMappingServiceForCommandDto;
-import org.apache.isis.applib.services.conmap.command.ContentMappingServiceForCommandsDto;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.services.command.CommandDtoProcessor;
import org.apache.isis.applib.services.command.CommandWithDto;
import org.apache.isis.applib.services.command.spi.CommandService;
+import org.apache.isis.applib.services.conmap.command.ContentMappingServiceForCommandDto;
+import org.apache.isis.applib.services.conmap.command.ContentMappingServiceForCommandsDto;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Module.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Module.java
index edf4b3e..7b7887f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Module.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Module.java
@@ -19,16 +19,13 @@
package org.apache.isis.applib.annotation;
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
-import org.apache.isis.applib.events.domain.ActionDomainEvent;
-import org.apache.isis.applib.services.command.CommandDtoProcessor;
-import org.apache.isis.applib.services.command.CommandWithDto;
-import org.apache.isis.applib.services.command.spi.CommandService;
-import org.apache.isis.applib.services.conmap.command.ContentMappingServiceForCommandDto;
-import org.apache.isis.applib.services.conmap.command.ContentMappingServiceForCommandsDto;
-import org.apache.isis.applib.value.Blob;
-import org.apache.isis.applib.value.Clob;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/OrderPrecedence.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/OrderPrecedence.java
index 5eeb3a2..a62cf10 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/OrderPrecedence.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/OrderPrecedence.java
@@ -19,10 +19,10 @@
package org.apache.isis.applib.annotation;
-import lombok.experimental.UtilityClass;
-
import org.springframework.core.Ordered;
+import lombok.experimental.UtilityClass;
+
@UtilityClass
public class OrderPrecedence {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
index 8f7e5df..bd774db 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
@@ -25,12 +25,12 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.isis.applib.services.conmap.command.ContentMappingServiceForCommandDto;
-import org.apache.isis.applib.services.conmap.command.ContentMappingServiceForCommandsDto;
import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.applib.services.command.CommandDtoProcessor;
import org.apache.isis.applib.services.command.CommandWithDto;
import org.apache.isis.applib.services.command.spi.CommandService;
+import org.apache.isis.applib.services.conmap.command.ContentMappingServiceForCommandDto;
+import org.apache.isis.applib.services.conmap.command.ContentMappingServiceForCommandsDto;
import org.apache.isis.applib.spec.Specification;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ui/IconUiEvent.java b/core/applib/src/main/java/org/apache/isis/applib/events/ui/IconUiEvent.java
index 1e20990..e17f25d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/ui/IconUiEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/events/ui/IconUiEvent.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.applib.events.ui;
+import java.util.EventObject;
/**
* Emitted for subscribers to obtain a cssClass hint (equivalent to the <tt>iconName()</tt> supporting method).
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ui/LayoutUiEvent.java b/core/applib/src/main/java/org/apache/isis/applib/events/ui/LayoutUiEvent.java
index 98305a7..552508b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/ui/LayoutUiEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/events/ui/LayoutUiEvent.java
@@ -18,6 +18,8 @@
*/
package org.apache.isis.applib.events.ui;
+import java.util.EventObject;
+
import org.apache.isis.applib.annotation.DomainObjectLayout;
/**
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ui/TitleUiEvent.java b/core/applib/src/main/java/org/apache/isis/applib/events/ui/TitleUiEvent.java
index 7413e6e..059cf10 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/ui/TitleUiEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/events/ui/TitleUiEvent.java
@@ -18,6 +18,8 @@
*/
package org.apache.isis.applib.events.ui;
+import java.util.EventObject;
+
import org.apache.isis.applib.services.i18n.TranslatableString;
/**
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
index 0043b19..81eb614 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
@@ -33,14 +33,11 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.schema.common.v1.BookmarkObjectState;
import org.apache.isis.schema.common.v1.OidDto;
-import lombok.extern.log4j.Log4j2;
-
@Service
@Named("isisApplib.DtoMappingHelper")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class DtoMappingHelper {
@Inject private BookmarkService bookmarkService;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
index 188bc4a..2f33de8 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
@@ -19,10 +19,10 @@
package org.apache.isis.applib.query;
-import lombok.Getter;
-
import org.apache.isis.commons.internal.context._Context;
+import lombok.Getter;
+
/**
* Convenience adapter class for {@link Query}.
*
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java b/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
index b5291ee..8222b8a 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
@@ -24,12 +24,12 @@ import java.util.UUID;
import javax.annotation.PostConstruct;
import javax.inject.Named;
-import org.apache.isis.applib.annotation.OrderPrecedence;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.bookmark.Bookmark;
import lombok.extern.log4j.Log4j2;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java b/core/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java
index c15abb9..e1b1663 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.applib.services.clock;
-import lombok.extern.log4j.Log4j2;
-
import java.sql.Timestamp;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -27,12 +25,12 @@ import java.time.OffsetDateTime;
import javax.inject.Named;
-import org.apache.isis.applib.annotation.OrderPrecedence;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.clock.Clock;
/**
@@ -46,7 +44,6 @@ import org.apache.isis.applib.clock.Clock;
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class ClockService {
public LocalDate now() {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java b/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java
index b1c759f..95cdf54 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java
@@ -18,17 +18,16 @@
*/
package org.apache.isis.applib.services.command;
-import lombok.extern.log4j.Log4j2;
-
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
-import org.apache.isis.applib.annotation.OrderPrecedence;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.OrderPrecedence;
+
/**
* This service (API and implementation) provides access to context information about any {@link Command}.
*
@@ -42,7 +41,6 @@ import org.springframework.stereotype.Service;
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class CommandContext {
private Command command;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java
index f0967b7..2c4193a 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java
@@ -30,7 +30,6 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.SemanticsOf;
@Named("isisApplib.ConfigurationMenu")
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java b/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java
index 35fcdea..8d3ab83 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandDto.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.applib.services.conmap.command;
-import lombok.extern.log4j.Log4j2;
-
import java.sql.Timestamp;
import java.util.List;
@@ -27,32 +25,29 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.ws.rs.core.MediaType;
-import org.apache.isis.applib.annotation.OrderPrecedence;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.services.conmap.ContentMappingService;
-import org.apache.isis.applib.services.conmap.command.spi.CommandDtoProcessorService;
+import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.CommandDtoProcessor;
import org.apache.isis.applib.services.command.CommandWithDto;
+import org.apache.isis.applib.services.conmap.ContentMappingService;
+import org.apache.isis.applib.services.conmap.command.spi.CommandDtoProcessorService;
import org.apache.isis.applib.services.metamodel.MetaModelService;
+import org.apache.isis.applib.util.schema.CommandDtoUtils;
import org.apache.isis.schema.cmd.v1.CommandDto;
import org.apache.isis.schema.common.v1.PeriodDto;
-import org.apache.isis.applib.util.schema.CommandDtoUtils;
import org.apache.isis.schema.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
-import org.springframework.stereotype.Service;
@Service
@Named("isisApplib.ContentMappingServiceForCommandDto")
@Order(OrderPrecedence.HIGH)
@Primary
@Qualifier("CommandDto")
-@Log4j2
public class ContentMappingServiceForCommandDto implements ContentMappingService {
@Override
@@ -114,7 +109,6 @@ public class ContentMappingServiceForCommandDto implements ContentMappingService
// (but can choose to run before if they wish)
@Order(OrderPrecedence.HIGH)
@Qualifier("Command")
- @Log4j2
public static class CopyOverFromCommand implements CommandDtoProcessorService {
@Override
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandsDto.java b/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandsDto.java
index 88e65e2..46fd141 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandsDto.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/ContentMappingServiceForCommandsDto.java
@@ -18,31 +18,27 @@
*/
package org.apache.isis.applib.services.conmap.command;
-import lombok.extern.log4j.Log4j2;
-
import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
import javax.ws.rs.core.MediaType;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.applib.services.conmap.ContentMappingService;
-import org.apache.isis.schema.cmd.v1.CommandDto;
-import org.apache.isis.schema.cmd.v1.CommandsDto;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.applib.services.conmap.ContentMappingService;
+import org.apache.isis.schema.cmd.v1.CommandDto;
+import org.apache.isis.schema.cmd.v1.CommandsDto;
+
@Service
@Named("isisApplib.ContentMappingServiceForCommandsDto")
@Order(OrderPrecedence.HIGH)
@Primary
@Qualifier("CommandsDto")
-@Log4j2
public class ContentMappingServiceForCommandsDto implements ContentMappingService {
@Override
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/spi/CommandDtoProcessorService.java b/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/spi/CommandDtoProcessorService.java
index 166dc6b..90b7b3c 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/spi/CommandDtoProcessorService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/conmap/command/spi/CommandDtoProcessorService.java
@@ -19,9 +19,9 @@
package org.apache.isis.applib.services.conmap.command.spi;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.services.conmap.command.ContentMappingServiceForCommandDto;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.CommandDtoProcessor;
+import org.apache.isis.applib.services.conmap.command.ContentMappingServiceForCommandDto;
import org.apache.isis.schema.cmd.v1.CommandDto;
/**
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
index ac58ed7..4cb19a9 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
@@ -41,6 +41,7 @@ import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.applib.services.metrics.MetricsService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.xactn.Transaction;
+import org.apache.isis.applib.util.schema.MemberExecutionDtoUtils;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.schema.common.v1.DifferenceDto;
@@ -51,7 +52,6 @@ import org.apache.isis.schema.ixn.v1.MemberExecutionDto;
import org.apache.isis.schema.ixn.v1.MetricsDto;
import org.apache.isis.schema.ixn.v1.ObjectCountsDto;
import org.apache.isis.schema.ixn.v1.PropertyEditDto;
-import org.apache.isis.applib.util.schema.MemberExecutionDtoUtils;
import org.apache.isis.schema.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
/**
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
index e1bd3e9..99e9444 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
@@ -18,18 +18,16 @@
*/
package org.apache.isis.applib.services.iactn;
-import lombok.extern.log4j.Log4j2;
-
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
-import org.apache.isis.applib.annotation.OrderPrecedence;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.OrderPrecedence;
/**
* This service (API and implementation) provides access to context information about any {@link Interaction}.
@@ -44,7 +42,6 @@ import org.apache.isis.applib.annotation.DomainService;
@Primary
@Qualifier("Default")
@RequestScoped
-@Log4j2
public class InteractionContext {
private Interaction interaction;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java
index 3c85ad4..9a70e93 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbServiceDefault.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.applib.services.jaxb;
-import lombok.extern.log4j.Log4j2;
-
import java.util.Map;
import javax.inject.Inject;
@@ -30,26 +28,25 @@ import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.isis.applib.annotation.OrderPrecedence;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.NonRecoverableException;
+import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.domain.DomainObjectList;
+import org.apache.isis.applib.jaxbadapters.PersistentEntitiesAdapter;
+import org.apache.isis.applib.jaxbadapters.PersistentEntityAdapter;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.applib.jaxbadapters.PersistentEntitiesAdapter;
-import org.apache.isis.applib.jaxbadapters.PersistentEntityAdapter;
@Service
@Named("isisApplib.JaxbServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class JaxbServiceDefault extends JaxbService.Simple {
@Override
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
index bd2b2c4..7f973e8 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
@@ -29,7 +29,6 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
index 5aa5066..8b103c8 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
@@ -35,7 +35,6 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.ParameterLayout;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java b/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
index 1153b98..b21e72b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
@@ -18,22 +18,22 @@
*/
package org.apache.isis.applib.services.publish;
-import org.apache.isis.applib.annotation.OrderPrecedence;
+import javax.inject.Named;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.iactn.Interaction;
-import org.apache.isis.schema.chg.v1.ChangesDto;
-import org.apache.isis.schema.ixn.v1.InteractionDto;
import org.apache.isis.applib.util.schema.ChangesDtoUtils;
import org.apache.isis.applib.util.schema.InteractionDtoUtils;
+import org.apache.isis.schema.chg.v1.ChangesDto;
+import org.apache.isis.schema.ixn.v1.InteractionDto;
import lombok.extern.log4j.Log4j2;
-import javax.inject.Named;
-
@Service
@Named("isisApplib.PublisherServiceLogging")
@Order(OrderPrecedence.LOW)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java
index 55456e6..61908de 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java
@@ -24,19 +24,17 @@ import java.util.concurrent.Callable;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
-import org.apache.isis.applib.annotation.OrderPrecedence;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.WithTransactionScope;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Maps;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Primary;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Service;
import lombok.extern.log4j.Log4j2;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java b/core/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
index 9583093..7e33a95 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
@@ -18,22 +18,19 @@
*/
package org.apache.isis.applib.services.scratchpad;
-import lombok.extern.log4j.Log4j2;
-
import java.util.Map;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.commons.internal.collections._Maps;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.commons.internal.collections._Maps;
+
/**
* This service (API and implementation) provides a mechanism to interchange information between multiple objects invoked in the same
* interaction. Most commonly this will be as the result of invoking a {@link org.apache.isis.applib.annotation.Bulk}
@@ -50,7 +47,6 @@ import org.springframework.stereotype.Service;
@Primary
@Named("isisApplib.Scratchpad")
@Qualifier("Default")
-@Log4j2
public class Scratchpad {
/**
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java b/core/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java
index f53119b..7308ed8 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java
@@ -18,20 +18,17 @@
*/
package org.apache.isis.applib.services.tablecol;
-import lombok.extern.log4j.Log4j2;
-
import java.util.List;
import javax.inject.Named;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.annotation.OrderPrecedence;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.OrderPrecedence;
+
public interface TableColumnOrderService {
List<String> orderParented(
@@ -52,7 +49,6 @@ public interface TableColumnOrderService {
@Order(OrderPrecedence.LOW)
@Primary
@Qualifier("Default")
- @Log4j2
public static class Default implements TableColumnOrderService {
@Override
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java b/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java
index 7e3e6fa..b7f753b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java
@@ -18,26 +18,24 @@
*/
package org.apache.isis.applib.services.urlencoding;
-import lombok.extern.log4j.Log4j2;
-
import java.nio.charset.StandardCharsets;
import javax.inject.Named;
-import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.commons.internal.base._Bytes;
+import org.apache.isis.commons.internal.base._Strings;
+
@Service
@Named("isisApplib.UrlEncodingServiceWithCompression")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Compression")
-@Log4j2
public class UrlEncodingServiceWithCompression implements UrlEncodingService {
@Override
diff --git a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java b/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
index fcb490b..a0bb33e 100644
--- a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
+++ b/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
@@ -19,15 +19,12 @@
package org.apache.isis.config;
-import lombok.experimental.UtilityClass;
-
import java.util.List;
-import java.util.Map;
-import java.util.function.Supplier;
-import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
+import lombok.experimental.UtilityClass;
+
@UtilityClass
public final class ConfigurationConstants {
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
index ee10966..ae2e4e0 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
@@ -42,7 +42,6 @@ import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.config.metamodel.facets.AuditObjectsConfiguration;
import org.apache.isis.config.metamodel.facets.CommandActionsConfiguration;
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java b/core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java
index dccc231..7f97e6c 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java
@@ -21,15 +21,14 @@ package org.apache.isis.config;
import java.util.HashMap;
import java.util.Map;
-import org.apache.isis.commons.IsisModuleCommons;
-import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.commons.IsisModuleCommons;
+import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
@Configuration
@@ -47,7 +46,6 @@ import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
@EnableConfigurationProperties(IsisConfiguration.class)
public class IsisModuleConfig {
- @SuppressWarnings("ConfigurationProperties") // think this is not really an issue...
@ConfigurationProperties(prefix = "isis")
@Bean("isis-settings")
public Map<String, String> getAsMap() {
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 870b262..b8eb257 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
@@ -18,6 +18,8 @@
*/
package org.apache.isis.config.beans;
+import javax.inject.Named;
+
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -32,8 +34,6 @@ import lombok.Getter;
import lombok.val;
import lombok.extern.log4j.Log4j2;
-import javax.inject.Named;
-
/**
* The framework's stereotypes {@link DomainService}, {@link DomainObject}, {@link ViewModel}, etc.
* are meta annotated with eg. {@link Component}, which allows for the Spring framework to pick up the
diff --git a/core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java b/core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java
index 0a518b9..c11057f 100644
--- a/core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java
+++ b/core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java
@@ -18,14 +18,14 @@
*/
package org.apache.isis.config.util;
-import lombok.experimental.UtilityClass;
-
import java.util.Map;
import java.util.function.Supplier;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.config.ConfigurationConstants;
+import lombok.experimental.UtilityClass;
+
@UtilityClass
public class ConfigUtil {
diff --git a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java b/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
index c39a12f..190f765 100644
--- a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
@@ -25,7 +25,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
-import org.apache.isis.applib.annotation.OrderPrecedence;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
@@ -33,11 +32,11 @@ import org.springframework.core.io.AbstractResource;
import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.commons.internal.resources._Resources;
import org.apache.isis.config.IsisConfiguration;
import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
/**
@@ -49,7 +48,6 @@ import lombok.val;
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
-@Log4j2
public class WebAppConfiguration {
@Inject private IsisConfiguration isisConfiguration;
diff --git a/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_isProtected_Test.java b/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_isProtected_Test.java
index cd7862c..bfb5874 100644
--- a/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_isProtected_Test.java
+++ b/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_isProtected_Test.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.config.util;
-import org.apache.isis.config.ConfigurationConstants;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_mask_Test.java b/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_mask_Test.java
index 7732d3f..106eb96 100644
--- a/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_mask_Test.java
+++ b/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_mask_Test.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.config.util;
-import org.apache.isis.config.ConfigurationConstants;
import org.junit.Test;
import static org.hamcrest.Matchers.equalTo;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SomeDomainObject.java b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SomeDomainObject.java
index f3b5d2b..8d6f3df 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SomeDomainObject.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SomeDomainObject.java
@@ -27,6 +27,7 @@ import javax.jdo.annotations.PersistenceCapable;
public class SomeDomainObject {
+ @SuppressWarnings("unused")
private SortedSet<SomeDomainObject> someSortedSet = new TreeSet<SomeDomainObject>();
//private Set<SomeDomainObject> someSet = new HashSet<SomeDomainObject>();
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
index 6fe9b16..6e83e67 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
+++ b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
@@ -18,18 +18,14 @@
*/
package org.apache.isis.security.keycloak;
-import javax.inject.Singleton;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
import org.apache.isis.runtime.services.IsisModuleRuntimeServices;
import org.apache.isis.security.keycloak.authentication.AuthenticatorKeycloak;
import org.apache.isis.security.keycloak.authorization.AuthorizorKeycloak;
import org.apache.isis.security.keycloak.webmodule.WebModuleKeycloak;
import org.apache.isis.webapp.IsisModuleWebapp;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-import org.apache.isis.security.api.authorization.standard.Authorizor;
/**
* Configuration Bean to support Isis Security using Shiro.
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
index e32f54d..ebb6bc7 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
+++ b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
@@ -19,17 +19,18 @@
package org.apache.isis.security.keycloak.authorization;
-import lombok.extern.log4j.Log4j2;
-
import javax.inject.Named;
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.security.api.authorization.standard.Authorizor;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.security.api.authorization.standard.Authorizor;
+
+import lombok.extern.log4j.Log4j2;
+
@Service
@Named("isisSecurityKeycloak.AuthorizorKeycloak")
@Order(OrderPrecedence.HIGH)
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
index dc41664..7bfd6e0 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
+++ b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
@@ -1,17 +1,24 @@
package org.apache.isis.security.keycloak.webmodule;
-import lombok.val;
-
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.List;
-import javax.servlet.*;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.isis.webapp.wormhole.AuthenticationSessionWormhole;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
+import org.apache.isis.webapp.wormhole.AuthenticationSessionWormhole;
+
+import lombok.val;
public class KeycloakFilter implements Filter {
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
index dbec699..89ea984 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
+++ b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
@@ -18,26 +18,27 @@
*/
package org.apache.isis.security.keycloak.webmodule;
-import lombok.extern.log4j.Log4j2;
-import lombok.val;
-
import javax.inject.Named;
import javax.servlet.FilterRegistration.Dynamic;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
-import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.webapp.modules.WebModule;
-import org.apache.isis.webapp.modules.WebModuleContext;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.webapp.modules.WebModule;
+import org.apache.isis.webapp.modules.WebModuleContext;
+
import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
import static org.apache.isis.commons.internal.context._Context.getDefaultClassLoader;
import static org.apache.isis.commons.internal.exceptions._Exceptions.unexpectedCodeReach;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
+
/**
* WebModule to enable support for Keycloak.
*/
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
index 01a8a08..db10c28 100644
--- a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
+++ b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
@@ -23,11 +23,9 @@ import java.util.Collections;
import java.util.Set;
import java.util.stream.Stream;
-import javax.annotation.PostConstruct;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo;
@@ -44,7 +42,11 @@ import org.apache.shiro.mgt.SecurityManager;
import org.apache.shiro.realm.Realm;
import org.apache.shiro.subject.PrincipalCollection;
import org.apache.shiro.subject.Subject;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.security.api.authentication.AuthenticationRequest;
@@ -54,11 +56,7 @@ import org.apache.isis.security.api.authentication.standard.Authenticator;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
import org.apache.isis.security.api.authorization.standard.Authorizor;
import org.apache.isis.security.shiro.context.ShiroSecurityContext;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Service;
-import lombok.NoArgsConstructor;
import lombok.extern.log4j.Log4j2;
/**
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java b/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java
index a734baf..3300374 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java
@@ -18,15 +18,15 @@
*/
package org.apache.isis.webapp;
-import org.apache.isis.runtime.IsisModuleRuntime;
-import org.apache.isis.webapp.health.HealthIndicatorUsingHealthCheckService;
-import org.apache.isis.webapp.webappctx.IsisWebAppContextInitializer;
-import org.apache.isis.webapp.webappctx.IsisWebAppContextListener;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.isis.runtime.IsisModuleRuntime;
+import org.apache.isis.webapp.health.HealthIndicatorUsingHealthCheckService;
import org.apache.isis.webapp.modules.logonlog.WebModuleLogOnExceptionLogger;
import org.apache.isis.webapp.modules.templresources.WebModuleTemplateResources;
+import org.apache.isis.webapp.webappctx.IsisWebAppContextInitializer;
+import org.apache.isis.webapp.webappctx.IsisWebAppContextListener;
@Configuration
@Import({
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/health/HealthIndicatorUsingHealthCheckService.java b/core/webapp/src/main/java/org/apache/isis/webapp/health/HealthIndicatorUsingHealthCheckService.java
index b44ac94..5c100d8 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/health/HealthIndicatorUsingHealthCheckService.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/health/HealthIndicatorUsingHealthCheckService.java
@@ -1,21 +1,20 @@
package org.apache.isis.webapp.health;
-import lombok.extern.log4j.Log4j2;
-import lombok.val;
-
import java.util.Optional;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.isis.applib.services.health.HealthCheckService;
import org.springframework.boot.actuate.health.AbstractHealthIndicator;
import org.springframework.boot.actuate.health.Health;
import org.springframework.stereotype.Component;
+import org.apache.isis.applib.services.health.HealthCheckService;
+
+import lombok.val;
+
@Component
@Named("isisWebapp.HealthCheckService") // this appears in the endpoint.
-@Log4j2
public class HealthIndicatorUsingHealthCheckService extends AbstractHealthIndicator {
private final Optional<HealthCheckService> healthCheckServiceIfAny;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java b/core/webapp/src/main/java/org/apache/isis/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
index e3b7efe..d3781c4 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.webapp.modules.logonlog;
-import lombok.extern.log4j.Log4j2;
-
import javax.inject.Named;
import javax.servlet.Filter;
import javax.servlet.FilterRegistration.Dynamic;
@@ -27,13 +25,13 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
-import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.webapp.diagnostics.IsisLogOnExceptionFilter;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.commons.internal.collections._Arrays;
+import org.apache.isis.webapp.diagnostics.IsisLogOnExceptionFilter;
import org.apache.isis.webapp.modules.WebModule;
import org.apache.isis.webapp.modules.WebModuleContext;
@@ -50,7 +48,6 @@ import static org.apache.isis.commons.internal.exceptions._Exceptions.unexpected
@Named("isisWebapp.WebModuleLogOnExceptionLogger")
@Order(OrderPrecedence.LOWEST) // TODO: should this not be the highest precedence, ie first in stack?
@Qualifier("LogOnExceptionLogger")
-@Log4j2
public final class WebModuleLogOnExceptionLogger implements WebModule {
private final static String LOGONLOGGER_FILTER_CLASS_NAME = IsisLogOnExceptionFilter.class.getName();
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/WebModuleTemplateResources.java b/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/WebModuleTemplateResources.java
index 48b7617..4826315 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/WebModuleTemplateResources.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/WebModuleTemplateResources.java
@@ -18,19 +18,17 @@
*/
package org.apache.isis.webapp.modules.templresources;
-import lombok.extern.log4j.Log4j2;
-
import javax.inject.Named;
import javax.servlet.FilterRegistration.Dynamic;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
-import org.apache.isis.applib.annotation.OrderPrecedence;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.webapp.modules.WebModule;
import org.apache.isis.webapp.modules.WebModuleContext;
@@ -43,7 +41,6 @@ import org.apache.isis.webapp.modules.WebModuleContext;
@Named("isisWebapp.WebModuleTemplateResources")
@Order(OrderPrecedence.MIDPOINT - 100)
@Qualifier("TemplateResources")
-@Log4j2
public final class WebModuleTemplateResources implements WebModule {
private final static String[] urlPatterns = { "*.thtml" };
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 256580a..0da98c9 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
@@ -26,9 +26,9 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.resources._Resources;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.webapp.webappctx.IsisWebAppContextInitializer.ServletContextResource;
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;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/wormhole/AuthenticationSessionWormhole.java b/core/webapp/src/main/java/org/apache/isis/webapp/wormhole/AuthenticationSessionWormhole.java
index 3ce3255..6388f63 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/wormhole/AuthenticationSessionWormhole.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/wormhole/AuthenticationSessionWormhole.java
@@ -18,10 +18,10 @@
*/
package org.apache.isis.webapp.wormhole;
-import lombok.experimental.UtilityClass;
-
import org.apache.isis.security.api.authentication.AuthenticationSession;
+import lombok.experimental.UtilityClass;
+
/**
* Just a mechanism to pass an {@link AuthenticationSession} from a filter (eg keycloak) to a viewer (eg Wicket).
*/
diff --git a/examples/demo/src/main/resources/application.yml b/examples/demo/src/main/resources/application.yml
index 584b7c1..813467a 100644
--- a/examples/demo/src/main/resources/application.yml
+++ b/examples/demo/src/main/resources/application.yml
@@ -64,9 +64,9 @@ isis:
name: Apache Isis
themes:
- initial: bootstrap-theme
+ initial: Flatly
showChooser: true
- enabled: bootstrap-theme,Cosmo,Flatly,Darkly,Sandstone,United
+ enabled: Cosmo,Flatly,Darkly,Sandstone,United
max-title-length-in-standalone-tables: 0
max-title-length-in-parented-tables: 0
@@ -87,6 +87,7 @@ isis:
# to DataNucleus, and must use camelCase rather than kebab-case
datanucleus:
schema:
+ autoCreateTables: true
validateTables: true
validateConstraints: true