Skip to content

Commit 0eec4c8

Browse files
authored
Merge pull request #83 from graphql-java/move-annotations
Moving annotations info their own package
2 parents 5805475 + 240da40 commit 0eec4c8

22 files changed

+28
-10
lines changed

src/main/java/org/dataloader/BatchLoader.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package org.dataloader;
1818

19+
import org.dataloader.annotations.PublicSpi;
20+
1921
import java.util.List;
2022
import java.util.concurrent.CompletionStage;
2123

src/main/java/org/dataloader/BatchLoaderContextProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.dataloader;
22

3+
import org.dataloader.annotations.PublicSpi;
4+
35
/**
46
* A BatchLoaderContextProvider is used by the {@link org.dataloader.DataLoader} code to
57
* provide overall calling context to the {@link org.dataloader.BatchLoader} call. A common use

src/main/java/org/dataloader/BatchLoaderEnvironment.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.dataloader;
22

3+
import org.dataloader.annotations.PublicApi;
34
import org.dataloader.impl.Assertions;
45

56
import java.util.ArrayList;

src/main/java/org/dataloader/BatchLoaderEnvironmentProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.dataloader;
22

3+
import org.dataloader.annotations.PublicSpi;
4+
35
/**
46
* A BatchLoaderEnvironmentProvider is used by the {@link org.dataloader.DataLoader} code to
57
* provide {@link org.dataloader.BatchLoaderEnvironment} calling context to

src/main/java/org/dataloader/BatchLoaderWithContext.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.dataloader;
22

3+
import org.dataloader.annotations.PublicSpi;
4+
35
import java.util.List;
46
import java.util.concurrent.CompletionStage;
57

src/main/java/org/dataloader/CacheMap.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.dataloader;
1818

19+
import org.dataloader.annotations.PublicSpi;
1920
import org.dataloader.impl.DefaultCacheMap;
2021

2122
import java.util.concurrent.CompletableFuture;

src/main/java/org/dataloader/DataLoader.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.dataloader;
1818

19+
import org.dataloader.annotations.PublicApi;
1920
import org.dataloader.impl.CompletableFutureKit;
2021
import org.dataloader.stats.Statistics;
2122
import org.dataloader.stats.StatisticsCollector;

src/main/java/org/dataloader/DataLoaderHelper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.dataloader;
22

3+
import org.dataloader.annotations.Internal;
34
import org.dataloader.impl.CompletableFutureKit;
45
import org.dataloader.stats.StatisticsCollector;
56

src/main/java/org/dataloader/DataLoaderOptions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.dataloader;
1818

19+
import org.dataloader.annotations.PublicApi;
1920
import org.dataloader.stats.SimpleStatisticsCollector;
2021
import org.dataloader.stats.StatisticsCollector;
2122

src/main/java/org/dataloader/DataLoaderRegistry.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.util.concurrent.ConcurrentHashMap;
99
import java.util.function.Function;
1010

11+
import org.dataloader.annotations.PublicApi;
1112
import org.dataloader.stats.Statistics;
1213

1314
/**

src/main/java/org/dataloader/DispatchResult.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.dataloader;
22

3+
import org.dataloader.annotations.PublicApi;
4+
35
import java.util.List;
46
import java.util.concurrent.CompletableFuture;
57

src/main/java/org/dataloader/Try.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.dataloader;
22

3+
import org.dataloader.annotations.PublicApi;
4+
35
import java.util.Optional;
46
import java.util.concurrent.Callable;
57
import java.util.concurrent.CompletionStage;

src/main/java/org/dataloader/Internal.java renamed to src/main/java/org/dataloader/annotations/Internal.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.dataloader;
1+
package org.dataloader.annotations;
22

33
import java.lang.annotation.Retention;
44
import java.lang.annotation.RetentionPolicy;

src/main/java/org/dataloader/PublicApi.java renamed to src/main/java/org/dataloader/annotations/PublicApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.dataloader;
1+
package org.dataloader.annotations;
22

33
import java.lang.annotation.Documented;
44
import java.lang.annotation.Retention;

src/main/java/org/dataloader/PublicSpi.java renamed to src/main/java/org/dataloader/annotations/PublicSpi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.dataloader;
1+
package org.dataloader.annotations;
22

33
import java.lang.annotation.Documented;
44
import java.lang.annotation.Retention;

src/main/java/org/dataloader/impl/Assertions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.dataloader.impl;
22

3-
import org.dataloader.Internal;
3+
import org.dataloader.annotations.Internal;
44

55
import java.util.Objects;
66

src/main/java/org/dataloader/impl/CompletableFutureKit.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.dataloader.impl;
22

3-
import org.dataloader.Internal;
3+
import org.dataloader.annotations.Internal;
44

55
import java.util.List;
66
import java.util.concurrent.CompletableFuture;

src/main/java/org/dataloader/impl/DefaultCacheMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.dataloader.impl;
1818

1919
import org.dataloader.CacheMap;
20-
import org.dataloader.Internal;
20+
import org.dataloader.annotations.Internal;
2121

2222
import java.util.HashMap;
2323
import java.util.Map;

src/main/java/org/dataloader/impl/PromisedValues.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.dataloader.impl;
22

3-
import org.dataloader.Internal;
3+
import org.dataloader.annotations.Internal;
44

55
import java.util.List;
66
import java.util.concurrent.CancellationException;

src/main/java/org/dataloader/impl/PromisedValuesImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.dataloader.impl;
22

3-
import org.dataloader.Internal;
3+
import org.dataloader.annotations.Internal;
44

55
import java.util.ArrayList;
66
import java.util.List;

src/main/java/org/dataloader/stats/Statistics.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.dataloader.stats;
22

3-
import org.dataloader.PublicApi;
3+
import org.dataloader.annotations.PublicApi;
44

55
import java.util.LinkedHashMap;
66
import java.util.Map;

src/main/java/org/dataloader/stats/StatisticsCollector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.dataloader.stats;
22

3-
import org.dataloader.PublicSpi;
3+
import org.dataloader.annotations.PublicSpi;
44

55
/**
66
* This allows statistics to be collected for {@link org.dataloader.DataLoader} operations

0 commit comments

Comments
 (0)