diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1645382fe4..0e547dde64 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -353,9 +353,12 @@ jobs: # ------------------------- # Maven Build # ------------------------- - - name: Build and Test Website + - name: Build Code run: | - mvn -B -e -PCI -Prelease install site site:stage -Dmaven.test.skip=true + mvn -B -e -PCI -Prelease install -Dmaven.test.skip=true + - name: Build Website + run: | + mvn -B -e -PCI -Prelease site site:stage -Dmaven.test.skip=true - name: Zip Artifacts for Upload run: | zip ${{ runner.temp }}/website.zip -r target/staging diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a074aa0817..f722c8c555 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -83,9 +83,12 @@ jobs: # ------------------------- # Maven Site # ------------------------- + - name: Build Code + run: | + mvn -B -e -Prelease install - name: Build Website run: | - mvn -B -e -Prelease package site site:stage + mvn -B -e -Prelease site site:stage - name: Run deploy script run: | touch target/staging/.nojekyll diff --git a/cli-processor/src/main/java/dev/metaschema/cli/processor/CLIProcessor.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/CLIProcessor.java index 8fa84a8c38..5a36bd2406 100644 --- a/cli-processor/src/main/java/dev/metaschema/cli/processor/CLIProcessor.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/CLIProcessor.java @@ -7,12 +7,6 @@ import static org.jline.jansi.Ansi.ansi; -import dev.metaschema.cli.processor.command.CommandService; -import dev.metaschema.cli.processor.command.ICommand; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.IVersionInfo; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.commons.cli.Option; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; @@ -31,6 +25,11 @@ import java.util.function.Function; import java.util.stream.Collectors; +import dev.metaschema.cli.processor.command.CommandService; +import dev.metaschema.cli.processor.command.ICommand; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.IVersionInfo; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java index 85d237a975..f6f94135e7 100644 --- a/cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/CallingContext.java @@ -7,14 +7,6 @@ import static org.jline.jansi.Ansi.ansi; -import dev.metaschema.cli.processor.command.CommandExecutionException; -import dev.metaschema.cli.processor.command.ExtraArgument; -import dev.metaschema.cli.processor.command.ICommand; -import dev.metaschema.cli.processor.command.ICommandExecutor; -import dev.metaschema.core.util.AutoCloser; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.Option; @@ -23,6 +15,7 @@ import org.apache.commons.cli.help.HelpFormatter; import org.apache.commons.cli.help.OptionFormatter; import org.apache.commons.cli.help.TextHelpAppendable; + import java.io.IOException; import java.io.PrintStream; import java.io.PrintWriter; @@ -35,6 +28,13 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ExtraArgument; +import dev.metaschema.cli.processor.command.ICommand; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.util.AutoCloser; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/cli-processor/src/main/java/dev/metaschema/cli/processor/MessageExitStatus.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/MessageExitStatus.java index b65688403a..d488a65127 100644 --- a/cli-processor/src/main/java/dev/metaschema/cli/processor/MessageExitStatus.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/MessageExitStatus.java @@ -5,12 +5,11 @@ package dev.metaschema.cli.processor; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; - import java.util.Arrays; import java.util.List; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractCommandExecutor.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractCommandExecutor.java index e1d2df95a5..999ad291f8 100644 --- a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractCommandExecutor.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractCommandExecutor.java @@ -5,11 +5,10 @@ package dev.metaschema.cli.processor.command; -import dev.metaschema.cli.processor.CallingContext; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.commons.cli.CommandLine; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractParentCommand.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractParentCommand.java index 572222e56c..6168021db1 100644 --- a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractParentCommand.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractParentCommand.java @@ -5,11 +5,6 @@ package dev.metaschema.cli.processor.command; -import dev.metaschema.cli.processor.CallingContext; -import dev.metaschema.cli.processor.ExitCode; -import dev.metaschema.cli.processor.ExitStatus; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.commons.cli.CommandLine; import java.util.Collection; @@ -18,6 +13,10 @@ import java.util.Map; import java.util.stream.Collectors; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.ExitStatus; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractTerminalCommand.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractTerminalCommand.java index 139fd6de4e..ed4794e6d5 100644 --- a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractTerminalCommand.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/AbstractTerminalCommand.java @@ -5,14 +5,13 @@ package dev.metaschema.cli.processor.command; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.core.util.UriUtils; - import java.net.URI; import java.net.URISyntaxException; import java.nio.file.Path; import java.nio.file.Paths; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.UriUtils; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/CommandExecutionException.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/CommandExecutionException.java index 129c63b02b..73ed834fc3 100644 --- a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/CommandExecutionException.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/CommandExecutionException.java @@ -7,7 +7,6 @@ import dev.metaschema.cli.processor.ExitCode; import dev.metaschema.cli.processor.ExitStatus; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/CommandService.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/CommandService.java index 687e91cf6a..50a901626e 100644 --- a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/CommandService.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/CommandService.java @@ -5,13 +5,12 @@ package dev.metaschema.cli.processor.command; -import dev.metaschema.core.util.ObjectUtils; - import java.util.List; import java.util.ServiceLoader; import java.util.ServiceLoader.Provider; import java.util.stream.Collectors; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ExtraArgument.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ExtraArgument.java index f85d09c913..b55b051715 100644 --- a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ExtraArgument.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ExtraArgument.java @@ -6,7 +6,6 @@ package dev.metaschema.cli.processor.command; import dev.metaschema.cli.processor.command.impl.DefaultExtraArgument; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ICommand.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ICommand.java index 6617adfeea..b3ad22e840 100644 --- a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ICommand.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ICommand.java @@ -5,10 +5,6 @@ package dev.metaschema.cli.processor.command; -import dev.metaschema.cli.processor.CallingContext; -import dev.metaschema.cli.processor.InvalidArgumentException; -import dev.metaschema.core.util.CollectionUtil; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; @@ -16,6 +12,9 @@ import java.util.List; import java.util.stream.Collectors; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.InvalidArgumentException; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ICommandExecutor.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ICommandExecutor.java index 27e1123e59..49a6730555 100644 --- a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ICommandExecutor.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ICommandExecutor.java @@ -5,10 +5,9 @@ package dev.metaschema.cli.processor.command; -import dev.metaschema.cli.processor.CallingContext; - import org.apache.commons.cli.CommandLine; +import dev.metaschema.cli.processor.CallingContext; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ShellCompletionCommand.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ShellCompletionCommand.java index 40becd6e9d..aee4c204c1 100644 --- a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ShellCompletionCommand.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/ShellCompletionCommand.java @@ -5,12 +5,6 @@ package dev.metaschema.cli.processor.command; -import dev.metaschema.cli.processor.CLIProcessor; -import dev.metaschema.cli.processor.CallingContext; -import dev.metaschema.cli.processor.ExitCode; -import dev.metaschema.cli.processor.completion.CompletionScriptGenerator; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; @@ -26,6 +20,11 @@ import java.util.List; import java.util.Locale; +import dev.metaschema.cli.processor.CLIProcessor; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.completion.CompletionScriptGenerator; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/impl/DefaultExtraArgument.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/impl/DefaultExtraArgument.java index b6988d7c6b..5bbeb73c37 100644 --- a/cli-processor/src/main/java/dev/metaschema/cli/processor/command/impl/DefaultExtraArgument.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/command/impl/DefaultExtraArgument.java @@ -6,7 +6,6 @@ package dev.metaschema.cli.processor.command.impl; import dev.metaschema.cli.processor.command.ExtraArgument; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/cli-processor/src/main/java/dev/metaschema/cli/processor/completion/CompletionScriptGenerator.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/completion/CompletionScriptGenerator.java index e7a0424c9d..556d563f57 100644 --- a/cli-processor/src/main/java/dev/metaschema/cli/processor/completion/CompletionScriptGenerator.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/completion/CompletionScriptGenerator.java @@ -5,16 +5,15 @@ package dev.metaschema.cli.processor.completion; -import dev.metaschema.cli.processor.command.ExtraArgument; -import dev.metaschema.cli.processor.command.ICommand; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.commons.cli.Option; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; +import dev.metaschema.cli.processor.command.ExtraArgument; +import dev.metaschema.cli.processor.command.ICommand; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/cli-processor/src/main/java/dev/metaschema/cli/processor/completion/CompletionTypeRegistry.java b/cli-processor/src/main/java/dev/metaschema/cli/processor/completion/CompletionTypeRegistry.java index dbaa52848b..35b13a3e27 100644 --- a/cli-processor/src/main/java/dev/metaschema/cli/processor/completion/CompletionTypeRegistry.java +++ b/cli-processor/src/main/java/dev/metaschema/cli/processor/completion/CompletionTypeRegistry.java @@ -5,8 +5,6 @@ package dev.metaschema.cli.processor.completion; -import dev.metaschema.core.util.ObjectUtils; - import java.io.File; import java.net.URI; import java.net.URL; @@ -15,6 +13,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/cli-processor/src/main/java/module-info.java b/cli-processor/src/main/java/module-info.java index 8a2a7c7447..bc4b4e6ea8 100644 --- a/cli-processor/src/main/java/module-info.java +++ b/cli-processor/src/main/java/module-info.java @@ -15,11 +15,11 @@ requires java.base; requires transitive dev.metaschema.core; + requires transitive org.apache.commons.cli; requires static org.eclipse.jdt.annotation; requires static com.github.spotbugs.annotations; - requires org.apache.commons.cli; requires org.jansi.core; requires nl.talsmasoftware.lazy4j; requires org.apache.logging.log4j; diff --git a/cli-processor/src/test/java/dev/metaschema/cli/processor/CallingContextTest.java b/cli-processor/src/test/java/dev/metaschema/cli/processor/CallingContextTest.java index 4699c6921e..15f0bc5542 100644 --- a/cli-processor/src/test/java/dev/metaschema/cli/processor/CallingContextTest.java +++ b/cli-processor/src/test/java/dev/metaschema/cli/processor/CallingContextTest.java @@ -11,8 +11,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.ParseException; import org.eclipse.jdt.annotation.Owning; @@ -29,6 +27,7 @@ import java.util.Map; import java.util.Optional; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommand.java b/cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommand.java index 7d56fca814..1926870741 100644 --- a/cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommand.java +++ b/cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommand.java @@ -5,11 +5,10 @@ package dev.metaschema.cli.processor; -import dev.metaschema.cli.processor.command.AbstractTerminalCommand; -import dev.metaschema.cli.processor.command.ICommandExecutor; - import org.apache.commons.cli.CommandLine; +import dev.metaschema.cli.processor.command.AbstractTerminalCommand; +import dev.metaschema.cli.processor.command.ICommandExecutor; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommandWithRequiredArg.java b/cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommandWithRequiredArg.java index 8258383583..a49bec7b39 100644 --- a/cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommandWithRequiredArg.java +++ b/cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommandWithRequiredArg.java @@ -5,14 +5,13 @@ package dev.metaschema.cli.processor; -import dev.metaschema.cli.processor.command.AbstractTerminalCommand; -import dev.metaschema.cli.processor.command.ExtraArgument; -import dev.metaschema.cli.processor.command.ICommandExecutor; - import org.apache.commons.cli.CommandLine; import java.util.List; +import dev.metaschema.cli.processor.command.AbstractTerminalCommand; +import dev.metaschema.cli.processor.command.ExtraArgument; +import dev.metaschema.cli.processor.command.ICommandExecutor; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommandWithRequiredOption.java b/cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommandWithRequiredOption.java index 3c67b3ce58..36ebdd02c2 100644 --- a/cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommandWithRequiredOption.java +++ b/cli-processor/src/test/java/dev/metaschema/cli/processor/TestCommandWithRequiredOption.java @@ -5,16 +5,15 @@ package dev.metaschema.cli.processor; -import dev.metaschema.cli.processor.command.AbstractTerminalCommand; -import dev.metaschema.cli.processor.command.ICommandExecutor; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import java.util.Collection; import java.util.List; +import dev.metaschema.cli.processor.command.AbstractTerminalCommand; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/cli-processor/src/test/java/dev/metaschema/cli/processor/TestVersionInfo.java b/cli-processor/src/test/java/dev/metaschema/cli/processor/TestVersionInfo.java index 227ab47436..213b00978f 100644 --- a/cli-processor/src/test/java/dev/metaschema/cli/processor/TestVersionInfo.java +++ b/cli-processor/src/test/java/dev/metaschema/cli/processor/TestVersionInfo.java @@ -6,7 +6,6 @@ package dev.metaschema.cli.processor; import dev.metaschema.core.util.IVersionInfo; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/cli-processor/src/test/java/dev/metaschema/cli/processor/command/ShellCompletionCommandTest.java b/cli-processor/src/test/java/dev/metaschema/cli/processor/command/ShellCompletionCommandTest.java index 064e7a5ab4..14ec4bf562 100644 --- a/cli-processor/src/test/java/dev/metaschema/cli/processor/command/ShellCompletionCommandTest.java +++ b/cli-processor/src/test/java/dev/metaschema/cli/processor/command/ShellCompletionCommandTest.java @@ -11,10 +11,10 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.cli.processor.command.ShellCompletionCommand.Shell; - import org.junit.jupiter.api.Test; +import dev.metaschema.cli.processor.command.ShellCompletionCommand.Shell; + /** * Unit tests for {@link ShellCompletionCommand}. */ diff --git a/cli-processor/src/test/java/dev/metaschema/cli/processor/completion/CompletionScriptGeneratorTest.java b/cli-processor/src/test/java/dev/metaschema/cli/processor/completion/CompletionScriptGeneratorTest.java index 9c6dce01d1..1ce055a2dd 100644 --- a/cli-processor/src/test/java/dev/metaschema/cli/processor/completion/CompletionScriptGeneratorTest.java +++ b/cli-processor/src/test/java/dev/metaschema/cli/processor/completion/CompletionScriptGeneratorTest.java @@ -8,11 +8,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.cli.processor.CallingContext; -import dev.metaschema.cli.processor.command.ExtraArgument; -import dev.metaschema.cli.processor.command.ICommand; -import dev.metaschema.cli.processor.command.ICommandExecutor; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import org.junit.jupiter.api.BeforeAll; @@ -23,6 +18,11 @@ import java.util.Collection; import java.util.List; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.command.ExtraArgument; +import dev.metaschema.cli.processor.command.ICommand; +import dev.metaschema.cli.processor.command.ICommandExecutor; + /** * Unit tests for {@link CompletionScriptGenerator}. */ diff --git a/core/src/main/java/dev/metaschema/core/MetaschemaConstants.java b/core/src/main/java/dev/metaschema/core/MetaschemaConstants.java index f24b428952..c93c71c62e 100644 --- a/core/src/main/java/dev/metaschema/core/MetaschemaConstants.java +++ b/core/src/main/java/dev/metaschema/core/MetaschemaConstants.java @@ -5,10 +5,9 @@ package dev.metaschema.core; -import dev.metaschema.core.util.ObjectUtils; - import java.net.URI; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/configuration/DefaultConfiguration.java b/core/src/main/java/dev/metaschema/core/configuration/DefaultConfiguration.java index a928dc7d47..778cb98590 100644 --- a/core/src/main/java/dev/metaschema/core/configuration/DefaultConfiguration.java +++ b/core/src/main/java/dev/metaschema/core/configuration/DefaultConfiguration.java @@ -5,11 +5,10 @@ package dev.metaschema.core.configuration; -import dev.metaschema.core.util.CollectionUtil; - import java.util.HashMap; import java.util.Map; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/AbstractCustomJavaDataType.java b/core/src/main/java/dev/metaschema/core/datatype/AbstractCustomJavaDataType.java index 059cc43616..e9cb1e77b9 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/AbstractCustomJavaDataType.java +++ b/core/src/main/java/dev/metaschema/core/datatype/AbstractCustomJavaDataType.java @@ -5,10 +5,9 @@ package dev.metaschema.core.datatype; -import dev.metaschema.core.util.ObjectUtils; - import java.util.Objects; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/AbstractCustomJavaDataTypeAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/AbstractCustomJavaDataTypeAdapter.java index effc64c85a..36772e10e1 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/AbstractCustomJavaDataTypeAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/AbstractCustomJavaDataTypeAdapter.java @@ -7,7 +7,6 @@ import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/AbstractDataTypeAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/AbstractDataTypeAdapter.java index 8885bbb6c7..4f4afaa045 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/AbstractDataTypeAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/AbstractDataTypeAdapter.java @@ -8,15 +8,6 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import dev.metaschema.core.metapath.type.AbstractAtomicOrUnionType; -import dev.metaschema.core.metapath.type.DataTypeItemType; -import dev.metaschema.core.metapath.type.IAtomicOrUnionType; -import dev.metaschema.core.model.util.JsonUtil; -import dev.metaschema.core.model.util.XmlEventUtil; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import org.codehaus.stax2.XMLEventReader2; import org.codehaus.stax2.XMLStreamWriter2; import org.codehaus.stax2.evt.XMLEventFactory2; @@ -30,6 +21,14 @@ import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.type.AbstractAtomicOrUnionType; +import dev.metaschema.core.metapath.type.DataTypeItemType; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.model.util.JsonUtil; +import dev.metaschema.core.model.util.XmlEventUtil; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/AbstractDataTypeProvider.java b/core/src/main/java/dev/metaschema/core/datatype/AbstractDataTypeProvider.java index 9f6e3bb983..49fad45943 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/AbstractDataTypeProvider.java +++ b/core/src/main/java/dev/metaschema/core/datatype/AbstractDataTypeProvider.java @@ -5,11 +5,6 @@ package dev.metaschema.core.datatype; -import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import dev.metaschema.core.metapath.type.DataTypeItemType; -import dev.metaschema.core.metapath.type.IAtomicOrUnionType; -import dev.metaschema.core.util.CollectionUtil; - import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -17,6 +12,10 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.type.DataTypeItemType; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/DataTypeService.java b/core/src/main/java/dev/metaschema/core/datatype/DataTypeService.java index 7c94ed6eed..7787001545 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/DataTypeService.java +++ b/core/src/main/java/dev/metaschema/core/datatype/DataTypeService.java @@ -5,16 +5,6 @@ package dev.metaschema.core.datatype; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import dev.metaschema.core.metapath.type.IAtomicOrUnionType; -import dev.metaschema.core.metapath.type.IItemType; -import dev.metaschema.core.qname.EQNameFactory; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.CustomCollectors; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -29,6 +19,15 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Stream; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/core/src/main/java/dev/metaschema/core/datatype/IDataTypeAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/IDataTypeAdapter.java index f73c10e28c..5309e1388c 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/IDataTypeAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/IDataTypeAdapter.java @@ -9,11 +9,6 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import dev.metaschema.core.metapath.type.IAtomicOrUnionType; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import org.codehaus.stax2.XMLEventReader2; import org.codehaus.stax2.XMLStreamWriter2; import org.codehaus.stax2.evt.XMLEventFactory2; @@ -28,6 +23,10 @@ import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/IDataTypeProvider.java b/core/src/main/java/dev/metaschema/core/datatype/IDataTypeProvider.java index 3fe1cf8b1c..d935892e0f 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/IDataTypeProvider.java +++ b/core/src/main/java/dev/metaschema/core/datatype/IDataTypeProvider.java @@ -5,10 +5,9 @@ package dev.metaschema.core.datatype; -import dev.metaschema.core.metapath.type.IAtomicOrUnionType; - import java.util.List; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractBinaryAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractBinaryAdapter.java index 3a0436dec9..385077073b 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractBinaryAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractBinaryAdapter.java @@ -7,11 +7,6 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import dev.metaschema.core.datatype.AbstractDataTypeAdapter; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import dev.metaschema.core.metapath.type.AbstractAtomicOrUnionType; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.commons.codec.BinaryDecoder; import org.apache.commons.codec.BinaryEncoder; import org.apache.commons.codec.DecoderException; @@ -21,6 +16,10 @@ import java.nio.charset.StandardCharsets; import java.util.Arrays; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.type.AbstractAtomicOrUnionType; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractDurationAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractDurationAdapter.java index 8e2ba81288..8f624538e6 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractDurationAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractDurationAdapter.java @@ -7,13 +7,6 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import dev.metaschema.core.datatype.AbstractDataTypeAdapter; -import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import dev.metaschema.core.metapath.item.atomic.IDurationItem; -import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; -import dev.metaschema.core.metapath.type.AbstractAtomicOrUnionType; -import dev.metaschema.core.util.ObjectUtils; - import java.math.BigDecimal; import java.math.RoundingMode; import java.time.Duration; @@ -21,6 +14,12 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.IDurationItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.metapath.type.AbstractAtomicOrUnionType; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractIntegerAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractIntegerAdapter.java index 9396af4e8a..4251d1dccb 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractIntegerAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractIntegerAdapter.java @@ -8,13 +8,12 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import dev.metaschema.core.datatype.AbstractDataTypeAdapter; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; -import dev.metaschema.core.metapath.type.IAtomicOrUnionType; - import java.io.IOException; import java.math.BigInteger; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractStringAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractStringAdapter.java index af8ba591d8..99e2bc99c0 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractStringAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/AbstractStringAdapter.java @@ -10,7 +10,6 @@ import dev.metaschema.core.datatype.AbstractDataTypeAdapter; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/Base64Adapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/Base64Adapter.java index ad16bca40b..0653e61f3a 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/Base64Adapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/Base64Adapter.java @@ -5,12 +5,6 @@ package dev.metaschema.core.datatype.adapter; -import dev.metaschema.core.metapath.MetapathConstants; -import dev.metaschema.core.metapath.item.atomic.IBase64BinaryItem; -import dev.metaschema.core.qname.EQNameFactory; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.commons.codec.BinaryDecoder; import org.apache.commons.codec.BinaryEncoder; import org.apache.commons.codec.binary.Base64; @@ -18,6 +12,11 @@ import java.nio.ByteBuffer; import java.util.List; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IBase64BinaryItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/BooleanAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/BooleanAdapter.java index 67de6f022a..b1e7fb455e 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/BooleanAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/BooleanAdapter.java @@ -9,17 +9,16 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; +import java.io.IOException; +import java.net.URI; +import java.util.List; + import dev.metaschema.core.datatype.AbstractDataTypeAdapter; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.io.IOException; -import java.net.URI; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/DateAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/DateAdapter.java index 2542847360..63e114c7a2 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/DateAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/DateAdapter.java @@ -7,14 +7,6 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import dev.metaschema.core.datatype.AbstractCustomJavaDataTypeAdapter; -import dev.metaschema.core.datatype.object.AmbiguousDate; -import dev.metaschema.core.metapath.MetapathConstants; -import dev.metaschema.core.metapath.item.atomic.IDateItem; -import dev.metaschema.core.qname.EQNameFactory; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import java.time.LocalDate; import java.time.LocalTime; import java.time.ZoneOffset; @@ -25,6 +17,13 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import dev.metaschema.core.datatype.AbstractCustomJavaDataTypeAdapter; +import dev.metaschema.core.datatype.object.AmbiguousDate; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/DateTimeAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/DateTimeAdapter.java index 24bc6351ad..7c39dc8777 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/DateTimeAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/DateTimeAdapter.java @@ -7,6 +7,12 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.time.ZonedDateTime; +import java.time.format.DateTimeParseException; +import java.util.List; + import dev.metaschema.core.datatype.AbstractCustomJavaDataTypeAdapter; import dev.metaschema.core.datatype.object.AmbiguousDateTime; import dev.metaschema.core.metapath.MetapathConstants; @@ -14,13 +20,6 @@ import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.time.ZonedDateTime; -import java.time.format.DateTimeParseException; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/DateTimeWithTZAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/DateTimeWithTZAdapter.java index 410cefb69a..ff1164c6de 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/DateTimeWithTZAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/DateTimeWithTZAdapter.java @@ -7,18 +7,17 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; +import java.time.DateTimeException; +import java.time.ZonedDateTime; +import java.time.format.DateTimeParseException; +import java.util.List; + import dev.metaschema.core.datatype.AbstractDataTypeAdapter; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.item.atomic.IDateTimeWithTimeZoneItem; import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.time.DateTimeException; -import java.time.ZonedDateTime; -import java.time.format.DateTimeParseException; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/DateWithTZAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/DateWithTZAdapter.java index b642744e8c..5a95d9e8b4 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/DateWithTZAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/DateWithTZAdapter.java @@ -7,13 +7,6 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import dev.metaschema.core.datatype.AbstractDataTypeAdapter; -import dev.metaschema.core.metapath.MetapathConstants; -import dev.metaschema.core.metapath.item.atomic.IDateWithTimeZoneItem; -import dev.metaschema.core.qname.EQNameFactory; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import java.time.DateTimeException; import java.time.ZonedDateTime; import java.time.format.DateTimeParseException; @@ -21,6 +14,12 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import dev.metaschema.core.datatype.AbstractDataTypeAdapter; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IDateWithTimeZoneItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/DayTimeAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/DayTimeAdapter.java index b61d7c328c..677700cdc8 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/DayTimeAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/DayTimeAdapter.java @@ -5,17 +5,16 @@ package dev.metaschema.core.datatype.adapter; -import dev.metaschema.core.metapath.MetapathConstants; -import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import dev.metaschema.core.qname.EQNameFactory; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import java.time.Duration; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/DecimalAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/DecimalAdapter.java index 1ef6fca7cb..d9cbce8d19 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/DecimalAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/DecimalAdapter.java @@ -8,18 +8,17 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; +import java.io.IOException; +import java.math.BigDecimal; +import java.math.MathContext; +import java.util.List; + import dev.metaschema.core.datatype.AbstractDataTypeAdapter; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.item.atomic.IDecimalItem; import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.io.IOException; -import java.math.BigDecimal; -import java.math.MathContext; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/EmailAddressAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/EmailAddressAdapter.java index ce0e6e022a..4b1ec2cb55 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/EmailAddressAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/EmailAddressAdapter.java @@ -5,14 +5,13 @@ package dev.metaschema.core.datatype.adapter; +import java.util.List; + import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.item.atomic.IEmailAddressItem; import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/HexBinaryAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/HexBinaryAdapter.java index 179be329b5..6247709617 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/HexBinaryAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/HexBinaryAdapter.java @@ -5,12 +5,6 @@ package dev.metaschema.core.datatype.adapter; -import dev.metaschema.core.metapath.MetapathConstants; -import dev.metaschema.core.metapath.item.atomic.IHexBinaryItem; -import dev.metaschema.core.qname.EQNameFactory; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.commons.codec.BinaryDecoder; import org.apache.commons.codec.BinaryEncoder; import org.apache.commons.codec.binary.Hex; @@ -19,6 +13,11 @@ import java.nio.charset.StandardCharsets; import java.util.List; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IHexBinaryItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/HostnameAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/HostnameAdapter.java index 7c2b04d4db..e95be244f8 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/HostnameAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/HostnameAdapter.java @@ -5,14 +5,13 @@ package dev.metaschema.core.datatype.adapter; +import java.util.List; + import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.item.atomic.IHostnameItem; import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/IPv4AddressAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/IPv4AddressAdapter.java index 55465c9b6e..a11f8d011f 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/IPv4AddressAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/IPv4AddressAdapter.java @@ -7,15 +7,14 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; +import java.util.List; + import dev.metaschema.core.datatype.AbstractDataTypeAdapter; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.item.atomic.IIPv4AddressItem; import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import inet.ipaddr.AddressStringException; import inet.ipaddr.IPAddressString; diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/IPv6AddressAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/IPv6AddressAdapter.java index c7bf74e3ad..7387705da1 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/IPv6AddressAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/IPv6AddressAdapter.java @@ -7,15 +7,14 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; +import java.util.List; + import dev.metaschema.core.datatype.AbstractDataTypeAdapter; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.item.atomic.IIPv6AddressItem; import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import inet.ipaddr.AddressStringException; import inet.ipaddr.IPAddressString; diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/IntegerAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/IntegerAdapter.java index 471455f88e..1a5f782032 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/IntegerAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/IntegerAdapter.java @@ -5,15 +5,14 @@ package dev.metaschema.core.datatype.adapter; +import java.math.BigInteger; +import java.util.List; + import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.math.BigInteger; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/MetaschemaDataTypeProvider.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/MetaschemaDataTypeProvider.java index f8430f5190..8dfccb0a36 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/MetaschemaDataTypeProvider.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/MetaschemaDataTypeProvider.java @@ -7,7 +7,6 @@ import dev.metaschema.core.datatype.AbstractDataTypeProvider; import dev.metaschema.core.metapath.type.impl.TypeConstants; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/NcNameAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/NcNameAdapter.java index 604d089122..ac0f9a1bb3 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/NcNameAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/NcNameAdapter.java @@ -5,15 +5,14 @@ package dev.metaschema.core.datatype.adapter; +import java.util.List; +import java.util.regex.Pattern; + import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.item.atomic.INcNameItem; import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.regex.Pattern; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/NonNegativeIntegerAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/NonNegativeIntegerAdapter.java index 48abae9cc9..8ed2945a2f 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/NonNegativeIntegerAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/NonNegativeIntegerAdapter.java @@ -5,15 +5,14 @@ package dev.metaschema.core.datatype.adapter; +import java.math.BigInteger; +import java.util.List; + import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.item.atomic.INonNegativeIntegerItem; import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.math.BigInteger; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/PositiveIntegerAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/PositiveIntegerAdapter.java index 76ab683314..0c6ec9cc7d 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/PositiveIntegerAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/PositiveIntegerAdapter.java @@ -5,15 +5,14 @@ package dev.metaschema.core.datatype.adapter; +import java.math.BigInteger; +import java.util.List; + import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.item.atomic.IPositiveIntegerItem; import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.math.BigInteger; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/QNameAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/QNameAdapter.java index bdbaa13282..611512cfe1 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/QNameAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/QNameAdapter.java @@ -7,15 +7,14 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; +import java.util.List; + import dev.metaschema.core.datatype.AbstractDataTypeAdapter; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.item.atomic.IQNameItem; import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/StringAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/StringAdapter.java index 58d9523d94..79479f0099 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/StringAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/StringAdapter.java @@ -5,14 +5,13 @@ package dev.metaschema.core.datatype.adapter; +import java.util.List; + import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/TimeAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/TimeAdapter.java index 2d186b628b..a9d00931d3 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/TimeAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/TimeAdapter.java @@ -7,6 +7,12 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; +import java.time.LocalTime; +import java.time.OffsetTime; +import java.time.ZoneOffset; +import java.time.format.DateTimeParseException; +import java.util.List; + import dev.metaschema.core.datatype.AbstractCustomJavaDataTypeAdapter; import dev.metaschema.core.datatype.object.AmbiguousTime; import dev.metaschema.core.metapath.MetapathConstants; @@ -14,13 +20,6 @@ import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.time.LocalTime; -import java.time.OffsetTime; -import java.time.ZoneOffset; -import java.time.format.DateTimeParseException; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/TimeWithTZAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/TimeWithTZAdapter.java index c8660d4d6a..16d32e5f0a 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/TimeWithTZAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/TimeWithTZAdapter.java @@ -7,18 +7,17 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; +import java.time.DateTimeException; +import java.time.OffsetTime; +import java.time.format.DateTimeParseException; +import java.util.List; + import dev.metaschema.core.datatype.AbstractDataTypeAdapter; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.item.atomic.ITimeWithTimeZoneItem; import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.time.DateTimeException; -import java.time.OffsetTime; -import java.time.format.DateTimeParseException; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/TokenAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/TokenAdapter.java index dc67046f0c..f01495599c 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/TokenAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/TokenAdapter.java @@ -5,14 +5,13 @@ package dev.metaschema.core.datatype.adapter; +import java.util.List; + import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.item.atomic.ITokenItem; import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/UriAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/UriAdapter.java index 8c432136d0..c0f2ce8f7e 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/UriAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/UriAdapter.java @@ -7,16 +7,15 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; +import java.net.URI; +import java.util.List; + import dev.metaschema.core.datatype.AbstractDataTypeAdapter; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.item.atomic.IAnyUriItem; import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/UriReferenceAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/UriReferenceAdapter.java index ba1a8367e4..c018c72760 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/UriReferenceAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/UriReferenceAdapter.java @@ -7,16 +7,15 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; +import java.net.URI; +import java.util.List; + import dev.metaschema.core.datatype.AbstractDataTypeAdapter; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.item.atomic.IUriReferenceItem; import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/UuidAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/UuidAdapter.java index 84926eeffd..422c32e9b2 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/UuidAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/UuidAdapter.java @@ -7,17 +7,16 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; +import java.util.List; +import java.util.UUID; +import java.util.regex.Pattern; + import dev.metaschema.core.datatype.AbstractDataTypeAdapter; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.item.atomic.IUuidItem; import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.UUID; -import java.util.regex.Pattern; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/adapter/YearMonthAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/adapter/YearMonthAdapter.java index 485ff3e510..8f781e2fb2 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/adapter/YearMonthAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/adapter/YearMonthAdapter.java @@ -5,17 +5,16 @@ package dev.metaschema.core.datatype.adapter; -import dev.metaschema.core.metapath.MetapathConstants; -import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; -import dev.metaschema.core.qname.EQNameFactory; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import java.time.Period; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/markup/AbstractMarkupAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/markup/AbstractMarkupAdapter.java index 7f62b8c093..c2068dd15e 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/markup/AbstractMarkupAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/AbstractMarkupAdapter.java @@ -8,12 +8,6 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; -import dev.metaschema.core.datatype.AbstractCustomJavaDataTypeAdapter; -import dev.metaschema.core.metapath.item.atomic.IMarkupItem; -import dev.metaschema.core.metapath.type.IAtomicOrUnionType; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import org.codehaus.stax2.XMLStreamWriter2; import org.codehaus.stax2.evt.XMLEventFactory2; @@ -23,6 +17,11 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.events.StartElement; +import dev.metaschema.core.datatype.AbstractCustomJavaDataTypeAdapter; +import dev.metaschema.core.metapath.item.atomic.IMarkupItem; +import dev.metaschema.core.metapath.type.IAtomicOrUnionType; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/markup/AbstractMarkupString.java b/core/src/main/java/dev/metaschema/core/datatype/markup/AbstractMarkupString.java index 43c6377381..49873f4116 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/markup/AbstractMarkupString.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/AbstractMarkupString.java @@ -14,17 +14,6 @@ import com.vladsch.flexmark.util.ast.Node; import com.vladsch.flexmark.util.ast.TextCollectingVisitor; -import dev.metaschema.core.datatype.markup.flexmark.FlexmarkFactory; -import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension; -import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; -import dev.metaschema.core.datatype.markup.flexmark.impl.AstCollectingVisitor; -import dev.metaschema.core.datatype.markup.flexmark.impl.IMarkupVisitor; -import dev.metaschema.core.datatype.markup.flexmark.impl.IMarkupWriter; -import dev.metaschema.core.datatype.markup.flexmark.impl.MarkupVisitor; -import dev.metaschema.core.datatype.markup.flexmark.impl.MarkupXmlEventWriter; -import dev.metaschema.core.datatype.markup.flexmark.impl.MarkupXmlStreamWriter; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codehaus.stax2.XMLOutputFactory2; @@ -49,6 +38,16 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; +import dev.metaschema.core.datatype.markup.flexmark.FlexmarkFactory; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; +import dev.metaschema.core.datatype.markup.flexmark.impl.AstCollectingVisitor; +import dev.metaschema.core.datatype.markup.flexmark.impl.IMarkupVisitor; +import dev.metaschema.core.datatype.markup.flexmark.impl.IMarkupWriter; +import dev.metaschema.core.datatype.markup.flexmark.impl.MarkupVisitor; +import dev.metaschema.core.datatype.markup.flexmark.impl.MarkupXmlEventWriter; +import dev.metaschema.core.datatype.markup.flexmark.impl.MarkupXmlStreamWriter; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/datatype/markup/IMarkupString.java b/core/src/main/java/dev/metaschema/core/datatype/markup/IMarkupString.java index f96f845e4f..45d1b91b27 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/markup/IMarkupString.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/IMarkupString.java @@ -9,10 +9,6 @@ import com.vladsch.flexmark.util.ast.Document; import com.vladsch.flexmark.util.ast.Node; -import dev.metaschema.core.datatype.ICustomJavaDataType; -import dev.metaschema.core.datatype.markup.flexmark.FlexmarkFactory; -import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; - import org.codehaus.stax2.XMLStreamWriter2; import org.codehaus.stax2.evt.XMLEventFactory2; @@ -24,6 +20,9 @@ import javax.xml.stream.XMLEventWriter; import javax.xml.stream.XMLStreamException; +import dev.metaschema.core.datatype.ICustomJavaDataType; +import dev.metaschema.core.datatype.markup.flexmark.FlexmarkFactory; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupDataTypeProvider.java b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupDataTypeProvider.java index 5a350e962c..2679d989c4 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupDataTypeProvider.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupDataTypeProvider.java @@ -10,7 +10,6 @@ import dev.metaschema.core.metapath.item.atomic.IMarkupItem; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.qname.EQNameFactory; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupLine.java b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupLine.java index 71dbb0753a..da6df3fb30 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupLine.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupLine.java @@ -14,14 +14,13 @@ import com.vladsch.flexmark.util.data.MutableDataSet; import com.vladsch.flexmark.util.misc.Extension; -import dev.metaschema.core.datatype.markup.flexmark.FlexmarkFactory; -import dev.metaschema.core.datatype.markup.flexmark.impl.FlexmarkConfiguration; -import dev.metaschema.core.datatype.markup.flexmark.impl.SuppressPTagExtension; - import java.util.Collection; import java.util.LinkedList; import java.util.List; +import dev.metaschema.core.datatype.markup.flexmark.FlexmarkFactory; +import dev.metaschema.core.datatype.markup.flexmark.impl.FlexmarkConfiguration; +import dev.metaschema.core.datatype.markup.flexmark.impl.SuppressPTagExtension; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupLineAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupLineAdapter.java index ff143dc250..8818824abf 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupLineAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupLineAdapter.java @@ -7,12 +7,6 @@ import com.fasterxml.jackson.core.JsonParser; -import dev.metaschema.core.metapath.MetapathConstants; -import dev.metaschema.core.metapath.item.atomic.IMarkupLineItem; -import dev.metaschema.core.qname.EQNameFactory; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import org.codehaus.stax2.XMLEventReader2; import java.io.IOException; @@ -21,6 +15,11 @@ import javax.xml.stream.XMLStreamException; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IMarkupLineItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupMultiline.java b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupMultiline.java index 137db2bec4..c2679eea61 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupMultiline.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupMultiline.java @@ -8,7 +8,6 @@ import com.vladsch.flexmark.util.ast.Document; import dev.metaschema.core.datatype.markup.flexmark.FlexmarkFactory; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupMultilineAdapter.java b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupMultilineAdapter.java index f812249151..93d5092e59 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupMultilineAdapter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/MarkupMultilineAdapter.java @@ -7,12 +7,6 @@ import com.fasterxml.jackson.core.JsonParser; -import dev.metaschema.core.metapath.MetapathConstants; -import dev.metaschema.core.metapath.item.atomic.IMarkupMultilineItem; -import dev.metaschema.core.qname.EQNameFactory; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import org.codehaus.stax2.XMLEventReader2; import java.io.IOException; @@ -21,6 +15,11 @@ import javax.xml.stream.XMLStreamException; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.atomic.IMarkupMultilineItem; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/markup/XmlMarkupParser.java b/core/src/main/java/dev/metaschema/core/datatype/markup/XmlMarkupParser.java index 2c0713a31d..8ed49b3928 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/markup/XmlMarkupParser.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/XmlMarkupParser.java @@ -7,10 +7,6 @@ import com.vladsch.flexmark.util.sequence.Escaping; -import dev.metaschema.core.model.util.XmlEventUtil; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codehaus.stax2.XMLEventReader2; @@ -26,6 +22,9 @@ import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; +import dev.metaschema.core.model.util.XmlEventUtil; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/FlexmarkFactory.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/FlexmarkFactory.java index 1b741cc7a7..e24058af4c 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/FlexmarkFactory.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/FlexmarkFactory.java @@ -14,7 +14,6 @@ import dev.metaschema.core.datatype.markup.flexmark.impl.FixedEmphasisDelimiterProcessor; import dev.metaschema.core.datatype.markup.flexmark.impl.FlexmarkConfiguration; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/InsertAnchorExtension.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/InsertAnchorExtension.java index d53493069f..8474aa048c 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/InsertAnchorExtension.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/InsertAnchorExtension.java @@ -36,8 +36,6 @@ import com.vladsch.flexmark.util.sequence.BasedSequence; import com.vladsch.flexmark.util.sequence.CharSubSequence; -import dev.metaschema.core.datatype.markup.IMarkupString; - import org.jsoup.nodes.Element; import java.util.Collections; @@ -48,6 +46,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import dev.metaschema.core.datatype.markup.IMarkupString; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/AbstractMarkupWriter.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/AbstractMarkupWriter.java index e27349df00..ca0d9a0f50 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/AbstractMarkupWriter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/AbstractMarkupWriter.java @@ -42,11 +42,6 @@ import com.vladsch.flexmark.util.sequence.BasedSequence; import com.vladsch.flexmark.util.sequence.Escaping; -import dev.metaschema.core.datatype.markup.flexmark.HtmlQuoteTagExtension.DoubleQuoteNode; -import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.commons.text.StringEscapeUtils; import org.jsoup.Jsoup; import org.jsoup.nodes.Attributes; @@ -63,6 +58,10 @@ import javax.xml.namespace.QName; +import dev.metaschema.core.datatype.markup.flexmark.HtmlQuoteTagExtension.DoubleQuoteNode; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/AstCollectingVisitor.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/AstCollectingVisitor.java index a5a3dfdf40..4395004cc0 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/AstCollectingVisitor.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/AstCollectingVisitor.java @@ -9,7 +9,6 @@ import com.vladsch.flexmark.util.ast.NodeVisitorBase; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/FlexmarkConfiguration.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/FlexmarkConfiguration.java index 60ad0a62cd..cc40d876d5 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/FlexmarkConfiguration.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/FlexmarkConfiguration.java @@ -21,14 +21,13 @@ import com.vladsch.flexmark.util.format.options.ListBulletMarker; import com.vladsch.flexmark.util.misc.Extension; -import dev.metaschema.core.datatype.markup.flexmark.HtmlQuoteTagExtension; -import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension; -import dev.metaschema.core.util.ObjectUtils; - import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import dev.metaschema.core.datatype.markup.flexmark.HtmlQuoteTagExtension; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/HtmlCodeRenderExtension.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/HtmlCodeRenderExtension.java index 6b50761a7c..77b8d28a5a 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/HtmlCodeRenderExtension.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/HtmlCodeRenderExtension.java @@ -22,12 +22,11 @@ import com.vladsch.flexmark.util.sequence.Range; import com.vladsch.flexmark.util.sequence.SequenceUtils; -import dev.metaschema.core.util.ObjectUtils; - import java.util.Collections; import java.util.Set; import java.util.regex.Pattern; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/IMarkupWriter.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/IMarkupWriter.java index a281987424..1d0a420a8e 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/IMarkupWriter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/IMarkupWriter.java @@ -31,11 +31,10 @@ import com.vladsch.flexmark.ext.typographic.TypographicSmarts; import com.vladsch.flexmark.util.ast.Node; -import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; -import dev.metaschema.core.util.CollectionUtil; - import java.util.Map; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/MarkupVisitor.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/MarkupVisitor.java index b9a17066ce..0a0c53ba01 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/MarkupVisitor.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/MarkupVisitor.java @@ -43,7 +43,6 @@ import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/MarkupXmlEventWriter.java b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/MarkupXmlEventWriter.java index bf8039d406..d53c64f267 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/MarkupXmlEventWriter.java +++ b/core/src/main/java/dev/metaschema/core/datatype/markup/flexmark/impl/MarkupXmlEventWriter.java @@ -7,9 +7,6 @@ import com.vladsch.flexmark.parser.ListOptions; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; - import org.codehaus.stax2.evt.XMLEventFactory2; import java.util.List; @@ -24,6 +21,8 @@ import javax.xml.stream.events.EndElement; import javax.xml.stream.events.StartElement; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/datatype/object/AbstractAmbiguousTemporal.java b/core/src/main/java/dev/metaschema/core/datatype/object/AbstractAmbiguousTemporal.java index 6e793a9557..0d0b6e20d8 100644 --- a/core/src/main/java/dev/metaschema/core/datatype/object/AbstractAmbiguousTemporal.java +++ b/core/src/main/java/dev/metaschema/core/datatype/object/AbstractAmbiguousTemporal.java @@ -5,10 +5,9 @@ package dev.metaschema.core.datatype.object; -import dev.metaschema.core.datatype.AbstractCustomJavaDataType; - import java.time.temporal.Temporal; +import dev.metaschema.core.datatype.AbstractCustomJavaDataType; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/mdm/IDMAssemblyNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/IDMAssemblyNodeItem.java index 014318a33e..9c5ff75967 100644 --- a/core/src/main/java/dev/metaschema/core/mdm/IDMAssemblyNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/IDMAssemblyNodeItem.java @@ -13,7 +13,6 @@ import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IAssemblyInstance; import dev.metaschema.core.model.IFieldInstance; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/mdm/IDMDocumentNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/IDMDocumentNodeItem.java index 0492fd09ba..7e35bfd6b9 100644 --- a/core/src/main/java/dev/metaschema/core/mdm/IDMDocumentNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/IDMDocumentNodeItem.java @@ -5,12 +5,11 @@ package dev.metaschema.core.mdm; +import java.net.URI; + import dev.metaschema.core.mdm.impl.DocumentNodeItem; import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; import dev.metaschema.core.model.IAssemblyDefinition; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/mdm/IDMFieldNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/IDMFieldNodeItem.java index 6741ae5b79..d889a3510d 100644 --- a/core/src/main/java/dev/metaschema/core/mdm/IDMFieldNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/IDMFieldNodeItem.java @@ -13,7 +13,6 @@ import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IFieldInstance; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/mdm/IDMFlagNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/IDMFlagNodeItem.java index b4ee9ff3d8..c6c672a119 100644 --- a/core/src/main/java/dev/metaschema/core/mdm/IDMFlagNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/IDMFlagNodeItem.java @@ -10,7 +10,6 @@ import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.node.IFlagNodeItem; import dev.metaschema.core.model.IFlagDefinition; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/mdm/IDMNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/IDMNodeItem.java index d7e7e8a8cc..82e817c3be 100644 --- a/core/src/main/java/dev/metaschema/core/mdm/IDMNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/IDMNodeItem.java @@ -7,7 +7,6 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.model.IResourceLocation; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMAssemblyNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMAssemblyNodeItem.java index 33b4c08203..032cea1bad 100644 --- a/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMAssemblyNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMAssemblyNodeItem.java @@ -5,6 +5,13 @@ package dev.metaschema.core.mdm.impl; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + import dev.metaschema.core.mdm.IDMAssemblyNodeItem; import dev.metaschema.core.mdm.IDMFieldNodeItem; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; @@ -14,14 +21,6 @@ import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMFieldNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMFieldNodeItem.java index 192143d5f3..d75be14e49 100644 --- a/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMFieldNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMFieldNodeItem.java @@ -5,6 +5,9 @@ package dev.metaschema.core.mdm.impl; +import java.util.Collection; +import java.util.List; + import dev.metaschema.core.mdm.IDMFieldNodeItem; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.node.IModelNodeItem; @@ -12,10 +15,6 @@ import dev.metaschema.core.model.IFieldInstance; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.CollectionUtil; - -import java.util.Collection; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMFlagNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMFlagNodeItem.java index 2d7acc8ac4..709660133f 100644 --- a/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMFlagNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMFlagNodeItem.java @@ -5,15 +5,14 @@ package dev.metaschema.core.mdm.impl; +import java.util.Collection; +import java.util.List; + import dev.metaschema.core.mdm.IDMFlagNodeItem; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.node.IModelNodeItem; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.CollectionUtil; - -import java.util.Collection; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMModelNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMModelNodeItem.java index 24d35236b2..ee7574db53 100644 --- a/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMModelNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMModelNodeItem.java @@ -5,6 +5,10 @@ package dev.metaschema.core.mdm.impl; +import java.util.Collection; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + import dev.metaschema.core.mdm.IDMFlagNodeItem; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.model.IFlagInstance; @@ -12,11 +16,6 @@ import dev.metaschema.core.model.INamedModelInstance; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Collection; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMNodeItem.java index d5c2488ba8..76b94a5451 100644 --- a/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/AbstractDMNodeItem.java @@ -8,7 +8,6 @@ import dev.metaschema.core.mdm.IDMNodeItem; import dev.metaschema.core.metapath.item.node.AbstractNodeItem; import dev.metaschema.core.model.IResourceLocation; - import edu.umd.cs.findbugs.annotations.Nullable; /** diff --git a/core/src/main/java/dev/metaschema/core/mdm/impl/ChildAssemblyNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/ChildAssemblyNodeItem.java index 9c96554aa3..85c327410f 100644 --- a/core/src/main/java/dev/metaschema/core/mdm/impl/ChildAssemblyNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/ChildAssemblyNodeItem.java @@ -8,7 +8,6 @@ import dev.metaschema.core.mdm.IDMAssemblyNodeItem; import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IAssemblyInstance; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/mdm/impl/ChildFieldNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/ChildFieldNodeItem.java index 362deed8f3..727de54e9d 100644 --- a/core/src/main/java/dev/metaschema/core/mdm/impl/ChildFieldNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/ChildFieldNodeItem.java @@ -9,7 +9,6 @@ import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IFieldInstance; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/mdm/impl/ChildFlagNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/ChildFlagNodeItem.java index 04b1ad1bf7..5f23047ae6 100644 --- a/core/src/main/java/dev/metaschema/core/mdm/impl/ChildFlagNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/ChildFlagNodeItem.java @@ -8,7 +8,6 @@ import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.model.IFlagDefinition; import dev.metaschema.core.model.IFlagInstance; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionAssemblyNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionAssemblyNodeItem.java index f90c6eb428..a4e2f66502 100644 --- a/core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionAssemblyNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionAssemblyNodeItem.java @@ -10,7 +10,6 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IAssemblyInstance; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionFieldNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionFieldNodeItem.java index 177116038a..aa31c95cab 100644 --- a/core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionFieldNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionFieldNodeItem.java @@ -11,7 +11,6 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IFieldInstance; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionFlagNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionFlagNodeItem.java index 1b5c3aec22..445768c766 100644 --- a/core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionFlagNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/DefinitionFlagNodeItem.java @@ -11,7 +11,6 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.model.IFlagDefinition; import dev.metaschema.core.model.IFlagInstance; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/mdm/impl/DocumentNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/DocumentNodeItem.java index 132e1d4fea..50d9ecca92 100644 --- a/core/src/main/java/dev/metaschema/core/mdm/impl/DocumentNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/DocumentNodeItem.java @@ -5,6 +5,10 @@ package dev.metaschema.core.mdm.impl; +import java.net.URI; +import java.util.Collection; +import java.util.List; + import dev.metaschema.core.mdm.IDMDocumentNodeItem; import dev.metaschema.core.mdm.IDMRootAssemblyNodeItem; import dev.metaschema.core.metapath.StaticContext; @@ -16,11 +20,6 @@ import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; -import java.util.Collection; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/mdm/impl/IDMModelNodeItem.java b/core/src/main/java/dev/metaschema/core/mdm/impl/IDMModelNodeItem.java index 9de402be1e..9818f6c1e2 100644 --- a/core/src/main/java/dev/metaschema/core/mdm/impl/IDMModelNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/mdm/impl/IDMModelNodeItem.java @@ -12,7 +12,6 @@ import dev.metaschema.core.model.IFlagInstance; import dev.metaschema.core.model.IModelDefinition; import dev.metaschema.core.model.INamedModelInstance; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/DynamicContext.java b/core/src/main/java/dev/metaschema/core/metapath/DynamicContext.java index 02406686a8..707fb6b770 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/DynamicContext.java +++ b/core/src/main/java/dev/metaschema/core/metapath/DynamicContext.java @@ -5,20 +5,6 @@ package dev.metaschema.core.metapath; -import dev.metaschema.core.configuration.DefaultConfiguration; -import dev.metaschema.core.configuration.IConfiguration; -import dev.metaschema.core.configuration.IMutableConfiguration; -import dev.metaschema.core.metapath.function.CalledContext; -import dev.metaschema.core.metapath.function.DateTimeFunctionException; -import dev.metaschema.core.metapath.function.IFunction; -import dev.metaschema.core.metapath.function.IFunction.FunctionProperty; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; -import dev.metaschema.core.model.IUriResolver; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import java.io.IOException; import java.io.UncheckedIOException; import java.net.URI; @@ -35,6 +21,19 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.metapath.function.CalledContext; +import dev.metaschema.core.metapath.function.DateTimeFunctionException; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.function.IFunction.FunctionProperty; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.model.IUriResolver; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/FocusContext.java b/core/src/main/java/dev/metaschema/core/metapath/FocusContext.java index 42fcda753f..9d0cf18abd 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/FocusContext.java +++ b/core/src/main/java/dev/metaschema/core/metapath/FocusContext.java @@ -6,7 +6,6 @@ package dev.metaschema.core.metapath; import dev.metaschema.core.metapath.item.IItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/IDocumentLoader.java b/core/src/main/java/dev/metaschema/core/metapath/IDocumentLoader.java index 48eb04e237..6369788b03 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/IDocumentLoader.java +++ b/core/src/main/java/dev/metaschema/core/metapath/IDocumentLoader.java @@ -5,11 +5,6 @@ package dev.metaschema.core.metapath; -import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; -import dev.metaschema.core.model.IResourceResolver; -import dev.metaschema.core.model.IUriResolver; -import dev.metaschema.core.util.ObjectUtils; - import java.io.File; import java.io.IOException; import java.net.URI; @@ -17,6 +12,10 @@ import java.net.URL; import java.nio.file.Path; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.model.IResourceResolver; +import dev.metaschema.core.model.IUriResolver; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/IErrorCode.java b/core/src/main/java/dev/metaschema/core/metapath/IErrorCode.java index a4d65d195d..d84eecf721 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/IErrorCode.java +++ b/core/src/main/java/dev/metaschema/core/metapath/IErrorCode.java @@ -7,7 +7,6 @@ import dev.metaschema.core.metapath.impl.ErrorCodeImpl; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/IExpression.java b/core/src/main/java/dev/metaschema/core/metapath/IExpression.java index d43f255d65..9796267a13 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/IExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/IExpression.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath; +import java.util.List; + import dev.metaschema.core.metapath.cst.IExpressionVisitor; import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/IMetapathExpression.java b/core/src/main/java/dev/metaschema/core/metapath/IMetapathExpression.java index 1249133e67..86d8456108 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/IMetapathExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/IMetapathExpression.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath; +import java.math.BigDecimal; + import dev.metaschema.core.metapath.function.FunctionUtils; import dev.metaschema.core.metapath.function.library.FnBoolean; import dev.metaschema.core.metapath.impl.LazyCompilationMetapathExpression; @@ -16,9 +18,6 @@ import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.metapath.type.TypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.math.BigDecimal; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/MetapathConstants.java b/core/src/main/java/dev/metaschema/core/metapath/MetapathConstants.java index b4c8ebd8c3..2ec63bf64d 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/MetapathConstants.java +++ b/core/src/main/java/dev/metaschema/core/metapath/MetapathConstants.java @@ -5,13 +5,12 @@ package dev.metaschema.core.metapath; -import dev.metaschema.core.metapath.item.atomic.IDateItem; -import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; -import dev.metaschema.core.util.ObjectUtils; - import java.time.LocalDate; import java.time.LocalDateTime; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/MetapathEvaluationFeature.java b/core/src/main/java/dev/metaschema/core/metapath/MetapathEvaluationFeature.java index d13fb3354f..9a7ed66869 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/MetapathEvaluationFeature.java +++ b/core/src/main/java/dev/metaschema/core/metapath/MetapathEvaluationFeature.java @@ -6,7 +6,6 @@ package dev.metaschema.core.metapath; import dev.metaschema.core.configuration.AbstractConfigurationFeature; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/StaticContext.java b/core/src/main/java/dev/metaschema/core/metapath/StaticContext.java index fad7ccd7bc..8ba16b795e 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/StaticContext.java +++ b/core/src/main/java/dev/metaschema/core/metapath/StaticContext.java @@ -5,6 +5,15 @@ package dev.metaschema.core.metapath; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Locale; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; + +import javax.xml.XMLConstants; + import dev.metaschema.core.datatype.DataTypeService; import dev.metaschema.core.metapath.function.FunctionService; import dev.metaschema.core.metapath.function.IFunction; @@ -20,16 +29,6 @@ import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.CustomCollectors; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Locale; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; - -import javax.xml.XMLConstants; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/antlr/AbstractAstVisitor.java b/core/src/main/java/dev/metaschema/core/metapath/antlr/AbstractAstVisitor.java index b38467b7c5..c7eeb33a04 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/antlr/AbstractAstVisitor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/antlr/AbstractAstVisitor.java @@ -5,13 +5,12 @@ package dev.metaschema.core.metapath.antlr; // NOPMD requires a large number of public methods -import dev.metaschema.core.util.ObjectUtils; - import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.RuleContext; import java.util.function.Function; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractBinaryExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractBinaryExpression.java index 307537d187..774bb24024 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractBinaryExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractBinaryExpression.java @@ -5,11 +5,10 @@ package dev.metaschema.core.metapath.cst; -import dev.metaschema.core.metapath.IExpression; - import java.util.List; import java.util.Objects; +import dev.metaschema.core.metapath.IExpression; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractCSTVisitorBase.java b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractCSTVisitorBase.java index 908783425a..06a4f69ef5 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractCSTVisitorBase.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractCSTVisitorBase.java @@ -5,13 +5,6 @@ package dev.metaschema.core.metapath.cst; -import dev.metaschema.core.metapath.IExpression; -import dev.metaschema.core.metapath.StaticContext; -import dev.metaschema.core.metapath.StaticMetapathException; -import dev.metaschema.core.metapath.antlr.AbstractAstVisitor; -import dev.metaschema.core.metapath.antlr.Metapath10; -import dev.metaschema.core.util.ObjectUtils; - import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.TerminalNode; @@ -26,6 +19,12 @@ import javax.xml.namespace.QName; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.antlr.AbstractAstVisitor; +import dev.metaschema.core.metapath.antlr.Metapath10; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractExpression.java index f2cdb324e3..4022f2d025 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractExpression.java @@ -9,7 +9,6 @@ import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractExpressionVisitor.java b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractExpressionVisitor.java index bc08391691..94bacf2100 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractExpressionVisitor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractExpressionVisitor.java @@ -52,7 +52,6 @@ import dev.metaschema.core.metapath.cst.type.Castable; import dev.metaschema.core.metapath.cst.type.InstanceOf; import dev.metaschema.core.metapath.cst.type.Treat; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractNAryExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractNAryExpression.java index 8bad4e684e..6939a36499 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractNAryExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractNAryExpression.java @@ -5,11 +5,10 @@ package dev.metaschema.core.metapath.cst; -import dev.metaschema.core.metapath.IExpression; - import java.util.List; import java.util.Objects; +import dev.metaschema.core.metapath.IExpression; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractUnaryExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractUnaryExpression.java index 13dffbe182..b30a6448a4 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractUnaryExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/AbstractUnaryExpression.java @@ -5,11 +5,10 @@ package dev.metaschema.core.metapath.cst; -import dev.metaschema.core.metapath.IExpression; - import java.util.List; import java.util.Objects; +import dev.metaschema.core.metapath.IExpression; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/AnonymousFunctionCall.java b/core/src/main/java/dev/metaschema/core/metapath/cst/AnonymousFunctionCall.java index 81e18a1536..63e437c57b 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/AnonymousFunctionCall.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/AnonymousFunctionCall.java @@ -5,6 +5,12 @@ package dev.metaschema.core.metapath.cst; +import java.util.EnumSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.UUID; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.function.IArgument; @@ -14,13 +20,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.type.ISequenceType; import dev.metaschema.core.util.ObjectUtils; - -import java.util.EnumSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.UUID; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/BuildCSTVisitor.java b/core/src/main/java/dev/metaschema/core/metapath/cst/BuildCSTVisitor.java index a0d659a37b..676d89de2f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/BuildCSTVisitor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/BuildCSTVisitor.java @@ -5,6 +5,20 @@ package dev.metaschema.core.metapath.cst; +import org.antlr.v4.runtime.Token; +import org.antlr.v4.runtime.tree.ParseTree; +import org.antlr.v4.runtime.tree.TerminalNode; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.InvalidMetapathGrammarException; import dev.metaschema.core.metapath.StaticContext; @@ -74,21 +88,6 @@ import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import org.antlr.v4.runtime.Token; -import org.antlr.v4.runtime.tree.ParseTree; -import org.antlr.v4.runtime.tree.TerminalNode; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/CSTPrinter.java b/core/src/main/java/dev/metaschema/core/metapath/cst/CSTPrinter.java index 0e6190edb6..92268cc197 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/CSTPrinter.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/CSTPrinter.java @@ -52,7 +52,6 @@ import dev.metaschema.core.metapath.cst.type.Castable; import dev.metaschema.core.metapath.cst.type.InstanceOf; import dev.metaschema.core.metapath.cst.type.Treat; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/DynamicFunctionCall.java b/core/src/main/java/dev/metaschema/core/metapath/cst/DynamicFunctionCall.java index 1b6f87c823..e614ec4fbe 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/DynamicFunctionCall.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/DynamicFunctionCall.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath.cst; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.StaticMetapathException; @@ -12,11 +16,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/ExpressionUtils.java b/core/src/main/java/dev/metaschema/core/metapath/cst/ExpressionUtils.java index 737139f343..e583c86a48 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/ExpressionUtils.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/ExpressionUtils.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.cst; -import dev.metaschema.core.metapath.IExpression; -import dev.metaschema.core.util.ObjectUtils; - import java.util.List; import java.util.stream.Collectors; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/For.java b/core/src/main/java/dev/metaschema/core/metapath/cst/For.java index 4ca0506e10..3d3e648a3b 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/For.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/For.java @@ -5,16 +5,15 @@ package dev.metaschema.core.metapath.cst; +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.Let.VariableDeclaration; import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.util.ObjectUtils; - -import java.util.LinkedList; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/FunctionCallAccessor.java b/core/src/main/java/dev/metaschema/core/metapath/cst/FunctionCallAccessor.java index cbaa17cb41..fbfb1b0c61 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/FunctionCallAccessor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/FunctionCallAccessor.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath.cst; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.function.IFunction; @@ -12,11 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/ICstExpressionFactory.java b/core/src/main/java/dev/metaschema/core/metapath/cst/ICstExpressionFactory.java index 45c1dfe88f..3c4c02f445 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/ICstExpressionFactory.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/ICstExpressionFactory.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.cst; +import java.math.BigDecimal; +import java.util.List; + import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.Let.VariableDeclaration; import dev.metaschema.core.metapath.cst.items.ArraySequenceConstructor; @@ -16,10 +19,6 @@ import dev.metaschema.core.metapath.cst.logic.If; import dev.metaschema.core.metapath.cst.math.Addition; import dev.metaschema.core.metapath.item.IItem; - -import java.math.BigDecimal; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/IExpressionVisitor.java b/core/src/main/java/dev/metaschema/core/metapath/cst/IExpressionVisitor.java index 0360e99321..c3cdb4587a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/IExpressionVisitor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/IExpressionVisitor.java @@ -51,7 +51,6 @@ import dev.metaschema.core.metapath.cst.type.Castable; import dev.metaschema.core.metapath.cst.type.InstanceOf; import dev.metaschema.core.metapath.cst.type.Treat; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/Let.java b/core/src/main/java/dev/metaschema/core/metapath/cst/Let.java index a6836f973b..d611793fc9 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/Let.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/Let.java @@ -5,14 +5,13 @@ package dev.metaschema.core.metapath.cst; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/NamedFunctionReference.java b/core/src/main/java/dev/metaschema/core/metapath/cst/NamedFunctionReference.java index b565fad9e2..0d733debd9 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/NamedFunctionReference.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/NamedFunctionReference.java @@ -5,15 +5,14 @@ package dev.metaschema.core.metapath.cst; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.function.IFunction; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.CollectionUtil; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/StaticFunctionCall.java b/core/src/main/java/dev/metaschema/core/metapath/cst/StaticFunctionCall.java index 0627cd92d2..601c0cb6b5 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/StaticFunctionCall.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/StaticFunctionCall.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath.cst; +import java.util.List; +import java.util.function.Supplier; +import java.util.stream.Collectors; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.StaticMetapathException; @@ -12,11 +16,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.function.Supplier; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/VariableReference.java b/core/src/main/java/dev/metaschema/core/metapath/cst/VariableReference.java index 78f8262910..39be676ed7 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/VariableReference.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/VariableReference.java @@ -5,14 +5,13 @@ package dev.metaschema.core.metapath.cst; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.CollectionUtil; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractFilterExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractFilterExpression.java index d1ae811775..a207529494 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractFilterExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractFilterExpression.java @@ -5,15 +5,14 @@ package dev.metaschema.core.metapath.cst.items; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.AbstractBinaryExpression; import dev.metaschema.core.metapath.cst.ExpressionUtils; import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractLiteralExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractLiteralExpression.java index 9fd393c229..0e761a5a59 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractLiteralExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractLiteralExpression.java @@ -9,7 +9,6 @@ import dev.metaschema.core.metapath.cst.AbstractExpression; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractLookup.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractLookup.java index 81b897e7bd..9782e8fc95 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractLookup.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/AbstractLookup.java @@ -9,7 +9,6 @@ import dev.metaschema.core.metapath.item.function.IArrayItem; import dev.metaschema.core.metapath.item.function.IKeySpecifier; import dev.metaschema.core.metapath.item.function.IMapItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/ArraySequenceConstructor.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/ArraySequenceConstructor.java index 9338d08d5f..b501c01340 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/ArraySequenceConstructor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/ArraySequenceConstructor.java @@ -5,15 +5,14 @@ package dev.metaschema.core.metapath.cst.items; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.AbstractExpression; import dev.metaschema.core.metapath.cst.IExpressionVisitor; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.function.IArrayItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/ArraySquareConstructor.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/ArraySquareConstructor.java index 348af2c110..6e427f366f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/ArraySquareConstructor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/ArraySquareConstructor.java @@ -5,15 +5,14 @@ package dev.metaschema.core.metapath.cst.items; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.AbstractExpression; import dev.metaschema.core.metapath.cst.IExpressionVisitor; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.function.IArrayItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/DecimalLiteral.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/DecimalLiteral.java index b65730813c..8188042e8a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/DecimalLiteral.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/DecimalLiteral.java @@ -5,11 +5,10 @@ package dev.metaschema.core.metapath.cst.items; -import dev.metaschema.core.metapath.cst.IExpressionVisitor; -import dev.metaschema.core.metapath.item.atomic.IDecimalItem; - import java.math.BigDecimal; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/EmptySequence.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/EmptySequence.java index f351313dbd..4f681c4f49 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/EmptySequence.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/EmptySequence.java @@ -5,16 +5,15 @@ package dev.metaschema.core.metapath.cst.items; +import java.util.Collections; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.AbstractExpression; import dev.metaschema.core.metapath.cst.IExpressionVisitor; import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; - -import java.util.Collections; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/Except.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Except.java index 1cbe8eb6d7..57b4c7c6b9 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/Except.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Except.java @@ -5,16 +5,15 @@ package dev.metaschema.core.metapath.cst.items; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.IExpressionVisitor; import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.util.ObjectUtils; - -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/ILiteralExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/ILiteralExpression.java index 7af3d36fed..ac4646b91e 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/ILiteralExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/ILiteralExpression.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.cst.items; -import dev.metaschema.core.metapath.IExpression; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; - import java.util.Collections; import java.util.List; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/IntegerLiteral.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/IntegerLiteral.java index a0df2bdb57..050c089fda 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/IntegerLiteral.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/IntegerLiteral.java @@ -5,11 +5,10 @@ package dev.metaschema.core.metapath.cst.items; -import dev.metaschema.core.metapath.cst.IExpressionVisitor; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import java.math.BigInteger; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/Intersect.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Intersect.java index fd98a46db9..e3001e47e1 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/Intersect.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Intersect.java @@ -5,14 +5,13 @@ package dev.metaschema.core.metapath.cst.items; +import java.util.List; + import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.IExpressionVisitor; import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/MapConstructor.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/MapConstructor.java index c53dd18452..86fe9423a8 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/MapConstructor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/MapConstructor.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath.cst.items; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.AbstractExpression; @@ -15,11 +19,6 @@ import dev.metaschema.core.metapath.item.function.IMapItem; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/PostfixLookup.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/PostfixLookup.java index 46d0276a61..cf3a741e7f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/PostfixLookup.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/PostfixLookup.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.cst.items; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.IExpressionVisitor; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.function.IKeySpecifier; import dev.metaschema.core.metapath.item.function.IMapItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/Quantified.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Quantified.java index 11699e035f..a4e307f416 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/Quantified.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Quantified.java @@ -5,17 +5,6 @@ package dev.metaschema.core.metapath.cst.items; -import dev.metaschema.core.metapath.DynamicContext; -import dev.metaschema.core.metapath.IExpression; -import dev.metaschema.core.metapath.cst.AbstractExpression; -import dev.metaschema.core.metapath.cst.IExpressionVisitor; -import dev.metaschema.core.metapath.function.library.FnBoolean; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IBooleanItem; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -27,6 +16,16 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.cst.AbstractExpression; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.function.library.FnBoolean; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/Range.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Range.java index bf400bb453..af39fafa0c 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/Range.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Range.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath.cst.items; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.AbstractBinaryExpression; @@ -12,11 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/SequenceExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/SequenceExpression.java index e05b5bd287..f4a609d8e3 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/SequenceExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/SequenceExpression.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.cst.items; +import java.util.List; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.AbstractNAryExpression; @@ -13,10 +16,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/SimpleMap.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/SimpleMap.java index a3f14a6322..cb34546900 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/SimpleMap.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/SimpleMap.java @@ -12,7 +12,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.util.CustomCollectors; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/StringConcat.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/StringConcat.java index c28977909d..2f84eee9d8 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/StringConcat.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/StringConcat.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.cst.items; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.AbstractNAryExpression; @@ -13,9 +15,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/StringLiteral.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/StringLiteral.java index 71f130bd1d..4c92bfb27f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/StringLiteral.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/StringLiteral.java @@ -7,7 +7,6 @@ import dev.metaschema.core.metapath.cst.IExpressionVisitor; import dev.metaschema.core.metapath.item.atomic.IStringItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/UnaryLookup.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/UnaryLookup.java index 018684bbdd..0eb360a8aa 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/UnaryLookup.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/UnaryLookup.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.cst.items; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.IExpressionVisitor; @@ -15,9 +17,6 @@ import dev.metaschema.core.metapath.item.function.IKeySpecifier; import dev.metaschema.core.metapath.item.function.IMapItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/items/Union.java b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Union.java index 9d6cecad06..cbf7892ed3 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/items/Union.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/items/Union.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.cst.items; +import java.util.List; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.AbstractNAryExpression; @@ -13,10 +16,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/logic/AbstractComparison.java b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/AbstractComparison.java index cd279c1452..6d5b7894a0 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/logic/AbstractComparison.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/AbstractComparison.java @@ -9,7 +9,6 @@ import dev.metaschema.core.metapath.cst.AbstractBinaryExpression; import dev.metaschema.core.metapath.function.ComparisonFunctions; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/logic/And.java b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/And.java index 5d7fc63a4d..e0dfd743af 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/logic/And.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/And.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.cst.logic; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.AbstractNAryExpression; @@ -12,9 +14,6 @@ import dev.metaschema.core.metapath.function.library.FnBoolean; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IBooleanItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/logic/GeneralComparison.java b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/GeneralComparison.java index 53b3623943..aaa48f690c 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/logic/GeneralComparison.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/GeneralComparison.java @@ -12,7 +12,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.atomic.IBooleanItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/logic/If.java b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/If.java index 40f8318a37..322c5818ca 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/logic/If.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/If.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.cst.logic; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.AbstractExpression; @@ -13,9 +15,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/logic/Or.java b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/Or.java index be8a0884ab..6881cfadc7 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/logic/Or.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/Or.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.cst.logic; +import java.util.Arrays; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.AbstractNAryExpression; @@ -12,10 +15,6 @@ import dev.metaschema.core.metapath.function.library.FnBoolean; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IBooleanItem; - -import java.util.Arrays; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/logic/PredicateExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/PredicateExpression.java index b7ddf8b6e1..5dbe915a33 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/logic/PredicateExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/PredicateExpression.java @@ -5,6 +5,14 @@ package dev.metaschema.core.metapath.cst.logic; +import java.math.BigInteger; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.FocusContext; import dev.metaschema.core.metapath.IExpression; @@ -16,15 +24,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.util.ObjectUtils; - -import java.math.BigInteger; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/logic/ValueComparison.java b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/ValueComparison.java index 39053f5d7e..fd824dcff2 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/logic/ValueComparison.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/logic/ValueComparison.java @@ -12,7 +12,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.atomic.IBooleanItem; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/math/AbstractArithmeticExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/math/AbstractArithmeticExpression.java index 9416451e67..56ea5a7ec1 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/math/AbstractArithmeticExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/math/AbstractArithmeticExpression.java @@ -5,13 +5,12 @@ package dev.metaschema.core.metapath.cst.math; +import java.util.List; + import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.AbstractBinaryExpression; import dev.metaschema.core.metapath.cst.ExpressionUtils; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/math/AbstractBasicArithmeticExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/math/AbstractBasicArithmeticExpression.java index eeb9b97a4a..329514d16a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/math/AbstractBasicArithmeticExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/math/AbstractBasicArithmeticExpression.java @@ -5,15 +5,14 @@ package dev.metaschema.core.metapath.cst.math; +import java.util.Map; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.function.FunctionUtils; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.atomic.INumericItem; - -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/math/Addition.java b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Addition.java index af37534efc..777adcc982 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/math/Addition.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Addition.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.cst.math; +import java.util.LinkedHashMap; +import java.util.Map; + import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.IExpressionVisitor; import dev.metaschema.core.metapath.function.impl.OperationFunctions; @@ -17,10 +20,6 @@ import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.util.LinkedHashMap; -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/math/Division.java b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Division.java index 918d084850..dd15ef31ea 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/math/Division.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Division.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.cst.math; +import java.util.LinkedHashMap; +import java.util.Map; + import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.IExpressionVisitor; import dev.metaschema.core.metapath.function.impl.OperationFunctions; @@ -14,10 +17,6 @@ import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.util.LinkedHashMap; -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/math/IntegerDivision.java b/core/src/main/java/dev/metaschema/core/metapath/cst/math/IntegerDivision.java index bef67fc9c5..a8ab0588e0 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/math/IntegerDivision.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/math/IntegerDivision.java @@ -14,7 +14,6 @@ import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.metapath.item.atomic.INumericItem; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/math/Modulo.java b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Modulo.java index 924bd0d98d..93ed9116e3 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/math/Modulo.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Modulo.java @@ -13,7 +13,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.atomic.INumericItem; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/math/Multiplication.java b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Multiplication.java index b0faab1c87..755ee8eb5b 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/math/Multiplication.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Multiplication.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.cst.math; +import java.util.LinkedHashMap; +import java.util.Map; + import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.IExpressionVisitor; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -16,10 +19,6 @@ import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.util.LinkedHashMap; -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/math/Negate.java b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Negate.java index 1ad50ee08a..9add737e80 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/math/Negate.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Negate.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.cst.math; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.AbstractUnaryExpression; @@ -15,9 +17,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.atomic.INumericItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/math/Subtraction.java b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Subtraction.java index 2b8e3d9b10..6c61845881 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/math/Subtraction.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/math/Subtraction.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.cst.math; +import java.util.HashMap; +import java.util.Map; + import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.IExpressionVisitor; import dev.metaschema.core.metapath.function.impl.OperationFunctions; @@ -17,10 +20,6 @@ import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.util.HashMap; -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractPathExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractPathExpression.java index fc15ef59e4..3ce2922031 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractPathExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractPathExpression.java @@ -7,7 +7,6 @@ import dev.metaschema.core.metapath.cst.AbstractExpression; import dev.metaschema.core.metapath.item.node.INodeItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractRelativePathExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractRelativePathExpression.java index 96c9731faa..16aa61fa05 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractRelativePathExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractRelativePathExpression.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.cst.path; +import java.util.List; + import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.ExpressionUtils; import dev.metaschema.core.metapath.item.node.INodeItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractRootPathExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractRootPathExpression.java index 782dc41753..c59b45c3fa 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractRootPathExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractRootPathExpression.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.cst.path; +import java.util.List; + import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.ExpressionUtils; import dev.metaschema.core.metapath.item.node.INodeItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractSearchPathExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractSearchPathExpression.java index 85958fd95e..13ee40d778 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractSearchPathExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractSearchPathExpression.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.cst.path; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.item.ISequence; @@ -12,9 +14,6 @@ import dev.metaschema.core.metapath.item.node.ICycledAssemblyNodeItem; import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractStepExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractStepExpression.java index 42142d68e0..3fe1e98c8e 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractStepExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/AbstractStepExpression.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.cst.path; +import java.util.List; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.item.ISequence; @@ -12,10 +15,6 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/Axis.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/Axis.java index 10466dd973..1270ae0481 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/Axis.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/Axis.java @@ -5,13 +5,12 @@ package dev.metaschema.core.metapath.cst.path; -import dev.metaschema.core.metapath.StaticMetapathException; -import dev.metaschema.core.metapath.item.node.INodeItem; -import dev.metaschema.core.util.ObjectUtils; - import java.util.function.Function; import java.util.stream.Stream; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/ContextItem.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/ContextItem.java index 43e91a32fd..ad9e1a07e2 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/ContextItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/ContextItem.java @@ -5,16 +5,15 @@ package dev.metaschema.core.metapath.cst.path; +import java.util.Collections; +import java.util.List; + import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.IExpressionVisitor; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.node.INodeItem; - -import java.util.Collections; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/FlagStep.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/FlagStep.java index bd323e6cef..d2d197280b 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/FlagStep.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/FlagStep.java @@ -5,14 +5,13 @@ package dev.metaschema.core.metapath.cst.path; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.cst.IExpressionVisitor; import dev.metaschema.core.metapath.item.node.IFlagNodeItem; import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/INodeTestExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/INodeTestExpression.java index 704a24764f..a351f18d87 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/INodeTestExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/INodeTestExpression.java @@ -5,14 +5,13 @@ package dev.metaschema.core.metapath.cst.path; -import dev.metaschema.core.metapath.IExpression; -import dev.metaschema.core.metapath.item.node.INodeItem; -import dev.metaschema.core.util.ObjectUtils; - import java.util.Collections; import java.util.List; import java.util.stream.Stream; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/IWildcardMatcher.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/IWildcardMatcher.java index cb2f70880d..1d059cf0d3 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/IWildcardMatcher.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/IWildcardMatcher.java @@ -5,10 +5,9 @@ package dev.metaschema.core.metapath.cst.path; -import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; - import java.util.function.Predicate; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/KindNodeTest.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/KindNodeTest.java index 22d95a3c67..b05eaf948e 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/KindNodeTest.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/KindNodeTest.java @@ -13,7 +13,6 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.metapath.type.IItemType; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/MatchAnyLocalName.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/MatchAnyLocalName.java index fcb42169f9..4421a3b0b5 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/MatchAnyLocalName.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/MatchAnyLocalName.java @@ -6,7 +6,6 @@ package dev.metaschema.core.metapath.cst.path; import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/MatchAnyNamespace.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/MatchAnyNamespace.java index 4e270fdae2..92c01fe8c2 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/MatchAnyNamespace.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/MatchAnyNamespace.java @@ -6,7 +6,6 @@ package dev.metaschema.core.metapath.cst.path; import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/ModelInstanceStep.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/ModelInstanceStep.java index b9b0a6a779..eeef0034b7 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/ModelInstanceStep.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/ModelInstanceStep.java @@ -5,14 +5,13 @@ package dev.metaschema.core.metapath.cst.path; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.cst.IExpressionVisitor; import dev.metaschema.core.metapath.item.node.IModelNodeItem; import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/NameNodeTest.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/NameNodeTest.java index 9c582f3c51..82a9d44e1d 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/NameNodeTest.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/NameNodeTest.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.cst.path; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.cst.AbstractExpression; import dev.metaschema.core.metapath.cst.IExpressionVisitor; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/RelativeDoubleSlashPath.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RelativeDoubleSlashPath.java index d44ee3bc74..1e014a67ae 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/RelativeDoubleSlashPath.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RelativeDoubleSlashPath.java @@ -10,7 +10,6 @@ import dev.metaschema.core.metapath.cst.IExpressionVisitor; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.node.INodeItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/RelativeSlashPath.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RelativeSlashPath.java index f8f41bfda8..2eacee00bd 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/RelativeSlashPath.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RelativeSlashPath.java @@ -9,7 +9,6 @@ import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.IExpressionVisitor; import dev.metaschema.core.metapath.item.ISequence; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/RootDoubleSlashPath.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RootDoubleSlashPath.java index 46c178e373..33a505a779 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/RootDoubleSlashPath.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RootDoubleSlashPath.java @@ -10,7 +10,6 @@ import dev.metaschema.core.metapath.cst.IExpressionVisitor; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.ItemUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/RootSlashOnlyPath.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RootSlashOnlyPath.java index 875e66a7c4..170df6d5c5 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/RootSlashOnlyPath.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RootSlashOnlyPath.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.cst.path; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.IExpressionVisitor; @@ -12,9 +14,6 @@ import dev.metaschema.core.metapath.item.ItemUtils; import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.util.CollectionUtil; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/RootSlashPath.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RootSlashPath.java index 8dbf84836b..57939619e7 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/RootSlashPath.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/RootSlashPath.java @@ -12,7 +12,6 @@ import dev.metaschema.core.metapath.item.ItemUtils; import dev.metaschema.core.util.CustomCollectors; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/Step.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/Step.java index b3a2b327d8..8d39583ea8 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/Step.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/Step.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.cst.path; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.AbstractExpression; @@ -16,9 +18,6 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/path/WildcardNodeTest.java b/core/src/main/java/dev/metaschema/core/metapath/cst/path/WildcardNodeTest.java index 5440e58c8b..895c697344 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/path/WildcardNodeTest.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/path/WildcardNodeTest.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.cst.path; +import java.util.function.Predicate; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.cst.AbstractExpression; import dev.metaschema.core.metapath.cst.IExpressionVisitor; @@ -13,10 +16,6 @@ import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.function.Predicate; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/type/AbstractCastingExpression.java b/core/src/main/java/dev/metaschema/core/metapath/cst/type/AbstractCastingExpression.java index 9a6eabb6a4..a90d16e420 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/type/AbstractCastingExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/type/AbstractCastingExpression.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.cst.type; +import java.util.List; + import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.AbstractExpression; import dev.metaschema.core.metapath.item.ISequence; @@ -12,9 +14,6 @@ import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/type/Cast.java b/core/src/main/java/dev/metaschema/core/metapath/cst/type/Cast.java index 21ab6a8870..8f4e616e8e 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/type/Cast.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/type/Cast.java @@ -11,7 +11,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/type/Castable.java b/core/src/main/java/dev/metaschema/core/metapath/cst/type/Castable.java index e3e83838ab..a44b127fb3 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/type/Castable.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/type/Castable.java @@ -13,7 +13,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/type/InstanceOf.java b/core/src/main/java/dev/metaschema/core/metapath/cst/type/InstanceOf.java index 26550405aa..9ab322abd7 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/type/InstanceOf.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/type/InstanceOf.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.cst.type; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.cst.AbstractExpression; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import dev.metaschema.core.metapath.type.ISequenceType; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/type/Treat.java b/core/src/main/java/dev/metaschema/core/metapath/cst/type/Treat.java index 5007d77cd0..c2cdbcdc24 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/type/Treat.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/type/Treat.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.cst.type; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.InvalidTreatTypeDynamicMetapathException; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.type.ISequenceType; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/cst/type/TypeTestSupport.java b/core/src/main/java/dev/metaschema/core/metapath/cst/type/TypeTestSupport.java index 352c455006..e496d5137f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/cst/type/TypeTestSupport.java +++ b/core/src/main/java/dev/metaschema/core/metapath/cst/type/TypeTestSupport.java @@ -5,6 +5,11 @@ package dev.metaschema.core.metapath.cst.type; +import org.antlr.v4.runtime.tree.ParseTree; +import org.antlr.v4.runtime.tree.TerminalNode; + +import java.util.Map; + import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.metapath.antlr.Metapath10; import dev.metaschema.core.metapath.antlr.Metapath10Lexer; @@ -20,12 +25,6 @@ import dev.metaschema.core.metapath.type.Occurrence; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import org.antlr.v4.runtime.tree.ParseTree; -import org.antlr.v4.runtime.tree.TerminalNode; - -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/format/IPathFormatter.java b/core/src/main/java/dev/metaschema/core/metapath/format/IPathFormatter.java index 3b1a8d9631..2f38a5e90b 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/format/IPathFormatter.java +++ b/core/src/main/java/dev/metaschema/core/metapath/format/IPathFormatter.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.format; +import java.util.stream.Collectors; + import dev.metaschema.core.metapath.item.node.IAssemblyInstanceGroupedNodeItem; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; @@ -12,9 +14,6 @@ import dev.metaschema.core.metapath.item.node.IFlagNodeItem; import dev.metaschema.core.metapath.item.node.IModuleNodeItem; import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; - -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/format/IPathSegment.java b/core/src/main/java/dev/metaschema/core/metapath/format/IPathSegment.java index 70f64e9b01..99872a7d91 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/format/IPathSegment.java +++ b/core/src/main/java/dev/metaschema/core/metapath/format/IPathSegment.java @@ -5,13 +5,12 @@ package dev.metaschema.core.metapath.format; -import dev.metaschema.core.metapath.item.node.INodeItem; -import dev.metaschema.core.model.IMetapathQueryable; - import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.IMetapathQueryable; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/format/JsonPointerFormatter.java b/core/src/main/java/dev/metaschema/core/metapath/format/JsonPointerFormatter.java index 98ea4fcfca..086b152c6a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/format/JsonPointerFormatter.java +++ b/core/src/main/java/dev/metaschema/core/metapath/format/JsonPointerFormatter.java @@ -5,6 +5,11 @@ package dev.metaschema.core.metapath.format; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.List; + import dev.metaschema.core.metapath.item.node.IAssemblyInstanceGroupedNodeItem; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; @@ -18,12 +23,6 @@ import dev.metaschema.core.model.JsonGroupAsBehavior; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/format/MetapathFormatter.java b/core/src/main/java/dev/metaschema/core/metapath/format/MetapathFormatter.java index b1ad22c30f..6085d7090c 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/format/MetapathFormatter.java +++ b/core/src/main/java/dev/metaschema/core/metapath/format/MetapathFormatter.java @@ -15,7 +15,6 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/format/XPathFormatter.java b/core/src/main/java/dev/metaschema/core/metapath/format/XPathFormatter.java index a25f5b8110..0c065ed4c8 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/format/XPathFormatter.java +++ b/core/src/main/java/dev/metaschema/core/metapath/format/XPathFormatter.java @@ -17,7 +17,6 @@ import dev.metaschema.core.model.XmlGroupAsBehavior; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/ArgumentImpl.java b/core/src/main/java/dev/metaschema/core/metapath/function/ArgumentImpl.java index 51391e9e59..0816a11194 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/ArgumentImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/ArgumentImpl.java @@ -5,11 +5,10 @@ package dev.metaschema.core.metapath.function; -import dev.metaschema.core.metapath.type.ISequenceType; -import dev.metaschema.core.qname.IEnhancedQName; - import java.util.Objects; +import dev.metaschema.core.metapath.type.ISequenceType; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; class ArgumentImpl implements IArgument { diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/ArithmeticFunctionException.java b/core/src/main/java/dev/metaschema/core/metapath/function/ArithmeticFunctionException.java index ded37b725b..34a5344bab 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/ArithmeticFunctionException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/ArithmeticFunctionException.java @@ -6,7 +6,6 @@ package dev.metaschema.core.metapath.function; import dev.metaschema.core.metapath.IErrorCode; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/CalledContext.java b/core/src/main/java/dev/metaschema/core/metapath/function/CalledContext.java index 2bbc05abe8..901c8d80b8 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/CalledContext.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/CalledContext.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.function; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.ISequence; - import java.util.List; import java.util.Objects; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/CastFunctionException.java b/core/src/main/java/dev/metaschema/core/metapath/function/CastFunctionException.java index 96fe7d3a18..6feb689cae 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/CastFunctionException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/CastFunctionException.java @@ -7,7 +7,6 @@ import dev.metaschema.core.metapath.IErrorCode; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/ComparisonFunctions.java b/core/src/main/java/dev/metaschema/core/metapath/function/ComparisonFunctions.java index 6ff3567690..4b3f5f182e 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/ComparisonFunctions.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/ComparisonFunctions.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function; +import java.util.Locale; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.function.impl.OperationFunctions; import dev.metaschema.core.metapath.function.library.FnNot; @@ -23,9 +25,6 @@ import dev.metaschema.core.metapath.item.atomic.IUntypedAtomicItem; import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; - -import java.util.Locale; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/DateTimeFunctionException.java b/core/src/main/java/dev/metaschema/core/metapath/function/DateTimeFunctionException.java index 5fc36bc44a..cf0c373639 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/DateTimeFunctionException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/DateTimeFunctionException.java @@ -6,7 +6,6 @@ package dev.metaschema.core.metapath.function; import dev.metaschema.core.metapath.IErrorCode; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/DefaultFunction.java b/core/src/main/java/dev/metaschema/core/metapath/function/DefaultFunction.java index be03342b8e..09b1a34788 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/DefaultFunction.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/DefaultFunction.java @@ -5,18 +5,17 @@ package dev.metaschema.core.metapath.function; +import java.util.Collections; +import java.util.EnumSet; +import java.util.List; +import java.util.Set; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathException; import dev.metaschema.core.metapath.function.impl.AbstractFunction; import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.type.ISequenceType; - -import java.util.Collections; -import java.util.EnumSet; -import java.util.List; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/DocumentFunctionException.java b/core/src/main/java/dev/metaschema/core/metapath/function/DocumentFunctionException.java index 33d4227ede..30b365bed4 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/DocumentFunctionException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/DocumentFunctionException.java @@ -7,7 +7,6 @@ import dev.metaschema.core.metapath.IErrorCode; import dev.metaschema.core.metapath.function.library.FnDoc; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/FunctionLibrary.java b/core/src/main/java/dev/metaschema/core/metapath/function/FunctionLibrary.java index 916bc4a8ff..06265c268f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/FunctionLibrary.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/FunctionLibrary.java @@ -5,9 +5,6 @@ package dev.metaschema.core.metapath.function; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import java.util.HashMap; import java.util.Map; import java.util.concurrent.locks.Lock; @@ -15,6 +12,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.stream.Stream; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/FunctionMetapathError.java b/core/src/main/java/dev/metaschema/core/metapath/function/FunctionMetapathError.java index ee1e3a53e5..78cff06f45 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/FunctionMetapathError.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/FunctionMetapathError.java @@ -7,7 +7,6 @@ import dev.metaschema.core.metapath.IErrorCode; import dev.metaschema.core.metapath.MetapathException; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/FunctionService.java b/core/src/main/java/dev/metaschema/core/metapath/function/FunctionService.java index fed96c5fd0..bf359d02d6 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/FunctionService.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/FunctionService.java @@ -5,14 +5,13 @@ package dev.metaschema.core.metapath.function; -import dev.metaschema.core.metapath.StaticMetapathException; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import java.util.ServiceLoader; import java.util.ServiceLoader.Provider; import java.util.stream.Stream; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/FunctionUtils.java b/core/src/main/java/dev/metaschema/core/metapath/function/FunctionUtils.java index e3996a86ed..bcc992733b 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/FunctionUtils.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/FunctionUtils.java @@ -5,14 +5,6 @@ package dev.metaschema.core.metapath.function; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import dev.metaschema.core.metapath.item.atomic.INumericItem; -import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; -import dev.metaschema.core.metapath.type.TypeMetapathException; -import dev.metaschema.core.util.ObjectUtils; - import java.util.Collection; import java.util.HashMap; import java.util.List; @@ -21,6 +13,13 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.metapath.type.TypeMetapathException; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/IArgument.java b/core/src/main/java/dev/metaschema/core/metapath/function/IArgument.java index 58383f4224..7367eb0ae0 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/IArgument.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/IArgument.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function; +import java.util.Objects; + import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.metapath.StaticMetapathException; import dev.metaschema.core.metapath.item.IItem; @@ -14,9 +16,6 @@ import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Objects; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/IFunction.java b/core/src/main/java/dev/metaschema/core/metapath/function/IFunction.java index 6742bd31f7..a60c779e7b 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/IFunction.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/IFunction.java @@ -5,6 +5,14 @@ package dev.metaschema.core.metapath.function; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathException; import dev.metaschema.core.metapath.StaticContext; @@ -18,15 +26,6 @@ import dev.metaschema.core.metapath.type.Occurrence; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/IFunctionExecutor.java b/core/src/main/java/dev/metaschema/core/metapath/function/IFunctionExecutor.java index bcb755ed62..a32795b6a5 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/IFunctionExecutor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/IFunctionExecutor.java @@ -5,13 +5,12 @@ package dev.metaschema.core.metapath.function; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathException; import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/IFunctionLibrary.java b/core/src/main/java/dev/metaschema/core/metapath/function/IFunctionLibrary.java index eeac0d8bde..2a59192dbe 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/IFunctionLibrary.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/IFunctionLibrary.java @@ -5,10 +5,9 @@ package dev.metaschema.core.metapath.function; -import dev.metaschema.core.qname.IEnhancedQName; - import java.util.stream.Stream; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/IFunctionResolver.java b/core/src/main/java/dev/metaschema/core/metapath/function/IFunctionResolver.java index 79f8fa65bf..3f336ea9dd 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/IFunctionResolver.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/IFunctionResolver.java @@ -7,7 +7,6 @@ import dev.metaschema.core.metapath.StaticMetapathException; import dev.metaschema.core.qname.IEnhancedQName; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/InvalidArgumentFunctionException.java b/core/src/main/java/dev/metaschema/core/metapath/function/InvalidArgumentFunctionException.java index de490ac84c..8f40575a05 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/InvalidArgumentFunctionException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/InvalidArgumentFunctionException.java @@ -6,7 +6,6 @@ package dev.metaschema.core.metapath.function; import dev.metaschema.core.metapath.IErrorCode; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/InvalidTypeFunctionException.java b/core/src/main/java/dev/metaschema/core/metapath/function/InvalidTypeFunctionException.java index d1c2c7138a..79b770cd7e 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/InvalidTypeFunctionException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/InvalidTypeFunctionException.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.function; +import java.util.Locale; + import dev.metaschema.core.metapath.IErrorCode; import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.node.INodeItem; - -import java.util.Locale; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/JsonFunctionException.java b/core/src/main/java/dev/metaschema/core/metapath/function/JsonFunctionException.java index c48f3b2149..95df76b166 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/JsonFunctionException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/JsonFunctionException.java @@ -6,7 +6,6 @@ package dev.metaschema.core.metapath.function; import dev.metaschema.core.metapath.IErrorCode; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/UnidentifiedFunctionError.java b/core/src/main/java/dev/metaschema/core/metapath/function/UnidentifiedFunctionError.java index 806cfcd497..e2d30648f5 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/UnidentifiedFunctionError.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/UnidentifiedFunctionError.java @@ -6,7 +6,6 @@ package dev.metaschema.core.metapath.function; import dev.metaschema.core.metapath.IErrorCode; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/UriFunctionException.java b/core/src/main/java/dev/metaschema/core/metapath/function/UriFunctionException.java index ad21e47f81..8a45a1dbf4 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/UriFunctionException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/UriFunctionException.java @@ -7,7 +7,6 @@ import dev.metaschema.core.metapath.IErrorCode; import dev.metaschema.core.metapath.function.library.FnResolveUri; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/impl/AbstractFunction.java b/core/src/main/java/dev/metaschema/core/metapath/function/impl/AbstractFunction.java index 823f648d4d..b9ae9f382d 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/impl/AbstractFunction.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/impl/AbstractFunction.java @@ -5,6 +5,12 @@ package dev.metaschema.core.metapath.function.impl; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Objects; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathException; @@ -22,13 +28,6 @@ import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.CollectionUtil; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Objects; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/impl/OperationFunctions.java b/core/src/main/java/dev/metaschema/core/metapath/function/impl/OperationFunctions.java index d2a7c27f79..519e962ad2 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/impl/OperationFunctions.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/impl/OperationFunctions.java @@ -5,6 +5,14 @@ package dev.metaschema.core.metapath.function.impl; +import java.time.Duration; +import java.time.LocalDate; +import java.time.OffsetTime; +import java.time.Period; +import java.time.ZonedDateTime; +import java.time.temporal.Temporal; +import java.util.Set; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.function.ArithmeticFunctionException; import dev.metaschema.core.metapath.function.CastFunctionException; @@ -27,15 +35,6 @@ import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.time.Duration; -import java.time.LocalDate; -import java.time.OffsetTime; -import java.time.Period; -import java.time.ZonedDateTime; -import java.time.temporal.Temporal; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayAppend.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayAppend.java index 4e8c01f080..f1173c0376 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayAppend.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayAppend.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.function.library; +import java.util.ArrayList; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -15,10 +18,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.function.IArrayItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.ArrayList; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayFlatten.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayFlatten.java index 8ea02a9c91..57e020fab5 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayFlatten.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayFlatten.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.IArgument; @@ -13,10 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.function.IArrayItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayGet.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayGet.java index f71b60b8ee..57066d0de0 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayGet.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayGet.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -17,9 +19,6 @@ import dev.metaschema.core.metapath.item.function.IArrayItem; import dev.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayHead.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayHead.java index 9de36bd61e..7c85bad8b8 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayHead.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayHead.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -15,9 +17,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.function.IArrayItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayInsertBefore.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayInsertBefore.java index d4b16edf83..bcdb211a12 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayInsertBefore.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayInsertBefore.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -18,9 +20,6 @@ import dev.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException; import dev.metaschema.core.metapath.item.function.NegativeLengthArrayMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayJoin.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayJoin.java index cd2cad41cd..f1b6a6d126 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayJoin.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayJoin.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath.function.library; +import java.util.Collection; +import java.util.List; +import java.util.stream.Collectors; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -15,11 +19,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.function.IArrayItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayPut.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayPut.java index 987587d467..acfc4e86b3 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayPut.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayPut.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.function.library; +import java.util.ArrayList; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -18,10 +21,6 @@ import dev.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException; import dev.metaschema.core.metapath.item.function.NegativeLengthArrayMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.util.ArrayList; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayRemove.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayRemove.java index efdd56b566..0121ab268c 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayRemove.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayRemove.java @@ -5,6 +5,13 @@ package dev.metaschema.core.metapath.function.library; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -17,14 +24,6 @@ import dev.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException; import dev.metaschema.core.metapath.item.function.NegativeLengthArrayMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayReverse.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayReverse.java index 2f92d93e08..e66f2cb5f5 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayReverse.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayReverse.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath.function.library; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -15,11 +19,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.function.IArrayItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArraySize.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArraySize.java index 808aae5752..6505e9c10f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArraySize.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArraySize.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -15,9 +17,6 @@ import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.metapath.item.function.IArrayItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArraySubarray.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArraySubarray.java index c94e2b1ade..7e12b1065a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArraySubarray.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArraySubarray.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.function.library; +import java.util.ArrayList; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -18,10 +21,6 @@ import dev.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException; import dev.metaschema.core.metapath.item.function.NegativeLengthArrayMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.util.ArrayList; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayTail.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayTail.java index 3be7920f84..c1a449f4b7 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayTail.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/ArrayTail.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.function.IArrayItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/CastFunction.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/CastFunction.java index 5677081437..196d6c5567 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/CastFunction.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/CastFunction.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.function.FunctionUtils; import dev.metaschema.core.metapath.function.IArgument; @@ -17,9 +19,6 @@ import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java index 687050bc82..a65024edb0 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java @@ -10,7 +10,6 @@ import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionLibrary; import dev.metaschema.core.metapath.item.atomic.INumericItem; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAbs.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAbs.java index 062bf38414..b0286f48a5 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAbs.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAbs.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.INumericItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezone.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezone.java index 3fe3d3cb9b..3600be47eb 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezone.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezone.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustDateToTimezone.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustDateToTimezone.java index 1c3a26c729..2b5e959c5d 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustDateToTimezone.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustDateToTimezone.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IDateItem; import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustTimeToTimezone.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustTimeToTimezone.java index f01257d9da..0d248e3f81 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustTimeToTimezone.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAdjustTimeToTimezone.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; import dev.metaschema.core.metapath.item.atomic.ITimeItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAvg.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAvg.java index 40ac181b80..f8c3881768 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAvg.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnAvg.java @@ -5,6 +5,13 @@ package dev.metaschema.core.metapath.function.library; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.function.BiFunction; +import java.util.function.BinaryOperator; +import java.util.stream.Collectors; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -22,14 +29,6 @@ import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; import dev.metaschema.core.util.CustomCollectors; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.function.BiFunction; -import java.util.function.BinaryOperator; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnBaseUri.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnBaseUri.java index 60d0df0370..f9406a3b96 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnBaseUri.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnBaseUri.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.function.library; +import java.net.URI; +import java.util.List; + import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; @@ -17,10 +20,6 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnBoolean.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnBoolean.java index ad3700bf74..08b910ad5a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnBoolean.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnBoolean.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.IArgument; @@ -20,9 +22,6 @@ import dev.metaschema.core.metapath.item.atomic.IUntypedAtomicItem; import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCeiling.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCeiling.java index 60cf45776f..78cf4eed7a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCeiling.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCeiling.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.INumericItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCompare.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCompare.java index 9d614e0167..06a9457e6e 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCompare.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCompare.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.metapath.item.atomic.IStringItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnConcat.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnConcat.java index 8e83767cb6..da0ef0cb66 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnConcat.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnConcat.java @@ -5,6 +5,11 @@ package dev.metaschema.core.metapath.function.library; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.IArgument; @@ -14,12 +19,6 @@ import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnContains.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnContains.java index 2a851fc95f..65a333ab29 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnContains.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnContains.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import dev.metaschema.core.metapath.item.atomic.IStringItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCount.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCount.java index 43adfc3ce8..9f2b6a956e 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCount.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCount.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentDate.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentDate.java index 4c6cb85c49..1eba49ce12 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentDate.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentDate.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.IFunction; @@ -12,9 +14,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IDateItem; import dev.metaschema.core.metapath.item.atomic.IDateWithTimeZoneItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentDateTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentDateTime.java index fe7b36faf5..64012b7d7c 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentDateTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentDateTime.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.IFunction; @@ -12,9 +14,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; import dev.metaschema.core.metapath.item.atomic.IDateTimeWithTimeZoneItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentTime.java index 7883ca2600..9431e72ca5 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnCurrentTime.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.IFunction; @@ -12,9 +14,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.ITimeItem; import dev.metaschema.core.metapath.item.atomic.ITimeWithTimeZoneItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnData.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnData.java index fc6dbb91b4..08e1231083 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnData.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnData.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDateTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDateTime.java index 24a085cdfe..790e9e36c6 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDateTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDateTime.java @@ -5,6 +5,12 @@ package dev.metaschema.core.metapath.function.library; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.time.ZonedDateTime; +import java.util.List; +import java.util.Objects; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -17,13 +23,6 @@ import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; import dev.metaschema.core.metapath.item.atomic.ITimeItem; import dev.metaschema.core.util.ObjectUtils; - -import java.time.ZoneId; -import java.time.ZoneOffset; -import java.time.ZonedDateTime; -import java.util.List; -import java.util.Objects; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDayFromDate.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDayFromDate.java index 535ec87046..b31ed9b6b5 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDayFromDate.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDayFromDate.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IDateItem; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTime.java index 05007fb57e..d08065861a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTime.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDaysFromDuration.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDaysFromDuration.java index d7755f757c..2d5b34c2ef 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDaysFromDuration.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDaysFromDuration.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -16,9 +18,6 @@ import dev.metaschema.core.metapath.item.atomic.IDurationItem; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDeepEqual.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDeepEqual.java index 5860a369c1..af540bcba0 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDeepEqual.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDeepEqual.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDefaultLanguage.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDefaultLanguage.java index 77782fc69d..a5db96845f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDefaultLanguage.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDefaultLanguage.java @@ -5,15 +5,14 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.IFunction; import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IStringItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDistinctValues.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDistinctValues.java index 61f986f627..b9477296f7 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDistinctValues.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDistinctValues.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -15,14 +18,10 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** - * /** Implements fn:distinct-values * functions. This implementation does not implement the two-arg variant with * collation at this time. @@ -66,7 +65,7 @@ private static ISequence executeOneArg(@NonNull IFunction functi * function. * * @param values - * the items to get destinct values for + * the items to get distinct values for * @param dynamicContext * used to provide evaluation information, including the implicit * timezone diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDoc.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDoc.java index 8c38b2d183..83f9ba3f31 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDoc.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDoc.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.function.library; +import java.io.IOException; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.MetapathException; @@ -18,10 +21,6 @@ import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; import dev.metaschema.core.util.ObjectUtils; - -import java.io.IOException; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDocumentAvailable.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDocumentAvailable.java index dbf1aaf5d4..8b960739d3 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDocumentAvailable.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDocumentAvailable.java @@ -5,6 +5,11 @@ package dev.metaschema.core.metapath.function.library; +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URLConnection; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.MetapathException; @@ -19,12 +24,6 @@ import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.util.ObjectUtils; - -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URLConnection; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDocumentUri.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDocumentUri.java index 451a3dbadb..a9105d9789 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDocumentUri.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnDocumentUri.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; @@ -18,9 +20,6 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnEmpty.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnEmpty.java index 9c71fbe4eb..b49e45923a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnEmpty.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnEmpty.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnEndsWith.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnEndsWith.java index 085d8f7324..8797cd79a7 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnEndsWith.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnEndsWith.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import dev.metaschema.core.metapath.item.atomic.IStringItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnExactlyOne.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnExactlyOne.java index 36d39ac70e..bd0c87322a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnExactlyOne.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnExactlyOne.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.IArgument; @@ -13,9 +15,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnExists.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnExists.java index 4c40a85350..61e16a18ef 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnExists.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnExists.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFalse.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFalse.java index a9830ec5d8..323173287b 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFalse.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFalse.java @@ -5,15 +5,14 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.IFunction; import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IBooleanItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionArity.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionArity.java index 53f0502bac..103bd8e0fa 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionArity.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionArity.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionLookup.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionLookup.java index 9b30252b0a..4b3f7553c7 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionLookup.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionLookup.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.StaticMetapathException; @@ -17,9 +19,6 @@ import dev.metaschema.core.metapath.item.atomic.IQNameItem; import dev.metaschema.core.metapath.type.IItemType; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionName.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionName.java index bf7dceb424..007ba90f6a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionName.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnFunctionName.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IQNameItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHasChildren.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHasChildren.java index a9bb342f78..7ef9e58a53 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHasChildren.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHasChildren.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -16,9 +18,6 @@ import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHead.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHead.java index c8af015fa3..50f557da78 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHead.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHead.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -13,9 +15,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromDateTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromDateTime.java index c7da6e8991..a2e5e1bd66 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromDateTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromDateTime.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromDuration.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromDuration.java index 8dd0ad3995..c6e3096798 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromDuration.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromDuration.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -16,9 +18,6 @@ import dev.metaschema.core.metapath.item.atomic.IDurationItem; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromTime.java index ffd8eb1b1e..89d2664d76 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnHoursFromTime.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.metapath.item.atomic.ITimeItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnImplicitTimezone.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnImplicitTimezone.java index 5aea1d7034..fe6396502e 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnImplicitTimezone.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnImplicitTimezone.java @@ -5,6 +5,12 @@ package dev.metaschema.core.metapath.function.library; +import java.time.Duration; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.time.ZonedDateTime; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.IFunction; @@ -12,13 +18,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; import dev.metaschema.core.util.ObjectUtils; - -import java.time.Duration; -import java.time.ZoneId; -import java.time.ZoneOffset; -import java.time.ZonedDateTime; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnIndexOf.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnIndexOf.java index a295f95e28..dfb5d36a72 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnIndexOf.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnIndexOf.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath.function.library; +import java.util.ArrayList; +import java.util.List; +import java.util.ListIterator; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.ComparisonFunctions; @@ -17,11 +21,6 @@ import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.ListIterator; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnInnermost.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnInnermost.java index ddf7d1dd57..de93b5548b 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnInnermost.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnInnermost.java @@ -5,6 +5,11 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,16 +19,10 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** - * /** Implements fn:innermost * functions. */ diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnInsertBefore.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnInsertBefore.java index 3e4a577138..9987c61609 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnInsertBefore.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnInsertBefore.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.function.library; +import java.util.ArrayList; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,10 +17,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.ArrayList; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnLast.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnLast.java index 128bc8f46e..0d6f88adca 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnLast.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnLast.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.FocusContext; @@ -13,9 +15,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnLocalName.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnLocalName.java index 18aeeac543..0c34611e5d 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnLocalName.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnLocalName.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -16,9 +18,6 @@ import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnLowerCase.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnLowerCase.java index 3c38bff487..1ce2c1f010 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnLowerCase.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnLowerCase.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; +import java.util.Locale; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,10 +17,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.Locale; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMatches.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMatches.java index b4913dbcaa..cbaf76c4b9 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMatches.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMatches.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; +import java.util.regex.Pattern; +import java.util.regex.PatternSyntaxException; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -17,11 +21,6 @@ import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.regex.Pattern; -import java.util.regex.PatternSyntaxException; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinMax.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinMax.java index 8a65c384a8..8d85952a3a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinMax.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinMax.java @@ -5,6 +5,12 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.ComparisonFunctions; @@ -25,13 +31,6 @@ import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.metapath.item.atomic.IUntypedAtomicItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDateTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDateTime.java index cfed1db4a5..456b174159 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDateTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDateTime.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDuration.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDuration.java index fc4297020a..903d285309 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDuration.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDuration.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -16,9 +18,6 @@ import dev.metaschema.core.metapath.item.atomic.IDurationItem; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromTime.java index 2034ede6c5..d5e02bdc4b 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMinutesFromTime.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.metapath.item.atomic.ITimeItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthFromDate.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthFromDate.java index 65a766f81f..c24cb9d390 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthFromDate.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthFromDate.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IDateItem; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTime.java index 28669a7482..fc26d7e910 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTime.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthsFromDuration.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthsFromDuration.java index aec3c417ca..997765cf1e 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthsFromDuration.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnMonthsFromDuration.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -16,9 +18,6 @@ import dev.metaschema.core.metapath.item.atomic.IDurationItem; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** @@ -62,7 +61,7 @@ private static ISequence execute(@NonNull IFunction function, : arg instanceof IDayTimeDurationItem // day-time durations do not have months granularity ? ISequence.of(IIntegerItem.ZERO) - // get the hours + // get the months : ISequence.of(fnMonthsFromDuration((IYearMonthDurationItem) arg)); } diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnName.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnName.java index 2707c68aba..f5f985fc7e 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnName.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnName.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.StaticContext; @@ -17,9 +19,6 @@ import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnNamespaceUri.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnNamespaceUri.java index 36d11af409..e7c35f0d70 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnNamespaceUri.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnNamespaceUri.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -16,9 +18,6 @@ import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnNormalizeSpace.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnNormalizeSpace.java index bbb0fc7c86..593a02cb8c 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnNormalizeSpace.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnNormalizeSpace.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnNot.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnNot.java index d552ebda77..27fd4a5504 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnNot.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnNot.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.IArgument; @@ -13,9 +15,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnOneOrMore.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnOneOrMore.java index 513bcdf571..ef802bf0f2 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnOneOrMore.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnOneOrMore.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.IArgument; @@ -13,9 +15,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnOutermost.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnOutermost.java index 8636ca8f80..db624e9a34 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnOutermost.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnOutermost.java @@ -5,6 +5,11 @@ package dev.metaschema.core.metapath.function.library; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,12 +19,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnPath.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnPath.java index 1472ced03d..17f9b9ac2c 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnPath.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnPath.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; @@ -18,9 +20,6 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnPosition.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnPosition.java index 4d66519932..ace695c0a6 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnPosition.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnPosition.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.FocusContext; @@ -13,9 +15,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnQName.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnQName.java index cb93ce70d6..8cc93f6480 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnQName.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnQName.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath.function.library; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.CastFunctionException; @@ -17,11 +21,6 @@ import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; -import java.net.URISyntaxException; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnRemove.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnRemove.java index cd07f5e005..85eb7a92d2 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnRemove.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnRemove.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.function.library; +import java.util.ArrayList; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,10 +17,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.ArrayList; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnResolveUri.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnResolveUri.java index 3db536cb6e..c537e39925 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnResolveUri.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnResolveUri.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -17,9 +19,6 @@ import dev.metaschema.core.metapath.item.atomic.IAnyUriItem; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnReverse.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnReverse.java index dcdd620f12..815c3c696f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnReverse.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnReverse.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath.function.library; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -13,11 +17,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.util.ObjectUtils; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnRoot.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnRoot.java index d210dc482a..da2b4238e4 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnRoot.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnRoot.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -15,9 +17,6 @@ import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnRound.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnRound.java index 89681f2130..068bd2472f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnRound.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnRound.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -15,9 +17,6 @@ import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.metapath.item.atomic.INumericItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDateTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDateTime.java index 7c835f1583..24ff8ed482 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDateTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDateTime.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.function.library; +import java.math.BigDecimal; +import java.util.List; + import dev.metaschema.core.datatype.adapter.DecimalAdapter; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; @@ -16,10 +19,6 @@ import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; import dev.metaschema.core.metapath.item.atomic.IDecimalItem; import dev.metaschema.core.util.ObjectUtils; - -import java.math.BigDecimal; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDuration.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDuration.java index 9c99eaf20a..63e96e1176 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDuration.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDuration.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.function.library; +import java.time.Duration; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -17,10 +20,6 @@ import dev.metaschema.core.metapath.item.atomic.IDurationItem; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; - -import java.time.Duration; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromTime.java index f7cae56054..06059060d9 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSecondsFromTime.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath.function.library; +import java.math.BigDecimal; +import java.time.Duration; +import java.util.List; + import dev.metaschema.core.datatype.adapter.DecimalAdapter; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; @@ -16,11 +20,6 @@ import dev.metaschema.core.metapath.item.atomic.IDecimalItem; import dev.metaschema.core.metapath.item.atomic.ITimeItem; import dev.metaschema.core.util.ObjectUtils; - -import java.math.BigDecimal; -import java.time.Duration; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStartsWith.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStartsWith.java index 2655fb79a8..ef113d0d8f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStartsWith.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStartsWith.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import dev.metaschema.core.metapath.item.atomic.IStringItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStaticBaseUri.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStaticBaseUri.java index c0de829294..e294665871 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStaticBaseUri.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStaticBaseUri.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.function.library; +import java.net.URI; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.IArgument; @@ -13,10 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IAnyUriItem; import dev.metaschema.core.metapath.item.atomic.IStringItem; - -import java.net.URI; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnString.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnString.java index a2d6628489..ff4b715e89 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnString.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnString.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -18,9 +20,6 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStringJoin.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStringJoin.java index f8e31b9c06..fa35b78fe3 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStringJoin.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStringJoin.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -15,11 +19,6 @@ import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStringLength.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStringLength.java index 9f6d866312..7bb074c2bb 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStringLength.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnStringLength.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -15,9 +17,6 @@ import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstring.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstring.java index addcf93f25..4309053776 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstring.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstring.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -15,9 +17,6 @@ import dev.metaschema.core.metapath.item.atomic.IDecimalItem; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstringAfter.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstringAfter.java index 955fef2d1f..e153d01e70 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstringAfter.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstringAfter.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath.function.library; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,11 +18,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.util.ObjectUtils; - -import org.apache.commons.lang3.StringUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; // CPD-OFF diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstringBefore.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstringBefore.java index c3d3569d5b..5fe24f6d25 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstringBefore.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSubstringBefore.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath.function.library; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,11 +18,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.util.ObjectUtils; - -import org.apache.commons.lang3.StringUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; // CPD-OFF diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSum.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSum.java index 94b91a4a53..3c99592b11 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSum.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnSum.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; +import java.util.Map; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -21,10 +24,6 @@ import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; import dev.metaschema.core.util.CustomCollectors; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTail.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTail.java index a2303bc02f..fe449917c6 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTail.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTail.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDate.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDate.java index 0d4043b66e..c03991667a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDate.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDate.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -15,9 +17,6 @@ import dev.metaschema.core.metapath.item.atomic.IDateItem; import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTime.java index cb335504ac..399fe54a6a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTime.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -15,9 +17,6 @@ import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromTime.java index 112d87e738..f4819a641f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromTime.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -15,9 +17,6 @@ import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; import dev.metaschema.core.metapath.item.atomic.ITimeItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTokenize.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTokenize.java index c980f2ca1e..c5455b62fd 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTokenize.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTokenize.java @@ -5,6 +5,12 @@ package dev.metaschema.core.metapath.function.library; +import java.util.LinkedList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.regex.PatternSyntaxException; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -17,13 +23,6 @@ import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.util.LinkedList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.regex.PatternSyntaxException; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTrue.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTrue.java index 6768ebfff5..d541a296ea 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTrue.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnTrue.java @@ -5,15 +5,14 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.IFunction; import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IBooleanItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnUpperCase.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnUpperCase.java index b2820367bb..f392ad53f8 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnUpperCase.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnUpperCase.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; +import java.util.Locale; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,10 +17,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.Locale; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearFromDate.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearFromDate.java index 6a3b8668c1..4c984cc9d2 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearFromDate.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearFromDate.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IDateItem; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTime.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTime.java index 66bd4bf4ba..f7f41a5dce 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTime.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTime.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearsFromDuration.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearsFromDuration.java index e98a3c65ad..7a833496be 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearsFromDuration.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnYearsFromDuration.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -16,9 +18,6 @@ import dev.metaschema.core.metapath.item.atomic.IDurationItem; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnZeroOrOne.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnZeroOrOne.java index b4ce8832e7..9cec0c7022 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/FnZeroOrOne.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/FnZeroOrOne.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.IArgument; @@ -13,9 +15,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapContains.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapContains.java index 3098afa8f4..19d08ec87d 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapContains.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapContains.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -17,9 +19,6 @@ import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import dev.metaschema.core.metapath.item.function.IMapItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapEntry.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapEntry.java index 6627f4599a..e9863e16cb 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapEntry.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapEntry.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -16,9 +18,6 @@ import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.function.IMapItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapFind.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapFind.java index c8ff2f1522..1eea7961ba 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapFind.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapFind.java @@ -5,6 +5,11 @@ package dev.metaschema.core.metapath.function.library; +import java.util.Collection; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -17,12 +22,6 @@ import dev.metaschema.core.metapath.item.function.IArrayItem; import dev.metaschema.core.metapath.item.function.IMapItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapForEach.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapForEach.java index 37acb42424..631218b99f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapForEach.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapForEach.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; +import java.util.function.BiFunction; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -15,10 +18,6 @@ import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.function.IMapItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.function.BiFunction; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapGet.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapGet.java index 94cb54ad3f..bf03c6e05a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapGet.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapGet.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -16,9 +18,6 @@ import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.function.IMapItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapKeys.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapKeys.java index 53304161b3..0c53ce5e06 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapKeys.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapKeys.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -16,11 +20,6 @@ import dev.metaschema.core.metapath.item.function.IMapItem; import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.Map; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapMerge.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapMerge.java index 728a5854f3..8722398e6d 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapMerge.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapMerge.java @@ -5,6 +5,14 @@ package dev.metaschema.core.metapath.function.library; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -21,15 +29,6 @@ import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.CustomCollectors; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapPut.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapPut.java index 89c63b36c4..ef7c126504 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapPut.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapPut.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath.function.library; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -17,11 +21,6 @@ import dev.metaschema.core.metapath.item.function.IMapItem; import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.util.ObjectUtils; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapRemove.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapRemove.java index 9240fbeca3..247068656d 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapRemove.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapRemove.java @@ -5,6 +5,12 @@ package dev.metaschema.core.metapath.function.library; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -17,13 +23,6 @@ import dev.metaschema.core.metapath.item.function.IMapItem; import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapSize.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapSize.java index 2c14d562b9..4875d3898d 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/MapSize.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MapSize.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -15,9 +17,6 @@ import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.metapath.item.function.IMapItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/MpBase64Decode.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MpBase64Decode.java index 0ea04e93c2..f2dbd3f452 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/MpBase64Decode.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MpBase64Decode.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -15,9 +17,6 @@ import dev.metaschema.core.metapath.item.atomic.IBase64BinaryItem; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/MpBase64Encode.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MpBase64Encode.java index 29934c9d2a..410b10d1e2 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/MpBase64Encode.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MpBase64Encode.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -15,9 +17,6 @@ import dev.metaschema.core.metapath.item.atomic.IBase64BinaryItem; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/MpRecurseDepth.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/MpRecurseDepth.java index 860ecc514a..cee55b9d1a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/MpRecurseDepth.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/MpRecurseDepth.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.metapath.MetapathConstants; @@ -17,10 +20,6 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/library/NumericFunction.java b/core/src/main/java/dev/metaschema/core/metapath/function/library/NumericFunction.java index d7c3c8d14d..b02596af71 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/library/NumericFunction.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/library/NumericFunction.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath.function.library; +import java.util.List; + +import javax.xml.namespace.QName; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.function.FunctionUtils; import dev.metaschema.core.metapath.function.IArgument; @@ -14,11 +18,6 @@ import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.INumericItem; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - -import javax.xml.namespace.QName; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/function/regex/RegularExpressionMetapathException.java b/core/src/main/java/dev/metaschema/core/metapath/function/regex/RegularExpressionMetapathException.java index face0d6afd..55d283167f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/function/regex/RegularExpressionMetapathException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/function/regex/RegularExpressionMetapathException.java @@ -7,7 +7,6 @@ import dev.metaschema.core.metapath.IErrorCode; import dev.metaschema.core.metapath.MetapathException; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractMapKey.java b/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractMapKey.java index 3176f77c30..6c35f6d1f7 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractMapKey.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractMapKey.java @@ -6,7 +6,6 @@ package dev.metaschema.core.metapath.impl; import dev.metaschema.core.metapath.item.function.IMapKey; - import nl.talsmasoftware.lazy4j.Lazy; public abstract class AbstractMapKey implements IMapKey { diff --git a/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractMetapathExpression.java b/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractMetapathExpression.java index f1c6c2923e..d138d6386f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractMetapathExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractMetapathExpression.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.impl; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.IMetapathExpression; @@ -13,9 +15,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.util.CollectionUtil; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; public abstract class AbstractMetapathExpression implements IMetapathExpression { diff --git a/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractSequence.java b/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractSequence.java index 85644c8ad4..ab7785172b 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractSequence.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/AbstractSequence.java @@ -5,12 +5,6 @@ package dev.metaschema.core.metapath.impl; -import dev.metaschema.core.metapath.DynamicContext; -import dev.metaschema.core.metapath.item.ICollectionValue; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.util.ObjectUtils; - import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -19,6 +13,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/impl/ErrorCodeImpl.java b/core/src/main/java/dev/metaschema/core/metapath/impl/ErrorCodeImpl.java index 5340506b4b..7b12be8288 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/impl/ErrorCodeImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/ErrorCodeImpl.java @@ -6,7 +6,6 @@ package dev.metaschema.core.metapath.impl; import dev.metaschema.core.metapath.IErrorCode; - import edu.umd.cs.findbugs.annotations.NonNull; public class ErrorCodeImpl implements IErrorCode { diff --git a/core/src/main/java/dev/metaschema/core/metapath/impl/IFeatureCollectionFunctionItem.java b/core/src/main/java/dev/metaschema/core/metapath/impl/IFeatureCollectionFunctionItem.java index e1431ebe6d..42be746302 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/impl/IFeatureCollectionFunctionItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/IFeatureCollectionFunctionItem.java @@ -5,15 +5,14 @@ package dev.metaschema.core.metapath.impl; +import java.util.EnumSet; +import java.util.Set; + import dev.metaschema.core.metapath.function.IFunction; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.type.ISequenceType; import dev.metaschema.core.metapath.type.Occurrence; import dev.metaschema.core.util.ObjectUtils; - -import java.util.EnumSet; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/impl/LazyCompilationMetapathExpression.java b/core/src/main/java/dev/metaschema/core/metapath/impl/LazyCompilationMetapathExpression.java index 38b8310336..462d579060 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/impl/LazyCompilationMetapathExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/LazyCompilationMetapathExpression.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.impl; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.IMetapathExpression; @@ -15,9 +17,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/impl/MetapathExpression.java b/core/src/main/java/dev/metaschema/core/metapath/impl/MetapathExpression.java index ff71cd393a..4e7f843dd8 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/impl/MetapathExpression.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/MetapathExpression.java @@ -5,6 +5,20 @@ package dev.metaschema.core.metapath.impl; +import org.antlr.v4.runtime.CharStreams; +import org.antlr.v4.runtime.CommonTokenStream; +import org.antlr.v4.runtime.DefaultErrorStrategy; +import org.antlr.v4.runtime.Parser; +import org.antlr.v4.runtime.misc.ParseCancellationException; +import org.antlr.v4.runtime.tree.ParseTree; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.nio.charset.StandardCharsets; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.InvalidMetapathGrammarException; @@ -20,21 +34,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.util.ObjectUtils; - -import org.antlr.v4.runtime.CharStreams; -import org.antlr.v4.runtime.CommonTokenStream; -import org.antlr.v4.runtime.DefaultErrorStrategy; -import org.antlr.v4.runtime.Parser; -import org.antlr.v4.runtime.misc.ParseCancellationException; -import org.antlr.v4.runtime.tree.ParseTree; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.PrintStream; -import java.nio.charset.StandardCharsets; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/impl/SequenceN.java b/core/src/main/java/dev/metaschema/core/metapath/impl/SequenceN.java index fa7da87bab..e9ce899a4a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/impl/SequenceN.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/SequenceN.java @@ -5,15 +5,14 @@ package dev.metaschema.core.metapath.impl; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; - import java.util.ArrayList; import java.util.Collection; import java.util.List; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/impl/SingletonSequence.java b/core/src/main/java/dev/metaschema/core/metapath/impl/SingletonSequence.java index c4608a540d..8708bb4484 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/impl/SingletonSequence.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/SingletonSequence.java @@ -5,13 +5,12 @@ package dev.metaschema.core.metapath.impl; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.util.CollectionUtil; - import java.util.List; import java.util.function.Consumer; import java.util.stream.Stream; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/impl/StreamSequence.java b/core/src/main/java/dev/metaschema/core/metapath/impl/StreamSequence.java index 66e1a30a7e..54c0a9f429 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/impl/StreamSequence.java +++ b/core/src/main/java/dev/metaschema/core/metapath/impl/StreamSequence.java @@ -5,10 +5,6 @@ package dev.metaschema.core.metapath.impl; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.util.ObjectUtils; - import java.util.List; import java.util.Objects; import java.util.concurrent.locks.Lock; @@ -16,6 +12,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/DefaultItemWriter.java b/core/src/main/java/dev/metaschema/core/metapath/item/DefaultItemWriter.java index c97b115251..4b3c5e071a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/DefaultItemWriter.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/DefaultItemWriter.java @@ -5,17 +5,16 @@ package dev.metaschema.core.metapath.item; +import org.eclipse.jdt.annotation.Owning; + +import java.io.PrintWriter; + import dev.metaschema.core.metapath.function.IFunction; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.atomic.IAtomicValuedItem; import dev.metaschema.core.metapath.item.function.IArrayItem; import dev.metaschema.core.metapath.item.function.IMapItem; import dev.metaschema.core.metapath.item.node.INodeItem; - -import org.eclipse.jdt.annotation.Owning; - -import java.io.PrintWriter; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/ICollectionValue.java b/core/src/main/java/dev/metaschema/core/metapath/item/ICollectionValue.java index 237d8330e2..7b9ea786bb 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/ICollectionValue.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/ICollectionValue.java @@ -5,17 +5,16 @@ package dev.metaschema.core.metapath.item; -import dev.metaschema.core.metapath.DynamicContext; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import dev.metaschema.core.metapath.item.function.IArrayItem; -import dev.metaschema.core.metapath.item.function.IMapItem; -import dev.metaschema.core.util.ObjectUtils; - import java.util.LinkedList; import java.util.List; import java.util.function.Predicate; import java.util.stream.Stream; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/IItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/IItem.java index d198fa097c..1223d03768 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/IItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/IItem.java @@ -5,14 +5,13 @@ package dev.metaschema.core.metapath.item; +import java.util.stream.Stream; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.metapath.function.InvalidTypeFunctionException; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.type.IItemType; import dev.metaschema.core.util.ObjectUtils; - -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/IItemVisitor.java b/core/src/main/java/dev/metaschema/core/metapath/item/IItemVisitor.java index 3cc1188ea4..f29c35591e 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/IItemVisitor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/IItemVisitor.java @@ -10,7 +10,6 @@ import dev.metaschema.core.metapath.item.function.IArrayItem; import dev.metaschema.core.metapath.item.function.IMapItem; import dev.metaschema.core.metapath.item.node.INodeItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/IItemWriter.java b/core/src/main/java/dev/metaschema/core/metapath/item/IItemWriter.java index ba33c3853c..ea295d20d8 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/IItemWriter.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/IItemWriter.java @@ -10,7 +10,6 @@ import dev.metaschema.core.metapath.item.function.IArrayItem; import dev.metaschema.core.metapath.item.function.IMapItem; import dev.metaschema.core.metapath.item.node.INodeItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/ISequence.java b/core/src/main/java/dev/metaschema/core/metapath/item/ISequence.java index cbaa003e0c..36d5cc7d1e 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/ISequence.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/ISequence.java @@ -5,17 +5,6 @@ package dev.metaschema.core.metapath.item; -import dev.metaschema.core.metapath.impl.AbstractSequence; -import dev.metaschema.core.metapath.impl.SequenceN; -import dev.metaschema.core.metapath.impl.SingletonSequence; -import dev.metaschema.core.metapath.impl.StreamSequence; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import dev.metaschema.core.metapath.item.function.IArrayItem; -import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; -import dev.metaschema.core.metapath.type.TypeMetapathException; -import dev.metaschema.core.util.CustomCollectors; -import dev.metaschema.core.util.ObjectUtils; - import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -26,6 +15,16 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.metapath.impl.AbstractSequence; +import dev.metaschema.core.metapath.impl.SequenceN; +import dev.metaschema.core.metapath.impl.SingletonSequence; +import dev.metaschema.core.metapath.impl.StreamSequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.function.IArrayItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.metapath.type.TypeMetapathException; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/ItemUtils.java b/core/src/main/java/dev/metaschema/core/metapath/item/ItemUtils.java index d2be04fc40..6162c20fdc 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/ItemUtils.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/ItemUtils.java @@ -14,7 +14,6 @@ import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.metapath.type.TypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractAnyAtomicItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractAnyAtomicItem.java index f6b4b0f24f..3dbcf2f3ff 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractAnyAtomicItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractAnyAtomicItem.java @@ -6,7 +6,6 @@ package dev.metaschema.core.metapath.item.atomic; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractAtomicItemBase.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractAtomicItemBase.java index 6943ef01d4..efcb842547 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractAtomicItemBase.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractAtomicItemBase.java @@ -11,7 +11,6 @@ import dev.metaschema.core.metapath.item.ICollectionValue; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractUntypedAtomicItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractUntypedAtomicItem.java index faf2b05cb2..2ab3366566 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractUntypedAtomicItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/AbstractUntypedAtomicItem.java @@ -7,7 +7,6 @@ import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.metapath.item.function.impl.AbstractStringMapKey; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IAnyAtomicItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IAnyAtomicItem.java index 13b766bdb7..715438b16d 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IAnyAtomicItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IAnyAtomicItem.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.item.atomic; +import java.util.stream.Stream; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; import dev.metaschema.core.metapath.item.ICollectionValue; @@ -14,9 +16,6 @@ import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.IItemType; import dev.metaschema.core.util.ObjectUtils; - -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IAnyUriItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IAnyUriItem.java index 7f63e645f4..98891792fb 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IAnyUriItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IAnyUriItem.java @@ -5,15 +5,14 @@ package dev.metaschema.core.metapath.item.atomic; +import java.net.URI; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; import dev.metaschema.core.metapath.item.atomic.impl.AnyUriItemImpl; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IBase64BinaryItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IBase64BinaryItem.java index ff02d391f1..69e272fdfb 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IBase64BinaryItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IBase64BinaryItem.java @@ -5,15 +5,14 @@ package dev.metaschema.core.metapath.item.atomic; +import java.nio.ByteBuffer; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; import dev.metaschema.core.metapath.item.atomic.impl.Base64BinaryItemImpl; import dev.metaschema.core.metapath.item.atomic.impl.IBinaryItem; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; - -import java.nio.ByteBuffer; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IBooleanItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IBooleanItem.java index 275d13caa2..86e595af0c 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IBooleanItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IBooleanItem.java @@ -10,7 +10,6 @@ import dev.metaschema.core.metapath.item.atomic.impl.BooleanItemImpl; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateItem.java index 702d4ef130..c4f99aae2b 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateItem.java @@ -5,6 +5,11 @@ package dev.metaschema.core.metapath.item.atomic; +import java.time.LocalDate; +import java.time.ZoneOffset; +import java.time.ZonedDateTime; +import java.time.temporal.ChronoUnit; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.datatype.object.AmbiguousDate; import dev.metaschema.core.datatype.object.AmbiguousDateTime; @@ -14,12 +19,6 @@ import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.time.LocalDate; -import java.time.ZoneOffset; -import java.time.ZonedDateTime; -import java.time.temporal.ChronoUnit; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateTimeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateTimeItem.java index d58a92b52d..37bcbed8ea 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateTimeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateTimeItem.java @@ -5,6 +5,14 @@ package dev.metaschema.core.metapath.item.atomic; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.OffsetTime; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.time.ZonedDateTime; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.datatype.object.AmbiguousDateTime; import dev.metaschema.core.metapath.DynamicContext; @@ -14,15 +22,6 @@ import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.OffsetTime; -import java.time.ZoneId; -import java.time.ZoneOffset; -import java.time.ZonedDateTime; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateTimeWithTimeZoneItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateTimeWithTimeZoneItem.java index 9c3e27dde2..dd9f5f14f2 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateTimeWithTimeZoneItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateTimeWithTimeZoneItem.java @@ -5,15 +5,14 @@ package dev.metaschema.core.metapath.item.atomic; +import java.time.ZonedDateTime; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; import dev.metaschema.core.metapath.item.atomic.impl.DateTimeWithTimeZoneItemImpl; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.time.ZonedDateTime; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateWithTimeZoneItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateWithTimeZoneItem.java index cf75857134..df814878d8 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateWithTimeZoneItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDateWithTimeZoneItem.java @@ -5,16 +5,15 @@ package dev.metaschema.core.metapath.item.atomic; +import java.time.ZonedDateTime; +import java.time.temporal.ChronoUnit; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; import dev.metaschema.core.metapath.item.atomic.impl.DateWithTimeZoneItemImpl; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.time.ZonedDateTime; -import java.time.temporal.ChronoUnit; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDayTimeDurationItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDayTimeDurationItem.java index 814abeecf7..2f135c64e8 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDayTimeDurationItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDayTimeDurationItem.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.item.atomic; +import java.time.Duration; +import java.time.ZoneOffset; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.function.DateTimeFunctionException; import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; @@ -12,10 +15,6 @@ import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.time.Duration; -import java.time.ZoneOffset; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDecimalItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDecimalItem.java index 78f23a19a9..b6e6a2d50f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDecimalItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDecimalItem.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.item.atomic; +import java.math.BigDecimal; +import java.math.RoundingMode; + import dev.metaschema.core.datatype.adapter.DecimalAdapter; import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.function.ArithmeticFunctionException; @@ -14,10 +17,6 @@ import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.math.BigDecimal; -import java.math.RoundingMode; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDurationItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDurationItem.java index 8904fcaf15..9967f4ef75 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDurationItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IDurationItem.java @@ -5,14 +5,13 @@ package dev.metaschema.core.metapath.item.atomic; +import java.time.temporal.TemporalAmount; + import dev.metaschema.core.datatype.adapter.AbstractDurationAdapter; import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.metapath.type.impl.TypeConstants; - -import java.time.temporal.TemporalAmount; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IEmailAddressItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IEmailAddressItem.java index 7ef067ebbf..e9bf4c29d7 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IEmailAddressItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IEmailAddressItem.java @@ -10,7 +10,6 @@ import dev.metaschema.core.metapath.item.atomic.impl.EmailAddressItemImpl; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IHexBinaryItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IHexBinaryItem.java index d0608ff6b9..26cfeab9c3 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IHexBinaryItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IHexBinaryItem.java @@ -5,15 +5,14 @@ package dev.metaschema.core.metapath.item.atomic; +import java.nio.ByteBuffer; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; import dev.metaschema.core.metapath.item.atomic.impl.HexBinaryItem; import dev.metaschema.core.metapath.item.atomic.impl.IBinaryItem; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; - -import java.nio.ByteBuffer; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IHostnameItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IHostnameItem.java index ddb5291422..1e8de7d46c 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IHostnameItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IHostnameItem.java @@ -10,7 +10,6 @@ import dev.metaschema.core.metapath.item.atomic.impl.HostnameItemImpl; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPAddressItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPAddressItem.java index 45524ae3f3..466ad4f7bc 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPAddressItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPAddressItem.java @@ -9,7 +9,6 @@ import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.metapath.type.impl.TypeConstants; - import edu.umd.cs.findbugs.annotations.NonNull; import inet.ipaddr.IPAddress; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPv4AddressItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPv4AddressItem.java index 5423bae44b..9b91d5df38 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPv4AddressItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPv4AddressItem.java @@ -10,7 +10,6 @@ import dev.metaschema.core.metapath.item.atomic.impl.IPv4AddressItemImpl; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; - import edu.umd.cs.findbugs.annotations.NonNull; import inet.ipaddr.ipv4.IPv4Address; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPv6AddressItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPv6AddressItem.java index d83cee1e36..c1a05ee636 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPv6AddressItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIPv6AddressItem.java @@ -10,7 +10,6 @@ import dev.metaschema.core.metapath.item.atomic.impl.IPv6AddressItemImpl; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; - import edu.umd.cs.findbugs.annotations.NonNull; import inet.ipaddr.ipv6.IPv6Address; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIntegerItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIntegerItem.java index 699376fb2e..7da9a11487 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIntegerItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IIntegerItem.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.item.atomic; +import java.math.BigInteger; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.function.ArithmeticFunctionException; import dev.metaschema.core.metapath.function.CastFunctionException; @@ -13,9 +15,6 @@ import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.math.BigInteger; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupItem.java index e4b0c0d2b3..a953005a3f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupItem.java @@ -10,7 +10,6 @@ import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupLineItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupLineItem.java index 1e948e581d..63ad79ca9d 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupLineItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupLineItem.java @@ -11,7 +11,6 @@ import dev.metaschema.core.metapath.item.atomic.impl.MarkupLineItemImpl; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupMultilineItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupMultilineItem.java index f2f93de33b..2abf62a47f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupMultilineItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IMarkupMultilineItem.java @@ -11,7 +11,6 @@ import dev.metaschema.core.metapath.item.atomic.impl.MarkupMultiLineItemImpl; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/INcNameItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/INcNameItem.java index 5b0b5c1e36..f12c4832f3 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/INcNameItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/INcNameItem.java @@ -10,7 +10,6 @@ import dev.metaschema.core.metapath.item.atomic.impl.NcNameItemImpl; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/INonNegativeIntegerItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/INonNegativeIntegerItem.java index c094c8890d..3440d9c780 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/INonNegativeIntegerItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/INonNegativeIntegerItem.java @@ -5,15 +5,14 @@ package dev.metaschema.core.metapath.item.atomic; +import java.math.BigInteger; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; import dev.metaschema.core.metapath.item.atomic.impl.NonNegativeIntegerItemImpl; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.math.BigInteger; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/INumericItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/INumericItem.java index 36dbc67718..d717a3c588 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/INumericItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/INumericItem.java @@ -5,6 +5,11 @@ package dev.metaschema.core.metapath.item.atomic; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.math.MathContext; +import java.math.RoundingMode; + import dev.metaschema.core.metapath.function.ArithmeticFunctionException; import dev.metaschema.core.metapath.function.CastFunctionException; import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; @@ -13,12 +18,6 @@ import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.metapath.type.impl.TypeConstants; import dev.metaschema.core.util.ObjectUtils; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.math.MathContext; -import java.math.RoundingMode; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IPositiveIntegerItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IPositiveIntegerItem.java index 9dc465f8ca..ed5f53536b 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IPositiveIntegerItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IPositiveIntegerItem.java @@ -5,14 +5,13 @@ package dev.metaschema.core.metapath.item.atomic; +import java.math.BigInteger; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; import dev.metaschema.core.metapath.item.atomic.impl.PositiveIntegerItemImpl; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; - -import java.math.BigInteger; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IQNameItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IQNameItem.java index 5c52e6f89a..7398a4351f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IQNameItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IQNameItem.java @@ -12,7 +12,6 @@ import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.qname.EQNameFactory; import dev.metaschema.core.qname.IEnhancedQName; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IStringItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IStringItem.java index 62ed121097..cb6e000163 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IStringItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IStringItem.java @@ -10,7 +10,6 @@ import dev.metaschema.core.metapath.item.atomic.impl.StringItemImpl; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITemporalItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITemporalItem.java index d181e1f049..14d33f89ee 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITemporalItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITemporalItem.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.item.atomic; -import dev.metaschema.core.metapath.function.DateTimeFunctionException; -import dev.metaschema.core.util.ObjectUtils; - import java.time.Duration; import java.time.ZoneOffset; +import dev.metaschema.core.metapath.function.DateTimeFunctionException; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITimeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITimeItem.java index 7dd33200f1..d4896812b9 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITimeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITimeItem.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath.item.atomic; +import java.time.LocalTime; +import java.time.OffsetTime; +import java.time.ZoneOffset; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.datatype.object.AmbiguousTime; import dev.metaschema.core.metapath.MetapathConstants; @@ -14,11 +18,6 @@ import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.time.LocalTime; -import java.time.OffsetTime; -import java.time.ZoneOffset; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITimeWithTimeZoneItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITimeWithTimeZoneItem.java index 96a5d6e1de..0c10277b2f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITimeWithTimeZoneItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITimeWithTimeZoneItem.java @@ -5,16 +5,15 @@ package dev.metaschema.core.metapath.item.atomic; +import java.time.OffsetTime; +import java.time.ZonedDateTime; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; import dev.metaschema.core.metapath.item.atomic.impl.TimeWithTimeZoneItemImpl; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.time.OffsetTime; -import java.time.ZonedDateTime; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITokenItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITokenItem.java index f1e70aee24..1435350e06 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITokenItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/ITokenItem.java @@ -10,7 +10,6 @@ import dev.metaschema.core.metapath.item.atomic.impl.TokenItemImpl; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IUriReferenceItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IUriReferenceItem.java index b684f9e88d..0c69e6d290 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IUriReferenceItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IUriReferenceItem.java @@ -5,14 +5,13 @@ package dev.metaschema.core.metapath.item.atomic; +import java.net.URI; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; import dev.metaschema.core.metapath.item.atomic.impl.UriReferenceItemImpl; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IUuidItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IUuidItem.java index 177b035d9f..c48e303596 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IUuidItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IUuidItem.java @@ -5,14 +5,13 @@ package dev.metaschema.core.metapath.item.atomic; +import java.util.UUID; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; import dev.metaschema.core.metapath.item.atomic.impl.UuidItemImpl; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; - -import java.util.UUID; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IYearMonthDurationItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IYearMonthDurationItem.java index fed06bf020..7c14d1603f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IYearMonthDurationItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/IYearMonthDurationItem.java @@ -5,15 +5,14 @@ package dev.metaschema.core.metapath.item.atomic; +import java.time.Period; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; import dev.metaschema.core.metapath.item.atomic.impl.YearMonthDurationItemImpl; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.time.Period; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractBinaryItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractBinaryItem.java index 1114d6b1d1..4c2d8cc5fa 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractBinaryItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractBinaryItem.java @@ -5,10 +5,9 @@ package dev.metaschema.core.metapath.item.atomic.impl; -import dev.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; - import java.nio.ByteBuffer; +import dev.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDateItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDateItem.java index 845511bfeb..054483ca4f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDateItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDateItem.java @@ -5,13 +5,12 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.time.ZoneOffset; + import dev.metaschema.core.metapath.impl.AbstractMapKey; import dev.metaschema.core.metapath.item.atomic.IDateItem; import dev.metaschema.core.metapath.item.function.ICalendarMapKey; import dev.metaschema.core.metapath.item.function.IMapKey; - -import java.time.ZoneOffset; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDateTimeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDateTimeItem.java index c8c0703df6..aecbe5899f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDateTimeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDateTimeItem.java @@ -5,13 +5,12 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.time.ZoneOffset; + import dev.metaschema.core.metapath.impl.AbstractMapKey; import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; import dev.metaschema.core.metapath.item.function.ICalendarMapKey; import dev.metaschema.core.metapath.item.function.IMapKey; - -import java.time.ZoneOffset; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDecimalItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDecimalItem.java index bcb1194e71..0ce2bf49fb 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDecimalItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDecimalItem.java @@ -5,14 +5,13 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.math.BigDecimal; + import dev.metaschema.core.metapath.impl.AbstractDecimalMapKey; import dev.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; import dev.metaschema.core.metapath.item.atomic.IDecimalItem; import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.util.ObjectUtils; - -import java.math.BigDecimal; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDurationItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDurationItem.java index 8a8ecf8150..817dbbac51 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDurationItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractDurationItem.java @@ -5,14 +5,13 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.time.temporal.TemporalAmount; +import java.util.Comparator; + import dev.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; import dev.metaschema.core.metapath.item.atomic.IDurationItem; import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; - -import java.time.temporal.TemporalAmount; -import java.util.Comparator; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractIPAddressItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractIPAddressItem.java index 58085c5d38..3f80528461 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractIPAddressItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractIPAddressItem.java @@ -10,7 +10,6 @@ import dev.metaschema.core.metapath.item.atomic.IIPAddressItem; import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.metapath.item.function.IOpaqueMapKey; - import edu.umd.cs.findbugs.annotations.NonNull; import inet.ipaddr.IPAddress; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractIntegerItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractIntegerItem.java index 9097b81b61..9981fbb044 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractIntegerItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractIntegerItem.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.item.atomic.impl; -import dev.metaschema.core.datatype.adapter.DecimalAdapter; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import java.math.BigDecimal; import java.math.BigInteger; +import dev.metaschema.core.datatype.adapter.DecimalAdapter; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractMarkupItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractMarkupItem.java index d4373e0132..408fb16e16 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractMarkupItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractMarkupItem.java @@ -10,7 +10,6 @@ import dev.metaschema.core.metapath.item.atomic.IMarkupItem; import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.metapath.item.function.impl.AbstractStringMapKey; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractStringItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractStringItem.java index fe9cdb2321..023f2b0b34 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractStringItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractStringItem.java @@ -5,13 +5,12 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.util.regex.Pattern; + import dev.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.metapath.item.function.impl.AbstractStringMapKey; - -import java.util.regex.Pattern; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractTemporalItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractTemporalItem.java index 4855c17234..ede5c1851f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractTemporalItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractTemporalItem.java @@ -7,7 +7,6 @@ import dev.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; import dev.metaschema.core.metapath.item.atomic.ITemporalItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractTimeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractTimeItem.java index b948e49cf2..d21da96fbf 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractTimeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractTimeItem.java @@ -5,13 +5,12 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.time.ZoneOffset; + import dev.metaschema.core.metapath.impl.AbstractMapKey; import dev.metaschema.core.metapath.item.atomic.ITimeItem; import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.metapath.item.function.ITemporalMapKey; - -import java.time.ZoneOffset; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractUriItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractUriItem.java index fef91f1a3b..01f4dcee0a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractUriItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AbstractUriItem.java @@ -5,14 +5,13 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.net.URI; + import dev.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; import dev.metaschema.core.metapath.item.atomic.IAnyUriItem; import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.metapath.item.function.impl.AbstractStringMapKey; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AnyUriItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AnyUriItemImpl.java index af3cab7fd7..73b80433e1 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AnyUriItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/AnyUriItemImpl.java @@ -5,11 +5,10 @@ package dev.metaschema.core.metapath.item.atomic.impl; -import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import dev.metaschema.core.datatype.adapter.UriAdapter; - import java.net.URI; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.datatype.adapter.UriAdapter; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/Base64BinaryItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/Base64BinaryItemImpl.java index d30fee8c11..3ebfcb1060 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/Base64BinaryItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/Base64BinaryItemImpl.java @@ -5,15 +5,14 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.nio.ByteBuffer; + import dev.metaschema.core.datatype.adapter.Base64Adapter; import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.impl.AbstractMapKey; import dev.metaschema.core.metapath.item.atomic.IBase64BinaryItem; import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.metapath.item.function.IOpaqueMapKey; - -import java.nio.ByteBuffer; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/BooleanItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/BooleanItemImpl.java index 4d42954d3d..defc6540e3 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/BooleanItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/BooleanItemImpl.java @@ -13,7 +13,6 @@ import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.metapath.item.function.IOpaqueMapKey; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateTimeWithTimeZoneItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateTimeWithTimeZoneItemImpl.java index 692c8af814..13f7b0e481 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateTimeWithTimeZoneItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateTimeWithTimeZoneItemImpl.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.time.ZonedDateTime; + import dev.metaschema.core.datatype.adapter.DateTimeWithTZAdapter; import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.item.atomic.IDateTimeWithTimeZoneItem; - -import java.time.ZonedDateTime; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateTimeWithoutTimeZoneItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateTimeWithoutTimeZoneItemImpl.java index 7ddb784868..a3b1209c45 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateTimeWithoutTimeZoneItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateTimeWithoutTimeZoneItemImpl.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.time.ZonedDateTime; + import dev.metaschema.core.datatype.adapter.DateTimeAdapter; import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.datatype.object.AmbiguousDateTime; - -import java.time.ZonedDateTime; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateWithTimeZoneItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateWithTimeZoneItemImpl.java index 5c7de9ae5f..6a899ff4f2 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateWithTimeZoneItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateWithTimeZoneItemImpl.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.time.ZonedDateTime; + import dev.metaschema.core.datatype.adapter.DateWithTZAdapter; import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.item.atomic.IDateWithTimeZoneItem; - -import java.time.ZonedDateTime; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateWithoutTimeZoneItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateWithoutTimeZoneItemImpl.java index eae6c607bd..96e8a4ecba 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateWithoutTimeZoneItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DateWithoutTimeZoneItemImpl.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.time.ZonedDateTime; + import dev.metaschema.core.datatype.adapter.DateAdapter; import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.datatype.object.AmbiguousDate; - -import java.time.ZonedDateTime; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DayTimeDurationItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DayTimeDurationItemImpl.java index 894d33246e..1b3f970d3b 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DayTimeDurationItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DayTimeDurationItemImpl.java @@ -5,6 +5,9 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.time.Duration; +import java.time.ZoneOffset; + import dev.metaschema.core.datatype.adapter.DayTimeAdapter; import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.function.DateTimeFunctionException; @@ -13,10 +16,6 @@ import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.metapath.item.function.IOpaqueMapKey; import dev.metaschema.core.util.ObjectUtils; - -import java.time.Duration; -import java.time.ZoneOffset; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DecimalItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DecimalItemImpl.java index c8d1d8f829..7ee1361c1f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DecimalItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/DecimalItemImpl.java @@ -5,14 +5,13 @@ package dev.metaschema.core.metapath.item.atomic.impl; -import dev.metaschema.core.datatype.adapter.DecimalAdapter; -import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; -import dev.metaschema.core.metapath.item.atomic.IDecimalItem; - import java.math.BigDecimal; import java.math.BigInteger; import java.util.Objects; +import dev.metaschema.core.datatype.adapter.DecimalAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/EmailAddressItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/EmailAddressItemImpl.java index 9173fcbad6..ad797dd20b 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/EmailAddressItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/EmailAddressItemImpl.java @@ -8,7 +8,6 @@ import dev.metaschema.core.datatype.adapter.EmailAddressAdapter; import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.item.atomic.IEmailAddressItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/HexBinaryItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/HexBinaryItem.java index d69d8c22ab..cf676a7edc 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/HexBinaryItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/HexBinaryItem.java @@ -5,15 +5,14 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.nio.ByteBuffer; + import dev.metaschema.core.datatype.adapter.HexBinaryAdapter; import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.impl.AbstractMapKey; import dev.metaschema.core.metapath.item.atomic.IHexBinaryItem; import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.metapath.item.function.IOpaqueMapKey; - -import java.nio.ByteBuffer; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/HostnameItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/HostnameItemImpl.java index c0c3e53416..a92ff1a61a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/HostnameItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/HostnameItemImpl.java @@ -8,7 +8,6 @@ import dev.metaschema.core.datatype.adapter.HostnameAdapter; import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.item.atomic.IHostnameItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IBinaryItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IBinaryItem.java index a5578a9ec3..3a111480b1 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IBinaryItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IBinaryItem.java @@ -5,11 +5,10 @@ package dev.metaschema.core.metapath.item.atomic.impl; -import dev.metaschema.core.datatype.adapter.AbstractBinaryAdapter; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; - import java.nio.ByteBuffer; +import dev.metaschema.core.datatype.adapter.AbstractBinaryAdapter; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IPv4AddressItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IPv4AddressItemImpl.java index 0207745686..82ab3cd78e 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IPv4AddressItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IPv4AddressItemImpl.java @@ -8,7 +8,6 @@ import dev.metaschema.core.datatype.adapter.IPv4AddressAdapter; import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.item.atomic.IIPv4AddressItem; - import edu.umd.cs.findbugs.annotations.NonNull; import inet.ipaddr.ipv4.IPv4Address; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IPv6AddressItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IPv6AddressItemImpl.java index 8cf640f0b0..01d167a8d9 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IPv6AddressItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IPv6AddressItemImpl.java @@ -8,7 +8,6 @@ import dev.metaschema.core.datatype.adapter.IPv6AddressAdapter; import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.item.atomic.IIPv6AddressItem; - import edu.umd.cs.findbugs.annotations.NonNull; import inet.ipaddr.ipv6.IPv6Address; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IntegerItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IntegerItemImpl.java index bdebed010b..b9feeb4a62 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IntegerItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/IntegerItemImpl.java @@ -5,11 +5,10 @@ package dev.metaschema.core.metapath.item.atomic.impl; -import dev.metaschema.core.datatype.adapter.IntegerAdapter; -import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; - import java.math.BigInteger; +import dev.metaschema.core.datatype.adapter.IntegerAdapter; +import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/MarkupLineItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/MarkupLineItemImpl.java index fc205a0cdf..75e31692e9 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/MarkupLineItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/MarkupLineItemImpl.java @@ -9,7 +9,6 @@ import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupLineAdapter; import dev.metaschema.core.metapath.item.atomic.IMarkupLineItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/MarkupMultiLineItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/MarkupMultiLineItemImpl.java index 1052b3e671..020772e4be 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/MarkupMultiLineItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/MarkupMultiLineItemImpl.java @@ -9,7 +9,6 @@ import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.datatype.markup.MarkupMultilineAdapter; import dev.metaschema.core.metapath.item.atomic.IMarkupMultilineItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/NcNameItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/NcNameItemImpl.java index 9da904cf4a..a192a7e070 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/NcNameItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/NcNameItemImpl.java @@ -8,7 +8,6 @@ import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.datatype.adapter.NcNameAdapter; import dev.metaschema.core.metapath.item.atomic.INcNameItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/NonNegativeIntegerItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/NonNegativeIntegerItemImpl.java index 28add01ccb..cba20f50df 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/NonNegativeIntegerItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/NonNegativeIntegerItemImpl.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.math.BigInteger; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; import dev.metaschema.core.metapath.item.atomic.INonNegativeIntegerItem; - -import java.math.BigInteger; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/PositiveIntegerItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/PositiveIntegerItemImpl.java index d1a8ef5aa2..bb5d71c2d3 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/PositiveIntegerItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/PositiveIntegerItemImpl.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.math.BigInteger; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.datatype.adapter.PositiveIntegerAdapter; import dev.metaschema.core.metapath.item.atomic.IPositiveIntegerItem; - -import java.math.BigInteger; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/QNameItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/QNameItemImpl.java index 8d47f20a41..23508db9f4 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/QNameItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/QNameItemImpl.java @@ -14,7 +14,6 @@ import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.metapath.item.function.IOpaqueMapKey; import dev.metaschema.core.qname.IEnhancedQName; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/StringItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/StringItemImpl.java index 4f0710afc6..5c1c8a080e 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/StringItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/StringItemImpl.java @@ -7,7 +7,6 @@ import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.datatype.adapter.StringAdapter; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TimeWithTimeZoneItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TimeWithTimeZoneItemImpl.java index b74273fa47..7ddd5e52a2 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TimeWithTimeZoneItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TimeWithTimeZoneItemImpl.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.time.OffsetTime; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.datatype.adapter.TimeWithTZAdapter; import dev.metaschema.core.metapath.item.atomic.ITimeWithTimeZoneItem; - -import java.time.OffsetTime; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TimeWithoutTimeZoneItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TimeWithoutTimeZoneItemImpl.java index 1302cd1164..687b2ecabb 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TimeWithoutTimeZoneItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TimeWithoutTimeZoneItemImpl.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.time.OffsetTime; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.datatype.adapter.TimeAdapter; import dev.metaschema.core.datatype.object.AmbiguousTime; - -import java.time.OffsetTime; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TokenItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TokenItemImpl.java index bfd5bd2692..325a5201c1 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TokenItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/TokenItemImpl.java @@ -8,7 +8,6 @@ import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.metapath.item.atomic.ITokenItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/UriReferenceItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/UriReferenceItemImpl.java index 82f45d0594..4d54cf326a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/UriReferenceItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/UriReferenceItemImpl.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.net.URI; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.datatype.adapter.UriReferenceAdapter; import dev.metaschema.core.metapath.item.atomic.IUriReferenceItem; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/UuidItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/UuidItemImpl.java index 674a289730..9b0b78407a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/UuidItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/UuidItemImpl.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.util.UUID; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.datatype.adapter.UuidAdapter; import dev.metaschema.core.metapath.item.atomic.AbstractAnyAtomicItem; @@ -13,9 +15,6 @@ import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.metapath.item.function.impl.AbstractStringMapKey; import dev.metaschema.core.util.ObjectUtils; - -import java.util.UUID; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/YearMonthDurationItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/YearMonthDurationItemImpl.java index 41869ec806..dda4bd5b87 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/YearMonthDurationItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/atomic/impl/YearMonthDurationItemImpl.java @@ -5,16 +5,15 @@ package dev.metaschema.core.metapath.item.atomic.impl; +import java.time.Period; +import java.util.Objects; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.datatype.adapter.YearMonthAdapter; import dev.metaschema.core.metapath.impl.AbstractMapKey; import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.metapath.item.function.IOpaqueMapKey; - -import java.time.Period; -import java.util.Objects; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/function/IArrayItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/IArrayItem.java index 3454b1e9e3..fcc4d395c4 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/function/IArrayItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/IArrayItem.java @@ -5,17 +5,6 @@ package dev.metaschema.core.metapath.item.function; -import dev.metaschema.core.metapath.function.IFunction; -import dev.metaschema.core.metapath.item.ICollectionValue; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.IItemVisitor; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import dev.metaschema.core.metapath.item.function.impl.AbstractArrayItem; -import dev.metaschema.core.metapath.item.function.impl.ArrayItemN; -import dev.metaschema.core.metapath.type.IItemType; -import dev.metaschema.core.util.ObjectUtils; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -29,6 +18,16 @@ import java.util.stream.Collector; import java.util.stream.Stream; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.IItemVisitor; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.function.impl.AbstractArrayItem; +import dev.metaschema.core.metapath.item.function.impl.ArrayItemN; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/function/IDecimalMapKey.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/IDecimalMapKey.java index 4229c06a98..4ccbf232d5 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/function/IDecimalMapKey.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/IDecimalMapKey.java @@ -5,10 +5,9 @@ package dev.metaschema.core.metapath.item.function; -import dev.metaschema.core.metapath.item.atomic.IDecimalItem; - import java.math.BigDecimal; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/function/IKeySpecifier.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/IKeySpecifier.java index 6434f655ca..377d0afa33 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/function/IKeySpecifier.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/IKeySpecifier.java @@ -5,13 +5,12 @@ package dev.metaschema.core.metapath.item.function; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.item.ICollectionValue; import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; - -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/function/IMapItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/IMapItem.java index b6252a0d53..9c01c4cd63 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/function/IMapItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/IMapItem.java @@ -5,16 +5,6 @@ package dev.metaschema.core.metapath.item.function; -import dev.metaschema.core.metapath.function.IFunction; -import dev.metaschema.core.metapath.item.ICollectionValue; -import dev.metaschema.core.metapath.item.IItemVisitor; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import dev.metaschema.core.metapath.item.function.impl.AbstractMapItem; -import dev.metaschema.core.metapath.item.function.impl.MapItemN; -import dev.metaschema.core.metapath.type.IItemType; -import dev.metaschema.core.util.ObjectUtils; - import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; @@ -25,6 +15,15 @@ import java.util.function.Supplier; import java.util.stream.Collector; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.metapath.item.ICollectionValue; +import dev.metaschema.core.metapath.item.IItemVisitor; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.function.impl.AbstractMapItem; +import dev.metaschema.core.metapath.item.function.impl.MapItemN; +import dev.metaschema.core.metapath.type.IItemType; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/function/IMapKey.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/IMapKey.java index 5b517b4fb9..07c935e165 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/function/IMapKey.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/IMapKey.java @@ -6,7 +6,6 @@ package dev.metaschema.core.metapath.item.function; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/function/IndexOutOfBoundsArrayMetapathException.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/IndexOutOfBoundsArrayMetapathException.java index 631f9cb2c7..a4296d4f36 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/function/IndexOutOfBoundsArrayMetapathException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/IndexOutOfBoundsArrayMetapathException.java @@ -6,7 +6,6 @@ package dev.metaschema.core.metapath.item.function; import dev.metaschema.core.metapath.item.function.impl.ArrayMetapathException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/function/NegativeLengthArrayMetapathException.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/NegativeLengthArrayMetapathException.java index d1725b2a9c..551ef002cf 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/function/NegativeLengthArrayMetapathException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/NegativeLengthArrayMetapathException.java @@ -6,7 +6,6 @@ package dev.metaschema.core.metapath.item.function; import dev.metaschema.core.metapath.item.function.impl.ArrayMetapathException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractArrayItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractArrayItem.java index 96d911fc30..075365b675 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractArrayItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractArrayItem.java @@ -5,6 +5,11 @@ package dev.metaschema.core.metapath.item.function.impl; +import java.util.Iterator; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.function.FunctionUtils; import dev.metaschema.core.metapath.function.IArgument; @@ -15,12 +20,6 @@ import dev.metaschema.core.metapath.item.function.IArrayItem; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Iterator; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractKeySpecifier.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractKeySpecifier.java index e428711b72..e1cfbc669b 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractKeySpecifier.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractKeySpecifier.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.item.function.impl; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.function.library.ArrayGet; @@ -20,9 +22,6 @@ import dev.metaschema.core.metapath.item.function.IndexOutOfBoundsArrayMetapathException; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.ObjectUtils; - -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractMapItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractMapItem.java index 1983022cae..b646031263 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractMapItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/AbstractMapItem.java @@ -5,6 +5,12 @@ package dev.metaschema.core.metapath.item.function.impl; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.function.FunctionUtils; import dev.metaschema.core.metapath.function.IArgument; @@ -18,13 +24,6 @@ import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ArrayItemN.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ArrayItemN.java index 96d9fffaba..8340ffec1c 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ArrayItemN.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ArrayItemN.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.item.function.impl; +import java.util.List; + import dev.metaschema.core.metapath.item.ICollectionValue; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ArrayMetapathException.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ArrayMetapathException.java index b9c19da738..dc45dc286f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ArrayMetapathException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ArrayMetapathException.java @@ -8,7 +8,6 @@ import dev.metaschema.core.metapath.IErrorCode; import dev.metaschema.core.metapath.function.FunctionMetapathError; import dev.metaschema.core.metapath.item.function.IArrayItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ImmutableCollections.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ImmutableCollections.java index cde8fd6b8c..23aab4af74 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ImmutableCollections.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/ImmutableCollections.java @@ -5,8 +5,6 @@ package dev.metaschema.core.metapath.item.function.impl; -import dev.metaschema.core.util.ObjectUtils; - import java.util.AbstractCollection; import java.util.AbstractMap; import java.util.Collection; @@ -21,6 +19,7 @@ import java.util.function.Predicate; import java.util.stream.Stream; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/MapItemN.java b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/MapItemN.java index 8ebc80a4fa..479ce88dbf 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/MapItemN.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/function/impl/MapItemN.java @@ -5,13 +5,12 @@ package dev.metaschema.core.metapath.item.function.impl; +import java.util.Map; + import dev.metaschema.core.metapath.item.ICollectionValue; import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractDefinitionNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractDefinitionNodeItem.java index a1dc90cba0..280fcd4a7d 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractDefinitionNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractDefinitionNodeItem.java @@ -3,7 +3,6 @@ import dev.metaschema.core.model.IDefinition; import dev.metaschema.core.model.INamedInstance; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractFlagInstanceNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractFlagInstanceNodeItem.java index 452a90b191..b8fef56da3 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractFlagInstanceNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractFlagInstanceNodeItem.java @@ -3,7 +3,6 @@ import dev.metaschema.core.model.IFlagDefinition; import dev.metaschema.core.model.IFlagInstance; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractGlobalDefinitionNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractGlobalDefinitionNodeItem.java index 44a3a86af0..c6bf36f59c 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractGlobalDefinitionNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractGlobalDefinitionNodeItem.java @@ -1,12 +1,11 @@ package dev.metaschema.core.metapath.item.node; +import java.net.URI; + import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.model.IDefinition; import dev.metaschema.core.model.INamedInstance; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractInstanceNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractInstanceNodeItem.java index beb249b995..8dfa5b2389 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractInstanceNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractInstanceNodeItem.java @@ -4,7 +4,6 @@ import dev.metaschema.core.model.IDefinition; import dev.metaschema.core.model.IModelDefinition; import dev.metaschema.core.model.INamedInstance; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractNodeItem.java index 6535bbf8cc..211d4818b2 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractNodeItem.java @@ -2,7 +2,6 @@ package dev.metaschema.core.metapath.item.node; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.Nullable; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractNodeItemFactory.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractNodeItemFactory.java index 8dd41d818e..b5fba93f97 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractNodeItemFactory.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractNodeItemFactory.java @@ -1,6 +1,9 @@ package dev.metaschema.core.metapath.item.node; +import java.net.URI; +import java.util.stream.Stream; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IAssemblyInstance; import dev.metaschema.core.model.IAssemblyInstanceAbsolute; @@ -16,10 +19,6 @@ import dev.metaschema.core.model.INamedModelInstanceAbsolute; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractOrphanedDefinitionNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractOrphanedDefinitionNodeItem.java index 222a1113f4..da9d1b33c1 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractOrphanedDefinitionNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AbstractOrphanedDefinitionNodeItem.java @@ -1,13 +1,12 @@ package dev.metaschema.core.metapath.item.node; +import java.net.URI; + import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.model.IDefinition; import dev.metaschema.core.model.INamedInstance; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyGlobalDefinitionNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyGlobalDefinitionNodeItemImpl.java index cd32221f75..ed07c105a5 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyGlobalDefinitionNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyGlobalDefinitionNodeItemImpl.java @@ -4,7 +4,6 @@ import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IAssemblyInstance; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyInstanceNoValueNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyInstanceNoValueNodeItemImpl.java index 317554d6f1..cd3732ba13 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyInstanceNoValueNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyInstanceNoValueNodeItemImpl.java @@ -4,7 +4,6 @@ import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IAssemblyInstance; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyInstanceNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyInstanceNodeItemImpl.java index 272326f2d8..f38d486696 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyInstanceNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyInstanceNodeItemImpl.java @@ -1,12 +1,11 @@ package dev.metaschema.core.metapath.item.node; +import java.util.stream.Collectors; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IAssemblyInstance; import dev.metaschema.core.util.ObjectUtils; - -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionDataNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionDataNodeItemImpl.java index 490ae1e95d..2e2bf04267 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionDataNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionDataNodeItemImpl.java @@ -1,13 +1,12 @@ package dev.metaschema.core.metapath.item.node; -import dev.metaschema.core.model.IAssemblyDefinition; -import dev.metaschema.core.model.IAssemblyInstance; -import dev.metaschema.core.util.ObjectUtils; - import java.net.URI; import java.util.stream.Collectors; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionNodeItemImpl.java index ab8992132c..46f02aae68 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/AssemblyOrphanedDefinitionNodeItemImpl.java @@ -1,12 +1,11 @@ package dev.metaschema.core.metapath.item.node; +import java.net.URI; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IAssemblyInstance; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/CycledAssemblyInstanceNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/CycledAssemblyInstanceNodeItemImpl.java index 2b90cc6236..1b4a64045a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/CycledAssemblyInstanceNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/CycledAssemblyInstanceNodeItemImpl.java @@ -1,13 +1,12 @@ package dev.metaschema.core.metapath.item.node; -import dev.metaschema.core.model.IAssemblyDefinition; -import dev.metaschema.core.model.IAssemblyInstance; -import dev.metaschema.core.qname.IEnhancedQName; - import java.util.Collection; import java.util.List; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstance; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; class CycledAssemblyInstanceNodeItemImpl diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/DefaultNodeItemFactory.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/DefaultNodeItemFactory.java index 92c6b91078..3b0b13eb20 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/DefaultNodeItemFactory.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/DefaultNodeItemFactory.java @@ -1,6 +1,17 @@ package dev.metaschema.core.metapath.item.node; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.item.node.IFeatureFlagContainerItem.FlagContainer; import dev.metaschema.core.metapath.item.node.IFeatureModelContainerItem.ModelContainer; import dev.metaschema.core.model.IAssemblyInstanceGrouped; @@ -13,18 +24,6 @@ import dev.metaschema.core.model.INamedModelInstanceGrouped; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Function; -import java.util.function.Supplier; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; @SuppressWarnings("PMD.CouplingBetweenObjects") diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/DocumentNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/DocumentNodeItemImpl.java index 667ab3f0e1..a8dc81279a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/DocumentNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/DocumentNodeItemImpl.java @@ -1,13 +1,12 @@ package dev.metaschema.core.metapath.item.node; +import java.net.URI; + import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IResourceLocation; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldGlobalDefinitionNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldGlobalDefinitionNodeItemImpl.java index 15a91bd419..1516275997 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldGlobalDefinitionNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldGlobalDefinitionNodeItemImpl.java @@ -3,7 +3,6 @@ import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IFieldInstance; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldInstanceNoValueNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldInstanceNoValueNodeItemImpl.java index 0116dd64ab..263e35d21a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldInstanceNoValueNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldInstanceNoValueNodeItemImpl.java @@ -4,7 +4,6 @@ import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IFieldInstance; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldInstanceNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldInstanceNodeItemImpl.java index 539eebbb33..6450c63e30 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldInstanceNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldInstanceNodeItemImpl.java @@ -5,7 +5,6 @@ import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IFieldInstance; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldOrphanedDefinitionNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldOrphanedDefinitionNodeItemImpl.java index 902d33b255..d0e45e949f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldOrphanedDefinitionNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/FieldOrphanedDefinitionNodeItemImpl.java @@ -1,11 +1,10 @@ package dev.metaschema.core.metapath.item.node; -import dev.metaschema.core.model.IFieldDefinition; -import dev.metaschema.core.model.IFieldInstance; - import java.net.URI; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstance; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/FlagGlobalDefinitionNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/FlagGlobalDefinitionNodeItemImpl.java index 9d21108dcb..fc7801fd08 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/FlagGlobalDefinitionNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/FlagGlobalDefinitionNodeItemImpl.java @@ -3,7 +3,6 @@ import dev.metaschema.core.model.IFlagDefinition; import dev.metaschema.core.model.IFlagInstance; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/FlagInstanceNoValueNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/FlagInstanceNoValueNodeItemImpl.java index 94b735587d..73138a4a61 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/FlagInstanceNoValueNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/FlagInstanceNoValueNodeItemImpl.java @@ -2,7 +2,6 @@ package dev.metaschema.core.metapath.item.node; import dev.metaschema.core.model.IFlagInstance; - import edu.umd.cs.findbugs.annotations.NonNull; class FlagInstanceNoValueNodeItemImpl diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/FlagInstanceNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/FlagInstanceNodeItemImpl.java index ac82a407a6..7d1b814868 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/FlagInstanceNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/FlagInstanceNodeItemImpl.java @@ -4,7 +4,6 @@ import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.model.IFlagInstance; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/IAssemblyNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IAssemblyNodeItem.java index 1f956f3f22..03c881031f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/IAssemblyNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IAssemblyNodeItem.java @@ -1,6 +1,8 @@ package dev.metaschema.core.metapath.item.node; +import java.net.URI; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.metapath.format.IPathFormatter; @@ -11,9 +13,6 @@ import dev.metaschema.core.metapath.type.IKindTest; import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IAssemblyInstance; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/IAtomicValuedNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IAtomicValuedNodeItem.java index 11e0ab983a..bdb4179b22 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/IAtomicValuedNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IAtomicValuedNodeItem.java @@ -3,7 +3,6 @@ import dev.metaschema.core.metapath.item.atomic.IAtomicValuedItem; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/IDefinitionNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IDefinitionNodeItem.java index a097bcaa4e..e630e1e538 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/IDefinitionNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IDefinitionNodeItem.java @@ -5,7 +5,6 @@ import dev.metaschema.core.model.INamedInstance; import dev.metaschema.core.model.IResourceLocation; import dev.metaschema.core.qname.IEnhancedQName; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/IDocumentBasedNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IDocumentBasedNodeItem.java index 31d944b4cb..e0eec1192f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/IDocumentBasedNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IDocumentBasedNodeItem.java @@ -1,11 +1,10 @@ package dev.metaschema.core.metapath.item.node; -import dev.metaschema.core.metapath.function.InvalidTypeFunctionException; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; - import java.net.URI; +import dev.metaschema.core.metapath.function.InvalidTypeFunctionException; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import edu.umd.cs.findbugs.annotations.Nullable; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/IDocumentNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IDocumentNodeItem.java index 5297a5d98f..86d5ce4f5f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/IDocumentNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IDocumentNodeItem.java @@ -1,14 +1,13 @@ package dev.metaschema.core.metapath.item.node; +import java.net.URI; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.format.IPathFormatter; import dev.metaschema.core.metapath.item.ICollectionValue; import dev.metaschema.core.metapath.type.IItemType; import dev.metaschema.core.metapath.type.IKindTest; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureAtomicValuedItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureAtomicValuedItem.java index 97ba9af11b..dfe551aaa6 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureAtomicValuedItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureAtomicValuedItem.java @@ -4,7 +4,6 @@ import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.atomic.IAtomicValuedItem; import dev.metaschema.core.model.IValuedDefinition; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureChildNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureChildNodeItem.java index 1aeb9aabe8..eaed321379 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureChildNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureChildNodeItem.java @@ -2,7 +2,6 @@ package dev.metaschema.core.metapath.item.node; import dev.metaschema.core.metapath.StaticContext; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureFlagContainerItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureFlagContainerItem.java index 77cb831f74..5b00652a40 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureFlagContainerItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureFlagContainerItem.java @@ -1,14 +1,13 @@ package dev.metaschema.core.metapath.item.node; -import dev.metaschema.core.model.IModelDefinition; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.CollectionUtil; - import java.util.Collection; import java.util.List; import java.util.Map; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureModelContainerItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureModelContainerItem.java index 29f8268f34..2ea2548fcb 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureModelContainerItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureModelContainerItem.java @@ -1,13 +1,12 @@ package dev.metaschema.core.metapath.item.node; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.CollectionUtil; - import java.util.Collection; import java.util.List; import java.util.Map; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureNoDataAtomicValuedItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureNoDataAtomicValuedItem.java index 8488b2017c..397054853f 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureNoDataAtomicValuedItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureNoDataAtomicValuedItem.java @@ -4,7 +4,6 @@ import dev.metaschema.core.metapath.function.InvalidTypeFunctionException; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.atomic.IAtomicValuedItem; - import edu.umd.cs.findbugs.annotations.Nullable; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureNoDataValuedItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureNoDataValuedItem.java index 8be7bb400c..e1cf6b63d1 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureNoDataValuedItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureNoDataValuedItem.java @@ -2,7 +2,6 @@ package dev.metaschema.core.metapath.item.node; import dev.metaschema.core.metapath.item.IItem; - import edu.umd.cs.findbugs.annotations.Nullable; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureRequiredDataItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureRequiredDataItem.java index 37e466fc93..7b496dfce6 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureRequiredDataItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFeatureRequiredDataItem.java @@ -2,7 +2,6 @@ package dev.metaschema.core.metapath.item.node; import dev.metaschema.core.metapath.item.IItem; - import edu.umd.cs.findbugs.annotations.NonNull; interface IFeatureRequiredDataItem extends IItem { diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/IFieldNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFieldNodeItem.java index 8c9b0b1992..dc7193ddf8 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/IFieldNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFieldNodeItem.java @@ -1,6 +1,8 @@ package dev.metaschema.core.metapath.item.node; +import java.net.URI; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.metapath.format.IPathFormatter; @@ -10,9 +12,6 @@ import dev.metaschema.core.metapath.type.IKindTest; import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IFieldInstance; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/IFlagNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFlagNodeItem.java index bacca6d868..9cb694f095 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/IFlagNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IFlagNodeItem.java @@ -1,6 +1,12 @@ package dev.metaschema.core.metapath.item.node; +import java.net.URI; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.metapath.format.IPathFormatter; @@ -11,13 +17,6 @@ import dev.metaschema.core.model.IFlagDefinition; import dev.metaschema.core.model.IFlagInstance; import dev.metaschema.core.qname.IEnhancedQName; - -import java.net.URI; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/IModelNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IModelNodeItem.java index c6d1deeda6..9fd98573c6 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/IModelNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IModelNodeItem.java @@ -1,12 +1,11 @@ package dev.metaschema.core.metapath.item.node; +import java.util.stream.Stream; + import dev.metaschema.core.model.IModelDefinition; import dev.metaschema.core.model.INamedModelInstance; import dev.metaschema.core.util.ObjectUtils; - -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/IModuleNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IModuleNodeItem.java index 9bfd9ccb48..639fc321e2 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/IModuleNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IModuleNodeItem.java @@ -1,15 +1,14 @@ package dev.metaschema.core.metapath.item.node; +import java.net.URI; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.metapath.format.IPathFormatter; import dev.metaschema.core.metapath.item.ICollectionValue; import dev.metaschema.core.metapath.type.IItemType; import dev.metaschema.core.model.IModule; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItem.java index f669f20c60..fb15a9ab00 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItem.java @@ -1,6 +1,11 @@ package dev.metaschema.core.metapath.item.node; +import java.net.URI; +import java.util.Collection; +import java.util.List; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.metapath.format.IPathFormatter; import dev.metaschema.core.metapath.format.IPathSegment; @@ -10,12 +15,6 @@ import dev.metaschema.core.model.IResourceLocation; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; -import java.util.Collection; -import java.util.List; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemFactory.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemFactory.java index 5218b4dbbd..c1fda248b7 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemFactory.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemFactory.java @@ -1,6 +1,8 @@ package dev.metaschema.core.metapath.item.node; +import java.net.URI; + import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IAssemblyInstance; @@ -10,9 +12,6 @@ import dev.metaschema.core.model.IFlagDefinition; import dev.metaschema.core.model.IFlagInstance; import dev.metaschema.core.model.IModule; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemGenerator.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemGenerator.java index 08a4aee10c..04ee851093 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemGenerator.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/INodeItemGenerator.java @@ -1,11 +1,10 @@ package dev.metaschema.core.metapath.item.node; -import dev.metaschema.core.metapath.item.node.IFeatureFlagContainerItem.FlagContainer; -import dev.metaschema.core.metapath.item.node.IFeatureModelContainerItem.ModelContainer; - import java.util.function.Supplier; +import dev.metaschema.core.metapath.item.node.IFeatureFlagContainerItem.FlagContainer; +import dev.metaschema.core.metapath.item.node.IFeatureModelContainerItem.ModelContainer; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/IRootAssemblyNodeItem.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/IRootAssemblyNodeItem.java index ddb8b4f9ca..debb8da510 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/IRootAssemblyNodeItem.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/IRootAssemblyNodeItem.java @@ -5,7 +5,6 @@ import dev.metaschema.core.model.IAssemblyInstance; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/ModuleNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/ModuleNodeItemImpl.java index 6110ea5c69..086c8de1de 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/ModuleNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/ModuleNodeItemImpl.java @@ -1,12 +1,11 @@ package dev.metaschema.core.metapath.item.node; +import java.net.URI; + import dev.metaschema.core.model.IModule; import dev.metaschema.core.model.IResourceLocation; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/NodeComparators.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/NodeComparators.java index 3c692622d7..2e46a33c12 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/NodeComparators.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/NodeComparators.java @@ -1,11 +1,6 @@ package dev.metaschema.core.metapath.item.node; -import dev.metaschema.core.metapath.DynamicContext; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -13,6 +8,10 @@ import java.util.Iterator; import java.util.List; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitor.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitor.java index ec8eca20c0..26fd9a0050 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitor.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitor.java @@ -5,10 +5,6 @@ package dev.metaschema.core.metapath.item.node; -import dev.metaschema.core.model.IAssemblyDefinition; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.util.ObjectUtils; - import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; @@ -16,6 +12,9 @@ import java.util.Set; import java.util.stream.Collectors; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/item/node/RootAssemblyValuedNodeItemImpl.java b/core/src/main/java/dev/metaschema/core/metapath/item/node/RootAssemblyValuedNodeItemImpl.java index 6eef8f0e3c..d529b2bbf9 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/item/node/RootAssemblyValuedNodeItemImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/item/node/RootAssemblyValuedNodeItemImpl.java @@ -1,11 +1,10 @@ package dev.metaschema.core.metapath.item.node; -import dev.metaschema.core.model.IAssemblyDefinition; -import dev.metaschema.core.util.ObjectUtils; - import java.util.stream.Collectors; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/AbstractAtomicOrUnionType.java b/core/src/main/java/dev/metaschema/core/metapath/type/AbstractAtomicOrUnionType.java index a78417665c..638b25a46a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/AbstractAtomicOrUnionType.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/AbstractAtomicOrUnionType.java @@ -7,7 +7,6 @@ import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.type.impl.AbstractItemType; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/DataTypeItemType.java b/core/src/main/java/dev/metaschema/core/metapath/type/DataTypeItemType.java index 927f54907b..5ad6deb60e 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/DataTypeItemType.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/DataTypeItemType.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.type; +import java.util.Objects; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.qname.IEnhancedQName; - -import java.util.Objects; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/IArrayTest.java b/core/src/main/java/dev/metaschema/core/metapath/type/IArrayTest.java index 30774a66c0..2d1d2c6248 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/IArrayTest.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/IArrayTest.java @@ -8,7 +8,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.function.IArrayItem; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/IAtomicOrUnionType.java b/core/src/main/java/dev/metaschema/core/metapath/type/IAtomicOrUnionType.java index 98de3e309c..0b2227e498 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/IAtomicOrUnionType.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/IAtomicOrUnionType.java @@ -11,7 +11,6 @@ import dev.metaschema.core.metapath.type.impl.NonAdapterAtomicItemType; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/IItemType.java b/core/src/main/java/dev/metaschema/core/metapath/type/IItemType.java index 4092853633..f25bae414a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/IItemType.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/IItemType.java @@ -24,7 +24,6 @@ import dev.metaschema.core.metapath.type.impl.MapTestImpl; import dev.metaschema.core.metapath.type.impl.TypeConstants; import dev.metaschema.core.qname.IEnhancedQName; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/IMapTest.java b/core/src/main/java/dev/metaschema/core/metapath/type/IMapTest.java index b3c2c8937f..5dcf93cbcd 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/IMapTest.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/IMapTest.java @@ -8,7 +8,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.function.IMapItem; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/ISequenceType.java b/core/src/main/java/dev/metaschema/core/metapath/type/ISequenceType.java index e58165ea85..850ca4fc65 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/ISequenceType.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/ISequenceType.java @@ -9,7 +9,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.type.impl.SequenceTypeImpl; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/InvalidTypeMetapathException.java b/core/src/main/java/dev/metaschema/core/metapath/type/InvalidTypeMetapathException.java index 4de088a863..f469bdc90b 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/InvalidTypeMetapathException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/InvalidTypeMetapathException.java @@ -6,7 +6,6 @@ package dev.metaschema.core.metapath.type; import dev.metaschema.core.metapath.item.IItem; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/Occurrence.java b/core/src/main/java/dev/metaschema/core/metapath/type/Occurrence.java index 37c5946e40..3ed8ff1f92 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/Occurrence.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/Occurrence.java @@ -5,11 +5,10 @@ package dev.metaschema.core.metapath.type; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.ISequence; - import java.util.Objects; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/TypeMetapathException.java b/core/src/main/java/dev/metaschema/core/metapath/type/TypeMetapathException.java index 017cd2b705..e55fa31cb8 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/TypeMetapathException.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/TypeMetapathException.java @@ -7,7 +7,6 @@ import dev.metaschema.core.metapath.IErrorCode; import dev.metaschema.core.metapath.MetapathException; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/impl/AbstractDefinitionTest.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AbstractDefinitionTest.java index 6fab78b341..5dbfbead34 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/impl/AbstractDefinitionTest.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AbstractDefinitionTest.java @@ -11,7 +11,6 @@ import dev.metaschema.core.metapath.type.IKindTest; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/impl/AbstractItemType.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AbstractItemType.java index e1540bb119..81cc4a86d3 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/impl/AbstractItemType.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AbstractItemType.java @@ -7,7 +7,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.type.IItemType; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyFunctionItemType.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyFunctionItemType.java index 89e258ec3a..f118774ff4 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyFunctionItemType.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyFunctionItemType.java @@ -9,7 +9,6 @@ import dev.metaschema.core.metapath.item.function.IArrayItem; import dev.metaschema.core.metapath.item.function.IMapItem; import dev.metaschema.core.metapath.type.IItemType; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyItemType.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyItemType.java index 721b39e0b5..58aeefee0a 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyItemType.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyItemType.java @@ -7,7 +7,6 @@ import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.type.IItemType; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyKindTest.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyKindTest.java index 3babee81e5..bf23201bb0 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyKindTest.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/AnyKindTest.java @@ -13,7 +13,6 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.metapath.type.IKindTest; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/impl/ArrayTestImpl.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/ArrayTestImpl.java index 6177f5af61..8190f10bc6 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/impl/ArrayTestImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/ArrayTestImpl.java @@ -8,7 +8,6 @@ import dev.metaschema.core.metapath.item.function.IArrayItem; import dev.metaschema.core.metapath.type.IArrayTest; import dev.metaschema.core.metapath.type.ISequenceType; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/impl/DynamicTypeSupport.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/DynamicTypeSupport.java index 5b6d60e5ed..2ac881cead 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/impl/DynamicTypeSupport.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/DynamicTypeSupport.java @@ -17,7 +17,6 @@ import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IFlagDefinition; import dev.metaschema.core.qname.IEnhancedQName; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindAssemblyTestImpl.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindAssemblyTestImpl.java index 2a789d1d42..0b5dc3ec20 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindAssemblyTestImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindAssemblyTestImpl.java @@ -8,7 +8,6 @@ import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; import dev.metaschema.core.qname.IEnhancedQName; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindDocumentTestImpl.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindDocumentTestImpl.java index 7aa5876563..c45017c0fe 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindDocumentTestImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindDocumentTestImpl.java @@ -11,7 +11,6 @@ import dev.metaschema.core.metapath.item.node.IRootAssemblyNodeItem; import dev.metaschema.core.metapath.type.IKindTest; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindFieldTestImpl.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindFieldTestImpl.java index 487005db6e..f00f5a2734 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindFieldTestImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindFieldTestImpl.java @@ -8,7 +8,6 @@ import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.metapath.item.node.IFieldNodeItem; import dev.metaschema.core.qname.IEnhancedQName; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindFlagTestImpl.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindFlagTestImpl.java index ff48cd553d..5d74681210 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindFlagTestImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/KindFlagTestImpl.java @@ -8,7 +8,6 @@ import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.metapath.item.node.IFlagNodeItem; import dev.metaschema.core.qname.IEnhancedQName; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/impl/MapTestImpl.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/MapTestImpl.java index f17aabe4fc..abb0335605 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/impl/MapTestImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/MapTestImpl.java @@ -9,7 +9,6 @@ import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.metapath.type.IMapTest; import dev.metaschema.core.metapath.type.ISequenceType; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/impl/NonAdapterAtomicItemType.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/NonAdapterAtomicItemType.java index f967cd7323..ab7a5030c9 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/impl/NonAdapterAtomicItemType.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/NonAdapterAtomicItemType.java @@ -5,12 +5,11 @@ package dev.metaschema.core.metapath.type.impl; +import java.util.Objects; + import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.type.AbstractAtomicOrUnionType; import dev.metaschema.core.qname.IEnhancedQName; - -import java.util.Objects; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/impl/SequenceTypeImpl.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/SequenceTypeImpl.java index 16afdcd40e..bfd6f3d299 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/impl/SequenceTypeImpl.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/SequenceTypeImpl.java @@ -5,6 +5,8 @@ package dev.metaschema.core.metapath.type.impl; +import java.util.Objects; + import dev.metaschema.core.metapath.item.ICollectionValue; import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; @@ -12,9 +14,6 @@ import dev.metaschema.core.metapath.type.ISequenceType; import dev.metaschema.core.metapath.type.Occurrence; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Objects; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/metapath/type/impl/TypeConstants.java b/core/src/main/java/dev/metaschema/core/metapath/type/impl/TypeConstants.java index 69a9d8ab60..87b35c1e44 100644 --- a/core/src/main/java/dev/metaschema/core/metapath/type/impl/TypeConstants.java +++ b/core/src/main/java/dev/metaschema/core/metapath/type/impl/TypeConstants.java @@ -12,7 +12,6 @@ import dev.metaschema.core.metapath.item.atomic.INumericItem; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.qname.EQNameFactory; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/AbstractAssemblyInstance.java b/core/src/main/java/dev/metaschema/core/model/AbstractAssemblyInstance.java index 82a30fed5f..ab2d6749bf 100644 --- a/core/src/main/java/dev/metaschema/core/model/AbstractAssemblyInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractAssemblyInstance.java @@ -7,7 +7,6 @@ import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/AbstractFieldInstance.java b/core/src/main/java/dev/metaschema/core/model/AbstractFieldInstance.java index e43def7e2e..12ce70939b 100644 --- a/core/src/main/java/dev/metaschema/core/model/AbstractFieldInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractFieldInstance.java @@ -7,7 +7,6 @@ import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/AbstractFlagInstance.java b/core/src/main/java/dev/metaschema/core/model/AbstractFlagInstance.java index 8906ba1864..61176240c5 100644 --- a/core/src/main/java/dev/metaschema/core/model/AbstractFlagInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractFlagInstance.java @@ -8,7 +8,6 @@ import dev.metaschema.core.model.util.ModuleUtils; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/AbstractGlobalAssemblyDefinition.java b/core/src/main/java/dev/metaschema/core/model/AbstractGlobalAssemblyDefinition.java index db1eb6536c..bc77883628 100644 --- a/core/src/main/java/dev/metaschema/core/model/AbstractGlobalAssemblyDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractGlobalAssemblyDefinition.java @@ -6,7 +6,6 @@ package dev.metaschema.core.model; import dev.metaschema.core.model.util.ModuleUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/AbstractGlobalDefinition.java b/core/src/main/java/dev/metaschema/core/model/AbstractGlobalDefinition.java index 7272fce9c7..e3b7ed058d 100644 --- a/core/src/main/java/dev/metaschema/core/model/AbstractGlobalDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractGlobalDefinition.java @@ -7,7 +7,6 @@ import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/model/AbstractGlobalFieldDefinition.java b/core/src/main/java/dev/metaschema/core/model/AbstractGlobalFieldDefinition.java index 4089a2f3c5..fe2332cdb7 100644 --- a/core/src/main/java/dev/metaschema/core/model/AbstractGlobalFieldDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractGlobalFieldDefinition.java @@ -6,7 +6,6 @@ package dev.metaschema.core.model; import dev.metaschema.core.model.util.ModuleUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/AbstractGlobalFlagDefinition.java b/core/src/main/java/dev/metaschema/core/model/AbstractGlobalFlagDefinition.java index 39c2fef081..ed3fe42afe 100644 --- a/core/src/main/java/dev/metaschema/core/model/AbstractGlobalFlagDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractGlobalFlagDefinition.java @@ -6,7 +6,6 @@ package dev.metaschema.core.model; import dev.metaschema.core.model.util.ModuleUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/AbstractInlineAssemblyDefinition.java b/core/src/main/java/dev/metaschema/core/model/AbstractInlineAssemblyDefinition.java index 83bf80f018..db51eb0c55 100644 --- a/core/src/main/java/dev/metaschema/core/model/AbstractInlineAssemblyDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractInlineAssemblyDefinition.java @@ -6,7 +6,6 @@ package dev.metaschema.core.model; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/AbstractInlineFieldDefinition.java b/core/src/main/java/dev/metaschema/core/model/AbstractInlineFieldDefinition.java index c6cf7d2659..1d5aec7da3 100644 --- a/core/src/main/java/dev/metaschema/core/model/AbstractInlineFieldDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractInlineFieldDefinition.java @@ -6,7 +6,6 @@ package dev.metaschema.core.model; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/AbstractInlineFlagDefinition.java b/core/src/main/java/dev/metaschema/core/model/AbstractInlineFlagDefinition.java index 480f23e99b..ed4bfc6607 100644 --- a/core/src/main/java/dev/metaschema/core/model/AbstractInlineFlagDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractInlineFlagDefinition.java @@ -6,7 +6,6 @@ package dev.metaschema.core.model; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/AbstractLoader.java b/core/src/main/java/dev/metaschema/core/model/AbstractLoader.java index 3f790b200c..ea166a3d8a 100644 --- a/core/src/main/java/dev/metaschema/core/model/AbstractLoader.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractLoader.java @@ -7,9 +7,6 @@ import com.github.benmanes.caffeine.cache.Caffeine; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -26,6 +23,8 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/AbstractModelElementVisitor.java b/core/src/main/java/dev/metaschema/core/model/AbstractModelElementVisitor.java index 28c265e474..fa46e3a805 100644 --- a/core/src/main/java/dev/metaschema/core/model/AbstractModelElementVisitor.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractModelElementVisitor.java @@ -6,7 +6,6 @@ package dev.metaschema.core.model; import dev.metaschema.core.metapath.item.node.AbstractNodeItemVisitor; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/AbstractModule.java b/core/src/main/java/dev/metaschema/core/model/AbstractModule.java index a0fd352e28..2a411bc791 100644 --- a/core/src/main/java/dev/metaschema/core/model/AbstractModule.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractModule.java @@ -5,11 +5,6 @@ package dev.metaschema.core.model; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.CustomCollectors; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -22,6 +17,10 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/model/AbstractModuleLoader.java b/core/src/main/java/dev/metaschema/core/model/AbstractModuleLoader.java index 1a077dde00..9a411e87a5 100644 --- a/core/src/main/java/dev/metaschema/core/model/AbstractModuleLoader.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractModuleLoader.java @@ -5,8 +5,6 @@ package dev.metaschema.core.model; -import dev.metaschema.core.util.ObjectUtils; - import java.io.IOException; import java.net.URI; import java.util.ArrayList; @@ -17,6 +15,7 @@ import java.util.List; import java.util.Map; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/AbstractNamedInstance.java b/core/src/main/java/dev/metaschema/core/model/AbstractNamedInstance.java index 71048678e2..0d1903c31e 100644 --- a/core/src/main/java/dev/metaschema/core/model/AbstractNamedInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractNamedInstance.java @@ -8,7 +8,6 @@ import dev.metaschema.core.model.AbstractGlobalDefinition.NameInitializer; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/model/AbstractNamedModelInstance.java b/core/src/main/java/dev/metaschema/core/model/AbstractNamedModelInstance.java index 038aaa1039..8124abd5f0 100644 --- a/core/src/main/java/dev/metaschema/core/model/AbstractNamedModelInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/AbstractNamedModelInstance.java @@ -7,7 +7,6 @@ import dev.metaschema.core.model.util.ModuleUtils; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/DefaultAssemblyModelBuilder.java b/core/src/main/java/dev/metaschema/core/model/DefaultAssemblyModelBuilder.java index ca192792fa..68ea00392b 100644 --- a/core/src/main/java/dev/metaschema/core/model/DefaultAssemblyModelBuilder.java +++ b/core/src/main/java/dev/metaschema/core/model/DefaultAssemblyModelBuilder.java @@ -5,14 +5,13 @@ package dev.metaschema.core.model; -import dev.metaschema.core.model.impl.DefaultContainerModelAssemblySupport; -import dev.metaschema.core.util.CollectionUtil; - import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import dev.metaschema.core.model.impl.DefaultContainerModelAssemblySupport; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/DefaultChoiceGroupModelBuilder.java b/core/src/main/java/dev/metaschema/core/model/DefaultChoiceGroupModelBuilder.java index c3d31b1314..66e853f1eb 100644 --- a/core/src/main/java/dev/metaschema/core/model/DefaultChoiceGroupModelBuilder.java +++ b/core/src/main/java/dev/metaschema/core/model/DefaultChoiceGroupModelBuilder.java @@ -5,12 +5,11 @@ package dev.metaschema.core.model; -import dev.metaschema.core.model.impl.DefaultContainerModelChoiceGroupSupport; -import dev.metaschema.core.util.CollectionUtil; - import java.util.LinkedHashMap; import java.util.Map; +import dev.metaschema.core.model.impl.DefaultContainerModelChoiceGroupSupport; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/DefaultChoiceModelBuilder.java b/core/src/main/java/dev/metaschema/core/model/DefaultChoiceModelBuilder.java index c6cf0cb876..55db0481b5 100644 --- a/core/src/main/java/dev/metaschema/core/model/DefaultChoiceModelBuilder.java +++ b/core/src/main/java/dev/metaschema/core/model/DefaultChoiceModelBuilder.java @@ -5,12 +5,11 @@ package dev.metaschema.core.model; -import dev.metaschema.core.model.impl.DefaultContainerModelSupport; -import dev.metaschema.core.util.CollectionUtil; - import java.util.LinkedList; import java.util.List; +import dev.metaschema.core.model.impl.DefaultContainerModelSupport; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/FlagContainerBuilder.java b/core/src/main/java/dev/metaschema/core/model/FlagContainerBuilder.java index 9920e66a32..c410e0aea7 100644 --- a/core/src/main/java/dev/metaschema/core/model/FlagContainerBuilder.java +++ b/core/src/main/java/dev/metaschema/core/model/FlagContainerBuilder.java @@ -5,12 +5,6 @@ package dev.metaschema.core.model; -import dev.metaschema.core.model.impl.DefaultContainerFlagSupport; -import dev.metaschema.core.qname.EQNameFactory; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.CustomCollectors; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -19,6 +13,11 @@ import java.util.List; import java.util.Map; +import dev.metaschema.core.model.impl.DefaultContainerFlagSupport; +import dev.metaschema.core.qname.EQNameFactory; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/IAssemblyDefinition.java b/core/src/main/java/dev/metaschema/core/model/IAssemblyDefinition.java index 1d97786752..3cf70960ca 100644 --- a/core/src/main/java/dev/metaschema/core/model/IAssemblyDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/IAssemblyDefinition.java @@ -9,7 +9,6 @@ import dev.metaschema.core.model.constraint.IFeatureModelConstrained; import dev.metaschema.core.model.util.ModuleUtils; import dev.metaschema.core.qname.IEnhancedQName; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/IAttributable.java b/core/src/main/java/dev/metaschema/core/model/IAttributable.java index 77a9c0d5f7..cf3cf9ef62 100644 --- a/core/src/main/java/dev/metaschema/core/model/IAttributable.java +++ b/core/src/main/java/dev/metaschema/core/model/IAttributable.java @@ -5,13 +5,12 @@ package dev.metaschema.core.model; -import dev.metaschema.core.MetaschemaConstants; -import dev.metaschema.core.util.CollectionUtil; - import java.util.Map; import java.util.Objects; import java.util.Set; +import dev.metaschema.core.MetaschemaConstants; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/IChoiceGroupInstance.java b/core/src/main/java/dev/metaschema/core/model/IChoiceGroupInstance.java index ca89f5cb79..eb26b9e6b5 100644 --- a/core/src/main/java/dev/metaschema/core/model/IChoiceGroupInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/IChoiceGroupInstance.java @@ -5,11 +5,10 @@ package dev.metaschema.core.model; -import dev.metaschema.core.datatype.markup.MarkupMultiline; -import dev.metaschema.core.util.ObjectUtils; - import java.util.Locale; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/IChoiceInstance.java b/core/src/main/java/dev/metaschema/core/model/IChoiceInstance.java index 9ab6084c0c..b0663e552e 100644 --- a/core/src/main/java/dev/metaschema/core/model/IChoiceInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/IChoiceInstance.java @@ -5,10 +5,9 @@ package dev.metaschema.core.model; -import dev.metaschema.core.qname.IEnhancedQName; - import java.util.Locale; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/IConstraintLoader.java b/core/src/main/java/dev/metaschema/core/model/IConstraintLoader.java index 3d34814a20..e64cc47d49 100644 --- a/core/src/main/java/dev/metaschema/core/model/IConstraintLoader.java +++ b/core/src/main/java/dev/metaschema/core/model/IConstraintLoader.java @@ -5,10 +5,10 @@ package dev.metaschema.core.model; -import dev.metaschema.core.model.constraint.IConstraintSet; - import java.util.List; +import dev.metaschema.core.model.constraint.IConstraintSet; + /** * Provides loading capabilities for Metaschema constraint sets. *

diff --git a/core/src/main/java/dev/metaschema/core/model/IContainerFlagSupport.java b/core/src/main/java/dev/metaschema/core/model/IContainerFlagSupport.java index 2da579cd02..ad5ddc4d8a 100644 --- a/core/src/main/java/dev/metaschema/core/model/IContainerFlagSupport.java +++ b/core/src/main/java/dev/metaschema/core/model/IContainerFlagSupport.java @@ -5,10 +5,9 @@ package dev.metaschema.core.model; -import dev.metaschema.core.model.impl.EmptyFlagContainer; - import java.util.Map; +import dev.metaschema.core.model.impl.EmptyFlagContainer; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/IContainerModelAssemblySupport.java b/core/src/main/java/dev/metaschema/core/model/IContainerModelAssemblySupport.java index b98ff297b7..487837b7bb 100644 --- a/core/src/main/java/dev/metaschema/core/model/IContainerModelAssemblySupport.java +++ b/core/src/main/java/dev/metaschema/core/model/IContainerModelAssemblySupport.java @@ -5,11 +5,10 @@ package dev.metaschema.core.model; -import dev.metaschema.core.model.impl.DefaultContainerModelAssemblySupport; - import java.util.List; import java.util.Map; +import dev.metaschema.core.model.impl.DefaultContainerModelAssemblySupport; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/IContainerModelSupport.java b/core/src/main/java/dev/metaschema/core/model/IContainerModelSupport.java index d2ac7a1d33..b1cbe905b3 100644 --- a/core/src/main/java/dev/metaschema/core/model/IContainerModelSupport.java +++ b/core/src/main/java/dev/metaschema/core/model/IContainerModelSupport.java @@ -5,11 +5,10 @@ package dev.metaschema.core.model; -import dev.metaschema.core.model.impl.DefaultContainerModelSupport; - import java.util.Collection; import java.util.Map; +import dev.metaschema.core.model.impl.DefaultContainerModelSupport; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/IDefinition.java b/core/src/main/java/dev/metaschema/core/model/IDefinition.java index fbff05f9ca..8cd848f4e3 100644 --- a/core/src/main/java/dev/metaschema/core/model/IDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/IDefinition.java @@ -5,11 +5,10 @@ package dev.metaschema.core.model; -import dev.metaschema.core.model.constraint.IFeatureValueConstrained; -import dev.metaschema.core.qname.IEnhancedQName; - import java.util.Locale; +import dev.metaschema.core.model.constraint.IFeatureValueConstrained; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/IDescribable.java b/core/src/main/java/dev/metaschema/core/model/IDescribable.java index 3b9667e32f..fc7802af6b 100644 --- a/core/src/main/java/dev/metaschema/core/model/IDescribable.java +++ b/core/src/main/java/dev/metaschema/core/model/IDescribable.java @@ -6,7 +6,6 @@ package dev.metaschema.core.model; import dev.metaschema.core.datatype.markup.MarkupLine; - import edu.umd.cs.findbugs.annotations.Nullable; /** diff --git a/core/src/main/java/dev/metaschema/core/model/IFeatureContainerFlag.java b/core/src/main/java/dev/metaschema/core/model/IFeatureContainerFlag.java index f4252c9f71..88ee164883 100644 --- a/core/src/main/java/dev/metaschema/core/model/IFeatureContainerFlag.java +++ b/core/src/main/java/dev/metaschema/core/model/IFeatureContainerFlag.java @@ -5,10 +5,9 @@ package dev.metaschema.core.model; -import dev.metaschema.core.util.ObjectUtils; - import java.util.Collection; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/IFeatureDefinitionInstanceInlined.java b/core/src/main/java/dev/metaschema/core/model/IFeatureDefinitionInstanceInlined.java index f0429b0919..39dfb3604a 100644 --- a/core/src/main/java/dev/metaschema/core/model/IFeatureDefinitionInstanceInlined.java +++ b/core/src/main/java/dev/metaschema/core/model/IFeatureDefinitionInstanceInlined.java @@ -5,12 +5,11 @@ package dev.metaschema.core.model; +import java.util.Locale; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Locale; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/IFeatureDefinitionReferenceInstance.java b/core/src/main/java/dev/metaschema/core/model/IFeatureDefinitionReferenceInstance.java index 679a914fbc..a4b7e10c43 100644 --- a/core/src/main/java/dev/metaschema/core/model/IFeatureDefinitionReferenceInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/IFeatureDefinitionReferenceInstance.java @@ -6,7 +6,6 @@ package dev.metaschema.core.model; import dev.metaschema.core.datatype.markup.MarkupLine; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/IGroupable.java b/core/src/main/java/dev/metaschema/core/model/IGroupable.java index 195fa0d891..5b7dcdf21a 100644 --- a/core/src/main/java/dev/metaschema/core/model/IGroupable.java +++ b/core/src/main/java/dev/metaschema/core/model/IGroupable.java @@ -5,12 +5,11 @@ package dev.metaschema.core.model; +import java.util.Collection; + import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Collection; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/ILoader.java b/core/src/main/java/dev/metaschema/core/model/ILoader.java index 04409bb7a5..74d8d05d27 100644 --- a/core/src/main/java/dev/metaschema/core/model/ILoader.java +++ b/core/src/main/java/dev/metaschema/core/model/ILoader.java @@ -5,8 +5,6 @@ package dev.metaschema.core.model; -import dev.metaschema.core.util.ObjectUtils; - import java.io.File; import java.io.IOException; import java.net.URI; @@ -14,6 +12,7 @@ import java.nio.file.Path; import java.util.Collection; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/IMetapathQueryable.java b/core/src/main/java/dev/metaschema/core/model/IMetapathQueryable.java index 155b827f96..3066b222d0 100644 --- a/core/src/main/java/dev/metaschema/core/model/IMetapathQueryable.java +++ b/core/src/main/java/dev/metaschema/core/model/IMetapathQueryable.java @@ -6,7 +6,6 @@ package dev.metaschema.core.model; import dev.metaschema.core.metapath.item.node.INodeItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/IModelElement.java b/core/src/main/java/dev/metaschema/core/model/IModelElement.java index 8abc4fec18..a05a0d1f04 100644 --- a/core/src/main/java/dev/metaschema/core/model/IModelElement.java +++ b/core/src/main/java/dev/metaschema/core/model/IModelElement.java @@ -6,7 +6,6 @@ package dev.metaschema.core.model; import dev.metaschema.core.datatype.markup.MarkupMultiline; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/IModule.java b/core/src/main/java/dev/metaschema/core/model/IModule.java index 8ce34fa20a..6a3dc8c680 100644 --- a/core/src/main/java/dev/metaschema/core/model/IModule.java +++ b/core/src/main/java/dev/metaschema/core/model/IModule.java @@ -5,16 +5,15 @@ package dev.metaschema.core.model; -import dev.metaschema.core.datatype.markup.MarkupLine; -import dev.metaschema.core.datatype.markup.MarkupMultiline; -import dev.metaschema.core.metapath.StaticContext; -import dev.metaschema.core.qname.IEnhancedQName; - import java.net.URI; import java.util.Collection; import java.util.List; import java.util.Map; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/IModuleExtended.java b/core/src/main/java/dev/metaschema/core/model/IModuleExtended.java index 818f4089f4..7df7654021 100644 --- a/core/src/main/java/dev/metaschema/core/model/IModuleExtended.java +++ b/core/src/main/java/dev/metaschema/core/model/IModuleExtended.java @@ -5,15 +5,14 @@ package dev.metaschema.core.model; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import java.util.Collection; import java.util.List; import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/INamed.java b/core/src/main/java/dev/metaschema/core/model/INamed.java index 5c2097bd64..3ba242f3a4 100644 --- a/core/src/main/java/dev/metaschema/core/model/INamed.java +++ b/core/src/main/java/dev/metaschema/core/model/INamed.java @@ -5,10 +5,9 @@ package dev.metaschema.core.model; -import dev.metaschema.core.qname.IEnhancedQName; - import javax.xml.XMLConstants; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/INamedInstance.java b/core/src/main/java/dev/metaschema/core/model/INamedInstance.java index 05b80c6b0f..2c3da864a0 100644 --- a/core/src/main/java/dev/metaschema/core/model/INamedInstance.java +++ b/core/src/main/java/dev/metaschema/core/model/INamedInstance.java @@ -6,7 +6,6 @@ package dev.metaschema.core.model; import dev.metaschema.core.qname.IEnhancedQName; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/INamedModelInstanceAbsolute.java b/core/src/main/java/dev/metaschema/core/model/INamedModelInstanceAbsolute.java index a5f24798f7..e0e89fda1d 100644 --- a/core/src/main/java/dev/metaschema/core/model/INamedModelInstanceAbsolute.java +++ b/core/src/main/java/dev/metaschema/core/model/INamedModelInstanceAbsolute.java @@ -6,7 +6,6 @@ package dev.metaschema.core.model; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/INamedModelInstanceGrouped.java b/core/src/main/java/dev/metaschema/core/model/INamedModelInstanceGrouped.java index 7e08752a9c..18ac803ad6 100644 --- a/core/src/main/java/dev/metaschema/core/model/INamedModelInstanceGrouped.java +++ b/core/src/main/java/dev/metaschema/core/model/INamedModelInstanceGrouped.java @@ -7,7 +7,6 @@ import dev.metaschema.core.model.util.ModuleUtils; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/ISource.java b/core/src/main/java/dev/metaschema/core/model/ISource.java index a7700c23ed..6f87bc9942 100644 --- a/core/src/main/java/dev/metaschema/core/model/ISource.java +++ b/core/src/main/java/dev/metaschema/core/model/ISource.java @@ -5,13 +5,12 @@ package dev.metaschema.core.model; +import java.net.URI; + import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.model.constraint.impl.InternalModelSource; import dev.metaschema.core.model.constraint.impl.StaticContextSource; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/IValuedDefinition.java b/core/src/main/java/dev/metaschema/core/model/IValuedDefinition.java index ca9700a486..9d6bfeb25e 100644 --- a/core/src/main/java/dev/metaschema/core/model/IValuedDefinition.java +++ b/core/src/main/java/dev/metaschema/core/model/IValuedDefinition.java @@ -6,7 +6,6 @@ package dev.metaschema.core.model; import dev.metaschema.core.datatype.IDataTypeAdapter; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/MetaschemaModelConstants.java b/core/src/main/java/dev/metaschema/core/model/MetaschemaModelConstants.java index 334bc924ca..4aefc5367b 100644 --- a/core/src/main/java/dev/metaschema/core/model/MetaschemaModelConstants.java +++ b/core/src/main/java/dev/metaschema/core/model/MetaschemaModelConstants.java @@ -15,7 +15,6 @@ import dev.metaschema.core.model.constraint.IReportConstraint; import dev.metaschema.core.model.constraint.IUniqueConstraint; import dev.metaschema.core.qname.IEnhancedQName; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/UsedDefinitionModelWalker.java b/core/src/main/java/dev/metaschema/core/model/UsedDefinitionModelWalker.java index 38ecd35ca5..82b77f27d7 100644 --- a/core/src/main/java/dev/metaschema/core/model/UsedDefinitionModelWalker.java +++ b/core/src/main/java/dev/metaschema/core/model/UsedDefinitionModelWalker.java @@ -5,13 +5,12 @@ package dev.metaschema.core.model; -import dev.metaschema.core.util.CollectionUtil; - import java.util.Collection; import java.util.HashSet; import java.util.Set; import java.util.function.Function; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintBuilder.java b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintBuilder.java index b8c1382dd0..ca1cf24ec5 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintBuilder.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintBuilder.java @@ -5,6 +5,11 @@ package dev.metaschema.core.model.constraint; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.IMetapathExpression; @@ -13,12 +18,6 @@ import dev.metaschema.core.model.constraint.IConstraint.Level; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintSet.java b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintSet.java index a650480f4b..d497210c29 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintSet.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintSet.java @@ -6,7 +6,6 @@ package dev.metaschema.core.model.constraint; import dev.metaschema.core.model.ISource; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintValidationHandler.java b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintValidationHandler.java index 22b74b1dc9..f4ab0a69cb 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintValidationHandler.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractConstraintValidationHandler.java @@ -5,6 +5,11 @@ package dev.metaschema.core.model.constraint; +import java.util.List; +import java.util.Objects; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.format.IPathFormatter; @@ -12,12 +17,6 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.util.CustomCollectors; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.Objects; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/AbstractKeyConstraintBuilder.java b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractKeyConstraintBuilder.java index 410348a320..d15c6a2b00 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/AbstractKeyConstraintBuilder.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractKeyConstraintBuilder.java @@ -5,11 +5,10 @@ package dev.metaschema.core.model.constraint; -import dev.metaschema.core.util.CollectionUtil; - import java.util.LinkedList; import java.util.List; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/AbstractTargetedConstraints.java b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractTargetedConstraints.java index 9ab3c9e583..c83773df1a 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/AbstractTargetedConstraints.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/AbstractTargetedConstraints.java @@ -5,6 +5,10 @@ package dev.metaschema.core.model.constraint; +import java.util.List; +import java.util.Locale; +import java.util.function.Supplier; + import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IDefinition; @@ -12,11 +16,6 @@ import dev.metaschema.core.model.IFlagDefinition; import dev.metaschema.core.model.ISource; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.Locale; -import java.util.function.Supplier; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/AssemblyConstraintSet.java b/core/src/main/java/dev/metaschema/core/model/constraint/AssemblyConstraintSet.java index 242e18f0b8..f6a6b529d2 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/AssemblyConstraintSet.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/AssemblyConstraintSet.java @@ -5,13 +5,12 @@ package dev.metaschema.core.model.constraint; -import dev.metaschema.core.model.ISource; -import dev.metaschema.core.util.CollectionUtil; - import java.util.LinkedList; import java.util.List; import java.util.concurrent.locks.Lock; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/AssemblyTargetedConstraints.java b/core/src/main/java/dev/metaschema/core/model/constraint/AssemblyTargetedConstraints.java index fe3aa3a4f9..f99a0e6a37 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/AssemblyTargetedConstraints.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/AssemblyTargetedConstraints.java @@ -5,15 +5,14 @@ package dev.metaschema.core.model.constraint; +import java.util.List; +import java.util.function.Supplier; + import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IFlagDefinition; import dev.metaschema.core.model.ISource; - -import java.util.List; -import java.util.function.Supplier; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/ConstraintValidationFinding.java b/core/src/main/java/dev/metaschema/core/model/constraint/ConstraintValidationFinding.java index bbb6996fe4..395cac1701 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/ConstraintValidationFinding.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ConstraintValidationFinding.java @@ -5,17 +5,16 @@ package dev.metaschema.core.model.constraint; +import java.net.URI; +import java.util.Comparator; +import java.util.List; + import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.model.IResourceLocation; import dev.metaschema.core.model.constraint.IConstraint.Level; import dev.metaschema.core.model.validation.IValidationFinding; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; -import java.util.Comparator; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/DefaultConstraintValidator.java b/core/src/main/java/dev/metaschema/core/model/constraint/DefaultConstraintValidator.java index cc815e764b..aac496120a 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/DefaultConstraintValidator.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/DefaultConstraintValidator.java @@ -5,6 +5,24 @@ package dev.metaschema.core.model.constraint; +import org.apache.commons.lang3.tuple.Pair; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.eclipse.jdt.annotation.Owning; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import dev.metaschema.core.configuration.DefaultConfiguration; import dev.metaschema.core.configuration.IConfiguration; import dev.metaschema.core.configuration.IMutableConfiguration; @@ -30,25 +48,6 @@ import dev.metaschema.core.util.ExceptionUtils; import dev.metaschema.core.util.ExceptionUtils.WrappedException; import dev.metaschema.core.util.ObjectUtils; - -import org.apache.commons.lang3.tuple.Pair; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.eclipse.jdt.annotation.Owning; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/DefaultScopedContraints.java b/core/src/main/java/dev/metaschema/core/model/constraint/DefaultScopedContraints.java index 63dafa2eb8..dcbce71af1 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/DefaultScopedContraints.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/DefaultScopedContraints.java @@ -5,11 +5,10 @@ package dev.metaschema.core.model.constraint; -import dev.metaschema.core.model.IModule; - import java.net.URI; import java.util.List; +import dev.metaschema.core.model.IModule; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessor.java b/core/src/main/java/dev/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessor.java index 962f9c3230..39426f62b8 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessor.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessor.java @@ -5,18 +5,17 @@ package dev.metaschema.core.model.constraint; +import java.util.Collection; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.item.node.IModuleNodeItem; import dev.metaschema.core.metapath.item.node.INodeItemFactory; import dev.metaschema.core.model.IModule; import dev.metaschema.core.model.IModuleLoader; import dev.metaschema.core.model.constraint.impl.ConstraintComposingVisitor; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/FieldTargetedConstraints.java b/core/src/main/java/dev/metaschema/core/model/constraint/FieldTargetedConstraints.java index 23c58fc16e..f1979df89d 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/FieldTargetedConstraints.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/FieldTargetedConstraints.java @@ -5,15 +5,14 @@ package dev.metaschema.core.model.constraint; +import java.util.List; +import java.util.function.Supplier; + import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IFlagDefinition; import dev.metaschema.core.model.ISource; - -import java.util.List; -import java.util.function.Supplier; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java b/core/src/main/java/dev/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java index 2e1ee33a7c..18ba4e1042 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandler.java @@ -5,16 +5,6 @@ package dev.metaschema.core.model.constraint; -import dev.metaschema.core.datatype.IDataTypeAdapter; -import dev.metaschema.core.metapath.DynamicContext; -import dev.metaschema.core.metapath.MetapathException; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.node.INodeItem; -import dev.metaschema.core.model.constraint.IConstraint.Level; -import dev.metaschema.core.model.validation.IValidationFinding.Kind; -import dev.metaschema.core.model.validation.IValidationResult; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -26,6 +16,15 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.model.validation.IValidationFinding.Kind; +import dev.metaschema.core.model.validation.IValidationResult; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/FlagTargetedConstraints.java b/core/src/main/java/dev/metaschema/core/model/constraint/FlagTargetedConstraints.java index 53fbfb993a..f1fcbae32c 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/FlagTargetedConstraints.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/FlagTargetedConstraints.java @@ -5,15 +5,14 @@ package dev.metaschema.core.model.constraint; +import java.util.List; +import java.util.function.Supplier; + import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IFlagDefinition; import dev.metaschema.core.model.ISource; - -import java.util.List; -import java.util.function.Supplier; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/IAllowedValue.java b/core/src/main/java/dev/metaschema/core/model/constraint/IAllowedValue.java index 22afba6292..64077d8c53 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/IAllowedValue.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IAllowedValue.java @@ -7,7 +7,6 @@ import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.model.constraint.impl.DefaultAllowedValue; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/IAllowedValuesConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/IAllowedValuesConstraint.java index 5a83b32b3d..7cb5204843 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/IAllowedValuesConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IAllowedValuesConstraint.java @@ -5,12 +5,11 @@ package dev.metaschema.core.model.constraint; -import dev.metaschema.core.model.constraint.impl.DefaultAllowedValuesConstraint; -import dev.metaschema.core.util.ObjectUtils; - import java.util.LinkedHashMap; import java.util.Map; +import dev.metaschema.core.model.constraint.impl.DefaultAllowedValuesConstraint; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/ICardinalityConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/ICardinalityConstraint.java index 06ece6e60e..6110b2f786 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/ICardinalityConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ICardinalityConstraint.java @@ -8,7 +8,6 @@ import dev.metaschema.core.model.IModelInstanceAbsolute; import dev.metaschema.core.model.constraint.impl.DefaultCardinalityConstraint; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/IConfigurableMessageConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/IConfigurableMessageConstraint.java index d7024b6adc..8579bac143 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/IConfigurableMessageConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IConfigurableMessageConstraint.java @@ -7,7 +7,6 @@ import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.item.node.INodeItem; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/IConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/IConstraint.java index 3d6e591d44..80a5ecaae3 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/IConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IConstraint.java @@ -15,7 +15,6 @@ import dev.metaschema.core.model.IDescribable; import dev.metaschema.core.model.ISource; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintSet.java b/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintSet.java index ecb5293f0f..736b070e4f 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintSet.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintSet.java @@ -5,12 +5,11 @@ package dev.metaschema.core.model.constraint; +import java.util.Collection; + import dev.metaschema.core.metapath.item.node.IModuleNodeItem; import dev.metaschema.core.model.IModelElementVisitor; import dev.metaschema.core.model.ISource; - -import java.util.Collection; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintValidationHandler.java b/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintValidationHandler.java index b20b95bbc3..d5e6876d3f 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintValidationHandler.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintValidationHandler.java @@ -5,15 +5,14 @@ package dev.metaschema.core.model.constraint; +import java.util.List; +import java.util.regex.Pattern; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathException; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.node.INodeItem; - -import java.util.List; -import java.util.regex.Pattern; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintValidator.java b/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintValidator.java index 35b276016d..00234864c3 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintValidator.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IConstraintValidator.java @@ -8,7 +8,6 @@ import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathException; import dev.metaschema.core.metapath.item.node.INodeItem; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/IExpectConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/IExpectConstraint.java index 63ffa0afb8..23add26beb 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/IExpectConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IExpectConstraint.java @@ -8,7 +8,6 @@ import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.model.constraint.impl.DefaultExpectConstraint; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/IFeatureValueConstrained.java b/core/src/main/java/dev/metaschema/core/model/constraint/IFeatureValueConstrained.java index 45586c0717..1205fde108 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/IFeatureValueConstrained.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IFeatureValueConstrained.java @@ -5,11 +5,10 @@ package dev.metaschema.core.model.constraint; -import dev.metaschema.core.qname.IEnhancedQName; - import java.util.List; import java.util.Map; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/IIndex.java b/core/src/main/java/dev/metaschema/core/model/constraint/IIndex.java index 343491269c..0aca123571 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/IIndex.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IIndex.java @@ -5,6 +5,12 @@ package dev.metaschema.core.model.constraint; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.metapath.MetapathException; @@ -13,13 +19,6 @@ import dev.metaschema.core.model.constraint.impl.DefaultIndex; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/IIndexConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/IIndexConstraint.java index acf28bd5d9..3e33e547a6 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/IIndexConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IIndexConstraint.java @@ -7,7 +7,6 @@ import dev.metaschema.core.model.constraint.impl.DefaultIndexConstraint; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/IIndexHasKeyConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/IIndexHasKeyConstraint.java index 9717107537..e1811bee00 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/IIndexHasKeyConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IIndexHasKeyConstraint.java @@ -7,7 +7,6 @@ import dev.metaschema.core.model.constraint.impl.DefaultIndexHasKeyConstraint; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/IKeyField.java b/core/src/main/java/dev/metaschema/core/model/constraint/IKeyField.java index 09f93eaca3..51326937dd 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/IKeyField.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IKeyField.java @@ -5,12 +5,11 @@ package dev.metaschema.core.model.constraint; +import java.util.regex.Pattern; + import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.model.constraint.impl.DefaultKeyField; - -import java.util.regex.Pattern; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/ILet.java b/core/src/main/java/dev/metaschema/core/model/constraint/ILet.java index f4e43ee048..88d9d25200 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/ILet.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ILet.java @@ -10,7 +10,6 @@ import dev.metaschema.core.model.ISource; import dev.metaschema.core.model.constraint.impl.DefaultLet; import dev.metaschema.core.qname.IEnhancedQName; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/IMatchesConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/IMatchesConstraint.java index 21753ce81a..c18f3409cc 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/IMatchesConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IMatchesConstraint.java @@ -5,12 +5,11 @@ package dev.metaschema.core.model.constraint; +import java.util.regex.Pattern; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.model.constraint.impl.DefaultMatchesConstraint; import dev.metaschema.core.util.ObjectUtils; - -import java.util.regex.Pattern; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/IReportConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/IReportConstraint.java index 37b411c2be..553ad08fc3 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/IReportConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IReportConstraint.java @@ -8,7 +8,6 @@ import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.model.constraint.impl.DefaultReportConstraint; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/ITargetedConstraints.java b/core/src/main/java/dev/metaschema/core/model/constraint/ITargetedConstraints.java index 09a72d9b68..0a52fa069c 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/ITargetedConstraints.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ITargetedConstraints.java @@ -5,13 +5,12 @@ package dev.metaschema.core.model.constraint; +import java.util.List; + import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IFlagDefinition; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/IUniqueConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/IUniqueConstraint.java index fbe33f90fe..c5509a919f 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/IUniqueConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IUniqueConstraint.java @@ -7,7 +7,6 @@ import dev.metaschema.core.model.constraint.impl.DefaultUniqueConstraint; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/IValueConstrained.java b/core/src/main/java/dev/metaschema/core/model/constraint/IValueConstrained.java index 384de4988e..3acdbf963b 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/IValueConstrained.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/IValueConstrained.java @@ -5,12 +5,11 @@ package dev.metaschema.core.model.constraint; -import dev.metaschema.core.model.ISource; -import dev.metaschema.core.qname.IEnhancedQName; - import java.util.List; import java.util.Map; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/LoggingConstraintValidationHandler.java b/core/src/main/java/dev/metaschema/core/model/constraint/LoggingConstraintValidationHandler.java index f58135bca5..723353702c 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/LoggingConstraintValidationHandler.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/LoggingConstraintValidationHandler.java @@ -5,14 +5,6 @@ package dev.metaschema.core.model.constraint; -import dev.metaschema.core.datatype.IDataTypeAdapter; -import dev.metaschema.core.metapath.DynamicContext; -import dev.metaschema.core.metapath.MetapathException; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.node.INodeItem; -import dev.metaschema.core.model.constraint.IConstraint.Level; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.logging.log4j.LogBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -21,6 +13,13 @@ import java.util.List; import java.util.regex.Pattern; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/MetaConstraintSet.java b/core/src/main/java/dev/metaschema/core/model/constraint/MetaConstraintSet.java index d2fa7bd213..c01da87bf3 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/MetaConstraintSet.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/MetaConstraintSet.java @@ -5,19 +5,6 @@ package dev.metaschema.core.model.constraint; -import dev.metaschema.core.metapath.DynamicContext; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; -import dev.metaschema.core.metapath.item.node.IModuleNodeItem; -import dev.metaschema.core.metapath.item.node.INodeItem; -import dev.metaschema.core.model.IDefinition; -import dev.metaschema.core.model.IModelElementVisitor; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.model.ISource; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.eclipse.jdt.annotation.Owning; @@ -30,6 +17,18 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.IModuleNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IModelElementVisitor; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/ModelTargetedConstraints.java b/core/src/main/java/dev/metaschema/core/model/constraint/ModelTargetedConstraints.java index 5a7a9319bd..d26369f3a3 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/ModelTargetedConstraints.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ModelTargetedConstraints.java @@ -5,13 +5,12 @@ package dev.metaschema.core.model.constraint; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.model.IAssemblyDefinition; -import dev.metaschema.core.model.ISource; - import java.util.List; import java.util.function.Supplier; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.ISource; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/ScopedConstraintSet.java b/core/src/main/java/dev/metaschema/core/model/constraint/ScopedConstraintSet.java index b1ccc2d633..5b307ef2d5 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/ScopedConstraintSet.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ScopedConstraintSet.java @@ -5,19 +5,6 @@ package dev.metaschema.core.model.constraint; -import dev.metaschema.core.metapath.DynamicContext; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; -import dev.metaschema.core.metapath.item.node.IModuleNodeItem; -import dev.metaschema.core.model.IDefinition; -import dev.metaschema.core.model.IModelElementVisitor; -import dev.metaschema.core.model.ISource; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -31,6 +18,18 @@ import javax.xml.namespace.QName; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.IModuleNodeItem; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IModelElementVisitor; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/ValidationFeature.java b/core/src/main/java/dev/metaschema/core/model/constraint/ValidationFeature.java index 565d36d856..0b428f9719 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/ValidationFeature.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ValidationFeature.java @@ -6,7 +6,6 @@ package dev.metaschema.core.model.constraint; import dev.metaschema.core.configuration.AbstractConfigurationFeature; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/ValueConstraintSet.java b/core/src/main/java/dev/metaschema/core/model/constraint/ValueConstraintSet.java index 3065a9a417..f15eb70d5d 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/ValueConstraintSet.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/ValueConstraintSet.java @@ -5,10 +5,6 @@ package dev.metaschema.core.model.constraint; -import dev.metaschema.core.model.ISource; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.CollectionUtil; - import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; @@ -17,6 +13,9 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraint.java index bad07bebe4..086a88b989 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraint.java @@ -5,6 +5,10 @@ package dev.metaschema.core.model.constraint.impl; +import java.util.Map; +import java.util.Set; +import java.util.regex.Pattern; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.DynamicContext; @@ -20,11 +24,6 @@ import dev.metaschema.core.model.constraint.IConstraint; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.core.util.StringUtils; - -import java.util.Map; -import java.util.Set; -import java.util.regex.Pattern; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractConstraint.java index 6dc2c6a901..51179842f1 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractConstraint.java @@ -5,6 +5,10 @@ package dev.metaschema.core.model.constraint.impl; +import java.util.Map; +import java.util.Objects; +import java.util.Set; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.DynamicContext; @@ -16,11 +20,6 @@ import dev.metaschema.core.model.constraint.IConstraint; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Map; -import java.util.Objects; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractKeyConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractKeyConstraint.java index de00e881c8..ee6022f36a 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractKeyConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/AbstractKeyConstraint.java @@ -5,6 +5,10 @@ package dev.metaschema.core.model.constraint.impl; +import java.util.List; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.IMetapathExpression; @@ -14,11 +18,6 @@ import dev.metaschema.core.model.constraint.IConstraint; import dev.metaschema.core.model.constraint.IKeyConstraint; import dev.metaschema.core.model.constraint.IKeyField; - -import java.util.List; -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/impl/ConstraintComposingVisitor.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/ConstraintComposingVisitor.java index cfe05b899c..f37f070931 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/impl/ConstraintComposingVisitor.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/ConstraintComposingVisitor.java @@ -20,7 +20,6 @@ import dev.metaschema.core.model.INamedModelElement; import dev.metaschema.core.model.constraint.ConstraintInitializationException; import dev.metaschema.core.model.constraint.ITargetedConstraints; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultAllowedValue.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultAllowedValue.java index 8d17a3cd0a..93e9356471 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultAllowedValue.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultAllowedValue.java @@ -8,7 +8,6 @@ import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.model.constraint.IAllowedValue; import dev.metaschema.core.model.constraint.IAllowedValuesConstraint; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultAllowedValuesConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultAllowedValuesConstraint.java index 9261877b18..8303d97d0a 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultAllowedValuesConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultAllowedValuesConstraint.java @@ -5,6 +5,9 @@ package dev.metaschema.core.model.constraint.impl; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.IMetapathExpression; @@ -12,10 +15,6 @@ import dev.metaschema.core.model.ISource; import dev.metaschema.core.model.constraint.IAllowedValue; import dev.metaschema.core.model.constraint.IAllowedValuesConstraint; - -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultCardinalityConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultCardinalityConstraint.java index 7c3c8c303b..d2cc14e23d 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultCardinalityConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultCardinalityConstraint.java @@ -5,6 +5,9 @@ package dev.metaschema.core.model.constraint.impl; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.IMetapathExpression; @@ -13,10 +16,6 @@ import dev.metaschema.core.model.constraint.ConstraintInitializationException; import dev.metaschema.core.model.constraint.ICardinalityConstraint; import dev.metaschema.core.model.constraint.IConstraint; - -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultExpectConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultExpectConstraint.java index 2a295bd9a5..08b7927d05 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultExpectConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultExpectConstraint.java @@ -5,6 +5,9 @@ package dev.metaschema.core.model.constraint.impl; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.IMetapathExpression; @@ -12,10 +15,6 @@ import dev.metaschema.core.model.IAttributable; import dev.metaschema.core.model.ISource; import dev.metaschema.core.model.constraint.IExpectConstraint; - -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndex.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndex.java index 48f544c93e..93c22d4596 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndex.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndex.java @@ -5,6 +5,12 @@ package dev.metaschema.core.model.constraint.impl; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; + import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.model.constraint.ConstraintInitializationException; import dev.metaschema.core.model.constraint.IIndex; @@ -13,13 +19,6 @@ import dev.metaschema.core.model.constraint.IKeyField; import dev.metaschema.core.model.constraint.IUniqueConstraint; import dev.metaschema.core.util.CollectionUtil; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndexConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndexConstraint.java index 20f7804483..7ed69ac3ec 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndexConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndexConstraint.java @@ -5,6 +5,10 @@ package dev.metaschema.core.model.constraint.impl; +import java.util.List; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.IMetapathExpression; @@ -14,11 +18,6 @@ import dev.metaschema.core.model.constraint.IConstraint; import dev.metaschema.core.model.constraint.IIndexConstraint; import dev.metaschema.core.model.constraint.IKeyField; - -import java.util.List; -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndexHasKeyConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndexHasKeyConstraint.java index d17af84f10..462d86eaa8 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndexHasKeyConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultIndexHasKeyConstraint.java @@ -5,6 +5,10 @@ package dev.metaschema.core.model.constraint.impl; +import java.util.List; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.IMetapathExpression; @@ -14,11 +18,6 @@ import dev.metaschema.core.model.constraint.IConstraint; import dev.metaschema.core.model.constraint.IIndexHasKeyConstraint; import dev.metaschema.core.model.constraint.IKeyField; - -import java.util.List; -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultKeyField.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultKeyField.java index 0c957c50b0..0d96e868ca 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultKeyField.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultKeyField.java @@ -5,15 +5,14 @@ package dev.metaschema.core.model.constraint.impl; +import java.util.regex.Pattern; + import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.model.constraint.IIndexConstraint; import dev.metaschema.core.model.constraint.IIndexHasKeyConstraint; import dev.metaschema.core.model.constraint.IKeyField; import dev.metaschema.core.model.constraint.IUniqueConstraint; - -import java.util.regex.Pattern; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultLet.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultLet.java index 2c2f5e0e9f..976ac2e11d 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultLet.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultLet.java @@ -10,7 +10,6 @@ import dev.metaschema.core.model.ISource; import dev.metaschema.core.model.constraint.ILet; import dev.metaschema.core.qname.IEnhancedQName; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultMatchesConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultMatchesConstraint.java index 08a03122ac..abf26ae930 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultMatchesConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultMatchesConstraint.java @@ -5,6 +5,10 @@ package dev.metaschema.core.model.constraint.impl; +import java.util.Map; +import java.util.Set; +import java.util.regex.Pattern; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; @@ -14,11 +18,6 @@ import dev.metaschema.core.model.constraint.ConstraintInitializationException; import dev.metaschema.core.model.constraint.IConstraint; import dev.metaschema.core.model.constraint.IMatchesConstraint; - -import java.util.Map; -import java.util.Set; -import java.util.regex.Pattern; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultReportConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultReportConstraint.java index 93717d714f..212132ccd1 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultReportConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultReportConstraint.java @@ -5,6 +5,9 @@ package dev.metaschema.core.model.constraint.impl; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.IMetapathExpression; @@ -12,10 +15,6 @@ import dev.metaschema.core.model.IAttributable; import dev.metaschema.core.model.ISource; import dev.metaschema.core.model.constraint.IReportConstraint; - -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultUniqueConstraint.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultUniqueConstraint.java index 05d064cf89..12bb19b80f 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultUniqueConstraint.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/DefaultUniqueConstraint.java @@ -5,6 +5,10 @@ package dev.metaschema.core.model.constraint.impl; +import java.util.List; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.IMetapathExpression; @@ -12,11 +16,6 @@ import dev.metaschema.core.model.ISource; import dev.metaschema.core.model.constraint.IKeyField; import dev.metaschema.core.model.constraint.IUniqueConstraint; - -import java.util.List; -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/impl/InternalModelSource.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/InternalModelSource.java index e6773f7ddc..5c0054ebf8 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/impl/InternalModelSource.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/InternalModelSource.java @@ -5,17 +5,16 @@ package dev.metaschema.core.model.constraint.impl; -import dev.metaschema.core.metapath.StaticContext; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.model.ISource; -import dev.metaschema.core.util.ObjectUtils; - import java.net.URI; import java.util.HashMap; import java.util.Map; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/constraint/impl/StaticContextSource.java b/core/src/main/java/dev/metaschema/core/model/constraint/impl/StaticContextSource.java index 6b6ca3c779..23aaff57ac 100644 --- a/core/src/main/java/dev/metaschema/core/model/constraint/impl/StaticContextSource.java +++ b/core/src/main/java/dev/metaschema/core/model/constraint/impl/StaticContextSource.java @@ -5,16 +5,15 @@ package dev.metaschema.core.model.constraint.impl; -import dev.metaschema.core.metapath.StaticContext; -import dev.metaschema.core.model.ISource; -import dev.metaschema.core.util.ObjectUtils; - import java.net.URI; import java.util.HashMap; import java.util.Map; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerFlagSupport.java b/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerFlagSupport.java index fde9fae682..eeca241d81 100644 --- a/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerFlagSupport.java +++ b/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerFlagSupport.java @@ -5,11 +5,10 @@ package dev.metaschema.core.model.impl; -import dev.metaschema.core.model.IContainerFlagSupport; -import dev.metaschema.core.model.IFlagInstance; - import java.util.Map; +import dev.metaschema.core.model.IContainerFlagSupport; +import dev.metaschema.core.model.IFlagInstance; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelAssemblySupport.java b/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelAssemblySupport.java index a355e832b3..ab7f23d838 100644 --- a/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelAssemblySupport.java +++ b/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelAssemblySupport.java @@ -5,6 +5,11 @@ package dev.metaschema.core.model.impl; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + import dev.metaschema.core.model.IAssemblyInstance; import dev.metaschema.core.model.IChoiceGroupInstance; import dev.metaschema.core.model.IChoiceInstance; @@ -13,12 +18,6 @@ import dev.metaschema.core.model.IModelInstance; import dev.metaschema.core.model.INamedModelInstance; import dev.metaschema.core.util.CollectionUtil; - -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelChoiceGroupSupport.java b/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelChoiceGroupSupport.java index 95d4468d04..86311bc04a 100644 --- a/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelChoiceGroupSupport.java +++ b/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelChoiceGroupSupport.java @@ -5,16 +5,15 @@ package dev.metaschema.core.model.impl; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.Map; + import dev.metaschema.core.model.AbstractContainerModelSupport; import dev.metaschema.core.model.IAssemblyInstance; import dev.metaschema.core.model.IFieldInstance; import dev.metaschema.core.model.INamedModelInstance; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelSupport.java b/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelSupport.java index 08772dc530..9ed2edc57f 100644 --- a/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelSupport.java +++ b/core/src/main/java/dev/metaschema/core/model/impl/DefaultContainerModelSupport.java @@ -5,6 +5,10 @@ package dev.metaschema.core.model.impl; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + import dev.metaschema.core.model.AbstractContainerModelSupport; import dev.metaschema.core.model.IAssemblyInstance; import dev.metaschema.core.model.IContainerModelSupport; @@ -12,11 +16,6 @@ import dev.metaschema.core.model.IModelInstance; import dev.metaschema.core.model.INamedModelInstance; import dev.metaschema.core.util.CollectionUtil; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/core/src/main/java/dev/metaschema/core/model/impl/EmptyFlagContainer.java b/core/src/main/java/dev/metaschema/core/model/impl/EmptyFlagContainer.java index a07b9cf416..4d5562c68c 100644 --- a/core/src/main/java/dev/metaschema/core/model/impl/EmptyFlagContainer.java +++ b/core/src/main/java/dev/metaschema/core/model/impl/EmptyFlagContainer.java @@ -5,12 +5,11 @@ package dev.metaschema.core.model.impl; +import java.util.Map; + import dev.metaschema.core.model.IContainerFlagSupport; import dev.metaschema.core.model.IFlagInstance; import dev.metaschema.core.util.CollectionUtil; - -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/util/DefaultDiagramNode.java b/core/src/main/java/dev/metaschema/core/model/util/DefaultDiagramNode.java index b974512bed..3e7755802b 100644 --- a/core/src/main/java/dev/metaschema/core/model/util/DefaultDiagramNode.java +++ b/core/src/main/java/dev/metaschema/core/model/util/DefaultDiagramNode.java @@ -5,6 +5,10 @@ package dev.metaschema.core.model.util; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IChoiceGroupInstance; @@ -17,11 +21,6 @@ import dev.metaschema.core.model.INamedModelInstanceGrouped; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/model/util/IDiagramNode.java b/core/src/main/java/dev/metaschema/core/model/util/IDiagramNode.java index 4cc2274141..0fd01c5dad 100644 --- a/core/src/main/java/dev/metaschema/core/model/util/IDiagramNode.java +++ b/core/src/main/java/dev/metaschema/core/model/util/IDiagramNode.java @@ -5,13 +5,12 @@ package dev.metaschema.core.model.util; +import java.util.List; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.model.IGroupable; import dev.metaschema.core.model.IModelDefinition; import dev.metaschema.core.model.IModelInstance; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/util/IDiagramNodeVisitor.java b/core/src/main/java/dev/metaschema/core/model/util/IDiagramNodeVisitor.java index 6b1385c3e1..44ad71e219 100644 --- a/core/src/main/java/dev/metaschema/core/model/util/IDiagramNodeVisitor.java +++ b/core/src/main/java/dev/metaschema/core/model/util/IDiagramNodeVisitor.java @@ -9,7 +9,6 @@ import dev.metaschema.core.model.IChoiceInstance; import dev.metaschema.core.model.INamedModelInstanceAbsolute; import dev.metaschema.core.model.INamedModelInstanceGrouped; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/util/JsonUtil.java b/core/src/main/java/dev/metaschema/core/model/util/JsonUtil.java index 18c2dfd267..b47e1b7cc1 100644 --- a/core/src/main/java/dev/metaschema/core/model/util/JsonUtil.java +++ b/core/src/main/java/dev/metaschema/core/model/util/JsonUtil.java @@ -9,9 +9,6 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; -import dev.metaschema.core.util.CustomCollectors; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.json.JSONObject; @@ -25,6 +22,8 @@ import java.util.Collection; import java.util.List; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/util/MermaidErDiagramGenerator.java b/core/src/main/java/dev/metaschema/core/model/util/MermaidErDiagramGenerator.java index 86d839dec2..eb8c6cf6c1 100644 --- a/core/src/main/java/dev/metaschema/core/model/util/MermaidErDiagramGenerator.java +++ b/core/src/main/java/dev/metaschema/core/model/util/MermaidErDiagramGenerator.java @@ -5,6 +5,15 @@ package dev.metaschema.core.model.util; +import org.apache.commons.lang3.tuple.Pair; +import org.eclipse.jdt.annotation.NotOwning; + +import java.io.PrintWriter; +import java.util.Collection; +import java.util.EnumMap; +import java.util.LinkedHashMap; +import java.util.Map; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IFlagDefinition; @@ -15,16 +24,6 @@ import dev.metaschema.core.model.ModelWalker; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import org.apache.commons.lang3.tuple.Pair; -import org.eclipse.jdt.annotation.NotOwning; - -import java.io.PrintWriter; -import java.util.Collection; -import java.util.EnumMap; -import java.util.LinkedHashMap; -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/model/util/ModuleUtils.java b/core/src/main/java/dev/metaschema/core/model/util/ModuleUtils.java index fb461afc1e..4ccd710b2a 100644 --- a/core/src/main/java/dev/metaschema/core/model/util/ModuleUtils.java +++ b/core/src/main/java/dev/metaschema/core/model/util/ModuleUtils.java @@ -10,7 +10,6 @@ import dev.metaschema.core.model.IModule; import dev.metaschema.core.model.ModelInitializationException; import dev.metaschema.core.qname.IEnhancedQName; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/util/XmlEventUtil.java b/core/src/main/java/dev/metaschema/core/model/util/XmlEventUtil.java index 00698aaffe..2d591bb7c5 100644 --- a/core/src/main/java/dev/metaschema/core/model/util/XmlEventUtil.java +++ b/core/src/main/java/dev/metaschema/core/model/util/XmlEventUtil.java @@ -5,8 +5,6 @@ package dev.metaschema.core.model.util; -import dev.metaschema.core.util.ObjectUtils; - import org.codehaus.stax2.XMLEventReader2; import org.codehaus.stax2.XMLStreamReader2; @@ -28,6 +26,7 @@ import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/validation/AbstractContentValidator.java b/core/src/main/java/dev/metaschema/core/model/validation/AbstractContentValidator.java index cc91718287..354e454db2 100644 --- a/core/src/main/java/dev/metaschema/core/model/validation/AbstractContentValidator.java +++ b/core/src/main/java/dev/metaschema/core/model/validation/AbstractContentValidator.java @@ -5,15 +5,15 @@ package dev.metaschema.core.model.validation; -import dev.metaschema.core.model.AbstractResourceResolver; -import dev.metaschema.core.util.ObjectUtils; - import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; import java.net.URI; import java.net.URL; +import dev.metaschema.core.model.AbstractResourceResolver; +import dev.metaschema.core.util.ObjectUtils; + /** * Base class for a content validator. */ diff --git a/core/src/main/java/dev/metaschema/core/model/validation/AbstractValidationResultProcessor.java b/core/src/main/java/dev/metaschema/core/model/validation/AbstractValidationResultProcessor.java index 61ee36c2e1..459fbd6869 100644 --- a/core/src/main/java/dev/metaschema/core/model/validation/AbstractValidationResultProcessor.java +++ b/core/src/main/java/dev/metaschema/core/model/validation/AbstractValidationResultProcessor.java @@ -5,12 +5,11 @@ package dev.metaschema.core.model.validation; +import java.util.List; + import dev.metaschema.core.model.constraint.ConstraintValidationFinding; import dev.metaschema.core.model.validation.JsonSchemaContentValidator.JsonValidationFinding; import dev.metaschema.core.model.validation.XmlSchemaContentValidator.XmlValidationFinding; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/validation/AggregateValidationResult.java b/core/src/main/java/dev/metaschema/core/model/validation/AggregateValidationResult.java index 4f550140b8..568567f307 100644 --- a/core/src/main/java/dev/metaschema/core/model/validation/AggregateValidationResult.java +++ b/core/src/main/java/dev/metaschema/core/model/validation/AggregateValidationResult.java @@ -5,15 +5,14 @@ package dev.metaschema.core.model.validation; -import dev.metaschema.core.model.constraint.IConstraint.Level; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; - import java.util.LinkedList; import java.util.List; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Stream; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/validation/IContentValidator.java b/core/src/main/java/dev/metaschema/core/model/validation/IContentValidator.java index 4245521f3e..34a8e91bb1 100644 --- a/core/src/main/java/dev/metaschema/core/model/validation/IContentValidator.java +++ b/core/src/main/java/dev/metaschema/core/model/validation/IContentValidator.java @@ -5,9 +5,6 @@ package dev.metaschema.core.model.validation; -import dev.metaschema.core.model.util.JsonUtil; -import dev.metaschema.core.util.ObjectUtils; - import org.json.JSONObject; import org.xml.sax.SAXException; @@ -22,6 +19,8 @@ import javax.xml.transform.Source; +import dev.metaschema.core.model.util.JsonUtil; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/validation/IValidationFinding.java b/core/src/main/java/dev/metaschema/core/model/validation/IValidationFinding.java index b8ebd79cd1..9c9b3ed4a3 100644 --- a/core/src/main/java/dev/metaschema/core/model/validation/IValidationFinding.java +++ b/core/src/main/java/dev/metaschema/core/model/validation/IValidationFinding.java @@ -5,11 +5,10 @@ package dev.metaschema.core.model.validation; -import dev.metaschema.core.model.IResourceLocation; -import dev.metaschema.core.model.constraint.IConstraint; - import java.net.URI; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.model.constraint.IConstraint; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/model/validation/IValidationResult.java b/core/src/main/java/dev/metaschema/core/model/validation/IValidationResult.java index cba275c47b..040d2af392 100644 --- a/core/src/main/java/dev/metaschema/core/model/validation/IValidationResult.java +++ b/core/src/main/java/dev/metaschema/core/model/validation/IValidationResult.java @@ -5,11 +5,10 @@ package dev.metaschema.core.model.validation; -import dev.metaschema.core.model.constraint.IConstraint.Level; - import java.util.Collections; import java.util.List; +import dev.metaschema.core.model.constraint.IConstraint.Level; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/validation/JsonSchemaContentValidator.java b/core/src/main/java/dev/metaschema/core/model/validation/JsonSchemaContentValidator.java index c7154c295e..46d2c270a6 100644 --- a/core/src/main/java/dev/metaschema/core/model/validation/JsonSchemaContentValidator.java +++ b/core/src/main/java/dev/metaschema/core/model/validation/JsonSchemaContentValidator.java @@ -5,10 +5,6 @@ package dev.metaschema.core.model.validation; -import dev.metaschema.core.model.IResourceLocation; -import dev.metaschema.core.model.constraint.IConstraint; -import dev.metaschema.core.util.ObjectUtils; - import org.everit.json.schema.Schema; import org.everit.json.schema.ValidationException; import org.everit.json.schema.loader.SchemaLoader; @@ -26,6 +22,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/model/validation/XmlSchemaContentValidator.java b/core/src/main/java/dev/metaschema/core/model/validation/XmlSchemaContentValidator.java index 54f96dc7a2..fe84ecb0df 100644 --- a/core/src/main/java/dev/metaschema/core/model/validation/XmlSchemaContentValidator.java +++ b/core/src/main/java/dev/metaschema/core/model/validation/XmlSchemaContentValidator.java @@ -5,10 +5,6 @@ package dev.metaschema.core.model.validation; -import dev.metaschema.core.model.IResourceLocation; -import dev.metaschema.core.model.constraint.IConstraint.Level; -import dev.metaschema.core.util.ObjectUtils; - import org.eclipse.jdt.annotation.Owning; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; @@ -28,6 +24,9 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/main/java/dev/metaschema/core/qname/EQNameFactory.java b/core/src/main/java/dev/metaschema/core/qname/EQNameFactory.java index 73bdcbf13b..a273cef4c2 100644 --- a/core/src/main/java/dev/metaschema/core/qname/EQNameFactory.java +++ b/core/src/main/java/dev/metaschema/core/qname/EQNameFactory.java @@ -5,14 +5,13 @@ package dev.metaschema.core.qname; -import dev.metaschema.core.util.ObjectUtils; - import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.xml.XMLConstants; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/qname/IEnhancedQName.java b/core/src/main/java/dev/metaschema/core/qname/IEnhancedQName.java index c076e1a620..f66445bc70 100644 --- a/core/src/main/java/dev/metaschema/core/qname/IEnhancedQName.java +++ b/core/src/main/java/dev/metaschema/core/qname/IEnhancedQName.java @@ -5,16 +5,15 @@ package dev.metaschema.core.qname; -import dev.metaschema.core.metapath.StaticContext; -import dev.metaschema.core.metapath.StaticMetapathException; -import dev.metaschema.core.util.ObjectUtils; - import java.net.URI; import java.util.Optional; import javax.xml.XMLConstants; import javax.xml.namespace.QName; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/main/java/dev/metaschema/core/qname/NamespaceCache.java b/core/src/main/java/dev/metaschema/core/qname/NamespaceCache.java index 44bf3f92b3..309955874d 100644 --- a/core/src/main/java/dev/metaschema/core/qname/NamespaceCache.java +++ b/core/src/main/java/dev/metaschema/core/qname/NamespaceCache.java @@ -5,14 +5,13 @@ package dev.metaschema.core.qname; -import dev.metaschema.core.util.ObjectUtils; - import java.net.URI; import java.util.Map; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/qname/QNameCache.java b/core/src/main/java/dev/metaschema/core/qname/QNameCache.java index 4bcd150541..fa487bd00d 100644 --- a/core/src/main/java/dev/metaschema/core/qname/QNameCache.java +++ b/core/src/main/java/dev/metaschema/core/qname/QNameCache.java @@ -5,8 +5,6 @@ package dev.metaschema.core.qname; -import dev.metaschema.core.util.ObjectUtils; - import java.net.URI; import java.util.Comparator; import java.util.Map; @@ -15,6 +13,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/core/src/main/java/dev/metaschema/core/qname/WellKnown.java b/core/src/main/java/dev/metaschema/core/qname/WellKnown.java index 63d5849fa7..a2f9577db4 100644 --- a/core/src/main/java/dev/metaschema/core/qname/WellKnown.java +++ b/core/src/main/java/dev/metaschema/core/qname/WellKnown.java @@ -5,16 +5,15 @@ package dev.metaschema.core.qname; -import dev.metaschema.core.metapath.MetapathConstants; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; - import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; import java.util.stream.Collectors; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/core/src/main/java/dev/metaschema/core/util/CustomCollectors.java b/core/src/main/java/dev/metaschema/core/util/CustomCollectors.java index 20cf1989a9..e046483abc 100644 --- a/core/src/main/java/dev/metaschema/core/util/CustomCollectors.java +++ b/core/src/main/java/dev/metaschema/core/util/CustomCollectors.java @@ -5,9 +5,6 @@ package dev.metaschema.core.util; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.ISequence; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -24,6 +21,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/datatype/adapter/BooleanAdapterTest.java b/core/src/test/java/dev/metaschema/core/datatype/adapter/BooleanAdapterTest.java index 919fe17928..39248f024c 100644 --- a/core/src/test/java/dev/metaschema/core/datatype/adapter/BooleanAdapterTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/adapter/BooleanAdapterTest.java @@ -12,13 +12,13 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; -import dev.metaschema.core.util.ObjectUtils; - import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; +import dev.metaschema.core.util.ObjectUtils; + class BooleanAdapterTest { private static final String TEST_JSON = "{ \"some-boolean\" : true }"; diff --git a/core/src/test/java/dev/metaschema/core/datatype/adapter/DateAdapterTest.java b/core/src/test/java/dev/metaschema/core/datatype/adapter/DateAdapterTest.java index 48dd72ace7..edc445a9f3 100644 --- a/core/src/test/java/dev/metaschema/core/datatype/adapter/DateAdapterTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/adapter/DateAdapterTest.java @@ -9,8 +9,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.datatype.object.AmbiguousDate; - import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -20,6 +18,7 @@ import java.time.ZonedDateTime; import java.util.stream.Stream; +import dev.metaschema.core.datatype.object.AmbiguousDate; import edu.umd.cs.findbugs.annotations.NonNull; class DateAdapterTest { diff --git a/core/src/test/java/dev/metaschema/core/datatype/adapter/DateTimeAdapterTest.java b/core/src/test/java/dev/metaschema/core/datatype/adapter/DateTimeAdapterTest.java index dce746c803..11451edf4c 100644 --- a/core/src/test/java/dev/metaschema/core/datatype/adapter/DateTimeAdapterTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/adapter/DateTimeAdapterTest.java @@ -8,8 +8,6 @@ import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.datatype.object.AmbiguousDateTime; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; @@ -19,6 +17,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Stream; +import dev.metaschema.core.datatype.object.AmbiguousDateTime; import edu.umd.cs.findbugs.annotations.NonNull; class DateTimeAdapterTest { diff --git a/core/src/test/java/dev/metaschema/core/datatype/adapter/MetaschemaDataTypeProviderTest.java b/core/src/test/java/dev/metaschema/core/datatype/adapter/MetaschemaDataTypeProviderTest.java index 63f542160e..83b0a71263 100644 --- a/core/src/test/java/dev/metaschema/core/datatype/adapter/MetaschemaDataTypeProviderTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/adapter/MetaschemaDataTypeProviderTest.java @@ -7,12 +7,12 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.junit.jupiter.api.Test; + import dev.metaschema.core.datatype.DataTypeService; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.qname.IEnhancedQName; -import org.junit.jupiter.api.Test; - class MetaschemaDataTypeProviderTest { @Test diff --git a/core/src/test/java/dev/metaschema/core/datatype/markup/CommonmarkConformanceTest.java b/core/src/test/java/dev/metaschema/core/datatype/markup/CommonmarkConformanceTest.java index e7db7e4314..7af2a78724 100644 --- a/core/src/test/java/dev/metaschema/core/datatype/markup/CommonmarkConformanceTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/markup/CommonmarkConformanceTest.java @@ -18,9 +18,6 @@ import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.ObjectMapper; -import dev.metaschema.core.MetaschemaConstants; -import dev.metaschema.core.util.ObjectUtils; - import org.codehaus.stax2.XMLStreamWriter2; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -60,6 +57,8 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; +import dev.metaschema.core.MetaschemaConstants; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/datatype/markup/MarkupStringTest.java b/core/src/test/java/dev/metaschema/core/datatype/markup/MarkupStringTest.java index 0b832547d6..8abd8c608d 100644 --- a/core/src/test/java/dev/metaschema/core/datatype/markup/MarkupStringTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/markup/MarkupStringTest.java @@ -17,10 +17,6 @@ import com.vladsch.flexmark.util.ast.Document; import com.vladsch.flexmark.util.ast.Node; -import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; -import dev.metaschema.core.datatype.markup.flexmark.impl.AstCollectingVisitor; -import dev.metaschema.core.util.CollectionUtil; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codehaus.stax2.XMLOutputFactory2; @@ -38,6 +34,9 @@ import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; +import dev.metaschema.core.datatype.markup.flexmark.InsertAnchorExtension.InsertAnchorNode; +import dev.metaschema.core.datatype.markup.flexmark.impl.AstCollectingVisitor; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; class MarkupStringTest { diff --git a/core/src/test/java/dev/metaschema/core/datatype/markup/flexmark/MarkupParserTest.java b/core/src/test/java/dev/metaschema/core/datatype/markup/flexmark/MarkupParserTest.java index 0c841e8bd4..c85af442e2 100644 --- a/core/src/test/java/dev/metaschema/core/datatype/markup/flexmark/MarkupParserTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/markup/flexmark/MarkupParserTest.java @@ -10,12 +10,6 @@ import com.ctc.wstx.stax.WstxInputFactory; -import dev.metaschema.core.datatype.markup.MarkupMultiline; -import dev.metaschema.core.datatype.markup.XmlMarkupParser; -import dev.metaschema.core.datatype.markup.flexmark.impl.AstCollectingVisitor; -import dev.metaschema.core.model.util.XmlEventUtil; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codehaus.stax2.XMLEventReader2; @@ -28,6 +22,12 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.datatype.markup.XmlMarkupParser; +import dev.metaschema.core.datatype.markup.flexmark.impl.AstCollectingVisitor; +import dev.metaschema.core.model.util.XmlEventUtil; +import dev.metaschema.core.util.ObjectUtils; + class MarkupParserTest { private static final Logger LOGGER = LogManager.getLogger(MarkupParserTest.class); diff --git a/core/src/test/java/dev/metaschema/core/datatype/markup/flexmark/MarkupXmlStreamWriterTest.java b/core/src/test/java/dev/metaschema/core/datatype/markup/flexmark/MarkupXmlStreamWriterTest.java index 60ac7f94cb..0d0bebea21 100644 --- a/core/src/test/java/dev/metaschema/core/datatype/markup/flexmark/MarkupXmlStreamWriterTest.java +++ b/core/src/test/java/dev/metaschema/core/datatype/markup/flexmark/MarkupXmlStreamWriterTest.java @@ -8,8 +8,6 @@ import com.ctc.wstx.api.WstxOutputProperties; import com.ctc.wstx.stax.WstxOutputFactory; -import dev.metaschema.core.datatype.markup.MarkupMultiline; - import org.codehaus.stax2.XMLOutputFactory2; import org.codehaus.stax2.XMLStreamWriter2; import org.codehaus.stax2.ri.evt.MergedNsContext; @@ -22,6 +20,8 @@ import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; +import dev.metaschema.core.datatype.markup.MarkupMultiline; + class MarkupXmlStreamWriterTest { private static final String NAMESPACE = "http://www.w3.org/1999/xhtml"; private static final String NS_PREFIX = ""; diff --git a/core/src/test/java/dev/metaschema/core/metapath/DynamicContextFocusTest.java b/core/src/test/java/dev/metaschema/core/metapath/DynamicContextFocusTest.java index 19fad69221..aaff64bf23 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/DynamicContextFocusTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/DynamicContextFocusTest.java @@ -12,11 +12,11 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; +import org.junit.jupiter.api.Test; + import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; -import org.junit.jupiter.api.Test; - /** * Tests for focus context support in DynamicContext. */ diff --git a/core/src/test/java/dev/metaschema/core/metapath/DynamicContextTest.java b/core/src/test/java/dev/metaschema/core/metapath/DynamicContextTest.java index 073820f060..349f7ca115 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/DynamicContextTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/DynamicContextTest.java @@ -9,14 +9,6 @@ import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.Mockito.mock; -import dev.metaschema.core.metapath.cst.IExpressionVisitor; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; -import dev.metaschema.core.model.IUriResolver; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; - import org.junit.jupiter.api.Test; import java.io.IOException; @@ -26,6 +18,13 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; +import dev.metaschema.core.metapath.cst.IExpressionVisitor; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.model.IUriResolver; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; class DynamicContextTest { diff --git a/core/src/test/java/dev/metaschema/core/metapath/ErrorHandlingTest.java b/core/src/test/java/dev/metaschema/core/metapath/ErrorHandlingTest.java index b75b47b137..9a413ba937 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/ErrorHandlingTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/ErrorHandlingTest.java @@ -12,6 +12,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; + import dev.metaschema.core.metapath.function.ArithmeticFunctionException; import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; import dev.metaschema.core.metapath.item.ISequence; @@ -20,8 +22,6 @@ import dev.metaschema.core.metapath.type.TypeMetapathException; import dev.metaschema.core.qname.IEnhancedQName; -import org.junit.jupiter.api.Test; - /** * Comprehensive tests for error handling paths in the metaschema-java * constraint and metapath systems. diff --git a/core/src/test/java/dev/metaschema/core/metapath/ExpressionTestBase.java b/core/src/test/java/dev/metaschema/core/metapath/ExpressionTestBase.java index be8ea1ed61..b7b0cf1f28 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/ExpressionTestBase.java +++ b/core/src/test/java/dev/metaschema/core/metapath/ExpressionTestBase.java @@ -5,10 +5,6 @@ package dev.metaschema.core.metapath; -import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; -import dev.metaschema.core.metapath.item.node.INodeItem; -import dev.metaschema.core.util.ObjectUtils; - import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.junit5.JUnit5Mockery; @@ -19,6 +15,9 @@ import java.net.URI; import java.util.stream.Stream; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; public class ExpressionTestBase { diff --git a/core/src/test/java/dev/metaschema/core/metapath/ExpressionUtilsTest.java b/core/src/test/java/dev/metaschema/core/metapath/ExpressionUtilsTest.java index 79d32b2390..8798df7103 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/ExpressionUtilsTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/ExpressionUtilsTest.java @@ -7,14 +7,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.cst.ExpressionUtils; -import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; -import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; -import dev.metaschema.core.metapath.item.node.IFieldNodeItem; -import dev.metaschema.core.metapath.item.node.IFlagNodeItem; -import dev.metaschema.core.metapath.item.node.IModelNodeItem; -import dev.metaschema.core.metapath.item.node.INodeItem; - import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.junit5.JUnit5Mockery; @@ -24,6 +16,14 @@ import java.util.List; +import dev.metaschema.core.metapath.cst.ExpressionUtils; +import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.IFieldNodeItem; +import dev.metaschema.core.metapath.item.node.IFlagNodeItem; +import dev.metaschema.core.metapath.item.node.IModelNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; + class ExpressionUtilsTest { @RegisterExtension diff --git a/core/src/test/java/dev/metaschema/core/metapath/FocusContextTest.java b/core/src/test/java/dev/metaschema/core/metapath/FocusContextTest.java index e6c74073fb..d1c6eb0997 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/FocusContextTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/FocusContextTest.java @@ -10,11 +10,11 @@ import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; + import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.atomic.IIntegerItem; -import org.junit.jupiter.api.Test; - class FocusContextTest { @Test diff --git a/core/src/test/java/dev/metaschema/core/metapath/ISequenceTest.java b/core/src/test/java/dev/metaschema/core/metapath/ISequenceTest.java index 2a8a36e369..cb5f1845bc 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/ISequenceTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/ISequenceTest.java @@ -15,6 +15,12 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; + +import java.util.List; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.atomic.IDecimalItem; @@ -23,12 +29,6 @@ import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; -import org.junit.jupiter.api.Test; - -import java.util.List; -import java.util.Map; -import java.util.Set; - class ISequenceTest { @Test diff --git a/core/src/test/java/dev/metaschema/core/metapath/MetapathExpressionTest.java b/core/src/test/java/dev/metaschema/core/metapath/MetapathExpressionTest.java index e040e0639e..339d3a9a59 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/MetapathExpressionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/MetapathExpressionTest.java @@ -11,14 +11,13 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IBooleanItem; - import org.antlr.v4.runtime.misc.ParseCancellationException; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvFileSource; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import io.hosuaby.inject.resources.junit.jupiter.GivenTextResource; import io.hosuaby.inject.resources.junit.jupiter.TestWithResources; diff --git a/core/src/test/java/dev/metaschema/core/metapath/StaticContextTest.java b/core/src/test/java/dev/metaschema/core/metapath/StaticContextTest.java index 66b51552d2..6fa58b0b92 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/StaticContextTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/StaticContextTest.java @@ -12,9 +12,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.function.IFunction; -import dev.metaschema.core.qname.IEnhancedQName; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -22,6 +19,8 @@ import java.util.stream.Stream; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; class StaticContextTest { diff --git a/core/src/test/java/dev/metaschema/core/metapath/TestUtils.java b/core/src/test/java/dev/metaschema/core/metapath/TestUtils.java index 52d7382a92..03957bfd3b 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/TestUtils.java +++ b/core/src/test/java/dev/metaschema/core/metapath/TestUtils.java @@ -5,6 +5,10 @@ package dev.metaschema.core.metapath; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.Map; + import dev.metaschema.core.datatype.adapter.DecimalAdapter; import dev.metaschema.core.metapath.item.ICollectionValue; import dev.metaschema.core.metapath.item.IItem; @@ -29,11 +33,6 @@ import dev.metaschema.core.metapath.item.function.IMapKey; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; public final class TestUtils { diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/AnonymousFunctionCallTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/AnonymousFunctionCallTest.java index ed45c4c136..72f79e4df3 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/AnonymousFunctionCallTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/AnonymousFunctionCallTest.java @@ -8,6 +8,8 @@ import static dev.metaschema.core.metapath.TestUtils.eqname; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.metapath.IMetapathExpression.ResultType; @@ -15,8 +17,6 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; -import org.junit.jupiter.api.Test; - /** * Unit tests for anonymous function calls in Metapath expressions. *

diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/ArrowExpressionTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/ArrowExpressionTest.java index f5d52af206..4ed957d1ff 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/ArrowExpressionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/ArrowExpressionTest.java @@ -11,14 +11,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.DynamicContext; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.StaticContext; -import dev.metaschema.core.metapath.StaticMetapathException; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.qname.IEnhancedQName; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -26,6 +18,13 @@ import java.util.stream.Stream; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; class ArrowExpressionTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/BuildCstVisitorTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/BuildCstVisitorTest.java index 7e140f5d00..fa334094aa 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/BuildCstVisitorTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/BuildCstVisitorTest.java @@ -23,6 +23,22 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.antlr.v4.runtime.CharStreams; +import org.antlr.v4.runtime.CommonTokenStream; +import org.antlr.v4.runtime.tree.ParseTree; +import org.jmock.Mockery; +import org.jmock.junit5.JUnit5Mockery; +import org.jmock.lib.concurrent.Synchroniser; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.net.URI; +import java.util.List; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IExpression; import dev.metaschema.core.metapath.IMetapathExpression; @@ -53,23 +69,6 @@ import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; import dev.metaschema.core.util.ObjectUtils; - -import org.antlr.v4.runtime.CharStreams; -import org.antlr.v4.runtime.CommonTokenStream; -import org.antlr.v4.runtime.tree.ParseTree; -import org.jmock.Mockery; -import org.jmock.junit5.JUnit5Mockery; -import org.jmock.lib.concurrent.Synchroniser; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - -import java.net.URI; -import java.util.List; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; @SuppressWarnings("PMD.TooManyStaticImports") diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/items/QuantifiedTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/items/QuantifiedTest.java index 5926f30b24..4c7e76eac3 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/items/QuantifiedTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/items/QuantifiedTest.java @@ -7,16 +7,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.DynamicContext; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; import edu.umd.cs.findbugs.annotations.NonNull; class QuantifiedTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/items/RangeTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/items/RangeTest.java index ed538da73f..e689458d66 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/items/RangeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/items/RangeTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; class RangeTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/logic/CSTLogicalExpressionsTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/logic/CSTLogicalExpressionsTest.java index 7a277eec65..f0fd482c68 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/logic/CSTLogicalExpressionsTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/logic/CSTLogicalExpressionsTest.java @@ -7,14 +7,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.DynamicContext; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IExpression; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IBooleanItem; -import dev.metaschema.core.util.ObjectUtils; - import org.jmock.Expectations; import org.jmock.Mockery; import org.junit.jupiter.api.DisplayName; @@ -25,6 +17,14 @@ import java.util.List; import java.util.stream.Stream; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IExpression; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.util.ObjectUtils; + class CSTLogicalExpressionsTest extends ExpressionTestBase { diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/logic/PredicateExpressionTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/logic/PredicateExpressionTest.java index 31c1ec5683..bf094c5829 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/logic/PredicateExpressionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/logic/PredicateExpressionTest.java @@ -11,6 +11,10 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import org.junit.jupiter.api.Test; + +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.ExpressionTestBase; import dev.metaschema.core.metapath.IExpression; @@ -19,11 +23,6 @@ import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; import dev.metaschema.core.util.CollectionUtil; - -import org.junit.jupiter.api.Test; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT") diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/logic/ValueComparisonTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/logic/ValueComparisonTest.java index ec1cc876d3..1686bd14ac 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/logic/ValueComparisonTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/logic/ValueComparisonTest.java @@ -7,6 +7,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import org.jmock.Expectations; +import org.jmock.Mockery; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.ExpressionTestBase; import dev.metaschema.core.metapath.IExpression; @@ -16,14 +24,6 @@ import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import dev.metaschema.core.metapath.item.atomic.IStringItem; -import org.jmock.Expectations; -import org.jmock.Mockery; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - -import java.util.stream.Stream; - class ValueComparisonTest extends ExpressionTestBase { diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/math/AdditionTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/math/AdditionTest.java index 094bedda2d..2ff53df9f7 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/math/AdditionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/math/AdditionTest.java @@ -14,16 +14,15 @@ import static dev.metaschema.core.metapath.TestUtils.yearMonthDuration; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import edu.umd.cs.findbugs.annotations.NonNull; public class AdditionTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/math/DivisionTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/math/DivisionTest.java index efb4f0816a..c8746fbd7b 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/math/DivisionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/math/DivisionTest.java @@ -10,16 +10,15 @@ import static dev.metaschema.core.metapath.TestUtils.yearMonthDuration; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import edu.umd.cs.findbugs.annotations.NonNull; public class DivisionTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/math/IntegerDivisionTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/math/IntegerDivisionTest.java index 42bf941b17..f387e45c49 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/math/IntegerDivisionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/math/IntegerDivisionTest.java @@ -9,17 +9,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.MetapathException; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/math/ModuloTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/math/ModuloTest.java index b413d7a363..017fe543e6 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/math/ModuloTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/math/ModuloTest.java @@ -10,17 +10,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.MetapathException; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/math/MultiplicationTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/math/MultiplicationTest.java index 70581cdb6e..7e4ec9750b 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/math/MultiplicationTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/math/MultiplicationTest.java @@ -11,16 +11,15 @@ import static dev.metaschema.core.metapath.TestUtils.yearMonthDuration; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import edu.umd.cs.findbugs.annotations.NonNull; public class MultiplicationTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/math/NegateTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/math/NegateTest.java index 574d893eae..e97d8dd3a7 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/math/NegateTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/math/NegateTest.java @@ -10,17 +10,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.MetapathException; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/math/SubtractionTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/math/SubtractionTest.java index f4cf51d2fd..3fd3fb296c 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/math/SubtractionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/math/SubtractionTest.java @@ -12,16 +12,15 @@ import static dev.metaschema.core.metapath.TestUtils.yearMonthDuration; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import edu.umd.cs.findbugs.annotations.NonNull; public class SubtractionTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/path/FlagStepTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/path/FlagStepTest.java index c0b4975e18..c658707231 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/path/FlagStepTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/path/FlagStepTest.java @@ -7,6 +7,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import org.jmock.Expectations; +import org.jmock.Mockery; +import org.junit.jupiter.api.Test; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.ExpressionTestBase; import dev.metaschema.core.metapath.item.ISequence; @@ -15,11 +19,6 @@ import dev.metaschema.core.metapath.item.node.NodeItemKind; import dev.metaschema.core.model.IFlagInstance; import dev.metaschema.core.qname.IEnhancedQName; - -import org.jmock.Expectations; -import org.jmock.Mockery; -import org.junit.jupiter.api.Test; - import edu.umd.cs.findbugs.annotations.NonNull; class FlagStepTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/path/RootSlashOnlyPathTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/path/RootSlashOnlyPathTest.java index ccdb39ae0a..b6e0575128 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/path/RootSlashOnlyPathTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/path/RootSlashOnlyPathTest.java @@ -9,6 +9,10 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.doReturn; +import org.junit.jupiter.api.Test; + +import java.net.URI; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.ExpressionTestBase; import dev.metaschema.core.metapath.InvalidTreatTypeDynamicMetapathException; @@ -19,10 +23,6 @@ import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; import dev.metaschema.core.util.CollectionUtil; -import org.junit.jupiter.api.Test; - -import java.net.URI; - class RootSlashOnlyPathTest extends ExpressionTestBase { diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/path/StepTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/path/StepTest.java index 1432fa195a..76d9b74b5d 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/path/StepTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/path/StepTest.java @@ -7,6 +7,12 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.net.URI; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.ExpressionTestBase; import dev.metaschema.core.metapath.IMetapathExpression; @@ -19,13 +25,6 @@ import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; import dev.metaschema.core.util.ObjectUtils; - -import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.Test; - -import java.net.URI; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; class StepTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/type/CastTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/type/CastTest.java index 643fd68843..d3c48c351b 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/type/CastTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/type/CastTest.java @@ -17,13 +17,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.InvalidMetapathGrammarException; -import dev.metaschema.core.metapath.StaticMetapathException; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -31,6 +24,12 @@ import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.InvalidMetapathGrammarException; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import edu.umd.cs.findbugs.annotations.NonNull; class CastTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/type/CastableTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/type/CastableTest.java index 8b41118c4a..00a63f549f 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/type/CastableTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/type/CastableTest.java @@ -9,13 +9,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.InvalidMetapathGrammarException; -import dev.metaschema.core.metapath.StaticMetapathException; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import dev.metaschema.core.util.ObjectUtils; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -23,6 +16,12 @@ import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.InvalidMetapathGrammarException; +import dev.metaschema.core.metapath.StaticMetapathException; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; class CastableTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/cst/type/InstanceOfTest.java b/core/src/test/java/dev/metaschema/core/metapath/cst/type/InstanceOfTest.java index a092e87200..a2d2e0db04 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/cst/type/InstanceOfTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/cst/type/InstanceOfTest.java @@ -9,6 +9,14 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.net.URI; +import java.util.List; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.ExpressionTestBase; import dev.metaschema.core.metapath.IMetapathExpression; @@ -20,15 +28,6 @@ import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; - -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - -import java.net.URI; -import java.util.List; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; class InstanceOfTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/format/JsonPointerFormatterTest.java b/core/src/test/java/dev/metaschema/core/metapath/format/JsonPointerFormatterTest.java index 6f2938f300..a38e449b44 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/format/JsonPointerFormatterTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/format/JsonPointerFormatterTest.java @@ -9,6 +9,14 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; + +import java.net.URI; +import java.util.List; + import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.metapath.item.node.IAssemblyInstanceGroupedNodeItem; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; @@ -26,14 +34,6 @@ import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; import dev.metaschema.core.util.CollectionUtil; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; - -import java.net.URI; -import java.util.List; - /** * Unit tests for {@link JsonPointerFormatter}. */ diff --git a/core/src/test/java/dev/metaschema/core/metapath/format/XPathFormatterTest.java b/core/src/test/java/dev/metaschema/core/metapath/format/XPathFormatterTest.java index cac3525555..4d03e044a1 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/format/XPathFormatterTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/format/XPathFormatterTest.java @@ -10,6 +10,13 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; + +import java.net.URI; + import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.metapath.item.node.IAssemblyInstanceGroupedNodeItem; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; @@ -25,13 +32,6 @@ import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; import dev.metaschema.core.util.CollectionUtil; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; - -import java.net.URI; - /** * Unit tests for {@link XPathFormatter}. */ diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/DefaultFunctionTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/DefaultFunctionTest.java index 4bb6b73561..50c3247e25 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/DefaultFunctionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/DefaultFunctionTest.java @@ -8,14 +8,14 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; +import org.junit.jupiter.api.Test; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import dev.metaschema.core.util.CollectionUtil; -import org.junit.jupiter.api.Test; - class DefaultFunctionTest { /** diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/FunctionServiceTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/FunctionServiceTest.java index 8b973b346c..d2ff26986c 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/FunctionServiceTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/FunctionServiceTest.java @@ -14,6 +14,11 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; + +import java.util.List; +import java.util.stream.Collectors; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.StaticMetapathException; @@ -25,12 +30,6 @@ import dev.metaschema.core.metapath.type.Occurrence; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.CollectionUtil; - -import org.junit.jupiter.api.Test; - -import java.util.List; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/impl/OperationFunctionsTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/impl/OperationFunctionsTest.java index 510980295d..34be209043 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/impl/OperationFunctionsTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/impl/OperationFunctionsTest.java @@ -20,6 +20,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.function.ArithmeticFunctionException; import dev.metaschema.core.metapath.function.CastFunctionException; @@ -34,17 +44,6 @@ import dev.metaschema.core.metapath.item.atomic.INumericItem; import dev.metaschema.core.metapath.item.atomic.ITimeItem; import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayAppendTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayAppendTest.java index f13868c2ce..1b360f8b74 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayAppendTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayAppendTest.java @@ -10,16 +10,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; import edu.umd.cs.findbugs.annotations.NonNull; class ArrayAppendTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayFlattenTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayFlattenTest.java index 3c8ec1cfd3..8e8780ddd6 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayFlattenTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayFlattenTest.java @@ -9,16 +9,15 @@ import static dev.metaschema.core.metapath.TestUtils.sequence; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; class ArrayFlattenTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayGetTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayGetTest.java index bb2dcafeec..949aaeb9ee 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayGetTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayGetTest.java @@ -9,16 +9,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; import edu.umd.cs.findbugs.annotations.NonNull; class ArrayGetTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayHeadTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayHeadTest.java index 9bca58fbfb..1681f70ccd 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayHeadTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayHeadTest.java @@ -11,16 +11,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; class ArrayHeadTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayInsertBeforeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayInsertBeforeTest.java index 17fd61089d..bad7ce7f7e 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayInsertBeforeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayInsertBeforeTest.java @@ -10,16 +10,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; import edu.umd.cs.findbugs.annotations.NonNull; class ArrayInsertBeforeTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayJoinTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayJoinTest.java index ef8a530b09..d9f95ee02f 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayJoinTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayJoinTest.java @@ -10,16 +10,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; import edu.umd.cs.findbugs.annotations.NonNull; class ArrayJoinTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayPutTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayPutTest.java index 89a20063c0..6c55094e69 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayPutTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayPutTest.java @@ -10,16 +10,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; import edu.umd.cs.findbugs.annotations.NonNull; class ArrayPutTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayRemoveTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayRemoveTest.java index 14e3360805..084b6b8a6e 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayRemoveTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayRemoveTest.java @@ -9,16 +9,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; import edu.umd.cs.findbugs.annotations.NonNull; class ArrayRemoveTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayReverseTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayReverseTest.java index df0111c158..514bed617c 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayReverseTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayReverseTest.java @@ -11,16 +11,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; import edu.umd.cs.findbugs.annotations.NonNull; class ArrayReverseTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArraySizeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArraySizeTest.java index 55f022c77e..3bda9b72d4 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArraySizeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArraySizeTest.java @@ -8,17 +8,16 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; class ArraySizeTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArraySubarrayTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArraySubarrayTest.java index de203c44b2..c95b3ec0e1 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArraySubarrayTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArraySubarrayTest.java @@ -9,16 +9,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; import edu.umd.cs.findbugs.annotations.NonNull; class ArraySubarrayTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayTailTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayTailTest.java index a522263bbb..061850e790 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayTailTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/ArrayTailTest.java @@ -11,16 +11,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.function.IArrayItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.function.IArrayItem; import edu.umd.cs.findbugs.annotations.NonNull; class ArrayTailTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/CastFunctionTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/CastFunctionTest.java index ee08679999..e022de818d 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/CastFunctionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/CastFunctionTest.java @@ -11,6 +11,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.util.stream.Stream; + import dev.metaschema.core.metapath.ExpressionTestBase; import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.metapath.MetapathException; @@ -20,14 +27,6 @@ import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.metapath.type.IAtomicOrUnionType; import dev.metaschema.core.util.ObjectUtils; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; class CastFunctionTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAbsTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAbsTest.java index 1f21917311..3b204874fa 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAbsTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAbsTest.java @@ -8,10 +8,6 @@ import static dev.metaschema.core.metapath.TestUtils.decimal; import static dev.metaschema.core.metapath.TestUtils.integer; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.INumericItem; -import dev.metaschema.core.util.CollectionUtil; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -19,6 +15,9 @@ import java.util.stream.Stream; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; class FnAbsTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezoneTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezoneTest.java index a4a581114a..9f382b4038 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezoneTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustDateTimeToTimezoneTest.java @@ -10,19 +10,18 @@ import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.DynamicContext; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; -import dev.metaschema.core.qname.IEnhancedQName; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustDateToTimezoneTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustDateToTimezoneTest.java index 3a146e20e1..de29604260 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustDateToTimezoneTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustDateToTimezoneTest.java @@ -10,19 +10,18 @@ import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.DynamicContext; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IDateItem; -import dev.metaschema.core.qname.IEnhancedQName; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDateItem; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustTimeToTimezoneTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustTimeToTimezoneTest.java index 0b023d9c94..cfe5844857 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustTimeToTimezoneTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAdjustTimeToTimezoneTest.java @@ -10,19 +10,18 @@ import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.DynamicContext; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.ITimeItem; -import dev.metaschema.core.qname.IEnhancedQName; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.ITimeItem; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAvgTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAvgTest.java index 5ceff6e127..07319276e0 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAvgTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnAvgTest.java @@ -12,13 +12,6 @@ import static dev.metaschema.core.metapath.TestUtils.yearMonthDuration; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; -import dev.metaschema.core.util.CollectionUtil; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -27,6 +20,12 @@ import java.util.List; import java.util.stream.Stream; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnBaseUriTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnBaseUriTest.java index b27545cad6..59edbca336 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnBaseUriTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnBaseUriTest.java @@ -9,6 +9,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; + import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.ExpressionTestBase; @@ -18,8 +20,6 @@ import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; -import org.junit.jupiter.api.Test; - /** * Tests for the XPath 3.1 fn:base-uri diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnBooleanTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnBooleanTest.java index 181265ee30..7cdb4e0835 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnBooleanTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnBooleanTest.java @@ -12,14 +12,6 @@ import static dev.metaschema.core.metapath.TestUtils.yearMonthDuration; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IBooleanItem; -import dev.metaschema.core.metapath.item.atomic.IUntypedAtomicItem; -import dev.metaschema.core.metapath.item.node.INodeItem; -import dev.metaschema.core.util.CollectionUtil; - import org.jmock.Expectations; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -29,6 +21,13 @@ import java.util.List; import java.util.stream.Stream; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IUntypedAtomicItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnCeilingTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnCeilingTest.java index 7bcf0df4c9..f28cd16898 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnCeilingTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnCeilingTest.java @@ -8,10 +8,6 @@ import static dev.metaschema.core.metapath.TestUtils.decimal; import static dev.metaschema.core.metapath.TestUtils.integer; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.INumericItem; -import dev.metaschema.core.util.CollectionUtil; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -19,6 +15,9 @@ import java.util.stream.Stream; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; class FnCeilingTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnConcatTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnConcatTest.java index f38e939e52..566fa2cd83 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnConcatTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnConcatTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; class FnConcatTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnContainsTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnContainsTest.java index fe030fe3c0..ab5d5f65a0 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnContainsTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnContainsTest.java @@ -8,15 +8,14 @@ import static dev.metaschema.core.metapath.TestUtils.bool; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IBooleanItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnContainsTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnCountTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnCountTest.java index e28204787c..d49b1ce19b 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnCountTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnCountTest.java @@ -9,17 +9,16 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static dev.metaschema.core.metapath.TestUtils.string; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; -import dev.metaschema.core.util.CollectionUtil; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnCurrentTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnCurrentTimeTest.java index 77b1e6733f..dd0d62aa3b 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnCurrentTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnCurrentTimeTest.java @@ -7,11 +7,11 @@ import static org.junit.jupiter.api.Assertions.assertFalse; +import org.junit.jupiter.api.Test; + import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.util.ObjectUtils; -import org.junit.jupiter.api.Test; - class FnCurrentTimeTest { @Test void test() { diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDataTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDataTest.java index 40dffae225..d6792ffa1f 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDataTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDataTest.java @@ -8,6 +8,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.junit.jupiter.api.Test; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.ExpressionTestBase; import dev.metaschema.core.metapath.IMetapathExpression; @@ -17,8 +19,6 @@ import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; -import org.junit.jupiter.api.Test; - /** * Tests for the XPath 3.1 * fn:data diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDateTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDateTimeTest.java index b1369841cd..b4b1092d36 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDateTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDateTimeTest.java @@ -9,16 +9,15 @@ import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTest.java index d09ad6c4d0..166c5030b4 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnDayFromDateTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTimeTest.java index 824941d922..254b338d06 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDayFromDateTimeTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnDayFromDateTimeTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDaysFromDurationTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDaysFromDurationTest.java index 612072eb82..45ae4fbf28 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDaysFromDurationTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDaysFromDurationTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnDaysFromDurationTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDeepEqualTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDeepEqualTest.java index 9d810f1367..7e51e32769 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDeepEqualTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDeepEqualTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.bool; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IBooleanItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnDeepEqualTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDefaultLanguageTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDefaultLanguageTest.java index 5a25731964..d7d85aa251 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDefaultLanguageTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDefaultLanguageTest.java @@ -7,16 +7,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + +import java.util.Locale; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.util.ObjectUtils; -import org.junit.jupiter.api.Test; - -import java.util.Locale; - class FnDefaultLanguageTest { @Test diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDistinctValuesTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDistinctValuesTest.java index fcd5cd1ff1..41596ebd3b 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDistinctValuesTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDistinctValuesTest.java @@ -11,11 +11,6 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.ISequence; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; @@ -24,6 +19,10 @@ import java.util.Set; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; class FnDistinctValuesTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDocumentAvailableTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDocumentAvailableTest.java index 8d155b8f83..97207a8208 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDocumentAvailableTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDocumentAvailableTest.java @@ -7,11 +7,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.item.atomic.IAnyUriItem; -import org.junit.jupiter.api.Test; - class FnDocumentAvailableTest { /** diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDocumentUriTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDocumentUriTest.java index 1732640125..09dd093d59 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDocumentUriTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnDocumentUriTest.java @@ -10,6 +10,8 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; + import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.ExpressionTestBase; @@ -19,8 +21,6 @@ import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; -import org.junit.jupiter.api.Test; - /** * Tests for the XPath 3.1 fn:document-uri diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnEmptyTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnEmptyTest.java index b1faa8c98e..31e0e9babf 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnEmptyTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnEmptyTest.java @@ -8,15 +8,14 @@ import static dev.metaschema.core.metapath.TestUtils.bool; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; /* diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnEndsWithTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnEndsWithTest.java index 0d0469026c..b23689a8eb 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnEndsWithTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnEndsWithTest.java @@ -8,15 +8,14 @@ import static dev.metaschema.core.metapath.TestUtils.bool; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IBooleanItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnEndsWithTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnExactlyOneTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnExactlyOneTest.java index ca5b8706d4..e7cdc69468 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnExactlyOneTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnExactlyOneTest.java @@ -11,17 +11,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; -import dev.metaschema.core.metapath.item.ISequence; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnExistsTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnExistsTest.java index 46fb53d68a..02a76b2484 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnExistsTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnExistsTest.java @@ -8,17 +8,16 @@ import static dev.metaschema.core.metapath.TestUtils.bool; import static dev.metaschema.core.metapath.TestUtils.integer; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IBooleanItem; -import dev.metaschema.core.util.CollectionUtil; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFalseTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFalseTest.java index ea770a8bb2..a71370e9a9 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFalseTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFalseTest.java @@ -5,12 +5,12 @@ package dev.metaschema.core.metapath.function.library; +import org.junit.jupiter.api.Test; + import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import dev.metaschema.core.util.CollectionUtil; -import org.junit.jupiter.api.Test; - class FnFalseTest extends FunctionTestBase { diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionArityTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionArityTest.java index 33d6e93c8f..1bcc46f846 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionArityTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionArityTest.java @@ -8,17 +8,16 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.IMetapathExpression.ResultType; -import dev.metaschema.core.metapath.item.IItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.IMetapathExpression.ResultType; +import dev.metaschema.core.metapath.item.IItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnFunctionArityTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionLookupTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionLookupTest.java index 4d1cf9706e..0f758f21a1 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionLookupTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionLookupTest.java @@ -9,16 +9,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; class FnFunctionLookupTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionNameTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionNameTest.java index dd44adeed7..c5531d5e86 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionNameTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnFunctionNameTest.java @@ -9,17 +9,16 @@ import static dev.metaschema.core.metapath.TestUtils.sequence; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.MetapathConstants; -import dev.metaschema.core.metapath.item.ISequence; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.MetapathConstants; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; class FnFunctionNameTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHasChildrenTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHasChildrenTest.java index 500064af06..0069eace65 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHasChildrenTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHasChildrenTest.java @@ -8,6 +8,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.util.stream.Stream; + import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.ExpressionTestBase; @@ -16,14 +23,6 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; class FnHasChildrenTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHeadTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHeadTest.java index f35fb6bce1..f02d868892 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHeadTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHeadTest.java @@ -9,16 +9,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; class FnHeadTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromDateTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromDateTimeTest.java index 4e2d3e8dfb..0684747567 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromDateTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromDateTimeTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnHoursFromDateTimeTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromDurationTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromDurationTest.java index ea003cb946..0ac1d8a1d2 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromDurationTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromDurationTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnHoursFromDurationTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromTimeTest.java index c701714241..5eea175138 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnHoursFromTimeTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnHoursFromTimeTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnImplicitTimezoneTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnImplicitTimezoneTest.java index 9211019715..e7a19b0193 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnImplicitTimezoneTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnImplicitTimezoneTest.java @@ -7,16 +7,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.DynamicContext; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import dev.metaschema.core.util.ObjectUtils; - import org.junit.jupiter.api.Test; import java.time.temporal.ChronoField; import java.time.temporal.ChronoUnit; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.util.ObjectUtils; + class FnImplicitTimezoneTest { @Test diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnIndexOfTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnIndexOfTest.java index e8b1fc64bc..83c3030c8a 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnIndexOfTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnIndexOfTest.java @@ -9,17 +9,16 @@ import static dev.metaschema.core.metapath.TestUtils.sequence; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnIndexOfTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnInnermostTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnInnermostTest.java index 930dcf3d53..b2c16985b6 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnInnermostTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnInnermostTest.java @@ -9,6 +9,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.ExpressionTestBase; import dev.metaschema.core.metapath.IMetapathExpression; @@ -18,14 +25,6 @@ import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; class FnInnermostTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnInsertBeforeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnInsertBeforeTest.java index 1d229443b1..c42fcf83f9 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnInsertBeforeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnInsertBeforeTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; class FnInsertBeforeTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnLastTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnLastTest.java index d7b382deb1..2cf8be3d47 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnLastTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnLastTest.java @@ -8,6 +8,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; + import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.FocusContext; @@ -15,8 +17,6 @@ import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.util.ObjectUtils; -import org.junit.jupiter.api.Test; - class FnLastTest { @Test diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnLocalNameTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnLocalNameTest.java index aad8684a40..b450da5cc3 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnLocalNameTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnLocalNameTest.java @@ -9,6 +9,13 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.util.stream.Stream; + import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.ExpressionTestBase; @@ -17,14 +24,6 @@ import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnLowerCaseTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnLowerCaseTest.java index c5bd4ef93b..2930684459 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnLowerCaseTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnLowerCaseTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IStringItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnLowerCaseTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMatchesTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMatchesTest.java index 5b969140cc..746a982521 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMatchesTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMatchesTest.java @@ -13,16 +13,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.DynamicContext; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.function.regex.RegularExpressionMetapathException; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IBooleanItem; -import dev.metaschema.core.metapath.item.atomic.IStringItem; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -32,6 +22,15 @@ import java.util.regex.PatternSyntaxException; import java.util.stream.Stream; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.function.regex.RegularExpressionMetapathException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; class FnMatchesTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinMaxTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinMaxTest.java index 11c3e1ff0c..e2cad2cc3a 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinMaxTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinMaxTest.java @@ -11,11 +11,6 @@ import static dev.metaschema.core.metapath.TestUtils.uri; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import dev.metaschema.core.util.CollectionUtil; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -24,6 +19,10 @@ import java.util.List; import java.util.stream.Stream; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDateTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDateTimeTest.java index a60b2f0683..b4907b8621 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDateTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDateTimeTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnMinutesFromDateTimeTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDurationTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDurationTest.java index 54efd0862f..8a66ce7c95 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDurationTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromDurationTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnMinutesFromDurationTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromTimeTest.java index c8a219c571..41f65853a7 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMinutesFromTimeTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnMinutesFromTimeTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTest.java index 6865b62d17..d18f85b116 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnMonthFromDateTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTimeTest.java index 5d832e7aea..2ce2562a73 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthFromDateTimeTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnMonthFromDateTimeTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthsFromDurationTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthsFromDurationTest.java index 73ce4c4081..342e26ab2d 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthsFromDurationTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnMonthsFromDurationTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnMonthsFromDurationTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNameTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNameTest.java index f1379676f9..0c5e19fca8 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNameTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNameTest.java @@ -9,6 +9,13 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.util.stream.Stream; + import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.ExpressionTestBase; @@ -17,14 +24,6 @@ import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNamespaceUriTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNamespaceUriTest.java index 98e547d752..992280f66f 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNamespaceUriTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNamespaceUriTest.java @@ -9,6 +9,13 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.util.stream.Stream; + import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.ExpressionTestBase; @@ -17,14 +24,6 @@ import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNormalizeSpaceTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNormalizeSpaceTest.java index 11d02b02fe..ef7ada22b8 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNormalizeSpaceTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNormalizeSpaceTest.java @@ -10,12 +10,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IStringItem; -import dev.metaschema.core.util.CollectionUtil; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -23,6 +17,11 @@ import java.util.stream.Stream; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; class FnNormalizeSpaceTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNotTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNotTest.java index 50af13c75f..9cc00c450e 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNotTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnNotTest.java @@ -12,14 +12,6 @@ import static dev.metaschema.core.metapath.TestUtils.yearMonthDuration; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IBooleanItem; -import dev.metaschema.core.metapath.item.atomic.IUntypedAtomicItem; -import dev.metaschema.core.metapath.item.node.INodeItem; -import dev.metaschema.core.util.CollectionUtil; - import org.jmock.Expectations; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -29,6 +21,13 @@ import java.util.List; import java.util.stream.Stream; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IUntypedAtomicItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnOneOrMoreTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnOneOrMoreTest.java index 980b82ce27..2fd4881e81 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnOneOrMoreTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnOneOrMoreTest.java @@ -11,17 +11,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; -import dev.metaschema.core.metapath.item.ISequence; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnOutermostTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnOutermostTest.java index 634aa945f5..ffb5f7558f 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnOutermostTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnOutermostTest.java @@ -9,6 +9,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.util.stream.Stream; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.ExpressionTestBase; import dev.metaschema.core.metapath.IMetapathExpression; @@ -18,14 +25,6 @@ import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; class FnOutermostTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnPathTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnPathTest.java index 885c6a2231..14d03d5504 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnPathTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnPathTest.java @@ -10,14 +10,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; -import dev.metaschema.core.metapath.DynamicContext; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IStringItem; -import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; -import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -25,6 +17,13 @@ import java.util.stream.Stream; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; +import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnPositionTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnPositionTest.java index 27c050af70..ab0c254301 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnPositionTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnPositionTest.java @@ -8,6 +8,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; + import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.FocusContext; @@ -15,8 +17,6 @@ import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import dev.metaschema.core.util.ObjectUtils; -import org.junit.jupiter.api.Test; - class FnPositionTest { @Test diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnQNameTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnQNameTest.java index 298f6a7545..439af103f9 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnQNameTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnQNameTest.java @@ -9,16 +9,15 @@ import static dev.metaschema.core.metapath.TestUtils.sequence; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; class FnQNameTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnRemoveTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnRemoveTest.java index 06cd65f81a..188fc21a97 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnRemoveTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnRemoveTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; class FnRemoveTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnReverseTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnReverseTest.java index 959120393e..ccd656d6fe 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnReverseTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnReverseTest.java @@ -10,16 +10,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; class FnReverseTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnRootTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnRootTest.java index da1f0531e1..5ce33375a6 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnRootTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnRootTest.java @@ -8,6 +8,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.util.stream.Stream; + import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.ExpressionTestBase; @@ -16,14 +23,6 @@ import dev.metaschema.core.metapath.item.node.INodeItem; import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; class FnRootTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnRoundTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnRoundTest.java index 21adc5711d..e33e448262 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnRoundTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnRoundTest.java @@ -8,12 +8,6 @@ import static dev.metaschema.core.metapath.TestUtils.decimal; import static dev.metaschema.core.metapath.TestUtils.integer; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; -import dev.metaschema.core.metapath.item.atomic.INumericItem; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -22,6 +16,11 @@ import java.util.List; import java.util.stream.Stream; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.INumericItem; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; class FnRoundTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDateTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDateTimeTest.java index 600d946eaf..a4cc4d5454 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDateTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDateTimeTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.decimal; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IDecimalItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnSecondsFromDateTimeTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDurationTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDurationTest.java index aae4619002..e34086984d 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDurationTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromDurationTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.decimal; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IDecimalItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnSecondsFromDurationTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromTimeTest.java index 25a21b8303..c48dc347a0 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSecondsFromTimeTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.decimal; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IDecimalItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IDecimalItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnSecondsFromTimeTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStartsWithTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStartsWithTest.java index 2e181c36ec..ab6f675910 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStartsWithTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStartsWithTest.java @@ -8,11 +8,6 @@ import static dev.metaschema.core.metapath.TestUtils.bool; import static dev.metaschema.core.metapath.TestUtils.string; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IBooleanItem; -import dev.metaschema.core.metapath.item.atomic.IStringItem; -import dev.metaschema.core.util.ObjectUtils; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; @@ -20,6 +15,10 @@ import java.util.List; import java.util.stream.Stream; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IBooleanItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.Nullable; class FnStartsWithTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringJoinTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringJoinTest.java index 2d4dd03c03..43219a59cc 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringJoinTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringJoinTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IStringItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnStringJoinTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringLengthTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringLengthTest.java index ca52424ea7..9e3dccef19 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringLengthTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringLengthTest.java @@ -10,14 +10,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; -import dev.metaschema.core.metapath.item.atomic.IStringItem; -import dev.metaschema.core.util.CollectionUtil; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -25,6 +17,13 @@ import java.util.stream.Stream; +import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; class FnStringLengthTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringTest.java index 23c9139ff6..9bad069edc 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnStringTest.java @@ -13,6 +13,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.util.List; +import java.util.stream.Stream; + import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException; import dev.metaschema.core.metapath.ExpressionTestBase; import dev.metaschema.core.metapath.IMetapathExpression; @@ -22,15 +30,6 @@ import dev.metaschema.core.metapath.type.InvalidTypeMetapathException; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - -import java.util.List; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; class FnStringTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringAfterTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringAfterTest.java index 98dd4c587a..5042e15b00 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringAfterTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringAfterTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IStringItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnSubstringAfterTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringBeforeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringBeforeTest.java index 3d989c6b5f..6ee2a6a4f6 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringBeforeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringBeforeTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IStringItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnSubstringBeforeTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringTest.java index 61695f5b51..5e301fca4e 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSubstringTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IStringItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnSubstringTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSumTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSumTest.java index 43a275b41d..56f91e5864 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSumTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnSumTest.java @@ -11,14 +11,6 @@ import static dev.metaschema.core.metapath.TestUtils.yearMonthDuration; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; -import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -27,6 +19,13 @@ import java.util.List; import java.util.stream.Stream; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; +import dev.metaschema.core.metapath.item.atomic.IYearMonthDurationItem; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTailTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTailTest.java index e3315e2177..950e748b7b 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTailTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTailTest.java @@ -9,16 +9,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; class FnTailTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTest.java index 6fb09c1f7d..e3e612e84e 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTest.java @@ -9,17 +9,16 @@ import static dev.metaschema.core.metapath.TestUtils.sequence; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTimeTest.java index f58e8a0958..b2e5e2bfd9 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromDateTimeTest.java @@ -9,17 +9,16 @@ import static dev.metaschema.core.metapath.TestUtils.sequence; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromTimeTest.java index 701a622457..55334fcaf6 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTimezoneFromTimeTest.java @@ -9,17 +9,16 @@ import static dev.metaschema.core.metapath.TestUtils.sequence; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IDayTimeDurationItem; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTokenizeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTokenizeTest.java index d38fa48ef9..eccea6b542 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTokenizeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTokenizeTest.java @@ -11,12 +11,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.function.regex.RegularExpressionMetapathException; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.util.ObjectUtils; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -26,6 +20,11 @@ import java.util.regex.PatternSyntaxException; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.function.regex.RegularExpressionMetapathException; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; class FnTokenizeTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTrueTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTrueTest.java index 9943a41614..e2d5aa627e 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTrueTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnTrueTest.java @@ -5,12 +5,12 @@ package dev.metaschema.core.metapath.function.library; +import org.junit.jupiter.api.Test; + import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.IBooleanItem; import dev.metaschema.core.util.CollectionUtil; -import org.junit.jupiter.api.Test; - class FnTrueTest extends FunctionTestBase { diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnUpperCaseTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnUpperCaseTest.java index ec2acf064b..21695ffe9c 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnUpperCaseTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnUpperCaseTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IStringItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IStringItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnUpperCaseTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTest.java index 042dc2cdc0..45f777e336 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnYearFromDateTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTimeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTimeTest.java index e9c1053a0e..2d9d65564a 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTimeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearFromDateTimeTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnYearFromDateTimeTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearsFromDurationTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearsFromDurationTest.java index 8aa5a56a62..45c4d00d81 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearsFromDurationTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnYearsFromDurationTest.java @@ -8,16 +8,15 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; class FnYearsFromDurationTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnZeroOrOneTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnZeroOrOneTest.java index d787513fbf..838db678f4 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FnZeroOrOneTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FnZeroOrOneTest.java @@ -11,17 +11,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; -import dev.metaschema.core.metapath.item.ISequence; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/FunctionTestBase.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/FunctionTestBase.java index 0c09beb7a0..88e590bc4b 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/FunctionTestBase.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/FunctionTestBase.java @@ -8,15 +8,14 @@ import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.ExpressionTestBase; import dev.metaschema.core.metapath.function.IFunction; import dev.metaschema.core.metapath.item.IItem; import dev.metaschema.core.metapath.item.ISequence; import dev.metaschema.core.metapath.item.atomic.INumericItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapContainsTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapContainsTest.java index 0a8b11085d..7800adccd9 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapContainsTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapContainsTest.java @@ -8,17 +8,16 @@ import static dev.metaschema.core.metapath.TestUtils.bool; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.function.LookupTest; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.function.LookupTest; import edu.umd.cs.findbugs.annotations.NonNull; class MapContainsTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapEntryTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapEntryTest.java index a095bdb7e8..38add0b487 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapEntryTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapEntryTest.java @@ -10,17 +10,16 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.function.IMapItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.function.IMapItem; import edu.umd.cs.findbugs.annotations.NonNull; class MapEntryTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapFindTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapFindTest.java index 254f496024..e964565ccc 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapFindTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapFindTest.java @@ -12,16 +12,15 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; import edu.umd.cs.findbugs.annotations.NonNull; class MapFindTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapForEachTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapForEachTest.java index 1f96271edb..a6cff540df 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapForEachTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapForEachTest.java @@ -12,17 +12,16 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.assertj.core.api.Assertions.assertThat; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.ISequence; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; class MapForEachTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapGetTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapGetTest.java index e19669f97c..fbb52c7ea7 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapGetTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapGetTest.java @@ -9,17 +9,16 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.function.LookupTest; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.function.LookupTest; import edu.umd.cs.findbugs.annotations.NonNull; class MapGetTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapKeysTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapKeysTest.java index 53b4a62943..309600df55 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapKeysTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapKeysTest.java @@ -8,16 +8,16 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; - import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.Set; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; + class MapKeysTest extends ExpressionTestBase { diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapMergeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapMergeTest.java index 4793c6dcac..e97c578411 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapMergeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapMergeTest.java @@ -12,17 +12,16 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.function.LookupTest; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.function.LookupTest; import edu.umd.cs.findbugs.annotations.NonNull; class MapMergeTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapPutTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapPutTest.java index 86ac28a91c..583a21a6fb 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapPutTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapPutTest.java @@ -11,18 +11,17 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.function.IMapItem; -import dev.metaschema.core.metapath.item.function.LookupTest; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.item.function.LookupTest; import edu.umd.cs.findbugs.annotations.NonNull; class MapPutTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapRemoveTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapRemoveTest.java index 0410b93185..d905d00b65 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapRemoveTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapRemoveTest.java @@ -11,18 +11,17 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.function.IMapItem; -import dev.metaschema.core.metapath.item.function.LookupTest; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.function.IMapItem; +import dev.metaschema.core.metapath.item.function.LookupTest; import edu.umd.cs.findbugs.annotations.NonNull; class MapRemoveTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapSizeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapSizeTest.java index 6f5d3b1049..a06ef5f183 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/MapSizeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MapSizeTest.java @@ -8,17 +8,16 @@ import static dev.metaschema.core.metapath.TestUtils.integer; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.IItem; -import dev.metaschema.core.metapath.item.atomic.IIntegerItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.IItem; +import dev.metaschema.core.metapath.item.atomic.IIntegerItem; import edu.umd.cs.findbugs.annotations.NonNull; class MapSizeTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/function/library/MpBase64EncodeDecodeTest.java b/core/src/test/java/dev/metaschema/core/metapath/function/library/MpBase64EncodeDecodeTest.java index ee6e535c69..07ba43b738 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/function/library/MpBase64EncodeDecodeTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/function/library/MpBase64EncodeDecodeTest.java @@ -8,18 +8,17 @@ import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.item.atomic.IBase64BinaryItem; -import dev.metaschema.core.metapath.item.atomic.IStringItem; -import dev.metaschema.core.util.ObjectUtils; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.item.atomic.IBase64BinaryItem; +import dev.metaschema.core.metapath.item.atomic.IStringItem; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; class MpBase64EncodeDecodeTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IBase64BinaryItemTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IBase64BinaryItemTest.java index 1425b6053a..8d12e7c5cb 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IBase64BinaryItemTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IBase64BinaryItemTest.java @@ -9,8 +9,6 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.util.ObjectUtils; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -20,6 +18,7 @@ import java.nio.ByteBuffer; import java.util.stream.Stream; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; class IBase64BinaryItemTest { diff --git a/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IBooleanItemTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IBooleanItemTest.java index 41e2e05cb9..e3a71e6d37 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IBooleanItemTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IBooleanItemTest.java @@ -10,8 +10,6 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.util.ObjectUtils; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -20,6 +18,7 @@ import java.util.stream.Stream; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; class IBooleanItemTest { diff --git a/core/src/test/java/dev/metaschema/core/metapath/item/atomic/INumericItemTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/INumericItemTest.java index bb5c631cad..c2d61f413d 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/item/atomic/INumericItemTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/INumericItemTest.java @@ -10,8 +10,6 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -19,6 +17,7 @@ import java.util.stream.Stream; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; import edu.umd.cs.findbugs.annotations.NonNull; class INumericItemTest { diff --git a/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IUuidItemTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IUuidItemTest.java index 2ab4467ac6..e53abdf0ef 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IUuidItemTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/IUuidItemTest.java @@ -7,9 +7,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.DynamicContext; -import dev.metaschema.core.util.ObjectUtils; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; @@ -17,6 +14,8 @@ import java.util.UUID; import java.util.stream.Stream; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; class IUuidItemTest { diff --git a/core/src/test/java/dev/metaschema/core/metapath/item/atomic/NumericCastSymmetryTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/NumericCastSymmetryTest.java index 7e95ba0d59..088d91a2d2 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/item/atomic/NumericCastSymmetryTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/atomic/NumericCastSymmetryTest.java @@ -12,14 +12,13 @@ import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.function.InvalidValueForCastFunctionException; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/metapath/item/function/IArrayItemTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/function/IArrayItemTest.java index 9a0b8b3b24..43f9ee49db 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/item/function/IArrayItemTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/function/IArrayItemTest.java @@ -11,15 +11,14 @@ import static dev.metaschema.core.metapath.TestUtils.string; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; import edu.umd.cs.findbugs.annotations.NonNull; class IArrayItemTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/item/function/IMapKeyTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/function/IMapKeyTest.java index da43986a96..ef076deeb4 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/item/function/IMapKeyTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/function/IMapKeyTest.java @@ -16,15 +16,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; -import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.stream.Stream; +import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; +import dev.metaschema.core.metapath.item.atomic.IDateTimeItem; import edu.umd.cs.findbugs.annotations.NonNull; class IMapKeyTest { diff --git a/core/src/test/java/dev/metaschema/core/metapath/item/function/LookupTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/function/LookupTest.java index 274d7f35bd..ea742122f8 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/item/function/LookupTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/function/LookupTest.java @@ -16,11 +16,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import dev.metaschema.core.metapath.ExpressionTestBase; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.MetapathException; -import dev.metaschema.core.metapath.item.ISequence; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -28,6 +23,10 @@ import java.util.stream.Stream; +import dev.metaschema.core.metapath.ExpressionTestBase; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.MetapathException; +import dev.metaschema.core.metapath.item.ISequence; import edu.umd.cs.findbugs.annotations.NonNull; public class LookupTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitorTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitorTest.java index d53186d23a..fb206cada4 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitorTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/node/AbstractRecursionPreventingNodeItemVisitorTest.java @@ -7,17 +7,17 @@ import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.model.ISource; -import dev.metaschema.core.testsupport.MockedModelTestSupport; -import dev.metaschema.core.testsupport.builder.IModuleBuilder; - import org.junit.jupiter.api.Test; import java.net.URI; import java.time.Duration; import java.util.List; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.testsupport.MockedModelTestSupport; +import dev.metaschema.core.testsupport.builder.IModuleBuilder; + class AbstractRecursionPreventingNodeItemVisitorTest { private static final String TEST_NAMESPACE = "http://example.com/ns/recursion-test"; diff --git a/core/src/test/java/dev/metaschema/core/metapath/item/node/DefaultNodeItemFactoryTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/node/DefaultNodeItemFactoryTest.java index 71239b3938..f6e115b001 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/item/node/DefaultNodeItemFactoryTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/node/DefaultNodeItemFactoryTest.java @@ -4,6 +4,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; +import org.junit.jupiter.api.Test; + +import java.util.Collection; +import java.util.List; +import java.util.stream.Collectors; + import dev.metaschema.core.mdm.IDMAssemblyNodeItem; import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.metapath.item.atomic.IStringItem; @@ -12,13 +18,6 @@ import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.testsupport.MockedModelTestSupport; import dev.metaschema.core.util.ObjectUtils; - -import org.junit.jupiter.api.Test; - -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; class DefaultNodeItemFactoryTest diff --git a/core/src/test/java/dev/metaschema/core/metapath/item/node/NodeItemTraversalTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/node/NodeItemTraversalTest.java index c206219d7d..2d09793f40 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/item/node/NodeItemTraversalTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/node/NodeItemTraversalTest.java @@ -10,6 +10,13 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; + +import java.net.URI; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + import dev.metaschema.core.mdm.IDMAssemblyNodeItem; import dev.metaschema.core.mdm.IDMDocumentNodeItem; import dev.metaschema.core.mdm.IDMFieldNodeItem; @@ -27,13 +34,6 @@ import dev.metaschema.core.testsupport.builder.IModuleBuilder; import dev.metaschema.core.util.ObjectUtils; -import org.junit.jupiter.api.Test; - -import java.net.URI; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - /** * Comprehensive tests for Metapath node item traversal and navigation. */ diff --git a/core/src/test/java/dev/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitorTest.java b/core/src/test/java/dev/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitorTest.java index 494da37cb3..c0eeb04613 100644 --- a/core/src/test/java/dev/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitorTest.java +++ b/core/src/test/java/dev/metaschema/core/metapath/item/node/RecursionCollectingNodeItemVisitorTest.java @@ -8,17 +8,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.model.ISource; -import dev.metaschema.core.testsupport.MockedModelTestSupport; -import dev.metaschema.core.testsupport.builder.IModuleBuilder; - import org.junit.jupiter.api.Test; import java.net.URI; import java.util.List; import java.util.Set; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.testsupport.MockedModelTestSupport; +import dev.metaschema.core.testsupport.builder.IModuleBuilder; + class RecursionCollectingNodeItemVisitorTest { private static final String TEST_NAMESPACE = "http://example.com/ns/recursion-test"; diff --git a/core/src/test/java/dev/metaschema/core/model/constraint/CardinalityConstraintTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/CardinalityConstraintTest.java index 9859fd9ed5..21d0d32a28 100644 --- a/core/src/test/java/dev/metaschema/core/model/constraint/CardinalityConstraintTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/CardinalityConstraintTest.java @@ -13,6 +13,10 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; + +import java.net.URI; + import dev.metaschema.core.mdm.IDMAssemblyNodeItem; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IMetapathExpression; @@ -24,11 +28,6 @@ import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.testsupport.MockedModelTestSupport; import dev.metaschema.core.util.ObjectUtils; - -import org.junit.jupiter.api.Test; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/model/constraint/DefaultConstraintValidatorTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/DefaultConstraintValidatorTest.java index 925059d9f5..a1959df718 100644 --- a/core/src/test/java/dev/metaschema/core/model/constraint/DefaultConstraintValidatorTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/DefaultConstraintValidatorTest.java @@ -18,6 +18,11 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; +import org.junit.jupiter.api.Test; + +import java.net.URI; +import java.util.List; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.StaticContext; @@ -31,12 +36,6 @@ import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import org.junit.jupiter.api.Test; - -import java.net.URI; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; @SuppressWarnings("PMD.TooManyStaticImports") diff --git a/core/src/test/java/dev/metaschema/core/model/constraint/DefaultConstraintValidatorThreadSafetyTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/DefaultConstraintValidatorThreadSafetyTest.java index c7336f7207..b72307e273 100644 --- a/core/src/test/java/dev/metaschema/core/model/constraint/DefaultConstraintValidatorThreadSafetyTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/DefaultConstraintValidatorThreadSafetyTest.java @@ -11,14 +11,6 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.metapath.StaticContext; -import dev.metaschema.core.metapath.item.ISequence; -import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; -import dev.metaschema.core.metapath.item.node.INodeItem; -import dev.metaschema.core.model.ISource; -import dev.metaschema.core.util.ObjectUtils; - import org.junit.jupiter.api.Test; import java.util.Collections; @@ -28,6 +20,13 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.ISequence; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/model/constraint/ExpectConstraintTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/ExpectConstraintTest.java index 998c346fad..b6154646da 100644 --- a/core/src/test/java/dev/metaschema/core/model/constraint/ExpectConstraintTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/ExpectConstraintTest.java @@ -17,11 +17,15 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; +import org.junit.jupiter.api.Test; + +import java.net.URI; + import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.mdm.IDMFieldNodeItem; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.metapath.StaticContext; -import dev.metaschema.core.mdm.IDMFieldNodeItem; import dev.metaschema.core.metapath.format.IPathFormatter; import dev.metaschema.core.metapath.item.atomic.IStringItem; import dev.metaschema.core.metapath.item.node.IFlagNodeItem; @@ -35,11 +39,6 @@ import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import org.junit.jupiter.api.Test; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessorTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessorTest.java index d566e4023f..0fa81e10e7 100644 --- a/core/src/test/java/dev/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessorTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/ExternalConstraintsModulePostProcessorTest.java @@ -7,6 +7,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + +import java.net.URI; +import java.util.Collections; +import java.util.List; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.model.IAssemblyDefinition; @@ -17,12 +23,6 @@ import dev.metaschema.core.testsupport.builder.IModuleBuilder; import dev.metaschema.core.util.ObjectUtils; -import org.junit.jupiter.api.Test; - -import java.net.URI; -import java.util.Collections; -import java.util.List; - class ExternalConstraintsModulePostProcessorTest { private static final String TEST_NAMESPACE = "http://csrc.nist.gov/ns/test/metaschema/constraint-targeting-test"; diff --git a/core/src/test/java/dev/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandlerTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandlerTest.java index 8ff0efe34e..d6b1a15bb5 100644 --- a/core/src/test/java/dev/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandlerTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/FindingCollectingConstraintValidationHandlerTest.java @@ -11,14 +11,6 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import dev.metaschema.core.metapath.DynamicContext; -import dev.metaschema.core.metapath.StaticContext; -import dev.metaschema.core.metapath.format.IPathFormatter; -import dev.metaschema.core.metapath.item.node.INodeItem; -import dev.metaschema.core.model.ISource; -import dev.metaschema.core.model.constraint.IConstraint.Level; -import dev.metaschema.core.util.ObjectUtils; - import org.junit.jupiter.api.Test; import java.util.List; @@ -27,6 +19,13 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; @SuppressWarnings("PMD.TooManyStaticImports") diff --git a/core/src/test/java/dev/metaschema/core/model/constraint/IndexUniqueConstraintTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/IndexUniqueConstraintTest.java index aae40654b8..929b7e3b1b 100644 --- a/core/src/test/java/dev/metaschema/core/model/constraint/IndexUniqueConstraintTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/IndexUniqueConstraintTest.java @@ -13,6 +13,10 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; + +import java.net.URI; + import dev.metaschema.core.mdm.IDMAssemblyNodeItem; import dev.metaschema.core.mdm.IDMFieldNodeItem; import dev.metaschema.core.metapath.DynamicContext; @@ -26,11 +30,6 @@ import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.testsupport.MockedModelTestSupport; import dev.metaschema.core.util.ObjectUtils; - -import org.junit.jupiter.api.Test; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/model/constraint/MatchesConstraintTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/MatchesConstraintTest.java index 8dd6201d21..8c8f971508 100644 --- a/core/src/test/java/dev/metaschema/core/model/constraint/MatchesConstraintTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/MatchesConstraintTest.java @@ -17,6 +17,10 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; +import org.junit.jupiter.api.Test; + +import java.net.URI; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.StaticContext; @@ -29,11 +33,6 @@ import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import org.junit.jupiter.api.Test; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/model/constraint/ParallelValidationConfigTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/ParallelValidationConfigTest.java index f7ae9b52ce..1a2e5a02ab 100644 --- a/core/src/test/java/dev/metaschema/core/model/constraint/ParallelValidationConfigTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/ParallelValidationConfigTest.java @@ -9,13 +9,13 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.core.util.ObjectUtils; - import org.junit.jupiter.api.Test; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import dev.metaschema.core.util.ObjectUtils; + class ParallelValidationConfigTest { @Test diff --git a/core/src/test/java/dev/metaschema/core/model/constraint/ReportConstraintTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/ReportConstraintTest.java index 9b7895a348..ab6535a634 100644 --- a/core/src/test/java/dev/metaschema/core/model/constraint/ReportConstraintTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/ReportConstraintTest.java @@ -21,6 +21,10 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; +import org.junit.jupiter.api.Test; + +import java.net.URI; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.metapath.StaticContext; @@ -35,11 +39,6 @@ import dev.metaschema.core.testsupport.mocking.MockNodeItemFactory; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import org.junit.jupiter.api.Test; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraintTest.java b/core/src/test/java/dev/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraintTest.java index cb31607d52..8e467ed795 100644 --- a/core/src/test/java/dev/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraintTest.java +++ b/core/src/test/java/dev/metaschema/core/model/constraint/impl/AbstractConfigurableMessageConstraintTest.java @@ -9,6 +9,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; + +import java.net.URI; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.ExpressionTestBase; import dev.metaschema.core.metapath.IMetapathExpression; @@ -22,10 +26,6 @@ import dev.metaschema.core.testsupport.mocking.MockedDocumentGenerator; import dev.metaschema.core.util.ObjectUtils; -import org.junit.jupiter.api.Test; - -import java.net.URI; - class AbstractConfigurableMessageConstraintTest extends ExpressionTestBase { diff --git a/core/src/test/java/dev/metaschema/core/model/validation/SchemaContentValidatorTest.java b/core/src/test/java/dev/metaschema/core/model/validation/SchemaContentValidatorTest.java index 0d935e6573..aaee2e9635 100644 --- a/core/src/test/java/dev/metaschema/core/model/validation/SchemaContentValidatorTest.java +++ b/core/src/test/java/dev/metaschema/core/model/validation/SchemaContentValidatorTest.java @@ -10,9 +10,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.core.model.constraint.IConstraint.Level; -import dev.metaschema.core.util.ObjectUtils; - import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; @@ -24,6 +21,8 @@ import javax.xml.transform.stream.StreamSource; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/testsupport/builder/AbstractMetaschemaBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/AbstractMetaschemaBuilder.java index 43f707666d..578b785eac 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/builder/AbstractMetaschemaBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/AbstractMetaschemaBuilder.java @@ -20,7 +20,6 @@ import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.core.util.StringUtils; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/testsupport/builder/AbstractModelBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/AbstractModelBuilder.java index f8f1360059..e51c851e1a 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/builder/AbstractModelBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/AbstractModelBuilder.java @@ -5,11 +5,10 @@ package dev.metaschema.core.testsupport.builder; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; - import java.util.List; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.Nullable; /** diff --git a/core/src/test/java/dev/metaschema/core/testsupport/builder/AssemblyBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/AssemblyBuilder.java index 8ba1790e37..9e513148b4 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/builder/AssemblyBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/AssemblyBuilder.java @@ -8,6 +8,12 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IAssemblyInstance; import dev.metaschema.core.model.IAssemblyInstanceAbsolute; @@ -23,13 +29,6 @@ import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/testsupport/builder/AssemblyReference.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/AssemblyReference.java index 487dee7382..1fccab9362 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/builder/AssemblyReference.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/AssemblyReference.java @@ -5,13 +5,12 @@ package dev.metaschema.core.testsupport.builder; +import java.util.List; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.INamedModelInstanceAbsolute; import dev.metaschema.core.model.ISource; import dev.metaschema.core.qname.IEnhancedQName; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/testsupport/builder/ConstraintSetBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/ConstraintSetBuilder.java index bb9a128bd0..01aabad7b2 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/builder/ConstraintSetBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/ConstraintSetBuilder.java @@ -5,16 +5,15 @@ package dev.metaschema.core.testsupport.builder; -import dev.metaschema.core.model.ISource; -import dev.metaschema.core.model.constraint.IConstraintSet; -import dev.metaschema.core.model.constraint.MetaConstraintSet; -import dev.metaschema.core.util.ObjectUtils; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.function.Consumer; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.model.constraint.MetaConstraintSet; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/testsupport/builder/ContextBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/ContextBuilder.java index 90c8b387ab..e9abac6f1b 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/builder/ContextBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/ContextBuilder.java @@ -5,6 +5,10 @@ package dev.metaschema.core.testsupport.builder; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; + import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.model.ISource; import dev.metaschema.core.model.constraint.AbstractConstraintBuilder; @@ -19,11 +23,6 @@ import dev.metaschema.core.model.constraint.IModelConstrained; import dev.metaschema.core.model.constraint.IUniqueConstraint; import dev.metaschema.core.model.constraint.MetaConstraintSet; - -import java.util.ArrayList; -import java.util.List; -import java.util.function.Consumer; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/testsupport/builder/FieldBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/FieldBuilder.java index 4d580e04f0..3f2f9931b4 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/builder/FieldBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/FieldBuilder.java @@ -8,6 +8,10 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.model.IAssemblyDefinition; @@ -20,11 +24,6 @@ import dev.metaschema.core.model.constraint.ValueConstraintSet; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/testsupport/builder/FieldReference.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/FieldReference.java index fff9925e0c..c72557bf28 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/builder/FieldReference.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/FieldReference.java @@ -5,13 +5,12 @@ package dev.metaschema.core.testsupport.builder; +import java.util.List; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.INamedModelInstanceAbsolute; import dev.metaschema.core.model.ISource; import dev.metaschema.core.qname.IEnhancedQName; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/testsupport/builder/FlagBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/FlagBuilder.java index b01ba41d33..e1a6ad354a 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/builder/FlagBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/FlagBuilder.java @@ -17,7 +17,6 @@ import dev.metaschema.core.model.ModelType; import dev.metaschema.core.model.constraint.ValueConstraintSet; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/testsupport/builder/IAssemblyBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/IAssemblyBuilder.java index 9f0eb5b7b7..fdb433a75e 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/builder/IAssemblyBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/IAssemblyBuilder.java @@ -5,15 +5,14 @@ package dev.metaschema.core.testsupport.builder; +import java.net.URI; +import java.util.List; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IAssemblyInstanceAbsolute; import dev.metaschema.core.model.IModule; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/testsupport/builder/IConstraintSetBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/IConstraintSetBuilder.java index 922e477876..fae1db96bf 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/builder/IConstraintSetBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/IConstraintSetBuilder.java @@ -5,11 +5,10 @@ package dev.metaschema.core.testsupport.builder; -import dev.metaschema.core.model.ISource; -import dev.metaschema.core.model.constraint.IConstraintSet; - import java.util.function.Consumer; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.IConstraintSet; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/testsupport/builder/IContextBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/IContextBuilder.java index 018085c8ec..d39e851a6f 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/builder/IContextBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/IContextBuilder.java @@ -5,11 +5,10 @@ package dev.metaschema.core.testsupport.builder; -import dev.metaschema.core.model.constraint.AbstractConstraintBuilder; -import dev.metaschema.core.model.constraint.IConstraint; - import java.util.function.Consumer; +import dev.metaschema.core.model.constraint.AbstractConstraintBuilder; +import dev.metaschema.core.model.constraint.IConstraint; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/testsupport/builder/IFieldBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/IFieldBuilder.java index bd048d2451..657b966135 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/builder/IFieldBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/IFieldBuilder.java @@ -10,7 +10,6 @@ import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IFieldInstanceAbsolute; import dev.metaschema.core.model.IModule; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/testsupport/builder/IFlagBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/IFlagBuilder.java index 8a7e37e5e0..0b0d372788 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/builder/IFlagBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/IFlagBuilder.java @@ -10,7 +10,6 @@ import dev.metaschema.core.model.IFlagInstance; import dev.metaschema.core.model.IModelDefinition; import dev.metaschema.core.model.IModule; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/testsupport/builder/IMetaschemaBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/IMetaschemaBuilder.java index a3826e6332..6aaba9bc58 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/builder/IMetaschemaBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/IMetaschemaBuilder.java @@ -5,12 +5,11 @@ package dev.metaschema.core.testsupport.builder; +import java.net.URI; + import dev.metaschema.core.model.ISource; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/testsupport/builder/IModelBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/IModelBuilder.java index 429fefee45..3daa53ac43 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/builder/IModelBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/IModelBuilder.java @@ -5,11 +5,10 @@ package dev.metaschema.core.testsupport.builder; -import dev.metaschema.core.model.IAssemblyDefinition; -import dev.metaschema.core.model.INamedModelInstanceAbsolute; - import java.util.List; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/testsupport/builder/IModuleBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/IModuleBuilder.java index bbdb1196a1..4c5da8fd33 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/builder/IModuleBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/IModuleBuilder.java @@ -5,12 +5,11 @@ package dev.metaschema.core.testsupport.builder; +import java.net.URI; + import dev.metaschema.core.model.IModule; import dev.metaschema.core.model.ISource; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/testsupport/builder/IModuleMockFactory.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/IModuleMockFactory.java index 2cbe395f48..0da5156501 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/builder/IModuleMockFactory.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/IModuleMockFactory.java @@ -6,7 +6,6 @@ package dev.metaschema.core.testsupport.builder; import dev.metaschema.core.testsupport.mocking.IMockFactory; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/testsupport/builder/ModuleBuilder.java b/core/src/test/java/dev/metaschema/core/testsupport/builder/ModuleBuilder.java index 1a8a31a387..daa6c63dc9 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/builder/ModuleBuilder.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/builder/ModuleBuilder.java @@ -8,6 +8,13 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; +import java.net.URI; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IFlagDefinition; @@ -17,14 +24,6 @@ import dev.metaschema.core.testsupport.mocking.AbstractMockitoFactory; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/testsupport/mocking/AbstractJMockFactory.java b/core/src/test/java/dev/metaschema/core/testsupport/mocking/AbstractJMockFactory.java index 0963179dbb..5bf760126c 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/mocking/AbstractJMockFactory.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/mocking/AbstractJMockFactory.java @@ -5,12 +5,11 @@ package dev.metaschema.core.testsupport.mocking; -import dev.metaschema.core.util.ObjectUtils; - import org.jmock.Mockery; import java.util.UUID; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/testsupport/mocking/AbstractMockitoFactory.java b/core/src/test/java/dev/metaschema/core/testsupport/mocking/AbstractMockitoFactory.java index 53c2a1c480..80c777c25a 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/mocking/AbstractMockitoFactory.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/mocking/AbstractMockitoFactory.java @@ -7,13 +7,12 @@ import static org.mockito.Mockito.withSettings; -import dev.metaschema.core.util.ObjectUtils; - import org.mockito.Answers; import org.mockito.Mockito; import java.util.UUID; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/core/src/test/java/dev/metaschema/core/testsupport/mocking/MockNodeItemFactory.java b/core/src/test/java/dev/metaschema/core/testsupport/mocking/MockNodeItemFactory.java index 3b89f9179c..a1d39d6056 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/mocking/MockNodeItemFactory.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/mocking/MockNodeItemFactory.java @@ -8,6 +8,14 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; +import java.net.URI; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; + import dev.metaschema.core.metapath.item.atomic.IAnyAtomicItem; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; @@ -23,15 +31,6 @@ import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/core/src/test/java/dev/metaschema/core/testsupport/mocking/MockedDocumentGenerator.java b/core/src/test/java/dev/metaschema/core/testsupport/mocking/MockedDocumentGenerator.java index c70b4fb7f4..d03cded9f8 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/mocking/MockedDocumentGenerator.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/mocking/MockedDocumentGenerator.java @@ -5,6 +5,8 @@ package dev.metaschema.core.testsupport.mocking; +import java.net.URI; + import dev.metaschema.core.mdm.IDMAssemblyNodeItem; import dev.metaschema.core.mdm.IDMDocumentNodeItem; import dev.metaschema.core.mdm.IDMFieldNodeItem; @@ -20,9 +22,6 @@ import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.testsupport.MockedModelTestSupport; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/core/src/test/java/dev/metaschema/core/testsupport/tests/ConstraintSetBuilderTest.java b/core/src/test/java/dev/metaschema/core/testsupport/tests/ConstraintSetBuilderTest.java index 2686d6f91c..10fd54a47b 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/tests/ConstraintSetBuilderTest.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/tests/ConstraintSetBuilderTest.java @@ -9,6 +9,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; + +import java.net.URI; + import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.metapath.IMetapathExpression; @@ -26,10 +30,6 @@ import dev.metaschema.core.testsupport.MockedModelTestSupport; import dev.metaschema.core.testsupport.builder.IConstraintSetBuilder; -import org.junit.jupiter.api.Test; - -import java.net.URI; - /** * Unit tests for {@link IConstraintSetBuilder}. */ diff --git a/core/src/test/java/dev/metaschema/core/testsupport/tests/ModuleBuilderTest.java b/core/src/test/java/dev/metaschema/core/testsupport/tests/ModuleBuilderTest.java index c8da439393..7f3ab467ef 100644 --- a/core/src/test/java/dev/metaschema/core/testsupport/tests/ModuleBuilderTest.java +++ b/core/src/test/java/dev/metaschema/core/testsupport/tests/ModuleBuilderTest.java @@ -9,6 +9,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; +import org.junit.jupiter.api.Test; + +import java.net.URI; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IFlagDefinition; @@ -19,10 +23,6 @@ import dev.metaschema.core.testsupport.MockedModelTestSupport; import dev.metaschema.core.testsupport.builder.IModuleBuilder; -import org.junit.jupiter.api.Test; - -import java.net.URI; - /** * Unit tests for {@link IModuleBuilder}. */ diff --git a/core/src/test/java/dev/metaschema/core/util/MermaidErDiagramGeneratorTest.java b/core/src/test/java/dev/metaschema/core/util/MermaidErDiagramGeneratorTest.java index d103686dc6..0f33753e32 100644 --- a/core/src/test/java/dev/metaschema/core/util/MermaidErDiagramGeneratorTest.java +++ b/core/src/test/java/dev/metaschema/core/util/MermaidErDiagramGeneratorTest.java @@ -7,12 +7,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.model.ISource; -import dev.metaschema.core.model.util.MermaidErDiagramGenerator; -import dev.metaschema.core.testsupport.MockedModelTestSupport; -import dev.metaschema.core.testsupport.builder.IModuleBuilder; - import org.junit.jupiter.api.Test; import java.io.PrintWriter; @@ -20,6 +14,12 @@ import java.net.URI; import java.util.List; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.util.MermaidErDiagramGenerator; +import dev.metaschema.core.testsupport.MockedModelTestSupport; +import dev.metaschema.core.testsupport.builder.IModuleBuilder; + class MermaidErDiagramGeneratorTest { private static final String TEST_NAMESPACE = "http://example.com/ns/diagram-test"; diff --git a/databind-modules/src/main/java/dev/metaschema/modules/sarif/SarifValidationHandler.java b/databind-modules/src/main/java/dev/metaschema/modules/sarif/SarifValidationHandler.java index ed14c69fbe..26ac997b16 100644 --- a/databind-modules/src/main/java/dev/metaschema/modules/sarif/SarifValidationHandler.java +++ b/databind-modules/src/main/java/dev/metaschema/modules/sarif/SarifValidationHandler.java @@ -5,25 +5,6 @@ package dev.metaschema.modules.sarif; -import dev.metaschema.core.datatype.markup.MarkupLine; -import dev.metaschema.core.datatype.markup.MarkupMultiline; -import dev.metaschema.core.model.IAttributable; -import dev.metaschema.core.model.IResourceLocation; -import dev.metaschema.core.model.MetaschemaException; -import dev.metaschema.core.model.constraint.ConstraintValidationFinding; -import dev.metaschema.core.model.constraint.IConstraint; -import dev.metaschema.core.model.constraint.IConstraint.Level; -import dev.metaschema.core.model.validation.IValidationFinding; -import dev.metaschema.core.model.validation.JsonSchemaContentValidator.JsonValidationFinding; -import dev.metaschema.core.model.validation.XmlSchemaContentValidator.XmlValidationFinding; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.IVersionInfo; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.core.util.UriUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.io.Format; -import dev.metaschema.databind.io.SerializationFeature; - import org.schemastore.json.sarif.x210.Artifact; import org.schemastore.json.sarif.x210.ArtifactLocation; import org.schemastore.json.sarif.x210.Location; @@ -56,6 +37,24 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.IAttributable; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.ConstraintValidationFinding; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.model.validation.IValidationFinding; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator.JsonValidationFinding; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator.XmlValidationFinding; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.IVersionInfo; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.UriUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.SerializationFeature; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind-modules/src/test/java/dev/metaschema/modules/sarif/SarifValidationHandlerTest.java b/databind-modules/src/test/java/dev/metaschema/modules/sarif/SarifValidationHandlerTest.java index e583f5bb23..8a5c3672ae 100644 --- a/databind-modules/src/test/java/dev/metaschema/modules/sarif/SarifValidationHandlerTest.java +++ b/databind-modules/src/test/java/dev/metaschema/modules/sarif/SarifValidationHandlerTest.java @@ -7,16 +7,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.core.datatype.markup.MarkupLine; -import dev.metaschema.core.metapath.item.node.INodeItem; -import dev.metaschema.core.model.IResourceLocation; -import dev.metaschema.core.model.constraint.ConstraintValidationFinding; -import dev.metaschema.core.model.constraint.IConstraint; -import dev.metaschema.core.model.validation.IValidationFinding; -import dev.metaschema.core.util.IVersionInfo; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; - import org.jmock.Expectations; import org.jmock.junit5.JUnit5Mockery; import org.jmock.lib.concurrent.Synchroniser; @@ -40,6 +30,15 @@ import dev.harrel.jsonschema.Validator; import dev.harrel.jsonschema.ValidatorFactory; import dev.harrel.jsonschema.providers.OrgJsonNode; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.model.constraint.ConstraintValidationFinding; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.validation.IValidationFinding; +import dev.metaschema.core.util.IVersionInfo; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; class SarifValidationHandlerTest { @RegisterExtension diff --git a/databind/src/main/java/dev/metaschema/databind/AbstractModuleLoaderStrategy.java b/databind/src/main/java/dev/metaschema/databind/AbstractModuleLoaderStrategy.java index 97bfd002fa..85fe541fac 100644 --- a/databind/src/main/java/dev/metaschema/databind/AbstractModuleLoaderStrategy.java +++ b/databind/src/main/java/dev/metaschema/databind/AbstractModuleLoaderStrategy.java @@ -5,6 +5,20 @@ package dev.metaschema.databind; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; +import java.util.stream.Collectors; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IModule; import dev.metaschema.core.model.MetaschemaException; @@ -24,21 +38,6 @@ import dev.metaschema.databind.model.impl.DefinitionAssembly; import dev.metaschema.databind.model.impl.DefinitionField; import dev.metaschema.databind.model.metaschema.binding.MetaschemaModelModule; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/DefaultBindingContext.java b/databind/src/main/java/dev/metaschema/databind/DefaultBindingContext.java index aab33c00bd..17ef2bc6c4 100644 --- a/databind/src/main/java/dev/metaschema/databind/DefaultBindingContext.java +++ b/databind/src/main/java/dev/metaschema/databind/DefaultBindingContext.java @@ -5,6 +5,18 @@ package dev.metaschema.databind; +import java.io.IOException; +import java.net.URI; +import java.net.URL; +import java.nio.file.Path; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; + +import javax.xml.namespace.QName; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.MetaschemaException; import dev.metaschema.core.util.ObjectUtils; @@ -27,19 +39,6 @@ import dev.metaschema.databind.model.metaschema.ModuleLoadingPostProcessor; import dev.metaschema.databind.model.metaschema.binding.METASCHEMA; import dev.metaschema.databind.model.metaschema.binding.MetaschemaModelModule; - -import java.io.IOException; -import java.net.URI; -import java.net.URL; -import java.nio.file.Path; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; - -import javax.xml.namespace.QName; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/IBindingContext.java b/databind/src/main/java/dev/metaschema/databind/IBindingContext.java index 730a2ea098..512646c1e7 100644 --- a/databind/src/main/java/dev/metaschema/databind/IBindingContext.java +++ b/databind/src/main/java/dev/metaschema/databind/IBindingContext.java @@ -5,6 +5,27 @@ package dev.metaschema.databind; +import org.eclipse.jdt.annotation.Owning; +import org.json.JSONObject; +import org.json.JSONTokener; +import org.xml.sax.SAXException; + +import java.io.BufferedInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.math.BigInteger; +import java.net.URI; +import java.net.URL; +import java.nio.file.Path; +import java.time.ZonedDateTime; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.function.Function; + +import javax.xml.namespace.QName; + import dev.metaschema.core.configuration.IConfiguration; import dev.metaschema.core.datatype.DataTypeService; import dev.metaschema.core.datatype.IDataTypeAdapter; @@ -51,28 +72,6 @@ import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; import dev.metaschema.databind.model.metaschema.ModuleLoadingPostProcessor; - -import org.eclipse.jdt.annotation.Owning; -import org.json.JSONObject; -import org.json.JSONTokener; -import org.xml.sax.SAXException; - -import java.io.BufferedInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.math.BigInteger; -import java.net.URI; -import java.net.URL; -import java.nio.file.Path; -import java.time.ZonedDateTime; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; -import java.util.function.Function; - -import javax.xml.namespace.QName; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/PostProcessingModuleLoaderStrategy.java b/databind/src/main/java/dev/metaschema/databind/PostProcessingModuleLoaderStrategy.java index 0d98ba444a..eb5394f70f 100644 --- a/databind/src/main/java/dev/metaschema/databind/PostProcessingModuleLoaderStrategy.java +++ b/databind/src/main/java/dev/metaschema/databind/PostProcessingModuleLoaderStrategy.java @@ -5,15 +5,6 @@ package dev.metaschema.databind; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.model.IModuleLoader; -import dev.metaschema.core.model.MetaschemaException; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.databind.IBindingContext.IBindingMatcher; -import dev.metaschema.databind.model.IBoundDefinitionModelComplex; -import dev.metaschema.databind.model.IBoundModule; - import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -22,6 +13,14 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.IModuleLoader; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.databind.IBindingContext.IBindingMatcher; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundModule; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/RootAssemblyBindingMatcher.java b/databind/src/main/java/dev/metaschema/databind/RootAssemblyBindingMatcher.java index 073341d4a2..367fcc7c9e 100644 --- a/databind/src/main/java/dev/metaschema/databind/RootAssemblyBindingMatcher.java +++ b/databind/src/main/java/dev/metaschema/databind/RootAssemblyBindingMatcher.java @@ -5,13 +5,12 @@ package dev.metaschema.databind; +import javax.xml.namespace.QName; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.IBindingContext.IBindingMatcher; import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; - -import javax.xml.namespace.QName; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/SimpleModuleLoaderStrategy.java b/databind/src/main/java/dev/metaschema/databind/SimpleModuleLoaderStrategy.java index f34f13686c..987d1d5068 100644 --- a/databind/src/main/java/dev/metaschema/databind/SimpleModuleLoaderStrategy.java +++ b/databind/src/main/java/dev/metaschema/databind/SimpleModuleLoaderStrategy.java @@ -9,7 +9,6 @@ import dev.metaschema.core.model.MetaschemaException; import dev.metaschema.databind.codegen.IModuleBindingGenerator; import dev.metaschema.databind.model.IBoundModule; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/ClassUtils.java b/databind/src/main/java/dev/metaschema/databind/codegen/ClassUtils.java index 5e607f6804..ee760f4b56 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/ClassUtils.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/ClassUtils.java @@ -5,8 +5,6 @@ package dev.metaschema.databind.codegen; -import dev.metaschema.core.util.ObjectUtils; - import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; @@ -15,6 +13,7 @@ import java.util.Map; import java.util.Set; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/DefaultModuleBindingGenerator.java b/databind/src/main/java/dev/metaschema/databind/codegen/DefaultModuleBindingGenerator.java index 42f0b8462c..0e5d4bf0de 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/DefaultModuleBindingGenerator.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/DefaultModuleBindingGenerator.java @@ -5,14 +5,13 @@ package dev.metaschema.databind.codegen; +import java.io.IOException; +import java.nio.file.Path; + import dev.metaschema.core.model.IModule; import dev.metaschema.core.model.MetaschemaException; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.model.IBoundModule; - -import java.io.IOException; -import java.nio.file.Path; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/IGeneratedDefinitionClass.java b/databind/src/main/java/dev/metaschema/databind/codegen/IGeneratedDefinitionClass.java index 9ea03e3d21..6f28b9e8b6 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/IGeneratedDefinitionClass.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/IGeneratedDefinitionClass.java @@ -6,7 +6,6 @@ package dev.metaschema.databind.codegen; import dev.metaschema.core.model.IModelDefinition; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/IGeneratedModuleClass.java b/databind/src/main/java/dev/metaschema/databind/codegen/IGeneratedModuleClass.java index ee7dfaefa0..f5053b73b1 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/IGeneratedModuleClass.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/IGeneratedModuleClass.java @@ -5,12 +5,11 @@ package dev.metaschema.databind.codegen; +import java.util.Collection; + import dev.metaschema.core.model.IModule; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.model.IBoundModule; - -import java.util.Collection; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/IModuleBindingGenerator.java b/databind/src/main/java/dev/metaschema/databind/codegen/IModuleBindingGenerator.java index 9956ee742f..d909a8e98c 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/IModuleBindingGenerator.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/IModuleBindingGenerator.java @@ -8,7 +8,6 @@ import dev.metaschema.core.model.IModule; import dev.metaschema.core.model.MetaschemaException; import dev.metaschema.databind.model.IBoundModule; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/IProduction.java b/databind/src/main/java/dev/metaschema/databind/codegen/IProduction.java index f8f9724e3f..c950e6ed41 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/IProduction.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/IProduction.java @@ -5,11 +5,6 @@ package dev.metaschema.databind.codegen; -import dev.metaschema.core.model.IModule; -import dev.metaschema.databind.codegen.config.IBindingConfiguration; -import dev.metaschema.databind.codegen.typeinfo.IMetaschemaClassFactory; -import dev.metaschema.databind.codegen.typeinfo.ITypeResolver; - import java.io.IOException; import java.nio.file.Path; import java.util.Collection; @@ -17,6 +12,10 @@ import java.util.Map; import java.util.stream.Stream; +import dev.metaschema.core.model.IModule; +import dev.metaschema.databind.codegen.config.IBindingConfiguration; +import dev.metaschema.databind.codegen.typeinfo.IMetaschemaClassFactory; +import dev.metaschema.databind.codegen.typeinfo.ITypeResolver; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/JavaCompilerSupport.java b/databind/src/main/java/dev/metaschema/databind/codegen/JavaCompilerSupport.java index cfe6c8121f..1786daa150 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/JavaCompilerSupport.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/JavaCompilerSupport.java @@ -5,8 +5,6 @@ package dev.metaschema.databind.codegen; -import dev.metaschema.core.util.CollectionUtil; - import java.io.IOException; import java.io.StringWriter; import java.nio.file.Path; @@ -22,6 +20,7 @@ import javax.tools.StandardJavaFileManager; import javax.tools.ToolProvider; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/JavaGenerator.java b/databind/src/main/java/dev/metaschema/databind/codegen/JavaGenerator.java index 5e8404e5e9..61d3f8c19d 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/JavaGenerator.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/JavaGenerator.java @@ -5,10 +5,6 @@ package dev.metaschema.databind.codegen; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.databind.codegen.config.IBindingConfiguration; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -17,6 +13,9 @@ import java.util.Collection; import java.util.Objects; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.databind.codegen.config.IBindingConfiguration; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/ModuleCompilerHelper.java b/databind/src/main/java/dev/metaschema/databind/codegen/ModuleCompilerHelper.java index 9d68560fd1..a1540a1e42 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/ModuleCompilerHelper.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/ModuleCompilerHelper.java @@ -5,12 +5,6 @@ package dev.metaschema.databind.codegen; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.codegen.config.DefaultBindingConfiguration; -import dev.metaschema.databind.codegen.config.IBindingConfiguration; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.eclipse.jdt.annotation.Owning; @@ -29,6 +23,11 @@ import javax.tools.DiagnosticCollector; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.config.DefaultBindingConfiguration; +import dev.metaschema.databind.codegen.config.IBindingConfiguration; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/PackageProductionImpl.java b/databind/src/main/java/dev/metaschema/databind/codegen/PackageProductionImpl.java index de9559cc1d..3d6c5c1250 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/PackageProductionImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/PackageProductionImpl.java @@ -5,12 +5,11 @@ package dev.metaschema.databind.codegen; -import dev.metaschema.databind.codegen.typeinfo.IMetaschemaClassFactory; - import java.io.IOException; import java.net.URI; import java.nio.file.Path; +import dev.metaschema.databind.codegen.typeinfo.IMetaschemaClassFactory; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/ProductionImpl.java b/databind/src/main/java/dev/metaschema/databind/codegen/ProductionImpl.java index 9e77c909b5..957414cd8b 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/ProductionImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/ProductionImpl.java @@ -5,10 +5,6 @@ package dev.metaschema.databind.codegen; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.codegen.typeinfo.IMetaschemaClassFactory; - import java.io.IOException; import java.nio.file.Path; import java.util.Collection; @@ -19,6 +15,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.typeinfo.IMetaschemaClassFactory; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultBindingConfiguration.java b/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultBindingConfiguration.java index f60e0700a1..fd09c79221 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultBindingConfiguration.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultBindingConfiguration.java @@ -5,20 +5,6 @@ package dev.metaschema.databind.codegen.config; -import dev.metaschema.core.model.IAssemblyDefinition; -import dev.metaschema.core.model.IFieldDefinition; -import dev.metaschema.core.model.IModelDefinition; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.model.INamedInstance; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.codegen.ClassUtils; -import dev.metaschema.databind.config.binding.MetaschemaBindings; -import dev.metaschema.databind.io.BindingException; -import dev.metaschema.databind.io.Format; -import dev.metaschema.databind.io.IDeserializer; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -36,6 +22,19 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedInstance; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.ClassUtils; +import dev.metaschema.databind.config.binding.MetaschemaBindings; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.IDeserializer; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfiguration.java b/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfiguration.java index 945e1307c0..a44172ba3d 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfiguration.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfiguration.java @@ -6,7 +6,6 @@ package dev.metaschema.databind.codegen.config; import dev.metaschema.databind.config.binding.MetaschemaBindings; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultDefinitionBindingConfiguration.java b/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultDefinitionBindingConfiguration.java index 0b0cde2e9c..65698019d2 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultDefinitionBindingConfiguration.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/config/DefaultDefinitionBindingConfiguration.java @@ -5,13 +5,12 @@ package dev.metaschema.databind.codegen.config; -import dev.metaschema.core.util.CollectionUtil; - import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/config/IBindingConfiguration.java b/databind/src/main/java/dev/metaschema/databind/codegen/config/IBindingConfiguration.java index e18d4eee8a..69bf707386 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/config/IBindingConfiguration.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/config/IBindingConfiguration.java @@ -5,11 +5,10 @@ package dev.metaschema.databind.codegen.config; -import dev.metaschema.core.model.IModelDefinition; -import dev.metaschema.core.model.IModule; - import java.util.List; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModule; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/impl/AnnotationGenerator.java b/databind/src/main/java/dev/metaschema/databind/codegen/impl/AnnotationGenerator.java index 36fee956f3..9ac6c9b6b4 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/impl/AnnotationGenerator.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/impl/AnnotationGenerator.java @@ -8,6 +8,15 @@ import com.squareup.javapoet.AnnotationSpec; import com.squareup.javapoet.AnnotationSpec.Builder; +import org.apache.logging.log4j.LogBuilder; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.lang.reflect.Method; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; @@ -27,11 +36,11 @@ import dev.metaschema.core.model.constraint.IConstraint; import dev.metaschema.core.model.constraint.IExpectConstraint; import dev.metaschema.core.model.constraint.IIndexConstraint; -import dev.metaschema.core.model.constraint.IReportConstraint; import dev.metaschema.core.model.constraint.IIndexHasKeyConstraint; import dev.metaschema.core.model.constraint.IKeyField; import dev.metaschema.core.model.constraint.ILet; import dev.metaschema.core.model.constraint.IMatchesConstraint; +import dev.metaschema.core.model.constraint.IReportConstraint; import dev.metaschema.core.model.constraint.IUniqueConstraint; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; @@ -48,16 +57,6 @@ import dev.metaschema.databind.model.annotations.Matches; import dev.metaschema.databind.model.annotations.Report; import dev.metaschema.databind.model.annotations.ValueConstraints; - -import org.apache.logging.log4j.LogBuilder; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.lang.reflect.Method; -import java.util.List; -import java.util.Map; -import java.util.regex.Pattern; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedClass.java b/databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedClass.java index e06173cd50..97158afd6f 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedClass.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedClass.java @@ -7,11 +7,10 @@ import com.squareup.javapoet.ClassName; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.codegen.IGeneratedClass; - import java.nio.file.Path; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.IGeneratedClass; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedDefinitionClass.java b/databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedDefinitionClass.java index 30dbee6d38..cc288712f6 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedDefinitionClass.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedDefinitionClass.java @@ -7,12 +7,11 @@ import com.squareup.javapoet.ClassName; +import java.nio.file.Path; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IModelDefinition; import dev.metaschema.databind.codegen.IGeneratedDefinitionClass; - -import java.nio.file.Path; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedModuleClass.java b/databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedModuleClass.java index 093f8e297a..1dc8380b1e 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedModuleClass.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/impl/DefaultGeneratedModuleClass.java @@ -7,17 +7,16 @@ import com.squareup.javapoet.ClassName; +import java.nio.file.Path; +import java.util.Collection; +import java.util.Map; + import dev.metaschema.core.model.IModelDefinition; import dev.metaschema.core.model.IModule; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.codegen.IGeneratedDefinitionClass; import dev.metaschema.databind.codegen.IGeneratedModuleClass; - -import java.nio.file.Path; -import java.util.Collection; -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractGroupedNamedModelInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractGroupedNamedModelInstanceTypeInfo.java index e8c7f59361..d82688c707 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractGroupedNamedModelInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractGroupedNamedModelInstanceTypeInfo.java @@ -9,10 +9,6 @@ import com.squareup.javapoet.ClassName; import com.squareup.javapoet.TypeSpec; -import dev.metaschema.core.model.IModelDefinition; -import dev.metaschema.core.model.INamedModelInstanceGrouped; -import dev.metaschema.core.util.ObjectUtils; - import org.apache.commons.lang3.StringUtils; import java.lang.annotation.Annotation; @@ -21,6 +17,9 @@ import javax.lang.model.element.Modifier; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.INamedModelInstanceGrouped; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; public abstract class AbstractGroupedNamedModelInstanceTypeInfo diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractInstanceTypeInfo.java index b48718d3e8..f297050e1d 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractInstanceTypeInfo.java @@ -7,7 +7,6 @@ import dev.metaschema.core.model.IInstance; import dev.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; - import edu.umd.cs.findbugs.annotations.NonNull; abstract class AbstractInstanceTypeInfo diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractModelInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractModelInstanceTypeInfo.java index 17d4abee5d..620ad9b882 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractModelInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractModelInstanceTypeInfo.java @@ -12,6 +12,13 @@ import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.model.IGroupable; import dev.metaschema.core.model.IModelDefinition; import dev.metaschema.core.model.IModelInstanceAbsolute; @@ -20,14 +27,6 @@ import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; import dev.metaschema.databind.model.annotations.GroupAs; - -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfo.java index 2e80dcd6f3..abc5114a24 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfo.java @@ -12,6 +12,13 @@ import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.Set; + +import javax.lang.model.element.Modifier; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IFlagInstance; import dev.metaschema.core.model.IGroupable; @@ -24,14 +31,6 @@ import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; import dev.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo; import dev.metaschema.databind.model.annotations.BoundChoice; - -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.Set; - -import javax.lang.model.element.Modifier; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractPropertyTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractPropertyTypeInfo.java index b5bcc36dbc..58494c9f46 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractPropertyTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractPropertyTypeInfo.java @@ -13,12 +13,6 @@ import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; -import dev.metaschema.core.model.IModelDefinition; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; -import dev.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -28,6 +22,11 @@ import javax.lang.model.element.Modifier; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractTypeInfo.java index 404f826560..360264f0e6 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AbstractTypeInfo.java @@ -8,7 +8,6 @@ import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.codegen.ClassUtils; import dev.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AssemblyInstanceTypeInfoImpl.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AssemblyInstanceTypeInfoImpl.java index c0f260e620..4a46cc91c9 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AssemblyInstanceTypeInfoImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/AssemblyInstanceTypeInfoImpl.java @@ -11,7 +11,6 @@ import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; import dev.metaschema.databind.model.annotations.BoundAssembly; - import edu.umd.cs.findbugs.annotations.NonNull; public class AssemblyInstanceTypeInfoImpl diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImpl.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImpl.java index 34dcf22d74..e421757346 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImpl.java @@ -14,6 +14,14 @@ import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.WildcardTypeName; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IChoiceGroupInstance; import dev.metaschema.core.model.IGroupable; @@ -26,18 +34,9 @@ import dev.metaschema.databind.codegen.config.IDefinitionBindingConfiguration; import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; import dev.metaschema.databind.model.annotations.BoundChoiceGroup; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - public class ChoiceGroupTypeInfoImpl extends AbstractModelInstanceTypeInfo implements IChoiceGroupTypeInfo { diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/DefaultMetaschemaClassFactory.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/DefaultMetaschemaClassFactory.java index aa18905574..a0d3f5245f 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/DefaultMetaschemaClassFactory.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/DefaultMetaschemaClassFactory.java @@ -14,6 +14,29 @@ import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.WildcardTypeName; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.IOException; +import java.io.PrintWriter; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardOpenOption; +import java.util.Collection; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import javax.lang.model.element.Modifier; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.model.IAssemblyDefinition; @@ -47,30 +70,6 @@ import dev.metaschema.databind.model.annotations.XmlNs; import dev.metaschema.databind.model.annotations.XmlNsForm; import dev.metaschema.databind.model.annotations.XmlSchema; - -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.io.IOException; -import java.io.PrintWriter; -import java.net.URI; -import java.net.URISyntaxException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.util.Collection; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.lang.model.element.Modifier; - import edu.umd.cs.findbugs.annotations.NonNull; @SuppressWarnings({ diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/DefaultTypeResolver.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/DefaultTypeResolver.java index e3ce624826..9fdabe8c3f 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/DefaultTypeResolver.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/DefaultTypeResolver.java @@ -7,6 +7,21 @@ import com.squareup.javapoet.ClassName; +import org.apache.commons.lang3.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; +import java.util.stream.Collectors; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IAssemblyInstanceGrouped; import dev.metaschema.core.model.IChoiceGroupInstance; @@ -25,22 +40,6 @@ import dev.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; import dev.metaschema.databind.codegen.typeinfo.def.IFieldDefinitionTypeInfo; import dev.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo; - -import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; @SuppressWarnings("PMD.CouplingBetweenObjects") diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FieldInstanceTypeInfoImpl.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FieldInstanceTypeInfoImpl.java index 6d5654b101..54d32905f5 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FieldInstanceTypeInfoImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FieldInstanceTypeInfoImpl.java @@ -11,6 +11,8 @@ import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; +import java.util.Set; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IFieldInstance; @@ -20,9 +22,6 @@ import dev.metaschema.databind.codegen.impl.AnnotationGenerator; import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; import dev.metaschema.databind.model.annotations.BoundField; - -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; public class FieldInstanceTypeInfoImpl diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FieldValueTypeInfoImpl.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FieldValueTypeInfoImpl.java index 4a808d7d33..251f63dbdc 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FieldValueTypeInfoImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FieldValueTypeInfoImpl.java @@ -12,15 +12,14 @@ import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; +import java.util.Set; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IModelDefinition; import dev.metaschema.databind.codegen.typeinfo.def.IFieldDefinitionTypeInfo; import dev.metaschema.databind.model.annotations.BoundFieldValue; - -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; class FieldValueTypeInfoImpl diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FlagInstanceTypeInfoImpl.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FlagInstanceTypeInfoImpl.java index cb25136e78..ebeca5c581 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FlagInstanceTypeInfoImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/FlagInstanceTypeInfoImpl.java @@ -11,6 +11,8 @@ import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; +import java.util.Set; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; @@ -25,9 +27,6 @@ import dev.metaschema.databind.model.annotations.BoundFlag; import dev.metaschema.databind.model.annotations.JsonFieldValueKeyFlag; import dev.metaschema.databind.model.annotations.JsonKey; - -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; public class FlagInstanceTypeInfoImpl diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/GroupedAssemblyInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/GroupedAssemblyInstanceTypeInfo.java index b46ff4016e..44b7ed4d57 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/GroupedAssemblyInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/GroupedAssemblyInstanceTypeInfo.java @@ -7,11 +7,10 @@ import com.squareup.javapoet.AnnotationSpec; -import dev.metaschema.core.model.IAssemblyInstanceGrouped; -import dev.metaschema.databind.model.annotations.BoundGroupedAssembly; - import java.lang.annotation.Annotation; +import dev.metaschema.core.model.IAssemblyInstanceGrouped; +import dev.metaschema.databind.model.annotations.BoundGroupedAssembly; import edu.umd.cs.findbugs.annotations.NonNull; public class GroupedAssemblyInstanceTypeInfo diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/GroupedFieldInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/GroupedFieldInstanceTypeInfo.java index 663b746bc4..58b59a18ba 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/GroupedFieldInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/GroupedFieldInstanceTypeInfo.java @@ -7,11 +7,10 @@ import com.squareup.javapoet.AnnotationSpec; -import dev.metaschema.core.model.IFieldInstanceGrouped; -import dev.metaschema.databind.model.annotations.BoundGroupedField; - import java.lang.annotation.Annotation; +import dev.metaschema.core.model.IFieldInstanceGrouped; +import dev.metaschema.databind.model.annotations.BoundGroupedField; import edu.umd.cs.findbugs.annotations.NonNull; public class GroupedFieldInstanceTypeInfo diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IFieldValueTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IFieldValueTypeInfo.java index 52542dcb4a..93337fa0f3 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IFieldValueTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IFieldValueTypeInfo.java @@ -7,7 +7,6 @@ import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.databind.codegen.typeinfo.def.IFieldDefinitionTypeInfo; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IFlagInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IFlagInstanceTypeInfo.java index f84f76426f..8a0fbc5524 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IFlagInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IFlagInstanceTypeInfo.java @@ -7,7 +7,6 @@ import dev.metaschema.core.model.IFlagInstance; import dev.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; - import edu.umd.cs.findbugs.annotations.NonNull; public interface IFlagInstanceTypeInfo extends INamedInstanceTypeInfo { diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IGroupedNamedModelInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IGroupedNamedModelInstanceTypeInfo.java index 257a512cea..129e558335 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IGroupedNamedModelInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IGroupedNamedModelInstanceTypeInfo.java @@ -8,10 +8,9 @@ import com.squareup.javapoet.AnnotationSpec; import com.squareup.javapoet.TypeSpec; -import dev.metaschema.core.model.IModelDefinition; - import java.util.Set; +import dev.metaschema.core.model.IModelDefinition; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IInstanceTypeInfo.java index f0c45a8318..062eaa3466 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IInstanceTypeInfo.java @@ -6,7 +6,6 @@ package dev.metaschema.databind.codegen.typeinfo; import dev.metaschema.core.model.IInstance; - import edu.umd.cs.findbugs.annotations.NonNull; public interface IInstanceTypeInfo extends IPropertyTypeInfo { diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IMetaschemaClassFactory.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IMetaschemaClassFactory.java index 99ef98ea1f..751267b25c 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IMetaschemaClassFactory.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IMetaschemaClassFactory.java @@ -5,17 +5,16 @@ package dev.metaschema.databind.codegen.typeinfo; -import dev.metaschema.core.model.IModule; -import dev.metaschema.databind.codegen.IGeneratedClass; -import dev.metaschema.databind.codegen.IGeneratedDefinitionClass; -import dev.metaschema.databind.codegen.IGeneratedModuleClass; -import dev.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo; - import java.io.IOException; import java.net.URI; import java.nio.file.Path; import java.util.Collection; +import dev.metaschema.core.model.IModule; +import dev.metaschema.databind.codegen.IGeneratedClass; +import dev.metaschema.databind.codegen.IGeneratedDefinitionClass; +import dev.metaschema.databind.codegen.IGeneratedModuleClass; +import dev.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IModelInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IModelInstanceTypeInfo.java index a2b2b3b3c3..2370cc0316 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IModelInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IModelInstanceTypeInfo.java @@ -9,12 +9,11 @@ import com.squareup.javapoet.FieldSpec; import com.squareup.javapoet.TypeSpec; +import java.util.Set; + import dev.metaschema.core.model.IModelDefinition; import dev.metaschema.core.model.IModelInstanceAbsolute; import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; - -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; public interface IModelInstanceTypeInfo extends IInstanceTypeInfo { diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/INamedInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/INamedInstanceTypeInfo.java index 3d29b24002..fe0c3672f1 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/INamedInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/INamedInstanceTypeInfo.java @@ -10,7 +10,6 @@ import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.model.INamedInstance; - import edu.umd.cs.findbugs.annotations.NonNull; public interface INamedInstanceTypeInfo extends IInstanceTypeInfo { diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/INamedModelInstanceTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/INamedModelInstanceTypeInfo.java index a18a7850cc..8afe66bcdc 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/INamedModelInstanceTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/INamedModelInstanceTypeInfo.java @@ -11,7 +11,6 @@ import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.model.INamedModelInstanceAbsolute; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IPropertyTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IPropertyTypeInfo.java index 7a3b6dabe2..0b09872d2f 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IPropertyTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/IPropertyTypeInfo.java @@ -9,10 +9,9 @@ import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.TypeSpec; -import dev.metaschema.core.model.IModelDefinition; - import java.util.Set; +import dev.metaschema.core.model.IModelDefinition; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ITypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ITypeInfo.java index a942ad705f..3f074eacd0 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ITypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ITypeInfo.java @@ -8,7 +8,6 @@ import com.squareup.javapoet.TypeName; import dev.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ITypeResolver.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ITypeResolver.java index 054eb3524b..49f3a27a49 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ITypeResolver.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/ITypeResolver.java @@ -7,6 +7,8 @@ import com.squareup.javapoet.ClassName; +import java.util.List; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IAssemblyInstanceAbsolute; import dev.metaschema.core.model.IChoiceGroupInstance; @@ -22,9 +24,6 @@ import dev.metaschema.databind.codegen.typeinfo.def.IDefinitionTypeInfo; import dev.metaschema.databind.codegen.typeinfo.def.IFieldDefinitionTypeInfo; import dev.metaschema.databind.codegen.typeinfo.def.IModelDefinitionTypeInfo; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/TypeInfoUtils.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/TypeInfoUtils.java index d717f5d94b..c0354f5741 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/TypeInfoUtils.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/TypeInfoUtils.java @@ -10,7 +10,6 @@ import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.model.INamedModelInstance; - import edu.umd.cs.findbugs.annotations.NonNull; public final class TypeInfoUtils { diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/AbstractModelDefinitionTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/AbstractModelDefinitionTypeInfo.java index aff484e9d4..ec4a3a0fc4 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/AbstractModelDefinitionTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/AbstractModelDefinitionTypeInfo.java @@ -7,6 +7,15 @@ import com.squareup.javapoet.ClassName; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; + import dev.metaschema.core.model.IFlagInstance; import dev.metaschema.core.model.IInstance; import dev.metaschema.core.model.IModelDefinition; @@ -18,16 +27,6 @@ import dev.metaschema.databind.codegen.typeinfo.IPropertyTypeInfo; import dev.metaschema.databind.codegen.typeinfo.ITypeInfo; import dev.metaschema.databind.codegen.typeinfo.ITypeResolver; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/AssemblyDefinitionTypeInfoImpl.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/AssemblyDefinitionTypeInfoImpl.java index a52e06196c..9f210da45e 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/AssemblyDefinitionTypeInfoImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/AssemblyDefinitionTypeInfoImpl.java @@ -5,6 +5,15 @@ package dev.metaschema.databind.codegen.typeinfo.def; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IChoiceGroupInstance; import dev.metaschema.core.model.IChoiceInstance; @@ -19,16 +28,6 @@ import dev.metaschema.databind.codegen.typeinfo.INamedModelInstanceTypeInfo; import dev.metaschema.databind.codegen.typeinfo.IPropertyTypeInfo; import dev.metaschema.databind.codegen.typeinfo.ITypeResolver; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/FieldDefinitionTypeInfoImpl.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/FieldDefinitionTypeInfoImpl.java index eb3f738080..8b714de7f1 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/FieldDefinitionTypeInfoImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/FieldDefinitionTypeInfoImpl.java @@ -5,16 +5,6 @@ package dev.metaschema.databind.codegen.typeinfo.def; -import dev.metaschema.core.model.IFieldDefinition; -import dev.metaschema.core.model.IInstance; -import dev.metaschema.core.util.CustomCollectors; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.codegen.typeinfo.IFieldValueTypeInfo; -import dev.metaschema.databind.codegen.typeinfo.IFlagInstanceTypeInfo; -import dev.metaschema.databind.codegen.typeinfo.IInstanceTypeInfo; -import dev.metaschema.databind.codegen.typeinfo.IPropertyTypeInfo; -import dev.metaschema.databind.codegen.typeinfo.ITypeResolver; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -24,6 +14,15 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IInstance; +import dev.metaschema.core.util.CustomCollectors; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.typeinfo.IFieldValueTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.IFlagInstanceTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.IInstanceTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.IPropertyTypeInfo; +import dev.metaschema.databind.codegen.typeinfo.ITypeResolver; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IAssemblyDefinitionTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IAssemblyDefinitionTypeInfo.java index 20b64f6ad5..11012c7342 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IAssemblyDefinitionTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IAssemblyDefinitionTypeInfo.java @@ -7,7 +7,6 @@ import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.databind.codegen.typeinfo.ITypeResolver; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IDefinitionTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IDefinitionTypeInfo.java index b9399d63dd..35341c4e31 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IDefinitionTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IDefinitionTypeInfo.java @@ -5,14 +5,13 @@ package dev.metaschema.databind.codegen.typeinfo.def; +import java.util.Collection; + import dev.metaschema.core.model.IDefinition; import dev.metaschema.core.model.IInstance; import dev.metaschema.databind.codegen.typeinfo.IInstanceTypeInfo; import dev.metaschema.databind.codegen.typeinfo.IPropertyTypeInfo; import dev.metaschema.databind.codegen.typeinfo.ITypeResolver; - -import java.util.Collection; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IFieldDefinitionTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IFieldDefinitionTypeInfo.java index f97b652f13..c0ed930774 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IFieldDefinitionTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IFieldDefinitionTypeInfo.java @@ -7,7 +7,6 @@ import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.databind.codegen.typeinfo.ITypeResolver; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IModelDefinitionTypeInfo.java b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IModelDefinitionTypeInfo.java index 22df775d09..63602c662c 100644 --- a/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IModelDefinitionTypeInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/codegen/typeinfo/def/IModelDefinitionTypeInfo.java @@ -7,16 +7,15 @@ import com.squareup.javapoet.ClassName; +import java.util.Collection; +import java.util.List; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IFlagInstance; import dev.metaschema.core.model.IModelDefinition; import dev.metaschema.databind.codegen.typeinfo.IFlagInstanceTypeInfo; import dev.metaschema.databind.codegen.typeinfo.ITypeResolver; - -import java.util.Collection; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/config/binding/MetaschemaBindings.java b/databind/src/main/java/dev/metaschema/databind/config/binding/MetaschemaBindings.java index 7d2bc8772a..4dee616caf 100644 --- a/databind/src/main/java/dev/metaschema/databind/config/binding/MetaschemaBindings.java +++ b/databind/src/main/java/dev/metaschema/databind/config/binding/MetaschemaBindings.java @@ -7,6 +7,13 @@ package dev.metaschema.databind.config.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.net.URI; +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.BooleanAdapter; import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; @@ -25,11 +32,6 @@ import dev.metaschema.databind.model.annotations.MetaschemaField; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.net.URI; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * The root element for a set of metaschema binding customizations. diff --git a/databind/src/main/java/dev/metaschema/databind/config/binding/MetaschemaBindingsModule.java b/databind/src/main/java/dev/metaschema/databind/config/binding/MetaschemaBindingsModule.java index a9eb2cf516..0b55d7eef4 100644 --- a/databind/src/main/java/dev/metaschema/databind/config/binding/MetaschemaBindingsModule.java +++ b/databind/src/main/java/dev/metaschema/databind/config/binding/MetaschemaBindingsModule.java @@ -7,14 +7,15 @@ package dev.metaschema.databind.config.binding; +import java.net.URI; +import java.util.List; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.databind.IBindingContext; import dev.metaschema.databind.model.AbstractBoundModule; import dev.metaschema.databind.model.IBoundModule; import dev.metaschema.databind.model.annotations.MetaschemaModule; -import java.net.URI; -import java.util.List; /** * Metaschema Binding Configuration diff --git a/databind/src/main/java/dev/metaschema/databind/io/AbstractDeserializer.java b/databind/src/main/java/dev/metaschema/databind/io/AbstractDeserializer.java index 8bbde2c05a..86c00c24f7 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/AbstractDeserializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/AbstractDeserializer.java @@ -5,6 +5,12 @@ package dev.metaschema.databind.io; +import java.io.IOException; +import java.io.Reader; +import java.net.URI; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + import dev.metaschema.core.configuration.IConfiguration; import dev.metaschema.core.configuration.IMutableConfiguration; import dev.metaschema.core.metapath.DynamicContext; @@ -18,13 +24,6 @@ import dev.metaschema.core.model.constraint.LoggingConstraintValidationHandler; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; - -import java.io.IOException; -import java.io.Reader; -import java.net.URI; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/io/AbstractProblemHandler.java b/databind/src/main/java/dev/metaschema/databind/io/AbstractProblemHandler.java index 0143266c71..069381520f 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/AbstractProblemHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/io/AbstractProblemHandler.java @@ -5,6 +5,16 @@ package dev.metaschema.databind.io; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + import dev.metaschema.core.model.IAssemblyInstance; import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IChoiceInstance; @@ -16,17 +26,6 @@ import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import dev.metaschema.databind.model.IBoundDefinitionModelComplex; import dev.metaschema.databind.model.IBoundProperty; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/io/AbstractSerializationBase.java b/databind/src/main/java/dev/metaschema/databind/io/AbstractSerializationBase.java index d65990834a..be700b7df2 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/AbstractSerializationBase.java +++ b/databind/src/main/java/dev/metaschema/databind/io/AbstractSerializationBase.java @@ -5,14 +5,13 @@ package dev.metaschema.databind.io; +import java.util.Map; + import dev.metaschema.core.configuration.DefaultConfiguration; import dev.metaschema.core.configuration.IConfigurationFeature; import dev.metaschema.core.configuration.IMutableConfiguration; import dev.metaschema.databind.IBindingContext; import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; - -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/io/AbstractSerializer.java b/databind/src/main/java/dev/metaschema/databind/io/AbstractSerializer.java index ca96e01a6b..aba093b62f 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/AbstractSerializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/AbstractSerializer.java @@ -9,7 +9,6 @@ import dev.metaschema.core.configuration.IMutableConfiguration; import dev.metaschema.core.model.IBoundObject; import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/io/DefaultBoundLoader.java b/databind/src/main/java/dev/metaschema/databind/io/DefaultBoundLoader.java index 9f04e09c48..342f9ea6bf 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/DefaultBoundLoader.java +++ b/databind/src/main/java/dev/metaschema/databind/io/DefaultBoundLoader.java @@ -5,16 +5,6 @@ package dev.metaschema.databind.io; -import dev.metaschema.core.configuration.DefaultConfiguration; -import dev.metaschema.core.configuration.IConfiguration; -import dev.metaschema.core.configuration.IMutableConfiguration; -import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; -import dev.metaschema.core.model.AbstractResourceResolver; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.io.ModelDetector.Result; - import org.eclipse.jdt.annotation.NotOwning; import org.eclipse.jdt.annotation.Owning; @@ -24,6 +14,15 @@ import java.net.URL; import java.util.Map; +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.model.AbstractResourceResolver; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.ModelDetector.Result; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/io/DeserializationFeature.java b/databind/src/main/java/dev/metaschema/databind/io/DeserializationFeature.java index cb268c83d5..3ada32eddb 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/DeserializationFeature.java +++ b/databind/src/main/java/dev/metaschema/databind/io/DeserializationFeature.java @@ -7,7 +7,6 @@ import dev.metaschema.core.configuration.AbstractConfigurationFeature; import dev.metaschema.core.model.IAssemblyDefinition; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/io/Format.java b/databind/src/main/java/dev/metaschema/databind/io/Format.java index e519f09ffb..3dbc655a3b 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/Format.java +++ b/databind/src/main/java/dev/metaschema/databind/io/Format.java @@ -5,10 +5,6 @@ package dev.metaschema.databind.io; -import dev.metaschema.core.metapath.format.IPathFormatter; -import dev.metaschema.core.metapath.format.PathFormatSelection; -import dev.metaschema.core.util.CollectionUtil; - import java.util.Arrays; import java.util.HashSet; import java.util.List; @@ -16,6 +12,9 @@ import java.util.Set; import java.util.stream.Collectors; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.format.PathFormatSelection; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/databind/src/main/java/dev/metaschema/databind/io/FormatDetector.java b/databind/src/main/java/dev/metaschema/databind/io/FormatDetector.java index dab795760e..a4db14cf44 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/FormatDetector.java +++ b/databind/src/main/java/dev/metaschema/databind/io/FormatDetector.java @@ -12,16 +12,15 @@ import com.fasterxml.jackson.dataformat.xml.XmlFactory; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; + import dev.metaschema.core.configuration.DefaultConfiguration; import dev.metaschema.core.configuration.IConfiguration; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.io.json.JsonFactoryFactory; import dev.metaschema.databind.io.yaml.impl.YamlFactoryFactory; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/io/IBoundLoader.java b/databind/src/main/java/dev/metaschema/databind/io/IBoundLoader.java index c5df9a6e99..5a41f7a7d9 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/IBoundLoader.java +++ b/databind/src/main/java/dev/metaschema/databind/io/IBoundLoader.java @@ -5,15 +5,6 @@ package dev.metaschema.databind.io; -import dev.metaschema.core.configuration.IConfiguration; -import dev.metaschema.core.configuration.IMutableConfiguration; -import dev.metaschema.core.metapath.IDocumentLoader; -import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.DefaultBindingContext; -import dev.metaschema.databind.IBindingContext; - import org.eclipse.jdt.annotation.Owning; import org.xml.sax.InputSource; @@ -28,6 +19,14 @@ import java.net.URL; import java.nio.file.Path; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.metapath.IDocumentLoader; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.DefaultBindingContext; +import dev.metaschema.databind.IBindingContext; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/io/IDeserializer.java b/databind/src/main/java/dev/metaschema/databind/io/IDeserializer.java index 6b85bd560c..f233122aac 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/IDeserializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/IDeserializer.java @@ -5,13 +5,6 @@ package dev.metaschema.databind.io; -import dev.metaschema.core.configuration.IConfiguration; -import dev.metaschema.core.configuration.IMutableConfiguration; -import dev.metaschema.core.metapath.item.node.INodeItem; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.core.model.constraint.IConstraintValidationHandler; -import dev.metaschema.core.util.ObjectUtils; - import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -24,6 +17,12 @@ import java.nio.file.Files; import java.nio.file.Path; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.constraint.IConstraintValidationHandler; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/io/IProblemHandler.java b/databind/src/main/java/dev/metaschema/databind/io/IProblemHandler.java index c5b7619e41..640eff5d34 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/IProblemHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/io/IProblemHandler.java @@ -5,13 +5,12 @@ package dev.metaschema.databind.io; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.databind.model.IBoundDefinitionModelComplex; -import dev.metaschema.databind.model.IBoundProperty; - import java.io.IOException; import java.util.Collection; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundProperty; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/io/ISerializer.java b/databind/src/main/java/dev/metaschema/databind/io/ISerializer.java index d1499c33a8..148136a16b 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/ISerializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/ISerializer.java @@ -5,11 +5,6 @@ package dev.metaschema.databind.io; -import dev.metaschema.core.configuration.IConfiguration; -import dev.metaschema.core.configuration.IMutableConfiguration; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.core.util.ObjectUtils; - import java.io.File; import java.io.IOException; import java.io.OutputStream; @@ -21,6 +16,10 @@ import java.nio.file.Path; import java.nio.file.StandardOpenOption; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/io/IWritingContext.java b/databind/src/main/java/dev/metaschema/databind/io/IWritingContext.java index a383fb17ec..51b3977142 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/IWritingContext.java +++ b/databind/src/main/java/dev/metaschema/databind/io/IWritingContext.java @@ -5,12 +5,11 @@ package dev.metaschema.databind.io; +import java.io.IOException; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.databind.model.IBoundDefinitionModelComplex; import dev.metaschema.databind.model.info.IFeatureComplexItemValueHandler; - -import java.io.IOException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/io/ModelDetector.java b/databind/src/main/java/dev/metaschema/databind/io/ModelDetector.java index 051fb284b3..96f08cbbb1 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/ModelDetector.java +++ b/databind/src/main/java/dev/metaschema/databind/io/ModelDetector.java @@ -11,16 +11,6 @@ import com.fasterxml.jackson.core.io.MergedStream; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import dev.metaschema.core.configuration.DefaultConfiguration; -import dev.metaschema.core.configuration.IConfiguration; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.core.model.util.JsonUtil; -import dev.metaschema.core.model.util.XmlEventUtil; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.io.json.JsonFactoryFactory; -import dev.metaschema.databind.io.yaml.impl.YamlFactoryFactory; - import org.codehaus.stax2.XMLEventReader2; import org.codehaus.stax2.XMLInputFactory2; import org.eclipse.jdt.annotation.NotOwning; @@ -41,6 +31,15 @@ import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.util.JsonUtil; +import dev.metaschema.core.model.util.XmlEventUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.json.JsonFactoryFactory; +import dev.metaschema.databind.io.yaml.impl.YamlFactoryFactory; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/io/PathTracker.java b/databind/src/main/java/dev/metaschema/databind/io/PathTracker.java index 54561ad2b0..18201e1a9d 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/PathTracker.java +++ b/databind/src/main/java/dev/metaschema/databind/io/PathTracker.java @@ -5,11 +5,10 @@ package dev.metaschema.databind.io; -import dev.metaschema.core.util.ObjectUtils; - import java.util.ArrayDeque; import java.util.Deque; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/io/SerializationFeature.java b/databind/src/main/java/dev/metaschema/databind/io/SerializationFeature.java index 055cb4bec4..02bdcc9352 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/SerializationFeature.java +++ b/databind/src/main/java/dev/metaschema/databind/io/SerializationFeature.java @@ -6,7 +6,6 @@ package dev.metaschema.databind.io; import dev.metaschema.core.configuration.AbstractConfigurationFeature; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/io/ValidationContext.java b/databind/src/main/java/dev/metaschema/databind/io/ValidationContext.java index 43ee4e27ad..f0a9a24c17 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/ValidationContext.java +++ b/databind/src/main/java/dev/metaschema/databind/io/ValidationContext.java @@ -5,12 +5,11 @@ package dev.metaschema.databind.io; +import java.net.URI; + import dev.metaschema.core.model.IResourceLocation; import dev.metaschema.core.model.SimpleResourceLocation; import dev.metaschema.core.util.ObjectUtils; - -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonDeserializer.java b/databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonDeserializer.java index 6c35031749..3fe122f75c 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonDeserializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonDeserializer.java @@ -8,6 +8,10 @@ import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; +import java.io.IOException; +import java.io.Reader; +import java.net.URI; + import dev.metaschema.core.configuration.IConfiguration; import dev.metaschema.core.configuration.IMutableConfiguration; import dev.metaschema.core.metapath.item.node.INodeItem; @@ -17,11 +21,6 @@ import dev.metaschema.databind.io.AbstractDeserializer; import dev.metaschema.databind.io.DeserializationFeature; import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; - -import java.io.IOException; -import java.io.Reader; -import java.net.URI; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonProblemHandler.java b/databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonProblemHandler.java index 283b15c631..8949337e24 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonProblemHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonProblemHandler.java @@ -5,15 +5,15 @@ package dev.metaschema.databind.io.json; +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.util.JsonUtil; import dev.metaschema.databind.io.AbstractProblemHandler; import dev.metaschema.databind.model.IBoundDefinitionModelComplex; -import java.io.IOException; -import java.util.HashSet; -import java.util.Set; - /** * This problem handler implementation handles common issues when parsing * JSON-based Metaschema module instances. diff --git a/databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonSerializer.java b/databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonSerializer.java index 230554db8b..add30ae47c 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonSerializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/json/DefaultJsonSerializer.java @@ -9,16 +9,15 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; +import java.io.IOException; +import java.io.Writer; + import dev.metaschema.core.configuration.IMutableConfiguration; import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.io.AbstractSerializer; import dev.metaschema.databind.io.SerializationFeature; import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; - -import java.io.IOException; -import java.io.Writer; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/io/json/IJsonProblemHandler.java b/databind/src/main/java/dev/metaschema/databind/io/json/IJsonProblemHandler.java index c3fc43fd47..feeda8ce33 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/json/IJsonProblemHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/io/json/IJsonProblemHandler.java @@ -5,12 +5,11 @@ package dev.metaschema.databind.io.json; +import java.io.IOException; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.databind.io.IProblemHandler; import dev.metaschema.databind.model.IBoundDefinitionModelComplex; - -import java.io.IOException; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonReader.java b/databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonReader.java index c286ece039..0107b2a12e 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonReader.java +++ b/databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonReader.java @@ -11,6 +11,20 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.eclipse.jdt.annotation.NotOwning; + +import java.io.IOException; +import java.net.URI; +import java.util.Collection; +import java.util.Deque; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IResourceLocation; import dev.metaschema.core.model.SimpleResourceLocation; @@ -39,21 +53,6 @@ import dev.metaschema.databind.model.info.IFeatureScalarItemValueHandler; import dev.metaschema.databind.model.info.IItemReadHandler; import dev.metaschema.databind.model.info.IModelInstanceCollectionInfo; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.eclipse.jdt.annotation.NotOwning; - -import java.io.IOException; -import java.net.URI; -import java.util.Collection; -import java.util.Deque; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonUtil.java b/databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonUtil.java index 0fc8f74543..15c14a4bf7 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonUtil.java +++ b/databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonUtil.java @@ -5,6 +5,13 @@ package dev.metaschema.databind.io.json; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; @@ -14,14 +21,6 @@ import dev.metaschema.databind.model.IBoundFieldValue; import dev.metaschema.databind.model.IBoundInstanceFlag; import dev.metaschema.databind.model.IBoundProperty; - -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonWriter.java b/databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonWriter.java index e9801dea48..c70d9f1470 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonWriter.java +++ b/databind/src/main/java/dev/metaschema/databind/io/json/MetaschemaJsonWriter.java @@ -7,6 +7,11 @@ import com.fasterxml.jackson.core.JsonGenerator; +import org.eclipse.jdt.annotation.NotOwning; + +import java.io.IOException; +import java.util.List; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.JsonGroupAsBehavior; import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; @@ -29,12 +34,6 @@ import dev.metaschema.databind.model.info.IFeatureScalarItemValueHandler; import dev.metaschema.databind.model.info.IItemWriteHandler; import dev.metaschema.databind.model.info.IModelInstanceCollectionInfo; - -import org.eclipse.jdt.annotation.NotOwning; - -import java.io.IOException; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlDeserializer.java b/databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlDeserializer.java index b28711cb94..4acc3f7321 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlDeserializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlDeserializer.java @@ -7,16 +7,6 @@ import com.ctc.wstx.stax.WstxInputFactory; -import dev.metaschema.core.configuration.IMutableConfiguration; -import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; -import dev.metaschema.core.metapath.item.node.INodeItemFactory; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.core.util.AutoCloser; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.io.AbstractDeserializer; -import dev.metaschema.databind.io.DeserializationFeature; -import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; - import org.codehaus.stax2.XMLEventReader2; import org.codehaus.stax2.XMLInputFactory2; @@ -30,6 +20,15 @@ import javax.xml.stream.XMLResolver; import javax.xml.stream.XMLStreamException; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.AutoCloser; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.AbstractDeserializer; +import dev.metaschema.databind.io.DeserializationFeature; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlProblemHandler.java b/databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlProblemHandler.java index 9e242c50a5..0d7cb59e67 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlProblemHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlProblemHandler.java @@ -5,13 +5,6 @@ package dev.metaschema.databind.io.xml; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.core.model.util.XmlEventUtil; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.io.AbstractProblemHandler; -import dev.metaschema.databind.model.IBoundDefinitionModelComplex; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -20,6 +13,13 @@ import javax.xml.stream.events.Attribute; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.util.XmlEventUtil; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.AbstractProblemHandler; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; + /** * Handles problems identified in the parsed XML. *

diff --git a/databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlSerializer.java b/databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlSerializer.java index 0c7c9b1ee4..10250921fd 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlSerializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/xml/DefaultXmlSerializer.java @@ -8,13 +8,6 @@ import com.ctc.wstx.api.WstxOutputProperties; import com.ctc.wstx.stax.WstxOutputFactory; -import dev.metaschema.core.configuration.IMutableConfiguration; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.io.AbstractSerializer; -import dev.metaschema.databind.io.SerializationFeature; -import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; - import org.codehaus.stax2.XMLOutputFactory2; import org.codehaus.stax2.XMLStreamWriter2; @@ -24,6 +17,12 @@ import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.AbstractSerializer; +import dev.metaschema.databind.io.SerializationFeature; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/io/xml/IXmlParsingContext.java b/databind/src/main/java/dev/metaschema/databind/io/xml/IXmlParsingContext.java index 95e1112c36..aace5b27fe 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/xml/IXmlParsingContext.java +++ b/databind/src/main/java/dev/metaschema/databind/io/xml/IXmlParsingContext.java @@ -5,17 +5,16 @@ package dev.metaschema.databind.io.xml; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.databind.io.IParsingContext; -import dev.metaschema.databind.model.IBoundDefinitionModelComplex; -import dev.metaschema.databind.model.IBoundInstanceModel; - import org.codehaus.stax2.XMLEventReader2; import java.io.IOException; import javax.xml.stream.XMLStreamConstants; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.io.IParsingContext; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundInstanceModel; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/io/xml/IXmlProblemHandler.java b/databind/src/main/java/dev/metaschema/databind/io/xml/IXmlProblemHandler.java index 1e193e74a8..4a3837f0a4 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/xml/IXmlProblemHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/io/xml/IXmlProblemHandler.java @@ -5,6 +5,12 @@ package dev.metaschema.databind.io.xml; +import java.io.IOException; +import java.util.Collection; + +import javax.xml.stream.events.Attribute; +import javax.xml.stream.events.StartElement; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.databind.io.IProblemHandler; import dev.metaschema.databind.io.ValidationContext; @@ -12,13 +18,6 @@ import dev.metaschema.databind.model.IBoundDefinitionModelComplex; import dev.metaschema.databind.model.IBoundInstanceFlag; import dev.metaschema.databind.model.IBoundInstanceModel; - -import java.io.IOException; -import java.util.Collection; - -import javax.xml.stream.events.Attribute; -import javax.xml.stream.events.StartElement; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/io/xml/IXmlWritingContext.java b/databind/src/main/java/dev/metaschema/databind/io/xml/IXmlWritingContext.java index 87d725e737..a3a790636e 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/xml/IXmlWritingContext.java +++ b/databind/src/main/java/dev/metaschema/databind/io/xml/IXmlWritingContext.java @@ -5,14 +5,13 @@ package dev.metaschema.databind.io.xml; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.databind.io.IWritingContext; -import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; - import org.codehaus.stax2.XMLStreamWriter2; import java.io.IOException; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.io.IWritingContext; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/io/xml/MetaschemaXmlReader.java b/databind/src/main/java/dev/metaschema/databind/io/xml/MetaschemaXmlReader.java index 34c9792b23..664f20b8a5 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/xml/MetaschemaXmlReader.java +++ b/databind/src/main/java/dev/metaschema/databind/io/xml/MetaschemaXmlReader.java @@ -5,6 +5,30 @@ package dev.metaschema.databind.io.xml; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.codehaus.stax2.XMLEventReader2; + +import java.io.IOException; +import java.net.URI; +import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; + +import javax.xml.namespace.QName; +import javax.xml.stream.Location; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.events.Attribute; +import javax.xml.stream.events.StartElement; +import javax.xml.stream.events.XMLEvent; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IResourceLocation; import dev.metaschema.core.model.SimpleResourceLocation; @@ -33,31 +57,6 @@ import dev.metaschema.databind.model.info.IFeatureScalarItemValueHandler; import dev.metaschema.databind.model.info.IItemReadHandler; import dev.metaschema.databind.model.info.IModelInstanceCollectionInfo; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.codehaus.stax2.XMLEventReader2; - -import java.io.IOException; -import java.net.URI; -import java.util.Collection; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; - -import javax.xml.namespace.QName; -import javax.xml.stream.Location; -import javax.xml.stream.XMLStreamConstants; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.events.Attribute; -import javax.xml.stream.events.StartElement; -import javax.xml.stream.events.XMLEvent; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/io/xml/MetaschemaXmlWriter.java b/databind/src/main/java/dev/metaschema/databind/io/xml/MetaschemaXmlWriter.java index 036cdd379a..705f27c568 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/xml/MetaschemaXmlWriter.java +++ b/databind/src/main/java/dev/metaschema/databind/io/xml/MetaschemaXmlWriter.java @@ -5,6 +5,13 @@ package dev.metaschema.databind.io.xml; +import org.codehaus.stax2.XMLStreamWriter2; + +import java.io.IOException; + +import javax.xml.namespace.NamespaceContext; +import javax.xml.stream.XMLStreamException; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.databind.io.json.DefaultJsonProblemHandler; @@ -27,14 +34,6 @@ import dev.metaschema.databind.model.info.IFeatureComplexItemValueHandler; import dev.metaschema.databind.model.info.IItemWriteHandler; import dev.metaschema.databind.model.info.IModelInstanceCollectionInfo; - -import org.codehaus.stax2.XMLStreamWriter2; - -import java.io.IOException; - -import javax.xml.namespace.NamespaceContext; -import javax.xml.stream.XMLStreamException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/io/yaml/DefaultYamlDeserializer.java b/databind/src/main/java/dev/metaschema/databind/io/yaml/DefaultYamlDeserializer.java index 8f7c3da00d..e6078c2e2e 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/yaml/DefaultYamlDeserializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/yaml/DefaultYamlDeserializer.java @@ -11,7 +11,6 @@ import dev.metaschema.databind.io.json.DefaultJsonDeserializer; import dev.metaschema.databind.io.yaml.impl.YamlFactoryFactory; import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/io/yaml/DefaultYamlSerializer.java b/databind/src/main/java/dev/metaschema/databind/io/yaml/DefaultYamlSerializer.java index b9408c3a13..ae9e3fe077 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/yaml/DefaultYamlSerializer.java +++ b/databind/src/main/java/dev/metaschema/databind/io/yaml/DefaultYamlSerializer.java @@ -11,7 +11,6 @@ import dev.metaschema.databind.io.json.DefaultJsonSerializer; import dev.metaschema.databind.io.yaml.impl.YamlFactoryFactory; import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/io/yaml/YamlOperations.java b/databind/src/main/java/dev/metaschema/databind/io/yaml/YamlOperations.java index 2abf4d67a8..89d1225230 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/yaml/YamlOperations.java +++ b/databind/src/main/java/dev/metaschema/databind/io/yaml/YamlOperations.java @@ -5,8 +5,6 @@ package dev.metaschema.databind.io.yaml; -import dev.metaschema.core.util.ObjectUtils; - import org.json.JSONException; import org.json.JSONObject; import org.yaml.snakeyaml.DumperOptions; @@ -22,6 +20,7 @@ import java.net.URI; import java.util.Map; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/io/yaml/impl/YamlFactoryFactory.java b/databind/src/main/java/dev/metaschema/databind/io/yaml/impl/YamlFactoryFactory.java index 1d1cc68563..1f7f7a5d2a 100644 --- a/databind/src/main/java/dev/metaschema/databind/io/yaml/impl/YamlFactoryFactory.java +++ b/databind/src/main/java/dev/metaschema/databind/io/yaml/impl/YamlFactoryFactory.java @@ -9,15 +9,14 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLFactoryBuilder; import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator; +import org.yaml.snakeyaml.LoaderOptions; + import dev.metaschema.core.configuration.IConfiguration; import dev.metaschema.core.configuration.IMutableConfiguration; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.io.DeserializationFeature; import dev.metaschema.databind.io.SerializationFeature; import dev.metaschema.databind.io.json.JsonFactoryFactory; - -import org.yaml.snakeyaml.LoaderOptions; - import edu.umd.cs.findbugs.annotations.NonNull; public final class YamlFactoryFactory { diff --git a/databind/src/main/java/dev/metaschema/databind/metapath/function/Model.java b/databind/src/main/java/dev/metaschema/databind/metapath/function/Model.java index 47767abe5f..6fad6a167e 100644 --- a/databind/src/main/java/dev/metaschema/databind/metapath/function/Model.java +++ b/databind/src/main/java/dev/metaschema/databind/metapath/function/Model.java @@ -5,6 +5,8 @@ package dev.metaschema.databind.metapath.function; +import java.util.List; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.MetapathConstants; import dev.metaschema.core.metapath.function.FunctionUtils; @@ -18,9 +20,6 @@ import dev.metaschema.core.model.INamedInstance; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.model.metaschema.IBindingModelElement; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/AbstractBoundModule.java b/databind/src/main/java/dev/metaschema/databind/model/AbstractBoundModule.java index 11408499a9..d8ddfec240 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/AbstractBoundModule.java +++ b/databind/src/main/java/dev/metaschema/databind/model/AbstractBoundModule.java @@ -5,16 +5,6 @@ package dev.metaschema.databind.model; -import dev.metaschema.core.metapath.StaticContext; -import dev.metaschema.core.model.AbstractModule; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.core.model.ISource; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.model.annotations.MetaschemaModule; -import dev.metaschema.databind.model.annotations.NsBinding; - import java.lang.reflect.Array; import java.util.Arrays; import java.util.Collection; @@ -25,6 +15,15 @@ import java.util.function.Function; import java.util.stream.Collectors; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.model.AbstractModule; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.annotations.MetaschemaModule; +import dev.metaschema.databind.model.annotations.NsBinding; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModel.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModel.java index fc1e20b522..d18fd42256 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModel.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModel.java @@ -7,7 +7,6 @@ import dev.metaschema.core.model.IFeatureContainerFlag; import dev.metaschema.databind.IBindingContext; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelAssembly.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelAssembly.java index c9823b65c5..ffc5fe3a26 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelAssembly.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelAssembly.java @@ -5,6 +5,13 @@ package dev.metaschema.databind.model; +import java.io.IOException; +import java.util.Map; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IChoiceInstance; @@ -13,14 +20,6 @@ import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.model.info.IItemReadHandler; import dev.metaschema.databind.model.info.IItemWriteHandler; - -import java.io.IOException; -import java.util.Map; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelComplex.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelComplex.java index c1ab96c874..add307ac67 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelComplex.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelComplex.java @@ -5,15 +5,14 @@ package dev.metaschema.databind.model; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.databind.io.BindingException; -import dev.metaschema.databind.model.info.IFeatureComplexItemValueHandler; - import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Map; import java.util.function.Predicate; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.info.IFeatureComplexItemValueHandler; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelField.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelField.java index fdab029b3b..37544b0a4d 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelField.java @@ -6,7 +6,6 @@ package dev.metaschema.databind.model; import dev.metaschema.core.model.IFieldDefinition; - import edu.umd.cs.findbugs.annotations.Nullable; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelFieldComplex.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelFieldComplex.java index 3ad315c665..f59fbdca93 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelFieldComplex.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundDefinitionModelFieldComplex.java @@ -5,13 +5,6 @@ package dev.metaschema.databind.model; -import dev.metaschema.core.datatype.IDataTypeAdapter; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.model.info.IItemReadHandler; -import dev.metaschema.databind.model.info.IItemWriteHandler; - import java.io.IOException; import java.util.Collection; import java.util.Map; @@ -20,6 +13,12 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.info.IItemReadHandler; +import dev.metaschema.databind.model.info.IItemWriteHandler; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundFieldValue.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundFieldValue.java index 21e8b4e569..1e2c39c714 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundFieldValue.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundFieldValue.java @@ -5,6 +5,8 @@ package dev.metaschema.databind.model; +import java.io.IOException; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; @@ -12,9 +14,6 @@ import dev.metaschema.databind.model.info.IFeatureScalarItemValueHandler; import dev.metaschema.databind.model.info.IItemReadHandler; import dev.metaschema.databind.model.info.IItemWriteHandler; - -import java.io.IOException; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstance.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstance.java index 76585b8cae..02a91fca52 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstance.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstance.java @@ -7,7 +7,6 @@ import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IInstance; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceFlag.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceFlag.java index 2402aad3f0..f43941748c 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceFlag.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceFlag.java @@ -5,6 +5,9 @@ package dev.metaschema.databind.model; +import java.io.IOException; +import java.lang.reflect.Field; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IFeatureDefinitionInstanceInlined; import dev.metaschema.core.model.IFlagInstance; @@ -16,10 +19,6 @@ import dev.metaschema.databind.model.info.IFeatureScalarItemValueHandler; import dev.metaschema.databind.model.info.IItemReadHandler; import dev.metaschema.databind.model.info.IItemWriteHandler; - -import java.io.IOException; -import java.lang.reflect.Field; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModel.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModel.java index fba8959ae0..7830b7352e 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModel.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModel.java @@ -5,12 +5,6 @@ package dev.metaschema.databind.model; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.core.model.IModelInstanceAbsolute; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.io.BindingException; -import dev.metaschema.databind.model.info.IModelInstanceCollectionInfo; - import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -18,6 +12,11 @@ import java.util.List; import java.util.Map; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IModelInstanceAbsolute; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.info.IModelInstanceCollectionInfo; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelAssembly.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelAssembly.java index fafb54c434..0001df7f05 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelAssembly.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelAssembly.java @@ -5,6 +5,9 @@ package dev.metaschema.databind.model; +import java.io.IOException; +import java.lang.reflect.Field; + import dev.metaschema.core.model.IAssemblyInstanceAbsolute; import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.util.ObjectUtils; @@ -14,10 +17,6 @@ import dev.metaschema.databind.model.info.IFeatureComplexItemValueHandler; import dev.metaschema.databind.model.info.IItemReadHandler; import dev.metaschema.databind.model.info.IItemWriteHandler; - -import java.io.IOException; -import java.lang.reflect.Field; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelChoiceGroup.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelChoiceGroup.java index f4a8cee3ee..76f6a06023 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelChoiceGroup.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelChoiceGroup.java @@ -5,6 +5,9 @@ package dev.metaschema.databind.model; +import java.io.IOException; +import java.lang.reflect.Field; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IChoiceGroupInstance; import dev.metaschema.core.model.IFeatureContainerModelGrouped; @@ -14,10 +17,6 @@ import dev.metaschema.databind.model.impl.InstanceModelChoiceGroup; import dev.metaschema.databind.model.info.IItemReadHandler; import dev.metaschema.databind.model.info.IItemWriteHandler; - -import java.io.IOException; -import java.lang.reflect.Field; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelField.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelField.java index cfb54f3a26..f6b45486e4 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelField.java @@ -5,6 +5,8 @@ package dev.metaschema.databind.model; +import java.lang.reflect.Field; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IFieldInstanceAbsolute; @@ -14,9 +16,6 @@ import dev.metaschema.databind.model.impl.DefinitionField; import dev.metaschema.databind.model.impl.InstanceModelFieldComplex; import dev.metaschema.databind.model.impl.InstanceModelFieldScalar; - -import java.lang.reflect.Field; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelFieldComplex.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelFieldComplex.java index 4d405c8788..892334487b 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelFieldComplex.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelFieldComplex.java @@ -5,6 +5,8 @@ package dev.metaschema.databind.model; +import java.io.IOException; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.io.BindingException; @@ -12,8 +14,6 @@ import dev.metaschema.databind.model.info.IItemReadHandler; import dev.metaschema.databind.model.info.IItemWriteHandler; -import java.io.IOException; - /** * Represents a bound field instance that contains complex (non-scalar) data, * such as an object with flags and a value. diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelFieldScalar.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelFieldScalar.java index c6cc3e4b73..71d42fe7f3 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelFieldScalar.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelFieldScalar.java @@ -5,6 +5,8 @@ package dev.metaschema.databind.model; +import java.io.IOException; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IContainerFlagSupport; import dev.metaschema.core.model.IFeatureDefinitionInstanceInlined; @@ -14,8 +16,6 @@ import dev.metaschema.databind.model.info.IItemReadHandler; import dev.metaschema.databind.model.info.IItemWriteHandler; -import java.io.IOException; - /** * Represents a bound field instance that contains scalar (simple) data, such as * a string or number value. diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedAssembly.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedAssembly.java index 542614774a..dfd0333ac3 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedAssembly.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedAssembly.java @@ -5,6 +5,9 @@ package dev.metaschema.databind.model; +import java.io.IOException; +import java.lang.reflect.Field; + import dev.metaschema.core.model.IAssemblyInstanceGrouped; import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.util.ObjectUtils; @@ -13,10 +16,6 @@ import dev.metaschema.databind.model.impl.InstanceModelGroupedAssembly; import dev.metaschema.databind.model.info.IItemReadHandler; import dev.metaschema.databind.model.info.IItemWriteHandler; - -import java.io.IOException; -import java.lang.reflect.Field; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedField.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedField.java index 51fd12f9d9..6535e5a207 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedField.java @@ -5,6 +5,9 @@ package dev.metaschema.databind.model; +import java.io.IOException; +import java.lang.reflect.Field; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IFieldInstanceGrouped; import dev.metaschema.core.util.ObjectUtils; @@ -14,10 +17,6 @@ import dev.metaschema.databind.model.impl.InstanceModelGroupedFieldComplex; import dev.metaschema.databind.model.info.IItemReadHandler; import dev.metaschema.databind.model.info.IItemWriteHandler; - -import java.io.IOException; -import java.lang.reflect.Field; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedNamed.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedNamed.java index 71343593c7..fc774c9812 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedNamed.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelGroupedNamed.java @@ -12,7 +12,6 @@ import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.io.BindingException; import dev.metaschema.databind.model.info.IFeatureComplexItemValueHandler; - import edu.umd.cs.findbugs.annotations.Nullable; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelNamed.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelNamed.java index ccd66267a5..70d77b815f 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelNamed.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundInstanceModelNamed.java @@ -5,12 +5,11 @@ package dev.metaschema.databind.model; +import java.util.Collection; + import dev.metaschema.core.model.INamedModelInstanceAbsolute; import dev.metaschema.core.model.JsonGroupAsBehavior; import dev.metaschema.core.qname.IEnhancedQName; - -import java.util.Collection; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundModelObject.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundModelObject.java index edd1732ebc..e470a44db4 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundModelObject.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundModelObject.java @@ -7,7 +7,6 @@ import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.databind.model.info.IItemValueHandler; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundModule.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundModule.java index 59a62c941a..6e4cfc7e26 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundModule.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundModule.java @@ -5,16 +5,15 @@ package dev.metaschema.databind.model; -import dev.metaschema.core.model.IModuleExtended; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; - import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.net.URI; import java.util.Collection; import java.util.List; +import dev.metaschema.core.model.IModuleExtended; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/IBoundProperty.java b/databind/src/main/java/dev/metaschema/databind/model/IBoundProperty.java index c2dce78a37..de14415775 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IBoundProperty.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IBoundProperty.java @@ -8,7 +8,6 @@ import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IJsonNamed; import dev.metaschema.databind.io.BindingException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/IGroupAs.java b/databind/src/main/java/dev/metaschema/databind/model/IGroupAs.java index bffa8e9e11..4cdd8f5af3 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IGroupAs.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IGroupAs.java @@ -8,7 +8,6 @@ import dev.metaschema.core.model.JsonGroupAsBehavior; import dev.metaschema.core.model.XmlGroupAsBehavior; import dev.metaschema.core.qname.IEnhancedQName; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/IValuedMutable.java b/databind/src/main/java/dev/metaschema/databind/model/IValuedMutable.java index 9201d2a1bd..32c92e16bd 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/IValuedMutable.java +++ b/databind/src/main/java/dev/metaschema/databind/model/IValuedMutable.java @@ -5,11 +5,10 @@ package dev.metaschema.databind.model; -import dev.metaschema.core.model.IValued; - import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; +import dev.metaschema.core.model.IValued; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/AllowedValues.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/AllowedValues.java index 2143978526..2552d61ee0 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/AllowedValues.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/AllowedValues.java @@ -8,14 +8,13 @@ import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.model.constraint.IAllowedValuesConstraint; -import dev.metaschema.core.model.constraint.IConstraint; -import dev.metaschema.core.model.constraint.IConstraint.Level; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.core.model.constraint.IAllowedValuesConstraint; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraint.Level; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundAssembly.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundAssembly.java index b14f917327..87461f9c91 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundAssembly.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundAssembly.java @@ -10,12 +10,11 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.model.IGroupable; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.core.model.IGroupable; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundChoiceGroup.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundChoiceGroup.java index bba8043369..b104c38906 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundChoiceGroup.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundChoiceGroup.java @@ -9,13 +9,12 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.model.IChoiceGroupInstance; -import dev.metaschema.core.model.IGroupable; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.IGroupable; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundField.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundField.java index 1770cc6db8..4982039712 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundField.java @@ -9,14 +9,13 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.datatype.IDataTypeAdapter; -import dev.metaschema.core.model.IFieldInstance; -import dev.metaschema.core.model.IGroupable; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.core.model.IGroupable; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundFieldValue.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundFieldValue.java index aa8927bfc0..4c164583b3 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundFieldValue.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundFieldValue.java @@ -9,12 +9,11 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.datatype.IDataTypeAdapter; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.core.datatype.IDataTypeAdapter; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundFlag.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundFlag.java index cf775433c0..2c4e813400 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundFlag.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundFlag.java @@ -9,12 +9,11 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.datatype.IDataTypeAdapter; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.core.datatype.IDataTypeAdapter; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundGroupedAssembly.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundGroupedAssembly.java index 459787fc2b..f5254ee4b9 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundGroupedAssembly.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundGroupedAssembly.java @@ -10,12 +10,11 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.model.IBoundObject; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.core.model.IBoundObject; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundGroupedField.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundGroupedField.java index d5ae0c3fc5..12c8594b45 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundGroupedField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/BoundGroupedField.java @@ -9,13 +9,12 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.datatype.IDataTypeAdapter; -import dev.metaschema.core.model.IBoundObject; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.IBoundObject; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/Expect.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/Expect.java index e7e2665d92..07599fd4ce 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/Expect.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/Expect.java @@ -8,13 +8,12 @@ import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.model.constraint.IConstraint; -import dev.metaschema.core.model.constraint.IConstraint.Level; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraint.Level; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/GroupAs.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/GroupAs.java index 6565e9934c..38618a3781 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/GroupAs.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/GroupAs.java @@ -7,14 +7,13 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.model.JsonGroupAsBehavior; -import dev.metaschema.core.model.XmlGroupAsBehavior; - import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.model.XmlGroupAsBehavior; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/HasCardinality.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/HasCardinality.java index c0486a9842..ab40794f79 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/HasCardinality.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/HasCardinality.java @@ -8,13 +8,12 @@ import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.model.constraint.IConstraint; -import dev.metaschema.core.model.constraint.IConstraint.Level; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraint.Level; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/Index.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/Index.java index 9a3ea9be73..ae7244b931 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/Index.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/Index.java @@ -8,13 +8,12 @@ import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.model.constraint.IConstraint; -import dev.metaschema.core.model.constraint.IConstraint.Level; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraint.Level; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/IndexHasKey.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/IndexHasKey.java index 2b6cd86cc0..eba3001dfd 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/IndexHasKey.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/IndexHasKey.java @@ -8,13 +8,12 @@ import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.model.constraint.IConstraint; -import dev.metaschema.core.model.constraint.IConstraint.Level; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraint.Level; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/IsUnique.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/IsUnique.java index 73cf162fad..a6613b0b5e 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/IsUnique.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/IsUnique.java @@ -8,13 +8,12 @@ import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.model.constraint.IConstraint; -import dev.metaschema.core.model.constraint.IConstraint.Level; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraint.Level; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/Matches.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/Matches.java index 64f47efaea..9d158ff90b 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/Matches.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/Matches.java @@ -8,15 +8,14 @@ import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.datatype.IDataTypeAdapter; -import dev.metaschema.core.model.constraint.IConstraint; -import dev.metaschema.core.model.constraint.IConstraint.Level; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.util.regex.Pattern; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraint.Level; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaAssembly.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaAssembly.java index b80738c68d..1d333bfac6 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaAssembly.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaAssembly.java @@ -8,12 +8,11 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.databind.model.IBoundModule; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.databind.model.IBoundModule; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaField.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaField.java index 41d02d7875..65b7de5371 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaField.java @@ -8,13 +8,12 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.model.IFieldInstance; -import dev.metaschema.databind.model.IBoundModule; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.core.model.IFieldInstance; +import dev.metaschema.databind.model.IBoundModule; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaModule.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaModule.java index d2dd21e307..2bbdf5db1d 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaModule.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaModule.java @@ -7,13 +7,12 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.databind.model.IBoundModule; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.model.IBoundModule; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaPackage.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaPackage.java index 1ba9543b96..05bcd1035a 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaPackage.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/MetaschemaPackage.java @@ -8,12 +8,12 @@ import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.model.IModule; -import dev.metaschema.databind.model.IBoundModule; - import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.core.model.IModule; +import dev.metaschema.databind.model.IBoundModule; + /** * Associates Metaschema module classes with a package. */ diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/ModelUtil.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/ModelUtil.java index d3c1b1eb6e..8a266bf5b7 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/ModelUtil.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/ModelUtil.java @@ -5,6 +5,15 @@ package dev.metaschema.databind.model.annotations; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.net.URI; +import java.util.Arrays; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.datatype.markup.MarkupLine; @@ -17,16 +26,6 @@ import dev.metaschema.databind.IBindingContext; import dev.metaschema.databind.model.IGroupAs; import dev.metaschema.databind.model.impl.DefaultGroupAs; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.net.URI; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/NullJavaTypeAdapter.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/NullJavaTypeAdapter.java index d74ed838e1..cf9abffe31 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/NullJavaTypeAdapter.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/NullJavaTypeAdapter.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes; +import java.util.List; + import dev.metaschema.core.datatype.AbstractDataTypeAdapter; import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.metapath.DynamicContext; @@ -16,9 +18,6 @@ import dev.metaschema.core.metapath.type.IItemType; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.databind.model.annotations.NullJavaTypeAdapter.VoidItem; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/Property.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/Property.java index cfba4a4d59..8d25354255 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/Property.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/Property.java @@ -8,11 +8,10 @@ import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.model.IAttributable; - import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.core.model.IAttributable; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/annotations/Report.java b/databind/src/main/java/dev/metaschema/databind/model/annotations/Report.java index d2bf18ce27..e815caf543 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/annotations/Report.java +++ b/databind/src/main/java/dev/metaschema/databind/model/annotations/Report.java @@ -8,13 +8,12 @@ import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import dev.metaschema.core.model.constraint.IConstraint; -import dev.metaschema.core.model.constraint.IConstraint.Level; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import dev.metaschema.core.model.constraint.IConstraint; +import dev.metaschema.core.model.constraint.IConstraint.Level; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/impl/AbstractBoundDefinitionModelComplex.java b/databind/src/main/java/dev/metaschema/databind/model/impl/AbstractBoundDefinitionModelComplex.java index 205290dc0d..4b218fd812 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/impl/AbstractBoundDefinitionModelComplex.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/AbstractBoundDefinitionModelComplex.java @@ -5,6 +5,9 @@ package dev.metaschema.databind.model.impl; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.ISource; import dev.metaschema.core.model.util.ModuleUtils; @@ -15,10 +18,6 @@ import dev.metaschema.databind.model.IBoundDefinitionModelComplex; import dev.metaschema.databind.model.IBoundInstanceFlag; import dev.metaschema.databind.model.IBoundModule; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/impl/AssemblyModelGenerator.java b/databind/src/main/java/dev/metaschema/databind/model/impl/AssemblyModelGenerator.java index 0689b457f2..fefefa380f 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/impl/AssemblyModelGenerator.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/AssemblyModelGenerator.java @@ -5,6 +5,16 @@ package dev.metaschema.databind.model.impl; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import dev.metaschema.core.model.DefaultAssemblyModelBuilder; import dev.metaschema.core.model.IChoiceInstance; import dev.metaschema.core.model.IContainerModelAssemblySupport; @@ -21,17 +31,6 @@ import dev.metaschema.databind.model.annotations.BoundChoiceGroup; import dev.metaschema.databind.model.annotations.BoundField; import dev.metaschema.databind.model.annotations.Ignore; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/impl/BoundInstanceModelChoice.java b/databind/src/main/java/dev/metaschema/databind/model/impl/BoundInstanceModelChoice.java index 291a34528b..1fcc03fbbb 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/impl/BoundInstanceModelChoice.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/BoundInstanceModelChoice.java @@ -5,6 +5,8 @@ package dev.metaschema.databind.model.impl; +import java.util.List; + import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.model.AbstractChoiceInstance; import dev.metaschema.core.model.DefaultChoiceModelBuilder; @@ -18,9 +20,6 @@ import dev.metaschema.databind.model.IBoundInstanceModelAssembly; import dev.metaschema.databind.model.IBoundInstanceModelField; import dev.metaschema.databind.model.IBoundInstanceModelNamed; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/impl/ConstraintFactory.java b/databind/src/main/java/dev/metaschema/databind/model/impl/ConstraintFactory.java index ce714f64af..29c88c5dc0 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/impl/ConstraintFactory.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/ConstraintFactory.java @@ -5,6 +5,9 @@ package dev.metaschema.databind.model.impl; +import java.util.Arrays; +import java.util.regex.Pattern; + import dev.metaschema.core.datatype.DataTypeService; import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; @@ -21,10 +24,10 @@ import dev.metaschema.core.model.constraint.IExpectConstraint; import dev.metaschema.core.model.constraint.IIndexConstraint; import dev.metaschema.core.model.constraint.IIndexHasKeyConstraint; -import dev.metaschema.core.model.constraint.IReportConstraint; import dev.metaschema.core.model.constraint.IKeyField; import dev.metaschema.core.model.constraint.ILet; import dev.metaschema.core.model.constraint.IMatchesConstraint; +import dev.metaschema.core.model.constraint.IReportConstraint; import dev.metaschema.core.model.constraint.IUniqueConstraint; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.model.annotations.AllowedValue; @@ -38,13 +41,9 @@ import dev.metaschema.databind.model.annotations.Let; import dev.metaschema.databind.model.annotations.Matches; import dev.metaschema.databind.model.annotations.ModelUtil; -import dev.metaschema.databind.model.annotations.Report; import dev.metaschema.databind.model.annotations.NullJavaTypeAdapter; import dev.metaschema.databind.model.annotations.Property; - -import java.util.Arrays; -import java.util.regex.Pattern; - +import dev.metaschema.databind.model.annotations.Report; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/impl/ConstraintSupport.java b/databind/src/main/java/dev/metaschema/databind/model/impl/ConstraintSupport.java index 2c11525fbf..a293611e49 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/impl/ConstraintSupport.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/ConstraintSupport.java @@ -5,14 +5,13 @@ package dev.metaschema.databind.model.impl; +import java.util.Arrays; + import dev.metaschema.core.model.ISource; import dev.metaschema.core.model.constraint.IModelConstrained; import dev.metaschema.core.model.constraint.IValueConstrained; import dev.metaschema.databind.model.annotations.AssemblyConstraints; import dev.metaschema.databind.model.annotations.ValueConstraints; - -import java.util.Arrays; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/impl/DefaultGroupAs.java b/databind/src/main/java/dev/metaschema/databind/model/impl/DefaultGroupAs.java index 29041a1d3a..b029932dc0 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/impl/DefaultGroupAs.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/DefaultGroupAs.java @@ -13,7 +13,6 @@ import dev.metaschema.databind.model.IGroupAs; import dev.metaschema.databind.model.annotations.GroupAs; import dev.metaschema.databind.model.annotations.ModelUtil; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/databind/src/main/java/dev/metaschema/databind/model/impl/DefinitionAssembly.java b/databind/src/main/java/dev/metaschema/databind/model/impl/DefinitionAssembly.java index 033e27a2f7..18d4233bb3 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/impl/DefinitionAssembly.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/DefinitionAssembly.java @@ -5,6 +5,12 @@ package dev.metaschema.databind.model.impl; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.model.IAttributable; @@ -32,13 +38,6 @@ import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import dev.metaschema.databind.model.annotations.ModelUtil; import dev.metaschema.databind.model.annotations.ValueConstraints; - -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/impl/DefinitionField.java b/databind/src/main/java/dev/metaschema/databind/model/impl/DefinitionField.java index 6270d6c8f0..7a62be5a54 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/impl/DefinitionField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/DefinitionField.java @@ -5,6 +5,14 @@ package dev.metaschema.databind.model.impl; +import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; @@ -28,15 +36,6 @@ import dev.metaschema.databind.model.annotations.MetaschemaField; import dev.metaschema.databind.model.annotations.ModelUtil; import dev.metaschema.databind.model.annotations.ValueConstraints; - -import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/impl/FlagContainerSupport.java b/databind/src/main/java/dev/metaschema/databind/model/impl/FlagContainerSupport.java index 0f0f82ca86..264e6466d5 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/impl/FlagContainerSupport.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/FlagContainerSupport.java @@ -5,14 +5,6 @@ package dev.metaschema.databind.model.impl; -import dev.metaschema.core.model.IContainerFlagSupport; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.model.IBoundDefinitionModelComplex; -import dev.metaschema.databind.model.IBoundInstanceFlag; -import dev.metaschema.databind.model.annotations.BoundFlag; -import dev.metaschema.databind.model.annotations.Ignore; - import java.lang.reflect.Field; import java.util.Collection; import java.util.Collections; @@ -25,6 +17,13 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.model.IContainerFlagSupport; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundDefinitionModelComplex; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.annotations.BoundFlag; +import dev.metaschema.databind.model.annotations.Ignore; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/databind/src/main/java/dev/metaschema/databind/model/impl/IFeatureInstanceModelGroupAs.java b/databind/src/main/java/dev/metaschema/databind/model/impl/IFeatureInstanceModelGroupAs.java index 33bf96d952..75b5bfa17c 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/impl/IFeatureInstanceModelGroupAs.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/IFeatureInstanceModelGroupAs.java @@ -10,7 +10,6 @@ import dev.metaschema.core.model.XmlGroupAsBehavior; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.databind.model.IGroupAs; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceFlagInline.java b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceFlagInline.java index 556ec4ee24..4e68f1d09c 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceFlagInline.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceFlagInline.java @@ -5,6 +5,14 @@ package dev.metaschema.databind.model.impl; +import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; @@ -26,15 +34,6 @@ import dev.metaschema.databind.model.annotations.JsonKey; import dev.metaschema.databind.model.annotations.ModelUtil; import dev.metaschema.databind.model.annotations.ValueConstraints; - -import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelAssemblyComplex.java b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelAssemblyComplex.java index f34a6b3296..d97314fc27 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelAssemblyComplex.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelAssemblyComplex.java @@ -5,6 +5,14 @@ package dev.metaschema.databind.model.impl; +import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.model.AbstractAssemblyInstance; @@ -22,15 +30,6 @@ import dev.metaschema.databind.model.annotations.GroupAs; import dev.metaschema.databind.model.annotations.ModelUtil; import dev.metaschema.databind.model.info.IModelInstanceCollectionInfo; - -import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelChoiceGroup.java b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelChoiceGroup.java index fbd0b9f244..f195808aa6 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelChoiceGroup.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelChoiceGroup.java @@ -5,6 +5,12 @@ package dev.metaschema.databind.model.impl; +import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.Collections; +import java.util.Map; +import java.util.stream.Collectors; + import dev.metaschema.core.model.AbstractChoiceGroupInstance; import dev.metaschema.core.model.DefaultChoiceGroupModelBuilder; import dev.metaschema.core.model.IBoundObject; @@ -26,13 +32,6 @@ import dev.metaschema.databind.model.annotations.GroupAs; import dev.metaschema.databind.model.annotations.ModelUtil; import dev.metaschema.databind.model.info.IModelInstanceCollectionInfo; - -import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.Collections; -import java.util.Map; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelFieldComplex.java b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelFieldComplex.java index f14664d8ca..8f38ff0b37 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelFieldComplex.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelFieldComplex.java @@ -5,6 +5,14 @@ package dev.metaschema.databind.model.impl; +import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.model.AbstractFieldInstance; @@ -24,15 +32,6 @@ import dev.metaschema.databind.model.annotations.GroupAs; import dev.metaschema.databind.model.annotations.ModelUtil; import dev.metaschema.databind.model.info.IModelInstanceCollectionInfo; - -import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelFieldScalar.java b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelFieldScalar.java index 8a7097369f..ba14ea5a5e 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelFieldScalar.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelFieldScalar.java @@ -5,6 +5,14 @@ package dev.metaschema.databind.model.impl; +import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; @@ -28,15 +36,6 @@ import dev.metaschema.databind.model.annotations.ModelUtil; import dev.metaschema.databind.model.annotations.ValueConstraints; import dev.metaschema.databind.model.info.IModelInstanceCollectionInfo; - -import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelGroupedAssembly.java b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelGroupedAssembly.java index cc59562e57..8f900de620 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelGroupedAssembly.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelGroupedAssembly.java @@ -5,6 +5,12 @@ package dev.metaschema.databind.model.impl; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.model.AbstractAssemblyInstance; @@ -18,13 +24,6 @@ import dev.metaschema.databind.model.IBoundProperty; import dev.metaschema.databind.model.annotations.BoundGroupedAssembly; import dev.metaschema.databind.model.annotations.ModelUtil; - -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelGroupedFieldComplex.java b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelGroupedFieldComplex.java index 786f0f43b7..6b96559155 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelGroupedFieldComplex.java +++ b/databind/src/main/java/dev/metaschema/databind/model/impl/InstanceModelGroupedFieldComplex.java @@ -5,6 +5,13 @@ package dev.metaschema.databind.model.impl; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.model.AbstractFieldInstance; @@ -20,14 +27,6 @@ import dev.metaschema.databind.model.IBoundProperty; import dev.metaschema.databind.model.annotations.BoundGroupedField; import dev.metaschema.databind.model.annotations.ModelUtil; - -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceCollectionInfo.java b/databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceCollectionInfo.java index 152f0bcc19..d1926b363f 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceCollectionInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceCollectionInfo.java @@ -6,7 +6,6 @@ package dev.metaschema.databind.model.info; import dev.metaschema.databind.model.IBoundInstanceModel; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceReadHandler.java b/databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceReadHandler.java index 5a69133629..17f48f8490 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceReadHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceReadHandler.java @@ -9,7 +9,6 @@ import dev.metaschema.databind.model.IBoundInstanceFlag; import dev.metaschema.databind.model.IBoundInstanceModel; import dev.metaschema.databind.model.IBoundInstanceModelNamed; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceWriteHandler.java b/databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceWriteHandler.java index a4b2d04307..d5cda85d99 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceWriteHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/AbstractModelInstanceWriteHandler.java @@ -5,14 +5,13 @@ package dev.metaschema.databind.model.info; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.model.IBoundInstanceModel; - import java.io.IOException; import java.util.Collection; import java.util.List; import java.util.Map; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.IBoundInstanceModel; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/info/IFeatureComplexItemValueHandler.java b/databind/src/main/java/dev/metaschema/databind/model/info/IFeatureComplexItemValueHandler.java index 788aa3bd30..39a60410b8 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/info/IFeatureComplexItemValueHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/IFeatureComplexItemValueHandler.java @@ -5,18 +5,17 @@ package dev.metaschema.databind.model.info; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.Map; +import java.util.function.Supplier; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IMetaschemaData; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.io.BindingException; import dev.metaschema.databind.model.IBoundDefinitionModelComplex; import dev.metaschema.databind.model.IBoundProperty; - -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.util.Map; -import java.util.function.Supplier; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/info/IFeatureScalarItemValueHandler.java b/databind/src/main/java/dev/metaschema/databind/model/info/IFeatureScalarItemValueHandler.java index ddce0e6379..0f74043e07 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/info/IFeatureScalarItemValueHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/IFeatureScalarItemValueHandler.java @@ -9,7 +9,6 @@ import dev.metaschema.core.model.IBoundObject; import dev.metaschema.databind.io.BindingException; import dev.metaschema.databind.model.IValuedMutable; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/info/IItemReadHandler.java b/databind/src/main/java/dev/metaschema/databind/model/info/IItemReadHandler.java index c4fd2d2df3..13fe98cf50 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/info/IItemReadHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/IItemReadHandler.java @@ -5,6 +5,8 @@ package dev.metaschema.databind.model.info; +import java.io.IOException; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import dev.metaschema.databind.model.IBoundDefinitionModelFieldComplex; @@ -16,9 +18,6 @@ import dev.metaschema.databind.model.IBoundInstanceModelFieldScalar; import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; import dev.metaschema.databind.model.IBoundInstanceModelGroupedField; - -import java.io.IOException; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/info/IItemValueHandler.java b/databind/src/main/java/dev/metaschema/databind/model/info/IItemValueHandler.java index d44aa7fc8c..c25775d895 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/info/IItemValueHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/IItemValueHandler.java @@ -5,11 +5,10 @@ package dev.metaschema.databind.model.info; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.databind.io.BindingException; - import java.io.IOException; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.io.BindingException; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/info/IItemWriteHandler.java b/databind/src/main/java/dev/metaschema/databind/model/info/IItemWriteHandler.java index a4f474cd76..216d914701 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/info/IItemWriteHandler.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/IItemWriteHandler.java @@ -5,6 +5,8 @@ package dev.metaschema.databind.model.info; +import java.io.IOException; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; import dev.metaschema.databind.model.IBoundDefinitionModelFieldComplex; @@ -16,9 +18,6 @@ import dev.metaschema.databind.model.IBoundInstanceModelFieldScalar; import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; import dev.metaschema.databind.model.IBoundInstanceModelGroupedField; - -import java.io.IOException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/info/IModelInstanceCollectionInfo.java b/databind/src/main/java/dev/metaschema/databind/model/info/IModelInstanceCollectionInfo.java index 0c17055c0d..38db097870 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/info/IModelInstanceCollectionInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/IModelInstanceCollectionInfo.java @@ -5,11 +5,6 @@ package dev.metaschema.databind.model.info; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.core.model.JsonGroupAsBehavior; -import dev.metaschema.databind.io.BindingException; -import dev.metaschema.databind.model.IBoundInstanceModel; - import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; @@ -18,6 +13,10 @@ import java.util.List; import java.util.Map; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.IBoundInstanceModel; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/info/ListCollectionInfo.java b/databind/src/main/java/dev/metaschema/databind/model/info/ListCollectionInfo.java index 5d30e26207..6567813c4c 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/info/ListCollectionInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/ListCollectionInfo.java @@ -5,17 +5,16 @@ package dev.metaschema.databind.model.info; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.io.BindingException; -import dev.metaschema.databind.model.IBoundInstanceModel; - import java.io.IOException; import java.lang.reflect.ParameterizedType; import java.util.LinkedList; import java.util.List; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.IBoundInstanceModel; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/info/MapCollectionInfo.java b/databind/src/main/java/dev/metaschema/databind/model/info/MapCollectionInfo.java index d1107ae0a0..900ee8f854 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/info/MapCollectionInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/MapCollectionInfo.java @@ -5,19 +5,18 @@ package dev.metaschema.databind.model.info; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.io.BindingException; -import dev.metaschema.databind.model.IBoundInstanceFlag; -import dev.metaschema.databind.model.IBoundInstanceModel; - import java.io.IOException; import java.lang.reflect.ParameterizedType; import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundInstanceModel; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/info/SingletonCollectionInfo.java b/databind/src/main/java/dev/metaschema/databind/model/info/SingletonCollectionInfo.java index 58ff541d4f..acc207d996 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/info/SingletonCollectionInfo.java +++ b/databind/src/main/java/dev/metaschema/databind/model/info/SingletonCollectionInfo.java @@ -5,15 +5,14 @@ package dev.metaschema.databind.model.info; +import java.io.IOException; +import java.util.List; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.io.BindingException; import dev.metaschema.databind.model.IBoundInstanceModel; - -import java.io.IOException; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/BindingConstraintLoader.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/BindingConstraintLoader.java index 75a9b491c2..8d9c12003c 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/BindingConstraintLoader.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/BindingConstraintLoader.java @@ -5,6 +5,16 @@ package dev.metaschema.databind.model.metaschema; +import java.io.IOException; +import java.net.URI; +import java.util.Collections; +import java.util.Deque; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.model.AbstractLoader; @@ -34,17 +44,6 @@ import dev.metaschema.databind.model.metaschema.binding.MetaschemaMetapath; import dev.metaschema.databind.model.metaschema.binding.MetaschemaModuleConstraints; import dev.metaschema.databind.model.metaschema.impl.ConstraintBindingSupport; - -import java.io.IOException; -import java.net.URI; -import java.util.Collections; -import java.util.Deque; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/BindingModuleLoader.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/BindingModuleLoader.java index b538297dad..8ddece8aaa 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/BindingModuleLoader.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/BindingModuleLoader.java @@ -5,6 +5,12 @@ package dev.metaschema.databind.model.metaschema; +import java.io.IOException; +import java.net.URI; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + import dev.metaschema.core.configuration.IConfiguration; import dev.metaschema.core.configuration.IMutableConfiguration; import dev.metaschema.core.model.AbstractModuleLoader; @@ -17,13 +23,6 @@ import dev.metaschema.databind.model.metaschema.binding.METASCHEMA; import dev.metaschema.databind.model.metaschema.binding.METASCHEMA.Import; import dev.metaschema.databind.model.metaschema.impl.BindingModule; - -import java.io.IOException; -import java.net.URI; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingInstance.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingInstance.java index c140ec3f77..34eb79c6aa 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingInstance.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingInstance.java @@ -6,7 +6,6 @@ package dev.metaschema.databind.model.metaschema; import dev.metaschema.core.model.IInstance; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingMetaschemaModule.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingMetaschemaModule.java index fdb64bd7bd..6001558633 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingMetaschemaModule.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingMetaschemaModule.java @@ -9,7 +9,6 @@ import dev.metaschema.core.metapath.item.node.IModuleNodeItem; import dev.metaschema.core.model.IMetaschemaModule; import dev.metaschema.databind.model.metaschema.binding.METASCHEMA; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingModelElement.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingModelElement.java index 6ad9bf227c..87c5388264 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingModelElement.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingModelElement.java @@ -7,7 +7,6 @@ import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; import dev.metaschema.core.model.IModelElement; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingModuleLoader.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingModuleLoader.java index b7e415a160..a60be8a226 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingModuleLoader.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IBindingModuleLoader.java @@ -9,7 +9,6 @@ import dev.metaschema.core.model.IModuleLoader; import dev.metaschema.databind.IBindingContext; import dev.metaschema.databind.io.DeserializationFeature; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/IConstraintBase.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IConstraintBase.java index 4a4a076e8e..d567471f71 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/IConstraintBase.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IConstraintBase.java @@ -5,13 +5,12 @@ package dev.metaschema.databind.model.metaschema; +import java.util.List; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.model.constraint.IConstraint; import dev.metaschema.databind.model.metaschema.binding.Property; import dev.metaschema.databind.model.metaschema.binding.Remarks; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.Nullable; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/IValueConstraintsBase.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IValueConstraintsBase.java index de59da0c42..1c972ba32f 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/IValueConstraintsBase.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/IValueConstraintsBase.java @@ -5,12 +5,11 @@ package dev.metaschema.databind.model.metaschema; +import java.util.List; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.databind.model.metaschema.binding.ConstraintLetExpression; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/ModuleLoadingPostProcessor.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/ModuleLoadingPostProcessor.java index 0e0ea29d4d..837005390a 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/ModuleLoadingPostProcessor.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/ModuleLoadingPostProcessor.java @@ -7,7 +7,6 @@ import dev.metaschema.core.model.IModule; import dev.metaschema.databind.IBindingContext; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Any.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Any.java index b612033879..8841329e8d 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Any.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Any.java @@ -7,12 +7,13 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IMetaschemaData; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.model.annotations.MetaschemaAssembly; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Any Additional Content. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyConstraints.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyConstraints.java index f1bf42e375..913705be6f 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyConstraints.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyConstraints.java @@ -7,6 +7,12 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.model.IMetaschemaData; import dev.metaschema.core.model.JsonGroupAsBehavior; import dev.metaschema.core.util.ObjectUtils; @@ -18,10 +24,6 @@ import dev.metaschema.databind.model.metaschema.IModelConstraintsBase; import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * A binding class for the {@code assembly-constraints} definition. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyModel.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyModel.java index e045c8a4ad..3db3314a00 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyModel.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyModel.java @@ -7,6 +7,13 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigInteger; +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; import dev.metaschema.core.datatype.adapter.PositiveIntegerAdapter; import dev.metaschema.core.datatype.adapter.StringAdapter; @@ -32,11 +39,6 @@ import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.math.BigInteger; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * A binding class for the {@code assembly-model} definition. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyReference.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyReference.java index b79964aaa5..a4553fb50b 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyReference.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/AssemblyReference.java @@ -7,6 +7,13 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigInteger; +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; import dev.metaschema.core.datatype.adapter.PositiveIntegerAdapter; import dev.metaschema.core.datatype.adapter.StringAdapter; @@ -27,11 +34,6 @@ import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.math.BigInteger; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Assembly Reference. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/ConstraintLetExpression.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/ConstraintLetExpression.java index 68656642d3..77aee11811 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/ConstraintLetExpression.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/ConstraintLetExpression.java @@ -7,6 +7,9 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.model.IBoundObject; @@ -17,8 +20,6 @@ import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Constraint Let Expression. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/ConstraintValueEnum.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/ConstraintValueEnum.java index d9f7d034f9..61ee390fa3 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/ConstraintValueEnum.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/ConstraintValueEnum.java @@ -7,6 +7,9 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupLineAdapter; @@ -19,8 +22,6 @@ import dev.metaschema.databind.model.metaschema.impl.AbstractAllowedValue; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Allowed Value Enumeration. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Example.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Example.java index 6cc5aa41ea..67185714cb 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Example.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Example.java @@ -7,6 +7,11 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.net.URI; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.UriReferenceAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; @@ -18,9 +23,6 @@ import dev.metaschema.databind.model.annotations.BoundFlag; import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.Nullable; -import java.net.URI; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Example. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FieldConstraints.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FieldConstraints.java index f11bc9b88c..5e59cb5700 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FieldConstraints.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FieldConstraints.java @@ -7,6 +7,12 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.model.IMetaschemaData; import dev.metaschema.core.model.JsonGroupAsBehavior; import dev.metaschema.core.util.ObjectUtils; @@ -18,10 +24,6 @@ import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; import dev.metaschema.databind.model.metaschema.IValueTargetedConstraintsBase; import edu.umd.cs.findbugs.annotations.NonNull; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * A binding class for the {@code field-constraints} definition. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FieldReference.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FieldReference.java index cd82dc1f36..010039fcfe 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FieldReference.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FieldReference.java @@ -7,6 +7,13 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigInteger; +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; import dev.metaschema.core.datatype.adapter.PositiveIntegerAdapter; import dev.metaschema.core.datatype.adapter.StringAdapter; @@ -29,11 +36,6 @@ import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.math.BigInteger; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Field Reference. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagAllowedValues.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagAllowedValues.java index 7130995ac8..238f3bbeb1 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagAllowedValues.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagAllowedValues.java @@ -7,6 +7,12 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; @@ -27,10 +33,6 @@ import dev.metaschema.databind.model.metaschema.IConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Allowed Values Constraint. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagConstraints.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagConstraints.java index 9a84933a2b..fda212908c 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagConstraints.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagConstraints.java @@ -7,6 +7,12 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.model.IMetaschemaData; import dev.metaschema.core.model.JsonGroupAsBehavior; import dev.metaschema.core.util.ObjectUtils; @@ -18,10 +24,6 @@ import dev.metaschema.databind.model.metaschema.IConstraintBase; import dev.metaschema.databind.model.metaschema.IValueConstraintsBase; import edu.umd.cs.findbugs.annotations.NonNull; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * A binding class for the {@code flag-constraints} definition. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagExpect.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagExpect.java index fad8b9bd4b..4aa4851dd1 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagExpect.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagExpect.java @@ -7,6 +7,12 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; @@ -27,10 +33,6 @@ import dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Expect Condition Constraint. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagIndexHasKey.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagIndexHasKey.java index b028c54c72..0d03a419b9 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagIndexHasKey.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagIndexHasKey.java @@ -7,6 +7,12 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; @@ -27,10 +33,6 @@ import dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Index Has Key Constraint. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagMatches.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagMatches.java index e35f01978e..d7e79744b2 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagMatches.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagMatches.java @@ -7,6 +7,12 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; @@ -27,10 +33,6 @@ import dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Value Matches Constraint. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagReference.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagReference.java index a96a099ed7..8b0bced215 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagReference.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagReference.java @@ -7,6 +7,13 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigInteger; +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.PositiveIntegerAdapter; import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; @@ -27,11 +34,6 @@ import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.math.BigInteger; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Flag Reference. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagReport.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagReport.java index e6986d9351..57e33a6811 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagReport.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/FlagReport.java @@ -7,6 +7,12 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; @@ -27,10 +33,6 @@ import dev.metaschema.databind.model.metaschema.IConfigurableMessageConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Report Condition Constraint. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/GroupingAs.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/GroupingAs.java index 5f3d6c3f4b..ec3ab596c0 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/GroupingAs.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/GroupingAs.java @@ -7,6 +7,9 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IMetaschemaData; @@ -19,8 +22,6 @@ import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Group As. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineAssembly.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineAssembly.java index fa79fc31d6..457752d685 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineAssembly.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineAssembly.java @@ -7,6 +7,13 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigInteger; +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; import dev.metaschema.core.datatype.adapter.PositiveIntegerAdapter; import dev.metaschema.core.datatype.adapter.StringAdapter; @@ -29,11 +36,6 @@ import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.math.BigInteger; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Inline Assembly Definition. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineField.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineField.java index 16c1f21d2a..f10c1556e5 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineField.java @@ -7,6 +7,13 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigInteger; +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; import dev.metaschema.core.datatype.adapter.PositiveIntegerAdapter; import dev.metaschema.core.datatype.adapter.StringAdapter; @@ -32,11 +39,6 @@ import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.math.BigInteger; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Inline Field Definition. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineFlag.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineFlag.java index c7b2b25a5c..3be3c3009d 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineFlag.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/InlineDefineFlag.java @@ -7,6 +7,13 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigInteger; +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.PositiveIntegerAdapter; import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; @@ -27,11 +34,6 @@ import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.math.BigInteger; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Inline Flag Definition. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/JsonKey.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/JsonKey.java index 1f872985d9..c77600a0d8 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/JsonKey.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/JsonKey.java @@ -7,6 +7,9 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IMetaschemaData; @@ -14,8 +17,6 @@ import dev.metaschema.databind.model.annotations.BoundFlag; import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Used in JSON (and similar formats) to identify a flag that will be used as diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/JsonValueKeyFlag.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/JsonValueKeyFlag.java index b755dffe97..e2bd64f922 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/JsonValueKeyFlag.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/JsonValueKeyFlag.java @@ -7,6 +7,9 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IMetaschemaData; @@ -14,8 +17,6 @@ import dev.metaschema.databind.model.annotations.BoundFlag; import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Flag Used as the Field Value's JSON Property Name. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/KeyConstraintField.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/KeyConstraintField.java index 0bca416763..1fc2be93c1 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/KeyConstraintField.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/KeyConstraintField.java @@ -7,6 +7,9 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IMetaschemaData; @@ -16,8 +19,6 @@ import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Key Constraint. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/METASCHEMA.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/METASCHEMA.java index a0bfae0c02..3aecfceefd 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/METASCHEMA.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/METASCHEMA.java @@ -7,6 +7,14 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigInteger; +import java.net.URI; +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; import dev.metaschema.core.datatype.adapter.PositiveIntegerAdapter; import dev.metaschema.core.datatype.adapter.StringAdapter; @@ -40,12 +48,6 @@ import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.math.BigInteger; -import java.net.URI; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * A declaration of the Metaschema module. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetapathContext.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetapathContext.java index 7f6894f211..dfef82ed68 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetapathContext.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetapathContext.java @@ -7,6 +7,12 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IMetaschemaData; import dev.metaschema.core.model.JsonGroupAsBehavior; @@ -17,10 +23,6 @@ import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * A binding class for the {@code metapath-context} definition. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetapathNamespace.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetapathNamespace.java index ab43b8d87d..4ff1fb799c 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetapathNamespace.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetapathNamespace.java @@ -7,6 +7,11 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.net.URI; + import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.datatype.adapter.UriAdapter; import dev.metaschema.core.model.IBoundObject; @@ -15,9 +20,6 @@ import dev.metaschema.databind.model.annotations.BoundFlag; import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; -import java.net.URI; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Assigns a Metapath namespace to a prefix for use in a Metapath expression in diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaMetaConstraints.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaMetaConstraints.java index 6987fa411a..9d96ab5688 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaMetaConstraints.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaMetaConstraints.java @@ -7,6 +7,13 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.net.URI; +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.datatype.adapter.UriAdapter; import dev.metaschema.core.datatype.adapter.UriReferenceAdapter; @@ -27,11 +34,6 @@ import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.net.URI; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Defines constraint rules to be applied to an existing set of Metaschema diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaMetapath.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaMetapath.java index ef7346f1af..60ba256255 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaMetapath.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaMetapath.java @@ -7,6 +7,9 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IMetaschemaData; @@ -14,8 +17,6 @@ import dev.metaschema.databind.model.annotations.BoundFlag; import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * A Metapath expression identifying the model node that the constraints will be diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaModelModule.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaModelModule.java index 3027daf007..02cb081f42 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaModelModule.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaModelModule.java @@ -7,14 +7,15 @@ package dev.metaschema.databind.model.metaschema.binding; +import java.net.URI; +import java.util.List; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.databind.IBindingContext; import dev.metaschema.databind.model.AbstractBoundModule; import dev.metaschema.databind.model.IBoundModule; import dev.metaschema.databind.model.annotations.MetaschemaModule; -import java.net.URI; -import java.util.List; /** * Metaschema Model diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaModuleConstraints.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaModuleConstraints.java index 4f6fca7eae..b1012c806c 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaModuleConstraints.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/MetaschemaModuleConstraints.java @@ -7,6 +7,13 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.net.URI; +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.datatype.adapter.UriAdapter; @@ -32,11 +39,6 @@ import dev.metaschema.databind.model.metaschema.IValueTargetedConstraintsBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.net.URI; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Defines constraint rules to be applied to an existing set of Metaschema diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Property.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Property.java index d6047448f8..b34004b689 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Property.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Property.java @@ -7,6 +7,11 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.net.URI; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.datatype.adapter.UriAdapter; @@ -17,9 +22,6 @@ import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.net.URI; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Property. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Remarks.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Remarks.java index 50dd36ad2a..4752671e8c 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Remarks.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/Remarks.java @@ -7,6 +7,9 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.datatype.markup.MarkupMultilineAdapter; @@ -21,8 +24,6 @@ import dev.metaschema.databind.model.annotations.MetaschemaField; import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.Nullable; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Any explanatory or helpful information to be provided about the remarks diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedAllowedValuesConstraint.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedAllowedValuesConstraint.java index fd03c0978d..bc310f40e4 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedAllowedValuesConstraint.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedAllowedValuesConstraint.java @@ -7,6 +7,12 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; @@ -27,10 +33,6 @@ import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Allowed Values Constraint. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedExpectConstraint.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedExpectConstraint.java index b4899caa1c..c6300a7c3a 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedExpectConstraint.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedExpectConstraint.java @@ -7,6 +7,12 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; @@ -28,10 +34,6 @@ import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Expect Condition Constraint. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedHasCardinalityConstraint.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedHasCardinalityConstraint.java index a6d09fcf3f..876beb2aab 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedHasCardinalityConstraint.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedHasCardinalityConstraint.java @@ -7,6 +7,13 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigInteger; +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; @@ -30,11 +37,6 @@ import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.math.BigInteger; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Targeted Cardinality Constraint. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIndexConstraint.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIndexConstraint.java index 95936e097f..d1c1941d1e 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIndexConstraint.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIndexConstraint.java @@ -7,6 +7,12 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; @@ -28,10 +34,6 @@ import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Targeted Index Constraint. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIndexHasKeyConstraint.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIndexHasKeyConstraint.java index 5e97e4f602..a379e1faab 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIndexHasKeyConstraint.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIndexHasKeyConstraint.java @@ -7,6 +7,12 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; @@ -28,10 +34,6 @@ import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Targeted Index Has Key Constraint. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIsUniqueConstraint.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIsUniqueConstraint.java index 82da4ffad3..400c47f599 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIsUniqueConstraint.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedIsUniqueConstraint.java @@ -7,6 +7,12 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; @@ -28,10 +34,6 @@ import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Targeted Unique Constraint. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedMatchesConstraint.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedMatchesConstraint.java index 2e0395edc4..d168d6e27f 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedMatchesConstraint.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedMatchesConstraint.java @@ -7,6 +7,12 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; @@ -28,10 +34,6 @@ import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Value Matches Constraint. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedReportConstraint.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedReportConstraint.java index 634aed066e..9a8391f4f9 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedReportConstraint.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/TargetedReportConstraint.java @@ -7,6 +7,12 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; @@ -28,10 +34,6 @@ import dev.metaschema.databind.model.metaschema.ITargetedConstraintBase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Report Condition Constraint. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/UseName.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/UseName.java index 66bb28232b..8fc4556008 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/UseName.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/binding/UseName.java @@ -7,6 +7,11 @@ package dev.metaschema.databind.model.metaschema.binding; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigInteger; + import dev.metaschema.core.datatype.adapter.NonNegativeIntegerAdapter; import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.model.IBoundObject; @@ -16,9 +21,6 @@ import dev.metaschema.databind.model.annotations.BoundFlag; import dev.metaschema.databind.model.annotations.MetaschemaField; import edu.umd.cs.findbugs.annotations.Nullable; -import java.math.BigInteger; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Allows the name of the definition to be overridden. diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AbstractAbsoluteModelGenerator.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AbstractAbsoluteModelGenerator.java index 925f3a453f..3d81461e6e 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AbstractAbsoluteModelGenerator.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AbstractAbsoluteModelGenerator.java @@ -22,7 +22,6 @@ import dev.metaschema.databind.model.metaschema.binding.FieldReference; import dev.metaschema.databind.model.metaschema.binding.InlineDefineAssembly; import dev.metaschema.databind.model.metaschema.binding.InlineDefineField; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AbstractAllowedValue.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AbstractAllowedValue.java index ad6d7500af..66fea9a565 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AbstractAllowedValue.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AbstractAllowedValue.java @@ -7,7 +7,6 @@ import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.model.constraint.IAllowedValue; - import edu.umd.cs.findbugs.annotations.Nullable; /** diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AssemblyModelGenerator.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AssemblyModelGenerator.java index 9dea939134..cecb801016 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AssemblyModelGenerator.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/AssemblyModelGenerator.java @@ -24,7 +24,6 @@ import dev.metaschema.databind.model.metaschema.binding.FieldReference; import dev.metaschema.databind.model.metaschema.binding.InlineDefineAssembly; import dev.metaschema.databind.model.metaschema.binding.InlineDefineField; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/BindingModule.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/BindingModule.java index 3341c58354..5acac24960 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/BindingModule.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/BindingModule.java @@ -5,6 +5,14 @@ package dev.metaschema.databind.model.metaschema.impl; +import java.net.URI; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.StaticContext; @@ -27,15 +35,6 @@ import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; import dev.metaschema.databind.model.metaschema.binding.METASCHEMA; import dev.metaschema.databind.model.metaschema.binding.MetapathNamespace; - -import java.net.URI; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ChoiceGroupModelGenerator.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ChoiceGroupModelGenerator.java index bc436f5f34..9ec0df9e43 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ChoiceGroupModelGenerator.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ChoiceGroupModelGenerator.java @@ -21,7 +21,6 @@ import dev.metaschema.databind.model.IBoundInstanceModelChoiceGroup; import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; import dev.metaschema.databind.model.metaschema.binding.AssemblyModel; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ChoiceModelGenerator.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ChoiceModelGenerator.java index d6c41b6a4c..d39b7fec04 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ChoiceModelGenerator.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ChoiceModelGenerator.java @@ -22,7 +22,6 @@ import dev.metaschema.databind.model.metaschema.binding.FieldReference; import dev.metaschema.databind.model.metaschema.binding.InlineDefineAssembly; import dev.metaschema.databind.model.metaschema.binding.InlineDefineField; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ConstraintBindingSupport.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ConstraintBindingSupport.java index 43910a1942..51802f882c 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ConstraintBindingSupport.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ConstraintBindingSupport.java @@ -5,6 +5,10 @@ package dev.metaschema.databind.model.metaschema.impl; +import java.math.BigInteger; +import java.util.List; +import java.util.regex.Pattern; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; @@ -49,11 +53,6 @@ import dev.metaschema.databind.model.metaschema.binding.TargetedIsUniqueConstraint; import dev.metaschema.databind.model.metaschema.binding.TargetedMatchesConstraint; import dev.metaschema.databind.model.metaschema.binding.TargetedReportConstraint; - -import java.math.BigInteger; -import java.util.List; -import java.util.regex.Pattern; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionAssemblyGlobal.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionAssemblyGlobal.java index 4bde89f57d..13c46aadde 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionAssemblyGlobal.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionAssemblyGlobal.java @@ -5,6 +5,10 @@ package dev.metaschema.databind.model.metaschema.impl; +import java.util.List; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; @@ -22,9 +26,9 @@ import dev.metaschema.core.model.IModelInstanceAbsolute; import dev.metaschema.core.model.INamedModelInstanceAbsolute; import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.MetaschemaModelConstants; import dev.metaschema.core.model.constraint.AssemblyConstraintSet; import dev.metaschema.core.model.constraint.IModelConstrained; -import dev.metaschema.core.model.MetaschemaModelConstants; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; import dev.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; @@ -32,11 +36,6 @@ import dev.metaschema.databind.model.metaschema.binding.AssemblyConstraints; import dev.metaschema.databind.model.metaschema.binding.JsonKey; import dev.metaschema.databind.model.metaschema.binding.METASCHEMA; - -import java.util.List; -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionFieldGlobal.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionFieldGlobal.java index c51994608b..b5f83a7da0 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionFieldGlobal.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionFieldGlobal.java @@ -5,6 +5,9 @@ package dev.metaschema.databind.model.metaschema.impl; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; @@ -26,10 +29,6 @@ import dev.metaschema.databind.model.metaschema.binding.JsonKey; import dev.metaschema.databind.model.metaschema.binding.JsonValueKeyFlag; import dev.metaschema.databind.model.metaschema.binding.METASCHEMA; - -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionFlagGlobal.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionFlagGlobal.java index 4bb576eacf..95c8a6ebef 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionFlagGlobal.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/DefinitionFlagGlobal.java @@ -5,6 +5,9 @@ package dev.metaschema.databind.model.metaschema.impl; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; @@ -21,10 +24,6 @@ import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; import dev.metaschema.databind.model.metaschema.binding.FlagConstraints; import dev.metaschema.databind.model.metaschema.binding.METASCHEMA; - -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/FlagContainerSupport.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/FlagContainerSupport.java index d2ee08e875..2d4dbdb5cc 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/FlagContainerSupport.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/FlagContainerSupport.java @@ -5,6 +5,9 @@ package dev.metaschema.databind.model.metaschema.impl; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; + import dev.metaschema.core.model.IContainerFlagSupport; import dev.metaschema.core.model.IFlagContainerBuilder; import dev.metaschema.core.model.IFlagDefinition; @@ -18,10 +21,6 @@ import dev.metaschema.databind.model.metaschema.IBindingDefinitionModel; import dev.metaschema.databind.model.metaschema.binding.FlagReference; import dev.metaschema.databind.model.metaschema.binding.InlineDefineFlag; - -import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/GroupAsImpl.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/GroupAsImpl.java index 01bafaf5d3..1244fb0b80 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/GroupAsImpl.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/GroupAsImpl.java @@ -13,7 +13,6 @@ import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.model.IGroupAs; import dev.metaschema.databind.model.metaschema.binding.GroupingAs; - import edu.umd.cs.findbugs.annotations.NonNull; class GroupAsImpl implements IGroupAs { diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceFlagInline.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceFlagInline.java index 7d23ac8698..5ea817d469 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceFlagInline.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceFlagInline.java @@ -5,6 +5,9 @@ package dev.metaschema.databind.model.metaschema.impl; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; @@ -24,10 +27,6 @@ import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; import dev.metaschema.databind.model.metaschema.binding.FlagConstraints; import dev.metaschema.databind.model.metaschema.binding.InlineDefineFlag; - -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceFlagReference.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceFlagReference.java index d04ccd21df..28ae8984e8 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceFlagReference.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceFlagReference.java @@ -5,6 +5,9 @@ package dev.metaschema.databind.model.metaschema.impl; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; @@ -20,10 +23,6 @@ import dev.metaschema.databind.model.metaschema.IBindingInstance; import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; import dev.metaschema.databind.model.metaschema.binding.FlagReference; - -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyInline.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyInline.java index dc6ac47bbe..892a26fb40 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyInline.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyInline.java @@ -5,6 +5,10 @@ package dev.metaschema.databind.model.metaschema.impl; +import java.math.BigInteger; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; @@ -24,9 +28,9 @@ import dev.metaschema.core.model.IModelInstanceAbsolute; import dev.metaschema.core.model.INamedModelInstanceAbsolute; import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.MetaschemaModelConstants; import dev.metaschema.core.model.constraint.AssemblyConstraintSet; import dev.metaschema.core.model.constraint.IModelConstrained; -import dev.metaschema.core.model.MetaschemaModelConstants; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; import dev.metaschema.databind.model.IGroupAs; @@ -37,11 +41,6 @@ import dev.metaschema.databind.model.metaschema.binding.AssemblyConstraints; import dev.metaschema.databind.model.metaschema.binding.InlineDefineAssembly; import dev.metaschema.databind.model.metaschema.binding.JsonKey; - -import java.math.BigInteger; -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyReference.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyReference.java index cb5c0c649e..2972602c19 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyReference.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelAssemblyReference.java @@ -5,6 +5,10 @@ package dev.metaschema.databind.model.metaschema.impl; +import java.math.BigInteger; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; @@ -21,11 +25,6 @@ import dev.metaschema.databind.model.metaschema.IBindingInstance; import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; import dev.metaschema.databind.model.metaschema.binding.AssemblyReference; - -import java.math.BigInteger; -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelChoice.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelChoice.java index c9204d7898..a702fcddb2 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelChoice.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelChoice.java @@ -21,7 +21,6 @@ import dev.metaschema.databind.model.metaschema.IBindingInstance; import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; import dev.metaschema.databind.model.metaschema.binding.AssemblyModel; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelChoiceGroup.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelChoiceGroup.java index 38affeb6c7..88ea48c44c 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelChoiceGroup.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelChoiceGroup.java @@ -5,6 +5,8 @@ package dev.metaschema.databind.model.metaschema.impl; +import java.math.BigInteger; + import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; import dev.metaschema.core.metapath.item.node.INodeItemFactory; import dev.metaschema.core.model.AbstractChoiceGroupInstance; @@ -22,9 +24,6 @@ import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; import dev.metaschema.databind.model.metaschema.binding.AssemblyModel; import dev.metaschema.databind.model.metaschema.binding.JsonKey; - -import java.math.BigInteger; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelFieldInline.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelFieldInline.java index d52de2ff0a..5013677e0a 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelFieldInline.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelFieldInline.java @@ -5,6 +5,10 @@ package dev.metaschema.databind.model.metaschema.impl; +import java.math.BigInteger; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; @@ -33,11 +37,6 @@ import dev.metaschema.databind.model.metaschema.binding.InlineDefineField; import dev.metaschema.databind.model.metaschema.binding.JsonKey; import dev.metaschema.databind.model.metaschema.binding.JsonValueKeyFlag; - -import java.math.BigInteger; -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelFieldReference.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelFieldReference.java index 697383ef0c..03dd870223 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelFieldReference.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelFieldReference.java @@ -5,6 +5,10 @@ package dev.metaschema.databind.model.metaschema.impl; +import java.math.BigInteger; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; @@ -21,11 +25,6 @@ import dev.metaschema.databind.model.metaschema.IBindingInstance; import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; import dev.metaschema.databind.model.metaschema.binding.FieldReference; - -import java.math.BigInteger; -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyInline.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyInline.java index a4ba125f99..af0d424a41 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyInline.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyInline.java @@ -5,6 +5,9 @@ package dev.metaschema.databind.model.metaschema.impl; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; @@ -24,9 +27,9 @@ import dev.metaschema.core.model.IModelInstanceAbsolute; import dev.metaschema.core.model.INamedModelInstanceAbsolute; import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.MetaschemaModelConstants; import dev.metaschema.core.model.constraint.AssemblyConstraintSet; import dev.metaschema.core.model.constraint.IModelConstrained; -import dev.metaschema.core.model.MetaschemaModelConstants; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.model.IBoundInstanceModelGroupedAssembly; import dev.metaschema.databind.model.metaschema.IBindingDefinitionModelAssembly; @@ -34,10 +37,6 @@ import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; import dev.metaschema.databind.model.metaschema.binding.AssemblyConstraints; import dev.metaschema.databind.model.metaschema.binding.AssemblyModel; - -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyReference.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyReference.java index 54e11a39ed..4be259c898 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyReference.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedAssemblyReference.java @@ -5,6 +5,9 @@ package dev.metaschema.databind.model.metaschema.impl; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; @@ -19,10 +22,6 @@ import dev.metaschema.databind.model.metaschema.IBindingInstance; import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; import dev.metaschema.databind.model.metaschema.binding.AssemblyModel; - -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldInline.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldInline.java index b21de14953..0932b30407 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldInline.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldInline.java @@ -5,6 +5,9 @@ package dev.metaschema.databind.model.metaschema.impl; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; @@ -30,10 +33,6 @@ import dev.metaschema.databind.model.metaschema.binding.AssemblyModel; import dev.metaschema.databind.model.metaschema.binding.FieldConstraints; import dev.metaschema.databind.model.metaschema.binding.JsonValueKeyFlag; - -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldReference.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldReference.java index d01632648e..fdb1161e19 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldReference.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/InstanceModelGroupedFieldReference.java @@ -5,6 +5,9 @@ package dev.metaschema.databind.model.metaschema.impl; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem; @@ -19,10 +22,6 @@ import dev.metaschema.databind.model.metaschema.IBindingInstance; import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; import dev.metaschema.databind.model.metaschema.binding.AssemblyModel; - -import java.util.Map; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ModelSupport.java b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ModelSupport.java index a3f7e16182..29c795b50b 100644 --- a/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ModelSupport.java +++ b/databind/src/main/java/dev/metaschema/databind/model/metaschema/impl/ModelSupport.java @@ -5,6 +5,14 @@ package dev.metaschema.databind.model.metaschema.impl; +import java.math.BigInteger; +import java.net.URI; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider; import dev.metaschema.core.datatype.markup.MarkupMultiline; @@ -34,15 +42,6 @@ import dev.metaschema.databind.model.metaschema.binding.Property; import dev.metaschema.databind.model.metaschema.binding.Remarks; import dev.metaschema.databind.model.metaschema.binding.UseName; - -import java.math.BigInteger; -import java.net.URI; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/test/java/dev/metaschema/databind/FnDocTest.java b/databind/src/test/java/dev/metaschema/databind/FnDocTest.java index bb31e48a82..f094ecc456 100644 --- a/databind/src/test/java/dev/metaschema/databind/FnDocTest.java +++ b/databind/src/test/java/dev/metaschema/databind/FnDocTest.java @@ -8,6 +8,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; +import org.junit.jupiter.api.Test; + +import java.nio.file.Paths; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.metapath.function.IFunction; @@ -16,10 +20,6 @@ import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; -import org.junit.jupiter.api.Test; - -import java.nio.file.Paths; - class FnDocTest { /** diff --git a/databind/src/test/java/dev/metaschema/databind/IBindingContextTest.java b/databind/src/test/java/dev/metaschema/databind/IBindingContextTest.java index 0a1df8066a..8cb866dfda 100644 --- a/databind/src/test/java/dev/metaschema/databind/IBindingContextTest.java +++ b/databind/src/test/java/dev/metaschema/databind/IBindingContextTest.java @@ -8,23 +8,23 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.nio.file.Paths; +import java.util.List; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IConstraintLoader; import dev.metaschema.core.model.MetaschemaException; import dev.metaschema.core.model.constraint.IConstraint; import dev.metaschema.core.model.constraint.IConstraintSet; -import dev.metaschema.databind.model.metaschema.BindingConstraintLoader; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.metaschema.BindingConstraintLoader; import dev.metaschema.databind.model.test.TestMetaschema; -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.nio.file.Paths; -import java.util.List; - class IBindingContextTest { @Test diff --git a/databind/src/test/java/dev/metaschema/databind/codegen/AbstractMetaschemaTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/AbstractMetaschemaTest.java index 1843cfee43..dad3255cba 100644 --- a/databind/src/test/java/dev/metaschema/databind/codegen/AbstractMetaschemaTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/AbstractMetaschemaTest.java @@ -7,18 +7,6 @@ import static org.junit.jupiter.api.Assertions.assertAll; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.model.MetaschemaException; -import dev.metaschema.core.model.constraint.IConstraintSet; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.codegen.config.DefaultBindingConfiguration; -import dev.metaschema.databind.io.BindingException; -import dev.metaschema.databind.io.Format; -import dev.metaschema.databind.io.IDeserializer; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -30,6 +18,17 @@ import java.nio.file.StandardOpenOption; import java.util.Collection; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.config.DefaultBindingConfiguration; +import dev.metaschema.databind.io.BindingException; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.IDeserializer; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/databind/src/test/java/dev/metaschema/databind/codegen/BasicMetaschemaTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/BasicMetaschemaTest.java index 7d9b3e325d..89477905c9 100644 --- a/databind/src/test/java/dev/metaschema/databind/codegen/BasicMetaschemaTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/BasicMetaschemaTest.java @@ -12,6 +12,18 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Execution; +import org.junit.jupiter.api.parallel.ExecutionMode; +import org.junit.platform.commons.util.ReflectionUtils; + +import java.io.IOException; +import java.nio.file.Paths; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + import dev.metaschema.core.metapath.DynamicContext; import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.metapath.StaticContext; @@ -26,18 +38,6 @@ import dev.metaschema.databind.io.BindingException; import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.parallel.Execution; -import org.junit.jupiter.api.parallel.ExecutionMode; -import org.junit.platform.commons.util.ReflectionUtils; - -import java.io.IOException; -import java.nio.file.Paths; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - @Execution(value = ExecutionMode.SAME_THREAD, reason = "FIXME: produces output that is not unique to each test: out.xml.") class BasicMetaschemaTest diff --git a/databind/src/test/java/dev/metaschema/databind/codegen/ClassUtilsTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/ClassUtilsTest.java index e7c8b63ced..8fac932b5a 100644 --- a/databind/src/test/java/dev/metaschema/databind/codegen/ClassUtilsTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/ClassUtilsTest.java @@ -7,12 +7,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.util.ObjectUtils; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; +import dev.metaschema.core.util.ObjectUtils; + /** * Unit tests for {@link ClassUtils}. */ diff --git a/databind/src/test/java/dev/metaschema/databind/codegen/GenerationTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/GenerationTest.java index e02fca0e7f..d32b8d232e 100644 --- a/databind/src/test/java/dev/metaschema/databind/codegen/GenerationTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/GenerationTest.java @@ -8,6 +8,11 @@ import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.net.URI; + import dev.metaschema.core.model.MetaschemaException; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.IBindingContext; @@ -15,11 +20,6 @@ import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.net.URI; - public class GenerationTest extends AbstractMetaschemaTest { diff --git a/databind/src/test/java/dev/metaschema/databind/codegen/JavadocGenerationTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/JavadocGenerationTest.java index ca42b8a155..f20652188f 100644 --- a/databind/src/test/java/dev/metaschema/databind/codegen/JavadocGenerationTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/JavadocGenerationTest.java @@ -8,11 +8,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.codegen.config.DefaultBindingConfiguration; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -22,6 +17,10 @@ import java.nio.file.Paths; import java.util.regex.Pattern; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.config.DefaultBindingConfiguration; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/test/java/dev/metaschema/databind/codegen/config/BindingConfigurationLoaderTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/config/BindingConfigurationLoaderTest.java index 8e7e57ab2c..68868eb360 100644 --- a/databind/src/test/java/dev/metaschema/databind/codegen/config/BindingConfigurationLoaderTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/config/BindingConfigurationLoaderTest.java @@ -8,9 +8,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.io.BindingException; - import org.junit.jupiter.api.Test; import java.io.File; @@ -19,6 +16,9 @@ import java.util.HashMap; import java.util.Map; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; + class BindingConfigurationLoaderTest { @Test diff --git a/databind/src/test/java/dev/metaschema/databind/codegen/config/DefaultBindingConfigurationTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/config/DefaultBindingConfigurationTest.java index d6154dd55f..82329bcf8c 100644 --- a/databind/src/test/java/dev/metaschema/databind/codegen/config/DefaultBindingConfigurationTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/config/DefaultBindingConfigurationTest.java @@ -11,14 +11,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.core.model.IAssemblyDefinition; -import dev.metaschema.core.model.IModelDefinition; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.model.INamedModelInstanceAbsolute; -import dev.metaschema.core.model.ModelType; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.io.BindingException; - import org.jmock.Expectations; import org.jmock.junit5.JUnit5Mockery; import org.jmock.lib.concurrent.Synchroniser; @@ -33,6 +25,14 @@ import java.util.LinkedList; import java.util.concurrent.CopyOnWriteArrayList; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.INamedModelInstanceAbsolute; +import dev.metaschema.core.model.ModelType; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; + class DefaultBindingConfigurationTest { private static final URI METASCHEMA_LOCATION = new File("src/test/resources/metaschema/metaschema.xml").getAbsoluteFile().toURI(); diff --git a/databind/src/test/java/dev/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfigurationTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfigurationTest.java index 19857405eb..e051ab9694 100644 --- a/databind/src/test/java/dev/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfigurationTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/config/DefaultChoiceGroupBindingConfigurationTest.java @@ -12,12 +12,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.core.model.IAssemblyDefinition; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.model.ModelType; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.io.BindingException; - import org.jmock.Expectations; import org.jmock.junit5.JUnit5Mockery; import org.jmock.lib.concurrent.Synchroniser; @@ -30,6 +24,12 @@ import java.net.URI; import java.util.concurrent.atomic.AtomicInteger; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.ModelType; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.BindingException; + /** * Tests for {@link DefaultChoiceGroupBindingConfiguration}. *

diff --git a/databind/src/test/java/dev/metaschema/databind/codegen/impl/AnnotationGeneratorTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/impl/AnnotationGeneratorTest.java index 47c7086173..532923fcc5 100644 --- a/databind/src/test/java/dev/metaschema/databind/codegen/impl/AnnotationGeneratorTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/impl/AnnotationGeneratorTest.java @@ -7,15 +7,6 @@ import com.squareup.javapoet.AnnotationSpec; -import dev.metaschema.core.datatype.markup.MarkupMultiline; -import dev.metaschema.core.metapath.IMetapathExpression; -import dev.metaschema.core.model.IFlagDefinition; -import dev.metaschema.core.model.ISource; -import dev.metaschema.core.model.constraint.ILet; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.model.annotations.BoundFlag; - import org.jmock.Expectations; import org.jmock.junit5.JUnit5Mockery; import org.jmock.lib.concurrent.Synchroniser; @@ -26,6 +17,15 @@ import java.util.List; import java.util.Map; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.metapath.IMetapathExpression; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.ILet; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.BoundFlag; + class AnnotationGeneratorTest { @RegisterExtension final JUnit5Mockery context = new JUnit5Mockery() { diff --git a/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfoTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfoTest.java index 08f59dd90b..2a36e2b837 100644 --- a/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfoTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/AbstractNamedModelInstanceTypeInfoTest.java @@ -8,18 +8,17 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.core.model.IFieldDefinition; -import dev.metaschema.core.model.IFieldInstanceAbsolute; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.codegen.config.IBindingConfiguration; -import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; - import org.jmock.Expectations; import org.jmock.junit5.JUnit5Mockery; import org.jmock.lib.concurrent.Synchroniser; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.config.IBindingConfiguration; +import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImplTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImplTest.java index 2cf7ed308c..3897bdac49 100644 --- a/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImplTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/ChoiceGroupTypeInfoImplTest.java @@ -14,15 +14,6 @@ import com.squareup.javapoet.TypeName; import com.squareup.javapoet.WildcardTypeName; -import dev.metaschema.core.model.IAssemblyDefinition; -import dev.metaschema.core.model.IChoiceGroupInstance; -import dev.metaschema.core.model.JsonGroupAsBehavior; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.codegen.config.IBindingConfiguration; -import dev.metaschema.databind.codegen.config.IChoiceGroupBindingConfiguration; -import dev.metaschema.databind.codegen.config.IDefinitionBindingConfiguration; -import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; - import org.jmock.Expectations; import org.jmock.junit5.JUnit5Mockery; import org.jmock.lib.concurrent.Synchroniser; @@ -33,6 +24,14 @@ import java.util.List; import java.util.Map; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.model.JsonGroupAsBehavior; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.config.IBindingConfiguration; +import dev.metaschema.databind.codegen.config.IChoiceGroupBindingConfiguration; +import dev.metaschema.databind.codegen.config.IDefinitionBindingConfiguration; +import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/DefaultTypeResolverTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/DefaultTypeResolverTest.java index 29b59dd897..daa3214ce4 100644 --- a/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/DefaultTypeResolverTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/DefaultTypeResolverTest.java @@ -10,12 +10,6 @@ import com.squareup.javapoet.ClassName; -import dev.metaschema.core.model.IAssemblyDefinition; -import dev.metaschema.core.model.IChoiceGroupInstance; -import dev.metaschema.databind.codegen.config.IBindingConfiguration; -import dev.metaschema.databind.codegen.config.IChoiceGroupBindingConfiguration; -import dev.metaschema.databind.codegen.config.IDefinitionBindingConfiguration; - import org.jmock.Expectations; import org.jmock.junit5.JUnit5Mockery; import org.jmock.lib.concurrent.Synchroniser; @@ -25,6 +19,12 @@ import java.util.HashMap; import java.util.Map; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.databind.codegen.config.IBindingConfiguration; +import dev.metaschema.databind.codegen.config.IChoiceGroupBindingConfiguration; +import dev.metaschema.databind.codegen.config.IDefinitionBindingConfiguration; + /** * Unit tests for {@link DefaultTypeResolver} choice group type resolution. */ diff --git a/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/JavadocEscapingTest.java b/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/JavadocEscapingTest.java index 000e2e8295..c21aea4965 100644 --- a/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/JavadocEscapingTest.java +++ b/databind/src/test/java/dev/metaschema/databind/codegen/typeinfo/JavadocEscapingTest.java @@ -9,13 +9,6 @@ import com.squareup.javapoet.MethodSpec; -import dev.metaschema.core.datatype.markup.MarkupLine; -import dev.metaschema.core.model.IFieldDefinition; -import dev.metaschema.core.model.IFieldInstanceAbsolute; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.codegen.config.IBindingConfiguration; -import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; - import org.jmock.Expectations; import org.jmock.junit5.JUnit5Mockery; import org.jmock.lib.concurrent.Synchroniser; @@ -24,6 +17,12 @@ import javax.lang.model.element.Modifier; +import dev.metaschema.core.datatype.markup.MarkupLine; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstanceAbsolute; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.config.IBindingConfiguration; +import dev.metaschema.databind.codegen.typeinfo.def.IAssemblyDefinitionTypeInfo; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/test/java/dev/metaschema/databind/io/ChoiceValidationTest.java b/databind/src/test/java/dev/metaschema/databind/io/ChoiceValidationTest.java index 3c255ca3d0..05a589ab0d 100644 --- a/databind/src/test/java/dev/metaschema/databind/io/ChoiceValidationTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/ChoiceValidationTest.java @@ -8,11 +8,6 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertNotNull; -import dev.metaschema.core.model.MetaschemaException; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.codegen.AbstractMetaschemaTest; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -21,6 +16,11 @@ import java.nio.file.Path; import java.nio.file.Paths; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.AbstractMetaschemaTest; + /** * Tests for choice validation during deserialization. *

diff --git a/databind/src/test/java/dev/metaschema/databind/io/DefaultBoundLoaderTest.java b/databind/src/test/java/dev/metaschema/databind/io/DefaultBoundLoaderTest.java index 08018c9685..a0c1acf52b 100644 --- a/databind/src/test/java/dev/metaschema/databind/io/DefaultBoundLoaderTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/DefaultBoundLoaderTest.java @@ -7,6 +7,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.nio.file.Paths; + import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; import dev.metaschema.core.model.MetaschemaException; @@ -14,11 +19,6 @@ import dev.metaschema.databind.IBindingContext; import dev.metaschema.databind.codegen.AbstractMetaschemaTest; -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.nio.file.Paths; - class DefaultBoundLoaderTest extends AbstractMetaschemaTest { diff --git a/databind/src/test/java/dev/metaschema/databind/io/FormatDetectorTest.java b/databind/src/test/java/dev/metaschema/databind/io/FormatDetectorTest.java index 58cee33c82..3469068a66 100644 --- a/databind/src/test/java/dev/metaschema/databind/io/FormatDetectorTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/FormatDetectorTest.java @@ -11,8 +11,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.databind.test.util.CloseDetectingInputStream; - import org.junit.jupiter.api.Test; import java.io.IOException; @@ -20,6 +18,8 @@ import java.nio.file.Files; import java.nio.file.Paths; +import dev.metaschema.databind.test.util.CloseDetectingInputStream; + class FormatDetectorTest { @Test diff --git a/databind/src/test/java/dev/metaschema/databind/io/FormatPathFormatterTest.java b/databind/src/test/java/dev/metaschema/databind/io/FormatPathFormatterTest.java index 096d43e25a..fff89be2d1 100644 --- a/databind/src/test/java/dev/metaschema/databind/io/FormatPathFormatterTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/FormatPathFormatterTest.java @@ -7,13 +7,13 @@ import static org.junit.jupiter.api.Assertions.assertSame; -import dev.metaschema.core.metapath.format.IPathFormatter; -import dev.metaschema.core.metapath.format.PathFormatSelection; - import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.metapath.format.PathFormatSelection; + /** * Unit tests for {@link Format} path formatter methods. */ diff --git a/databind/src/test/java/dev/metaschema/databind/io/Issue206MetaschemaReaderTest.java b/databind/src/test/java/dev/metaschema/databind/io/Issue206MetaschemaReaderTest.java index c09fef269f..ea16e281dc 100644 --- a/databind/src/test/java/dev/metaschema/databind/io/Issue206MetaschemaReaderTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/Issue206MetaschemaReaderTest.java @@ -10,6 +10,22 @@ import com.fasterxml.jackson.core.JsonParser; +import org.codehaus.stax2.XMLEventReader2; +import org.jmock.junit5.JUnit5Mockery; +import org.jmock.lib.concurrent.Synchroniser; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.util.List; + +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamException; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.model.IBoundObject; @@ -27,23 +43,6 @@ import dev.metaschema.databind.model.annotations.BoundFlag; import dev.metaschema.databind.model.annotations.MetaschemaField; import dev.metaschema.databind.model.annotations.MetaschemaModule; - -import org.codehaus.stax2.XMLEventReader2; -import org.jmock.junit5.JUnit5Mockery; -import org.jmock.lib.concurrent.Synchroniser; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.nio.charset.StandardCharsets; -import java.util.List; - -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamException; - import edu.umd.cs.findbugs.annotations.NonNull; class Issue206MetaschemaReaderTest { diff --git a/databind/src/test/java/dev/metaschema/databind/io/MetaschemaModuleMetaschemaTest.java b/databind/src/test/java/dev/metaschema/databind/io/MetaschemaModuleMetaschemaTest.java index bd76f2c092..c351d2c8bf 100644 --- a/databind/src/test/java/dev/metaschema/databind/io/MetaschemaModuleMetaschemaTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/MetaschemaModuleMetaschemaTest.java @@ -7,14 +7,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.core.model.MetaschemaException; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; -import dev.metaschema.databind.model.metaschema.binding.METASCHEMA; - import org.junit.jupiter.api.Test; import java.io.IOException; @@ -23,6 +15,13 @@ import java.nio.file.Path; import java.nio.file.Paths; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.databind.model.metaschema.binding.METASCHEMA; import edu.umd.cs.findbugs.annotations.NonNull; class MetaschemaModuleMetaschemaTest { diff --git a/databind/src/test/java/dev/metaschema/databind/io/RequiredFieldValidationTest.java b/databind/src/test/java/dev/metaschema/databind/io/RequiredFieldValidationTest.java index 66781b5e98..d8226fb2a1 100644 --- a/databind/src/test/java/dev/metaschema/databind/io/RequiredFieldValidationTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/RequiredFieldValidationTest.java @@ -10,12 +10,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.core.model.MetaschemaException; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.codegen.AbstractMetaschemaTest; - import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -25,6 +19,12 @@ import java.nio.file.Path; import java.nio.file.Paths; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.AbstractMetaschemaTest; + /** * Tests for required field validation during deserialization. */ diff --git a/databind/src/test/java/dev/metaschema/databind/io/ValidationErrorMessageTest.java b/databind/src/test/java/dev/metaschema/databind/io/ValidationErrorMessageTest.java index c56633aa94..4a056c26f1 100644 --- a/databind/src/test/java/dev/metaschema/databind/io/ValidationErrorMessageTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/ValidationErrorMessageTest.java @@ -6,16 +6,10 @@ package dev.metaschema.databind.io; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertFalse; - -import dev.metaschema.core.model.IBoundObject; -import dev.metaschema.core.model.MetaschemaException; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.codegen.AbstractMetaschemaTest; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Nested; @@ -27,6 +21,12 @@ import java.nio.file.Path; import java.nio.file.Paths; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.AbstractMetaschemaTest; + /** * Tests for validation error message improvements. *

diff --git a/databind/src/test/java/dev/metaschema/databind/io/json/JsonParserTest.java b/databind/src/test/java/dev/metaschema/databind/io/json/JsonParserTest.java index b653fec3b4..dd0e8cd917 100644 --- a/databind/src/test/java/dev/metaschema/databind/io/json/JsonParserTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/json/JsonParserTest.java @@ -7,6 +7,11 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.nio.file.Paths; + import dev.metaschema.core.model.MetaschemaException; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.IBindingContext; @@ -14,11 +19,6 @@ import dev.metaschema.databind.io.DeserializationFeature; import dev.metaschema.databind.io.IBoundLoader; -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.nio.file.Paths; - class JsonParserTest extends AbstractMetaschemaTest { @Test diff --git a/databind/src/test/java/dev/metaschema/databind/io/xml/XmlParserTest.java b/databind/src/test/java/dev/metaschema/databind/io/xml/XmlParserTest.java index 26689d939c..98fb0de985 100644 --- a/databind/src/test/java/dev/metaschema/databind/io/xml/XmlParserTest.java +++ b/databind/src/test/java/dev/metaschema/databind/io/xml/XmlParserTest.java @@ -13,16 +13,6 @@ import com.ctc.wstx.stax.WstxInputFactory; import com.fasterxml.jackson.core.JsonParseException; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.codegen.AbstractMetaschemaTest; -import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; -import dev.metaschema.databind.model.IBoundInstanceFlag; -import dev.metaschema.databind.model.IBoundInstanceModelField; -import dev.metaschema.databind.model.test.FlaggedAssembly; -import dev.metaschema.databind.model.test.MultiFieldAssembly; - import org.codehaus.stax2.XMLEventReader2; import org.junit.jupiter.api.Test; @@ -37,6 +27,15 @@ import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.AbstractMetaschemaTest; +import dev.metaschema.databind.model.IBoundDefinitionModelAssembly; +import dev.metaschema.databind.model.IBoundInstanceFlag; +import dev.metaschema.databind.model.IBoundInstanceModelField; +import dev.metaschema.databind.model.test.FlaggedAssembly; +import dev.metaschema.databind.model.test.MultiFieldAssembly; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; class XmlParserTest diff --git a/databind/src/test/java/dev/metaschema/databind/model/AbstractBoundModelTestSupport.java b/databind/src/test/java/dev/metaschema/databind/model/AbstractBoundModelTestSupport.java index ac2d945fec..055247b5ce 100644 --- a/databind/src/test/java/dev/metaschema/databind/model/AbstractBoundModelTestSupport.java +++ b/databind/src/test/java/dev/metaschema/databind/model/AbstractBoundModelTestSupport.java @@ -9,10 +9,6 @@ import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.codegen.AbstractMetaschemaTest; -import dev.metaschema.databind.model.test.RootBoundAssembly; - import org.jmock.junit5.JUnit5Mockery; import org.jmock.lib.concurrent.Synchroniser; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,6 +16,9 @@ import java.io.IOException; import java.io.Reader; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.AbstractMetaschemaTest; +import dev.metaschema.databind.model.test.RootBoundAssembly; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/test/java/dev/metaschema/databind/model/DefaultAssemblyClassBindingTest.java b/databind/src/test/java/dev/metaschema/databind/model/DefaultAssemblyClassBindingTest.java index 312ee4c81a..c871e4c5c2 100644 --- a/databind/src/test/java/dev/metaschema/databind/model/DefaultAssemblyClassBindingTest.java +++ b/databind/src/test/java/dev/metaschema/databind/model/DefaultAssemblyClassBindingTest.java @@ -10,10 +10,6 @@ import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.io.json.MetaschemaJsonReader; - import org.junit.jupiter.api.Test; import java.io.BufferedReader; @@ -22,6 +18,10 @@ import java.nio.file.Path; import java.nio.file.Paths; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.json.MetaschemaJsonReader; + class DefaultAssemblyClassBindingTest extends AbstractBoundModelTestSupport { @Test diff --git a/databind/src/test/java/dev/metaschema/databind/model/DefaultFieldPropertyTest.java b/databind/src/test/java/dev/metaschema/databind/model/DefaultFieldPropertyTest.java index cda313c60e..25e6ad4468 100644 --- a/databind/src/test/java/dev/metaschema/databind/model/DefaultFieldPropertyTest.java +++ b/databind/src/test/java/dev/metaschema/databind/model/DefaultFieldPropertyTest.java @@ -15,12 +15,6 @@ import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.io.json.MetaschemaJsonReader; -import dev.metaschema.databind.model.test.MultiFieldAssembly; -import dev.metaschema.databind.model.test.SimpleAssembly; - import org.junit.jupiter.api.Test; import java.io.IOException; @@ -28,6 +22,12 @@ import java.util.Collections; import java.util.LinkedList; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.json.MetaschemaJsonReader; +import dev.metaschema.databind.model.test.MultiFieldAssembly; +import dev.metaschema.databind.model.test.SimpleAssembly; + class DefaultFieldPropertyTest { @Test diff --git a/databind/src/test/java/dev/metaschema/databind/model/JsonKeyTest.java b/databind/src/test/java/dev/metaschema/databind/model/JsonKeyTest.java index 197383ba42..df3c8a0b16 100644 --- a/databind/src/test/java/dev/metaschema/databind/model/JsonKeyTest.java +++ b/databind/src/test/java/dev/metaschema/databind/model/JsonKeyTest.java @@ -7,16 +7,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import dev.metaschema.core.model.MetaschemaException; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.codegen.AbstractMetaschemaTest; - import org.junit.jupiter.api.Test; import java.io.IOException; import java.nio.file.Paths; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.codegen.AbstractMetaschemaTest; + class JsonKeyTest extends AbstractMetaschemaTest { @Test diff --git a/databind/src/test/java/dev/metaschema/databind/model/extra/MetaschemaModuleExternalConstraintsTest.java b/databind/src/test/java/dev/metaschema/databind/model/extra/MetaschemaModuleExternalConstraintsTest.java index 0adc54c39d..3d5b1ab48e 100644 --- a/databind/src/test/java/dev/metaschema/databind/model/extra/MetaschemaModuleExternalConstraintsTest.java +++ b/databind/src/test/java/dev/metaschema/databind/model/extra/MetaschemaModuleExternalConstraintsTest.java @@ -8,6 +8,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotSame; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.nio.file.Paths; +import java.util.List; +import java.util.stream.Collectors; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IConstraintLoader; import dev.metaschema.core.model.IModule; @@ -21,13 +28,6 @@ import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; import dev.metaschema.databind.model.metaschema.binding.METASCHEMA; -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.nio.file.Paths; -import java.util.List; -import java.util.stream.Collectors; - class MetaschemaModuleExternalConstraintsTest { @Test diff --git a/databind/src/test/java/dev/metaschema/databind/model/impl/BoundChoiceTest.java b/databind/src/test/java/dev/metaschema/databind/model/impl/BoundChoiceTest.java index a28897fc35..599493828c 100644 --- a/databind/src/test/java/dev/metaschema/databind/model/impl/BoundChoiceTest.java +++ b/databind/src/test/java/dev/metaschema/databind/model/impl/BoundChoiceTest.java @@ -10,6 +10,10 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; + +import java.util.List; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IChoiceInstance; import dev.metaschema.core.model.IMetaschemaData; @@ -20,10 +24,6 @@ import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import dev.metaschema.databind.testing.model.TestModule; -import org.junit.jupiter.api.Test; - -import java.util.List; - /** * Tests for the {@link BoundChoice} annotation and * {@link BoundInstanceModelChoice} class. diff --git a/databind/src/test/java/dev/metaschema/databind/model/impl/ConstraintFactoryTest.java b/databind/src/test/java/dev/metaschema/databind/model/impl/ConstraintFactoryTest.java index dcbefeb9a5..e2aaa3ce59 100644 --- a/databind/src/test/java/dev/metaschema/databind/model/impl/ConstraintFactoryTest.java +++ b/databind/src/test/java/dev/metaschema/databind/model/impl/ConstraintFactoryTest.java @@ -8,13 +8,6 @@ import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.datatype.markup.MarkupMultiline; -import dev.metaschema.core.model.ISource; -import dev.metaschema.core.model.constraint.ILet; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.model.annotations.Let; - import org.jmock.Expectations; import org.jmock.junit5.JUnit5Mockery; import org.jmock.lib.concurrent.Synchroniser; @@ -23,6 +16,13 @@ import java.net.URI; +import dev.metaschema.core.datatype.markup.MarkupMultiline; +import dev.metaschema.core.model.ISource; +import dev.metaschema.core.model.constraint.ILet; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.model.annotations.Let; + class ConstraintFactoryTest { @RegisterExtension final JUnit5Mockery context = new JUnit5Mockery() { diff --git a/databind/src/test/java/dev/metaschema/databind/model/metaschema/BindingConstraintLoaderTest.java b/databind/src/test/java/dev/metaschema/databind/model/metaschema/BindingConstraintLoaderTest.java index 075f772520..509458772b 100644 --- a/databind/src/test/java/dev/metaschema/databind/model/metaschema/BindingConstraintLoaderTest.java +++ b/databind/src/test/java/dev/metaschema/databind/model/metaschema/BindingConstraintLoaderTest.java @@ -10,6 +10,15 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.net.URI; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; + import dev.metaschema.core.metapath.StaticContext; import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IConstraintLoader; @@ -29,15 +38,6 @@ import dev.metaschema.databind.model.metaschema.binding.TargetedReportConstraint; import dev.metaschema.databind.model.metaschema.impl.ConstraintBindingSupport; -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.net.URI; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.List; - class BindingConstraintLoaderTest { private static final String NS = "http://csrc.nist.gov/ns/test/metaschema/meta-constraints"; diff --git a/databind/src/test/java/dev/metaschema/databind/model/metaschema/BindingModuleLoaderTest.java b/databind/src/test/java/dev/metaschema/databind/model/metaschema/BindingModuleLoaderTest.java index f952fa1225..2fb49bce3c 100644 --- a/databind/src/test/java/dev/metaschema/databind/model/metaschema/BindingModuleLoaderTest.java +++ b/databind/src/test/java/dev/metaschema/databind/model/metaschema/BindingModuleLoaderTest.java @@ -5,15 +5,15 @@ package dev.metaschema.databind.model.metaschema; -import dev.metaschema.core.model.MetaschemaException; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.codegen.AbstractMetaschemaTest; - import org.junit.jupiter.api.Test; import java.io.IOException; import java.nio.file.Paths; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.AbstractMetaschemaTest; + class BindingModuleLoaderTest extends AbstractMetaschemaTest { diff --git a/databind/src/test/java/dev/metaschema/databind/model/test/FlaggedAssembly.java b/databind/src/test/java/dev/metaschema/databind/model/test/FlaggedAssembly.java index f1a6dab8b3..60f1f5a857 100644 --- a/databind/src/test/java/dev/metaschema/databind/model/test/FlaggedAssembly.java +++ b/databind/src/test/java/dev/metaschema/databind/model/test/FlaggedAssembly.java @@ -5,14 +5,14 @@ package dev.metaschema.databind.model.test; +import java.math.BigInteger; + import dev.metaschema.core.datatype.adapter.IntegerAdapter; import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IMetaschemaData; import dev.metaschema.databind.model.annotations.BoundFlag; import dev.metaschema.databind.model.annotations.MetaschemaAssembly; -import java.math.BigInteger; - // Used @MetaschemaAssembly(name = "flagged-assembly", rootName = "flagged-assembly", moduleClass = TestMetaschema.class) public class FlaggedAssembly implements IBoundObject { diff --git a/databind/src/test/java/dev/metaschema/databind/model/test/MultiFieldAssembly.java b/databind/src/test/java/dev/metaschema/databind/model/test/MultiFieldAssembly.java index 7689857d07..8e2c967db8 100644 --- a/databind/src/test/java/dev/metaschema/databind/model/test/MultiFieldAssembly.java +++ b/databind/src/test/java/dev/metaschema/databind/model/test/MultiFieldAssembly.java @@ -5,6 +5,8 @@ package dev.metaschema.databind.model.test; +import java.util.List; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IMetaschemaData; import dev.metaschema.core.model.JsonGroupAsBehavior; @@ -15,9 +17,6 @@ import dev.metaschema.databind.model.annotations.GroupAs; import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import dev.metaschema.databind.model.annotations.MetaschemaField; - -import java.util.List; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; // Used diff --git a/databind/src/test/java/dev/metaschema/databind/model/test/OnlyModelBoundAssembly.java b/databind/src/test/java/dev/metaschema/databind/model/test/OnlyModelBoundAssembly.java index 354aae4bba..d19763513a 100644 --- a/databind/src/test/java/dev/metaschema/databind/model/test/OnlyModelBoundAssembly.java +++ b/databind/src/test/java/dev/metaschema/databind/model/test/OnlyModelBoundAssembly.java @@ -5,6 +5,9 @@ package dev.metaschema.databind.model.test; +import java.util.List; +import java.util.Map; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IMetaschemaData; import dev.metaschema.core.model.JsonGroupAsBehavior; @@ -13,9 +16,6 @@ import dev.metaschema.databind.model.annotations.GroupAs; import dev.metaschema.databind.model.annotations.MetaschemaAssembly; -import java.util.List; -import java.util.Map; - @SuppressWarnings("PMD") @MetaschemaAssembly(name = "only-model", moduleClass = TestMetaschema.class) public class OnlyModelBoundAssembly implements IBoundObject { // NOPMD - intentional diff --git a/databind/src/test/java/dev/metaschema/databind/model/test/RootBoundAssembly.java b/databind/src/test/java/dev/metaschema/databind/model/test/RootBoundAssembly.java index f8f8ee2787..471decd948 100644 --- a/databind/src/test/java/dev/metaschema/databind/model/test/RootBoundAssembly.java +++ b/databind/src/test/java/dev/metaschema/databind/model/test/RootBoundAssembly.java @@ -5,6 +5,10 @@ package dev.metaschema.databind.model.test; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import dev.metaschema.core.datatype.adapter.UuidAdapter; import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IMetaschemaData; @@ -15,10 +19,6 @@ import dev.metaschema.databind.model.annotations.GroupAs; import dev.metaschema.databind.model.annotations.MetaschemaAssembly; -import java.util.List; -import java.util.Map; -import java.util.UUID; - @MetaschemaAssembly(name = "root", rootName = "root", moduleClass = TestMetaschema.class) public class RootBoundAssembly implements IBoundObject { private final IMetaschemaData metaschemaData; diff --git a/databind/src/test/java/dev/metaschema/databind/model/test/SimpleAssembly.java b/databind/src/test/java/dev/metaschema/databind/model/test/SimpleAssembly.java index 72a703843f..03dc87f450 100644 --- a/databind/src/test/java/dev/metaschema/databind/model/test/SimpleAssembly.java +++ b/databind/src/test/java/dev/metaschema/databind/model/test/SimpleAssembly.java @@ -5,14 +5,14 @@ package dev.metaschema.databind.model.test; +import java.math.BigInteger; + import dev.metaschema.core.datatype.adapter.IntegerAdapter; import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IMetaschemaData; import dev.metaschema.databind.model.annotations.BoundFlag; import dev.metaschema.databind.model.annotations.MetaschemaAssembly; -import java.math.BigInteger; - @SuppressWarnings("PMD") @MetaschemaAssembly(name = "simple-assembly", rootName = "test", moduleClass = TestMetaschema.class) public class SimpleAssembly implements IBoundObject { diff --git a/databind/src/test/java/dev/metaschema/databind/model/test/TestMetaschema.java b/databind/src/test/java/dev/metaschema/databind/model/test/TestMetaschema.java index 05c3aaf082..657959e9e0 100644 --- a/databind/src/test/java/dev/metaschema/databind/model/test/TestMetaschema.java +++ b/databind/src/test/java/dev/metaschema/databind/model/test/TestMetaschema.java @@ -5,6 +5,10 @@ package dev.metaschema.databind.model.test; +import java.net.URI; +import java.util.List; +import java.util.Map; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.util.CollectionUtil; @@ -12,11 +16,6 @@ import dev.metaschema.databind.IBindingContext; import dev.metaschema.databind.model.AbstractBoundModule; import dev.metaschema.databind.model.annotations.MetaschemaModule; - -import java.net.URI; -import java.util.List; -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; @MetaschemaModule( diff --git a/databind/src/test/java/dev/metaschema/databind/testing/model/ModelTest.java b/databind/src/test/java/dev/metaschema/databind/testing/model/ModelTest.java index 6bcc2fdbf5..e9cde8ac92 100644 --- a/databind/src/test/java/dev/metaschema/databind/testing/model/ModelTest.java +++ b/databind/src/test/java/dev/metaschema/databind/testing/model/ModelTest.java @@ -12,6 +12,17 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.math.BigInteger; +import java.net.URI; +import java.util.List; +import java.util.Map; + import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.DefaultBindingContext; @@ -24,17 +35,6 @@ import dev.metaschema.databind.model.IBoundInstanceModelField; import dev.metaschema.databind.testing.model.RootAssemblyWithFields.JsonKeyField; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.math.BigInteger; -import java.net.URI; -import java.util.List; -import java.util.Map; - class ModelTest extends ModelTestBase { private static final String NS = "https://csrc.nist.gov/ns/test/xml"; diff --git a/databind/src/test/java/dev/metaschema/databind/testing/model/ModelTestBase.java b/databind/src/test/java/dev/metaschema/databind/testing/model/ModelTestBase.java index fa9782d641..a08c8f29dc 100644 --- a/databind/src/test/java/dev/metaschema/databind/testing/model/ModelTestBase.java +++ b/databind/src/test/java/dev/metaschema/databind/testing/model/ModelTestBase.java @@ -10,6 +10,9 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.lang.reflect.Field; +import java.util.Optional; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; @@ -21,10 +24,6 @@ import dev.metaschema.databind.model.annotations.BoundFlag; import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import dev.metaschema.databind.model.annotations.ModelUtil; - -import java.lang.reflect.Field; -import java.util.Optional; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/databind/src/test/java/dev/metaschema/databind/testing/model/RootAssemblyWithFields.java b/databind/src/test/java/dev/metaschema/databind/testing/model/RootAssemblyWithFields.java index d060596255..7286d9eb53 100644 --- a/databind/src/test/java/dev/metaschema/databind/testing/model/RootAssemblyWithFields.java +++ b/databind/src/test/java/dev/metaschema/databind/testing/model/RootAssemblyWithFields.java @@ -5,6 +5,9 @@ package dev.metaschema.databind.testing.model; +import java.util.List; +import java.util.Map; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IMetaschemaData; import dev.metaschema.core.model.JsonGroupAsBehavior; @@ -17,10 +20,6 @@ import dev.metaschema.databind.model.annotations.JsonKey; import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import dev.metaschema.databind.model.annotations.MetaschemaField; - -import java.util.List; -import java.util.Map; - import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/databind/src/test/java/dev/metaschema/databind/testing/model/RootAssemblyWithFlags.java b/databind/src/test/java/dev/metaschema/databind/testing/model/RootAssemblyWithFlags.java index 512c2905be..f515b955f4 100644 --- a/databind/src/test/java/dev/metaschema/databind/testing/model/RootAssemblyWithFlags.java +++ b/databind/src/test/java/dev/metaschema/databind/testing/model/RootAssemblyWithFlags.java @@ -5,14 +5,14 @@ package dev.metaschema.databind.testing.model; +import java.math.BigInteger; + import dev.metaschema.core.datatype.adapter.IntegerAdapter; import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IMetaschemaData; import dev.metaschema.databind.model.annotations.BoundFlag; import dev.metaschema.databind.model.annotations.MetaschemaAssembly; -import java.math.BigInteger; - /** * A test assembly class containing various flag binding configurations for * testing purposes. diff --git a/databind/src/test/java/dev/metaschema/databind/testing/model/TestModule.java b/databind/src/test/java/dev/metaschema/databind/testing/model/TestModule.java index a31974a4a4..d4853914fc 100644 --- a/databind/src/test/java/dev/metaschema/databind/testing/model/TestModule.java +++ b/databind/src/test/java/dev/metaschema/databind/testing/model/TestModule.java @@ -5,6 +5,10 @@ package dev.metaschema.databind.testing.model; +import java.net.URI; +import java.util.List; +import java.util.Map; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.util.CollectionUtil; @@ -13,11 +17,6 @@ import dev.metaschema.databind.model.AbstractBoundModule; import dev.metaschema.databind.model.IBoundModule; import dev.metaschema.databind.model.annotations.MetaschemaModule; - -import java.net.URI; -import java.util.List; -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; @MetaschemaModule( diff --git a/metaschema-cli/src/main/java/dev/metaschema/cli/CLI.java b/metaschema-cli/src/main/java/dev/metaschema/cli/CLI.java index 5654f25d37..9c542e77e2 100644 --- a/metaschema-cli/src/main/java/dev/metaschema/cli/CLI.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/CLI.java @@ -5,6 +5,10 @@ package dev.metaschema.cli; +import java.io.PrintStream; +import java.util.LinkedHashMap; +import java.util.Map; + import dev.metaschema.cli.commands.MetaschemaCommands; import dev.metaschema.cli.processor.CLIProcessor; import dev.metaschema.cli.processor.ExitStatus; @@ -17,11 +21,6 @@ import dev.metaschema.core.util.IVersionInfo; import dev.metaschema.databind.io.Format; import dev.metaschema.schemagen.ISchemaGenerator.SchemaFormat; - -import java.io.PrintStream; -import java.util.LinkedHashMap; -import java.util.Map; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/AbstractConvertSubcommand.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/AbstractConvertSubcommand.java index 8099676336..bcd14952c2 100644 --- a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/AbstractConvertSubcommand.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/AbstractConvertSubcommand.java @@ -5,19 +5,6 @@ package dev.metaschema.cli.commands; -import dev.metaschema.cli.processor.CallingContext; -import dev.metaschema.cli.processor.ExitCode; -import dev.metaschema.cli.processor.command.AbstractCommandExecutor; -import dev.metaschema.cli.processor.command.AbstractTerminalCommand; -import dev.metaschema.cli.processor.command.CommandExecutionException; -import dev.metaschema.cli.processor.command.ExtraArgument; -import dev.metaschema.core.model.MetaschemaException; -import dev.metaschema.core.util.AutoCloser; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.io.Format; -import dev.metaschema.databind.io.IBoundLoader; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import org.apache.logging.log4j.LogManager; @@ -36,6 +23,18 @@ import java.util.Collection; import java.util.List; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.command.AbstractCommandExecutor; +import dev.metaschema.cli.processor.command.AbstractTerminalCommand; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ExtraArgument; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.AutoCloser; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.IBoundLoader; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/AbstractValidateContentCommand.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/AbstractValidateContentCommand.java index eb05b7fe09..c4aa717596 100644 --- a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/AbstractValidateContentCommand.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/AbstractValidateContentCommand.java @@ -5,6 +5,23 @@ package dev.metaschema.cli.commands; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Option; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.URI; +import java.net.UnknownHostException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Collection; +import java.util.List; +import java.util.Locale; +import java.util.Set; + import dev.metaschema.cli.processor.CLIProcessor; import dev.metaschema.cli.processor.CallingContext; import dev.metaschema.cli.processor.ExitCode; @@ -32,24 +49,6 @@ import dev.metaschema.databind.io.Format; import dev.metaschema.databind.io.IBoundLoader; import dev.metaschema.modules.sarif.SarifValidationHandler; - -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.Option; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.net.URI; -import java.net.UnknownHostException; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Collection; -import java.util.List; -import java.util.Locale; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/ConvertContentUsingModuleCommand.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/ConvertContentUsingModuleCommand.java index 103922d247..d0bf2be502 100644 --- a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/ConvertContentUsingModuleCommand.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/ConvertContentUsingModuleCommand.java @@ -5,6 +5,19 @@ package dev.metaschema.cli.commands; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Option; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.io.Writer; +import java.net.URI; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import dev.metaschema.cli.processor.CallingContext; import dev.metaschema.cli.processor.command.CommandExecutionException; import dev.metaschema.cli.processor.command.ICommandExecutor; @@ -20,20 +33,6 @@ import dev.metaschema.databind.io.IDeserializer; import dev.metaschema.databind.io.ISerializer; import dev.metaschema.databind.io.ModelDetector; - -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.Option; - -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.Writer; -import java.net.URI; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/GenerateDiagramCommand.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/GenerateDiagramCommand.java index 8291c5af2e..5c3d5ee520 100644 --- a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/GenerateDiagramCommand.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/GenerateDiagramCommand.java @@ -5,17 +5,6 @@ package dev.metaschema.cli.commands; -import dev.metaschema.cli.processor.CallingContext; -import dev.metaschema.cli.processor.ExitCode; -import dev.metaschema.cli.processor.command.AbstractTerminalCommand; -import dev.metaschema.cli.processor.command.CommandExecutionException; -import dev.metaschema.cli.processor.command.ExtraArgument; -import dev.metaschema.cli.processor.command.ICommandExecutor; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.model.util.MermaidErDiagramGenerator; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import org.apache.logging.log4j.LogManager; @@ -34,6 +23,16 @@ import java.util.Collection; import java.util.List; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.command.AbstractTerminalCommand; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ExtraArgument; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.util.MermaidErDiagramGenerator; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/GenerateSchemaCommand.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/GenerateSchemaCommand.java index 97da1599fb..1590a7e600 100644 --- a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/GenerateSchemaCommand.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/GenerateSchemaCommand.java @@ -5,6 +5,21 @@ package dev.metaschema.cli.commands; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Option; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.nio.file.Path; +import java.util.Collection; +import java.util.List; + import dev.metaschema.cli.processor.CallingContext; import dev.metaschema.cli.processor.ExitCode; import dev.metaschema.cli.processor.command.AbstractTerminalCommand; @@ -21,22 +36,6 @@ import dev.metaschema.schemagen.ISchemaGenerator; import dev.metaschema.schemagen.ISchemaGenerator.SchemaFormat; import dev.metaschema.schemagen.SchemaGenerationFeature; - -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.Option; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.nio.charset.StandardCharsets; -import java.nio.file.Path; -import java.util.Collection; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/MetaschemaCommands.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/MetaschemaCommands.java index 78cc7c80bc..37de5611dd 100644 --- a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/MetaschemaCommands.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/MetaschemaCommands.java @@ -5,6 +5,22 @@ package dev.metaschema.cli.commands; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Option; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.Set; + import dev.metaschema.cli.commands.metapath.MetapathCommand; import dev.metaschema.cli.processor.ExitCode; import dev.metaschema.cli.processor.OptionUtils; @@ -25,23 +41,6 @@ import dev.metaschema.databind.io.IBoundLoader; import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; import dev.metaschema.schemagen.ISchemaGenerator.SchemaFormat; - -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.Option; - -import java.io.FileNotFoundException; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Locale; -import java.util.Set; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/ValidateContentUsingModuleCommand.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/ValidateContentUsingModuleCommand.java index 111f310707..6e89240767 100644 --- a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/ValidateContentUsingModuleCommand.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/ValidateContentUsingModuleCommand.java @@ -5,23 +5,6 @@ package dev.metaschema.cli.commands; -import dev.metaschema.cli.processor.CallingContext; -import dev.metaschema.cli.processor.command.CommandExecutionException; -import dev.metaschema.cli.processor.command.ICommandExecutor; -import dev.metaschema.core.configuration.DefaultConfiguration; -import dev.metaschema.core.configuration.IMutableConfiguration; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.model.constraint.IConstraintSet; -import dev.metaschema.core.model.validation.JsonSchemaContentValidator; -import dev.metaschema.core.model.validation.XmlSchemaContentValidator; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.IBindingContext.ISchemaValidationProvider; -import dev.metaschema.schemagen.ISchemaGenerator; -import dev.metaschema.schemagen.ISchemaGenerator.SchemaFormat; -import dev.metaschema.schemagen.SchemaGenerationFeature; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import org.json.JSONObject; @@ -40,6 +23,22 @@ import javax.xml.transform.stream.StreamSource; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.IBindingContext.ISchemaValidationProvider; +import dev.metaschema.schemagen.ISchemaGenerator; +import dev.metaschema.schemagen.ISchemaGenerator.SchemaFormat; +import dev.metaschema.schemagen.SchemaGenerationFeature; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/ValidateModuleCommand.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/ValidateModuleCommand.java index 69c486c0fd..ad3edb6c91 100644 --- a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/ValidateModuleCommand.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/ValidateModuleCommand.java @@ -5,21 +5,6 @@ package dev.metaschema.cli.commands; -import dev.metaschema.cli.processor.CallingContext; -import dev.metaschema.cli.processor.ExitCode; -import dev.metaschema.cli.processor.command.CommandExecutionException; -import dev.metaschema.cli.processor.command.ICommandExecutor; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.model.MetaschemaException; -import dev.metaschema.core.model.constraint.IConstraintSet; -import dev.metaschema.core.model.util.JsonUtil; -import dev.metaschema.core.model.validation.JsonSchemaContentValidator; -import dev.metaschema.core.model.validation.XmlSchemaContentValidator; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.IBindingContext.ISchemaValidationProvider; -import dev.metaschema.databind.model.metaschema.binding.MetaschemaModelModule; - import org.apache.commons.cli.CommandLine; import org.json.JSONObject; import org.xml.sax.SAXException; @@ -37,6 +22,20 @@ import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.model.util.JsonUtil; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.IBindingContext.ISchemaValidationProvider; +import dev.metaschema.databind.model.metaschema.binding.MetaschemaModelModule; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/EvaluateMetapathCommand.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/EvaluateMetapathCommand.java index 3bbf99c45f..4095e30e05 100644 --- a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/EvaluateMetapathCommand.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/EvaluateMetapathCommand.java @@ -5,6 +5,20 @@ package dev.metaschema.cli.commands.metapath; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Option; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.io.Writer; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Collection; +import java.util.List; + import dev.metaschema.cli.commands.MetaschemaCommands; import dev.metaschema.cli.processor.CallingContext; import dev.metaschema.cli.processor.ExitCode; @@ -26,21 +40,6 @@ import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.databind.IBindingContext; import dev.metaschema.databind.io.IBoundLoader; - -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.Option; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.io.Writer; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Collection; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/ListFunctionsSubcommand.java b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/ListFunctionsSubcommand.java index 236265f706..8d5088460a 100644 --- a/metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/ListFunctionsSubcommand.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/commands/metapath/ListFunctionsSubcommand.java @@ -5,16 +5,6 @@ package dev.metaschema.cli.commands.metapath; -import dev.metaschema.cli.processor.CallingContext; -import dev.metaschema.cli.processor.ExitCode; -import dev.metaschema.cli.processor.ExitStatus; -import dev.metaschema.cli.processor.command.AbstractTerminalCommand; -import dev.metaschema.cli.processor.command.ICommandExecutor; -import dev.metaschema.core.metapath.function.FunctionService; -import dev.metaschema.core.metapath.function.IArgument; -import dev.metaschema.core.metapath.function.IFunction; -import dev.metaschema.core.qname.WellKnown; - import org.apache.commons.cli.CommandLine; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -26,6 +16,15 @@ import java.util.Map; import java.util.stream.Collectors; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.ExitStatus; +import dev.metaschema.cli.processor.command.AbstractTerminalCommand; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.metapath.function.FunctionService; +import dev.metaschema.core.metapath.function.IArgument; +import dev.metaschema.core.metapath.function.IFunction; +import dev.metaschema.core.qname.WellKnown; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/metaschema-cli/src/main/java/dev/metaschema/cli/util/LoggingValidationHandler.java b/metaschema-cli/src/main/java/dev/metaschema/cli/util/LoggingValidationHandler.java index 5a842a106a..ddb447efdd 100644 --- a/metaschema-cli/src/main/java/dev/metaschema/cli/util/LoggingValidationHandler.java +++ b/metaschema-cli/src/main/java/dev/metaschema/cli/util/LoggingValidationHandler.java @@ -7,15 +7,6 @@ import static org.jline.jansi.Ansi.ansi; -import dev.metaschema.core.metapath.format.IPathFormatter; -import dev.metaschema.core.model.constraint.ConstraintValidationFinding; -import dev.metaschema.core.model.constraint.IConstraint.Level; -import dev.metaschema.core.model.validation.AbstractValidationResultProcessor; -import dev.metaschema.core.model.validation.IValidationFinding; -import dev.metaschema.core.model.validation.JsonSchemaContentValidator.JsonValidationFinding; -import dev.metaschema.core.model.validation.XmlSchemaContentValidator.XmlValidationFinding; -import dev.metaschema.modules.sarif.SarifValidationHandler; - import org.apache.logging.log4j.LogBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -27,6 +18,14 @@ import java.util.Set; import java.util.stream.Collectors; +import dev.metaschema.core.metapath.format.IPathFormatter; +import dev.metaschema.core.model.constraint.ConstraintValidationFinding; +import dev.metaschema.core.model.constraint.IConstraint.Level; +import dev.metaschema.core.model.validation.AbstractValidationResultProcessor; +import dev.metaschema.core.model.validation.IValidationFinding; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator.JsonValidationFinding; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator.XmlValidationFinding; +import dev.metaschema.modules.sarif.SarifValidationHandler; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/metaschema-cli/src/test/java/dev/metaschema/cli/CLITest.java b/metaschema-cli/src/test/java/dev/metaschema/cli/CLITest.java index 315ae4abf8..37c7fa3a95 100644 --- a/metaschema-cli/src/test/java/dev/metaschema/cli/CLITest.java +++ b/metaschema-cli/src/test/java/dev/metaschema/cli/CLITest.java @@ -10,9 +10,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -import dev.metaschema.cli.processor.ExitCode; -import dev.metaschema.cli.processor.ExitStatus; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -26,6 +23,8 @@ import java.util.List; import java.util.stream.Stream; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.ExitStatus; import edu.umd.cs.findbugs.annotations.NonNull; import nl.altindag.log.LogCaptor; diff --git a/metaschema-cli/src/test/java/dev/metaschema/cli/commands/metapath/EvaluateMetapathSubCommandTest.java b/metaschema-cli/src/test/java/dev/metaschema/cli/commands/metapath/EvaluateMetapathSubCommandTest.java index dc39cbcbb2..dba82b0a29 100644 --- a/metaschema-cli/src/test/java/dev/metaschema/cli/commands/metapath/EvaluateMetapathSubCommandTest.java +++ b/metaschema-cli/src/test/java/dev/metaschema/cli/commands/metapath/EvaluateMetapathSubCommandTest.java @@ -7,8 +7,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import dev.metaschema.cli.CLI; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -16,6 +14,7 @@ import java.io.OutputStream; import java.io.PrintStream; +import dev.metaschema.cli.CLI; import nl.altindag.log.LogCaptor; @Execution(value = ExecutionMode.SAME_THREAD, reason = "Log capturing needs to be single threaded") diff --git a/metaschema-cli/src/test/java/dev/metaschema/cli/util/LoggingValidationHandlerTest.java b/metaschema-cli/src/test/java/dev/metaschema/cli/util/LoggingValidationHandlerTest.java index b3769dda69..52b10f355b 100644 --- a/metaschema-cli/src/test/java/dev/metaschema/cli/util/LoggingValidationHandlerTest.java +++ b/metaschema-cli/src/test/java/dev/metaschema/cli/util/LoggingValidationHandlerTest.java @@ -9,12 +9,12 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; -import dev.metaschema.core.metapath.format.IPathFormatter; - import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; +import dev.metaschema.core.metapath.format.IPathFormatter; + /** * Tests for {@link LoggingValidationHandler} factory methods and configuration. *

diff --git a/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/AbstractMetaschemaMojo.java b/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/AbstractMetaschemaMojo.java index be3c21aee6..0c3dca2a7a 100644 --- a/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/AbstractMetaschemaMojo.java +++ b/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/AbstractMetaschemaMojo.java @@ -5,41 +5,6 @@ package dev.metaschema.maven.plugin; -import dev.metaschema.core.model.IConstraintLoader; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.model.IModuleLoader; -import dev.metaschema.core.model.IResourceLocation; -import dev.metaschema.core.model.MetaschemaException; -import dev.metaschema.core.model.constraint.ConstraintValidationException; -import dev.metaschema.core.model.constraint.ConstraintValidationFinding; -import dev.metaschema.core.model.constraint.ExternalConstraintsModulePostProcessor; -import dev.metaschema.core.model.constraint.IConstraintSet; -import dev.metaschema.core.model.validation.AbstractValidationResultProcessor; -import dev.metaschema.core.model.validation.IValidationFinding; -import dev.metaschema.core.model.validation.IValidationResult; -import dev.metaschema.core.model.validation.JsonSchemaContentValidator.JsonValidationFinding; -import dev.metaschema.core.model.validation.XmlSchemaContentValidator.XmlValidationFinding; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.DefaultBindingContext; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.PostProcessingModuleLoaderStrategy; -import dev.metaschema.databind.SimpleModuleLoaderStrategy; -import dev.metaschema.databind.codegen.IGeneratedClass; -import dev.metaschema.databind.codegen.IGeneratedModuleClass; -import dev.metaschema.databind.codegen.IModuleBindingGenerator; -import dev.metaschema.databind.codegen.IProduction; -import dev.metaschema.databind.codegen.JavaCompilerSupport; -import dev.metaschema.databind.codegen.JavaGenerator; -import dev.metaschema.databind.codegen.ModuleCompilerHelper; -import dev.metaschema.databind.codegen.config.DefaultBindingConfiguration; -import dev.metaschema.databind.codegen.config.IBindingConfiguration; -import dev.metaschema.databind.model.IBoundModule; -import dev.metaschema.databind.model.metaschema.BindingModuleLoader; -import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; -import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; -import dev.metaschema.databind.model.metaschema.binding.MetaschemaModelModule; - import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.DependencyResolutionRequiredException; import org.apache.maven.plugin.AbstractMojo; @@ -75,6 +40,40 @@ import javax.inject.Inject; import javax.tools.DiagnosticCollector; +import dev.metaschema.core.model.IConstraintLoader; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.IModuleLoader; +import dev.metaschema.core.model.IResourceLocation; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.ConstraintValidationException; +import dev.metaschema.core.model.constraint.ConstraintValidationFinding; +import dev.metaschema.core.model.constraint.ExternalConstraintsModulePostProcessor; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.model.validation.AbstractValidationResultProcessor; +import dev.metaschema.core.model.validation.IValidationFinding; +import dev.metaschema.core.model.validation.IValidationResult; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator.JsonValidationFinding; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator.XmlValidationFinding; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.DefaultBindingContext; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.PostProcessingModuleLoaderStrategy; +import dev.metaschema.databind.SimpleModuleLoaderStrategy; +import dev.metaschema.databind.codegen.IGeneratedClass; +import dev.metaschema.databind.codegen.IGeneratedModuleClass; +import dev.metaschema.databind.codegen.IModuleBindingGenerator; +import dev.metaschema.databind.codegen.IProduction; +import dev.metaschema.databind.codegen.JavaCompilerSupport; +import dev.metaschema.databind.codegen.JavaGenerator; +import dev.metaschema.databind.codegen.ModuleCompilerHelper; +import dev.metaschema.databind.codegen.config.DefaultBindingConfiguration; +import dev.metaschema.databind.codegen.config.IBindingConfiguration; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.databind.model.metaschema.BindingModuleLoader; +import dev.metaschema.databind.model.metaschema.IBindingMetaschemaModule; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.databind.model.metaschema.binding.MetaschemaModelModule; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/GenerateSchemaMojo.java b/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/GenerateSchemaMojo.java index a3a3fbfbf6..bf73c50561 100644 --- a/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/GenerateSchemaMojo.java +++ b/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/GenerateSchemaMojo.java @@ -5,17 +5,6 @@ package dev.metaschema.maven.plugin; -import dev.metaschema.core.configuration.DefaultConfiguration; -import dev.metaschema.core.configuration.IConfiguration; -import dev.metaschema.core.configuration.IMutableConfiguration; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.schemagen.ISchemaGenerator; -import dev.metaschema.schemagen.SchemaGenerationFeature; -import dev.metaschema.schemagen.json.JsonSchemaGenerator; -import dev.metaschema.schemagen.xml.XmlSchemaGenerator; - import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; @@ -34,6 +23,16 @@ import java.util.Locale; import java.util.Set; +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.ISchemaGenerator; +import dev.metaschema.schemagen.SchemaGenerationFeature; +import dev.metaschema.schemagen.json.JsonSchemaGenerator; +import dev.metaschema.schemagen.xml.XmlSchemaGenerator; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/GenerateSourcesMojo.java b/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/GenerateSourcesMojo.java index 3c0b75b17c..106792d528 100644 --- a/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/GenerateSourcesMojo.java +++ b/metaschema-maven-plugin/src/main/java/dev/metaschema/maven/plugin/GenerateSourcesMojo.java @@ -5,13 +5,6 @@ package dev.metaschema.maven.plugin; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.codegen.IProduction; -import dev.metaschema.databind.codegen.JavaGenerator; -import dev.metaschema.databind.codegen.config.DefaultBindingConfiguration; -import dev.metaschema.databind.io.BindingException; - import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; @@ -25,6 +18,12 @@ import java.util.Set; import java.util.stream.Collectors; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.codegen.IProduction; +import dev.metaschema.databind.codegen.JavaGenerator; +import dev.metaschema.databind.codegen.config.DefaultBindingConfiguration; +import dev.metaschema.databind.io.BindingException; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/metaschema-testing/src/main/java/dev/metaschema/model/testing/AbstractTestSuite.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/AbstractTestSuite.java index ec1647d189..cccc2e994a 100644 --- a/metaschema-testing/src/main/java/dev/metaschema/model/testing/AbstractTestSuite.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/AbstractTestSuite.java @@ -7,24 +7,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.model.MetaschemaException; -import dev.metaschema.core.model.validation.IContentValidator; -import dev.metaschema.core.model.validation.IValidationFinding; -import dev.metaschema.core.model.validation.IValidationResult; -import dev.metaschema.core.model.validation.JsonSchemaContentValidator.JsonValidationFinding; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.io.Format; -import dev.metaschema.databind.io.ISerializer; -import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; -import dev.metaschema.model.testing.testsuite.GenerateSchema; -import dev.metaschema.model.testing.testsuite.Metaschema; -import dev.metaschema.model.testing.testsuite.TestCollection; -import dev.metaschema.model.testing.testsuite.TestScenario; -import dev.metaschema.model.testing.testsuite.TestSuite; -import dev.metaschema.model.testing.testsuite.ValidationCase; - import org.apache.logging.log4j.LogBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -52,6 +34,23 @@ import java.util.function.Supplier; import java.util.stream.Stream; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.validation.IContentValidator; +import dev.metaschema.core.model.validation.IValidationFinding; +import dev.metaschema.core.model.validation.IValidationResult; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator.JsonValidationFinding; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.ISerializer; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.model.testing.testsuite.GenerateSchema; +import dev.metaschema.model.testing.testsuite.Metaschema; +import dev.metaschema.model.testing.testsuite.TestCollection; +import dev.metaschema.model.testing.testsuite.TestScenario; +import dev.metaschema.model.testing.testsuite.TestSuite; +import dev.metaschema.model.testing.testsuite.ValidationCase; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/GenerateSchema.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/GenerateSchema.java index 0fe2f4e97b..b7e8e94ff4 100644 --- a/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/GenerateSchema.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/GenerateSchema.java @@ -7,6 +7,12 @@ package dev.metaschema.model.testing.testsuite; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IMetaschemaData; @@ -22,10 +28,6 @@ import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Defines schema generation parameters and expected results. diff --git a/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/GenerationCase.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/GenerationCase.java index ce18270589..d188fab98d 100644 --- a/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/GenerationCase.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/GenerationCase.java @@ -7,6 +7,11 @@ package dev.metaschema.model.testing.testsuite; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.net.URI; + import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.datatype.adapter.UriReferenceAdapter; import dev.metaschema.core.model.IBoundObject; @@ -20,9 +25,6 @@ import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.net.URI; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * A schema generation comparison test case. diff --git a/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/Metaschema.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/Metaschema.java index 7869e5fd05..36ef3d72ea 100644 --- a/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/Metaschema.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/Metaschema.java @@ -7,6 +7,11 @@ package dev.metaschema.model.testing.testsuite; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.net.URI; + import dev.metaschema.core.datatype.adapter.UriReferenceAdapter; import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IMetaschemaData; @@ -14,9 +19,6 @@ import dev.metaschema.databind.model.annotations.BoundFlag; import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; -import java.net.URI; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * Reference to a metaschema module to load. diff --git a/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/MetaschemaTestSuiteModule.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/MetaschemaTestSuiteModule.java index d7547d3499..a636ca093c 100644 --- a/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/MetaschemaTestSuiteModule.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/MetaschemaTestSuiteModule.java @@ -7,14 +7,15 @@ package dev.metaschema.model.testing.testsuite; +import java.net.URI; +import java.util.List; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.databind.IBindingContext; import dev.metaschema.databind.model.AbstractBoundModule; import dev.metaschema.databind.model.IBoundModule; import dev.metaschema.databind.model.annotations.MetaschemaModule; -import java.net.URI; -import java.util.List; /** * Metaschema Test Suite diff --git a/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestCollection.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestCollection.java index 1439ece5ce..c6573023f0 100644 --- a/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestCollection.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestCollection.java @@ -7,6 +7,13 @@ package dev.metaschema.model.testing.testsuite; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.net.URI; +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.datatype.adapter.UriReferenceAdapter; import dev.metaschema.core.model.IBoundObject; @@ -18,11 +25,6 @@ import dev.metaschema.databind.model.annotations.GroupAs; import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; -import java.net.URI; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * A collection of test scenarios located at a specific path. diff --git a/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestScenario.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestScenario.java index 3fead89a52..f55e29d0c2 100644 --- a/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestScenario.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestScenario.java @@ -7,6 +7,12 @@ package dev.metaschema.model.testing.testsuite; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.datatype.adapter.StringAdapter; import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IMetaschemaData; @@ -18,10 +24,6 @@ import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * A test scenario that validates a metaschema and its content. diff --git a/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestSuite.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestSuite.java index ac3ff450ac..a1e00ea039 100644 --- a/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestSuite.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/TestSuite.java @@ -7,6 +7,12 @@ package dev.metaschema.model.testing.testsuite; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.model.IBoundObject; import dev.metaschema.core.model.IMetaschemaData; import dev.metaschema.core.model.JsonGroupAsBehavior; @@ -15,10 +21,6 @@ import dev.metaschema.databind.model.annotations.GroupAs; import dev.metaschema.databind.model.annotations.MetaschemaAssembly; import edu.umd.cs.findbugs.annotations.NonNull; -import java.util.LinkedList; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * The root element containing a collection of test collections. diff --git a/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/ValidationCase.java b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/ValidationCase.java index 0c63c5ab0c..5815623e7e 100644 --- a/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/ValidationCase.java +++ b/metaschema-testing/src/main/java/dev/metaschema/model/testing/testsuite/ValidationCase.java @@ -7,6 +7,11 @@ package dev.metaschema.model.testing.testsuite; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.net.URI; + import dev.metaschema.core.datatype.adapter.TokenAdapter; import dev.metaschema.core.datatype.adapter.UriReferenceAdapter; import dev.metaschema.core.model.IBoundObject; @@ -20,9 +25,6 @@ import dev.metaschema.databind.model.annotations.ValueConstraints; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import java.net.URI; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * A content validation test case. diff --git a/pom.xml b/pom.xml index 9c121b694f..ae42addab3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ dev.metaschema oss-parent - 9 + 10 dev.metaschema.java @@ -710,36 +710,35 @@ org.apache.maven.plugins maven-site-plugin + + + + org.apache.maven.plugins maven-javadoc-plugin - - + + aggregate-javadoc - package false - - aggregate - + + aggregate-no-fork + ${project.name} ${project.version} API ${project.name} ${project.version} API metaschema-maven-plugin - - + + - - - - org.apache.maven.plugins maven-jxr-plugin - default + default false diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/AbstractGenerationState.java b/schemagen/src/main/java/dev/metaschema/schemagen/AbstractGenerationState.java index 1c7a315d01..423feb7d9d 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/AbstractGenerationState.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/AbstractGenerationState.java @@ -5,6 +5,12 @@ package dev.metaschema.schemagen; +import org.eclipse.jdt.annotation.NotOwning; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + import dev.metaschema.core.configuration.IConfiguration; import dev.metaschema.core.metapath.IMetapathExpression; import dev.metaschema.core.model.IDefinition; @@ -16,13 +22,6 @@ import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.schemagen.datatype.IDatatypeManager; - -import org.eclipse.jdt.annotation.NotOwning; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/AbstractSchemaGenerator.java b/schemagen/src/main/java/dev/metaschema/schemagen/AbstractSchemaGenerator.java index 2d76450a40..18af19df50 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/AbstractSchemaGenerator.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/AbstractSchemaGenerator.java @@ -5,13 +5,6 @@ package dev.metaschema.schemagen; -import dev.metaschema.core.configuration.IConfiguration; -import dev.metaschema.core.model.IAssemblyDefinition; -import dev.metaschema.core.model.IDefinition; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.schemagen.datatype.IDatatypeManager; - import org.eclipse.jdt.annotation.Owning; import java.io.Writer; @@ -19,6 +12,12 @@ import java.util.List; import java.util.function.BiConsumer; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.datatype.IDatatypeManager; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/FlagInstanceFilter.java b/schemagen/src/main/java/dev/metaschema/schemagen/FlagInstanceFilter.java index d569a27004..06b9a58a2c 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/FlagInstanceFilter.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/FlagInstanceFilter.java @@ -5,13 +5,12 @@ package dev.metaschema.schemagen; -import dev.metaschema.core.model.IFlagInstance; -import dev.metaschema.core.util.ObjectUtils; - import java.util.Collection; import java.util.function.Predicate; import java.util.stream.Collectors; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/IGenerationState.java b/schemagen/src/main/java/dev/metaschema/schemagen/IGenerationState.java index 1580de92ae..a2402d876a 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/IGenerationState.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/IGenerationState.java @@ -5,14 +5,13 @@ package dev.metaschema.schemagen; -import dev.metaschema.core.model.IAssemblyDefinition; -import dev.metaschema.core.model.IDefinition; -import dev.metaschema.core.model.IModule; - import java.io.IOException; import java.util.Collection; import java.util.Locale; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IDefinition; +import dev.metaschema.core.model.IModule; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/IInlineStrategy.java b/schemagen/src/main/java/dev/metaschema/schemagen/IInlineStrategy.java index c19ba078b8..0fc50050fa 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/IInlineStrategy.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/IInlineStrategy.java @@ -7,7 +7,6 @@ import dev.metaschema.core.configuration.IConfiguration; import dev.metaschema.core.model.IDefinition; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/ISchemaGenerator.java b/schemagen/src/main/java/dev/metaschema/schemagen/ISchemaGenerator.java index 7be1decdaa..1493b1f01f 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/ISchemaGenerator.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/ISchemaGenerator.java @@ -5,11 +5,6 @@ package dev.metaschema.schemagen; -import dev.metaschema.core.configuration.IConfiguration; -import dev.metaschema.core.model.IModule; -import dev.metaschema.schemagen.json.JsonSchemaGenerator; -import dev.metaschema.schemagen.xml.XmlSchemaGenerator; - import java.io.IOException; import java.io.Writer; import java.nio.charset.StandardCharsets; @@ -17,6 +12,10 @@ import java.nio.file.Path; import java.nio.file.StandardOpenOption; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.schemagen.json.JsonSchemaGenerator; +import dev.metaschema.schemagen.xml.XmlSchemaGenerator; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/ModuleIndex.java b/schemagen/src/main/java/dev/metaschema/schemagen/ModuleIndex.java index 57d8a47efb..b0c8413182 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/ModuleIndex.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/ModuleIndex.java @@ -5,6 +5,13 @@ package dev.metaschema.schemagen; +import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.atomic.AtomicBoolean; + import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IAssemblyInstance; import dev.metaschema.core.model.IChoiceInstance; @@ -19,14 +26,6 @@ import dev.metaschema.core.model.INamedModelInstanceGrouped; import dev.metaschema.core.model.ModelWalker; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Collection; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/SchemaGenerationFeature.java b/schemagen/src/main/java/dev/metaschema/schemagen/SchemaGenerationFeature.java index 650e4606dd..5575621cea 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/SchemaGenerationFeature.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/SchemaGenerationFeature.java @@ -6,7 +6,6 @@ package dev.metaschema.schemagen; import dev.metaschema.core.configuration.AbstractConfigurationFeature; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/datatype/AbstractDatatypeManager.java b/schemagen/src/main/java/dev/metaschema/schemagen/datatype/AbstractDatatypeManager.java index 4ff8115310..b48882e35f 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/datatype/AbstractDatatypeManager.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/datatype/AbstractDatatypeManager.java @@ -5,8 +5,6 @@ package dev.metaschema.schemagen.datatype; -import dev.metaschema.core.datatype.IDataTypeAdapter; - import java.util.Collections; import java.util.HashSet; import java.util.LinkedHashMap; @@ -14,6 +12,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import dev.metaschema.core.datatype.IDataTypeAdapter; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/datatype/IDatatypeManager.java b/schemagen/src/main/java/dev/metaschema/schemagen/datatype/IDatatypeManager.java index a9c1fc37ad..0d0297680f 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/datatype/IDatatypeManager.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/datatype/IDatatypeManager.java @@ -5,10 +5,9 @@ package dev.metaschema.schemagen.datatype; -import dev.metaschema.core.datatype.IDataTypeAdapter; - import java.util.Set; +import dev.metaschema.core.datatype.IDataTypeAdapter; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/JsonSchemaGenerator.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/JsonSchemaGenerator.java index 91a4015acd..818700ce6d 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/JsonSchemaGenerator.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/JsonSchemaGenerator.java @@ -11,6 +11,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; +import java.io.IOException; +import java.io.Writer; + import dev.metaschema.core.configuration.IConfiguration; import dev.metaschema.core.model.IModule; import dev.metaschema.core.util.ObjectUtils; @@ -21,10 +24,6 @@ import dev.metaschema.schemagen.json.impl.JsonDatatypeManager; import dev.metaschema.schemagen.json.impl.JsonGenerationState; import dev.metaschema.schemagen.json.impl.JsonSchemaModule; - -import java.io.IOException; -import java.io.Writer; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractCardinalityBehavior.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractCardinalityBehavior.java index 0192211a63..8fc6bda7bb 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractCardinalityBehavior.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractCardinalityBehavior.java @@ -8,11 +8,10 @@ import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import dev.metaschema.core.model.IModelInstance; -import dev.metaschema.core.util.ObjectUtils; - import java.util.Collection; +import dev.metaschema.core.model.IModelInstance; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaDefinition.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaDefinition.java index e3ec0ba8c2..db201c595c 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaDefinition.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaDefinition.java @@ -7,7 +7,6 @@ import dev.metaschema.core.model.IDefinition; import dev.metaschema.core.util.ObjectUtils; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaModelDefinition.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaModelDefinition.java index 78dfd72880..1c48c8ce4c 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaModelDefinition.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaModelDefinition.java @@ -5,15 +5,14 @@ package dev.metaschema.schemagen.json.impl; -import dev.metaschema.core.model.IFlagInstance; -import dev.metaschema.core.model.IModelDefinition; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import java.util.List; import java.util.Set; import java.util.stream.Stream; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.model.IModelDefinition; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaProperty.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaProperty.java index 43d32065f9..f375d97b46 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaProperty.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaProperty.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import dev.metaschema.core.model.IInstance; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyGrouped.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyGrouped.java index f40bf06fd9..0e1c928f8b 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyGrouped.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyGrouped.java @@ -7,16 +7,15 @@ import com.fasterxml.jackson.databind.node.ObjectNode; +import java.util.List; +import java.util.Set; +import java.util.stream.Stream; + import dev.metaschema.core.model.IFlagInstance; import dev.metaschema.core.model.IModelDefinition; import dev.metaschema.core.model.INamedModelInstanceGrouped; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.ObjectUtils; - -import java.util.List; -import java.util.Set; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyNamed.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyNamed.java index ba45b9fcef..d1863516af 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyNamed.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/AbstractJsonSchemaPropertyNamed.java @@ -6,7 +6,6 @@ package dev.metaschema.schemagen.json.impl; import dev.metaschema.core.model.IInstance; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorArray.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorArray.java index 657d81595a..afe99fe209 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorArray.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorArray.java @@ -7,13 +7,12 @@ import com.fasterxml.jackson.databind.node.ObjectNode; +import java.util.Collection; + import dev.metaschema.core.model.IModelInstance; import dev.metaschema.core.model.IModelInstanceAbsolute; import dev.metaschema.core.model.JsonGroupAsBehavior; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Collection; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorKeyedObject.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorKeyedObject.java index 29571b2994..43cf46b783 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorKeyedObject.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorKeyedObject.java @@ -8,6 +8,8 @@ import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import java.util.Collection; + import dev.metaschema.core.model.IFlagInstance; import dev.metaschema.core.model.IModelDefinition; import dev.metaschema.core.model.IModelInstance; @@ -15,9 +17,6 @@ import dev.metaschema.core.model.JsonGroupAsBehavior; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Collection; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorSingleton.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorSingleton.java index 96a6c4fe06..6f95da00da 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorSingleton.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorSingleton.java @@ -7,12 +7,11 @@ import com.fasterxml.jackson.databind.node.ObjectNode; +import java.util.Collection; + import dev.metaschema.core.model.IModelInstance; import dev.metaschema.core.model.IModelInstanceAbsolute; import dev.metaschema.core.model.JsonGroupAsBehavior; - -import java.util.Collection; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorSingletonOrList.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorSingletonOrList.java index 0a94c04d73..8d4ae1a0aa 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorSingletonOrList.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/CardinalityBehaviorSingletonOrList.java @@ -8,13 +8,12 @@ import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import java.util.Collection; + import dev.metaschema.core.model.IModelInstance; import dev.metaschema.core.model.IModelInstanceAbsolute; import dev.metaschema.core.model.JsonGroupAsBehavior; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Collection; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/DataTypeJsonSchema.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/DataTypeJsonSchema.java index 4f80c3a113..deef41d1f1 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/DataTypeJsonSchema.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/DataTypeJsonSchema.java @@ -7,12 +7,11 @@ import com.fasterxml.jackson.databind.node.ObjectNode; -import dev.metaschema.core.datatype.IDataTypeAdapter; -import dev.metaschema.core.util.ObjectUtils; - import java.util.Set; import java.util.stream.Stream; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/DataTypeRestrictionDefinitionJsonSchema.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/DataTypeRestrictionDefinitionJsonSchema.java index 2ce30ba35d..812ae312d8 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/DataTypeRestrictionDefinitionJsonSchema.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/DataTypeRestrictionDefinitionJsonSchema.java @@ -9,6 +9,11 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.Set; +import java.util.stream.Stream; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.adapter.DecimalAdapter; import dev.metaschema.core.model.IValuedDefinition; @@ -17,12 +22,6 @@ import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; import dev.metaschema.schemagen.AbstractGenerationState.AllowedValueCollection; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Set; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/ICardinalityBehavior.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/ICardinalityBehavior.java index 1b7da23078..c7bcf5304a 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/ICardinalityBehavior.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/ICardinalityBehavior.java @@ -7,11 +7,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode; -import dev.metaschema.core.model.IModelInstance; -import dev.metaschema.core.model.IModelInstanceAbsolute; - import java.util.Collection; +import dev.metaschema.core.model.IModelInstance; +import dev.metaschema.core.model.IModelInstanceAbsolute; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IDataTypeJsonSchema.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IDataTypeJsonSchema.java index b7d0209e6b..5be4503eab 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IDataTypeJsonSchema.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IDataTypeJsonSchema.java @@ -6,7 +6,6 @@ package dev.metaschema.schemagen.json.impl; import dev.metaschema.core.datatype.IDataTypeAdapter; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonGenerationState.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonGenerationState.java index a06a7142e1..295871a4e4 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonGenerationState.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonGenerationState.java @@ -21,7 +21,6 @@ import dev.metaschema.core.model.IValuedDefinition; import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.schemagen.IGenerationState; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinition.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinition.java index e613b6a71d..2e57970fc8 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinition.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinition.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import dev.metaschema.core.model.IDefinition; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinitionAssembly.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinitionAssembly.java index 967ecac858..18f44f5f23 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinitionAssembly.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinitionAssembly.java @@ -5,11 +5,10 @@ package dev.metaschema.schemagen.json.impl; -import dev.metaschema.core.model.IAssemblyDefinition; -import dev.metaschema.core.model.IChoiceInstance; - import java.util.List; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IChoiceInstance; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinitionField.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinitionField.java index 9556ad7a15..3621af174f 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinitionField.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaDefinitionField.java @@ -5,10 +5,9 @@ package dev.metaschema.schemagen.json.impl; -import dev.metaschema.core.model.IFieldDefinition; - import java.util.List; +import dev.metaschema.core.model.IFieldDefinition; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaModelDefinition.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaModelDefinition.java index 34bf50d137..6835a5b63b 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaModelDefinition.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaModelDefinition.java @@ -5,11 +5,10 @@ package dev.metaschema.schemagen.json.impl; -import dev.metaschema.core.model.IFlagInstance; -import dev.metaschema.core.qname.IEnhancedQName; - import java.util.List; +import dev.metaschema.core.model.IFlagInstance; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaPropertyFlag.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaPropertyFlag.java index 9822647222..e5c69815c0 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaPropertyFlag.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaPropertyFlag.java @@ -6,7 +6,6 @@ package dev.metaschema.schemagen.json.impl; import dev.metaschema.core.model.IFlagInstance; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaPropertyGrouped.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaPropertyGrouped.java index cfa9396932..f8589c5e89 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaPropertyGrouped.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/IJsonSchemaPropertyGrouped.java @@ -6,7 +6,6 @@ package dev.metaschema.schemagen.json.impl; import dev.metaschema.core.model.INamedModelInstanceGrouped; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonDatatypeManager.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonDatatypeManager.java index c9bc7c1a40..fbb9efe15a 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonDatatypeManager.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonDatatypeManager.java @@ -9,12 +9,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import dev.metaschema.core.model.MetaschemaModelConstants; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.schemagen.SchemaGenerationException; -import dev.metaschema.schemagen.datatype.AbstractDatatypeManager; - import java.io.IOException; import java.io.InputStream; import java.util.List; @@ -26,6 +20,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.model.MetaschemaModelConstants; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.SchemaGenerationException; +import dev.metaschema.schemagen.datatype.AbstractDatatypeManager; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonGenerationState.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonGenerationState.java index e5e471611b..049fee6295 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonGenerationState.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonGenerationState.java @@ -9,6 +9,14 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; +import java.io.IOException; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; + import dev.metaschema.core.configuration.IConfiguration; import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.model.IAssemblyDefinition; @@ -32,15 +40,6 @@ import dev.metaschema.schemagen.AbstractGenerationState; import dev.metaschema.schemagen.IGenerationState; import dev.metaschema.schemagen.SchemaGenerationFeature; - -import java.io.IOException; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionAssembly.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionAssembly.java index 011e41fb0b..95ff7af935 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionAssembly.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionAssembly.java @@ -7,16 +7,15 @@ import com.fasterxml.jackson.databind.node.ObjectNode; -import dev.metaschema.core.model.IAssemblyDefinition; -import dev.metaschema.core.qname.IEnhancedQName; -import dev.metaschema.core.util.ObjectUtils; - import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.qname.IEnhancedQName; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionField.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionField.java index b027237997..ce3966a015 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionField.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionField.java @@ -7,11 +7,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode; -import dev.metaschema.core.model.IFieldDefinition; -import dev.metaschema.core.qname.IEnhancedQName; - import java.util.List; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.qname.IEnhancedQName; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionFlag.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionFlag.java index da51e07cec..e4b51857ae 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionFlag.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaDefinitionFlag.java @@ -7,12 +7,11 @@ import com.fasterxml.jackson.databind.node.ObjectNode; -import dev.metaschema.core.model.IFlagDefinition; -import dev.metaschema.core.util.ObjectUtils; - import java.util.Set; import java.util.stream.Stream; +import dev.metaschema.core.model.IFlagDefinition; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaHelper.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaHelper.java index 47479fe06c..a8e988b18d 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaHelper.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaHelper.java @@ -17,6 +17,17 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; @@ -31,18 +42,6 @@ import dev.metaschema.core.qname.IEnhancedQName; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Comparator; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaModule.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaModule.java index 078824578c..18226dbdad 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaModule.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaModule.java @@ -8,16 +8,15 @@ import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.schemagen.SchemaGenerationException; - import java.util.List; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.SchemaGenerationException; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyAssembly.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyAssembly.java index 7e924587e8..7a70f4bcf6 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyAssembly.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyAssembly.java @@ -7,15 +7,14 @@ import com.fasterxml.jackson.databind.node.ObjectNode; +import java.util.Set; +import java.util.stream.Stream; + import dev.metaschema.core.model.IAssemblyInstance; import dev.metaschema.core.model.IAssemblyInstanceAbsolute; import dev.metaschema.core.model.IFlagInstance; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.core.util.ObjectUtils; - -import java.util.Set; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyChoiceGroup.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyChoiceGroup.java index 04c476ec46..4cc58ff736 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyChoiceGroup.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyChoiceGroup.java @@ -7,14 +7,13 @@ import com.fasterxml.jackson.databind.node.ObjectNode; -import dev.metaschema.core.model.IChoiceGroupInstance; -import dev.metaschema.core.util.ObjectUtils; - import java.util.List; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.model.IChoiceGroupInstance; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyField.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyField.java index 067abd167d..da65b5e51a 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyField.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyField.java @@ -7,14 +7,13 @@ import com.fasterxml.jackson.databind.node.ObjectNode; +import java.util.Set; +import java.util.stream.Stream; + import dev.metaschema.core.model.IFieldInstance; import dev.metaschema.core.model.IFieldInstanceAbsolute; import dev.metaschema.core.model.IFlagInstance; import dev.metaschema.core.util.CollectionUtil; - -import java.util.Set; -import java.util.stream.Stream; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyFlag.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyFlag.java index 563a0a0125..e50b986a11 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyFlag.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyFlag.java @@ -7,11 +7,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode; -import dev.metaschema.core.model.IFlagInstance; - import java.util.Set; import java.util.stream.Stream; +import dev.metaschema.core.model.IFlagInstance; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedAssembly.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedAssembly.java index 1f861e506b..6165c70095 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedAssembly.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedAssembly.java @@ -7,16 +7,15 @@ import com.fasterxml.jackson.databind.node.ObjectNode; -import dev.metaschema.core.model.IAssemblyDefinition; -import dev.metaschema.core.model.IAssemblyInstanceGrouped; -import dev.metaschema.core.util.ObjectUtils; - import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.model.IAssemblyDefinition; +import dev.metaschema.core.model.IAssemblyInstanceGrouped; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedField.java b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedField.java index 966914adb0..4771dc1d02 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedField.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/json/impl/JsonSchemaPropertyGroupedField.java @@ -7,14 +7,13 @@ import com.fasterxml.jackson.databind.node.ObjectNode; -import dev.metaschema.core.model.IFieldDefinition; -import dev.metaschema.core.model.IFieldInstanceGrouped; -import dev.metaschema.core.util.ObjectUtils; - import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; +import dev.metaschema.core.model.IFieldDefinition; +import dev.metaschema.core.model.IFieldInstanceGrouped; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/XmlSchemaGenerator.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/XmlSchemaGenerator.java index 544b60199c..5f58722667 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/XmlSchemaGenerator.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/XmlSchemaGenerator.java @@ -7,6 +7,19 @@ import com.ctc.wstx.stax.WstxOutputFactory; +import org.codehaus.stax2.XMLOutputFactory2; +import org.codehaus.stax2.XMLStreamWriter2; +import org.eclipse.jdt.annotation.Owning; + +import java.io.Writer; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLOutputFactory; +import javax.xml.stream.XMLStreamException; + import dev.metaschema.core.configuration.IConfiguration; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.model.IAssemblyDefinition; @@ -21,20 +34,6 @@ import dev.metaschema.schemagen.xml.impl.XmlDatatypeManager; import dev.metaschema.schemagen.xml.impl.XmlGenerationState; import dev.metaschema.schemagen.xml.impl.schematype.IXmlType; - -import org.codehaus.stax2.XMLOutputFactory2; -import org.codehaus.stax2.XMLStreamWriter2; -import org.eclipse.jdt.annotation.Owning; - -import java.io.Writer; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLOutputFactory; -import javax.xml.stream.XMLStreamException; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractDatatypeContent.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractDatatypeContent.java index bfb41b5e34..16656296eb 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractDatatypeContent.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractDatatypeContent.java @@ -5,11 +5,10 @@ package dev.metaschema.schemagen.xml.impl; -import dev.metaschema.core.util.CollectionUtil; - import java.util.ArrayList; import java.util.List; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractXmlMarkupDatatypeProvider.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractXmlMarkupDatatypeProvider.java index 61e4e110f0..bd6050d141 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractXmlMarkupDatatypeProvider.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/AbstractXmlMarkupDatatypeProvider.java @@ -5,10 +5,6 @@ package dev.metaschema.schemagen.xml.impl; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; - import org.eclipse.jdt.annotation.Owning; import org.w3c.dom.Element; @@ -17,6 +13,9 @@ import java.util.Map; import java.util.stream.Collectors; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/CompositeDatatypeProvider.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/CompositeDatatypeProvider.java index a7d90b873d..83ccc5b397 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/CompositeDatatypeProvider.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/CompositeDatatypeProvider.java @@ -5,9 +5,6 @@ package dev.metaschema.schemagen.xml.impl; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; - import org.codehaus.stax2.XMLStreamWriter2; import java.util.ArrayList; @@ -21,6 +18,8 @@ import javax.xml.stream.XMLStreamException; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/DocumentationGenerator.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/DocumentationGenerator.java index edc1239571..b6f2f68dd6 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/DocumentationGenerator.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/DocumentationGenerator.java @@ -5,6 +5,11 @@ package dev.metaschema.schemagen.xml.impl; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.stream.XMLStreamException; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.datatype.markup.MarkupMultiline; import dev.metaschema.core.model.IDefinition; @@ -12,12 +17,6 @@ import dev.metaschema.core.model.INamedInstance; import dev.metaschema.core.util.CollectionUtil; import dev.metaschema.schemagen.SchemaGenerationException; - -import java.util.ArrayList; -import java.util.List; - -import javax.xml.stream.XMLStreamException; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/DomDatatypeContent.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/DomDatatypeContent.java index 6094aeb527..0db71ef187 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/DomDatatypeContent.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/DomDatatypeContent.java @@ -5,8 +5,6 @@ package dev.metaschema.schemagen.xml.impl; -import dev.metaschema.core.util.CollectionUtil; - import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; @@ -14,7 +12,6 @@ import org.w3c.dom.NodeList; import java.util.AbstractList; -import java.util.ArrayList; import java.util.List; import java.util.RandomAccess; import java.util.stream.Collectors; @@ -25,6 +22,7 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; +import dev.metaschema.core.util.CollectionUtil; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IXmlGenerationState.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IXmlGenerationState.java index 6098d9333b..5d74cfd0e9 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IXmlGenerationState.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/IXmlGenerationState.java @@ -5,6 +5,10 @@ package dev.metaschema.schemagen.xml.impl; +import org.codehaus.stax2.XMLStreamWriter2; + +import javax.xml.stream.XMLStreamException; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.model.IDefinition; import dev.metaschema.core.model.IModelElement; @@ -12,11 +16,6 @@ import dev.metaschema.schemagen.ModuleIndex; import dev.metaschema.schemagen.xml.impl.schematype.IXmlSimpleType; import dev.metaschema.schemagen.xml.impl.schematype.IXmlType; - -import org.codehaus.stax2.XMLStreamWriter2; - -import javax.xml.stream.XMLStreamException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlCoreDatatypeProvider.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlCoreDatatypeProvider.java index 1b9808cb63..1ed640d4cf 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlCoreDatatypeProvider.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlCoreDatatypeProvider.java @@ -5,10 +5,6 @@ package dev.metaschema.schemagen.xml.impl; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; - import org.eclipse.jdt.annotation.Owning; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -28,6 +24,9 @@ import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlDatatypeManager.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlDatatypeManager.java index 8e11d9d64d..899528fa2b 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlDatatypeManager.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlDatatypeManager.java @@ -5,9 +5,6 @@ package dev.metaschema.schemagen.xml.impl; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.schemagen.datatype.AbstractDatatypeManager; - import org.codehaus.stax2.XMLStreamWriter2; import java.util.LinkedHashSet; @@ -17,6 +14,8 @@ import javax.xml.stream.XMLStreamException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.datatype.AbstractDatatypeManager; import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlGenerationState.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlGenerationState.java index ccc4263832..06dd2bd868 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlGenerationState.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlGenerationState.java @@ -5,6 +5,17 @@ package dev.metaschema.schemagen.xml.impl; +import org.codehaus.stax2.XMLStreamWriter2; + +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicInteger; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + import dev.metaschema.core.configuration.IConfiguration; import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.model.IAssemblyDefinition; @@ -28,18 +39,6 @@ import dev.metaschema.schemagen.xml.impl.schematype.XmlSimpleTypeDataTypeReference; import dev.metaschema.schemagen.xml.impl.schematype.XmlSimpleTypeDataTypeRestriction; import dev.metaschema.schemagen.xml.impl.schematype.XmlSimpleTypeUnion; - -import org.codehaus.stax2.XMLStreamWriter2; - -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.atomic.AtomicInteger; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlProseBaseDatatypeProvider.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlProseBaseDatatypeProvider.java index 34a1855b90..87e1d632d0 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlProseBaseDatatypeProvider.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/XmlProseBaseDatatypeProvider.java @@ -5,10 +5,6 @@ package dev.metaschema.schemagen.xml.impl; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; - import org.eclipse.jdt.annotation.Owning; import org.w3c.dom.Element; @@ -16,6 +12,9 @@ import java.util.List; import java.util.Map; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/AbstractXmlComplexType.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/AbstractXmlComplexType.java index a0f60167a6..b20b385ec1 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/AbstractXmlComplexType.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/AbstractXmlComplexType.java @@ -5,16 +5,15 @@ package dev.metaschema.schemagen.xml.impl.schematype; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + import dev.metaschema.core.model.IFlagInstance; import dev.metaschema.core.model.IModelDefinition; import dev.metaschema.schemagen.SchemaGenerationException; import dev.metaschema.schemagen.xml.impl.DocumentationGenerator; import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; import dev.metaschema.schemagen.xml.impl.XmlDatatypeManager; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/AbstractXmlSimpleType.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/AbstractXmlSimpleType.java index e3519c3dbf..fcd9e4fbc2 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/AbstractXmlSimpleType.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/AbstractXmlSimpleType.java @@ -5,12 +5,11 @@ package dev.metaschema.schemagen.xml.impl.schematype; +import javax.xml.namespace.QName; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.model.IValuedDefinition; import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; - -import javax.xml.namespace.QName; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlComplexType.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlComplexType.java index 7d41569717..819df00b32 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlComplexType.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlComplexType.java @@ -8,7 +8,6 @@ import dev.metaschema.core.model.IDefinition; import dev.metaschema.schemagen.ModuleIndex.DefinitionEntry; import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlSimpleType.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlSimpleType.java index d51f647aec..8c66082b3b 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlSimpleType.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlSimpleType.java @@ -7,7 +7,6 @@ import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlType.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlType.java index f6f668d965..5531173ed2 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlType.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/IXmlType.java @@ -5,13 +5,12 @@ package dev.metaschema.schemagen.xml.impl.schematype; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.schemagen.SchemaGenerationException; -import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; - import javax.xml.XMLConstants; import javax.xml.namespace.QName; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.SchemaGenerationException; +import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; import edu.umd.cs.findbugs.annotations.NonNull; public interface IXmlType { diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeAssemblyDefinition.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeAssemblyDefinition.java index a11d13c07c..1a65870e77 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeAssemblyDefinition.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeAssemblyDefinition.java @@ -5,6 +5,11 @@ package dev.metaschema.schemagen.xml.impl.schematype; +import java.util.Collection; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + import dev.metaschema.core.datatype.markup.MarkupDataTypeProvider; import dev.metaschema.core.model.IAssemblyDefinition; import dev.metaschema.core.model.IChoiceGroupInstance; @@ -21,12 +26,6 @@ import dev.metaschema.schemagen.xml.impl.DocumentationGenerator; import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; import dev.metaschema.schemagen.xml.impl.XmlDatatypeManager; - -import java.util.Collection; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeFieldDefinition.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeFieldDefinition.java index ec3e7419e9..1ed2c95916 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeFieldDefinition.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeFieldDefinition.java @@ -5,15 +5,14 @@ package dev.metaschema.schemagen.xml.impl.schematype; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + import dev.metaschema.core.datatype.IDataTypeAdapter; import dev.metaschema.core.model.IFieldDefinition; import dev.metaschema.core.model.IFlagInstance; import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; import dev.metaschema.schemagen.xml.impl.XmlDatatypeManager; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeReference.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeReference.java index 75edab9ad6..28b7bd5dd5 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeReference.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeReference.java @@ -5,11 +5,10 @@ package dev.metaschema.schemagen.xml.impl.schematype; -import dev.metaschema.core.datatype.IDataTypeAdapter; -import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; - import javax.xml.namespace.QName; +import dev.metaschema.core.datatype.IDataTypeAdapter; +import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeRestriction.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeRestriction.java index 2e236cb273..226950f25c 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeRestriction.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeRestriction.java @@ -5,6 +5,11 @@ package dev.metaschema.schemagen.xml.impl.schematype; +import org.codehaus.stax2.XMLStreamWriter2; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + import dev.metaschema.core.datatype.markup.MarkupLine; import dev.metaschema.core.model.IValuedDefinition; import dev.metaschema.core.model.constraint.IAllowedValue; @@ -13,12 +18,6 @@ import dev.metaschema.schemagen.SchemaGenerationException; import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; import dev.metaschema.schemagen.xml.impl.XmlDatatypeManager; - -import org.codehaus.stax2.XMLStreamWriter2; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; - import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeUnion.java b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeUnion.java index 7a0c795f6f..e6c149d765 100644 --- a/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeUnion.java +++ b/schemagen/src/main/java/dev/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeUnion.java @@ -5,13 +5,6 @@ package dev.metaschema.schemagen.xml.impl.schematype; -import dev.metaschema.core.model.IValuedDefinition; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.schemagen.SchemaGenerationException; -import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; -import dev.metaschema.schemagen.xml.impl.XmlDatatypeManager; - import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; @@ -19,6 +12,12 @@ import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; +import dev.metaschema.core.model.IValuedDefinition; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.schemagen.SchemaGenerationException; +import dev.metaschema.schemagen.xml.impl.IXmlGenerationState; +import dev.metaschema.schemagen.xml.impl.XmlDatatypeManager; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/test/java/dev/metaschema/schemagen/AbstractSchemaGeneratorTestSuite.java b/schemagen/src/test/java/dev/metaschema/schemagen/AbstractSchemaGeneratorTestSuite.java index f5a29cf0d4..56e8b6fe36 100644 --- a/schemagen/src/test/java/dev/metaschema/schemagen/AbstractSchemaGeneratorTestSuite.java +++ b/schemagen/src/test/java/dev/metaschema/schemagen/AbstractSchemaGeneratorTestSuite.java @@ -8,24 +8,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.core.configuration.DefaultConfiguration; -import dev.metaschema.core.configuration.IConfiguration; -import dev.metaschema.core.configuration.IMutableConfiguration; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.model.MetaschemaException; -import dev.metaschema.core.model.MetaschemaModelConstants; -import dev.metaschema.core.model.constraint.IConstraintSet; -import dev.metaschema.core.model.validation.JsonSchemaContentValidator; -import dev.metaschema.core.model.validation.XmlSchemaContentValidator; -import dev.metaschema.core.util.CollectionUtil; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.io.Format; -import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; -import dev.metaschema.model.testing.AbstractTestSuite; -import dev.metaschema.schemagen.json.JsonSchemaGenerator; -import dev.metaschema.schemagen.xml.XmlSchemaGenerator; - import org.junit.platform.commons.JUnitException; import java.io.IOException; @@ -46,6 +28,23 @@ import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.MetaschemaModelConstants; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.model.testing.AbstractTestSuite; +import dev.metaschema.schemagen.json.JsonSchemaGenerator; +import dev.metaschema.schemagen.xml.XmlSchemaGenerator; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/schemagen/src/test/java/dev/metaschema/schemagen/JsonSuiteTest.java b/schemagen/src/test/java/dev/metaschema/schemagen/JsonSuiteTest.java index 0ae99a6b83..d34a311cb0 100644 --- a/schemagen/src/test/java/dev/metaschema/schemagen/JsonSuiteTest.java +++ b/schemagen/src/test/java/dev/metaschema/schemagen/JsonSuiteTest.java @@ -5,17 +5,6 @@ package dev.metaschema.schemagen; -import dev.metaschema.core.configuration.DefaultConfiguration; -import dev.metaschema.core.configuration.IMutableConfiguration; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.model.MetaschemaException; -import dev.metaschema.core.model.validation.IContentValidator; -import dev.metaschema.core.model.validation.JsonSchemaContentValidator; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.io.Format; -import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; -import dev.metaschema.schemagen.json.JsonSchemaGenerator; - import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DynamicNode; @@ -35,6 +24,17 @@ import java.util.function.Supplier; import java.util.stream.Stream; +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.validation.IContentValidator; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.schemagen.json.JsonSchemaGenerator; + class JsonSuiteTest extends AbstractSchemaGeneratorTestSuite { diff --git a/schemagen/src/test/java/dev/metaschema/schemagen/MetaschemaModuleTest.java b/schemagen/src/test/java/dev/metaschema/schemagen/MetaschemaModuleTest.java index 4fe307e800..30dd8f8dcd 100644 --- a/schemagen/src/test/java/dev/metaschema/schemagen/MetaschemaModuleTest.java +++ b/schemagen/src/test/java/dev/metaschema/schemagen/MetaschemaModuleTest.java @@ -5,16 +5,6 @@ package dev.metaschema.schemagen; -import dev.metaschema.core.configuration.DefaultConfiguration; -import dev.metaschema.core.configuration.IMutableConfiguration; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.model.MetaschemaException; -import dev.metaschema.core.util.ObjectUtils; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; -import dev.metaschema.schemagen.json.JsonSchemaGenerator; -import dev.metaschema.schemagen.xml.XmlSchemaGenerator; - import org.junit.jupiter.api.Test; import java.io.IOException; @@ -25,6 +15,15 @@ import java.nio.file.Paths; import java.nio.file.StandardOpenOption; +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.schemagen.json.JsonSchemaGenerator; +import dev.metaschema.schemagen.xml.XmlSchemaGenerator; import edu.umd.cs.findbugs.annotations.NonNull; class MetaschemaModuleTest { diff --git a/schemagen/src/test/java/dev/metaschema/schemagen/XmlSuiteTest.java b/schemagen/src/test/java/dev/metaschema/schemagen/XmlSuiteTest.java index d8d6930c7c..1f9ac582b1 100644 --- a/schemagen/src/test/java/dev/metaschema/schemagen/XmlSuiteTest.java +++ b/schemagen/src/test/java/dev/metaschema/schemagen/XmlSuiteTest.java @@ -7,17 +7,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.core.configuration.DefaultConfiguration; -import dev.metaschema.core.configuration.IMutableConfiguration; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.model.MetaschemaException; -import dev.metaschema.core.model.validation.IContentValidator; -import dev.metaschema.core.model.validation.XmlSchemaContentValidator; -import dev.metaschema.databind.IBindingContext; -import dev.metaschema.databind.io.Format; -import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; -import dev.metaschema.schemagen.xml.XmlSchemaGenerator; - import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DynamicNode; @@ -51,6 +40,17 @@ import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; +import dev.metaschema.core.configuration.DefaultConfiguration; +import dev.metaschema.core.configuration.IMutableConfiguration; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.validation.IContentValidator; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.model.metaschema.IBindingModuleLoader; +import dev.metaschema.schemagen.xml.XmlSchemaGenerator; + class XmlSuiteTest extends AbstractSchemaGeneratorTestSuite { // private static final XmlSchemaContentValidator SCHEMA_VALIDATOR; diff --git a/schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/DomDatatypeContentTest.java b/schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/DomDatatypeContentTest.java index e340bdbc09..8b8f20a809 100644 --- a/schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/DomDatatypeContentTest.java +++ b/schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/DomDatatypeContentTest.java @@ -10,8 +10,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.core.util.CollectionUtil; - import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -27,6 +25,8 @@ import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamWriter; +import dev.metaschema.core.util.CollectionUtil; + /** * Tests for DomDatatypeContent which writes DOM elements to XMLStreamWriter. */ diff --git a/schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/XmlSchemaLoaderTest.java b/schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/XmlSchemaLoaderTest.java index 3b5265a0d3..5f61b88b79 100644 --- a/schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/XmlSchemaLoaderTest.java +++ b/schemagen/src/test/java/dev/metaschema/schemagen/xml/impl/XmlSchemaLoaderTest.java @@ -10,9 +10,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import dev.metaschema.core.model.IModule; -import dev.metaschema.core.util.CollectionUtil; - import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -26,6 +23,9 @@ import java.util.Map; import java.util.stream.Collectors; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.util.CollectionUtil; + /** * Tests for the standard DOM/XPath-based XML schema loading functionality. *