From 240da40dc9f235d8fb92f240f0dafcb37e247f72 Mon Sep 17 00:00:00 2001 From: Brad Baker Date: Fri, 25 Jun 2021 08:07:42 +1000 Subject: [PATCH] Moving annotations info their own package --- src/main/java/org/dataloader/BatchLoader.java | 2 ++ src/main/java/org/dataloader/BatchLoaderContextProvider.java | 2 ++ src/main/java/org/dataloader/BatchLoaderEnvironment.java | 1 + .../java/org/dataloader/BatchLoaderEnvironmentProvider.java | 2 ++ src/main/java/org/dataloader/BatchLoaderWithContext.java | 2 ++ src/main/java/org/dataloader/CacheMap.java | 1 + src/main/java/org/dataloader/DataLoader.java | 1 + src/main/java/org/dataloader/DataLoaderHelper.java | 1 + src/main/java/org/dataloader/DataLoaderOptions.java | 1 + src/main/java/org/dataloader/DataLoaderRegistry.java | 1 + src/main/java/org/dataloader/DispatchResult.java | 2 ++ src/main/java/org/dataloader/Try.java | 2 ++ src/main/java/org/dataloader/{ => annotations}/Internal.java | 2 +- src/main/java/org/dataloader/{ => annotations}/PublicApi.java | 2 +- src/main/java/org/dataloader/{ => annotations}/PublicSpi.java | 2 +- src/main/java/org/dataloader/impl/Assertions.java | 2 +- src/main/java/org/dataloader/impl/CompletableFutureKit.java | 2 +- src/main/java/org/dataloader/impl/DefaultCacheMap.java | 2 +- src/main/java/org/dataloader/impl/PromisedValues.java | 2 +- src/main/java/org/dataloader/impl/PromisedValuesImpl.java | 2 +- src/main/java/org/dataloader/stats/Statistics.java | 2 +- src/main/java/org/dataloader/stats/StatisticsCollector.java | 2 +- 22 files changed, 28 insertions(+), 10 deletions(-) rename src/main/java/org/dataloader/{ => annotations}/Internal.java (95%) rename src/main/java/org/dataloader/{ => annotations}/PublicApi.java (95%) rename src/main/java/org/dataloader/{ => annotations}/PublicSpi.java (96%) diff --git a/src/main/java/org/dataloader/BatchLoader.java b/src/main/java/org/dataloader/BatchLoader.java index aee9df2..fed2baf 100644 --- a/src/main/java/org/dataloader/BatchLoader.java +++ b/src/main/java/org/dataloader/BatchLoader.java @@ -16,6 +16,8 @@ package org.dataloader; +import org.dataloader.annotations.PublicSpi; + import java.util.List; import java.util.concurrent.CompletionStage; diff --git a/src/main/java/org/dataloader/BatchLoaderContextProvider.java b/src/main/java/org/dataloader/BatchLoaderContextProvider.java index 0eda7cc..d1eb1fe 100644 --- a/src/main/java/org/dataloader/BatchLoaderContextProvider.java +++ b/src/main/java/org/dataloader/BatchLoaderContextProvider.java @@ -1,5 +1,7 @@ package org.dataloader; +import org.dataloader.annotations.PublicSpi; + /** * A BatchLoaderContextProvider is used by the {@link org.dataloader.DataLoader} code to * provide overall calling context to the {@link org.dataloader.BatchLoader} call. A common use diff --git a/src/main/java/org/dataloader/BatchLoaderEnvironment.java b/src/main/java/org/dataloader/BatchLoaderEnvironment.java index 88bc174..dd2572b 100644 --- a/src/main/java/org/dataloader/BatchLoaderEnvironment.java +++ b/src/main/java/org/dataloader/BatchLoaderEnvironment.java @@ -1,5 +1,6 @@ package org.dataloader; +import org.dataloader.annotations.PublicApi; import org.dataloader.impl.Assertions; import java.util.ArrayList; diff --git a/src/main/java/org/dataloader/BatchLoaderEnvironmentProvider.java b/src/main/java/org/dataloader/BatchLoaderEnvironmentProvider.java index 66d46c1..fd60a14 100644 --- a/src/main/java/org/dataloader/BatchLoaderEnvironmentProvider.java +++ b/src/main/java/org/dataloader/BatchLoaderEnvironmentProvider.java @@ -1,5 +1,7 @@ package org.dataloader; +import org.dataloader.annotations.PublicSpi; + /** * A BatchLoaderEnvironmentProvider is used by the {@link org.dataloader.DataLoader} code to * provide {@link org.dataloader.BatchLoaderEnvironment} calling context to diff --git a/src/main/java/org/dataloader/BatchLoaderWithContext.java b/src/main/java/org/dataloader/BatchLoaderWithContext.java index b82a63f..fbe66b0 100644 --- a/src/main/java/org/dataloader/BatchLoaderWithContext.java +++ b/src/main/java/org/dataloader/BatchLoaderWithContext.java @@ -1,5 +1,7 @@ package org.dataloader; +import org.dataloader.annotations.PublicSpi; + import java.util.List; import java.util.concurrent.CompletionStage; diff --git a/src/main/java/org/dataloader/CacheMap.java b/src/main/java/org/dataloader/CacheMap.java index f60c6ef..9373a77 100644 --- a/src/main/java/org/dataloader/CacheMap.java +++ b/src/main/java/org/dataloader/CacheMap.java @@ -16,6 +16,7 @@ package org.dataloader; +import org.dataloader.annotations.PublicSpi; import org.dataloader.impl.DefaultCacheMap; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/org/dataloader/DataLoader.java b/src/main/java/org/dataloader/DataLoader.java index 3f200c3..2c194fc 100644 --- a/src/main/java/org/dataloader/DataLoader.java +++ b/src/main/java/org/dataloader/DataLoader.java @@ -16,6 +16,7 @@ package org.dataloader; +import org.dataloader.annotations.PublicApi; import org.dataloader.impl.CompletableFutureKit; import org.dataloader.stats.Statistics; import org.dataloader.stats.StatisticsCollector; diff --git a/src/main/java/org/dataloader/DataLoaderHelper.java b/src/main/java/org/dataloader/DataLoaderHelper.java index edef507..cecfc18 100644 --- a/src/main/java/org/dataloader/DataLoaderHelper.java +++ b/src/main/java/org/dataloader/DataLoaderHelper.java @@ -1,5 +1,6 @@ package org.dataloader; +import org.dataloader.annotations.Internal; import org.dataloader.impl.CompletableFutureKit; import org.dataloader.stats.StatisticsCollector; diff --git a/src/main/java/org/dataloader/DataLoaderOptions.java b/src/main/java/org/dataloader/DataLoaderOptions.java index 8158902..ac54c3e 100644 --- a/src/main/java/org/dataloader/DataLoaderOptions.java +++ b/src/main/java/org/dataloader/DataLoaderOptions.java @@ -16,6 +16,7 @@ package org.dataloader; +import org.dataloader.annotations.PublicApi; import org.dataloader.stats.SimpleStatisticsCollector; import org.dataloader.stats.StatisticsCollector; diff --git a/src/main/java/org/dataloader/DataLoaderRegistry.java b/src/main/java/org/dataloader/DataLoaderRegistry.java index bf9b2c6..627b82c 100644 --- a/src/main/java/org/dataloader/DataLoaderRegistry.java +++ b/src/main/java/org/dataloader/DataLoaderRegistry.java @@ -8,6 +8,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; +import org.dataloader.annotations.PublicApi; import org.dataloader.stats.Statistics; /** diff --git a/src/main/java/org/dataloader/DispatchResult.java b/src/main/java/org/dataloader/DispatchResult.java index c1b41aa..97711da 100644 --- a/src/main/java/org/dataloader/DispatchResult.java +++ b/src/main/java/org/dataloader/DispatchResult.java @@ -1,5 +1,7 @@ package org.dataloader; +import org.dataloader.annotations.PublicApi; + import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/org/dataloader/Try.java b/src/main/java/org/dataloader/Try.java index 6a7f44e..e273155 100644 --- a/src/main/java/org/dataloader/Try.java +++ b/src/main/java/org/dataloader/Try.java @@ -1,5 +1,7 @@ package org.dataloader; +import org.dataloader.annotations.PublicApi; + import java.util.Optional; import java.util.concurrent.Callable; import java.util.concurrent.CompletionStage; diff --git a/src/main/java/org/dataloader/Internal.java b/src/main/java/org/dataloader/annotations/Internal.java similarity index 95% rename from src/main/java/org/dataloader/Internal.java rename to src/main/java/org/dataloader/annotations/Internal.java index 736c033..4ad04cd 100644 --- a/src/main/java/org/dataloader/Internal.java +++ b/src/main/java/org/dataloader/annotations/Internal.java @@ -1,4 +1,4 @@ -package org.dataloader; +package org.dataloader.annotations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/org/dataloader/PublicApi.java b/src/main/java/org/dataloader/annotations/PublicApi.java similarity index 95% rename from src/main/java/org/dataloader/PublicApi.java rename to src/main/java/org/dataloader/annotations/PublicApi.java index d2472e9..157c0b1 100644 --- a/src/main/java/org/dataloader/PublicApi.java +++ b/src/main/java/org/dataloader/annotations/PublicApi.java @@ -1,4 +1,4 @@ -package org.dataloader; +package org.dataloader.annotations; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/src/main/java/org/dataloader/PublicSpi.java b/src/main/java/org/dataloader/annotations/PublicSpi.java similarity index 96% rename from src/main/java/org/dataloader/PublicSpi.java rename to src/main/java/org/dataloader/annotations/PublicSpi.java index 86a43e9..5f385b7 100644 --- a/src/main/java/org/dataloader/PublicSpi.java +++ b/src/main/java/org/dataloader/annotations/PublicSpi.java @@ -1,4 +1,4 @@ -package org.dataloader; +package org.dataloader.annotations; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/src/main/java/org/dataloader/impl/Assertions.java b/src/main/java/org/dataloader/impl/Assertions.java index 3b09814..60b605b 100644 --- a/src/main/java/org/dataloader/impl/Assertions.java +++ b/src/main/java/org/dataloader/impl/Assertions.java @@ -1,6 +1,6 @@ package org.dataloader.impl; -import org.dataloader.Internal; +import org.dataloader.annotations.Internal; import java.util.Objects; diff --git a/src/main/java/org/dataloader/impl/CompletableFutureKit.java b/src/main/java/org/dataloader/impl/CompletableFutureKit.java index 3cce6b5..2b94d10 100644 --- a/src/main/java/org/dataloader/impl/CompletableFutureKit.java +++ b/src/main/java/org/dataloader/impl/CompletableFutureKit.java @@ -1,6 +1,6 @@ package org.dataloader.impl; -import org.dataloader.Internal; +import org.dataloader.annotations.Internal; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/org/dataloader/impl/DefaultCacheMap.java b/src/main/java/org/dataloader/impl/DefaultCacheMap.java index 0dc377e..7245ce2 100644 --- a/src/main/java/org/dataloader/impl/DefaultCacheMap.java +++ b/src/main/java/org/dataloader/impl/DefaultCacheMap.java @@ -17,7 +17,7 @@ package org.dataloader.impl; import org.dataloader.CacheMap; -import org.dataloader.Internal; +import org.dataloader.annotations.Internal; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/dataloader/impl/PromisedValues.java b/src/main/java/org/dataloader/impl/PromisedValues.java index 0f992f8..89ae8de 100644 --- a/src/main/java/org/dataloader/impl/PromisedValues.java +++ b/src/main/java/org/dataloader/impl/PromisedValues.java @@ -1,6 +1,6 @@ package org.dataloader.impl; -import org.dataloader.Internal; +import org.dataloader.annotations.Internal; import java.util.List; import java.util.concurrent.CancellationException; diff --git a/src/main/java/org/dataloader/impl/PromisedValuesImpl.java b/src/main/java/org/dataloader/impl/PromisedValuesImpl.java index e6f9180..4cf3ea8 100644 --- a/src/main/java/org/dataloader/impl/PromisedValuesImpl.java +++ b/src/main/java/org/dataloader/impl/PromisedValuesImpl.java @@ -1,6 +1,6 @@ package org.dataloader.impl; -import org.dataloader.Internal; +import org.dataloader.annotations.Internal; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/dataloader/stats/Statistics.java b/src/main/java/org/dataloader/stats/Statistics.java index 6e0d102..4bc9c69 100644 --- a/src/main/java/org/dataloader/stats/Statistics.java +++ b/src/main/java/org/dataloader/stats/Statistics.java @@ -1,6 +1,6 @@ package org.dataloader.stats; -import org.dataloader.PublicApi; +import org.dataloader.annotations.PublicApi; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/org/dataloader/stats/StatisticsCollector.java b/src/main/java/org/dataloader/stats/StatisticsCollector.java index 49c979f..8fde3e4 100644 --- a/src/main/java/org/dataloader/stats/StatisticsCollector.java +++ b/src/main/java/org/dataloader/stats/StatisticsCollector.java @@ -1,6 +1,6 @@ package org.dataloader.stats; -import org.dataloader.PublicSpi; +import org.dataloader.annotations.PublicSpi; /** * This allows statistics to be collected for {@link org.dataloader.DataLoader} operations