You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2024/06/25 20:13:52 UTC
(causeway) 01/02: reorg imports
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v3
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 72fdd94b0007bd292c5aa619492ae2ba1fada81e
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jun 25 22:02:22 2024 +0200
reorg imports
---
.../publishing/log/EntityPropertyChangeLogger.java | 3 +--
.../publishing/log/PageRenderCollectionLogger.java | 2 +-
.../log/PageRenderDomainObjectLogger.java | 15 +++------------
.../publishing/log/PageRenderValueLogger.java | 21 ++++++---------------
.../integration/WebRequestCycleForCauseway.java | 3 +--
5 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityPropertyChangeLogger.java b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityPropertyChangeLogger.java
index 1e6ebaa8c7..b10666cf16 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityPropertyChangeLogger.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityPropertyChangeLogger.java
@@ -21,8 +21,6 @@ package org.apache.causeway.applib.services.publishing.log;
import javax.annotation.Priority;
import javax.inject.Named;
-import org.apache.causeway.commons.collections.Can;
-
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@@ -30,6 +28,7 @@ import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.publishing.spi.EntityPropertyChange;
import org.apache.causeway.applib.services.publishing.spi.EntityPropertyChangeSubscriber;
+import org.apache.causeway.commons.collections.Can;
import lombok.extern.log4j.Log4j2;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderCollectionLogger.java b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderCollectionLogger.java
index 24b2e497de..f0b9ef500a 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderCollectionLogger.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderCollectionLogger.java
@@ -40,8 +40,8 @@ import org.apache.causeway.applib.services.user.UserService;
import org.apache.causeway.commons.internal.base._NullSafe;
import lombok.RequiredArgsConstructor;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Simple implementation of {@link PageRenderSubscriber} that just
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderDomainObjectLogger.java b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderDomainObjectLogger.java
index 49d2e4ca34..56bb8745b0 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderDomainObjectLogger.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderDomainObjectLogger.java
@@ -18,32 +18,23 @@
*/
package org.apache.causeway.applib.services.publishing.log;
-import java.util.List;
-import java.util.Objects;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.applib.services.metrics.MetricsService;
-
-import org.apache.causeway.applib.services.user.UserService;
-
import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.applib.services.metrics.MetricsService;
import org.apache.causeway.applib.services.publishing.spi.PageRenderSubscriber;
-import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.applib.services.user.UserService;
import lombok.RequiredArgsConstructor;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Simple implementation of {@link PageRenderSubscriber} that just
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderValueLogger.java b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderValueLogger.java
index c6d1d94503..224a31b65c 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderValueLogger.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderValueLogger.java
@@ -18,30 +18,21 @@
*/
package org.apache.causeway.applib.services.publishing.log;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.log4j.Log4j2;
-import lombok.val;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.applib.services.bookmark.Bookmark;
-import org.apache.causeway.applib.services.metrics.MetricsService;
import org.apache.causeway.applib.services.publishing.spi.PageRenderSubscriber;
import org.apache.causeway.applib.services.user.UserService;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.lang.Nullable;
-import org.springframework.stereotype.Service;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Simple implementation of {@link PageRenderSubscriber} that just
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java
index d97b5169e5..a7cdce231d 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java
@@ -25,8 +25,6 @@ import java.util.Optional;
import javax.servlet.http.HttpServletRequest;
-import org.apache.causeway.applib.services.metrics.MetricsService;
-
import org.apache.wicket.Application;
import org.apache.wicket.IPageFactory;
import org.apache.wicket.MetaDataKey;
@@ -56,6 +54,7 @@ import org.apache.causeway.applib.services.exceprecog.Recognition;
import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.applib.services.iactn.Interaction;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.metrics.MetricsService;
import org.apache.causeway.applib.services.user.UserService;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Strings;