diff --git a/README.md b/README.md index 7fe81e44..01ff85ef 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ In addition, several game modes are supported, including modes that require play Finally, `darts` can provide output in several formats: easily readable Markdown tables, HTML tables for web pages and JSON objects for computer processing. Currently, `darts` is available as a Java-based command-line application. -More information about the installation and use of this app can be found in the [Java command-line toolbox](cli/java) readme. +More information about the installation and use of this app can be found in the [Java command-line toolbox](cli/java-darts-cli) readme. If you are interested in checking out those checkout tables, refer to the [Markdown checkout tables](tables/md). ## License diff --git a/cli/README.md b/cli/README.md index 3de847b3..82f78228 100644 --- a/cli/README.md +++ b/cli/README.md @@ -10,7 +10,7 @@ This part of the [darts](https://github.com/mauritssilvis/darts) project provide Currently, command-line interfaces are available in the following languages: -- [Java](java) +- [Java](java-darts-cli) ## License diff --git a/cli/java/.gitignore b/cli/java-darts-cli/.gitignore similarity index 100% rename from cli/java/.gitignore rename to cli/java-darts-cli/.gitignore diff --git a/cli/java/.idea/.gitignore b/cli/java-darts-cli/.idea/.gitignore similarity index 100% rename from cli/java/.idea/.gitignore rename to cli/java-darts-cli/.idea/.gitignore diff --git a/cli/java/.idea/codeStyles/Project.xml b/cli/java-darts-cli/.idea/codeStyles/Project.xml similarity index 100% rename from cli/java/.idea/codeStyles/Project.xml rename to cli/java-darts-cli/.idea/codeStyles/Project.xml diff --git a/cli/java/.idea/codeStyles/codeStyleConfig.xml b/cli/java-darts-cli/.idea/codeStyles/codeStyleConfig.xml similarity index 100% rename from cli/java/.idea/codeStyles/codeStyleConfig.xml rename to cli/java-darts-cli/.idea/codeStyles/codeStyleConfig.xml diff --git a/cli/java/.idea/copyright/GNU_GPL_v3.xml b/cli/java-darts-cli/.idea/copyright/GNU_GPL_v3.xml similarity index 100% rename from cli/java/.idea/copyright/GNU_GPL_v3.xml rename to cli/java-darts-cli/.idea/copyright/GNU_GPL_v3.xml diff --git a/cli/java/.idea/copyright/profiles_settings.xml b/cli/java-darts-cli/.idea/copyright/profiles_settings.xml similarity index 100% rename from cli/java/.idea/copyright/profiles_settings.xml rename to cli/java-darts-cli/.idea/copyright/profiles_settings.xml diff --git a/cli/java/.idea/inspectionProfiles/All.xml b/cli/java-darts-cli/.idea/inspectionProfiles/All.xml similarity index 100% rename from cli/java/.idea/inspectionProfiles/All.xml rename to cli/java-darts-cli/.idea/inspectionProfiles/All.xml diff --git a/cli/java/.idea/inspectionProfiles/Default.xml b/cli/java-darts-cli/.idea/inspectionProfiles/Default.xml similarity index 100% rename from cli/java/.idea/inspectionProfiles/Default.xml rename to cli/java-darts-cli/.idea/inspectionProfiles/Default.xml diff --git a/cli/java/.idea/inspectionProfiles/Selected.xml b/cli/java-darts-cli/.idea/inspectionProfiles/Selected.xml similarity index 100% rename from cli/java/.idea/inspectionProfiles/Selected.xml rename to cli/java-darts-cli/.idea/inspectionProfiles/Selected.xml diff --git a/cli/java/.idea/inspectionProfiles/profiles_settings.xml b/cli/java-darts-cli/.idea/inspectionProfiles/profiles_settings.xml similarity index 100% rename from cli/java/.idea/inspectionProfiles/profiles_settings.xml rename to cli/java-darts-cli/.idea/inspectionProfiles/profiles_settings.xml diff --git a/cli/java/.idea/misc.xml b/cli/java-darts-cli/.idea/misc.xml similarity index 100% rename from cli/java/.idea/misc.xml rename to cli/java-darts-cli/.idea/misc.xml diff --git a/cli/java/.idea/runConfigurations/Tests_in__java_darts_cli_test_.xml b/cli/java-darts-cli/.idea/runConfigurations/Tests_in__java_darts_cli_test_.xml similarity index 100% rename from cli/java/.idea/runConfigurations/Tests_in__java_darts_cli_test_.xml rename to cli/java-darts-cli/.idea/runConfigurations/Tests_in__java_darts_cli_test_.xml diff --git a/cli/java/.idea/vcs.xml b/cli/java-darts-cli/.idea/vcs.xml similarity index 100% rename from cli/java/.idea/vcs.xml rename to cli/java-darts-cli/.idea/vcs.xml diff --git a/cli/java/CHANGELOG.md b/cli/java-darts-cli/CHANGELOG.md similarity index 92% rename from cli/java/CHANGELOG.md rename to cli/java-darts-cli/CHANGELOG.md index d126e579..9f61b70e 100644 --- a/cli/java/CHANGELOG.md +++ b/cli/java-darts-cli/CHANGELOG.md @@ -5,6 +5,18 @@ All notable changes to the `java-darts-cli` project (see [darts](https://github. The file format is based on [keep a changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [semantic versioning](https://semver.org/spec/v2.0.0.html). +## [0.4.0] - 2023-03-18 + +### Changed + +#### Command-line interface + +- Load the version from the project manifest file. + +#### General + +- Split the code in CLI, API and core packages. + ## [0.3.0] - 2023-03-17 ### Added @@ -17,14 +29,14 @@ and this project adheres to [semantic versioning](https://semver.org/spec/v2.0.0 ### Changed -#### Documentation - -- Document changes in the usage of `darts`. - #### Installation - Change the `darts` installation location. +#### Documentation + +- Document changes in the usage of `darts`. + #### Dependencies - Update the Gradle version to 8.0.2. @@ -45,7 +57,7 @@ and this project adheres to [semantic versioning](https://semver.org/spec/v2.0.0 - Describe the installation of `darts`. - Document the usage of the `darts` command-line interface. -- Document potential problems with the installation or usage of `darts`. +- Document potential problems with the installation and usage of `darts`. #### Installation diff --git a/cli/java/LICENSE.md b/cli/java-darts-cli/LICENSE.md similarity index 100% rename from cli/java/LICENSE.md rename to cli/java-darts-cli/LICENSE.md diff --git a/cli/java/README.md b/cli/java-darts-cli/README.md similarity index 99% rename from cli/java/README.md rename to cli/java-darts-cli/README.md index 3827f571..1777033c 100644 --- a/cli/java/README.md +++ b/cli/java-darts-cli/README.md @@ -1,4 +1,4 @@ -# darts > CLI > Java +# java-darts-cli > A Java-based command-line toolbox aimed at the game of darts @@ -50,7 +50,7 @@ You can then install the `darts` toolbox as follows: - Navigate to the folder containing the `darts` installation scripts, `install` and `install.bat`. - If you downloaded the latest `java-darts-cli` release, these scripts can be found in the extracted folder. - - If you downloaded the full `darts` code, these scripts can be found in the `cli/java` folder of that code. + - If you downloaded the full `darts` code, these scripts can be found in the `cli/java-darts-cli` folder of that code. - Run the `install` command to install `darts` in the `bin` folder. - Navigate to the newly created `bin` folder. - Test the execution of the `darts` toolbox by running the `darts` command. @@ -843,7 +843,7 @@ To solve these problems, take the following steps: - Ensure you navigated to the folder containing the `darts` installation scripts, `install` and `install.bat`. - If you downloaded the latest `java-darts-cli` release, these scripts can be found in the extracted folder. - - If you downloaded the full `darts` code, these scripts can be found in the `cli/java` folder of that code. + - If you downloaded the full `darts` code, these scripts can be found in the `cli/java-darts-cli` folder of that code. - Prefix the `install` command with `./` (Bash) or `.\` (PowerShell) before execution. #### 3.1.2 Java was not installed or found @@ -928,7 +928,7 @@ To solve these problems, take the following steps: - Install `darts` by following the [installation instructions](#1-installation). - Ensure you navigated to the folder containing the `darts` installation scripts, `install` and `install.bat`. - If you downloaded the latest `java-darts-cli` release, these scripts can be found in the extracted folder. - - If you downloaded the full `darts` code, these scripts can be found in the `cli/java` folder of that code. + - If you downloaded the full `darts` code, these scripts can be found in the `cli/java-darts-cli` folder of that code. - Navigate to the `bin` folder. - Prefix the `darts` command with `./` (Bash) or `.\` (PowerShell) before execution. diff --git a/cli/java/build.gradle.kts b/cli/java-darts-cli/build.gradle.kts similarity index 88% rename from cli/java/build.gradle.kts rename to cli/java-darts-cli/build.gradle.kts index 4ef3052b..390c9638 100644 --- a/cli/java/build.gradle.kts +++ b/cli/java-darts-cli/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } group = "nl.mauritssilvis.darts.java" -version = "0.3.0" +version = "0.4.0" repositories { mavenCentral() @@ -79,6 +79,13 @@ publishing { } } } + + repositories { + maven { + name = "buildFolder" + url = uri(layout.buildDirectory.dir("repo")) + } + } } nexusPublishing { @@ -107,7 +114,11 @@ tasks { jar { manifest { - attributes("Main-Class" to "nl.mauritssilvis.darts.java.cli.DartsApp") + attributes( + "Implementation-Title" to project.name, + "Implementation-Version" to project.version, + "Main-Class" to "nl.mauritssilvis.darts.java.cli.DartsApp" + ) } } diff --git a/cli/java/gradle/wrapper/gradle-wrapper.jar b/cli/java-darts-cli/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from cli/java/gradle/wrapper/gradle-wrapper.jar rename to cli/java-darts-cli/gradle/wrapper/gradle-wrapper.jar diff --git a/cli/java/gradle/wrapper/gradle-wrapper.properties b/cli/java-darts-cli/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from cli/java/gradle/wrapper/gradle-wrapper.properties rename to cli/java-darts-cli/gradle/wrapper/gradle-wrapper.properties diff --git a/cli/java/gradlew b/cli/java-darts-cli/gradlew similarity index 100% rename from cli/java/gradlew rename to cli/java-darts-cli/gradlew diff --git a/cli/java/gradlew.bat b/cli/java-darts-cli/gradlew.bat similarity index 100% rename from cli/java/gradlew.bat rename to cli/java-darts-cli/gradlew.bat diff --git a/cli/java/install b/cli/java-darts-cli/install similarity index 100% rename from cli/java/install rename to cli/java-darts-cli/install diff --git a/cli/java/install.bat b/cli/java-darts-cli/install.bat similarity index 100% rename from cli/java/install.bat rename to cli/java-darts-cli/install.bat diff --git a/cli/java/settings.gradle.kts b/cli/java-darts-cli/settings.gradle.kts similarity index 100% rename from cli/java/settings.gradle.kts rename to cli/java-darts-cli/settings.gradle.kts diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/Board.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/boards/Board.java similarity index 91% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/Board.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/boards/Board.java index f391b67a..06f82c22 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/Board.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/boards/Board.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards; +package nl.mauritssilvis.darts.java.api.boards; import java.util.List; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/Field.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/boards/Field.java similarity index 93% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/Field.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/boards/Field.java index 706ca498..fb52840e 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/Field.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/boards/Field.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards; +package nl.mauritssilvis.darts.java.api.boards; /** * A dartboard field with a type, a name and a score. diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/FieldType.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/boards/FieldType.java similarity index 90% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/FieldType.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/boards/FieldType.java index 9d891f90..811833a6 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/FieldType.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/boards/FieldType.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards; +package nl.mauritssilvis.darts.java.api.boards; import lombok.ToString; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/Checkout.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/finders/checkouts/Checkout.java similarity index 96% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/Checkout.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/finders/checkouts/Checkout.java index 1007e14b..256fd6d7 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/Checkout.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/finders/checkouts/Checkout.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts; +package nl.mauritssilvis.darts.java.api.finders.checkouts; import java.util.List; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/CheckoutFinder.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/finders/checkouts/CheckoutFinder.java similarity index 92% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/CheckoutFinder.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/finders/checkouts/CheckoutFinder.java index 51172f50..841ff7cb 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/CheckoutFinder.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/finders/checkouts/CheckoutFinder.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts; +package nl.mauritssilvis.darts.java.api.finders.checkouts; import java.util.List; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/Throw.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/finders/checkouts/Throw.java similarity index 86% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/Throw.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/finders/checkouts/Throw.java index a2d60189..53bcfd9e 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/Throw.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/finders/checkouts/Throw.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts; +package nl.mauritssilvis.darts.java.api.finders.checkouts; -import nl.mauritssilvis.darts.java.boards.Field; +import nl.mauritssilvis.darts.java.api.boards.Field; import java.util.List; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/Path.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/finders/paths/Path.java similarity index 96% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/Path.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/finders/paths/Path.java index 6bc2725f..d90cc952 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/Path.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/finders/paths/Path.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths; +package nl.mauritssilvis.darts.java.api.finders.paths; import java.util.List; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/Pathfinder.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/finders/paths/Pathfinder.java similarity index 92% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/Pathfinder.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/finders/paths/Pathfinder.java index dd311558..198cf1a5 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/Pathfinder.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/finders/paths/Pathfinder.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths; +package nl.mauritssilvis.darts.java.api.finders.paths; import java.util.List; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/output/Formatter.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/output/Formatter.java similarity index 93% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/output/Formatter.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/output/Formatter.java index a7ae414f..a256610b 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/output/Formatter.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/output/Formatter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.output; +package nl.mauritssilvis.darts.java.api.output; /** * A string formatter. diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/output/Serializer.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/output/Serializer.java similarity index 94% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/output/Serializer.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/output/Serializer.java index c6038543..02150731 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/output/Serializer.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/output/Serializer.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.output; +package nl.mauritssilvis.darts.java.api.output; /** * A serializer. diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/BoardType.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/BoardType.java similarity index 88% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/BoardType.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/BoardType.java index edfaaa3a..f1c67632 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/BoardType.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/BoardType.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.settings; +package nl.mauritssilvis.darts.java.api.settings; import lombok.ToString; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/CheckMode.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/CheckMode.java similarity index 89% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/CheckMode.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/CheckMode.java index edd238f2..e9ca078b 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/CheckMode.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/CheckMode.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.settings; +package nl.mauritssilvis.darts.java.api.settings; import lombok.ToString; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/FinderType.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/FinderType.java similarity index 88% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/FinderType.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/FinderType.java index 79079c41..d470b735 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/FinderType.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/FinderType.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.settings; +package nl.mauritssilvis.darts.java.api.settings; import lombok.ToString; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/OutputFormat.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/OutputFormat.java similarity index 89% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/OutputFormat.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/OutputFormat.java index c753b58d..fff36428 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/OutputFormat.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/OutputFormat.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.settings; +package nl.mauritssilvis.darts.java.api.settings; import lombok.ToString; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/Settings.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/Settings.java similarity index 96% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/Settings.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/Settings.java index 36d1400b..a29f24a6 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/Settings.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/Settings.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.settings; +package nl.mauritssilvis.darts.java.api.settings; /** * Checkout table settings. diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/SettingsBuilder.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/SettingsBuilder.java similarity index 97% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/SettingsBuilder.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/SettingsBuilder.java index 48913360..777b22f7 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/SettingsBuilder.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/SettingsBuilder.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.settings; +package nl.mauritssilvis.darts.java.api.settings; /** * A checkout table settings builder. diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/TableType.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/TableType.java similarity index 85% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/TableType.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/TableType.java index 8fada6da..7d4c2c30 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/TableType.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/TableType.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.settings; +package nl.mauritssilvis.darts.java.api.settings; import lombok.ToString; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/ThrowMode.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/ThrowMode.java similarity index 89% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/ThrowMode.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/ThrowMode.java index 1aac548f..60aaca1c 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/ThrowMode.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/settings/ThrowMode.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.settings; +package nl.mauritssilvis.darts.java.api.settings; import lombok.ToString; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/Table.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/tables/Table.java similarity index 79% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/Table.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/tables/Table.java index 0f95a5cb..d00f4a3b 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/Table.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/tables/Table.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables; +package nl.mauritssilvis.darts.java.api.tables; -import nl.mauritssilvis.darts.java.finders.checkouts.Checkout; -import nl.mauritssilvis.darts.java.settings.Settings; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Checkout; +import nl.mauritssilvis.darts.java.api.settings.Settings; import java.util.List; import java.util.Map; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/TableGenerator.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/tables/TableGenerator.java similarity index 94% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/TableGenerator.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/tables/TableGenerator.java index d6ae5e0c..ecac6dfd 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/TableGenerator.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/api/tables/TableGenerator.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables; +package nl.mauritssilvis.darts.java.api.tables; /** * A checkout table generator. diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/cli/App.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/cli/App.java similarity index 100% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/cli/App.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/cli/App.java diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/cli/BoardsCommand.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/cli/BoardsCommand.java similarity index 84% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/cli/BoardsCommand.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/cli/BoardsCommand.java index 988df8e3..8d0c6e3c 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/cli/BoardsCommand.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/cli/BoardsCommand.java @@ -6,12 +6,12 @@ package nl.mauritssilvis.darts.java.cli; import lombok.ToString; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.boards.output.BoardSerializerFactory; -import nl.mauritssilvis.darts.java.boards.types.BoardFactory; -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.settings.BoardType; -import nl.mauritssilvis.darts.java.settings.OutputFormat; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.api.settings.BoardType; +import nl.mauritssilvis.darts.java.api.settings.OutputFormat; +import nl.mauritssilvis.darts.java.core.boards.BoardFactory; +import nl.mauritssilvis.darts.java.core.boards.output.BoardSerializerFactory; import picocli.CommandLine.Command; import picocli.CommandLine.Model.CommandSpec; import picocli.CommandLine.Option; @@ -44,7 +44,7 @@ showDefaultValues = true, footerHeading = "%n", footer = { - "Online documentation: https://github.com/mauritssilvis/darts/tree/main/cli/java", + "Online documentation: https://github.com/mauritssilvis/darts/tree/main/cli/java-darts-cli", "", "Copyright © 2023 Maurits Silvis", "SPDX-License-Identifier: GPL-3.0-or-later" diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/cli/CheckoutsCommand.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/cli/CheckoutsCommand.java similarity index 92% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/cli/CheckoutsCommand.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/cli/CheckoutsCommand.java index 70f5461e..8e29aa47 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/cli/CheckoutsCommand.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/cli/CheckoutsCommand.java @@ -6,13 +6,13 @@ package nl.mauritssilvis.darts.java.cli; import lombok.ToString; -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.settings.*; -import nl.mauritssilvis.darts.java.settings.types.TableSettingsBuilder; -import nl.mauritssilvis.darts.java.tables.Table; -import nl.mauritssilvis.darts.java.tables.TableGenerator; -import nl.mauritssilvis.darts.java.tables.output.TableSerializerFactory; -import nl.mauritssilvis.darts.java.tables.types.TableGeneratorFactory; +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.api.settings.*; +import nl.mauritssilvis.darts.java.api.tables.Table; +import nl.mauritssilvis.darts.java.api.tables.TableGenerator; +import nl.mauritssilvis.darts.java.core.settings.TableSettingsBuilder; +import nl.mauritssilvis.darts.java.core.tables.TableGeneratorFactory; +import nl.mauritssilvis.darts.java.core.tables.output.TableSerializerFactory; import picocli.CommandLine; import picocli.CommandLine.*; import picocli.CommandLine.Model.CommandSpec; @@ -47,7 +47,7 @@ showDefaultValues = true, footerHeading = "%n", footer = { - "Online documentation: https://github.com/mauritssilvis/darts/tree/main/cli/java", + "Online documentation: https://github.com/mauritssilvis/darts/tree/main/cli/java-darts-cli", "", "Copyright © 2023 Maurits Silvis", "SPDX-License-Identifier: GPL-3.0-or-later" diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/cli/DartsApp.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/cli/DartsApp.java similarity index 98% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/cli/DartsApp.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/cli/DartsApp.java index ac0d8197..fe571cfa 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/cli/DartsApp.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/cli/DartsApp.java @@ -51,7 +51,7 @@ commandListHeading = "%nCommands:%n", footerHeading = "%n", footer = { - "Online documentation: https://github.com/mauritssilvis/darts/tree/main/cli/java", + "Online documentation: https://github.com/mauritssilvis/darts/tree/main/cli/java-darts-cli", "", "Copyright © 2023 Maurits Silvis", "SPDX-License-Identifier: GPL-3.0-or-later" diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/cli/Version.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/cli/Version.java similarity index 77% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/cli/Version.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/cli/Version.java index 1342f5cd..608df717 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/cli/Version.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/cli/Version.java @@ -18,8 +18,11 @@ class Version implements IVersionProvider { @Override public String[] getVersion() { + String title = getClass().getPackage().getImplementationTitle(); + String version = getClass().getPackage().getImplementationVersion(); + return new String[]{ - "java-darts-cli 0.3.0", + title + " " + version, "Copyright © 2023 Maurits Silvis", "SPDX-License-Identifier: GPL-3.0-or-later" }; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/types/BoardFactory.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/BoardFactory.java similarity index 82% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/types/BoardFactory.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/BoardFactory.java index 2fadd44d..5f4fbc14 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/types/BoardFactory.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/BoardFactory.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.types; +package nl.mauritssilvis.darts.java.core.boards; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.settings.BoardType; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.settings.BoardType; /** * A dartboard factory. diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/types/LondonBoard.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/LondonBoard.java similarity index 91% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/types/LondonBoard.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/LondonBoard.java index 20ef50eb..088e5e96 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/types/LondonBoard.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/LondonBoard.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.types; +package nl.mauritssilvis.darts.java.core.boards; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.boards.FieldType; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.boards.FieldType; import java.util.Collections; import java.util.List; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/types/QuadroBoard.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/QuadroBoard.java similarity index 92% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/types/QuadroBoard.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/QuadroBoard.java index 954228b0..a1aece44 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/types/QuadroBoard.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/QuadroBoard.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.types; +package nl.mauritssilvis.darts.java.core.boards; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.boards.FieldType; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.boards.FieldType; import java.util.List; import java.util.stream.IntStream; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/types/TypedField.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/TypedField.java similarity index 92% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/types/TypedField.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/TypedField.java index 9c5ac4d0..b099101a 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/types/TypedField.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/TypedField.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.types; +package nl.mauritssilvis.darts.java.core.boards; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.boards.FieldType; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.boards.FieldType; /** * An implementation of the {@code Field} interface that can represent fields of diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/types/YorkshireBoard.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/YorkshireBoard.java similarity index 90% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/types/YorkshireBoard.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/YorkshireBoard.java index cb1b4298..5899f368 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/types/YorkshireBoard.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/YorkshireBoard.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.types; +package nl.mauritssilvis.darts.java.core.boards; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.boards.FieldType; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.boards.FieldType; import java.util.Collections; import java.util.List; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/output/BoardPrinter.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/output/BoardPrinter.java similarity index 96% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/output/BoardPrinter.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/output/BoardPrinter.java index c5f609b5..f486e9fe 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/output/BoardPrinter.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/output/BoardPrinter.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.output; +package nl.mauritssilvis.darts.java.core.boards.output; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.boards.FieldType; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.boards.FieldType; import java.util.*; import java.util.function.Function; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/output/BoardSerializerFactory.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/output/BoardSerializerFactory.java similarity index 80% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/output/BoardSerializerFactory.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/output/BoardSerializerFactory.java index 064fe459..d6d6f83e 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/output/BoardSerializerFactory.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/output/BoardSerializerFactory.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.output; +package nl.mauritssilvis.darts.java.core.boards.output; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.settings.OutputFormat; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.api.settings.OutputFormat; /** * A dartboard serializer factory. diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/output/HtmlBoardSerializer.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/output/HtmlBoardSerializer.java similarity index 94% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/output/HtmlBoardSerializer.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/output/HtmlBoardSerializer.java index 702cb852..0cc2552a 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/output/HtmlBoardSerializer.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/output/HtmlBoardSerializer.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.output; +package nl.mauritssilvis.darts.java.core.boards.output; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.boards.FieldType; -import nl.mauritssilvis.darts.java.output.Serializer; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.boards.FieldType; +import nl.mauritssilvis.darts.java.api.output.Serializer; import java.util.Comparator; import java.util.HashMap; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/output/JsonBoardSerializer.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/output/JsonBoardSerializer.java similarity index 89% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/output/JsonBoardSerializer.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/output/JsonBoardSerializer.java index d782434b..783c30c9 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/output/JsonBoardSerializer.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/output/JsonBoardSerializer.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.output; +package nl.mauritssilvis.darts.java.core.boards.output; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.boards.FieldType; -import nl.mauritssilvis.darts.java.output.Formatter; -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.output.types.PrettyFormatter; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.boards.FieldType; +import nl.mauritssilvis.darts.java.api.output.Formatter; +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.core.output.PrettyFormatter; import java.util.Collection; import java.util.Collections; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/output/MarkdownBoardSerializer.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/output/MarkdownBoardSerializer.java similarity index 94% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/output/MarkdownBoardSerializer.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/output/MarkdownBoardSerializer.java index 069140a2..7b63a2d6 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/output/MarkdownBoardSerializer.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/output/MarkdownBoardSerializer.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.output; +package nl.mauritssilvis.darts.java.core.boards.output; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.boards.FieldType; -import nl.mauritssilvis.darts.java.output.Serializer; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.boards.FieldType; +import nl.mauritssilvis.darts.java.api.output.Serializer; import java.util.Comparator; import java.util.HashMap; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/output/StringBoardSerializer.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/output/StringBoardSerializer.java similarity index 81% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/output/StringBoardSerializer.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/output/StringBoardSerializer.java index 0002cc7e..57e5e2a9 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/boards/output/StringBoardSerializer.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/boards/output/StringBoardSerializer.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.output; +package nl.mauritssilvis.darts.java.core.boards.output; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.output.Formatter; -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.output.types.PrettyFormatter; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.output.Formatter; +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.core.output.PrettyFormatter; import java.util.Collection; import java.util.Collections; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CartesianCheckoutFinder.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CartesianCheckoutFinder.java similarity index 87% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CartesianCheckoutFinder.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CartesianCheckoutFinder.java index d4d3d42f..ad421461 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CartesianCheckoutFinder.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CartesianCheckoutFinder.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts.types; +package nl.mauritssilvis.darts.java.core.finders.checkouts; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.finders.checkouts.Checkout; -import nl.mauritssilvis.darts.java.finders.checkouts.CheckoutFinder; -import nl.mauritssilvis.darts.java.finders.paths.Path; -import nl.mauritssilvis.darts.java.finders.paths.Pathfinder; -import nl.mauritssilvis.darts.java.finders.paths.types.Node; -import nl.mauritssilvis.darts.java.finders.paths.types.NodeFactory; -import nl.mauritssilvis.darts.java.finders.paths.types.PathfinderFactory; -import nl.mauritssilvis.darts.java.settings.FinderType; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Checkout; +import nl.mauritssilvis.darts.java.api.finders.checkouts.CheckoutFinder; +import nl.mauritssilvis.darts.java.api.finders.paths.Path; +import nl.mauritssilvis.darts.java.api.finders.paths.Pathfinder; +import nl.mauritssilvis.darts.java.api.settings.FinderType; +import nl.mauritssilvis.darts.java.core.finders.paths.Node; +import nl.mauritssilvis.darts.java.core.finders.paths.NodeFactory; +import nl.mauritssilvis.darts.java.core.finders.paths.PathfinderFactory; import java.util.*; import java.util.stream.Collectors; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CheckoutFinderFactory.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CheckoutFinderFactory.java similarity index 81% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CheckoutFinderFactory.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CheckoutFinderFactory.java index 1a952e87..a544e380 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CheckoutFinderFactory.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CheckoutFinderFactory.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts.types; +package nl.mauritssilvis.darts.java.core.finders.checkouts; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.finders.checkouts.CheckoutFinder; -import nl.mauritssilvis.darts.java.settings.FinderType; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.finders.checkouts.CheckoutFinder; +import nl.mauritssilvis.darts.java.api.settings.FinderType; import java.util.Collection; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CompoundThrow.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CompoundThrow.java similarity index 90% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CompoundThrow.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CompoundThrow.java index ff491cc8..19c4e429 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CompoundThrow.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CompoundThrow.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts.types; +package nl.mauritssilvis.darts.java.core.finders.checkouts; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.finders.checkouts.Throw; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Throw; import java.util.Collection; import java.util.List; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/DescendingCheckoutFinder.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/DescendingCheckoutFinder.java similarity index 82% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/DescendingCheckoutFinder.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/DescendingCheckoutFinder.java index b12a9e4f..87d0ccb1 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/DescendingCheckoutFinder.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/DescendingCheckoutFinder.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts.types; +package nl.mauritssilvis.darts.java.core.finders.checkouts; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.finders.checkouts.Checkout; -import nl.mauritssilvis.darts.java.finders.checkouts.CheckoutFinder; -import nl.mauritssilvis.darts.java.finders.checkouts.Throw; -import nl.mauritssilvis.darts.java.finders.paths.Path; -import nl.mauritssilvis.darts.java.finders.paths.Pathfinder; -import nl.mauritssilvis.darts.java.finders.paths.types.Node; -import nl.mauritssilvis.darts.java.finders.paths.types.NodeFactory; -import nl.mauritssilvis.darts.java.finders.paths.types.PathfinderFactory; -import nl.mauritssilvis.darts.java.settings.FinderType; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Checkout; +import nl.mauritssilvis.darts.java.api.finders.checkouts.CheckoutFinder; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Throw; +import nl.mauritssilvis.darts.java.api.finders.paths.Path; +import nl.mauritssilvis.darts.java.api.finders.paths.Pathfinder; +import nl.mauritssilvis.darts.java.api.settings.FinderType; +import nl.mauritssilvis.darts.java.core.finders.paths.Node; +import nl.mauritssilvis.darts.java.core.finders.paths.NodeFactory; +import nl.mauritssilvis.darts.java.core.finders.paths.PathfinderFactory; import java.util.*; import java.util.stream.Collectors; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/GroupedCheckout.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/GroupedCheckout.java similarity index 96% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/GroupedCheckout.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/GroupedCheckout.java index b9e957ea..c549110a 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/GroupedCheckout.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/GroupedCheckout.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts.types; +package nl.mauritssilvis.darts.java.core.finders.checkouts; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.finders.checkouts.Checkout; -import nl.mauritssilvis.darts.java.finders.checkouts.Throw; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Checkout; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Throw; import java.util.*; import java.util.function.Function; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/SimpleCheckout.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/SimpleCheckout.java similarity index 86% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/SimpleCheckout.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/SimpleCheckout.java index 6b17f25f..6ef1d185 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/SimpleCheckout.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/SimpleCheckout.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts.types; +package nl.mauritssilvis.darts.java.core.finders.checkouts; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.finders.checkouts.Checkout; -import nl.mauritssilvis.darts.java.finders.checkouts.Throw; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Checkout; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Throw; import java.util.Collection; import java.util.List; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/SimpleThrow.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/SimpleThrow.java similarity index 86% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/SimpleThrow.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/SimpleThrow.java index cf5a75f5..eec2c158 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/checkouts/types/SimpleThrow.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/checkouts/SimpleThrow.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts.types; +package nl.mauritssilvis.darts.java.core.finders.checkouts; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.finders.checkouts.Throw; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Throw; import java.util.Collections; import java.util.List; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/CartesianNode.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/CartesianNode.java similarity index 95% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/CartesianNode.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/CartesianNode.java index 8a45c16c..ff61fb27 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/CartesianNode.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/CartesianNode.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths.types; +package nl.mauritssilvis.darts.java.core.finders.paths; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/CartesianPathfinder.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/CartesianPathfinder.java similarity index 94% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/CartesianPathfinder.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/CartesianPathfinder.java index 8df28205..8dccad9e 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/CartesianPathfinder.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/CartesianPathfinder.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths.types; +package nl.mauritssilvis.darts.java.core.finders.paths; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.finders.paths.Path; -import nl.mauritssilvis.darts.java.finders.paths.Pathfinder; +import nl.mauritssilvis.darts.java.api.finders.paths.Path; +import nl.mauritssilvis.darts.java.api.finders.paths.Pathfinder; import java.util.ArrayList; import java.util.Collection; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/DescendingNode.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/DescendingNode.java similarity index 96% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/DescendingNode.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/DescendingNode.java index e6bff8c7..7bd4304f 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/DescendingNode.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/DescendingNode.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths.types; +package nl.mauritssilvis.darts.java.core.finders.paths; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/DescendingPathfinder.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/DescendingPathfinder.java similarity index 96% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/DescendingPathfinder.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/DescendingPathfinder.java index 86fa9529..365888b7 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/DescendingPathfinder.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/DescendingPathfinder.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths.types; +package nl.mauritssilvis.darts.java.core.finders.paths; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.finders.paths.Path; -import nl.mauritssilvis.darts.java.finders.paths.Pathfinder; +import nl.mauritssilvis.darts.java.api.finders.paths.Path; +import nl.mauritssilvis.darts.java.api.finders.paths.Pathfinder; import java.util.ArrayList; import java.util.Collection; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/GroupedPath.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/GroupedPath.java similarity index 97% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/GroupedPath.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/GroupedPath.java index 8c972d5b..db603a3a 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/GroupedPath.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/GroupedPath.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths.types; +package nl.mauritssilvis.darts.java.core.finders.paths; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.finders.paths.Path; +import nl.mauritssilvis.darts.java.api.finders.paths.Path; import java.util.*; import java.util.function.Function; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/Node.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/Node.java similarity index 94% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/Node.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/Node.java index 0207cc5f..6ff3d7da 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/Node.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/Node.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths.types; +package nl.mauritssilvis.darts.java.core.finders.paths; import java.util.List; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/NodeFactory.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/NodeFactory.java similarity index 88% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/NodeFactory.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/NodeFactory.java index 3fc3a330..3fcf9ddb 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/NodeFactory.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/NodeFactory.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths.types; +package nl.mauritssilvis.darts.java.core.finders.paths; -import nl.mauritssilvis.darts.java.settings.FinderType; +import nl.mauritssilvis.darts.java.api.settings.FinderType; import java.util.Collection; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/PathfinderFactory.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/PathfinderFactory.java similarity index 83% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/PathfinderFactory.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/PathfinderFactory.java index 31c5f309..f3ec23eb 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/PathfinderFactory.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/PathfinderFactory.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths.types; +package nl.mauritssilvis.darts.java.core.finders.paths; -import nl.mauritssilvis.darts.java.finders.paths.Pathfinder; -import nl.mauritssilvis.darts.java.settings.FinderType; +import nl.mauritssilvis.darts.java.api.finders.paths.Pathfinder; +import nl.mauritssilvis.darts.java.api.settings.FinderType; import java.util.Collection; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/SimplePath.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/SimplePath.java similarity index 93% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/SimplePath.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/SimplePath.java index 41f0d416..d9df3b70 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/finders/paths/types/SimplePath.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/finders/paths/SimplePath.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths.types; +package nl.mauritssilvis.darts.java.core.finders.paths; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.finders.paths.Path; +import nl.mauritssilvis.darts.java.api.finders.paths.Path; import java.util.Collection; import java.util.List; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/output/types/PrettyFormatter.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/output/PrettyFormatter.java similarity index 97% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/output/types/PrettyFormatter.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/output/PrettyFormatter.java index c2d4f13e..aca98147 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/output/types/PrettyFormatter.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/output/PrettyFormatter.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.output.types; +package nl.mauritssilvis.darts.java.core.output; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.output.Formatter; +import nl.mauritssilvis.darts.java.api.output.Formatter; import java.util.ArrayDeque; import java.util.Collection; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/types/TableSettings.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/settings/TableSettings.java similarity index 96% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/types/TableSettings.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/settings/TableSettings.java index 1f75f867..528a2f36 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/types/TableSettings.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/settings/TableSettings.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.settings.types; +package nl.mauritssilvis.darts.java.core.settings; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.settings.*; +import nl.mauritssilvis.darts.java.api.settings.*; /** * An implementation of the {@code Settings} interface that stores checkout diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/types/TableSettingsBuilder.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/settings/TableSettingsBuilder.java similarity index 95% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/types/TableSettingsBuilder.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/settings/TableSettingsBuilder.java index 4526b4c5..0e03c20f 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/settings/types/TableSettingsBuilder.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/settings/TableSettingsBuilder.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.settings.types; +package nl.mauritssilvis.darts.java.core.settings; import lombok.ToString; -import nl.mauritssilvis.darts.java.settings.*; +import nl.mauritssilvis.darts.java.api.settings.*; /** * An implementation of the {@code SettingsBuilder} interface that builds diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/types/AscendingTable.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/AscendingTable.java similarity index 91% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/types/AscendingTable.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/AscendingTable.java index 58b72a2c..18eb3d6a 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/types/AscendingTable.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/AscendingTable.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables.types; +package nl.mauritssilvis.darts.java.core.tables; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.finders.checkouts.Checkout; -import nl.mauritssilvis.darts.java.settings.Settings; -import nl.mauritssilvis.darts.java.tables.Table; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Checkout; +import nl.mauritssilvis.darts.java.api.settings.Settings; +import nl.mauritssilvis.darts.java.api.tables.Table; import java.util.*; import java.util.stream.Collectors; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/types/AscendingTableGenerator.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/AscendingTableGenerator.java similarity index 92% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/types/AscendingTableGenerator.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/AscendingTableGenerator.java index a9ffb7f0..2044448f 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/types/AscendingTableGenerator.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/AscendingTableGenerator.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables.types; +package nl.mauritssilvis.darts.java.core.tables; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.boards.FieldType; -import nl.mauritssilvis.darts.java.boards.types.BoardFactory; -import nl.mauritssilvis.darts.java.finders.checkouts.Checkout; -import nl.mauritssilvis.darts.java.finders.checkouts.CheckoutFinder; -import nl.mauritssilvis.darts.java.finders.checkouts.types.CheckoutFinderFactory; -import nl.mauritssilvis.darts.java.settings.*; -import nl.mauritssilvis.darts.java.tables.Table; -import nl.mauritssilvis.darts.java.tables.TableGenerator; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.boards.FieldType; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Checkout; +import nl.mauritssilvis.darts.java.api.finders.checkouts.CheckoutFinder; +import nl.mauritssilvis.darts.java.api.settings.*; +import nl.mauritssilvis.darts.java.api.tables.Table; +import nl.mauritssilvis.darts.java.api.tables.TableGenerator; +import nl.mauritssilvis.darts.java.core.boards.BoardFactory; +import nl.mauritssilvis.darts.java.core.finders.checkouts.CheckoutFinderFactory; import java.util.*; import java.util.stream.IntStream; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/types/TableGeneratorFactory.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/TableGeneratorFactory.java similarity index 79% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/types/TableGeneratorFactory.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/TableGeneratorFactory.java index 72ff3fe3..5f256b4e 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/types/TableGeneratorFactory.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/TableGeneratorFactory.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables.types; +package nl.mauritssilvis.darts.java.core.tables; -import nl.mauritssilvis.darts.java.settings.Settings; -import nl.mauritssilvis.darts.java.settings.TableType; -import nl.mauritssilvis.darts.java.tables.TableGenerator; +import nl.mauritssilvis.darts.java.api.settings.Settings; +import nl.mauritssilvis.darts.java.api.settings.TableType; +import nl.mauritssilvis.darts.java.api.tables.TableGenerator; /** * A checkout table generator factory. diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/output/HtmlTableSerializer.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/output/HtmlTableSerializer.java similarity index 97% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/output/HtmlTableSerializer.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/output/HtmlTableSerializer.java index 3c6e7523..532ff939 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/output/HtmlTableSerializer.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/output/HtmlTableSerializer.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables.output; +package nl.mauritssilvis.darts.java.core.tables.output; -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.tables.Table; +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.api.tables.Table; import java.util.Locale; import java.util.stream.IntStream; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/output/JsonTableSerializer.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/output/JsonTableSerializer.java similarity index 94% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/output/JsonTableSerializer.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/output/JsonTableSerializer.java index 5086339c..fbb11250 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/output/JsonTableSerializer.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/output/JsonTableSerializer.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables.output; +package nl.mauritssilvis.darts.java.core.tables.output; -import nl.mauritssilvis.darts.java.output.Formatter; -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.output.types.PrettyFormatter; -import nl.mauritssilvis.darts.java.tables.Table; +import nl.mauritssilvis.darts.java.api.output.Formatter; +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.api.tables.Table; +import nl.mauritssilvis.darts.java.core.output.PrettyFormatter; import java.util.Collection; import java.util.Collections; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/output/MarkdownTableSerializer.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/output/MarkdownTableSerializer.java similarity index 97% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/output/MarkdownTableSerializer.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/output/MarkdownTableSerializer.java index 23a9e866..6d658c77 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/output/MarkdownTableSerializer.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/output/MarkdownTableSerializer.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables.output; +package nl.mauritssilvis.darts.java.core.tables.output; -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.tables.Table; +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.api.tables.Table; import java.util.Locale; import java.util.stream.IntStream; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/output/StringTableSerializer.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/output/StringTableSerializer.java similarity index 81% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/output/StringTableSerializer.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/output/StringTableSerializer.java index 9669be27..d5f42ddd 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/output/StringTableSerializer.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/output/StringTableSerializer.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables.output; +package nl.mauritssilvis.darts.java.core.tables.output; import lombok.EqualsAndHashCode; import lombok.ToString; -import nl.mauritssilvis.darts.java.output.Formatter; -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.output.types.PrettyFormatter; -import nl.mauritssilvis.darts.java.tables.Table; +import nl.mauritssilvis.darts.java.api.output.Formatter; +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.api.tables.Table; +import nl.mauritssilvis.darts.java.core.output.PrettyFormatter; import java.util.Collection; import java.util.Collections; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/output/TablePrinter.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/output/TablePrinter.java similarity index 97% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/output/TablePrinter.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/output/TablePrinter.java index ba1101ee..8394b8d3 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/output/TablePrinter.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/output/TablePrinter.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables.output; +package nl.mauritssilvis.darts.java.core.tables.output; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.finders.checkouts.Checkout; -import nl.mauritssilvis.darts.java.finders.checkouts.Throw; -import nl.mauritssilvis.darts.java.settings.Settings; -import nl.mauritssilvis.darts.java.tables.Table; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Checkout; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Throw; +import nl.mauritssilvis.darts.java.api.settings.Settings; +import nl.mauritssilvis.darts.java.api.tables.Table; import java.util.Collection; import java.util.List; diff --git a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/output/TableSerializerFactory.java b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/output/TableSerializerFactory.java similarity index 80% rename from cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/output/TableSerializerFactory.java rename to cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/output/TableSerializerFactory.java index d43b954c..f7f99b94 100644 --- a/cli/java/src/main/java/nl/mauritssilvis/darts/java/tables/output/TableSerializerFactory.java +++ b/cli/java-darts-cli/src/main/java/nl/mauritssilvis/darts/java/core/tables/output/TableSerializerFactory.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables.output; +package nl.mauritssilvis.darts.java.core.tables.output; -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.settings.OutputFormat; -import nl.mauritssilvis.darts.java.tables.Table; +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.api.settings.OutputFormat; +import nl.mauritssilvis.darts.java.api.tables.Table; /** * A dartboard serializer factory. diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/FieldTestUtils.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/api/boards/FieldTestUtils.java similarity index 93% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/FieldTestUtils.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/api/boards/FieldTestUtils.java index 5500a776..78f23f2f 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/FieldTestUtils.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/api/boards/FieldTestUtils.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards; +package nl.mauritssilvis.darts.java.api.boards; import java.util.Collection; import java.util.List; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/CheckoutTestUtils.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/api/finders/checkouts/CheckoutTestUtils.java similarity index 97% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/CheckoutTestUtils.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/api/finders/checkouts/CheckoutTestUtils.java index 27cd7d1b..37b42249 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/CheckoutTestUtils.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/api/finders/checkouts/CheckoutTestUtils.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts; +package nl.mauritssilvis.darts.java.api.finders.checkouts; import java.util.Collection; import java.util.List; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/ThrowTestUtils.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/api/finders/checkouts/ThrowTestUtils.java similarity index 86% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/ThrowTestUtils.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/api/finders/checkouts/ThrowTestUtils.java index ba7f34c7..000744fd 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/ThrowTestUtils.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/api/finders/checkouts/ThrowTestUtils.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts; +package nl.mauritssilvis.darts.java.api.finders.checkouts; -import nl.mauritssilvis.darts.java.boards.FieldTestUtils; +import nl.mauritssilvis.darts.java.api.boards.FieldTestUtils; import java.util.Collection; import java.util.List; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/PathTestUtils.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/api/finders/paths/PathTestUtils.java similarity index 96% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/PathTestUtils.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/api/finders/paths/PathTestUtils.java index 33d8df82..dc4d5e97 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/PathTestUtils.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/api/finders/paths/PathTestUtils.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths; +package nl.mauritssilvis.darts.java.api.finders.paths; import java.util.Collection; import java.util.List; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/TableTestUtils.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/api/tables/TableTestUtils.java similarity index 88% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/TableTestUtils.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/api/tables/TableTestUtils.java index c5691871..005559f3 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/TableTestUtils.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/api/tables/TableTestUtils.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables; +package nl.mauritssilvis.darts.java.api.tables; -import nl.mauritssilvis.darts.java.finders.checkouts.Checkout; -import nl.mauritssilvis.darts.java.finders.checkouts.CheckoutTestUtils; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Checkout; +import nl.mauritssilvis.darts.java.api.finders.checkouts.CheckoutTestUtils; import java.util.List; import java.util.Map; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/cli/BoardsCommandTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/cli/BoardsCommandTests.java similarity index 99% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/cli/BoardsCommandTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/cli/BoardsCommandTests.java index 5e117ef2..794026a2 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/cli/BoardsCommandTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/cli/BoardsCommandTests.java @@ -100,7 +100,6 @@ void getTheVersion(String arg) { String errString = err.toString(); List elements = List.of( - "java-darts-cli", "Copyright", "Maurits Silvis", "SPDX-License-Identifier: GPL-3.0-or-later" diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/cli/CheckoutsCommandTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/cli/CheckoutsCommandTests.java similarity index 99% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/cli/CheckoutsCommandTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/cli/CheckoutsCommandTests.java index ec093e53..91e2e291 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/cli/CheckoutsCommandTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/cli/CheckoutsCommandTests.java @@ -116,7 +116,6 @@ void getTheVersion(String arg) { String errString = err.toString(); List elements = List.of( - "java-darts-cli", "Copyright", "Maurits Silvis", "SPDX-License-Identifier: GPL-3.0-or-later" diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/cli/DartsAppTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/cli/DartsAppTests.java similarity index 99% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/cli/DartsAppTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/cli/DartsAppTests.java index 1498c108..996b4e88 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/cli/DartsAppTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/cli/DartsAppTests.java @@ -99,7 +99,6 @@ void getTheVersion(String arg) { String errString = err.toString(); List elements = List.of( - "java-darts-cli", "Copyright", "Maurits Silvis", "SPDX-License-Identifier: GPL-3.0-or-later" diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/types/BoardFactoryTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/BoardFactoryTests.java similarity index 83% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/types/BoardFactoryTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/BoardFactoryTests.java index 50297943..b6afab4d 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/types/BoardFactoryTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/BoardFactoryTests.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.types; +package nl.mauritssilvis.darts.java.core.boards; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.settings.BoardType; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.settings.BoardType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/types/LondonBoardTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/LondonBoardTests.java similarity index 95% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/types/LondonBoardTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/LondonBoardTests.java index ee1196a5..e59b652b 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/types/LondonBoardTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/LondonBoardTests.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.types; +package nl.mauritssilvis.darts.java.core.boards; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.boards.FieldType; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.boards.FieldType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/types/QuadroBoardTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/QuadroBoardTests.java similarity index 95% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/types/QuadroBoardTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/QuadroBoardTests.java index 76ba6e4f..05bc45fc 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/types/QuadroBoardTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/QuadroBoardTests.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.types; +package nl.mauritssilvis.darts.java.core.boards; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.boards.FieldType; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.boards.FieldType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/types/TypedFieldTestUtils.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/TypedFieldTestUtils.java similarity index 92% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/types/TypedFieldTestUtils.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/TypedFieldTestUtils.java index 18a316cf..21370317 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/types/TypedFieldTestUtils.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/TypedFieldTestUtils.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.types; +package nl.mauritssilvis.darts.java.core.boards; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.boards.FieldType; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.boards.FieldType; import java.util.Collection; import java.util.List; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/types/TypedFieldTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/TypedFieldTests.java similarity index 96% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/types/TypedFieldTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/TypedFieldTests.java index 31dc33e1..af3fd5cf 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/types/TypedFieldTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/TypedFieldTests.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.types; +package nl.mauritssilvis.darts.java.core.boards; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.boards.FieldType; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.boards.FieldType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/types/YorkshireBoardTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/YorkshireBoardTests.java similarity index 95% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/types/YorkshireBoardTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/YorkshireBoardTests.java index 1b9fdba9..965c6415 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/types/YorkshireBoardTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/YorkshireBoardTests.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.types; +package nl.mauritssilvis.darts.java.core.boards; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.boards.FieldType; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.boards.FieldType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/output/BoardSerializerFactoryTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/output/BoardSerializerFactoryTests.java similarity index 84% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/output/BoardSerializerFactoryTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/output/BoardSerializerFactoryTests.java index 1b4bcdc3..614425f7 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/output/BoardSerializerFactoryTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/output/BoardSerializerFactoryTests.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.output; +package nl.mauritssilvis.darts.java.core.boards.output; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.settings.OutputFormat; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.api.settings.OutputFormat; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/output/HtmlBoardSerializerTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/output/HtmlBoardSerializerTests.java similarity index 89% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/output/HtmlBoardSerializerTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/output/HtmlBoardSerializerTests.java index 44134bb5..836141cb 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/output/HtmlBoardSerializerTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/output/HtmlBoardSerializerTests.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.output; +package nl.mauritssilvis.darts.java.core.boards.output; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.boards.types.BoardFactory; -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.settings.BoardType; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.api.settings.BoardType; +import nl.mauritssilvis.darts.java.core.boards.BoardFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/output/JsonBoardSerializerTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/output/JsonBoardSerializerTests.java similarity index 90% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/output/JsonBoardSerializerTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/output/JsonBoardSerializerTests.java index 080b588c..4d496eb0 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/output/JsonBoardSerializerTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/output/JsonBoardSerializerTests.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.output; +package nl.mauritssilvis.darts.java.core.boards.output; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.boards.types.BoardFactory; -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.settings.BoardType; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.api.settings.BoardType; +import nl.mauritssilvis.darts.java.core.boards.BoardFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/output/MarkdownBoardSerializerTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/output/MarkdownBoardSerializerTests.java similarity index 87% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/output/MarkdownBoardSerializerTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/output/MarkdownBoardSerializerTests.java index d455aa3e..65c55d3b 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/output/MarkdownBoardSerializerTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/output/MarkdownBoardSerializerTests.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.output; +package nl.mauritssilvis.darts.java.core.boards.output; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.boards.types.BoardFactory; -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.settings.BoardType; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.api.settings.BoardType; +import nl.mauritssilvis.darts.java.core.boards.BoardFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/output/StringBoardSerializerTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/output/StringBoardSerializerTests.java similarity index 89% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/output/StringBoardSerializerTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/output/StringBoardSerializerTests.java index c7970dd3..60898898 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/boards/output/StringBoardSerializerTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/boards/output/StringBoardSerializerTests.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.boards.output; +package nl.mauritssilvis.darts.java.core.boards.output; -import nl.mauritssilvis.darts.java.boards.Board; -import nl.mauritssilvis.darts.java.boards.types.BoardFactory; -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.settings.BoardType; +import nl.mauritssilvis.darts.java.api.boards.Board; +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.api.settings.BoardType; +import nl.mauritssilvis.darts.java.core.boards.BoardFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CartesianCheckoutFinderTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CartesianCheckoutFinderTests.java similarity index 98% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CartesianCheckoutFinderTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CartesianCheckoutFinderTests.java index 396df373..025d68df 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CartesianCheckoutFinderTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CartesianCheckoutFinderTests.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts.types; +package nl.mauritssilvis.darts.java.core.finders.checkouts; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.boards.types.TypedFieldTestUtils; -import nl.mauritssilvis.darts.java.finders.checkouts.Checkout; -import nl.mauritssilvis.darts.java.finders.checkouts.CheckoutFinder; -import nl.mauritssilvis.darts.java.finders.checkouts.CheckoutTestUtils; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Checkout; +import nl.mauritssilvis.darts.java.api.finders.checkouts.CheckoutFinder; +import nl.mauritssilvis.darts.java.api.finders.checkouts.CheckoutTestUtils; +import nl.mauritssilvis.darts.java.core.boards.TypedFieldTestUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CheckoutFinderFactoryTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CheckoutFinderFactoryTests.java similarity index 80% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CheckoutFinderFactoryTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CheckoutFinderFactoryTests.java index a4af79d4..8d27d3f3 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CheckoutFinderFactoryTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CheckoutFinderFactoryTests.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts.types; +package nl.mauritssilvis.darts.java.core.finders.checkouts; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.boards.types.TypedFieldTestUtils; -import nl.mauritssilvis.darts.java.finders.checkouts.Checkout; -import nl.mauritssilvis.darts.java.finders.checkouts.CheckoutFinder; -import nl.mauritssilvis.darts.java.settings.FinderType; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Checkout; +import nl.mauritssilvis.darts.java.api.finders.checkouts.CheckoutFinder; +import nl.mauritssilvis.darts.java.api.settings.FinderType; +import nl.mauritssilvis.darts.java.core.boards.TypedFieldTestUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CompoundThrowTestUtils.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CompoundThrowTestUtils.java similarity index 81% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CompoundThrowTestUtils.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CompoundThrowTestUtils.java index 9498d2cf..0bb67fc9 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CompoundThrowTestUtils.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CompoundThrowTestUtils.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts.types; +package nl.mauritssilvis.darts.java.core.finders.checkouts; -import nl.mauritssilvis.darts.java.boards.types.TypedFieldTestUtils; -import nl.mauritssilvis.darts.java.finders.checkouts.Throw; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Throw; +import nl.mauritssilvis.darts.java.core.boards.TypedFieldTestUtils; import java.util.Collection; import java.util.List; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CompoundThrowTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CompoundThrowTests.java similarity index 95% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CompoundThrowTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CompoundThrowTests.java index f119bb41..6fe18991 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/CompoundThrowTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/CompoundThrowTests.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts.types; +package nl.mauritssilvis.darts.java.core.finders.checkouts; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.boards.FieldTestUtils; -import nl.mauritssilvis.darts.java.boards.types.TypedFieldTestUtils; -import nl.mauritssilvis.darts.java.finders.checkouts.Throw; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.boards.FieldTestUtils; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Throw; +import nl.mauritssilvis.darts.java.core.boards.TypedFieldTestUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/DescendingCheckoutFinderTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/DescendingCheckoutFinderTests.java similarity index 99% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/DescendingCheckoutFinderTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/DescendingCheckoutFinderTests.java index 5fb27c26..21d796de 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/DescendingCheckoutFinderTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/DescendingCheckoutFinderTests.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts.types; +package nl.mauritssilvis.darts.java.core.finders.checkouts; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.boards.types.TypedFieldTestUtils; -import nl.mauritssilvis.darts.java.finders.checkouts.Checkout; -import nl.mauritssilvis.darts.java.finders.checkouts.CheckoutFinder; -import nl.mauritssilvis.darts.java.finders.checkouts.CheckoutTestUtils; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Checkout; +import nl.mauritssilvis.darts.java.api.finders.checkouts.CheckoutFinder; +import nl.mauritssilvis.darts.java.api.finders.checkouts.CheckoutTestUtils; +import nl.mauritssilvis.darts.java.core.boards.TypedFieldTestUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/GroupedCheckoutTestUtils.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/GroupedCheckoutTestUtils.java similarity index 86% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/GroupedCheckoutTestUtils.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/GroupedCheckoutTestUtils.java index aedbb7d4..8ef22210 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/GroupedCheckoutTestUtils.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/GroupedCheckoutTestUtils.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts.types; +package nl.mauritssilvis.darts.java.core.finders.checkouts; -import nl.mauritssilvis.darts.java.finders.checkouts.Checkout; -import nl.mauritssilvis.darts.java.finders.checkouts.Throw; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Checkout; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Throw; import java.util.Collection; import java.util.List; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/GroupedCheckoutTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/GroupedCheckoutTests.java similarity index 98% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/GroupedCheckoutTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/GroupedCheckoutTests.java index 85c49d82..33b5941b 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/GroupedCheckoutTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/GroupedCheckoutTests.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts.types; +package nl.mauritssilvis.darts.java.core.finders.checkouts; -import nl.mauritssilvis.darts.java.finders.checkouts.Checkout; -import nl.mauritssilvis.darts.java.finders.checkouts.Throw; -import nl.mauritssilvis.darts.java.finders.checkouts.ThrowTestUtils; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Checkout; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Throw; +import nl.mauritssilvis.darts.java.api.finders.checkouts.ThrowTestUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/SimpleCheckoutTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/SimpleCheckoutTests.java similarity index 94% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/SimpleCheckoutTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/SimpleCheckoutTests.java index 7c0697df..13d0d5dd 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/SimpleCheckoutTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/SimpleCheckoutTests.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts.types; +package nl.mauritssilvis.darts.java.core.finders.checkouts; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.boards.types.TypedFieldTestUtils; -import nl.mauritssilvis.darts.java.finders.checkouts.Checkout; -import nl.mauritssilvis.darts.java.finders.checkouts.Throw; -import nl.mauritssilvis.darts.java.finders.checkouts.ThrowTestUtils; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Checkout; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Throw; +import nl.mauritssilvis.darts.java.api.finders.checkouts.ThrowTestUtils; +import nl.mauritssilvis.darts.java.core.boards.TypedFieldTestUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/SimpleThrowTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/SimpleThrowTests.java similarity index 89% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/SimpleThrowTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/SimpleThrowTests.java index 1d6e4fe2..6eec4661 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/checkouts/types/SimpleThrowTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/checkouts/SimpleThrowTests.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.checkouts.types; +package nl.mauritssilvis.darts.java.core.finders.checkouts; -import nl.mauritssilvis.darts.java.boards.Field; -import nl.mauritssilvis.darts.java.boards.FieldTestUtils; -import nl.mauritssilvis.darts.java.boards.types.TypedFieldTestUtils; -import nl.mauritssilvis.darts.java.finders.checkouts.Throw; +import nl.mauritssilvis.darts.java.api.boards.Field; +import nl.mauritssilvis.darts.java.api.boards.FieldTestUtils; +import nl.mauritssilvis.darts.java.api.finders.checkouts.Throw; +import nl.mauritssilvis.darts.java.core.boards.TypedFieldTestUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/CartesianNodeTestUtils.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/CartesianNodeTestUtils.java similarity index 93% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/CartesianNodeTestUtils.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/CartesianNodeTestUtils.java index a2980f19..b9b6961f 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/CartesianNodeTestUtils.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/CartesianNodeTestUtils.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths.types; +package nl.mauritssilvis.darts.java.core.finders.paths; import java.util.Collection; import java.util.List; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/CartesianNodeTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/CartesianNodeTests.java similarity index 98% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/CartesianNodeTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/CartesianNodeTests.java index c14eb9b4..b4a79598 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/CartesianNodeTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/CartesianNodeTests.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths.types; +package nl.mauritssilvis.darts.java.core.finders.paths; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/CartesianPathfinderTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/CartesianPathfinderTests.java similarity index 98% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/CartesianPathfinderTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/CartesianPathfinderTests.java index 8254e277..c3373a4b 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/CartesianPathfinderTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/CartesianPathfinderTests.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths.types; +package nl.mauritssilvis.darts.java.core.finders.paths; -import nl.mauritssilvis.darts.java.finders.paths.Path; -import nl.mauritssilvis.darts.java.finders.paths.PathTestUtils; -import nl.mauritssilvis.darts.java.finders.paths.Pathfinder; +import nl.mauritssilvis.darts.java.api.finders.paths.Path; +import nl.mauritssilvis.darts.java.api.finders.paths.PathTestUtils; +import nl.mauritssilvis.darts.java.api.finders.paths.Pathfinder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/DescendingNodeTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/DescendingNodeTests.java similarity index 98% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/DescendingNodeTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/DescendingNodeTests.java index 63164f7b..3f82dabf 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/DescendingNodeTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/DescendingNodeTests.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths.types; +package nl.mauritssilvis.darts.java.core.finders.paths; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/DescendingPathfinderTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/DescendingPathfinderTests.java similarity index 98% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/DescendingPathfinderTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/DescendingPathfinderTests.java index ff532290..eafd2559 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/DescendingPathfinderTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/DescendingPathfinderTests.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths.types; +package nl.mauritssilvis.darts.java.core.finders.paths; -import nl.mauritssilvis.darts.java.finders.paths.Path; -import nl.mauritssilvis.darts.java.finders.paths.PathTestUtils; -import nl.mauritssilvis.darts.java.finders.paths.Pathfinder; +import nl.mauritssilvis.darts.java.api.finders.paths.Path; +import nl.mauritssilvis.darts.java.api.finders.paths.PathTestUtils; +import nl.mauritssilvis.darts.java.api.finders.paths.Pathfinder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/GroupedPathTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/GroupedPathTests.java similarity index 99% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/GroupedPathTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/GroupedPathTests.java index 849cc9b5..234935ff 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/GroupedPathTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/GroupedPathTests.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths.types; +package nl.mauritssilvis.darts.java.core.finders.paths; -import nl.mauritssilvis.darts.java.finders.paths.Path; +import nl.mauritssilvis.darts.java.api.finders.paths.Path; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/NodeFactoryTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/NodeFactoryTests.java similarity index 90% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/NodeFactoryTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/NodeFactoryTests.java index fefe9956..9707b5e7 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/NodeFactoryTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/NodeFactoryTests.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths.types; +package nl.mauritssilvis.darts.java.core.finders.paths; -import nl.mauritssilvis.darts.java.settings.FinderType; +import nl.mauritssilvis.darts.java.api.settings.FinderType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/PathfinderFactoryTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/PathfinderFactoryTests.java similarity index 85% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/PathfinderFactoryTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/PathfinderFactoryTests.java index 91eb2cc9..2773ed35 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/PathfinderFactoryTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/PathfinderFactoryTests.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths.types; +package nl.mauritssilvis.darts.java.core.finders.paths; -import nl.mauritssilvis.darts.java.finders.paths.Path; -import nl.mauritssilvis.darts.java.finders.paths.Pathfinder; -import nl.mauritssilvis.darts.java.settings.FinderType; +import nl.mauritssilvis.darts.java.api.finders.paths.Path; +import nl.mauritssilvis.darts.java.api.finders.paths.Pathfinder; +import nl.mauritssilvis.darts.java.api.settings.FinderType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/SimplePathTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/SimplePathTests.java similarity index 97% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/SimplePathTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/SimplePathTests.java index 5b58d85c..9ee4bb72 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/finders/paths/types/SimplePathTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/finders/paths/SimplePathTests.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.finders.paths.types; +package nl.mauritssilvis.darts.java.core.finders.paths; -import nl.mauritssilvis.darts.java.finders.paths.Path; +import nl.mauritssilvis.darts.java.api.finders.paths.Path; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/output/types/PrettyFormatterTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/output/PrettyFormatterTests.java similarity index 98% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/output/types/PrettyFormatterTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/output/PrettyFormatterTests.java index 2d5a01c9..313d2de5 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/output/types/PrettyFormatterTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/output/PrettyFormatterTests.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.output.types; +package nl.mauritssilvis.darts.java.core.output; -import nl.mauritssilvis.darts.java.output.Formatter; +import nl.mauritssilvis.darts.java.api.output.Formatter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/settings/types/TableSettingsBuilderTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/settings/TableSettingsBuilderTests.java similarity index 98% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/settings/types/TableSettingsBuilderTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/settings/TableSettingsBuilderTests.java index 11ecff4c..d65181e8 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/settings/types/TableSettingsBuilderTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/settings/TableSettingsBuilderTests.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.settings.types; +package nl.mauritssilvis.darts.java.core.settings; -import nl.mauritssilvis.darts.java.settings.*; +import nl.mauritssilvis.darts.java.api.settings.*; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/settings/types/TableSettingsTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/settings/TableSettingsTests.java similarity index 99% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/settings/types/TableSettingsTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/settings/TableSettingsTests.java index ff9d0fd1..66a8bfe6 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/settings/types/TableSettingsTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/settings/TableSettingsTests.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.settings.types; +package nl.mauritssilvis.darts.java.core.settings; -import nl.mauritssilvis.darts.java.settings.*; +import nl.mauritssilvis.darts.java.api.settings.*; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/types/AscendingTableGeneratorTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/AscendingTableGeneratorTests.java similarity index 99% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/types/AscendingTableGeneratorTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/AscendingTableGeneratorTests.java index 86d43488..5f3df40a 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/types/AscendingTableGeneratorTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/AscendingTableGeneratorTests.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables.types; - -import nl.mauritssilvis.darts.java.finders.checkouts.Checkout; -import nl.mauritssilvis.darts.java.finders.checkouts.CheckoutTestUtils; -import nl.mauritssilvis.darts.java.settings.*; -import nl.mauritssilvis.darts.java.settings.types.TableSettingsBuilder; -import nl.mauritssilvis.darts.java.tables.Table; -import nl.mauritssilvis.darts.java.tables.TableGenerator; -import nl.mauritssilvis.darts.java.tables.TableTestUtils; +package nl.mauritssilvis.darts.java.core.tables; + +import nl.mauritssilvis.darts.java.api.finders.checkouts.Checkout; +import nl.mauritssilvis.darts.java.api.finders.checkouts.CheckoutTestUtils; +import nl.mauritssilvis.darts.java.api.settings.*; +import nl.mauritssilvis.darts.java.api.tables.Table; +import nl.mauritssilvis.darts.java.api.tables.TableGenerator; +import nl.mauritssilvis.darts.java.api.tables.TableTestUtils; +import nl.mauritssilvis.darts.java.core.settings.TableSettingsBuilder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/types/AscendingTableTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/AscendingTableTests.java similarity index 96% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/types/AscendingTableTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/AscendingTableTests.java index 0cab08da..ed43c64a 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/types/AscendingTableTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/AscendingTableTests.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables.types; - -import nl.mauritssilvis.darts.java.finders.checkouts.Checkout; -import nl.mauritssilvis.darts.java.finders.checkouts.CheckoutTestUtils; -import nl.mauritssilvis.darts.java.finders.checkouts.types.GroupedCheckoutTestUtils; -import nl.mauritssilvis.darts.java.settings.BoardType; -import nl.mauritssilvis.darts.java.settings.Settings; -import nl.mauritssilvis.darts.java.settings.types.TableSettingsBuilder; -import nl.mauritssilvis.darts.java.tables.Table; +package nl.mauritssilvis.darts.java.core.tables; + +import nl.mauritssilvis.darts.java.api.finders.checkouts.Checkout; +import nl.mauritssilvis.darts.java.api.finders.checkouts.CheckoutTestUtils; +import nl.mauritssilvis.darts.java.api.settings.BoardType; +import nl.mauritssilvis.darts.java.api.settings.Settings; +import nl.mauritssilvis.darts.java.api.tables.Table; +import nl.mauritssilvis.darts.java.core.finders.checkouts.GroupedCheckoutTestUtils; +import nl.mauritssilvis.darts.java.core.settings.TableSettingsBuilder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/types/TableGeneratorFactoryTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/TableGeneratorFactoryTests.java similarity index 76% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/types/TableGeneratorFactoryTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/TableGeneratorFactoryTests.java index a26d3656..806e03b2 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/types/TableGeneratorFactoryTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/TableGeneratorFactoryTests.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables.types; +package nl.mauritssilvis.darts.java.core.tables; -import nl.mauritssilvis.darts.java.settings.Settings; -import nl.mauritssilvis.darts.java.settings.TableType; -import nl.mauritssilvis.darts.java.settings.types.TableSettingsBuilder; -import nl.mauritssilvis.darts.java.tables.Table; -import nl.mauritssilvis.darts.java.tables.TableGenerator; +import nl.mauritssilvis.darts.java.api.settings.Settings; +import nl.mauritssilvis.darts.java.api.settings.TableType; +import nl.mauritssilvis.darts.java.api.tables.Table; +import nl.mauritssilvis.darts.java.api.tables.TableGenerator; +import nl.mauritssilvis.darts.java.core.settings.TableSettingsBuilder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/output/HtmlTableSerializerTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/output/HtmlTableSerializerTests.java similarity index 97% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/output/HtmlTableSerializerTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/output/HtmlTableSerializerTests.java index 47263f7c..9d506c7e 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/output/HtmlTableSerializerTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/output/HtmlTableSerializerTests.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables.output; - -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.settings.*; -import nl.mauritssilvis.darts.java.settings.types.TableSettingsBuilder; -import nl.mauritssilvis.darts.java.tables.Table; -import nl.mauritssilvis.darts.java.tables.TableGenerator; -import nl.mauritssilvis.darts.java.tables.types.TableGeneratorFactory; +package nl.mauritssilvis.darts.java.core.tables.output; + +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.api.settings.*; +import nl.mauritssilvis.darts.java.api.tables.Table; +import nl.mauritssilvis.darts.java.api.tables.TableGenerator; +import nl.mauritssilvis.darts.java.core.settings.TableSettingsBuilder; +import nl.mauritssilvis.darts.java.core.tables.TableGeneratorFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/output/JsonTableSerializerTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/output/JsonTableSerializerTests.java similarity index 96% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/output/JsonTableSerializerTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/output/JsonTableSerializerTests.java index fdbd426b..f463f687 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/output/JsonTableSerializerTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/output/JsonTableSerializerTests.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables.output; - -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.settings.*; -import nl.mauritssilvis.darts.java.settings.types.TableSettingsBuilder; -import nl.mauritssilvis.darts.java.tables.Table; -import nl.mauritssilvis.darts.java.tables.TableGenerator; -import nl.mauritssilvis.darts.java.tables.types.TableGeneratorFactory; +package nl.mauritssilvis.darts.java.core.tables.output; + +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.api.settings.*; +import nl.mauritssilvis.darts.java.api.tables.Table; +import nl.mauritssilvis.darts.java.api.tables.TableGenerator; +import nl.mauritssilvis.darts.java.core.settings.TableSettingsBuilder; +import nl.mauritssilvis.darts.java.core.tables.TableGeneratorFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/output/MarkdownTableSerializerTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/output/MarkdownTableSerializerTests.java similarity index 95% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/output/MarkdownTableSerializerTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/output/MarkdownTableSerializerTests.java index f441635b..0d215714 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/output/MarkdownTableSerializerTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/output/MarkdownTableSerializerTests.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables.output; - -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.settings.*; -import nl.mauritssilvis.darts.java.settings.types.TableSettingsBuilder; -import nl.mauritssilvis.darts.java.tables.Table; -import nl.mauritssilvis.darts.java.tables.TableGenerator; -import nl.mauritssilvis.darts.java.tables.types.TableGeneratorFactory; +package nl.mauritssilvis.darts.java.core.tables.output; + +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.api.settings.*; +import nl.mauritssilvis.darts.java.api.tables.Table; +import nl.mauritssilvis.darts.java.api.tables.TableGenerator; +import nl.mauritssilvis.darts.java.core.settings.TableSettingsBuilder; +import nl.mauritssilvis.darts.java.core.tables.TableGeneratorFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/output/StringTableSerializerTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/output/StringTableSerializerTests.java similarity index 87% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/output/StringTableSerializerTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/output/StringTableSerializerTests.java index 6b33b690..e32bb4b0 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/output/StringTableSerializerTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/output/StringTableSerializerTests.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables.output; - -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.settings.Settings; -import nl.mauritssilvis.darts.java.settings.TableType; -import nl.mauritssilvis.darts.java.settings.types.TableSettingsBuilder; -import nl.mauritssilvis.darts.java.tables.Table; -import nl.mauritssilvis.darts.java.tables.TableGenerator; -import nl.mauritssilvis.darts.java.tables.types.TableGeneratorFactory; +package nl.mauritssilvis.darts.java.core.tables.output; + +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.api.settings.Settings; +import nl.mauritssilvis.darts.java.api.settings.TableType; +import nl.mauritssilvis.darts.java.api.tables.Table; +import nl.mauritssilvis.darts.java.api.tables.TableGenerator; +import nl.mauritssilvis.darts.java.core.settings.TableSettingsBuilder; +import nl.mauritssilvis.darts.java.core.tables.TableGeneratorFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/output/TableSerializerFactoryTests.java b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/output/TableSerializerFactoryTests.java similarity index 84% rename from cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/output/TableSerializerFactoryTests.java rename to cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/output/TableSerializerFactoryTests.java index a087c382..40965261 100644 --- a/cli/java/src/test/java/nl/mauritssilvis/darts/java/tables/output/TableSerializerFactoryTests.java +++ b/cli/java-darts-cli/src/test/java/nl/mauritssilvis/darts/java/core/tables/output/TableSerializerFactoryTests.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package nl.mauritssilvis.darts.java.tables.output; +package nl.mauritssilvis.darts.java.core.tables.output; -import nl.mauritssilvis.darts.java.output.Serializer; -import nl.mauritssilvis.darts.java.settings.OutputFormat; -import nl.mauritssilvis.darts.java.tables.Table; +import nl.mauritssilvis.darts.java.api.output.Serializer; +import nl.mauritssilvis.darts.java.api.settings.OutputFormat; +import nl.mauritssilvis.darts.java.api.tables.Table; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/cli/java/.idea/.name b/cli/java/.idea/.name deleted file mode 100644 index 654711eb..00000000 --- a/cli/java/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -java-darts-cli \ No newline at end of file