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 2022/10/25 08:19:20 UTC
[isis] branch master updated: ISIS-3142: batch organize imports: valuetypes/tooling sources
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 ac88ee8257 ISIS-3142: batch organize imports: valuetypes/tooling sources
ac88ee8257 is described below
commit ac88ee8257efb07cb8631196a614f07d31b86be5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Oct 25 10:19:12 2022 +0200
ISIS-3142: batch organize imports: valuetypes/tooling sources
---
.../main/java/org/apache/causeway/tooling/c4/C4.java | 7 ++++---
.../org/apache/causeway/tooling/c4/test/C4Test.java | 5 +++--
.../java/org/apache/causeway/tooling/cli/Cli.java | 1 -
.../org/apache/causeway/tooling/cli/CliConfig.java | 3 ++-
.../causeway/tooling/cli/projdoc/ProjectDocModel.java | 18 +++++++++---------
.../tooling/cli/projdoc/ProjectDocWriter.java | 3 ++-
.../ProjectDocModel_sanitizeDescription_Test.java | 1 -
.../causeway/tooling/cli/test/CliConfigTest.java | 5 +++--
.../cli/test/adocfix/IncludeStatementFixerTest.java | 5 +++--
.../apache/causeway/tooling/j2adoc/J2AdocContext.java | 3 ++-
.../apache/causeway/tooling/j2adoc/J2AdocUnit.java | 3 ++-
.../tooling/j2adoc/convert/HtmlToAsciiDoc.java | 5 +++--
.../tooling/j2adoc/convert/J2AdocConverter.java | 3 ++-
.../j2adoc/convert/J2AdocConverterAbstract.java | 8 ++++----
.../j2adoc/convert/J2AdocConverterDefault.java | 5 +++--
.../causeway/tooling/j2adoc/format/Snippets.java | 1 +
.../causeway/tooling/j2adoc/format/UnitFormatter.java | 3 ++-
.../tooling/j2adoc/format/UnitFormatterAbstract.java | 14 +++++++++-----
.../tooling/j2adoc/format/UnitFormatterCompact.java | 3 ++-
.../format/UnitFormatterWithSourceAndCallouts.java | 3 ++-
.../format/UnitFormatterWithSourceAndSections.java | 7 ++++---
.../tooling/j2adoc/convert/HtmlToAsciiDocTest.java | 10 +++++-----
.../j2adoc/format/UnitFormatterAbstractTest.java | 3 ---
.../causeway/tooling/j2adoc/test/J2AdocTest.java | 12 ++++++------
.../tooling/javamodel/AnalyzerConfigFactory.java | 3 +--
.../tooling/javamodel/ast/CallableDeclarations.java | 2 +-
.../causeway/tooling/javamodel/ast/CodeClasses.java | 3 +--
.../tooling/javamodel/ast/FieldDeclarations.java | 3 +--
.../causeway/tooling/javamodel/ast/MemberInfos.java | 3 +--
.../causeway/tooling/javamodel/test/AnalyzerTest.java | 12 ++++++------
.../demoshowcases/value/ValueTypeGenTemplate.java | 4 +++-
.../graphql/GraphQLToJavaSourceConverter.java | 12 ++++++------
.../demoshowcases/value/ValueTypeGenTemplateTest.java | 11 ++++++-----
.../tooling/metaprog/graphql/GraphQLTest.java | 8 ++++----
.../causeway/tooling/model4adoc/AsciiDocFactory.java | 19 ++++++++++---------
.../causeway/tooling/model4adoc/AsciiDocWriter.java | 3 ++-
.../causeway/tooling/model4adoc/NodeWriter.java | 11 ++++++-----
.../tooling/model4adoc/StructuralNodeTraversor.java | 3 ++-
.../tooling/model4adoc/StructuralNodeVisitor.java | 3 ++-
.../tooling/model4adoc/ast/ContentNodeAbstract.java | 3 ++-
.../causeway/tooling/model4adoc/ast/SimpleList.java | 3 ++-
.../tooling/model4adoc/ast/SimpleListItem.java | 3 ++-
.../test/ast/AbstractAsciiDocWriterTest.java | 7 ++++---
.../tooling/model4adoc/test/ast/AdmonitionTest.java | 3 ++-
.../model4adoc/test/ast/CalloutContinuationTest.java | 3 ++-
.../tooling/model4adoc/test/ast/CollapsibleTest.java | 3 ++-
.../tooling/model4adoc/test/ast/OpenBlockTest.java | 3 ++-
.../tooling/model4adoc/test/ast/PlantumlTest.java | 5 +++--
.../tooling/model4adoc/test/ast/SourceTest.java | 3 ++-
.../causeway/tooling/model4adoc/test/ast/_Debug.java | 5 +++--
.../tooling/projectmodel/ArtifactCoordinates.java | 3 ++-
.../projectmodel/ProjectNodeFactory_gradle.java | 5 +++--
.../projectmodel/ProjectNodeFactory_maven.java | 3 ++-
.../projectmodel/maven/SimpleModelResolver.java | 3 ++-
.../projectmodel/test/GradleDependenciesTest.java | 7 ++++---
.../tooling/projectmodel/test/GradleSettingsTest.java | 9 +++++----
.../tooling/projectmodel/test/ProjectTreeTest.java | 7 ++++---
.../valuetypes/asciidoc/applib/value/AsciiDoc.java | 1 -
.../valuetypes/asciidoc/applib/value/Converter.java | 3 ++-
.../metamodel/CausewayModuleValAsciidocMetaModel.java | 5 +++--
.../metamodel/semantics/AsciiDocValueSemantics.java | 2 +-
.../dn/CausewayModuleValAsciidocPersistenceJdoDn.java | 3 ++-
.../jdo/dn/converters/CausewayAsciiDocConverter.java | 3 ++-
.../jpa/CausewayModuleValAsciidocPersistenceJpa.java | 5 +++--
.../ui/vaa/CausewayModuleValAsciidocUiVaa.java | 5 +++--
.../asciidoc/ui/vaa/components/AsciiDocFieldVaa.java | 3 ++-
.../ui/wkt/CausewayModuleValAsciidocUiWkt.java | 5 +++--
.../ui/wkt/components/AsciiDocComponentWkt.java | 3 ++-
.../ui/wkt/components/AsciiDocPanelFactoriesWkt.java | 3 ++-
.../jodatime/applib/value/JodaTimeConvertersTest.java | 1 -
.../CausewayModuleValJodatimeIntegration.java | 5 +++--
.../valuesemantics/JodaDateTimeValueSemantics.java | 2 +-
.../JodaLocalDateTimeValueSemantics.java | 2 +-
.../valuesemantics/JodaLocalDateValueSemantics.java | 2 +-
.../valuesemantics/JodaLocalTimeValueSemantics.java | 2 +-
.../valuetypes/markdown/applib/value/Markdown.java | 1 -
.../metamodel/CausewayModuleValMarkdownMetaModel.java | 3 ++-
.../metamodel/semantics/MarkdownValueSemantics.java | 2 +-
.../dn/CausewayModuleValMarkdownPersistenceJdoDn.java | 3 ++-
.../jdo/dn/converters/CausewayMarkdownConverter.java | 3 ++-
.../jpa/CausewayModuleValMarkdownPersistenceJpa.java | 5 +++--
.../ui/wkt/CausewayModuleValMarkdownUiWkt.java | 5 +++--
.../ui/wkt/components/MarkdownComponentWkt.java | 3 ++-
.../ui/wkt/components/MarkdownPanelFactoriesWkt.java | 3 ++-
.../causeway/valuetypes/vega/applib/value/Vega.java | 3 ++-
.../metamodel/CausewayModuleValVegaMetaModel.java | 3 ++-
.../vega/metamodel/semantics/VegaValueSemantics.java | 2 +-
.../jdo/dn/CausewayModuleValVegaPersistenceJdoDn.java | 3 ++-
.../jdo/dn/converters/CausewayVegaConverter.java | 3 ++-
.../jpa/CausewayModuleValVegaPersistenceJpa.java | 5 +++--
.../vega/ui/vaa/CausewayModuleValVegaUiVaa.java | 5 +++--
.../vega/ui/vaa/components/VegaFieldVaa.java | 3 ++-
.../vega/ui/wkt/CausewayModuleValVegaUiWkt.java | 5 +++--
.../vega/ui/wkt/components/VegaComponentWkt.java | 5 +++--
.../vega/ui/wkt/components/VegaPanelFactoriesWkt.java | 3 ++-
95 files changed, 247 insertions(+), 185 deletions(-)
diff --git a/tooling/c4modeling/src/main/java/org/apache/causeway/tooling/c4/C4.java b/tooling/c4modeling/src/main/java/org/apache/causeway/tooling/c4/C4.java
index ed103328b0..83a20cb784 100644
--- a/tooling/c4modeling/src/main/java/org/apache/causeway/tooling/c4/C4.java
+++ b/tooling/c4modeling/src/main/java/org/apache/causeway/tooling/c4/C4.java
@@ -20,9 +20,6 @@ package org.apache.causeway.tooling.c4;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.springframework.lang.Nullable;
-
import com.structurizr.Workspace;
import com.structurizr.io.plantuml.PlantUMLWriter;
import com.structurizr.io.plantuml.StructurizrPlantUMLWriter;
@@ -36,6 +33,10 @@ import com.structurizr.view.SystemContextView;
import com.structurizr.view.View;
import com.structurizr.view.ViewSet;
+import org.springframework.lang.Nullable;
+
+import org.apache.causeway.commons.internal.base._Strings;
+
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NonNull;
diff --git a/tooling/c4modeling/src/test/java/org/apache/causeway/tooling/c4/test/C4Test.java b/tooling/c4modeling/src/test/java/org/apache/causeway/tooling/c4/test/C4Test.java
index b1969cfb2e..ac89df261b 100644
--- a/tooling/c4modeling/src/test/java/org/apache/causeway/tooling/c4/test/C4Test.java
+++ b/tooling/c4modeling/src/test/java/org/apache/causeway/tooling/c4/test/C4Test.java
@@ -28,12 +28,13 @@ import com.structurizr.model.Person;
import com.structurizr.model.SoftwareSystem;
import com.structurizr.view.SystemContextView;
-import org.apache.causeway.commons.internal.base._Text;
-import org.apache.causeway.tooling.c4.C4;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.apache.causeway.commons.internal.base._Text;
+import org.apache.causeway.tooling.c4.C4;
+
import lombok.val;
class C4Test {
diff --git a/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/Cli.java b/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/Cli.java
index 3e42b79e71..5317100287 100644
--- a/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/Cli.java
+++ b/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/Cli.java
@@ -26,7 +26,6 @@ import org.apache.causeway.commons.internal.context._Context;
import org.apache.causeway.tooling.cli.projdoc.ProjectDocModel;
import lombok.val;
-
import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
diff --git a/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/CliConfig.java b/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/CliConfig.java
index 1efff409d2..b53402bdfb 100644
--- a/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/CliConfig.java
+++ b/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/CliConfig.java
@@ -22,12 +22,13 @@ import java.io.File;
import java.util.LinkedHashMap;
import java.util.Optional;
+import org.yaml.snakeyaml.constructor.ConstructorException;
+
import org.apache.causeway.commons.internal.resources._Yaml;
import org.apache.causeway.tooling.j2adoc.format.UnitFormatter;
import org.apache.causeway.tooling.j2adoc.format.UnitFormatterCompact;
import org.apache.causeway.tooling.j2adoc.format.UnitFormatterWithSourceAndCallouts;
import org.apache.causeway.tooling.j2adoc.format.UnitFormatterWithSourceAndSections;
-import org.yaml.snakeyaml.constructor.ConstructorException;
import lombok.Data;
import lombok.Getter;
diff --git a/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/projdoc/ProjectDocModel.java b/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/projdoc/ProjectDocModel.java
index 29300cecab..13895eb709 100644
--- a/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/projdoc/ProjectDocModel.java
+++ b/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/projdoc/ProjectDocModel.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.tooling.cli.projdoc;
+import static guru.nidi.codeassert.config.Language.JAVA;
+
import java.io.File;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
@@ -36,6 +38,10 @@ import java.util.stream.Stream;
import com.structurizr.model.Container;
import com.structurizr.view.AutomaticLayout.RankDirection;
+import org.apache.commons.lang3.builder.EqualsExclude;
+import org.asciidoctor.ast.Document;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Files;
import org.apache.causeway.commons.internal.base._Strings;
@@ -52,9 +58,6 @@ import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
import org.apache.causeway.tooling.projectmodel.ArtifactCoordinates;
import org.apache.causeway.tooling.projectmodel.Dependency;
import org.apache.causeway.tooling.projectmodel.ProjectNode;
-import org.apache.commons.lang3.builder.EqualsExclude;
-import org.asciidoctor.ast.Document;
-import org.springframework.lang.Nullable;
import static org.apache.causeway.tooling.model4adoc.AsciiDocFactory.block;
import static org.apache.causeway.tooling.model4adoc.AsciiDocFactory.cell;
@@ -63,6 +66,9 @@ import static org.apache.causeway.tooling.model4adoc.AsciiDocFactory.headRow;
import static org.apache.causeway.tooling.model4adoc.AsciiDocFactory.row;
import static org.apache.causeway.tooling.model4adoc.AsciiDocFactory.table;
+import guru.nidi.codeassert.config.Language;
+import guru.nidi.codeassert.model.CodeClass;
+import guru.nidi.codeassert.model.Model;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NonNull;
@@ -70,12 +76,6 @@ import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.val;
-import guru.nidi.codeassert.config.Language;
-import guru.nidi.codeassert.model.CodeClass;
-import guru.nidi.codeassert.model.Model;
-
-import static guru.nidi.codeassert.config.Language.JAVA;
-
/**
* Acts both as a model and a writer (adoc).
* @since Sep 22, 2020
diff --git a/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/projdoc/ProjectDocWriter.java b/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/projdoc/ProjectDocWriter.java
index 84f2bf1080..398ff9aec4 100644
--- a/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/projdoc/ProjectDocWriter.java
+++ b/tooling/cli/src/main/java/org/apache/causeway/tooling/cli/projdoc/ProjectDocWriter.java
@@ -21,13 +21,14 @@ package org.apache.causeway.tooling.cli.projdoc;
import java.io.File;
import java.util.function.BiConsumer;
+import org.asciidoctor.ast.Document;
+
import org.apache.causeway.commons.internal.base._Files;
import org.apache.causeway.commons.internal.base._Refs;
import org.apache.causeway.tooling.cli.CliConfig;
import org.apache.causeway.tooling.j2adoc.J2AdocContext;
import org.apache.causeway.tooling.j2adoc.J2AdocUnit;
import org.apache.causeway.tooling.model4adoc.AsciiDocWriter;
-import org.asciidoctor.ast.Document;
import lombok.NonNull;
import lombok.SneakyThrows;
diff --git a/tooling/cli/src/test/java/org/apache/causeway/tooling/cli/projdoc/ProjectDocModel_sanitizeDescription_Test.java b/tooling/cli/src/test/java/org/apache/causeway/tooling/cli/projdoc/ProjectDocModel_sanitizeDescription_Test.java
index e54ab0f3ec..2a30c58475 100644
--- a/tooling/cli/src/test/java/org/apache/causeway/tooling/cli/projdoc/ProjectDocModel_sanitizeDescription_Test.java
+++ b/tooling/cli/src/test/java/org/apache/causeway/tooling/cli/projdoc/ProjectDocModel_sanitizeDescription_Test.java
@@ -20,7 +20,6 @@
package org.apache.causeway.tooling.cli.projdoc;
-import org.apache.causeway.tooling.cli.projdoc.ProjectDocModel;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/tooling/cli/src/test/java/org/apache/causeway/tooling/cli/test/CliConfigTest.java b/tooling/cli/src/test/java/org/apache/causeway/tooling/cli/test/CliConfigTest.java
index 3ee3ba8955..6044738197 100644
--- a/tooling/cli/src/test/java/org/apache/causeway/tooling/cli/test/CliConfigTest.java
+++ b/tooling/cli/src/test/java/org/apache/causeway/tooling/cli/test/CliConfigTest.java
@@ -18,8 +18,6 @@
*/
package org.apache.causeway.tooling.cli.test;
-import org.apache.causeway.commons.internal.resources._Yaml;
-import org.apache.causeway.tooling.cli.CliConfig;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -28,6 +26,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.causeway.commons.internal.resources._Yaml;
+import org.apache.causeway.tooling.cli.CliConfig;
+
import lombok.val;
class CliConfigTest {
diff --git a/tooling/cli/src/test/java/org/apache/causeway/tooling/cli/test/adocfix/IncludeStatementFixerTest.java b/tooling/cli/src/test/java/org/apache/causeway/tooling/cli/test/adocfix/IncludeStatementFixerTest.java
index 096f9c9b8a..524a14e90d 100644
--- a/tooling/cli/src/test/java/org/apache/causeway/tooling/cli/test/adocfix/IncludeStatementFixerTest.java
+++ b/tooling/cli/src/test/java/org/apache/causeway/tooling/cli/test/adocfix/IncludeStatementFixerTest.java
@@ -23,12 +23,13 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.function.Consumer;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Text;
import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.tooling.model4adoc.include.IncludeStatements;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
import lombok.NonNull;
import lombok.val;
diff --git a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/J2AdocContext.java b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/J2AdocContext.java
index 34c1c8a67d..e13e16b696 100644
--- a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/J2AdocContext.java
+++ b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/J2AdocContext.java
@@ -26,6 +26,8 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.collections._Maps;
@@ -35,7 +37,6 @@ import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.tooling.j2adoc.J2AdocUnit.LookupKey;
import org.apache.causeway.tooling.j2adoc.format.UnitFormatter;
import org.apache.causeway.tooling.javamodel.ast.ImportDeclarations;
-import org.springframework.lang.Nullable;
import lombok.Builder;
import lombok.Getter;
diff --git a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/J2AdocUnit.java b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/J2AdocUnit.java
index 1088a14e26..06a2f318a7 100644
--- a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/J2AdocUnit.java
+++ b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/J2AdocUnit.java
@@ -27,6 +27,8 @@ import com.github.javaparser.StaticJavaParser;
import com.github.javaparser.ast.ImportDeclaration;
import com.github.javaparser.javadoc.Javadoc;
+import org.asciidoctor.ast.Document;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.resource.ResourceCoordinates;
@@ -34,7 +36,6 @@ import org.apache.causeway.tooling.j2adoc.util.AsciiDocIncludeTagFilter;
import org.apache.causeway.tooling.javamodel.ast.AnyTypeDeclaration;
import org.apache.causeway.tooling.javamodel.ast.CompilationUnits;
import org.apache.causeway.tooling.javamodel.ast.PackageDeclarations;
-import org.asciidoctor.ast.Document;
import lombok.Getter;
import lombok.NonNull;
diff --git a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/convert/HtmlToAsciiDoc.java b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/convert/HtmlToAsciiDoc.java
index ddcd47953e..4cd761d500 100644
--- a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/convert/HtmlToAsciiDoc.java
+++ b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/convert/HtmlToAsciiDoc.java
@@ -20,8 +20,6 @@ package org.apache.causeway.tooling.j2adoc.convert;
import java.util.Stack;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
import org.asciidoctor.ast.Block;
import org.asciidoctor.ast.Document;
import org.asciidoctor.ast.StructuralNode;
@@ -31,6 +29,9 @@ import org.jsoup.nodes.TextNode;
import org.jsoup.select.NodeTraversor;
import org.jsoup.select.NodeVisitor;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
+
import lombok.SneakyThrows;
import lombok.val;
diff --git a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/convert/J2AdocConverter.java b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/convert/J2AdocConverter.java
index b37bf92105..89cc876f43 100644
--- a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/convert/J2AdocConverter.java
+++ b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/convert/J2AdocConverter.java
@@ -25,9 +25,10 @@ import com.github.javaparser.ast.body.FieldDeclaration;
import com.github.javaparser.ast.body.MethodDeclaration;
import com.github.javaparser.javadoc.Javadoc;
+import org.asciidoctor.ast.Document;
+
import org.apache.causeway.tooling.j2adoc.J2AdocContext;
import org.apache.causeway.tooling.j2adoc.J2AdocUnit;
-import org.asciidoctor.ast.Document;
import lombok.NonNull;
diff --git a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/convert/J2AdocConverterAbstract.java b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/convert/J2AdocConverterAbstract.java
index fbf617b075..fb383af1e3 100644
--- a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/convert/J2AdocConverterAbstract.java
+++ b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/convert/J2AdocConverterAbstract.java
@@ -21,8 +21,6 @@ package org.apache.causeway.tooling.j2adoc.convert;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.springframework.lang.Nullable;
-
import com.github.javaparser.ast.body.Parameter;
import com.github.javaparser.ast.expr.SimpleName;
import com.github.javaparser.ast.type.ClassOrInterfaceType;
@@ -32,11 +30,13 @@ import com.github.javaparser.javadoc.description.JavadocDescription;
import com.github.javaparser.javadoc.description.JavadocInlineTag;
import com.github.javaparser.javadoc.description.JavadocSnippet;
+import org.asciidoctor.ast.Document;
+import org.jsoup.Jsoup;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.tooling.j2adoc.J2AdocContext;
import org.apache.causeway.tooling.j2adoc.J2AdocUnit;
-import org.asciidoctor.ast.Document;
-import org.jsoup.Jsoup;
import lombok.NonNull;
import lombok.val;
diff --git a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/convert/J2AdocConverterDefault.java b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/convert/J2AdocConverterDefault.java
index f2c21bbd78..5e08dc0c76 100644
--- a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/convert/J2AdocConverterDefault.java
+++ b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/convert/J2AdocConverterDefault.java
@@ -29,6 +29,9 @@ import com.github.javaparser.ast.body.MethodDeclaration;
import com.github.javaparser.javadoc.Javadoc;
import com.github.javaparser.javadoc.description.JavadocInlineTag;
+import org.asciidoctor.ast.Document;
+import org.asciidoctor.ast.StructuralNode;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.tooling.j2adoc.J2AdocContext;
@@ -42,8 +45,6 @@ import org.apache.causeway.tooling.javamodel.ast.Javadocs;
import org.apache.causeway.tooling.javamodel.ast.MethodDeclarations;
import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
import org.apache.causeway.tooling.model4adoc.ast.SimpleBlock;
-import org.asciidoctor.ast.Document;
-import org.asciidoctor.ast.StructuralNode;
import lombok.NonNull;
import lombok.val;
diff --git a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/Snippets.java b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/Snippets.java
index 0d839c9e66..6682e68fd0 100644
--- a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/Snippets.java
+++ b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/Snippets.java
@@ -26,6 +26,7 @@ import com.github.javaparser.ast.nodeTypes.NodeWithJavadoc;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.tooling.j2adoc.J2AdocContext;
import org.apache.causeway.tooling.j2adoc.J2AdocUnit;
+import org.apache.causeway.tooling.j2adoc.format.Snippets.Callout;
import org.apache.causeway.tooling.javamodel.ast.AnnotationMemberDeclarations;
import org.apache.causeway.tooling.javamodel.ast.ConstructorDeclarations;
import org.apache.causeway.tooling.javamodel.ast.EnumConstantDeclarations;
diff --git a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatter.java b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatter.java
index d17795aab6..74f5c08280 100644
--- a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatter.java
+++ b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatter.java
@@ -21,9 +21,10 @@ package org.apache.causeway.tooling.j2adoc.format;
import java.io.File;
import java.util.function.BiFunction;
-import org.apache.causeway.tooling.j2adoc.J2AdocUnit;
import org.asciidoctor.ast.Document;
+import org.apache.causeway.tooling.j2adoc.J2AdocUnit;
+
public interface UnitFormatter
extends BiFunction<J2AdocUnit, File, Document> {
diff --git a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterAbstract.java b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterAbstract.java
index 9ff4d7132c..6bb8b61f45 100644
--- a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterAbstract.java
+++ b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterAbstract.java
@@ -19,7 +19,10 @@
package org.apache.causeway.tooling.j2adoc.format;
import java.io.File;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Objects;
+import java.util.Optional;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -27,6 +30,11 @@ import java.util.stream.Collectors;
import com.github.javaparser.ast.nodeTypes.NodeWithJavadoc;
import com.github.javaparser.javadoc.Javadoc;
+import org.asciidoctor.ast.Block;
+import org.asciidoctor.ast.Document;
+import org.asciidoctor.ast.List;
+import org.asciidoctor.ast.StructuralNode;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.tooling.j2adoc.J2AdocContext;
@@ -35,10 +43,6 @@ import org.apache.causeway.tooling.j2adoc.convert.J2AdocConverter;
import org.apache.causeway.tooling.j2adoc.convert.J2AdocConverterDefault;
import org.apache.causeway.tooling.javamodel.ast.Javadocs;
import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
-import org.asciidoctor.ast.Block;
-import org.asciidoctor.ast.Document;
-import org.asciidoctor.ast.List;
-import org.asciidoctor.ast.StructuralNode;
import static org.apache.causeway.tooling.model4adoc.AsciiDocFactory.block;
diff --git a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterCompact.java b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterCompact.java
index e5d2bc1c1e..1af8262174 100644
--- a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterCompact.java
+++ b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterCompact.java
@@ -20,12 +20,13 @@ package org.apache.causeway.tooling.j2adoc.format;
import java.util.Optional;
+import org.asciidoctor.ast.StructuralNode;
+
import org.apache.causeway.tooling.j2adoc.J2AdocContext;
import org.apache.causeway.tooling.j2adoc.J2AdocUnit;
import org.apache.causeway.tooling.j2adoc.convert.J2AdocConverter;
import org.apache.causeway.tooling.j2adoc.convert.J2AdocConverterDefault;
import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
-import org.asciidoctor.ast.StructuralNode;
import lombok.NonNull;
import lombok.val;
diff --git a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterWithSourceAndCallouts.java b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterWithSourceAndCallouts.java
index d4290871d2..dd6271245f 100644
--- a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterWithSourceAndCallouts.java
+++ b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterWithSourceAndCallouts.java
@@ -20,12 +20,13 @@ package org.apache.causeway.tooling.j2adoc.format;
import java.util.Optional;
+import org.asciidoctor.ast.StructuralNode;
+
import org.apache.causeway.tooling.j2adoc.J2AdocContext;
import org.apache.causeway.tooling.j2adoc.J2AdocUnit;
import org.apache.causeway.tooling.j2adoc.convert.J2AdocConverter;
import org.apache.causeway.tooling.j2adoc.convert.J2AdocConverterDefault;
import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
-import org.asciidoctor.ast.StructuralNode;
import lombok.NonNull;
import lombok.val;
diff --git a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterWithSourceAndSections.java b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterWithSourceAndSections.java
index 95307e33b8..0a5ceb6b3a 100644
--- a/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterWithSourceAndSections.java
+++ b/tooling/java2adoc/src/main/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterWithSourceAndSections.java
@@ -26,6 +26,10 @@ import java.util.function.Function;
import com.github.javaparser.ast.nodeTypes.NodeWithJavadoc;
import com.github.javaparser.javadoc.Javadoc;
+import org.asciidoctor.ast.Document;
+import org.asciidoctor.ast.List;
+import org.asciidoctor.ast.StructuralNode;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.tooling.j2adoc.J2AdocContext;
import org.apache.causeway.tooling.j2adoc.J2AdocUnit;
@@ -34,9 +38,6 @@ import org.apache.causeway.tooling.j2adoc.convert.J2AdocConverterDefault;
import org.apache.causeway.tooling.javamodel.ast.CallableDeclarations;
import org.apache.causeway.tooling.javamodel.ast.Javadocs;
import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
-import org.asciidoctor.ast.Document;
-import org.asciidoctor.ast.List;
-import org.asciidoctor.ast.StructuralNode;
import lombok.NonNull;
import lombok.val;
diff --git a/tooling/java2adoc/src/test/java/org/apache/causeway/tooling/j2adoc/convert/HtmlToAsciiDocTest.java b/tooling/java2adoc/src/test/java/org/apache/causeway/tooling/j2adoc/convert/HtmlToAsciiDocTest.java
index f6492ef25b..9006dcce82 100644
--- a/tooling/java2adoc/src/test/java/org/apache/causeway/tooling/j2adoc/convert/HtmlToAsciiDocTest.java
+++ b/tooling/java2adoc/src/test/java/org/apache/causeway/tooling/j2adoc/convert/HtmlToAsciiDocTest.java
@@ -18,17 +18,17 @@
*/
package org.apache.causeway.tooling.j2adoc.convert;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._Text;
-import org.apache.causeway.tooling.j2adoc.convert.HtmlToAsciiDoc;
-import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
-import org.apache.causeway.tooling.model4adoc.AsciiDocWriter;
import org.jsoup.Jsoup;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._Text;
+import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
+import org.apache.causeway.tooling.model4adoc.AsciiDocWriter;
+
import lombok.val;
class HtmlToAsciiDocTest {
diff --git a/tooling/java2adoc/src/test/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterAbstractTest.java b/tooling/java2adoc/src/test/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterAbstractTest.java
index dc1fae3007..4be4a7d1a8 100644
--- a/tooling/java2adoc/src/test/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterAbstractTest.java
+++ b/tooling/java2adoc/src/test/java/org/apache/causeway/tooling/j2adoc/format/UnitFormatterAbstractTest.java
@@ -20,13 +20,10 @@
package org.apache.causeway.tooling.j2adoc.format;
-import org.apache.causeway.tooling.j2adoc.format.UnitFormatterAbstract;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
class UnitFormatterAbstractTest {
@Nested
diff --git a/tooling/java2adoc/src/test/java/org/apache/causeway/tooling/j2adoc/test/J2AdocTest.java b/tooling/java2adoc/src/test/java/org/apache/causeway/tooling/j2adoc/test/J2AdocTest.java
index 8aab84238c..0bef3db271 100644
--- a/tooling/java2adoc/src/test/java/org/apache/causeway/tooling/j2adoc/test/J2AdocTest.java
+++ b/tooling/java2adoc/src/test/java/org/apache/causeway/tooling/j2adoc/test/J2AdocTest.java
@@ -18,11 +18,16 @@
*/
package org.apache.causeway.tooling.j2adoc.test;
+import static guru.nidi.codeassert.config.Language.JAVA;
+
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.function.Consumer;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Text;
import org.apache.causeway.commons.internal.collections._Sets;
@@ -30,16 +35,11 @@ import org.apache.causeway.tooling.j2adoc.J2AdocContext;
import org.apache.causeway.tooling.j2adoc.util.AsciiDocIncludeTagFilter;
import org.apache.causeway.tooling.javamodel.AnalyzerConfigFactory;
import org.apache.causeway.tooling.model4adoc.AsciiDocWriter;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
+import guru.nidi.codeassert.config.Language;
import lombok.NonNull;
import lombok.val;
-import guru.nidi.codeassert.config.Language;
-
-import static guru.nidi.codeassert.config.Language.JAVA;
-
class J2AdocTest {
@Test @Disabled
diff --git a/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/AnalyzerConfigFactory.java b/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/AnalyzerConfigFactory.java
index da2a391976..556e11580d 100644
--- a/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/AnalyzerConfigFactory.java
+++ b/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/AnalyzerConfigFactory.java
@@ -24,11 +24,10 @@ import java.util.List;
import org.apache.causeway.commons.internal.base._Files;
-import lombok.experimental.UtilityClass;
-
import guru.nidi.codeassert.config.AnalyzerConfig;
import guru.nidi.codeassert.config.Language;
import guru.nidi.codeassert.config.ProjectLayout.Maven;
+import lombok.experimental.UtilityClass;
@UtilityClass
public class AnalyzerConfigFactory {
diff --git a/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/ast/CallableDeclarations.java b/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/ast/CallableDeclarations.java
index 15eab59d45..352f47df37 100644
--- a/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/ast/CallableDeclarations.java
+++ b/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/ast/CallableDeclarations.java
@@ -19,7 +19,7 @@
package org.apache.causeway.tooling.javamodel.ast;
import com.github.javaparser.ast.body.CallableDeclaration;
-import com.github.javaparser.ast.body.Parameter;
+
import lombok.NonNull;
import lombok.val;
diff --git a/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/ast/CodeClasses.java b/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/ast/CodeClasses.java
index 91a161cd94..f41aded2f8 100644
--- a/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/ast/CodeClasses.java
+++ b/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/ast/CodeClasses.java
@@ -22,11 +22,10 @@ import java.util.function.Predicate;
import org.apache.causeway.commons.internal.base._Strings;
+import guru.nidi.codeassert.model.CodeClass;
import lombok.NonNull;
import lombok.extern.log4j.Log4j2;
-import guru.nidi.codeassert.model.CodeClass;
-
@Log4j2
public final class CodeClasses {
diff --git a/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/ast/FieldDeclarations.java b/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/ast/FieldDeclarations.java
index 7d3174844e..cc60064fb3 100644
--- a/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/ast/FieldDeclarations.java
+++ b/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/ast/FieldDeclarations.java
@@ -29,11 +29,10 @@ import com.github.javaparser.ast.type.TypeParameter;
import com.github.javaparser.printer.configuration.DefaultConfigurationOption;
import com.github.javaparser.printer.configuration.DefaultPrinterConfiguration;
import com.github.javaparser.printer.configuration.DefaultPrinterConfiguration.ConfigOption;
+import com.github.javaparser.printer.configuration.PrinterConfiguration;
import org.apache.causeway.commons.collections.Can;
-import com.github.javaparser.printer.configuration.PrinterConfiguration;
-
import lombok.NonNull;
import lombok.val;
diff --git a/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/ast/MemberInfos.java b/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/ast/MemberInfos.java
index e66fc89dc8..5241bba16a 100644
--- a/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/ast/MemberInfos.java
+++ b/tooling/javamodel/src/main/java/org/apache/causeway/tooling/javamodel/ast/MemberInfos.java
@@ -21,9 +21,8 @@ package org.apache.causeway.tooling.javamodel.ast;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import lombok.NonNull;
-
import guru.nidi.codeassert.model.MemberInfo;
+import lombok.NonNull;
public final class MemberInfos {
diff --git a/tooling/javamodel/src/test/java/org/apache/causeway/tooling/javamodel/test/AnalyzerTest.java b/tooling/javamodel/src/test/java/org/apache/causeway/tooling/javamodel/test/AnalyzerTest.java
index 13bf317bdb..c20f24188c 100644
--- a/tooling/javamodel/src/test/java/org/apache/causeway/tooling/javamodel/test/AnalyzerTest.java
+++ b/tooling/javamodel/src/test/java/org/apache/causeway/tooling/javamodel/test/AnalyzerTest.java
@@ -18,24 +18,24 @@
*/
package org.apache.causeway.tooling.javamodel.test;
+import static guru.nidi.codeassert.config.Language.JAVA;
+
import java.io.File;
import java.util.stream.Stream;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Files;
import org.apache.causeway.tooling.javamodel.AnalyzerConfigFactory;
import org.apache.causeway.tooling.javamodel.ast.AnyTypeDeclaration;
import org.apache.causeway.tooling.javamodel.ast.CompilationUnits;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import lombok.val;
import guru.nidi.codeassert.config.Language;
import guru.nidi.codeassert.model.CodeClass;
import guru.nidi.codeassert.model.Model;
-
-import static guru.nidi.codeassert.config.Language.JAVA;
+import lombok.val;
class AnalyzerTest {
diff --git a/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java b/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java
index 5428d7792b..7bc3228972 100644
--- a/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java
+++ b/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java
@@ -26,13 +26,15 @@ import java.util.Optional;
import java.util.function.Consumer;
import java.util.stream.Stream;
+import org.springframework.util.ClassUtils;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Files;
import org.apache.causeway.commons.internal.base._Refs;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.base._Text;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.springframework.util.ClassUtils;
+import org.apache.causeway.tooling.metaprog.demoshowcases.value.ValueTypeGenTemplate.TemplateVariant;
import lombok.Builder;
import lombok.Getter;
diff --git a/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/graphql/GraphQLToJavaSourceConverter.java b/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/graphql/GraphQLToJavaSourceConverter.java
index f52c2de9db..f27d877eb1 100644
--- a/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/graphql/GraphQLToJavaSourceConverter.java
+++ b/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/graphql/GraphQLToJavaSourceConverter.java
@@ -33,14 +33,10 @@ import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.TypeName;
import com.squareup.javapoet.TypeSpec;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.base._Strings;
import org.springframework.util.ReflectionUtils;
-import lombok.AccessLevel;
-import lombok.RequiredArgsConstructor;
-import lombok.Value;
-import lombok.val;
+import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.commons.internal.base._Strings;
import graphql.language.ListType;
import graphql.language.NonNullType;
@@ -54,6 +50,10 @@ import graphql.schema.GraphQLObjectType;
import graphql.schema.GraphQLScalarType;
import graphql.schema.GraphQLSchema;
import graphql.schema.idl.SchemaGenerator;
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.Value;
+import lombok.val;
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
public class GraphQLToJavaSourceConverter {
diff --git a/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java b/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java
index 253f1c0f90..f5b2f322f8 100644
--- a/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java
+++ b/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java
@@ -27,11 +27,6 @@ import java.util.Comparator;
import java.util.Objects;
import java.util.Set;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._Files;
-import org.apache.causeway.commons.internal.base._Text;
-import org.apache.causeway.commons.internal.collections._Sets;
-import org.apache.causeway.commons.internal.functions._Predicates;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
@@ -39,6 +34,12 @@ import org.junit.jupiter.params.provider.EnumSource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._Files;
+import org.apache.causeway.commons.internal.base._Text;
+import org.apache.causeway.commons.internal.collections._Sets;
+import org.apache.causeway.commons.internal.functions._Predicates;
+
import lombok.SneakyThrows;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/graphql/GraphQLTest.java b/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/graphql/GraphQLTest.java
index 11055d0743..2e55e0c457 100644
--- a/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/graphql/GraphQLTest.java
+++ b/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/graphql/GraphQLTest.java
@@ -22,14 +22,14 @@ import java.beans.IntrospectionException;
import java.lang.reflect.InvocationTargetException;
import java.nio.charset.StandardCharsets;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.reflection._Reflect;
import org.apache.causeway.tooling.metaprog.compiler.JavaSourceCompilingClassLoader;
-import org.apache.causeway.tooling.metaprog.graphql.GraphQLToJavaSourceConverter;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
import lombok.val;
diff --git a/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/AsciiDocFactory.java b/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/AsciiDocFactory.java
index d270104b68..3e79f1093e 100644
--- a/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/AsciiDocFactory.java
+++ b/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/AsciiDocFactory.java
@@ -21,6 +21,16 @@ package org.apache.causeway.tooling.model4adoc;
import java.util.function.Consumer;
import java.util.stream.Collectors;
+import org.asciidoctor.ast.Block;
+import org.asciidoctor.ast.Cell;
+import org.asciidoctor.ast.Column;
+import org.asciidoctor.ast.Document;
+import org.asciidoctor.ast.ListItem;
+import org.asciidoctor.ast.Row;
+import org.asciidoctor.ast.StructuralNode;
+import org.asciidoctor.ast.Table;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Refs;
import org.apache.causeway.commons.internal.base._Strings;
@@ -33,15 +43,6 @@ import org.apache.causeway.tooling.model4adoc.ast.SimpleList;
import org.apache.causeway.tooling.model4adoc.ast.SimpleListItem;
import org.apache.causeway.tooling.model4adoc.ast.SimpleRow;
import org.apache.causeway.tooling.model4adoc.ast.SimpleTable;
-import org.asciidoctor.ast.Block;
-import org.asciidoctor.ast.Cell;
-import org.asciidoctor.ast.Column;
-import org.asciidoctor.ast.Document;
-import org.asciidoctor.ast.ListItem;
-import org.asciidoctor.ast.Row;
-import org.asciidoctor.ast.StructuralNode;
-import org.asciidoctor.ast.Table;
-import org.springframework.lang.Nullable;
import lombok.NonNull;
import lombok.val;
diff --git a/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/AsciiDocWriter.java b/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/AsciiDocWriter.java
index 64df1d5689..ea1b88c479 100644
--- a/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/AsciiDocWriter.java
+++ b/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/AsciiDocWriter.java
@@ -28,11 +28,12 @@ import java.io.StringWriter;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.asciidoctor.Asciidoctor;
import org.asciidoctor.ast.Document;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
import lombok.SneakyThrows;
import lombok.val;
diff --git a/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/NodeWriter.java b/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/NodeWriter.java
index 9bf45ede61..5a967335ad 100644
--- a/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/NodeWriter.java
+++ b/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/NodeWriter.java
@@ -31,6 +31,12 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
+import org.asciidoctor.ast.Block;
+import org.asciidoctor.ast.Document;
+import org.asciidoctor.ast.ListItem;
+import org.asciidoctor.ast.StructuralNode;
+import org.asciidoctor.ast.Table;
+
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.base._Refs;
import org.apache.causeway.commons.internal.base._Strings;
@@ -38,11 +44,6 @@ import org.apache.causeway.commons.internal.base._Text;
import org.apache.causeway.commons.internal.collections._Arrays;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.collections._Sets;
-import org.asciidoctor.ast.Block;
-import org.asciidoctor.ast.Document;
-import org.asciidoctor.ast.ListItem;
-import org.asciidoctor.ast.StructuralNode;
-import org.asciidoctor.ast.Table;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/StructuralNodeTraversor.java b/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/StructuralNodeTraversor.java
index 4ea61b3476..380b5a42bc 100644
--- a/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/StructuralNodeTraversor.java
+++ b/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/StructuralNodeTraversor.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.tooling.model4adoc;
+import org.asciidoctor.ast.StructuralNode;
+
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.base._Refs;
import org.apache.causeway.commons.internal.base._Refs.BooleanReference;
-import org.asciidoctor.ast.StructuralNode;
import lombok.val;
diff --git a/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/StructuralNodeVisitor.java b/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/StructuralNodeVisitor.java
index 4a09f03f02..3194f20a99 100644
--- a/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/StructuralNodeVisitor.java
+++ b/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/StructuralNodeVisitor.java
@@ -18,13 +18,14 @@
*/
package org.apache.causeway.tooling.model4adoc;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.asciidoctor.ast.Block;
import org.asciidoctor.ast.Document;
import org.asciidoctor.ast.ListItem;
import org.asciidoctor.ast.StructuralNode;
import org.asciidoctor.ast.Table;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
/**
* Node visitor interface. Provide an implementing class to {@link StructuralNodeTraversor} to iterate through nodes.
* <p>
diff --git a/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/ast/ContentNodeAbstract.java b/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/ast/ContentNodeAbstract.java
index 88475f98c7..9188b4c5f8 100644
--- a/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/ast/ContentNodeAbstract.java
+++ b/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/ast/ContentNodeAbstract.java
@@ -23,10 +23,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.causeway.commons.internal.base._Strings;
import org.asciidoctor.ast.ContentNode;
import org.asciidoctor.ast.Document;
+import org.apache.causeway.commons.internal.base._Strings;
+
import lombok.Getter;
import lombok.Setter;
import lombok.val;
diff --git a/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/ast/SimpleList.java b/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/ast/SimpleList.java
index b5963d25bb..18a65e99ec 100644
--- a/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/ast/SimpleList.java
+++ b/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/ast/SimpleList.java
@@ -20,9 +20,10 @@ package org.apache.causeway.tooling.model4adoc.ast;
import java.util.List;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.asciidoctor.ast.StructuralNode;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
import lombok.ToString;
@ToString(callSuper = true)
diff --git a/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/ast/SimpleListItem.java b/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/ast/SimpleListItem.java
index 57f837ec34..7fa20c2e5d 100644
--- a/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/ast/SimpleListItem.java
+++ b/tooling/model4adoc/src/main/java/org/apache/causeway/tooling/model4adoc/ast/SimpleListItem.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.tooling.model4adoc.ast;
-import org.apache.causeway.commons.internal.base._Strings;
import org.asciidoctor.ast.ListItem;
+import org.apache.causeway.commons.internal.base._Strings;
+
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
diff --git a/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/AbstractAsciiDocWriterTest.java b/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/AbstractAsciiDocWriterTest.java
index 6986c2459f..8ed70783e4 100644
--- a/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/AbstractAsciiDocWriterTest.java
+++ b/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/AbstractAsciiDocWriterTest.java
@@ -21,14 +21,15 @@ package org.apache.causeway.tooling.model4adoc.test.ast;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.base._Text;
-import org.apache.causeway.tooling.model4adoc.AsciiDocWriter;
import org.asciidoctor.Asciidoctor;
import org.asciidoctor.Options;
import org.asciidoctor.ast.Document;
import org.junit.jupiter.api.Test;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.base._Text;
+import org.apache.causeway.tooling.model4adoc.AsciiDocWriter;
+
import lombok.val;
abstract class AbstractAsciiDocWriterTest {
diff --git a/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/AdmonitionTest.java b/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/AdmonitionTest.java
index 4fdb5b6486..518d95142c 100644
--- a/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/AdmonitionTest.java
+++ b/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/AdmonitionTest.java
@@ -20,11 +20,12 @@ package org.apache.causeway.tooling.model4adoc.test.ast;
import java.io.IOException;
-import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
import org.asciidoctor.ast.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
+
import static org.apache.causeway.tooling.model4adoc.AsciiDocFactory.doc;
import lombok.val;
diff --git a/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/CalloutContinuationTest.java b/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/CalloutContinuationTest.java
index ac13236fe0..6d81c86f85 100644
--- a/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/CalloutContinuationTest.java
+++ b/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/CalloutContinuationTest.java
@@ -20,11 +20,12 @@ package org.apache.causeway.tooling.model4adoc.test.ast;
import java.io.IOException;
-import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
import org.asciidoctor.ast.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
+
import static org.apache.causeway.tooling.model4adoc.AsciiDocFactory.doc;
import lombok.val;
diff --git a/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/CollapsibleTest.java b/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/CollapsibleTest.java
index 7086a3e01b..e3d9b3e972 100644
--- a/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/CollapsibleTest.java
+++ b/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/CollapsibleTest.java
@@ -20,11 +20,12 @@ package org.apache.causeway.tooling.model4adoc.test.ast;
import java.io.IOException;
-import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
import org.asciidoctor.ast.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
+
import static org.apache.causeway.tooling.model4adoc.AsciiDocFactory.doc;
import lombok.val;
diff --git a/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/OpenBlockTest.java b/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/OpenBlockTest.java
index d324934f02..298bcc9783 100644
--- a/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/OpenBlockTest.java
+++ b/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/OpenBlockTest.java
@@ -20,11 +20,12 @@ package org.apache.causeway.tooling.model4adoc.test.ast;
import java.io.IOException;
-import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
import org.asciidoctor.ast.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
+
import static org.apache.causeway.tooling.model4adoc.AsciiDocFactory.block;
import static org.apache.causeway.tooling.model4adoc.AsciiDocFactory.doc;
import static org.apache.causeway.tooling.model4adoc.AsciiDocFactory.list;
diff --git a/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/PlantumlTest.java b/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/PlantumlTest.java
index c5d4e96eb1..652be646ab 100644
--- a/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/PlantumlTest.java
+++ b/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/PlantumlTest.java
@@ -20,12 +20,13 @@ package org.apache.causeway.tooling.model4adoc.test.ast;
import java.io.IOException;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
import org.asciidoctor.ast.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
+
import static org.apache.causeway.tooling.model4adoc.AsciiDocFactory.doc;
import lombok.val;
diff --git a/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/SourceTest.java b/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/SourceTest.java
index 79568fb620..ea8b84d2d9 100644
--- a/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/SourceTest.java
+++ b/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/SourceTest.java
@@ -20,11 +20,12 @@ package org.apache.causeway.tooling.model4adoc.test.ast;
import java.io.IOException;
-import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
import org.asciidoctor.ast.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.apache.causeway.tooling.model4adoc.AsciiDocFactory;
+
import static org.apache.causeway.tooling.model4adoc.AsciiDocFactory.doc;
import lombok.val;
diff --git a/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/_Debug.java b/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/_Debug.java
index d6c08ac986..07c0db483b 100644
--- a/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/_Debug.java
+++ b/tooling/model4adoc/src/test/java/org/apache/causeway/tooling/model4adoc/test/ast/_Debug.java
@@ -20,14 +20,15 @@ package org.apache.causeway.tooling.model4adoc.test.ast;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.asciidoctor.ast.Block;
import org.asciidoctor.ast.Document;
import org.asciidoctor.ast.ListItem;
import org.asciidoctor.ast.StructuralNode;
import org.asciidoctor.ast.Table;
+import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+
import lombok.val;
final class _Debug {
diff --git a/tooling/projectmodel/src/main/java/org/apache/causeway/tooling/projectmodel/ArtifactCoordinates.java b/tooling/projectmodel/src/main/java/org/apache/causeway/tooling/projectmodel/ArtifactCoordinates.java
index 9309529835..8a52def6b2 100644
--- a/tooling/projectmodel/src/main/java/org/apache/causeway/tooling/projectmodel/ArtifactCoordinates.java
+++ b/tooling/projectmodel/src/main/java/org/apache/causeway/tooling/projectmodel/ArtifactCoordinates.java
@@ -21,9 +21,10 @@ package org.apache.causeway.tooling.projectmodel;
import java.util.Comparator;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.causeway.commons.internal.base._Strings;
import org.apache.maven.artifact.versioning.ComparableVersion;
+import org.apache.causeway.commons.internal.base._Strings;
+
import lombok.NonNull;
import lombok.Value;
diff --git a/tooling/projectmodel/src/main/java/org/apache/causeway/tooling/projectmodel/ProjectNodeFactory_gradle.java b/tooling/projectmodel/src/main/java/org/apache/causeway/tooling/projectmodel/ProjectNodeFactory_gradle.java
index f8b1336a20..c64faa2282 100644
--- a/tooling/projectmodel/src/main/java/org/apache/causeway/tooling/projectmodel/ProjectNodeFactory_gradle.java
+++ b/tooling/projectmodel/src/main/java/org/apache/causeway/tooling/projectmodel/ProjectNodeFactory_gradle.java
@@ -20,11 +20,12 @@ package org.apache.causeway.tooling.projectmodel;
import java.io.File;
+import org.gradle.tooling.GradleConnector;
+import org.gradle.tooling.model.GradleProject;
import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.tooling.projectmodel.maven.MavenModelFactory;
-import org.gradle.tooling.GradleConnector;
-import org.gradle.tooling.model.GradleProject;
import lombok.NonNull;
import lombok.val;
diff --git a/tooling/projectmodel/src/main/java/org/apache/causeway/tooling/projectmodel/ProjectNodeFactory_maven.java b/tooling/projectmodel/src/main/java/org/apache/causeway/tooling/projectmodel/ProjectNodeFactory_maven.java
index f872646038..96744b9391 100644
--- a/tooling/projectmodel/src/main/java/org/apache/causeway/tooling/projectmodel/ProjectNodeFactory_maven.java
+++ b/tooling/projectmodel/src/main/java/org/apache/causeway/tooling/projectmodel/ProjectNodeFactory_maven.java
@@ -26,12 +26,13 @@ import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.apache.maven.model.Model;
import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.tooling.projectmodel.Dependency.Location;
import org.apache.causeway.tooling.projectmodel.maven.MavenModelFactory;
import org.apache.causeway.tooling.projectmodel.maven.SimpleModelResolver;
-import org.apache.maven.model.Model;
import lombok.NonNull;
import lombok.val;
diff --git a/tooling/projectmodel/src/main/java/org/apache/causeway/tooling/projectmodel/maven/SimpleModelResolver.java b/tooling/projectmodel/src/main/java/org/apache/causeway/tooling/projectmodel/maven/SimpleModelResolver.java
index c79277191b..01ce60a877 100644
--- a/tooling/projectmodel/src/main/java/org/apache/causeway/tooling/projectmodel/maven/SimpleModelResolver.java
+++ b/tooling/projectmodel/src/main/java/org/apache/causeway/tooling/projectmodel/maven/SimpleModelResolver.java
@@ -26,7 +26,6 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
-import org.apache.causeway.commons.internal.base._Files;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
@@ -38,6 +37,8 @@ import org.apache.maven.model.resolution.InvalidRepositoryException;
import org.apache.maven.model.resolution.ModelResolver;
import org.apache.maven.model.resolution.UnresolvableModelException;
+import org.apache.causeway.commons.internal.base._Files;
+
import lombok.Getter;
import lombok.SneakyThrows;
import lombok.val;
diff --git a/tooling/projectmodel/src/test/java/org/apache/causeway/tooling/projectmodel/test/GradleDependenciesTest.java b/tooling/projectmodel/src/test/java/org/apache/causeway/tooling/projectmodel/test/GradleDependenciesTest.java
index 69e8fb7ce0..db824ac743 100644
--- a/tooling/projectmodel/src/test/java/org/apache/causeway/tooling/projectmodel/test/GradleDependenciesTest.java
+++ b/tooling/projectmodel/src/test/java/org/apache/causeway/tooling/projectmodel/test/GradleDependenciesTest.java
@@ -21,13 +21,14 @@ package org.apache.causeway.tooling.projectmodel.test;
import java.io.IOException;
import java.time.LocalDate;
-import org.apache.causeway.tooling.projectmodel.gradle.GradleDependencies;
-import org.apache.causeway.tooling.projectmodel.gradle.GradleDependenciesFactory;
-import org.apache.causeway.tooling.projectmodel.gradle.GradleDependenciesWriter;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import org.apache.causeway.tooling.projectmodel.gradle.GradleDependencies;
+import org.apache.causeway.tooling.projectmodel.gradle.GradleDependenciesFactory;
+import org.apache.causeway.tooling.projectmodel.gradle.GradleDependenciesWriter;
+
class GradleDependenciesTest extends ProjectModelTestAbstract {
@Test //@Disabled("activate only if you want to see the dependencies.gradle written to stdout")
diff --git a/tooling/projectmodel/src/test/java/org/apache/causeway/tooling/projectmodel/test/GradleSettingsTest.java b/tooling/projectmodel/src/test/java/org/apache/causeway/tooling/projectmodel/test/GradleSettingsTest.java
index b7bb64efed..8bfcc43aa7 100644
--- a/tooling/projectmodel/src/test/java/org/apache/causeway/tooling/projectmodel/test/GradleSettingsTest.java
+++ b/tooling/projectmodel/src/test/java/org/apache/causeway/tooling/projectmodel/test/GradleSettingsTest.java
@@ -25,10 +25,6 @@ import java.time.LocalDate;
import java.util.HashSet;
import java.util.Set;
-import org.apache.causeway.commons.internal.base._Text;
-import org.apache.causeway.tooling.projectmodel.gradle.GradleSettings;
-import org.apache.causeway.tooling.projectmodel.gradle.GradleSettingsFactory;
-import org.apache.causeway.tooling.projectmodel.gradle.GradleSettingsWriter;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -36,6 +32,11 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import org.apache.causeway.commons.internal.base._Text;
+import org.apache.causeway.tooling.projectmodel.gradle.GradleSettings;
+import org.apache.causeway.tooling.projectmodel.gradle.GradleSettingsFactory;
+import org.apache.causeway.tooling.projectmodel.gradle.GradleSettingsWriter;
+
import lombok.SneakyThrows;
import lombok.val;
diff --git a/tooling/projectmodel/src/test/java/org/apache/causeway/tooling/projectmodel/test/ProjectTreeTest.java b/tooling/projectmodel/src/test/java/org/apache/causeway/tooling/projectmodel/test/ProjectTreeTest.java
index 0fecb663f9..4b47e73f24 100644
--- a/tooling/projectmodel/src/test/java/org/apache/causeway/tooling/projectmodel/test/ProjectTreeTest.java
+++ b/tooling/projectmodel/src/test/java/org/apache/causeway/tooling/projectmodel/test/ProjectTreeTest.java
@@ -21,15 +21,16 @@ package org.apache.causeway.tooling.projectmodel.test;
import java.util.HashSet;
import java.util.Set;
-import org.apache.causeway.tooling.projectmodel.ProjectNode;
-import org.apache.causeway.tooling.projectmodel.ProjectNodeFactory;
-import org.apache.causeway.tooling.projectmodel.ProjectVisitor;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.causeway.tooling.projectmodel.ProjectNode;
+import org.apache.causeway.tooling.projectmodel.ProjectNodeFactory;
+import org.apache.causeway.tooling.projectmodel.ProjectVisitor;
+
import lombok.val;
class ProjectTreeTest extends ProjectModelTestAbstract {
diff --git a/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/value/AsciiDoc.java b/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/value/AsciiDoc.java
index b33fb95358..bf09ee110a 100644
--- a/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/value/AsciiDoc.java
+++ b/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/value/AsciiDoc.java
@@ -24,7 +24,6 @@ import java.util.Objects;
import javax.inject.Named;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.value.Markup;
import org.apache.causeway.valuetypes.asciidoc.applib.CausewayModuleValAsciidocApplib;
import org.apache.causeway.valuetypes.asciidoc.applib.jaxb.AsciiDocJaxbAdapter;
diff --git a/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/value/Converter.java b/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/value/Converter.java
index b6437a804d..ab28b0fac2 100644
--- a/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/value/Converter.java
+++ b/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/value/Converter.java
@@ -20,13 +20,14 @@ package org.apache.causeway.valuetypes.asciidoc.applib.value;
import java.util.Optional;
-import org.apache.causeway.commons.internal.base._Strings;
import org.asciidoctor.Asciidoctor;
import org.asciidoctor.Attributes;
import org.asciidoctor.Options;
import org.asciidoctor.SafeMode;
import org.springframework.lang.Nullable;
+import org.apache.causeway.commons.internal.base._Strings;
+
import lombok.Getter;
final class Converter {
diff --git a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/CausewayModuleValAsciidocMetaModel.java b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/CausewayModuleValAsciidocMetaModel.java
index 60708388fa..e1b3fba276 100644
--- a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/CausewayModuleValAsciidocMetaModel.java
+++ b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/CausewayModuleValAsciidocMetaModel.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.valuetypes.asciidoc.metamodel;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.valuetypes.asciidoc.metamodel.semantics.AsciiDocValueSemantics;
import org.apache.causeway.valuetypes.asciidoc.metamodel.semantics.ChangesDtoValueSemanticsPrettyRender;
import org.apache.causeway.valuetypes.asciidoc.metamodel.semantics.CommandDtoValueSemanticsPrettyRender;
import org.apache.causeway.valuetypes.asciidoc.metamodel.semantics.InteractionDtoValueSemanticsPrettyRender;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
/**
* @since 2.0 {@index}
diff --git a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/AsciiDocValueSemantics.java b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/AsciiDocValueSemantics.java
index 0e1c33b82f..58a09c46ea 100644
--- a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/AsciiDocValueSemantics.java
+++ b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/AsciiDocValueSemantics.java
@@ -20,7 +20,6 @@ package org.apache.causeway.valuetypes.asciidoc.metamodel.semantics;
import javax.inject.Named;
-import org.apache.causeway.commons.collections.Can;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.value.semantics.Parser;
@@ -28,6 +27,7 @@ import org.apache.causeway.applib.value.semantics.Renderer;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract;
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.schema.common.v2.ValueType;
import org.apache.causeway.valuetypes.asciidoc.applib.CausewayModuleValAsciidocApplib;
import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
diff --git a/valuetypes/asciidoc/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jdo/dn/CausewayModuleValAsciidocPersistenceJdoDn.java b/valuetypes/asciidoc/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jdo/dn/CausewayModuleValAsciidocPersistenceJdoDn.java
index 9b5c4f3825..e5de87ad2d 100644
--- a/valuetypes/asciidoc/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jdo/dn/CausewayModuleValAsciidocPersistenceJdoDn.java
+++ b/valuetypes/asciidoc/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jdo/dn/CausewayModuleValAsciidocPersistenceJdoDn.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.valuetypes.asciidoc.persistence.jdo.dn;
-import org.apache.causeway.valuetypes.asciidoc.applib.CausewayModuleValAsciidocApplib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.valuetypes.asciidoc.applib.CausewayModuleValAsciidocApplib;
+
/**
* @since 2.0 {@index}
*/
diff --git a/valuetypes/asciidoc/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jdo/dn/converters/CausewayAsciiDocConverter.java b/valuetypes/asciidoc/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jdo/dn/converters/CausewayAsciiDocConverter.java
index d774d910e3..4c54c4dced 100644
--- a/valuetypes/asciidoc/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jdo/dn/converters/CausewayAsciiDocConverter.java
+++ b/valuetypes/asciidoc/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jdo/dn/converters/CausewayAsciiDocConverter.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.valuetypes.asciidoc.persistence.jdo.dn.converters;
-import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
import org.datanucleus.store.types.converters.TypeConverter;
+import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
+
/**
* @since 2.0 {@index}
*/
diff --git a/valuetypes/asciidoc/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jpa/CausewayModuleValAsciidocPersistenceJpa.java b/valuetypes/asciidoc/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jpa/CausewayModuleValAsciidocPersistenceJpa.java
index fa13d018e4..507960fb8c 100644
--- a/valuetypes/asciidoc/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jpa/CausewayModuleValAsciidocPersistenceJpa.java
+++ b/valuetypes/asciidoc/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jpa/CausewayModuleValAsciidocPersistenceJpa.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.valuetypes.asciidoc.persistence.jpa;
-import org.apache.causeway.valuetypes.asciidoc.applib.CausewayModuleValAsciidocApplib;
-import org.apache.causeway.valuetypes.asciidoc.persistence.jpa.converters.CausewayAsciiDocConverter;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.valuetypes.asciidoc.applib.CausewayModuleValAsciidocApplib;
+import org.apache.causeway.valuetypes.asciidoc.persistence.jpa.converters.CausewayAsciiDocConverter;
+
/**
* @since 2.0 {@index}
*/
diff --git a/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/vaa/CausewayModuleValAsciidocUiVaa.java b/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/vaa/CausewayModuleValAsciidocUiVaa.java
index 832dcfead6..36bd173ce1 100644
--- a/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/vaa/CausewayModuleValAsciidocUiVaa.java
+++ b/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/vaa/CausewayModuleValAsciidocUiVaa.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.valuetypes.asciidoc.ui.vaa;
-import org.apache.causeway.valuetypes.asciidoc.applib.CausewayModuleValAsciidocApplib;
-import org.apache.causeway.valuetypes.asciidoc.ui.vaa.components.AsciiDocFieldFactoryVaa;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.valuetypes.asciidoc.applib.CausewayModuleValAsciidocApplib;
+import org.apache.causeway.valuetypes.asciidoc.ui.vaa.components.AsciiDocFieldFactoryVaa;
+
@Configuration
@Import({
CausewayModuleValAsciidocApplib.class,
diff --git a/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/vaa/components/AsciiDocFieldVaa.java b/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/vaa/components/AsciiDocFieldVaa.java
index 37dfb84e51..4b0c1e3ec2 100644
--- a/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/vaa/components/AsciiDocFieldVaa.java
+++ b/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/vaa/components/AsciiDocFieldVaa.java
@@ -22,10 +22,11 @@ import com.vaadin.flow.component.Html;
import com.vaadin.flow.component.customfield.CustomField;
import com.vaadin.flow.component.html.Div;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.incubator.viewer.vaadin.ui.util.LocalResourceUtil;
import org.apache.causeway.incubator.viewer.vaadin.ui.util.PrismResourcesVaa;
import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
-import org.springframework.lang.Nullable;
public class AsciiDocFieldVaa extends CustomField<AsciiDoc> {
diff --git a/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/CausewayModuleValAsciidocUiWkt.java b/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/CausewayModuleValAsciidocUiWkt.java
index b66159625a..14af0038fa 100644
--- a/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/CausewayModuleValAsciidocUiWkt.java
+++ b/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/CausewayModuleValAsciidocUiWkt.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.valuetypes.asciidoc.ui.wkt;
-import org.apache.causeway.valuetypes.asciidoc.applib.CausewayModuleValAsciidocApplib;
-import org.apache.causeway.valuetypes.asciidoc.ui.wkt.components.AsciiDocPanelFactoriesWkt;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.valuetypes.asciidoc.applib.CausewayModuleValAsciidocApplib;
+import org.apache.causeway.valuetypes.asciidoc.ui.wkt.components.AsciiDocPanelFactoriesWkt;
+
/**
* @since 2.0 {@index}
*/
diff --git a/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/components/AsciiDocComponentWkt.java b/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/components/AsciiDocComponentWkt.java
index b8cfa7981e..b60231ad16 100644
--- a/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/components/AsciiDocComponentWkt.java
+++ b/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/components/AsciiDocComponentWkt.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.valuetypes.asciidoc.ui.wkt.components;
+import org.apache.wicket.model.IModel;
+
import org.apache.causeway.applib.value.semantics.Renderer.SyntaxHighlighter;
import org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
-import org.apache.wicket.model.IModel;
public class AsciiDocComponentWkt extends MarkupComponent {
diff --git a/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/components/AsciiDocPanelFactoriesWkt.java b/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/components/AsciiDocPanelFactoriesWkt.java
index 959df630f1..3028c4d65d 100644
--- a/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/components/AsciiDocPanelFactoriesWkt.java
+++ b/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/components/AsciiDocPanelFactoriesWkt.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.valuetypes.asciidoc.ui.wkt.components;
+import org.springframework.stereotype.Component;
+
import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.model.models.ValueModel;
import org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
import org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupPanelFactories;
-import org.springframework.stereotype.Component;
import lombok.val;
diff --git a/valuetypes/jodatime/applib/src/test/java/org/apache/causeway/valuetypes/jodatime/applib/value/JodaTimeConvertersTest.java b/valuetypes/jodatime/applib/src/test/java/org/apache/causeway/valuetypes/jodatime/applib/value/JodaTimeConvertersTest.java
index db4619738f..6e32352fb8 100644
--- a/valuetypes/jodatime/applib/src/test/java/org/apache/causeway/valuetypes/jodatime/applib/value/JodaTimeConvertersTest.java
+++ b/valuetypes/jodatime/applib/src/test/java/org/apache/causeway/valuetypes/jodatime/applib/value/JodaTimeConvertersTest.java
@@ -23,7 +23,6 @@ import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.stream.Stream;
-import org.apache.causeway.valuetypes.jodatime.applib.value.JodaTimeConverters;
import org.joda.time.DateTimeZone;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/CausewayModuleValJodatimeIntegration.java b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/CausewayModuleValJodatimeIntegration.java
index 645df96772..cf30ea0b3b 100644
--- a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/CausewayModuleValJodatimeIntegration.java
+++ b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/CausewayModuleValJodatimeIntegration.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.valuetypes.jodatime.integration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.causeway.valuetypes.jodatime.integration.valuesemantics.JodaDateTimeValueSemantics;
import org.apache.causeway.valuetypes.jodatime.integration.valuesemantics.JodaLocalDateTimeValueSemantics;
import org.apache.causeway.valuetypes.jodatime.integration.valuesemantics.JodaLocalDateValueSemantics;
import org.apache.causeway.valuetypes.jodatime.integration.valuesemantics.JodaLocalTimeValueSemantics;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
/**
* @since 2.0 {@index}
diff --git a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaDateTimeValueSemantics.java b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaDateTimeValueSemantics.java
index ad25db7142..56ba20ae7e 100644
--- a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaDateTimeValueSemantics.java
+++ b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaDateTimeValueSemantics.java
@@ -23,11 +23,11 @@ import java.time.ZonedDateTime;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.collections.Can;
import org.joda.time.DateTime;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.valuesemantics.temporal.ZonedDateTimeValueSemantics;
import org.apache.causeway.core.metamodel.valuetypes.TemporalSemanticsAdapter;
import org.apache.causeway.valuetypes.jodatime.applib.value.JodaTimeConverters;
diff --git a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateTimeValueSemantics.java b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateTimeValueSemantics.java
index c37dc41b83..4f7078c070 100644
--- a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateTimeValueSemantics.java
+++ b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateTimeValueSemantics.java
@@ -21,11 +21,11 @@ package org.apache.causeway.valuetypes.jodatime.integration.valuesemantics;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.collections.Can;
import org.joda.time.LocalDateTime;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.valuesemantics.temporal.LocalDateTimeValueSemantics;
import org.apache.causeway.core.metamodel.valuetypes.TemporalSemanticsAdapter;
import org.apache.causeway.valuetypes.jodatime.applib.value.JodaTimeConverters;
diff --git a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateValueSemantics.java b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateValueSemantics.java
index 8fca0de324..cb99971f25 100644
--- a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateValueSemantics.java
+++ b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateValueSemantics.java
@@ -21,11 +21,11 @@ package org.apache.causeway.valuetypes.jodatime.integration.valuesemantics;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.collections.Can;
import org.joda.time.LocalDate;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.valuesemantics.temporal.LocalDateValueSemantics;
import org.apache.causeway.core.metamodel.valuetypes.TemporalSemanticsAdapter;
import org.apache.causeway.valuetypes.jodatime.applib.value.JodaTimeConverters;
diff --git a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalTimeValueSemantics.java b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalTimeValueSemantics.java
index 80ef688c81..da51d75824 100644
--- a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalTimeValueSemantics.java
+++ b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalTimeValueSemantics.java
@@ -21,11 +21,11 @@ package org.apache.causeway.valuetypes.jodatime.integration.valuesemantics;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.commons.collections.Can;
import org.joda.time.LocalTime;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.valuesemantics.temporal.LocalTimeValueSemantics;
import org.apache.causeway.core.metamodel.valuetypes.TemporalSemanticsAdapter;
import org.apache.causeway.valuetypes.jodatime.applib.value.JodaTimeConverters;
diff --git a/valuetypes/markdown/applib/src/main/java/org/apache/causeway/valuetypes/markdown/applib/value/Markdown.java b/valuetypes/markdown/applib/src/main/java/org/apache/causeway/valuetypes/markdown/applib/value/Markdown.java
index 62742f57e3..079cbb6b2a 100644
--- a/valuetypes/markdown/applib/src/main/java/org/apache/causeway/valuetypes/markdown/applib/value/Markdown.java
+++ b/valuetypes/markdown/applib/src/main/java/org/apache/causeway/valuetypes/markdown/applib/value/Markdown.java
@@ -24,7 +24,6 @@ import java.util.Objects;
import javax.inject.Named;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.value.Markup;
import org.apache.causeway.valuetypes.markdown.applib.CausewayModuleValMarkdownApplib;
import org.apache.causeway.valuetypes.markdown.applib.jaxb.MarkdownJaxbAdapter;
diff --git a/valuetypes/markdown/metamodel/src/main/java/org/apache/causeway/valuetypes/markdown/metamodel/CausewayModuleValMarkdownMetaModel.java b/valuetypes/markdown/metamodel/src/main/java/org/apache/causeway/valuetypes/markdown/metamodel/CausewayModuleValMarkdownMetaModel.java
index 4018755b8c..91e32ee82f 100644
--- a/valuetypes/markdown/metamodel/src/main/java/org/apache/causeway/valuetypes/markdown/metamodel/CausewayModuleValMarkdownMetaModel.java
+++ b/valuetypes/markdown/metamodel/src/main/java/org/apache/causeway/valuetypes/markdown/metamodel/CausewayModuleValMarkdownMetaModel.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.valuetypes.markdown.metamodel;
-import org.apache.causeway.valuetypes.markdown.metamodel.semantics.MarkdownValueSemantics;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.valuetypes.markdown.metamodel.semantics.MarkdownValueSemantics;
+
/**
* @since 2.0 {@index}
*/
diff --git a/valuetypes/markdown/metamodel/src/main/java/org/apache/causeway/valuetypes/markdown/metamodel/semantics/MarkdownValueSemantics.java b/valuetypes/markdown/metamodel/src/main/java/org/apache/causeway/valuetypes/markdown/metamodel/semantics/MarkdownValueSemantics.java
index 6e239cd50a..f56f496074 100644
--- a/valuetypes/markdown/metamodel/src/main/java/org/apache/causeway/valuetypes/markdown/metamodel/semantics/MarkdownValueSemantics.java
+++ b/valuetypes/markdown/metamodel/src/main/java/org/apache/causeway/valuetypes/markdown/metamodel/semantics/MarkdownValueSemantics.java
@@ -20,7 +20,6 @@ package org.apache.causeway.valuetypes.markdown.metamodel.semantics;
import javax.inject.Named;
-import org.apache.causeway.commons.collections.Can;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.value.semantics.Parser;
@@ -28,6 +27,7 @@ import org.apache.causeway.applib.value.semantics.Renderer;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract;
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.schema.common.v2.ValueType;
import org.apache.causeway.valuetypes.markdown.applib.CausewayModuleValMarkdownApplib;
import org.apache.causeway.valuetypes.markdown.applib.value.Markdown;
diff --git a/valuetypes/markdown/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jdo/dn/CausewayModuleValMarkdownPersistenceJdoDn.java b/valuetypes/markdown/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jdo/dn/CausewayModuleValMarkdownPersistenceJdoDn.java
index 682d4211dc..ac8fe289e6 100644
--- a/valuetypes/markdown/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jdo/dn/CausewayModuleValMarkdownPersistenceJdoDn.java
+++ b/valuetypes/markdown/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jdo/dn/CausewayModuleValMarkdownPersistenceJdoDn.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.valuetypes.markdown.persistence.jdo.dn;
-import org.apache.causeway.valuetypes.markdown.applib.CausewayModuleValMarkdownApplib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.valuetypes.markdown.applib.CausewayModuleValMarkdownApplib;
+
/**
* @since 2.0 {@index}
*/
diff --git a/valuetypes/markdown/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jdo/dn/converters/CausewayMarkdownConverter.java b/valuetypes/markdown/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jdo/dn/converters/CausewayMarkdownConverter.java
index d3e503ded1..d49f4c65e8 100644
--- a/valuetypes/markdown/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jdo/dn/converters/CausewayMarkdownConverter.java
+++ b/valuetypes/markdown/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jdo/dn/converters/CausewayMarkdownConverter.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.valuetypes.markdown.persistence.jdo.dn.converters;
-import org.apache.causeway.valuetypes.markdown.applib.value.Markdown;
import org.datanucleus.store.types.converters.TypeConverter;
+import org.apache.causeway.valuetypes.markdown.applib.value.Markdown;
+
/**
* @since 2.0 {@index}
*/
diff --git a/valuetypes/markdown/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jpa/CausewayModuleValMarkdownPersistenceJpa.java b/valuetypes/markdown/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jpa/CausewayModuleValMarkdownPersistenceJpa.java
index 6e72ae809c..dd255a67fd 100644
--- a/valuetypes/markdown/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jpa/CausewayModuleValMarkdownPersistenceJpa.java
+++ b/valuetypes/markdown/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jpa/CausewayModuleValMarkdownPersistenceJpa.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.valuetypes.markdown.persistence.jpa;
-import org.apache.causeway.valuetypes.markdown.applib.CausewayModuleValMarkdownApplib;
-import org.apache.causeway.valuetypes.markdown.persistence.jpa.converters.CausewayMarkdownConverter;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.valuetypes.markdown.applib.CausewayModuleValMarkdownApplib;
+import org.apache.causeway.valuetypes.markdown.persistence.jpa.converters.CausewayMarkdownConverter;
+
/**
* @since 2.0 {@index}
*/
diff --git a/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/CausewayModuleValMarkdownUiWkt.java b/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/CausewayModuleValMarkdownUiWkt.java
index f214cd9a55..fad106cfab 100644
--- a/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/CausewayModuleValMarkdownUiWkt.java
+++ b/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/CausewayModuleValMarkdownUiWkt.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.valuetypes.markdown.ui.wkt;
-import org.apache.causeway.valuetypes.markdown.applib.CausewayModuleValMarkdownApplib;
-import org.apache.causeway.valuetypes.markdown.ui.wkt.components.MarkdownPanelFactoriesWkt;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.valuetypes.markdown.applib.CausewayModuleValMarkdownApplib;
+import org.apache.causeway.valuetypes.markdown.ui.wkt.components.MarkdownPanelFactoriesWkt;
+
/**
* @since 2.0 {@index}
*/
diff --git a/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/components/MarkdownComponentWkt.java b/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/components/MarkdownComponentWkt.java
index 14e26ca0dd..b43d4f5c89 100644
--- a/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/components/MarkdownComponentWkt.java
+++ b/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/components/MarkdownComponentWkt.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.valuetypes.markdown.ui.wkt.components;
-import org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
import org.apache.wicket.model.IModel;
+import org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
+
public class MarkdownComponentWkt extends MarkupComponent {
private static final long serialVersionUID = 1L;
diff --git a/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/components/MarkdownPanelFactoriesWkt.java b/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/components/MarkdownPanelFactoriesWkt.java
index b229285351..06793e18ab 100644
--- a/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/components/MarkdownPanelFactoriesWkt.java
+++ b/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/components/MarkdownPanelFactoriesWkt.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.valuetypes.markdown.ui.wkt.components;
+import org.springframework.stereotype.Component;
+
import org.apache.causeway.valuetypes.markdown.applib.value.Markdown;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.model.models.ValueModel;
import org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
import org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupPanelFactories;
-import org.springframework.stereotype.Component;
import lombok.val;
diff --git a/valuetypes/vega/applib/src/main/java/org/apache/causeway/valuetypes/vega/applib/value/Vega.java b/valuetypes/vega/applib/src/main/java/org/apache/causeway/valuetypes/vega/applib/value/Vega.java
index 731f130e6f..3eaf7f6016 100644
--- a/valuetypes/vega/applib/src/main/java/org/apache/causeway/valuetypes/vega/applib/value/Vega.java
+++ b/valuetypes/vega/applib/src/main/java/org/apache/causeway/valuetypes/vega/applib/value/Vega.java
@@ -25,11 +25,12 @@ import java.util.Objects;
import javax.inject.Named;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.resources._Json;
import org.apache.causeway.valuetypes.vega.applib.CausewayModuleValVegaApplib;
import org.apache.causeway.valuetypes.vega.applib.jaxb.VegaJaxbAdapter;
-import org.springframework.lang.Nullable;
import lombok.EqualsAndHashCode;
import lombok.Getter;
diff --git a/valuetypes/vega/metamodel/src/main/java/org/apache/causeway/valuetypes/vega/metamodel/CausewayModuleValVegaMetaModel.java b/valuetypes/vega/metamodel/src/main/java/org/apache/causeway/valuetypes/vega/metamodel/CausewayModuleValVegaMetaModel.java
index 1ace098460..776c5a70e5 100644
--- a/valuetypes/vega/metamodel/src/main/java/org/apache/causeway/valuetypes/vega/metamodel/CausewayModuleValVegaMetaModel.java
+++ b/valuetypes/vega/metamodel/src/main/java/org/apache/causeway/valuetypes/vega/metamodel/CausewayModuleValVegaMetaModel.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.valuetypes.vega.metamodel;
-import org.apache.causeway.valuetypes.vega.metamodel.semantics.VegaValueSemantics;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.valuetypes.vega.metamodel.semantics.VegaValueSemantics;
+
/**
* @since 2.0 {@index}
*/
diff --git a/valuetypes/vega/metamodel/src/main/java/org/apache/causeway/valuetypes/vega/metamodel/semantics/VegaValueSemantics.java b/valuetypes/vega/metamodel/src/main/java/org/apache/causeway/valuetypes/vega/metamodel/semantics/VegaValueSemantics.java
index 7f118bdd40..fdbd317893 100644
--- a/valuetypes/vega/metamodel/src/main/java/org/apache/causeway/valuetypes/vega/metamodel/semantics/VegaValueSemantics.java
+++ b/valuetypes/vega/metamodel/src/main/java/org/apache/causeway/valuetypes/vega/metamodel/semantics/VegaValueSemantics.java
@@ -22,7 +22,6 @@ import java.util.UUID;
import javax.inject.Named;
-import org.apache.causeway.commons.collections.Can;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.value.semantics.DefaultsProvider;
@@ -31,6 +30,7 @@ import org.apache.causeway.applib.value.semantics.Renderer;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract;
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.schema.common.v2.ValueType;
import org.apache.causeway.valuetypes.vega.applib.CausewayModuleValVegaApplib;
import org.apache.causeway.valuetypes.vega.applib.value.Vega;
diff --git a/valuetypes/vega/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jdo/dn/CausewayModuleValVegaPersistenceJdoDn.java b/valuetypes/vega/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jdo/dn/CausewayModuleValVegaPersistenceJdoDn.java
index 67dcddfeda..7deab90e12 100644
--- a/valuetypes/vega/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jdo/dn/CausewayModuleValVegaPersistenceJdoDn.java
+++ b/valuetypes/vega/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jdo/dn/CausewayModuleValVegaPersistenceJdoDn.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.valuetypes.vega.persistence.jdo.dn;
-import org.apache.causeway.valuetypes.vega.applib.CausewayModuleValVegaApplib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.valuetypes.vega.applib.CausewayModuleValVegaApplib;
+
/**
* @since 2.0 {@index}
*/
diff --git a/valuetypes/vega/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jdo/dn/converters/CausewayVegaConverter.java b/valuetypes/vega/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jdo/dn/converters/CausewayVegaConverter.java
index 88562e1056..26386f5c3f 100644
--- a/valuetypes/vega/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jdo/dn/converters/CausewayVegaConverter.java
+++ b/valuetypes/vega/persistence-jdo/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jdo/dn/converters/CausewayVegaConverter.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.valuetypes.vega.persistence.jdo.dn.converters;
+import org.datanucleus.store.types.converters.TypeConverter;
+
import org.apache.causeway.valuetypes.vega.applib.stringify.VegaStringifier;
import org.apache.causeway.valuetypes.vega.applib.value.Vega;
-import org.datanucleus.store.types.converters.TypeConverter;
/**
* @since 2.0 {@index}
diff --git a/valuetypes/vega/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jpa/CausewayModuleValVegaPersistenceJpa.java b/valuetypes/vega/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jpa/CausewayModuleValVegaPersistenceJpa.java
index 1e2517f061..352b7d6b4f 100644
--- a/valuetypes/vega/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jpa/CausewayModuleValVegaPersistenceJpa.java
+++ b/valuetypes/vega/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jpa/CausewayModuleValVegaPersistenceJpa.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.valuetypes.vega.persistence.jpa;
-import org.apache.causeway.valuetypes.vega.applib.CausewayModuleValVegaApplib;
-import org.apache.causeway.valuetypes.vega.persistence.jpa.converters.CausewayVegaConverter;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.valuetypes.vega.applib.CausewayModuleValVegaApplib;
+import org.apache.causeway.valuetypes.vega.persistence.jpa.converters.CausewayVegaConverter;
+
/**
* @since 2.0 {@index}
*/
diff --git a/valuetypes/vega/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/vega/ui/vaa/CausewayModuleValVegaUiVaa.java b/valuetypes/vega/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/vega/ui/vaa/CausewayModuleValVegaUiVaa.java
index f9f2230b02..bb3fdcfe96 100644
--- a/valuetypes/vega/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/vega/ui/vaa/CausewayModuleValVegaUiVaa.java
+++ b/valuetypes/vega/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/vega/ui/vaa/CausewayModuleValVegaUiVaa.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.valuetypes.vega.ui.vaa;
-import org.apache.causeway.valuetypes.vega.applib.CausewayModuleValVegaApplib;
-import org.apache.causeway.valuetypes.vega.ui.vaa.components.VegaFieldFactoryVaa;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.valuetypes.vega.applib.CausewayModuleValVegaApplib;
+import org.apache.causeway.valuetypes.vega.ui.vaa.components.VegaFieldFactoryVaa;
+
@Configuration
@Import({
CausewayModuleValVegaApplib.class,
diff --git a/valuetypes/vega/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/vega/ui/vaa/components/VegaFieldVaa.java b/valuetypes/vega/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/vega/ui/vaa/components/VegaFieldVaa.java
index 55d58e1e76..963e0eac72 100644
--- a/valuetypes/vega/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/vega/ui/vaa/components/VegaFieldVaa.java
+++ b/valuetypes/vega/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/vega/ui/vaa/components/VegaFieldVaa.java
@@ -22,10 +22,11 @@ import com.vaadin.flow.component.Html;
import com.vaadin.flow.component.customfield.CustomField;
import com.vaadin.flow.component.html.Div;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.incubator.viewer.vaadin.ui.util.LocalResourceUtil;
import org.apache.causeway.incubator.viewer.vaadin.ui.util.PrismResourcesVaa;
import org.apache.causeway.valuetypes.vega.applib.value.Vega;
-import org.springframework.lang.Nullable;
public class VegaFieldVaa extends CustomField<Vega> {
diff --git a/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/CausewayModuleValVegaUiWkt.java b/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/CausewayModuleValVegaUiWkt.java
index ce64bd585c..c13e219a58 100644
--- a/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/CausewayModuleValVegaUiWkt.java
+++ b/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/CausewayModuleValVegaUiWkt.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.valuetypes.vega.ui.wkt;
-import org.apache.causeway.valuetypes.vega.applib.CausewayModuleValVegaApplib;
-import org.apache.causeway.valuetypes.vega.ui.wkt.components.VegaPanelFactoriesWkt;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.causeway.valuetypes.vega.applib.CausewayModuleValVegaApplib;
+import org.apache.causeway.valuetypes.vega.ui.wkt.components.VegaPanelFactoriesWkt;
+
/**
* @since 2.0 {@index}
*/
diff --git a/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/components/VegaComponentWkt.java b/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/components/VegaComponentWkt.java
index 4b4626f15f..5a049a81bf 100644
--- a/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/components/VegaComponentWkt.java
+++ b/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/components/VegaComponentWkt.java
@@ -20,6 +20,9 @@ package org.apache.causeway.valuetypes.vega.ui.wkt.components;
import java.util.Optional;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.model.IModel;
+
import org.apache.causeway.applib.value.semantics.Renderer.SyntaxHighlighter;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -29,8 +32,6 @@ import org.apache.causeway.valuetypes.vega.ui.wkt.components.js.VegaEmbedJsRefer
import org.apache.causeway.valuetypes.vega.ui.wkt.components.js.VegaJsReference;
import org.apache.causeway.valuetypes.vega.ui.wkt.components.js.VegaLiteJsReference;
import org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.model.IModel;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/components/VegaPanelFactoriesWkt.java b/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/components/VegaPanelFactoriesWkt.java
index 4f2c17335c..2585d3cbe6 100644
--- a/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/components/VegaPanelFactoriesWkt.java
+++ b/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/components/VegaPanelFactoriesWkt.java
@@ -18,12 +18,13 @@
*/
package org.apache.causeway.valuetypes.vega.ui.wkt.components;
+import org.springframework.stereotype.Component;
+
import org.apache.causeway.valuetypes.vega.applib.value.Vega;
import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.model.models.ValueModel;
import org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
import org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupPanelFactories;
-import org.springframework.stereotype.Component;
import lombok.val;