From 63a78335b6590b1c4124b39f654cf657f43db095 Mon Sep 17 00:00:00 2001 From: "Omar \"Goatfryed\" Sood" Date: Tue, 10 Sep 2024 20:47:06 +0200 Subject: [PATCH] feat: update group name --- build.gradle | 2 +- .../presets/StandardConventionProvider.java | 19 ------------------- .../assert_baseline/BaselineAssertion.java | 2 +- .../assert_baseline/BaselineAssertions.java | 8 ++++---- .../assert_baseline/SerializableSubject.java | 2 +- .../core/AbstractBaselineAssertion.java | 7 +++---- .../assert_baseline/core/BaselineContext.java | 5 ++--- .../core/BaselineContextFactory.java | 3 ++- .../core/BaselineContextUtils.java | 2 +- .../core/convention/BaselineConvention.java | 6 +++--- .../BaselineConventionProvider.java | 2 +- .../core/convention/ConventionBuilder.java | 12 ++++++++---- .../core/convention/ConventionImpl.java | 6 ++---- .../core/convention/ConventionLocator.java | 4 ++-- .../core/convention/ConventionSupport.java | 8 ++++---- .../core/convention/FileStorageStrategy.java | 10 +++++----- .../presets/StandardConventionProvider.java | 19 +++++++++++++++++++ .../assert_baseline/core/storage/AsPath.java | 2 +- .../ConfigurableStorageConfigurer.java | 2 +- .../core/storage/FaultyValue.java | 2 +- .../core/storage/FileValue.java | 2 +- ...PathFromBaselineLocationPostProcessor.java | 2 +- .../core/storage/StorageConfig.java | 2 +- .../core/storage/StorageConfigUtils.java | 2 +- .../core/storage/StorageConfigValidator.java | 2 +- .../core/storage/StorageConfigurer.java | 2 +- .../core/storage/StoredValue.java | 2 +- .../core/storage/StoredValueStrategy.java | 2 +- .../json/JsonBaselineAssertion.java | 8 ++++---- .../text/TextBaselineAssertion.java | 8 ++++---- .../xml/ContextAwareXPathNodeMatcher.java | 2 +- .../xml/XmlBaselineAssertion.java | 8 ++++---- .../xml/XmlDiffConfiguration.java | 2 +- .../assert_baseline/BaselineContextTest.java | 4 ++-- .../convention/StandardConventionTest.java | 9 ++++----- .../json/JsonBaselineAssertionTest.java | 4 ++-- .../xml/XmlBaselineAssertionTest.java | 6 +++--- src/testRecipes/java/SiblingLayoutTest.java | 6 +++--- .../java/support/TestConventionProvider.java | 6 +++--- ...ore.convention.BaselineConventionProvider} | 0 .../ConventionServiceInjectionTest.java | 6 +++--- .../TestConventionProvider.java | 10 +++++----- ...core.convention.BaselineConventionProvider | 1 - ...core.convention.BaselineConventionProvider | 1 + 44 files changed, 110 insertions(+), 110 deletions(-) delete mode 100644 src/main/java/com/github/goatfryed/assert_baseline/core/convention/presets/StandardConventionProvider.java rename src/main/java/{com => io}/github/goatfryed/assert_baseline/BaselineAssertion.java (67%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/BaselineAssertions.java (65%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/SerializableSubject.java (92%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/AbstractBaselineAssertion.java (84%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/BaselineContext.java (93%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/BaselineContextFactory.java (95%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/BaselineContextUtils.java (82%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/convention/BaselineConvention.java (54%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/convention/BaselineConventionProvider.java (58%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/convention/ConventionBuilder.java (76%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/convention/ConventionImpl.java (72%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/convention/ConventionLocator.java (73%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/convention/ConventionSupport.java (87%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/convention/FileStorageStrategy.java (60%) create mode 100644 src/main/java/io/github/goatfryed/assert_baseline/core/convention/presets/StandardConventionProvider.java rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/storage/AsPath.java (56%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/storage/ConfigurableStorageConfigurer.java (98%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/storage/FaultyValue.java (93%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/storage/FileValue.java (93%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/storage/InferContextPathFromBaselineLocationPostProcessor.java (95%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/storage/StorageConfig.java (97%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/storage/StorageConfigUtils.java (98%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/storage/StorageConfigValidator.java (78%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/storage/StorageConfigurer.java (61%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/storage/StoredValue.java (90%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/core/storage/StoredValueStrategy.java (71%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/json/JsonBaselineAssertion.java (89%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/text/TextBaselineAssertion.java (83%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/xml/ContextAwareXPathNodeMatcher.java (96%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/xml/XmlBaselineAssertion.java (89%) rename src/main/java/{com => io}/github/goatfryed/assert_baseline/xml/XmlDiffConfiguration.java (92%) rename src/test/java/{com => io}/github/goatfryed/assert_baseline/BaselineContextTest.java (79%) rename src/test/java/{com => io}/github/goatfryed/assert_baseline/convention/StandardConventionTest.java (82%) rename src/test/java/{com => io}/github/goatfryed/assert_baseline/json/JsonBaselineAssertionTest.java (95%) rename src/test/java/{com => io}/github/goatfryed/assert_baseline/xml/XmlBaselineAssertionTest.java (93%) rename src/testRecipes/resources/META-INF/services/{com.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider => io.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider} (100%) rename src/testSpi/java/{com => io}/github/goatfryed/assert_baseline/ConventionServiceInjectionTest.java (78%) rename src/testSpi/java/{com => io}/github/goatfryed/assert_baseline/TestConventionProvider.java (66%) delete mode 100644 src/testSpi/resources/META-INF/services/com.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider create mode 100644 src/testSpi/resources/META-INF/services/io.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider diff --git a/build.gradle b/build.gradle index 5c734bd..f841a4b 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'maven-publish' } -group = "com.github.goatfryed" +group = "io.github.goatfryed" version = "1.0.0-alpha1-SNAPSHOT" repositories { diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/convention/presets/StandardConventionProvider.java b/src/main/java/com/github/goatfryed/assert_baseline/core/convention/presets/StandardConventionProvider.java deleted file mode 100644 index 815e127..0000000 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/convention/presets/StandardConventionProvider.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.github.goatfryed.assert_baseline.core.convention.presets; - -import com.github.goatfryed.assert_baseline.core.convention.BaselineConvention; -import com.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider; -import com.github.goatfryed.assert_baseline.core.convention.ConventionSupport; - -import static com.github.goatfryed.assert_baseline.core.convention.ConventionBuilder.builderWithDefaults; -import static com.github.goatfryed.assert_baseline.core.convention.ConventionSupport.locateBaselinesAndInferContextPath; - -public class StandardConventionProvider implements BaselineConventionProvider { - @Override - public BaselineConvention getConvention() { - return builderWithDefaults() - .storing(locateBaselinesAndInferContextPath()) - .withConfigValidator(ConventionSupport::validateDifferentPaths) - .build() - ; - } -} diff --git a/src/main/java/com/github/goatfryed/assert_baseline/BaselineAssertion.java b/src/main/java/io/github/goatfryed/assert_baseline/BaselineAssertion.java similarity index 67% rename from src/main/java/com/github/goatfryed/assert_baseline/BaselineAssertion.java rename to src/main/java/io/github/goatfryed/assert_baseline/BaselineAssertion.java index 35bdea4..ecbbc93 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/BaselineAssertion.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/BaselineAssertion.java @@ -1,4 +1,4 @@ -package com.github.goatfryed.assert_baseline; +package io.github.goatfryed.assert_baseline; public interface BaselineAssertion { SELF isEqualToBaseline(String baselinePath); diff --git a/src/main/java/com/github/goatfryed/assert_baseline/BaselineAssertions.java b/src/main/java/io/github/goatfryed/assert_baseline/BaselineAssertions.java similarity index 65% rename from src/main/java/com/github/goatfryed/assert_baseline/BaselineAssertions.java rename to src/main/java/io/github/goatfryed/assert_baseline/BaselineAssertions.java index a2fa1a9..93812dc 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/BaselineAssertions.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/BaselineAssertions.java @@ -1,8 +1,8 @@ -package com.github.goatfryed.assert_baseline; +package io.github.goatfryed.assert_baseline; -import com.github.goatfryed.assert_baseline.json.JsonBaselineAssertion; -import com.github.goatfryed.assert_baseline.text.TextBaselineAssertion; -import com.github.goatfryed.assert_baseline.xml.XmlBaselineAssertion; +import io.github.goatfryed.assert_baseline.json.JsonBaselineAssertion; +import io.github.goatfryed.assert_baseline.text.TextBaselineAssertion; +import io.github.goatfryed.assert_baseline.xml.XmlBaselineAssertion; public class BaselineAssertions { diff --git a/src/main/java/com/github/goatfryed/assert_baseline/SerializableSubject.java b/src/main/java/io/github/goatfryed/assert_baseline/SerializableSubject.java similarity index 92% rename from src/main/java/com/github/goatfryed/assert_baseline/SerializableSubject.java rename to src/main/java/io/github/goatfryed/assert_baseline/SerializableSubject.java index a7d8e38..25fcb09 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/SerializableSubject.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/SerializableSubject.java @@ -1,4 +1,4 @@ -package com.github.goatfryed.assert_baseline; +package io.github.goatfryed.assert_baseline; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/AbstractBaselineAssertion.java b/src/main/java/io/github/goatfryed/assert_baseline/core/AbstractBaselineAssertion.java similarity index 84% rename from src/main/java/com/github/goatfryed/assert_baseline/core/AbstractBaselineAssertion.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/AbstractBaselineAssertion.java index af619f4..0f2f5c1 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/AbstractBaselineAssertion.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/AbstractBaselineAssertion.java @@ -1,10 +1,9 @@ -package com.github.goatfryed.assert_baseline.core; +package io.github.goatfryed.assert_baseline.core; -import com.github.goatfryed.assert_baseline.BaselineAssertion; -import com.github.goatfryed.assert_baseline.core.convention.ConventionLocator; +import io.github.goatfryed.assert_baseline.BaselineAssertion; +import io.github.goatfryed.assert_baseline.core.convention.ConventionLocator; import org.assertj.core.api.AbstractAssert; -import java.nio.file.Path; import java.util.function.Function; abstract public class AbstractBaselineAssertion> diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/BaselineContext.java b/src/main/java/io/github/goatfryed/assert_baseline/core/BaselineContext.java similarity index 93% rename from src/main/java/com/github/goatfryed/assert_baseline/core/BaselineContext.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/BaselineContext.java index 7ca6406..a7c238d 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/BaselineContext.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/BaselineContext.java @@ -1,8 +1,7 @@ -package com.github.goatfryed.assert_baseline.core; +package io.github.goatfryed.assert_baseline.core; -import com.github.goatfryed.assert_baseline.core.storage.StoredValue; +import io.github.goatfryed.assert_baseline.core.storage.StoredValue; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; import org.assertj.core.description.Description; import org.assertj.core.description.JoinDescription; diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/BaselineContextFactory.java b/src/main/java/io/github/goatfryed/assert_baseline/core/BaselineContextFactory.java similarity index 95% rename from src/main/java/com/github/goatfryed/assert_baseline/core/BaselineContextFactory.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/BaselineContextFactory.java index 7e4789a..fa394d7 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/BaselineContextFactory.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/BaselineContextFactory.java @@ -1,6 +1,7 @@ -package com.github.goatfryed.assert_baseline.core; +package io.github.goatfryed.assert_baseline.core; import com.github.goatfryed.assert_baseline.core.storage.*; +import io.github.goatfryed.assert_baseline.core.storage.*; import java.util.function.Function; diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/BaselineContextUtils.java b/src/main/java/io/github/goatfryed/assert_baseline/core/BaselineContextUtils.java similarity index 82% rename from src/main/java/com/github/goatfryed/assert_baseline/core/BaselineContextUtils.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/BaselineContextUtils.java index 05b1ff4..d501ddf 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/BaselineContextUtils.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/BaselineContextUtils.java @@ -1,4 +1,4 @@ -package com.github.goatfryed.assert_baseline.core; +package io.github.goatfryed.assert_baseline.core; import java.util.function.Function; diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/convention/BaselineConvention.java b/src/main/java/io/github/goatfryed/assert_baseline/core/convention/BaselineConvention.java similarity index 54% rename from src/main/java/com/github/goatfryed/assert_baseline/core/convention/BaselineConvention.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/convention/BaselineConvention.java index 1e9c463..ed1506e 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/convention/BaselineConvention.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/convention/BaselineConvention.java @@ -1,7 +1,7 @@ -package com.github.goatfryed.assert_baseline.core.convention; +package io.github.goatfryed.assert_baseline.core.convention; -import com.github.goatfryed.assert_baseline.core.BaselineContext; -import com.github.goatfryed.assert_baseline.core.BaselineContextFactory; +import io.github.goatfryed.assert_baseline.core.BaselineContext; +import io.github.goatfryed.assert_baseline.core.BaselineContextFactory; public interface BaselineConvention { diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/convention/BaselineConventionProvider.java b/src/main/java/io/github/goatfryed/assert_baseline/core/convention/BaselineConventionProvider.java similarity index 58% rename from src/main/java/com/github/goatfryed/assert_baseline/core/convention/BaselineConventionProvider.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/convention/BaselineConventionProvider.java index 1793baa..69a67f0 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/convention/BaselineConventionProvider.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/convention/BaselineConventionProvider.java @@ -1,4 +1,4 @@ -package com.github.goatfryed.assert_baseline.core.convention; +package io.github.goatfryed.assert_baseline.core.convention; public interface BaselineConventionProvider { BaselineConvention getConvention(); diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/convention/ConventionBuilder.java b/src/main/java/io/github/goatfryed/assert_baseline/core/convention/ConventionBuilder.java similarity index 76% rename from src/main/java/com/github/goatfryed/assert_baseline/core/convention/ConventionBuilder.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/convention/ConventionBuilder.java index fef0f7e..1f4b110 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/convention/ConventionBuilder.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/convention/ConventionBuilder.java @@ -1,12 +1,16 @@ -package com.github.goatfryed.assert_baseline.core.convention; +package io.github.goatfryed.assert_baseline.core.convention; -import com.github.goatfryed.assert_baseline.core.BaselineContextFactory; +import io.github.goatfryed.assert_baseline.core.BaselineContextFactory; import com.github.goatfryed.assert_baseline.core.storage.*; +import io.github.goatfryed.assert_baseline.core.storage.ConfigurableStorageConfigurer; +import io.github.goatfryed.assert_baseline.core.storage.StorageConfig; +import io.github.goatfryed.assert_baseline.core.storage.StorageConfigValidator; +import io.github.goatfryed.assert_baseline.core.storage.StoredValueStrategy; import java.util.function.Function; -import static com.github.goatfryed.assert_baseline.core.convention.ConventionSupport.actualAsSibling; -import static com.github.goatfryed.assert_baseline.core.storage.StorageConfigUtils.baselineAsRequested; +import static io.github.goatfryed.assert_baseline.core.convention.ConventionSupport.actualAsSibling; +import static io.github.goatfryed.assert_baseline.core.storage.StorageConfigUtils.baselineAsRequested; public class ConventionBuilder { diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/convention/ConventionImpl.java b/src/main/java/io/github/goatfryed/assert_baseline/core/convention/ConventionImpl.java similarity index 72% rename from src/main/java/com/github/goatfryed/assert_baseline/core/convention/ConventionImpl.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/convention/ConventionImpl.java index 07acabc..4be98bc 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/convention/ConventionImpl.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/convention/ConventionImpl.java @@ -1,10 +1,8 @@ -package com.github.goatfryed.assert_baseline.core.convention; +package io.github.goatfryed.assert_baseline.core.convention; -import com.github.goatfryed.assert_baseline.core.BaselineContextFactory; +import io.github.goatfryed.assert_baseline.core.BaselineContextFactory; import com.github.goatfryed.assert_baseline.core.storage.*; -import java.nio.file.Path; -import java.util.function.Function; import java.util.function.Supplier; public class ConventionImpl implements BaselineConvention { diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/convention/ConventionLocator.java b/src/main/java/io/github/goatfryed/assert_baseline/core/convention/ConventionLocator.java similarity index 73% rename from src/main/java/com/github/goatfryed/assert_baseline/core/convention/ConventionLocator.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/convention/ConventionLocator.java index 359b5a1..44bbefd 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/convention/ConventionLocator.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/convention/ConventionLocator.java @@ -1,6 +1,6 @@ -package com.github.goatfryed.assert_baseline.core.convention; +package io.github.goatfryed.assert_baseline.core.convention; -import com.github.goatfryed.assert_baseline.core.convention.presets.StandardConventionProvider; +import io.github.goatfryed.assert_baseline.core.convention.presets.StandardConventionProvider; import java.util.ServiceLoader; diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/convention/ConventionSupport.java b/src/main/java/io/github/goatfryed/assert_baseline/core/convention/ConventionSupport.java similarity index 87% rename from src/main/java/com/github/goatfryed/assert_baseline/core/convention/ConventionSupport.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/convention/ConventionSupport.java index 5345405..256664e 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/convention/ConventionSupport.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/convention/ConventionSupport.java @@ -1,8 +1,8 @@ -package com.github.goatfryed.assert_baseline.core.convention; +package io.github.goatfryed.assert_baseline.core.convention; -import com.github.goatfryed.assert_baseline.core.storage.ConfigurableStorageConfigurer; -import com.github.goatfryed.assert_baseline.core.storage.StorageConfig; -import com.github.goatfryed.assert_baseline.core.storage.StorageConfigUtils; +import io.github.goatfryed.assert_baseline.core.storage.ConfigurableStorageConfigurer; +import io.github.goatfryed.assert_baseline.core.storage.StorageConfig; +import io.github.goatfryed.assert_baseline.core.storage.StorageConfigUtils; import java.nio.file.Path; import java.util.function.UnaryOperator; diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/convention/FileStorageStrategy.java b/src/main/java/io/github/goatfryed/assert_baseline/core/convention/FileStorageStrategy.java similarity index 60% rename from src/main/java/com/github/goatfryed/assert_baseline/core/convention/FileStorageStrategy.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/convention/FileStorageStrategy.java index a04a6ef..5d39cb4 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/convention/FileStorageStrategy.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/convention/FileStorageStrategy.java @@ -1,9 +1,9 @@ -package com.github.goatfryed.assert_baseline.core.convention; +package io.github.goatfryed.assert_baseline.core.convention; -import com.github.goatfryed.assert_baseline.core.storage.FileValue; -import com.github.goatfryed.assert_baseline.core.storage.StorageConfig; -import com.github.goatfryed.assert_baseline.core.storage.StoredValue; -import com.github.goatfryed.assert_baseline.core.storage.StoredValueStrategy; +import io.github.goatfryed.assert_baseline.core.storage.FileValue; +import io.github.goatfryed.assert_baseline.core.storage.StorageConfig; +import io.github.goatfryed.assert_baseline.core.storage.StoredValue; +import io.github.goatfryed.assert_baseline.core.storage.StoredValueStrategy; import java.nio.file.Path; import java.util.function.Function; diff --git a/src/main/java/io/github/goatfryed/assert_baseline/core/convention/presets/StandardConventionProvider.java b/src/main/java/io/github/goatfryed/assert_baseline/core/convention/presets/StandardConventionProvider.java new file mode 100644 index 0000000..0ba4c4e --- /dev/null +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/convention/presets/StandardConventionProvider.java @@ -0,0 +1,19 @@ +package io.github.goatfryed.assert_baseline.core.convention.presets; + +import io.github.goatfryed.assert_baseline.core.convention.BaselineConvention; +import io.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider; +import io.github.goatfryed.assert_baseline.core.convention.ConventionSupport; + +import static io.github.goatfryed.assert_baseline.core.convention.ConventionBuilder.builderWithDefaults; +import static io.github.goatfryed.assert_baseline.core.convention.ConventionSupport.locateBaselinesAndInferContextPath; + +public class StandardConventionProvider implements BaselineConventionProvider { + @Override + public BaselineConvention getConvention() { + return builderWithDefaults() + .storing(locateBaselinesAndInferContextPath()) + .withConfigValidator(ConventionSupport::validateDifferentPaths) + .build() + ; + } +} diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/AsPath.java b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/AsPath.java similarity index 56% rename from src/main/java/com/github/goatfryed/assert_baseline/core/storage/AsPath.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/storage/AsPath.java index 2eb74d9..5637340 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/AsPath.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/AsPath.java @@ -1,4 +1,4 @@ -package com.github.goatfryed.assert_baseline.core.storage; +package io.github.goatfryed.assert_baseline.core.storage; import java.nio.file.Path; diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/ConfigurableStorageConfigurer.java b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/ConfigurableStorageConfigurer.java similarity index 98% rename from src/main/java/com/github/goatfryed/assert_baseline/core/storage/ConfigurableStorageConfigurer.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/storage/ConfigurableStorageConfigurer.java index b784a36..9ee67eb 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/ConfigurableStorageConfigurer.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/ConfigurableStorageConfigurer.java @@ -1,4 +1,4 @@ -package com.github.goatfryed.assert_baseline.core.storage; +package io.github.goatfryed.assert_baseline.core.storage; import java.nio.file.Path; import java.util.Objects; diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/FaultyValue.java b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/FaultyValue.java similarity index 93% rename from src/main/java/com/github/goatfryed/assert_baseline/core/storage/FaultyValue.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/storage/FaultyValue.java index 02daed5..25b02f2 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/FaultyValue.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/FaultyValue.java @@ -1,4 +1,4 @@ -package com.github.goatfryed.assert_baseline.core.storage; +package io.github.goatfryed.assert_baseline.core.storage; import org.assertj.core.description.Description; import org.assertj.core.description.TextDescription; diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/FileValue.java b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/FileValue.java similarity index 93% rename from src/main/java/com/github/goatfryed/assert_baseline/core/storage/FileValue.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/storage/FileValue.java index 53591ea..8340688 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/FileValue.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/FileValue.java @@ -1,4 +1,4 @@ -package com.github.goatfryed.assert_baseline.core.storage; +package io.github.goatfryed.assert_baseline.core.storage; import org.assertj.core.description.Description; import org.assertj.core.description.TextDescription; diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/InferContextPathFromBaselineLocationPostProcessor.java b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/InferContextPathFromBaselineLocationPostProcessor.java similarity index 95% rename from src/main/java/com/github/goatfryed/assert_baseline/core/storage/InferContextPathFromBaselineLocationPostProcessor.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/storage/InferContextPathFromBaselineLocationPostProcessor.java index 5e1b801..d6a865c 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/InferContextPathFromBaselineLocationPostProcessor.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/InferContextPathFromBaselineLocationPostProcessor.java @@ -1,4 +1,4 @@ -package com.github.goatfryed.assert_baseline.core.storage; +package io.github.goatfryed.assert_baseline.core.storage; import java.nio.file.Path; import java.util.Optional; diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/StorageConfig.java b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/StorageConfig.java similarity index 97% rename from src/main/java/com/github/goatfryed/assert_baseline/core/storage/StorageConfig.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/storage/StorageConfig.java index bcf847d..14ff0e9 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/StorageConfig.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/StorageConfig.java @@ -1,4 +1,4 @@ -package com.github.goatfryed.assert_baseline.core.storage; +package io.github.goatfryed.assert_baseline.core.storage; import java.nio.file.Path; import java.util.Objects; diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/StorageConfigUtils.java b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/StorageConfigUtils.java similarity index 98% rename from src/main/java/com/github/goatfryed/assert_baseline/core/storage/StorageConfigUtils.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/storage/StorageConfigUtils.java index f77bb25..62241b8 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/StorageConfigUtils.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/StorageConfigUtils.java @@ -1,4 +1,4 @@ -package com.github.goatfryed.assert_baseline.core.storage; +package io.github.goatfryed.assert_baseline.core.storage; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/StorageConfigValidator.java b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/StorageConfigValidator.java similarity index 78% rename from src/main/java/com/github/goatfryed/assert_baseline/core/storage/StorageConfigValidator.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/storage/StorageConfigValidator.java index b32a2d0..dedf3b0 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/StorageConfigValidator.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/StorageConfigValidator.java @@ -1,4 +1,4 @@ -package com.github.goatfryed.assert_baseline.core.storage; +package io.github.goatfryed.assert_baseline.core.storage; public interface StorageConfigValidator { /** diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/StorageConfigurer.java b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/StorageConfigurer.java similarity index 61% rename from src/main/java/com/github/goatfryed/assert_baseline/core/storage/StorageConfigurer.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/storage/StorageConfigurer.java index c9fdcd7..765113f 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/StorageConfigurer.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/StorageConfigurer.java @@ -1,4 +1,4 @@ -package com.github.goatfryed.assert_baseline.core.storage; +package io.github.goatfryed.assert_baseline.core.storage; public interface StorageConfigurer { StorageConfig createConfig(String requestedKey); diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/StoredValue.java b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/StoredValue.java similarity index 90% rename from src/main/java/com/github/goatfryed/assert_baseline/core/storage/StoredValue.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/storage/StoredValue.java index e34d392..dab2d71 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/StoredValue.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/StoredValue.java @@ -1,4 +1,4 @@ -package com.github.goatfryed.assert_baseline.core.storage; +package io.github.goatfryed.assert_baseline.core.storage; import org.assertj.core.description.Description; diff --git a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/StoredValueStrategy.java b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/StoredValueStrategy.java similarity index 71% rename from src/main/java/com/github/goatfryed/assert_baseline/core/storage/StoredValueStrategy.java rename to src/main/java/io/github/goatfryed/assert_baseline/core/storage/StoredValueStrategy.java index fba645e..0428dc9 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/core/storage/StoredValueStrategy.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/core/storage/StoredValueStrategy.java @@ -1,4 +1,4 @@ -package com.github.goatfryed.assert_baseline.core.storage; +package io.github.goatfryed.assert_baseline.core.storage; import java.util.function.Function; diff --git a/src/main/java/com/github/goatfryed/assert_baseline/json/JsonBaselineAssertion.java b/src/main/java/io/github/goatfryed/assert_baseline/json/JsonBaselineAssertion.java similarity index 89% rename from src/main/java/com/github/goatfryed/assert_baseline/json/JsonBaselineAssertion.java rename to src/main/java/io/github/goatfryed/assert_baseline/json/JsonBaselineAssertion.java index e38f406..92c3f34 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/json/JsonBaselineAssertion.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/json/JsonBaselineAssertion.java @@ -1,8 +1,8 @@ -package com.github.goatfryed.assert_baseline.json; +package io.github.goatfryed.assert_baseline.json; -import com.github.goatfryed.assert_baseline.core.AbstractBaselineAssertion; -import com.github.goatfryed.assert_baseline.core.BaselineContext; -import com.github.goatfryed.assert_baseline.SerializableSubject; +import io.github.goatfryed.assert_baseline.core.AbstractBaselineAssertion; +import io.github.goatfryed.assert_baseline.core.BaselineContext; +import io.github.goatfryed.assert_baseline.SerializableSubject; import net.javacrumbs.jsonunit.assertj.JsonAssert; import net.javacrumbs.jsonunit.core.Configuration; diff --git a/src/main/java/com/github/goatfryed/assert_baseline/text/TextBaselineAssertion.java b/src/main/java/io/github/goatfryed/assert_baseline/text/TextBaselineAssertion.java similarity index 83% rename from src/main/java/com/github/goatfryed/assert_baseline/text/TextBaselineAssertion.java rename to src/main/java/io/github/goatfryed/assert_baseline/text/TextBaselineAssertion.java index f286ec2..e741939 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/text/TextBaselineAssertion.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/text/TextBaselineAssertion.java @@ -1,8 +1,8 @@ -package com.github.goatfryed.assert_baseline.text; +package io.github.goatfryed.assert_baseline.text; -import com.github.goatfryed.assert_baseline.core.AbstractBaselineAssertion; -import com.github.goatfryed.assert_baseline.core.BaselineContext; -import com.github.goatfryed.assert_baseline.SerializableSubject; +import io.github.goatfryed.assert_baseline.core.AbstractBaselineAssertion; +import io.github.goatfryed.assert_baseline.core.BaselineContext; +import io.github.goatfryed.assert_baseline.SerializableSubject; import net.javacrumbs.jsonunit.core.Configuration; import org.assertj.core.api.AbstractStringAssert; diff --git a/src/main/java/com/github/goatfryed/assert_baseline/xml/ContextAwareXPathNodeMatcher.java b/src/main/java/io/github/goatfryed/assert_baseline/xml/ContextAwareXPathNodeMatcher.java similarity index 96% rename from src/main/java/com/github/goatfryed/assert_baseline/xml/ContextAwareXPathNodeMatcher.java rename to src/main/java/io/github/goatfryed/assert_baseline/xml/ContextAwareXPathNodeMatcher.java index b191f89..d434b28 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/xml/ContextAwareXPathNodeMatcher.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/xml/ContextAwareXPathNodeMatcher.java @@ -1,4 +1,4 @@ -package com.github.goatfryed.assert_baseline.xml; +package io.github.goatfryed.assert_baseline.xml; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/src/main/java/com/github/goatfryed/assert_baseline/xml/XmlBaselineAssertion.java b/src/main/java/io/github/goatfryed/assert_baseline/xml/XmlBaselineAssertion.java similarity index 89% rename from src/main/java/com/github/goatfryed/assert_baseline/xml/XmlBaselineAssertion.java rename to src/main/java/io/github/goatfryed/assert_baseline/xml/XmlBaselineAssertion.java index 25a55e6..1174be2 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/xml/XmlBaselineAssertion.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/xml/XmlBaselineAssertion.java @@ -1,8 +1,8 @@ -package com.github.goatfryed.assert_baseline.xml; +package io.github.goatfryed.assert_baseline.xml; -import com.github.goatfryed.assert_baseline.core.AbstractBaselineAssertion; -import com.github.goatfryed.assert_baseline.core.BaselineContext; -import com.github.goatfryed.assert_baseline.SerializableSubject; +import io.github.goatfryed.assert_baseline.core.AbstractBaselineAssertion; +import io.github.goatfryed.assert_baseline.core.BaselineContext; +import io.github.goatfryed.assert_baseline.SerializableSubject; import org.xmlunit.assertj.CompareAssert; import org.xmlunit.assertj.XmlAssert; diff --git a/src/main/java/com/github/goatfryed/assert_baseline/xml/XmlDiffConfiguration.java b/src/main/java/io/github/goatfryed/assert_baseline/xml/XmlDiffConfiguration.java similarity index 92% rename from src/main/java/com/github/goatfryed/assert_baseline/xml/XmlDiffConfiguration.java rename to src/main/java/io/github/goatfryed/assert_baseline/xml/XmlDiffConfiguration.java index fc641fb..7e48a46 100644 --- a/src/main/java/com/github/goatfryed/assert_baseline/xml/XmlDiffConfiguration.java +++ b/src/main/java/io/github/goatfryed/assert_baseline/xml/XmlDiffConfiguration.java @@ -1,4 +1,4 @@ -package com.github.goatfryed.assert_baseline.xml; +package io.github.goatfryed.assert_baseline.xml; import org.w3c.dom.Node; import org.xmlunit.diff.NodeFilters; diff --git a/src/test/java/com/github/goatfryed/assert_baseline/BaselineContextTest.java b/src/test/java/io/github/goatfryed/assert_baseline/BaselineContextTest.java similarity index 79% rename from src/test/java/com/github/goatfryed/assert_baseline/BaselineContextTest.java rename to src/test/java/io/github/goatfryed/assert_baseline/BaselineContextTest.java index 7879d65..153607e 100644 --- a/src/test/java/com/github/goatfryed/assert_baseline/BaselineContextTest.java +++ b/src/test/java/io/github/goatfryed/assert_baseline/BaselineContextTest.java @@ -1,6 +1,6 @@ -package com.github.goatfryed.assert_baseline; +package io.github.goatfryed.assert_baseline; -import com.github.goatfryed.assert_baseline.core.convention.presets.StandardConventionProvider; +import io.github.goatfryed.assert_baseline.core.convention.presets.StandardConventionProvider; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThatCode; diff --git a/src/test/java/com/github/goatfryed/assert_baseline/convention/StandardConventionTest.java b/src/test/java/io/github/goatfryed/assert_baseline/convention/StandardConventionTest.java similarity index 82% rename from src/test/java/com/github/goatfryed/assert_baseline/convention/StandardConventionTest.java rename to src/test/java/io/github/goatfryed/assert_baseline/convention/StandardConventionTest.java index f71fc1f..faef206 100644 --- a/src/test/java/com/github/goatfryed/assert_baseline/convention/StandardConventionTest.java +++ b/src/test/java/io/github/goatfryed/assert_baseline/convention/StandardConventionTest.java @@ -1,9 +1,8 @@ -package com.github.goatfryed.assert_baseline.convention; +package io.github.goatfryed.assert_baseline.convention; -import com.github.goatfryed.assert_baseline.core.BaselineContext; -import com.github.goatfryed.assert_baseline.core.convention.ConventionSupport; -import com.github.goatfryed.assert_baseline.core.convention.presets.StandardConventionProvider; -import com.github.goatfryed.assert_baseline.core.storage.FileValue; +import io.github.goatfryed.assert_baseline.core.BaselineContext; +import io.github.goatfryed.assert_baseline.core.convention.presets.StandardConventionProvider; +import io.github.goatfryed.assert_baseline.core.storage.FileValue; import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/goatfryed/assert_baseline/json/JsonBaselineAssertionTest.java b/src/test/java/io/github/goatfryed/assert_baseline/json/JsonBaselineAssertionTest.java similarity index 95% rename from src/test/java/com/github/goatfryed/assert_baseline/json/JsonBaselineAssertionTest.java rename to src/test/java/io/github/goatfryed/assert_baseline/json/JsonBaselineAssertionTest.java index 92fd66f..c589330 100644 --- a/src/test/java/com/github/goatfryed/assert_baseline/json/JsonBaselineAssertionTest.java +++ b/src/test/java/io/github/goatfryed/assert_baseline/json/JsonBaselineAssertionTest.java @@ -1,4 +1,4 @@ -package com.github.goatfryed.assert_baseline.json; +package io.github.goatfryed.assert_baseline.json; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.BeforeEach; @@ -8,7 +8,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Path; -import static com.github.goatfryed.assert_baseline.BaselineAssertions.assertThatJson; +import static io.github.goatfryed.assert_baseline.BaselineAssertions.assertThatJson; import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/com/github/goatfryed/assert_baseline/xml/XmlBaselineAssertionTest.java b/src/test/java/io/github/goatfryed/assert_baseline/xml/XmlBaselineAssertionTest.java similarity index 93% rename from src/test/java/com/github/goatfryed/assert_baseline/xml/XmlBaselineAssertionTest.java rename to src/test/java/io/github/goatfryed/assert_baseline/xml/XmlBaselineAssertionTest.java index 0e850e1..1edf988 100644 --- a/src/test/java/com/github/goatfryed/assert_baseline/xml/XmlBaselineAssertionTest.java +++ b/src/test/java/io/github/goatfryed/assert_baseline/xml/XmlBaselineAssertionTest.java @@ -1,4 +1,4 @@ -package com.github.goatfryed.assert_baseline.xml; +package io.github.goatfryed.assert_baseline.xml; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.BeforeEach; @@ -8,8 +8,8 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Path; -import static com.github.goatfryed.assert_baseline.BaselineAssertions.assertThatXml; -import static com.github.goatfryed.assert_baseline.xml.XmlDiffConfiguration.ignoringXPath; +import static io.github.goatfryed.assert_baseline.BaselineAssertions.assertThatXml; +import static io.github.goatfryed.assert_baseline.xml.XmlDiffConfiguration.ignoringXPath; import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/testRecipes/java/SiblingLayoutTest.java b/src/testRecipes/java/SiblingLayoutTest.java index c310ecc..761ec19 100644 --- a/src/testRecipes/java/SiblingLayoutTest.java +++ b/src/testRecipes/java/SiblingLayoutTest.java @@ -1,9 +1,9 @@ -import com.github.goatfryed.assert_baseline.core.convention.ConventionBuilder; +import io.github.goatfryed.assert_baseline.core.convention.ConventionBuilder; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static com.github.goatfryed.assert_baseline.BaselineAssertions.assertThatText; -import static com.github.goatfryed.assert_baseline.core.storage.StorageConfigUtils.inContextPath; +import static io.github.goatfryed.assert_baseline.BaselineAssertions.assertThatText; +import static io.github.goatfryed.assert_baseline.core.storage.StorageConfigUtils.inContextPath; import static support.Assertions.assertBaselineUsed; import static support.Assertions.assertActualFile; import static support.TestConventionProvider.testWithConvention; diff --git a/src/testRecipes/java/support/TestConventionProvider.java b/src/testRecipes/java/support/TestConventionProvider.java index 59b1fa3..fb19624 100644 --- a/src/testRecipes/java/support/TestConventionProvider.java +++ b/src/testRecipes/java/support/TestConventionProvider.java @@ -1,8 +1,8 @@ package support; -import com.github.goatfryed.assert_baseline.core.BaselineContextFactory; -import com.github.goatfryed.assert_baseline.core.convention.BaselineConvention; -import com.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider; +import io.github.goatfryed.assert_baseline.core.BaselineContextFactory; +import io.github.goatfryed.assert_baseline.core.convention.BaselineConvention; +import io.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider; public class TestConventionProvider implements BaselineConventionProvider { diff --git a/src/testRecipes/resources/META-INF/services/com.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider b/src/testRecipes/resources/META-INF/services/io.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider similarity index 100% rename from src/testRecipes/resources/META-INF/services/com.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider rename to src/testRecipes/resources/META-INF/services/io.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider diff --git a/src/testSpi/java/com/github/goatfryed/assert_baseline/ConventionServiceInjectionTest.java b/src/testSpi/java/io/github/goatfryed/assert_baseline/ConventionServiceInjectionTest.java similarity index 78% rename from src/testSpi/java/com/github/goatfryed/assert_baseline/ConventionServiceInjectionTest.java rename to src/testSpi/java/io/github/goatfryed/assert_baseline/ConventionServiceInjectionTest.java index aefc0e9..cb05bf6 100644 --- a/src/testSpi/java/com/github/goatfryed/assert_baseline/ConventionServiceInjectionTest.java +++ b/src/testSpi/java/io/github/goatfryed/assert_baseline/ConventionServiceInjectionTest.java @@ -1,6 +1,6 @@ -package com.github.goatfryed.assert_baseline; +package io.github.goatfryed.assert_baseline; -import com.github.goatfryed.assert_baseline.core.convention.BaselineConvention; +import io.github.goatfryed.assert_baseline.core.convention.BaselineConvention; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -8,7 +8,7 @@ import java.io.IOException; import java.nio.file.Files; -import static com.github.goatfryed.assert_baseline.BaselineAssertions.assertThatText; +import static io.github.goatfryed.assert_baseline.BaselineAssertions.assertThatText; import static org.junit.jupiter.api.Assertions.assertTrue; /** diff --git a/src/testSpi/java/com/github/goatfryed/assert_baseline/TestConventionProvider.java b/src/testSpi/java/io/github/goatfryed/assert_baseline/TestConventionProvider.java similarity index 66% rename from src/testSpi/java/com/github/goatfryed/assert_baseline/TestConventionProvider.java rename to src/testSpi/java/io/github/goatfryed/assert_baseline/TestConventionProvider.java index fcccbdf..1e61775 100644 --- a/src/testSpi/java/com/github/goatfryed/assert_baseline/TestConventionProvider.java +++ b/src/testSpi/java/io/github/goatfryed/assert_baseline/TestConventionProvider.java @@ -1,12 +1,12 @@ -package com.github.goatfryed.assert_baseline; +package io.github.goatfryed.assert_baseline; -import com.github.goatfryed.assert_baseline.core.convention.BaselineConvention; -import com.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider; +import io.github.goatfryed.assert_baseline.core.convention.BaselineConvention; +import io.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider; import java.nio.file.Path; -import static com.github.goatfryed.assert_baseline.core.convention.ConventionBuilder.builderWithDefaults; -import static com.github.goatfryed.assert_baseline.core.storage.StorageConfigUtils.*; +import static io.github.goatfryed.assert_baseline.core.convention.ConventionBuilder.builderWithDefaults; +import static io.github.goatfryed.assert_baseline.core.storage.StorageConfigUtils.*; /** * This convention is for test only and uses fixed files for actual and baseline content. diff --git a/src/testSpi/resources/META-INF/services/com.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider b/src/testSpi/resources/META-INF/services/com.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider deleted file mode 100644 index e49c380..0000000 --- a/src/testSpi/resources/META-INF/services/com.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider +++ /dev/null @@ -1 +0,0 @@ -com.github.goatfryed.assert_baseline.TestConventionProvider \ No newline at end of file diff --git a/src/testSpi/resources/META-INF/services/io.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider b/src/testSpi/resources/META-INF/services/io.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider new file mode 100644 index 0000000..7be71bf --- /dev/null +++ b/src/testSpi/resources/META-INF/services/io.github.goatfryed.assert_baseline.core.convention.BaselineConventionProvider @@ -0,0 +1 @@ +io.github.goatfryed.assert_baseline.TestConventionProvider \ No newline at end of file