From 2af4d98337d82e0ff3ccc0b25c1a561a134cfe8e Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 17 Jun 2020 19:47:48 +0200 Subject: [PATCH] Fix bolts duplicate classes (#1033) * fix bolts duplicate classes renaming bolts-tasks module to fix naming conflict with legacy bolts library * renamed bolts package --- .../boltsinternal}/AggregateException.java | 2 +- .../boltsinternal}/AndroidExecutors.java | 2 +- .../parse/boltsinternal}/BoltsExecutors.java | 2 +- .../boltsinternal}/CancellationToken.java | 4 +- .../CancellationTokenRegistration.java | 2 +- .../CancellationTokenSource.java | 2 +- .../parse/boltsinternal}/Capture.java | 2 +- .../parse/boltsinternal}/Continuation.java | 2 +- .../boltsinternal}/ExecutorException.java | 2 +- .../parse/boltsinternal}/Task.java | 30 ++++++------ .../boltsinternal}/TaskCompletionSource.java | 2 +- .../UnobservedErrorNotifier.java | 2 +- .../UnobservedTaskException.java | 2 +- .../boltsinternal}/CancellationTest.java | 2 +- .../parse/boltsinternal}/TaskTest.java | 2 +- .../parse/facebook/FacebookController.java | 2 +- .../parse/facebook/ParseFacebookUtils.java | 4 +- .../facebook/FacebookControllerTest.java | 2 +- .../facebook/ParseFacebookUtilsTest.java | 2 +- .../com/parse/gcm/ParseGCMJobService.java | 2 +- .../java/com/parse/google/ParseGoogleUtils.kt | 4 +- parse/build.gradle | 2 +- .../com/parse/AbstractQueryController.java | 4 +- .../java/com/parse/CacheQueryController.java | 4 +- .../CachedCurrentInstallationController.java | 4 +- .../parse/CachedCurrentUserController.java | 4 +- .../main/java/com/parse/EventuallyPin.java | 4 +- .../main/java/com/parse/FileObjectStore.java | 2 +- .../main/java/com/parse/LocationNotifier.java | 6 +-- .../com/parse/NetworkObjectController.java | 4 +- .../com/parse/NetworkQueryController.java | 4 +- .../com/parse/NetworkSessionController.java | 4 +- .../java/com/parse/NetworkUserController.java | 4 +- .../java/com/parse/OfflineObjectStore.java | 4 +- .../com/parse/OfflineQueryController.java | 2 +- .../java/com/parse/OfflineQueryLogic.java | 4 +- .../src/main/java/com/parse/OfflineStore.java | 8 ++-- parse/src/main/java/com/parse/Parse.java | 4 +- .../main/java/com/parse/ParseAnalytics.java | 6 +-- .../com/parse/ParseAnalyticsController.java | 2 +- .../java/com/parse/ParseAnonymousUtils.java | 2 +- .../com/parse/ParseAuthenticationManager.java | 4 +- parse/src/main/java/com/parse/ParseCloud.java | 4 +- .../com/parse/ParseCloudCodeController.java | 4 +- .../java/com/parse/ParseCommandCache.java | 8 ++-- .../src/main/java/com/parse/ParseConfig.java | 4 +- .../java/com/parse/ParseConfigController.java | 4 +- .../parse/ParseCurrentConfigController.java | 2 +- .../com/parse/ParseCurrentUserController.java | 2 +- .../java/com/parse/ParseEventuallyQueue.java | 2 +- .../main/java/com/parse/ParseExecutors.java | 2 +- parse/src/main/java/com/parse/ParseFile.java | 6 +-- .../java/com/parse/ParseFileController.java | 4 +- .../main/java/com/parse/ParseFileRequest.java | 2 +- .../main/java/com/parse/ParseGeoPoint.java | 4 +- .../java/com/parse/ParseInstallation.java | 4 +- .../src/main/java/com/parse/ParseObject.java | 48 +++++++++---------- .../java/com/parse/ParseObjectController.java | 2 +- .../parse/ParseObjectCurrentController.java | 2 +- .../main/java/com/parse/ParseObjectStore.java | 2 +- .../parse/ParsePinningEventuallyQueue.java | 6 +-- parse/src/main/java/com/parse/ParsePush.java | 4 +- .../parse/ParsePushChannelsController.java | 4 +- .../java/com/parse/ParsePushController.java | 2 +- parse/src/main/java/com/parse/ParseQuery.java | 6 +-- .../java/com/parse/ParseQueryController.java | 2 +- .../main/java/com/parse/ParseRESTCommand.java | 2 +- .../parse/ParseRESTObjectBatchCommand.java | 6 +-- .../java/com/parse/ParseRESTUserCommand.java | 2 +- .../src/main/java/com/parse/ParseRequest.java | 6 +-- .../java/com/parse/ParseSQLiteCursor.java | 2 +- .../java/com/parse/ParseSQLiteDatabase.java | 6 +-- .../java/com/parse/ParseSQLiteOpenHelper.java | 2 +- .../src/main/java/com/parse/ParseSession.java | 4 +- .../com/parse/ParseSessionController.java | 2 +- .../main/java/com/parse/ParseTaskUtils.java | 8 ++-- parse/src/main/java/com/parse/ParseUser.java | 4 +- .../java/com/parse/ParseUserController.java | 2 +- parse/src/main/java/com/parse/TaskQueue.java | 4 +- ...chedCurrentInstallationControllerTest.java | 4 +- .../CachedCurrentUserControllerTest.java | 2 +- .../java/com/parse/EventuallyPinTest.java | 2 +- .../parse/NetworkObjectControllerTest.java | 2 +- .../com/parse/NetworkQueryControllerTest.java | 2 +- .../com/parse/OfflineObjectStoreTest.java | 2 +- .../com/parse/OfflineQueryControllerTest.java | 2 +- .../java/com/parse/OfflineQueryLogicTest.java | 2 +- .../parse/ParseAnalyticsControllerTest.java | 2 +- .../java/com/parse/ParseAnalyticsTest.java | 2 +- .../parse/ParseAuthenticationManagerTest.java | 2 +- .../parse/ParseCloudCodeControllerTest.java | 2 +- .../test/java/com/parse/ParseCloudTest.java | 2 +- .../com/parse/ParseConfigControllerTest.java | 2 +- .../test/java/com/parse/ParseConfigTest.java | 2 +- .../java/com/parse/ParseCorePluginsTest.java | 2 +- .../ParseCurrentConfigControllerTest.java | 2 +- .../parse/ParseDefaultACLControllerTest.java | 2 +- .../com/parse/ParseFileControllerTest.java | 2 +- .../java/com/parse/ParseFileRequestTest.java | 2 +- .../test/java/com/parse/ParseFileTest.java | 2 +- .../java/com/parse/ParseInstallationTest.java | 2 +- .../com/parse/ParseKeyValueCacheTest.java | 2 +- .../test/java/com/parse/ParseObjectTest.java | 4 +- .../com/parse/ParsePushControllerTest.java | 2 +- .../test/java/com/parse/ParsePushTest.java | 4 +- .../test/java/com/parse/ParseQueryTest.java | 6 +-- .../java/com/parse/ParseRESTCommandTest.java | 2 +- .../test/java/com/parse/ParseRequestTest.java | 2 +- .../java/com/parse/ParseTaskUtilsTest.java | 8 ++-- .../test/java/com/parse/ParseTestUtils.java | 2 +- .../test/java/com/parse/ParseUserTest.java | 6 +-- .../java/com/parse/TaskQueueTestHelper.java | 6 +-- .../com/parse/twitter/ParseTwitterUtils.java | 6 +-- .../com/parse/twitter/TwitterController.java | 2 +- .../parse/twitter/ParseTwitterUtilsTest.java | 2 +- .../parse/twitter/TwitterControllerTest.java | 2 +- 116 files changed, 219 insertions(+), 221 deletions(-) rename bolts-tasks/src/main/java/{bolts => com/parse/boltsinternal}/AggregateException.java (99%) rename bolts-tasks/src/main/java/{bolts => com/parse/boltsinternal}/AndroidExecutors.java (99%) rename bolts-tasks/src/main/java/{bolts => com/parse/boltsinternal}/BoltsExecutors.java (99%) rename bolts-tasks/src/main/java/{bolts => com/parse/boltsinternal}/CancellationToken.java (97%) rename bolts-tasks/src/main/java/{bolts => com/parse/boltsinternal}/CancellationTokenRegistration.java (97%) rename bolts-tasks/src/main/java/{bolts => com/parse/boltsinternal}/CancellationTokenSource.java (99%) rename bolts-tasks/src/main/java/{bolts => com/parse/boltsinternal}/Capture.java (94%) rename bolts-tasks/src/main/java/{bolts => com/parse/boltsinternal}/Continuation.java (94%) rename bolts-tasks/src/main/java/{bolts => com/parse/boltsinternal}/ExecutorException.java (93%) rename bolts-tasks/src/main/java/{bolts => com/parse/boltsinternal}/Task.java (95%) rename bolts-tasks/src/main/java/{bolts => com/parse/boltsinternal}/TaskCompletionSource.java (98%) rename bolts-tasks/src/main/java/{bolts => com/parse/boltsinternal}/UnobservedErrorNotifier.java (97%) rename bolts-tasks/src/main/java/{bolts => com/parse/boltsinternal}/UnobservedTaskException.java (92%) rename bolts-tasks/src/test/java/{bolts => com/parse/boltsinternal}/CancellationTest.java (99%) rename bolts-tasks/src/test/java/{bolts => com/parse/boltsinternal}/TaskTest.java (99%) diff --git a/bolts-tasks/src/main/java/bolts/AggregateException.java b/bolts-tasks/src/main/java/com/parse/boltsinternal/AggregateException.java similarity index 99% rename from bolts-tasks/src/main/java/bolts/AggregateException.java rename to bolts-tasks/src/main/java/com/parse/boltsinternal/AggregateException.java index 18bf20ae9..8535c1ca5 100644 --- a/bolts-tasks/src/main/java/bolts/AggregateException.java +++ b/bolts-tasks/src/main/java/com/parse/boltsinternal/AggregateException.java @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -package bolts; +package com.parse.boltsinternal; import java.io.PrintStream; import java.io.PrintWriter; diff --git a/bolts-tasks/src/main/java/bolts/AndroidExecutors.java b/bolts-tasks/src/main/java/com/parse/boltsinternal/AndroidExecutors.java similarity index 99% rename from bolts-tasks/src/main/java/bolts/AndroidExecutors.java rename to bolts-tasks/src/main/java/com/parse/boltsinternal/AndroidExecutors.java index 50e84fa0f..45ee7769a 100644 --- a/bolts-tasks/src/main/java/bolts/AndroidExecutors.java +++ b/bolts-tasks/src/main/java/com/parse/boltsinternal/AndroidExecutors.java @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -package bolts; +package com.parse.boltsinternal; import android.annotation.SuppressLint; import android.os.Build; diff --git a/bolts-tasks/src/main/java/bolts/BoltsExecutors.java b/bolts-tasks/src/main/java/com/parse/boltsinternal/BoltsExecutors.java similarity index 99% rename from bolts-tasks/src/main/java/bolts/BoltsExecutors.java rename to bolts-tasks/src/main/java/com/parse/boltsinternal/BoltsExecutors.java index 16e77a6d6..866013cbd 100644 --- a/bolts-tasks/src/main/java/bolts/BoltsExecutors.java +++ b/bolts-tasks/src/main/java/com/parse/boltsinternal/BoltsExecutors.java @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -package bolts; +package com.parse.boltsinternal; import java.util.Locale; import java.util.concurrent.Executor; diff --git a/bolts-tasks/src/main/java/bolts/CancellationToken.java b/bolts-tasks/src/main/java/com/parse/boltsinternal/CancellationToken.java similarity index 97% rename from bolts-tasks/src/main/java/bolts/CancellationToken.java rename to bolts-tasks/src/main/java/com/parse/boltsinternal/CancellationToken.java index b8f2e2bf1..d9214f86c 100644 --- a/bolts-tasks/src/main/java/bolts/CancellationToken.java +++ b/bolts-tasks/src/main/java/com/parse/boltsinternal/CancellationToken.java @@ -4,10 +4,8 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -package bolts; +package com.parse.boltsinternal; -import java.util.ArrayList; -import java.util.List; import java.util.Locale; import java.util.concurrent.CancellationException; diff --git a/bolts-tasks/src/main/java/bolts/CancellationTokenRegistration.java b/bolts-tasks/src/main/java/com/parse/boltsinternal/CancellationTokenRegistration.java similarity index 97% rename from bolts-tasks/src/main/java/bolts/CancellationTokenRegistration.java rename to bolts-tasks/src/main/java/com/parse/boltsinternal/CancellationTokenRegistration.java index bdd0733ea..547128054 100644 --- a/bolts-tasks/src/main/java/bolts/CancellationTokenRegistration.java +++ b/bolts-tasks/src/main/java/com/parse/boltsinternal/CancellationTokenRegistration.java @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -package bolts; +package com.parse.boltsinternal; import java.io.Closeable; diff --git a/bolts-tasks/src/main/java/bolts/CancellationTokenSource.java b/bolts-tasks/src/main/java/com/parse/boltsinternal/CancellationTokenSource.java similarity index 99% rename from bolts-tasks/src/main/java/bolts/CancellationTokenSource.java rename to bolts-tasks/src/main/java/com/parse/boltsinternal/CancellationTokenSource.java index ff3fb8e60..b654a33f0 100644 --- a/bolts-tasks/src/main/java/bolts/CancellationTokenSource.java +++ b/bolts-tasks/src/main/java/com/parse/boltsinternal/CancellationTokenSource.java @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -package bolts; +package com.parse.boltsinternal; import java.io.Closeable; import java.util.ArrayList; diff --git a/bolts-tasks/src/main/java/bolts/Capture.java b/bolts-tasks/src/main/java/com/parse/boltsinternal/Capture.java similarity index 94% rename from bolts-tasks/src/main/java/bolts/Capture.java rename to bolts-tasks/src/main/java/com/parse/boltsinternal/Capture.java index b10c1f849..6c25974e5 100644 --- a/bolts-tasks/src/main/java/bolts/Capture.java +++ b/bolts-tasks/src/main/java/com/parse/boltsinternal/Capture.java @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -package bolts; +package com.parse.boltsinternal; /** * Provides a class that can be used for capturing variables in an anonymous class implementation. diff --git a/bolts-tasks/src/main/java/bolts/Continuation.java b/bolts-tasks/src/main/java/com/parse/boltsinternal/Continuation.java similarity index 94% rename from bolts-tasks/src/main/java/bolts/Continuation.java rename to bolts-tasks/src/main/java/com/parse/boltsinternal/Continuation.java index 2373c3371..ef5d898a7 100644 --- a/bolts-tasks/src/main/java/bolts/Continuation.java +++ b/bolts-tasks/src/main/java/com/parse/boltsinternal/Continuation.java @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -package bolts; +package com.parse.boltsinternal; /** * A function to be called after a task completes. diff --git a/bolts-tasks/src/main/java/bolts/ExecutorException.java b/bolts-tasks/src/main/java/com/parse/boltsinternal/ExecutorException.java similarity index 93% rename from bolts-tasks/src/main/java/bolts/ExecutorException.java rename to bolts-tasks/src/main/java/com/parse/boltsinternal/ExecutorException.java index f57748e35..8022cf106 100644 --- a/bolts-tasks/src/main/java/bolts/ExecutorException.java +++ b/bolts-tasks/src/main/java/com/parse/boltsinternal/ExecutorException.java @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -package bolts; +package com.parse.boltsinternal; /** * This is a wrapper class for emphasizing that task failed due to bad {@code Executor}, rather than diff --git a/bolts-tasks/src/main/java/bolts/Task.java b/bolts-tasks/src/main/java/com/parse/boltsinternal/Task.java similarity index 95% rename from bolts-tasks/src/main/java/bolts/Task.java rename to bolts-tasks/src/main/java/com/parse/boltsinternal/Task.java index 3c3e0c8b8..25732908d 100644 --- a/bolts-tasks/src/main/java/bolts/Task.java +++ b/bolts-tasks/src/main/java/com/parse/boltsinternal/Task.java @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -package bolts; +package com.parse.boltsinternal; import java.util.ArrayList; import java.util.Collection; @@ -111,7 +111,7 @@ private Task(boolean cancelled) { } /** - * @deprecated Please use {@link bolts.TaskCompletionSource()} instead. + * @deprecated Please use {@link com.parse.boltsinternal.TaskCompletionSource ()} instead. */ public static Task.TaskCompletionSource create() { Task task = new Task<>(); @@ -208,7 +208,7 @@ public static Task forResult(TResult value) { if (value instanceof Boolean) { return (Task) ((Boolean) value ? TASK_TRUE : TASK_FALSE); } - bolts.TaskCompletionSource tcs = new bolts.TaskCompletionSource<>(); + com.parse.boltsinternal.TaskCompletionSource tcs = new com.parse.boltsinternal.TaskCompletionSource<>(); tcs.setResult(value); return tcs.getTask(); } @@ -217,7 +217,7 @@ public static Task forResult(TResult value) { * Creates a faulted task with the given error. */ public static Task forError(Exception error) { - bolts.TaskCompletionSource tcs = new bolts.TaskCompletionSource<>(); + com.parse.boltsinternal.TaskCompletionSource tcs = new com.parse.boltsinternal.TaskCompletionSource<>(); tcs.setError(error); return tcs.getTask(); } @@ -262,7 +262,7 @@ static Task delay(long delay, ScheduledExecutorService executor, final Can return Task.forResult(null); } - final bolts.TaskCompletionSource tcs = new bolts.TaskCompletionSource<>(); + final com.parse.boltsinternal.TaskCompletionSource tcs = new com.parse.boltsinternal.TaskCompletionSource<>(); final ScheduledFuture scheduled = executor.schedule(new Runnable() { @Override public void run() { @@ -343,7 +343,7 @@ public static Task call(final Callable callable, Exe */ public static Task call(final Callable callable, Executor executor, final CancellationToken ct) { - final bolts.TaskCompletionSource tcs = new bolts.TaskCompletionSource<>(); + final com.parse.boltsinternal.TaskCompletionSource tcs = new com.parse.boltsinternal.TaskCompletionSource<>(); try { executor.execute(new Runnable() { @Override @@ -402,7 +402,7 @@ public static Task> whenAnyResult(Collection> firstCompleted = new bolts.TaskCompletionSource<>(); + final com.parse.boltsinternal.TaskCompletionSource> firstCompleted = new com.parse.boltsinternal.TaskCompletionSource<>(); final AtomicBoolean isAnyTaskComplete = new AtomicBoolean(false); for (Task task : tasks) { @@ -438,7 +438,7 @@ public static Task> whenAny(Collection> tasks) { return Task.forResult(null); } - final bolts.TaskCompletionSource> firstCompleted = new bolts.TaskCompletionSource<>(); + final com.parse.boltsinternal.TaskCompletionSource> firstCompleted = new com.parse.boltsinternal.TaskCompletionSource<>(); final AtomicBoolean isAnyTaskComplete = new AtomicBoolean(false); for (Task task : tasks) { @@ -524,7 +524,7 @@ public static Task whenAll(Collection> tasks) { return Task.forResult(null); } - final bolts.TaskCompletionSource allFinished = new bolts.TaskCompletionSource<>(); + final com.parse.boltsinternal.TaskCompletionSource allFinished = new com.parse.boltsinternal.TaskCompletionSource<>(); final ArrayList causes = new ArrayList<>(); final Object errorLock = new Object(); final AtomicInteger count = new AtomicInteger(tasks.size()); @@ -642,7 +642,7 @@ public Task continueWith( final Continuation continuation, final Executor executor, final CancellationToken ct) { boolean completed; - final bolts.TaskCompletionSource tcs = new bolts.TaskCompletionSource<>(); + final com.parse.boltsinternal.TaskCompletionSource tcs = new com.parse.boltsinternal.TaskCompletionSource<>(); synchronized (lock) { completed = this.isCompleted(); if (!completed) { @@ -696,7 +696,7 @@ public Task continueWithTask( final Continuation> continuation, final Executor executor, final CancellationToken ct) { boolean completed; - final bolts.TaskCompletionSource tcs = new bolts.TaskCompletionSource<>(); + final com.parse.boltsinternal.TaskCompletionSource tcs = new com.parse.boltsinternal.TaskCompletionSource<>(); synchronized (lock) { completed = this.isCompleted(); if (!completed) { @@ -850,7 +850,7 @@ public Task onSuccessTask( * scheduled on a different thread). */ private static void completeImmediately( - final bolts.TaskCompletionSource tcs, + final com.parse.boltsinternal.TaskCompletionSource tcs, final Continuation continuation, final Task task, Executor executor, final CancellationToken ct) { try { @@ -890,7 +890,7 @@ public void run() { * scheduled on a different thread). */ private static void completeAfterTask( - final bolts.TaskCompletionSource tcs, + final com.parse.boltsinternal.TaskCompletionSource tcs, final Continuation> continuation, final Task task, final Executor executor, final CancellationToken ct) { @@ -1006,9 +1006,9 @@ private void runContinuations() { } /** - * @deprecated Please use {@link bolts.TaskCompletionSource} instead. + * @deprecated Please use {@link com.parse.boltsinternal.TaskCompletionSource} instead. */ - public class TaskCompletionSource extends bolts.TaskCompletionSource { + public class TaskCompletionSource extends com.parse.boltsinternal.TaskCompletionSource { /* package */ TaskCompletionSource() { } diff --git a/bolts-tasks/src/main/java/bolts/TaskCompletionSource.java b/bolts-tasks/src/main/java/com/parse/boltsinternal/TaskCompletionSource.java similarity index 98% rename from bolts-tasks/src/main/java/bolts/TaskCompletionSource.java rename to bolts-tasks/src/main/java/com/parse/boltsinternal/TaskCompletionSource.java index df4b60c26..a268dd48b 100644 --- a/bolts-tasks/src/main/java/bolts/TaskCompletionSource.java +++ b/bolts-tasks/src/main/java/com/parse/boltsinternal/TaskCompletionSource.java @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -package bolts; +package com.parse.boltsinternal; /** * Allows safe orchestration of a task's completion, preventing the consumer from prematurely diff --git a/bolts-tasks/src/main/java/bolts/UnobservedErrorNotifier.java b/bolts-tasks/src/main/java/com/parse/boltsinternal/UnobservedErrorNotifier.java similarity index 97% rename from bolts-tasks/src/main/java/bolts/UnobservedErrorNotifier.java rename to bolts-tasks/src/main/java/com/parse/boltsinternal/UnobservedErrorNotifier.java index 591d3c4fb..cdd8a8e6b 100644 --- a/bolts-tasks/src/main/java/bolts/UnobservedErrorNotifier.java +++ b/bolts-tasks/src/main/java/com/parse/boltsinternal/UnobservedErrorNotifier.java @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -package bolts; +package com.parse.boltsinternal; /** * This class is used to retain a faulted task until either its error is observed or it is diff --git a/bolts-tasks/src/main/java/bolts/UnobservedTaskException.java b/bolts-tasks/src/main/java/com/parse/boltsinternal/UnobservedTaskException.java similarity index 92% rename from bolts-tasks/src/main/java/bolts/UnobservedTaskException.java rename to bolts-tasks/src/main/java/com/parse/boltsinternal/UnobservedTaskException.java index 2a4678b07..a726b5803 100644 --- a/bolts-tasks/src/main/java/bolts/UnobservedTaskException.java +++ b/bolts-tasks/src/main/java/com/parse/boltsinternal/UnobservedTaskException.java @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -package bolts; +package com.parse.boltsinternal; /** * Used to signify that a Task's error went unobserved. diff --git a/bolts-tasks/src/test/java/bolts/CancellationTest.java b/bolts-tasks/src/test/java/com/parse/boltsinternal/CancellationTest.java similarity index 99% rename from bolts-tasks/src/test/java/bolts/CancellationTest.java rename to bolts-tasks/src/test/java/com/parse/boltsinternal/CancellationTest.java index d768abc03..bc390acbe 100644 --- a/bolts-tasks/src/test/java/bolts/CancellationTest.java +++ b/bolts-tasks/src/test/java/com/parse/boltsinternal/CancellationTest.java @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -package bolts; +package com.parse.boltsinternal; import org.junit.Test; diff --git a/bolts-tasks/src/test/java/bolts/TaskTest.java b/bolts-tasks/src/test/java/com/parse/boltsinternal/TaskTest.java similarity index 99% rename from bolts-tasks/src/test/java/bolts/TaskTest.java rename to bolts-tasks/src/test/java/com/parse/boltsinternal/TaskTest.java index b1d1113ad..8d096dd46 100644 --- a/bolts-tasks/src/test/java/bolts/TaskTest.java +++ b/bolts-tasks/src/test/java/com/parse/boltsinternal/TaskTest.java @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -package bolts; +package com.parse.boltsinternal; import org.junit.Rule; import org.junit.Test; diff --git a/facebook/src/main/java/com/parse/facebook/FacebookController.java b/facebook/src/main/java/com/parse/facebook/FacebookController.java index 456be0711..8a3b85937 100644 --- a/facebook/src/main/java/com/parse/facebook/FacebookController.java +++ b/facebook/src/main/java/com/parse/facebook/FacebookController.java @@ -36,7 +36,7 @@ import java.util.Set; import java.util.SimpleTimeZone; -import bolts.Task; +import com.parse.boltsinternal.Task; class FacebookController { diff --git a/facebook/src/main/java/com/parse/facebook/ParseFacebookUtils.java b/facebook/src/main/java/com/parse/facebook/ParseFacebookUtils.java index a50679715..354714545 100644 --- a/facebook/src/main/java/com/parse/facebook/ParseFacebookUtils.java +++ b/facebook/src/main/java/com/parse/facebook/ParseFacebookUtils.java @@ -25,8 +25,8 @@ import java.util.Collections; import java.util.Map; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; /** * Provides a set of utilities for using Parse with Facebook. diff --git a/facebook/src/test/java/com/parse/facebook/FacebookControllerTest.java b/facebook/src/test/java/com/parse/facebook/FacebookControllerTest.java index 8e2ffe8ca..5abcf5e34 100644 --- a/facebook/src/test/java/com/parse/facebook/FacebookControllerTest.java +++ b/facebook/src/test/java/com/parse/facebook/FacebookControllerTest.java @@ -41,7 +41,7 @@ import java.util.Set; import java.util.TimeZone; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/facebook/src/test/java/com/parse/facebook/ParseFacebookUtilsTest.java b/facebook/src/test/java/com/parse/facebook/ParseFacebookUtilsTest.java index f11901309..058adc7d9 100644 --- a/facebook/src/test/java/com/parse/facebook/ParseFacebookUtilsTest.java +++ b/facebook/src/test/java/com/parse/facebook/ParseFacebookUtilsTest.java @@ -33,7 +33,7 @@ import java.util.LinkedList; import java.util.Map; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/gcm/src/main/java/com/parse/gcm/ParseGCMJobService.java b/gcm/src/main/java/com/parse/gcm/ParseGCMJobService.java index fc00887e5..113d935f7 100644 --- a/gcm/src/main/java/com/parse/gcm/ParseGCMJobService.java +++ b/gcm/src/main/java/com/parse/gcm/ParseGCMJobService.java @@ -23,7 +23,7 @@ import java.util.concurrent.Callable; -import bolts.Task; +import com.parse.boltsinternal.Task; /** * Handles saving the GCM token to the Parse Installation diff --git a/google/src/main/java/com/parse/google/ParseGoogleUtils.kt b/google/src/main/java/com/parse/google/ParseGoogleUtils.kt index 5358ae45e..0b53fe5f0 100644 --- a/google/src/main/java/com/parse/google/ParseGoogleUtils.kt +++ b/google/src/main/java/com/parse/google/ParseGoogleUtils.kt @@ -3,8 +3,8 @@ package com.parse.google import android.app.Activity import android.content.Context import android.content.Intent -import bolts.Continuation -import bolts.Task +import com.parse.boltsinternal.Continuation +import com.parse.boltsinternal.Task import com.google.android.gms.auth.api.signin.GoogleSignIn import com.google.android.gms.auth.api.signin.GoogleSignInAccount import com.google.android.gms.auth.api.signin.GoogleSignInClient diff --git a/parse/build.gradle b/parse/build.gradle index a388607b2..303f7a27a 100644 --- a/parse/build.gradle +++ b/parse/build.gradle @@ -36,7 +36,7 @@ dependencies { api "androidx.annotation:annotation:1.1.0" api "androidx.core:core:1.2.0" api "com.squareup.okhttp3:okhttp:$okhttpVersion" - api project(":bolts-tasks") + api project(':bolts-tasks') testImplementation "org.robolectric:robolectric:3.8" testImplementation "org.skyscreamer:jsonassert:1.5.0" diff --git a/parse/src/main/java/com/parse/AbstractQueryController.java b/parse/src/main/java/com/parse/AbstractQueryController.java index b11a670fd..6e54e272b 100644 --- a/parse/src/main/java/com/parse/AbstractQueryController.java +++ b/parse/src/main/java/com/parse/AbstractQueryController.java @@ -10,8 +10,8 @@ import java.util.List; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; /** * {@code AbstractParseQueryController} is an abstract implementation of diff --git a/parse/src/main/java/com/parse/CacheQueryController.java b/parse/src/main/java/com/parse/CacheQueryController.java index c3b36ce9a..70cc2cfa9 100644 --- a/parse/src/main/java/com/parse/CacheQueryController.java +++ b/parse/src/main/java/com/parse/CacheQueryController.java @@ -14,8 +14,8 @@ import java.util.List; import java.util.concurrent.Callable; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; class CacheQueryController extends AbstractQueryController { diff --git a/parse/src/main/java/com/parse/CachedCurrentInstallationController.java b/parse/src/main/java/com/parse/CachedCurrentInstallationController.java index b62173ddf..350a5154a 100644 --- a/parse/src/main/java/com/parse/CachedCurrentInstallationController.java +++ b/parse/src/main/java/com/parse/CachedCurrentInstallationController.java @@ -8,8 +8,8 @@ */ package com.parse; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; class CachedCurrentInstallationController implements ParseCurrentInstallationController { diff --git a/parse/src/main/java/com/parse/CachedCurrentUserController.java b/parse/src/main/java/com/parse/CachedCurrentUserController.java index 762972ec4..2db9f7a36 100644 --- a/parse/src/main/java/com/parse/CachedCurrentUserController.java +++ b/parse/src/main/java/com/parse/CachedCurrentUserController.java @@ -11,8 +11,8 @@ import java.util.Arrays; import java.util.Map; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; class CachedCurrentUserController implements ParseCurrentUserController { diff --git a/parse/src/main/java/com/parse/EventuallyPin.java b/parse/src/main/java/com/parse/EventuallyPin.java index aabd88954..d3fdada11 100644 --- a/parse/src/main/java/com/parse/EventuallyPin.java +++ b/parse/src/main/java/com/parse/EventuallyPin.java @@ -19,8 +19,8 @@ import java.util.List; import java.util.UUID; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; /** * Properties diff --git a/parse/src/main/java/com/parse/FileObjectStore.java b/parse/src/main/java/com/parse/FileObjectStore.java index 55bf7d415..8982434f6 100644 --- a/parse/src/main/java/com/parse/FileObjectStore.java +++ b/parse/src/main/java/com/parse/FileObjectStore.java @@ -15,7 +15,7 @@ import java.io.IOException; import java.util.concurrent.Callable; -import bolts.Task; +import com.parse.boltsinternal.Task; class FileObjectStore implements ParseObjectStore { diff --git a/parse/src/main/java/com/parse/LocationNotifier.java b/parse/src/main/java/com/parse/LocationNotifier.java index fe79d9706..0db252ac9 100644 --- a/parse/src/main/java/com/parse/LocationNotifier.java +++ b/parse/src/main/java/com/parse/LocationNotifier.java @@ -18,9 +18,9 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import bolts.Capture; -import bolts.Task; -import bolts.TaskCompletionSource; +import com.parse.boltsinternal.Capture; +import com.parse.boltsinternal.Task; +import com.parse.boltsinternal.TaskCompletionSource; /** * LocationNotifier is a wrapper around fetching the current device's location. It looks for the GPS diff --git a/parse/src/main/java/com/parse/NetworkObjectController.java b/parse/src/main/java/com/parse/NetworkObjectController.java index d05b776fa..0c668a1fd 100644 --- a/parse/src/main/java/com/parse/NetworkObjectController.java +++ b/parse/src/main/java/com/parse/NetworkObjectController.java @@ -13,8 +13,8 @@ import java.util.ArrayList; import java.util.List; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; class NetworkObjectController implements ParseObjectController { diff --git a/parse/src/main/java/com/parse/NetworkQueryController.java b/parse/src/main/java/com/parse/NetworkQueryController.java index 925d5ce1d..9721038c7 100644 --- a/parse/src/main/java/com/parse/NetworkQueryController.java +++ b/parse/src/main/java/com/parse/NetworkQueryController.java @@ -15,8 +15,8 @@ import java.util.ArrayList; import java.util.List; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; class NetworkQueryController extends AbstractQueryController { diff --git a/parse/src/main/java/com/parse/NetworkSessionController.java b/parse/src/main/java/com/parse/NetworkSessionController.java index 68fddeb2d..6a7607c36 100644 --- a/parse/src/main/java/com/parse/NetworkSessionController.java +++ b/parse/src/main/java/com/parse/NetworkSessionController.java @@ -10,8 +10,8 @@ import org.json.JSONObject; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; class NetworkSessionController implements ParseSessionController { diff --git a/parse/src/main/java/com/parse/NetworkUserController.java b/parse/src/main/java/com/parse/NetworkUserController.java index 300a1763f..317fe3eaf 100644 --- a/parse/src/main/java/com/parse/NetworkUserController.java +++ b/parse/src/main/java/com/parse/NetworkUserController.java @@ -12,8 +12,8 @@ import java.util.Map; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; class NetworkUserController implements ParseUserController { diff --git a/parse/src/main/java/com/parse/OfflineObjectStore.java b/parse/src/main/java/com/parse/OfflineObjectStore.java index fc825d143..afbd610e9 100644 --- a/parse/src/main/java/com/parse/OfflineObjectStore.java +++ b/parse/src/main/java/com/parse/OfflineObjectStore.java @@ -11,8 +11,8 @@ import java.util.Arrays; import java.util.List; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; class OfflineObjectStore implements ParseObjectStore { diff --git a/parse/src/main/java/com/parse/OfflineQueryController.java b/parse/src/main/java/com/parse/OfflineQueryController.java index 653afe9f8..a678f8130 100644 --- a/parse/src/main/java/com/parse/OfflineQueryController.java +++ b/parse/src/main/java/com/parse/OfflineQueryController.java @@ -10,7 +10,7 @@ import java.util.List; -import bolts.Task; +import com.parse.boltsinternal.Task; class OfflineQueryController extends AbstractQueryController { diff --git a/parse/src/main/java/com/parse/OfflineQueryLogic.java b/parse/src/main/java/com/parse/OfflineQueryLogic.java index 6f6909e54..59e512655 100644 --- a/parse/src/main/java/com/parse/OfflineQueryLogic.java +++ b/parse/src/main/java/com/parse/OfflineQueryLogic.java @@ -28,8 +28,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; class OfflineQueryLogic { private final OfflineStore store; diff --git a/parse/src/main/java/com/parse/OfflineStore.java b/parse/src/main/java/com/parse/OfflineStore.java index 0c19af80a..1dd23be15 100644 --- a/parse/src/main/java/com/parse/OfflineStore.java +++ b/parse/src/main/java/com/parse/OfflineStore.java @@ -28,10 +28,10 @@ import java.util.UUID; import java.util.WeakHashMap; -import bolts.Capture; -import bolts.Continuation; -import bolts.Task; -import bolts.TaskCompletionSource; +import com.parse.boltsinternal.Capture; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; +import com.parse.boltsinternal.TaskCompletionSource; class OfflineStore { diff --git a/parse/src/main/java/com/parse/Parse.java b/parse/src/main/java/com/parse/Parse.java index 2b0005cff..9525c711d 100644 --- a/parse/src/main/java/com/parse/Parse.java +++ b/parse/src/main/java/com/parse/Parse.java @@ -27,8 +27,8 @@ import java.util.Set; import java.util.concurrent.Callable; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; import okhttp3.OkHttpClient; /** diff --git a/parse/src/main/java/com/parse/ParseAnalytics.java b/parse/src/main/java/com/parse/ParseAnalytics.java index 98b7427f8..b153b46c7 100644 --- a/parse/src/main/java/com/parse/ParseAnalytics.java +++ b/parse/src/main/java/com/parse/ParseAnalytics.java @@ -18,9 +18,9 @@ import java.util.LinkedHashMap; import java.util.Map; -import bolts.Capture; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Capture; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; /** * The {@code ParseAnalytics} class provides an interface to Parse's logging and analytics backend. diff --git a/parse/src/main/java/com/parse/ParseAnalyticsController.java b/parse/src/main/java/com/parse/ParseAnalyticsController.java index fe60823bb..61c180a23 100644 --- a/parse/src/main/java/com/parse/ParseAnalyticsController.java +++ b/parse/src/main/java/com/parse/ParseAnalyticsController.java @@ -12,7 +12,7 @@ import java.util.Map; -import bolts.Task; +import com.parse.boltsinternal.Task; class ParseAnalyticsController { diff --git a/parse/src/main/java/com/parse/ParseAnonymousUtils.java b/parse/src/main/java/com/parse/ParseAnonymousUtils.java index fcbc49337..10be8cc42 100644 --- a/parse/src/main/java/com/parse/ParseAnonymousUtils.java +++ b/parse/src/main/java/com/parse/ParseAnonymousUtils.java @@ -12,7 +12,7 @@ import java.util.Map; import java.util.UUID; -import bolts.Task; +import com.parse.boltsinternal.Task; /** * Provides utility functions for working with Anonymously logged-in users. Anonymous users have diff --git a/parse/src/main/java/com/parse/ParseAuthenticationManager.java b/parse/src/main/java/com/parse/ParseAuthenticationManager.java index 814fa7ae6..f145a148f 100644 --- a/parse/src/main/java/com/parse/ParseAuthenticationManager.java +++ b/parse/src/main/java/com/parse/ParseAuthenticationManager.java @@ -12,8 +12,8 @@ import java.util.Map; import java.util.concurrent.Callable; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; class ParseAuthenticationManager { diff --git a/parse/src/main/java/com/parse/ParseCloud.java b/parse/src/main/java/com/parse/ParseCloud.java index bab79fb8c..05dd315bd 100644 --- a/parse/src/main/java/com/parse/ParseCloud.java +++ b/parse/src/main/java/com/parse/ParseCloud.java @@ -13,8 +13,8 @@ import java.util.List; import java.util.Map; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; /** * The ParseCloud class defines provides methods for interacting with Parse Cloud Functions. A Cloud diff --git a/parse/src/main/java/com/parse/ParseCloudCodeController.java b/parse/src/main/java/com/parse/ParseCloudCodeController.java index 423bca7b3..3703178f7 100644 --- a/parse/src/main/java/com/parse/ParseCloudCodeController.java +++ b/parse/src/main/java/com/parse/ParseCloudCodeController.java @@ -12,8 +12,8 @@ import java.util.Map; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; class ParseCloudCodeController { diff --git a/parse/src/main/java/com/parse/ParseCommandCache.java b/parse/src/main/java/com/parse/ParseCommandCache.java index f9fb874cc..17e4412cc 100644 --- a/parse/src/main/java/com/parse/ParseCommandCache.java +++ b/parse/src/main/java/com/parse/ParseCommandCache.java @@ -26,10 +26,10 @@ import java.util.logging.Level; import java.util.logging.Logger; -import bolts.Capture; -import bolts.Continuation; -import bolts.Task; -import bolts.TaskCompletionSource; +import com.parse.boltsinternal.Capture; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; +import com.parse.boltsinternal.TaskCompletionSource; /** * ParseCommandCache manages an on-disk cache of commands to be executed, and a thread with a diff --git a/parse/src/main/java/com/parse/ParseConfig.java b/parse/src/main/java/com/parse/ParseConfig.java index 7c7b1eaf6..e985cde3d 100644 --- a/parse/src/main/java/com/parse/ParseConfig.java +++ b/parse/src/main/java/com/parse/ParseConfig.java @@ -17,8 +17,8 @@ import java.util.List; import java.util.Map; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; /** * The {@code ParseConfig} is a local representation of configuration data that can be set from the diff --git a/parse/src/main/java/com/parse/ParseConfigController.java b/parse/src/main/java/com/parse/ParseConfigController.java index c64061694..6c8707498 100644 --- a/parse/src/main/java/com/parse/ParseConfigController.java +++ b/parse/src/main/java/com/parse/ParseConfigController.java @@ -10,8 +10,8 @@ import org.json.JSONObject; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; class ParseConfigController { diff --git a/parse/src/main/java/com/parse/ParseCurrentConfigController.java b/parse/src/main/java/com/parse/ParseCurrentConfigController.java index 723374a93..a78d7dd9b 100644 --- a/parse/src/main/java/com/parse/ParseCurrentConfigController.java +++ b/parse/src/main/java/com/parse/ParseCurrentConfigController.java @@ -15,7 +15,7 @@ import java.io.IOException; import java.util.concurrent.Callable; -import bolts.Task; +import com.parse.boltsinternal.Task; class ParseCurrentConfigController { diff --git a/parse/src/main/java/com/parse/ParseCurrentUserController.java b/parse/src/main/java/com/parse/ParseCurrentUserController.java index 604510887..f4dffe5f6 100644 --- a/parse/src/main/java/com/parse/ParseCurrentUserController.java +++ b/parse/src/main/java/com/parse/ParseCurrentUserController.java @@ -8,7 +8,7 @@ */ package com.parse; -import bolts.Task; +import com.parse.boltsinternal.Task; interface ParseCurrentUserController extends ParseObjectCurrentController { diff --git a/parse/src/main/java/com/parse/ParseEventuallyQueue.java b/parse/src/main/java/com/parse/ParseEventuallyQueue.java index f45b15f85..8152b6b64 100644 --- a/parse/src/main/java/com/parse/ParseEventuallyQueue.java +++ b/parse/src/main/java/com/parse/ParseEventuallyQueue.java @@ -18,7 +18,7 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import bolts.Task; +import com.parse.boltsinternal.Task; /* package */ abstract class ParseEventuallyQueue { diff --git a/parse/src/main/java/com/parse/ParseExecutors.java b/parse/src/main/java/com/parse/ParseExecutors.java index f953f352e..e0a0e7d57 100644 --- a/parse/src/main/java/com/parse/ParseExecutors.java +++ b/parse/src/main/java/com/parse/ParseExecutors.java @@ -11,7 +11,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import bolts.Task; +import com.parse.boltsinternal.Task; class ParseExecutors { diff --git a/parse/src/main/java/com/parse/ParseFile.java b/parse/src/main/java/com/parse/ParseFile.java index 768469be4..edf745d72 100644 --- a/parse/src/main/java/com/parse/ParseFile.java +++ b/parse/src/main/java/com/parse/ParseFile.java @@ -23,9 +23,9 @@ import java.util.Set; import java.util.concurrent.Callable; -import bolts.Continuation; -import bolts.Task; -import bolts.TaskCompletionSource; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; +import com.parse.boltsinternal.TaskCompletionSource; /** * {@code ParseFile} is a local representation of a file that is saved to the Parse cloud. diff --git a/parse/src/main/java/com/parse/ParseFileController.java b/parse/src/main/java/com/parse/ParseFileController.java index c25d30600..a6ba29316 100644 --- a/parse/src/main/java/com/parse/ParseFileController.java +++ b/parse/src/main/java/com/parse/ParseFileController.java @@ -17,8 +17,8 @@ import java.util.concurrent.Callable; import java.util.concurrent.CancellationException; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; // TODO(grantland): Create ParseFileController interface class ParseFileController { diff --git a/parse/src/main/java/com/parse/ParseFileRequest.java b/parse/src/main/java/com/parse/ParseFileRequest.java index 6c7d42d1e..49eaf4d07 100644 --- a/parse/src/main/java/com/parse/ParseFileRequest.java +++ b/parse/src/main/java/com/parse/ParseFileRequest.java @@ -16,7 +16,7 @@ import java.io.InputStream; import java.util.concurrent.Callable; -import bolts.Task; +import com.parse.boltsinternal.Task; /** * Request returns a byte array of the response and provides a callback the progress of the data diff --git a/parse/src/main/java/com/parse/ParseGeoPoint.java b/parse/src/main/java/com/parse/ParseGeoPoint.java index 9ad3bc273..87e1d12c7 100644 --- a/parse/src/main/java/com/parse/ParseGeoPoint.java +++ b/parse/src/main/java/com/parse/ParseGeoPoint.java @@ -15,8 +15,8 @@ import java.util.Locale; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; /** * {@code ParseGeoPoint} represents a latitude / longitude point that may be associated with a key diff --git a/parse/src/main/java/com/parse/ParseInstallation.java b/parse/src/main/java/com/parse/ParseInstallation.java index 3842bc1ca..3bfe0b9e4 100644 --- a/parse/src/main/java/com/parse/ParseInstallation.java +++ b/parse/src/main/java/com/parse/ParseInstallation.java @@ -19,8 +19,8 @@ import java.util.Locale; import java.util.TimeZone; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; /** * The {@code ParseInstallation} is a local representation of installation data that can be saved diff --git a/parse/src/main/java/com/parse/ParseObject.java b/parse/src/main/java/com/parse/ParseObject.java index bac5bda8f..d00526522 100644 --- a/parse/src/main/java/com/parse/ParseObject.java +++ b/parse/src/main/java/com/parse/ParseObject.java @@ -36,10 +36,10 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.Lock; -import bolts.Capture; -import bolts.Continuation; -import bolts.Task; -import bolts.TaskCompletionSource; +import com.parse.boltsinternal.Capture; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; +import com.parse.boltsinternal.TaskCompletionSource; /** * The {@code ParseObject} is a local representation of data that can be saved and retrieved from @@ -545,7 +545,7 @@ public static void deleteAllInBackground(List objects * because it batches the requests. * * @param objects The objects to delete. - * @return A {@link bolts.Task} that is resolved when deleteAll completes. + * @return A {@link Task} that is resolved when deleteAll completes. */ public static Task deleteAllInBackground(final List objects) { return ParseUser.getCurrentSessionTokenAsync().onSuccessTask(new Continuation>() { @@ -826,7 +826,7 @@ public static void saveAllInBackground(List objects, * to using saveAll, unless your code is already running from a background thread. * * @param objects The objects to save. - * @return A {@link bolts.Task} that is resolved when saveAll completes. + * @return A {@link Task} that is resolved when saveAll completes. */ public static Task saveAllInBackground(final List objects) { return ParseUser.getCurrentUserAsync().onSuccessTask(new Continuation>() { @@ -882,7 +882,7 @@ public Task then(Task task) { * Fetches all the objects that don't have data in the provided list in the background. * * @param objects The list of objects to fetch. - * @return A {@link bolts.Task} that is resolved when fetchAllIfNeeded completes. + * @return A {@link Task} that is resolved when fetchAllIfNeeded completes. */ public static Task> fetchAllIfNeededInBackground( final List objects) { @@ -1009,7 +1009,7 @@ public List then(Task> task) throws Exception { * Fetches all the objects in the provided list in the background. * * @param objects The list of objects to fetch. - * @return A {@link bolts.Task} that is resolved when fetch completes. + * @return A {@link Task} that is resolved when fetch completes. */ public static Task> fetchAllInBackground(final List objects) { return fetchAllAsync(objects, false); @@ -1090,7 +1090,7 @@ public static void pinAllInBackground(String name, * * @param name the name * @param objects the objects to be pinned - * @return A {@link bolts.Task} that is resolved when pinning all completes. + * @return A {@link Task} that is resolved when pinning all completes. * @see #unpinAllInBackground(String, java.util.List) */ public static Task pinAllInBackground(final String name, @@ -1204,7 +1204,7 @@ public static void pinAllInBackground(List objects, * {@link #createWithoutData(Class, String)} and then call {@link #fetchFromLocalDatastore()} on it. * * @param objects the objects to be pinned - * @return A {@link bolts.Task} that is resolved when pinning all completes. + * @return A {@link Task} that is resolved when pinning all completes. * @see #unpinAllInBackground(java.util.List) * @see #DEFAULT_PIN */ @@ -1246,7 +1246,7 @@ public static void unpinAllInBackground(String name, Lis * * @param name the name * @param objects the objects - * @return A {@link bolts.Task} that is resolved when unpinning all completes. + * @return A {@link Task} that is resolved when unpinning all completes. * @see #pinAllInBackground(String, java.util.List) */ public static Task unpinAllInBackground(String name, @@ -1291,7 +1291,7 @@ public static void unpinAllInBackground(List objects, * Removes the objects and every object they point to in the local datastore, recursively. * * @param objects the objects - * @return A {@link bolts.Task} that is resolved when unpinning all completes. + * @return A {@link Task} that is resolved when unpinning all completes. * @see #pinAllInBackground(java.util.List) * @see #DEFAULT_PIN */ @@ -1326,7 +1326,7 @@ public static void unpinAllInBackground(String name, DeleteCallback callback) { * Removes the objects and every object they point to in the local datastore, recursively. * * @param name the name - * @return A {@link bolts.Task} that is resolved when unpinning all completes. + * @return A {@link Task} that is resolved when unpinning all completes. * @see #pinAll(String, java.util.List) */ public static Task unpinAllInBackground(String name) { @@ -1365,7 +1365,7 @@ public static void unpinAllInBackground(DeleteCallback callback) { /** * Removes the objects and every object they point to in the local datastore, recursively. * - * @return A {@link bolts.Task} that is resolved when unpinning all completes. + * @return A {@link Task} that is resolved when unpinning all completes. * @see #pinAllInBackground(java.util.List, SaveCallback) * @see #DEFAULT_PIN */ @@ -2192,7 +2192,7 @@ public final void save() throws ParseException { * Saves this object to the server in a background thread. This is preferable to using {@link #save()}, * unless your code is already running from a background thread. * - * @return A {@link bolts.Task} that is resolved when the save completes. + * @return A {@link Task} that is resolved when the save completes. */ public final Task saveInBackground() { return ParseUser.getCurrentUserAsync().onSuccessTask(new Continuation>() { @@ -2357,7 +2357,7 @@ public final void saveEventually(SaveCallback callback) { * saves to be silently discarded until the connection can be re-established, and the queued * objects can be saved. * - * @return A {@link bolts.Task} that is resolved when the save completes. + * @return A {@link Task} that is resolved when the save completes. */ public final Task saveEventually() { if (!isDirty()) { @@ -2527,7 +2527,7 @@ public final void deleteEventually(DeleteCallback callback) { * {@link #saveEventually()} will cause old instructions to be silently discarded until the * connection can be re-established, and the queued objects can be saved. * - * @return A {@link bolts.Task} that is resolved when the delete completes. + * @return A {@link Task} that is resolved when the delete completes. */ public final Task deleteEventually() { final ParseRESTCommand command; @@ -2705,7 +2705,7 @@ public T then(Task task) { * Fetches this object with the data from the server in a background thread. This is preferable to * using fetch(), unless your code is already running from a background thread. * - * @return A {@link bolts.Task} that is resolved when fetch completes. + * @return A {@link Task} that is resolved when fetch completes. */ public final Task fetchInBackground() { return ParseUser.getCurrentSessionTokenAsync().onSuccessTask(new Continuation>() { @@ -2737,7 +2737,7 @@ public final void fetchInBackground(GetCallback callb * fetches this object with the data from the server in a background thread. This is preferable to * using {@link #fetchIfNeeded()}, unless your code is already running from a background thread. * - * @return A {@link bolts.Task} that is resolved when fetch completes. + * @return A {@link Task} that is resolved when fetch completes. */ public final Task fetchIfNeededInBackground() { if (isDataAvailable()) { @@ -2859,7 +2859,7 @@ public Task then(Task task) { * Deletes this object on the server in a background thread. This is preferable to using * {@link #delete()}, unless your code is already running from a background thread. * - * @return A {@link bolts.Task} that is resolved when delete completes. + * @return A {@link Task} that is resolved when delete completes. */ public final Task deleteInBackground() { return ParseUser.getCurrentSessionTokenAsync().onSuccessTask(new Continuation>() { @@ -3703,7 +3703,7 @@ public void pinInBackground(String name, SaveCallback callback) { * {@link #createWithoutData(Class, String)} and then call {@link #fetchFromLocalDatastore()} on * it. * - * @return A {@link bolts.Task} that is resolved when pinning completes. + * @return A {@link Task} that is resolved when pinning completes. * @see #unpinInBackground(String) */ public Task pinInBackground(String name) { @@ -3753,7 +3753,7 @@ public void pinInBackground(SaveCallback callback) { * {@link #createWithoutData(Class, String)} and then call {@link #fetchFromLocalDatastore()} on * it. * - * @return A {@link bolts.Task} that is resolved when pinning completes. + * @return A {@link Task} that is resolved when pinning completes. * @see #unpinInBackground() * @see #DEFAULT_PIN */ @@ -3790,7 +3790,7 @@ public void unpinInBackground(String name, DeleteCallback callback) { /** * Removes the object and every object it points to in the local datastore, recursively. * - * @return A {@link bolts.Task} that is resolved when unpinning completes. + * @return A {@link Task} that is resolved when unpinning completes. * @see #pinInBackground(String) */ public Task unpinInBackground(String name) { @@ -3820,7 +3820,7 @@ public void unpinInBackground(DeleteCallback callback) { /** * Removes the object and every object it points to in the local datastore, recursively. * - * @return A {@link bolts.Task} that is resolved when unpinning completes. + * @return A {@link Task} that is resolved when unpinning completes. * @see #pinInBackground() * @see #DEFAULT_PIN */ diff --git a/parse/src/main/java/com/parse/ParseObjectController.java b/parse/src/main/java/com/parse/ParseObjectController.java index 0d6bb841d..9a2204bff 100644 --- a/parse/src/main/java/com/parse/ParseObjectController.java +++ b/parse/src/main/java/com/parse/ParseObjectController.java @@ -10,7 +10,7 @@ import java.util.List; -import bolts.Task; +import com.parse.boltsinternal.Task; interface ParseObjectController { diff --git a/parse/src/main/java/com/parse/ParseObjectCurrentController.java b/parse/src/main/java/com/parse/ParseObjectCurrentController.java index 39cfd8669..7951144a5 100644 --- a/parse/src/main/java/com/parse/ParseObjectCurrentController.java +++ b/parse/src/main/java/com/parse/ParseObjectCurrentController.java @@ -8,7 +8,7 @@ */ package com.parse; -import bolts.Task; +import com.parse.boltsinternal.Task; interface ParseObjectCurrentController { diff --git a/parse/src/main/java/com/parse/ParseObjectStore.java b/parse/src/main/java/com/parse/ParseObjectStore.java index 36ebd43d4..38f1e72f7 100644 --- a/parse/src/main/java/com/parse/ParseObjectStore.java +++ b/parse/src/main/java/com/parse/ParseObjectStore.java @@ -8,7 +8,7 @@ */ package com.parse; -import bolts.Task; +import com.parse.boltsinternal.Task; interface ParseObjectStore { diff --git a/parse/src/main/java/com/parse/ParsePinningEventuallyQueue.java b/parse/src/main/java/com/parse/ParsePinningEventuallyQueue.java index dc2aa7285..0e1cd9570 100644 --- a/parse/src/main/java/com/parse/ParsePinningEventuallyQueue.java +++ b/parse/src/main/java/com/parse/ParsePinningEventuallyQueue.java @@ -22,9 +22,9 @@ import java.util.HashMap; import java.util.List; -import bolts.Continuation; -import bolts.Task; -import bolts.TaskCompletionSource; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; +import com.parse.boltsinternal.TaskCompletionSource; /** * Manages all *Eventually calls when the local datastore is enabled. diff --git a/parse/src/main/java/com/parse/ParsePush.java b/parse/src/main/java/com/parse/ParsePush.java index 56fb5b6f2..b91ca00cc 100644 --- a/parse/src/main/java/com/parse/ParsePush.java +++ b/parse/src/main/java/com/parse/ParsePush.java @@ -16,8 +16,8 @@ import java.util.HashSet; import java.util.Set; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; /** * The {@code ParsePush} is a local representation of data that can be sent as a push notification. diff --git a/parse/src/main/java/com/parse/ParsePushChannelsController.java b/parse/src/main/java/com/parse/ParsePushChannelsController.java index fd6738d0f..f2468f550 100644 --- a/parse/src/main/java/com/parse/ParsePushChannelsController.java +++ b/parse/src/main/java/com/parse/ParsePushChannelsController.java @@ -11,8 +11,8 @@ import java.util.Collections; import java.util.List; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; class ParsePushChannelsController { diff --git a/parse/src/main/java/com/parse/ParsePushController.java b/parse/src/main/java/com/parse/ParsePushController.java index 22c460472..2991e115a 100644 --- a/parse/src/main/java/com/parse/ParsePushController.java +++ b/parse/src/main/java/com/parse/ParsePushController.java @@ -8,7 +8,7 @@ */ package com.parse; -import bolts.Task; +import com.parse.boltsinternal.Task; class ParsePushController { diff --git a/parse/src/main/java/com/parse/ParseQuery.java b/parse/src/main/java/com/parse/ParseQuery.java index a149f9503..22d1178b9 100644 --- a/parse/src/main/java/com/parse/ParseQuery.java +++ b/parse/src/main/java/com/parse/ParseQuery.java @@ -25,9 +25,9 @@ import java.util.concurrent.Callable; import java.util.regex.Pattern; -import bolts.Continuation; -import bolts.Task; -import bolts.TaskCompletionSource; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; +import com.parse.boltsinternal.TaskCompletionSource; /** * The {@code ParseQuery} class defines a query that is used to fetch {@link ParseObject}s. The most diff --git a/parse/src/main/java/com/parse/ParseQueryController.java b/parse/src/main/java/com/parse/ParseQueryController.java index d5ccca387..8917558fd 100644 --- a/parse/src/main/java/com/parse/ParseQueryController.java +++ b/parse/src/main/java/com/parse/ParseQueryController.java @@ -10,7 +10,7 @@ import java.util.List; -import bolts.Task; +import com.parse.boltsinternal.Task; /** * A {@code ParseQueryController} defines how a {@link ParseQuery} is executed. diff --git a/parse/src/main/java/com/parse/ParseRESTCommand.java b/parse/src/main/java/com/parse/ParseRESTCommand.java index 7d4df4ca1..250b5a783 100644 --- a/parse/src/main/java/com/parse/ParseRESTCommand.java +++ b/parse/src/main/java/com/parse/ParseRESTCommand.java @@ -26,7 +26,7 @@ import java.util.Iterator; import java.util.Map; -import bolts.Task; +import com.parse.boltsinternal.Task; /** * A helper object to send requests to the server. diff --git a/parse/src/main/java/com/parse/ParseRESTObjectBatchCommand.java b/parse/src/main/java/com/parse/ParseRESTObjectBatchCommand.java index e59f06560..75fa1bd09 100644 --- a/parse/src/main/java/com/parse/ParseRESTObjectBatchCommand.java +++ b/parse/src/main/java/com/parse/ParseRESTObjectBatchCommand.java @@ -22,9 +22,9 @@ import java.util.ArrayList; import java.util.List; -import bolts.Continuation; -import bolts.Task; -import bolts.TaskCompletionSource; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; +import com.parse.boltsinternal.TaskCompletionSource; class ParseRESTObjectBatchCommand extends ParseRESTCommand { public final static int COMMAND_OBJECT_BATCH_MAX_SIZE = 50; diff --git a/parse/src/main/java/com/parse/ParseRESTUserCommand.java b/parse/src/main/java/com/parse/ParseRESTUserCommand.java index 56e338516..a3df33438 100644 --- a/parse/src/main/java/com/parse/ParseRESTUserCommand.java +++ b/parse/src/main/java/com/parse/ParseRESTUserCommand.java @@ -17,7 +17,7 @@ import java.util.HashMap; import java.util.Map; -import bolts.Task; +import com.parse.boltsinternal.Task; class ParseRESTUserCommand extends ParseRESTCommand { diff --git a/parse/src/main/java/com/parse/ParseRequest.java b/parse/src/main/java/com/parse/ParseRequest.java index 6b6c71f70..efd5443bf 100644 --- a/parse/src/main/java/com/parse/ParseRequest.java +++ b/parse/src/main/java/com/parse/ParseRequest.java @@ -23,9 +23,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import bolts.Continuation; -import bolts.Task; -import bolts.TaskCompletionSource; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; +import com.parse.boltsinternal.TaskCompletionSource; /** * ParseRequest takes an arbitrary HttpUriRequest and retries it a number of times with diff --git a/parse/src/main/java/com/parse/ParseSQLiteCursor.java b/parse/src/main/java/com/parse/ParseSQLiteCursor.java index 30d727c64..092c9db27 100644 --- a/parse/src/main/java/com/parse/ParseSQLiteCursor.java +++ b/parse/src/main/java/com/parse/ParseSQLiteCursor.java @@ -21,7 +21,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.Executor; -import bolts.Task; +import com.parse.boltsinternal.Task; /** * Wrapper class to invoke {@link Cursor#close()} on a specific thread on Android versions below diff --git a/parse/src/main/java/com/parse/ParseSQLiteDatabase.java b/parse/src/main/java/com/parse/ParseSQLiteDatabase.java index 76282193d..c1e72dd4d 100644 --- a/parse/src/main/java/com/parse/ParseSQLiteDatabase.java +++ b/parse/src/main/java/com/parse/ParseSQLiteDatabase.java @@ -16,9 +16,9 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import bolts.Continuation; -import bolts.Task; -import bolts.TaskCompletionSource; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; +import com.parse.boltsinternal.TaskCompletionSource; class ParseSQLiteDatabase { diff --git a/parse/src/main/java/com/parse/ParseSQLiteOpenHelper.java b/parse/src/main/java/com/parse/ParseSQLiteOpenHelper.java index f7070dd5d..49f3f918d 100644 --- a/parse/src/main/java/com/parse/ParseSQLiteOpenHelper.java +++ b/parse/src/main/java/com/parse/ParseSQLiteOpenHelper.java @@ -12,7 +12,7 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import bolts.Task; +import com.parse.boltsinternal.Task; abstract class ParseSQLiteOpenHelper { diff --git a/parse/src/main/java/com/parse/ParseSession.java b/parse/src/main/java/com/parse/ParseSession.java index 307f352a1..7824a379d 100644 --- a/parse/src/main/java/com/parse/ParseSession.java +++ b/parse/src/main/java/com/parse/ParseSession.java @@ -12,8 +12,8 @@ import java.util.Collections; import java.util.List; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; /** * The {@code ParseSession} is a local representation of session data that can be saved diff --git a/parse/src/main/java/com/parse/ParseSessionController.java b/parse/src/main/java/com/parse/ParseSessionController.java index e85e8d31e..79ebf6c49 100644 --- a/parse/src/main/java/com/parse/ParseSessionController.java +++ b/parse/src/main/java/com/parse/ParseSessionController.java @@ -8,7 +8,7 @@ */ package com.parse; -import bolts.Task; +import com.parse.boltsinternal.Task; interface ParseSessionController { diff --git a/parse/src/main/java/com/parse/ParseTaskUtils.java b/parse/src/main/java/com/parse/ParseTaskUtils.java index 068066687..82e1bdb27 100644 --- a/parse/src/main/java/com/parse/ParseTaskUtils.java +++ b/parse/src/main/java/com/parse/ParseTaskUtils.java @@ -10,10 +10,10 @@ import java.util.concurrent.CancellationException; -import bolts.AggregateException; -import bolts.Continuation; -import bolts.Task; -import bolts.TaskCompletionSource; +import com.parse.boltsinternal.AggregateException; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; +import com.parse.boltsinternal.TaskCompletionSource; class ParseTaskUtils { diff --git a/parse/src/main/java/com/parse/ParseUser.java b/parse/src/main/java/com/parse/ParseUser.java index a8a9bac90..b93dbb2db 100644 --- a/parse/src/main/java/com/parse/ParseUser.java +++ b/parse/src/main/java/com/parse/ParseUser.java @@ -23,8 +23,8 @@ import java.util.List; import java.util.Map; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; /** * The {@code ParseUser} is a local representation of user data that can be saved and retrieved from diff --git a/parse/src/main/java/com/parse/ParseUserController.java b/parse/src/main/java/com/parse/ParseUserController.java index 15af4eb14..0ee548231 100644 --- a/parse/src/main/java/com/parse/ParseUserController.java +++ b/parse/src/main/java/com/parse/ParseUserController.java @@ -10,7 +10,7 @@ import java.util.Map; -import bolts.Task; +import com.parse.boltsinternal.Task; interface ParseUserController { diff --git a/parse/src/main/java/com/parse/TaskQueue.java b/parse/src/main/java/com/parse/TaskQueue.java index df127ab41..f8ba25181 100644 --- a/parse/src/main/java/com/parse/TaskQueue.java +++ b/parse/src/main/java/com/parse/TaskQueue.java @@ -12,8 +12,8 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; /** * A helper class for enqueueing tasks diff --git a/parse/src/test/java/com/parse/CachedCurrentInstallationControllerTest.java b/parse/src/test/java/com/parse/CachedCurrentInstallationControllerTest.java index bee718324..421ecf3c1 100644 --- a/parse/src/test/java/com/parse/CachedCurrentInstallationControllerTest.java +++ b/parse/src/test/java/com/parse/CachedCurrentInstallationControllerTest.java @@ -12,8 +12,8 @@ import org.junit.Before; import org.junit.Test; -import bolts.Task; -import bolts.TaskCompletionSource; +import com.parse.boltsinternal.Task; +import com.parse.boltsinternal.TaskCompletionSource; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/parse/src/test/java/com/parse/CachedCurrentUserControllerTest.java b/parse/src/test/java/com/parse/CachedCurrentUserControllerTest.java index 8bd37eb91..56d05a444 100644 --- a/parse/src/test/java/com/parse/CachedCurrentUserControllerTest.java +++ b/parse/src/test/java/com/parse/CachedCurrentUserControllerTest.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.Map; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/parse/src/test/java/com/parse/EventuallyPinTest.java b/parse/src/test/java/com/parse/EventuallyPinTest.java index dcfaec909..d8d6d05cb 100644 --- a/parse/src/test/java/com/parse/EventuallyPinTest.java +++ b/parse/src/test/java/com/parse/EventuallyPinTest.java @@ -11,7 +11,7 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; diff --git a/parse/src/test/java/com/parse/NetworkObjectControllerTest.java b/parse/src/test/java/com/parse/NetworkObjectControllerTest.java index e747f6cde..866af9f30 100644 --- a/parse/src/test/java/com/parse/NetworkObjectControllerTest.java +++ b/parse/src/test/java/com/parse/NetworkObjectControllerTest.java @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.List; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/parse/src/test/java/com/parse/NetworkQueryControllerTest.java b/parse/src/test/java/com/parse/NetworkQueryControllerTest.java index beca43611..74b9ff82a 100644 --- a/parse/src/test/java/com/parse/NetworkQueryControllerTest.java +++ b/parse/src/test/java/com/parse/NetworkQueryControllerTest.java @@ -19,7 +19,7 @@ import java.net.URL; import java.util.List; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; diff --git a/parse/src/test/java/com/parse/OfflineObjectStoreTest.java b/parse/src/test/java/com/parse/OfflineObjectStoreTest.java index f134e672a..6affeb896 100644 --- a/parse/src/test/java/com/parse/OfflineObjectStoreTest.java +++ b/parse/src/test/java/com/parse/OfflineObjectStoreTest.java @@ -18,7 +18,7 @@ import java.util.Arrays; import java.util.Collections; -import bolts.Task; +import com.parse.boltsinternal.Task; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertSame; diff --git a/parse/src/test/java/com/parse/OfflineQueryControllerTest.java b/parse/src/test/java/com/parse/OfflineQueryControllerTest.java index fa1d9d271..e3172f075 100644 --- a/parse/src/test/java/com/parse/OfflineQueryControllerTest.java +++ b/parse/src/test/java/com/parse/OfflineQueryControllerTest.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertTrue; diff --git a/parse/src/test/java/com/parse/OfflineQueryLogicTest.java b/parse/src/test/java/com/parse/OfflineQueryLogicTest.java index 3b08e142b..94f775866 100644 --- a/parse/src/test/java/com/parse/OfflineQueryLogicTest.java +++ b/parse/src/test/java/com/parse/OfflineQueryLogicTest.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.regex.Pattern; -import bolts.Task; +import com.parse.boltsinternal.Task; import static com.parse.ParseMatchers.hasParseErrorCode; import static org.junit.Assert.assertEquals; diff --git a/parse/src/test/java/com/parse/ParseAnalyticsControllerTest.java b/parse/src/test/java/com/parse/ParseAnalyticsControllerTest.java index 4a3a65cb2..428525597 100644 --- a/parse/src/test/java/com/parse/ParseAnalyticsControllerTest.java +++ b/parse/src/test/java/com/parse/ParseAnalyticsControllerTest.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/parse/src/test/java/com/parse/ParseAnalyticsTest.java b/parse/src/test/java/com/parse/ParseAnalyticsTest.java index 42bf0fbc9..bbebcb999 100644 --- a/parse/src/test/java/com/parse/ParseAnalyticsTest.java +++ b/parse/src/test/java/com/parse/ParseAnalyticsTest.java @@ -26,7 +26,7 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/parse/src/test/java/com/parse/ParseAuthenticationManagerTest.java b/parse/src/test/java/com/parse/ParseAuthenticationManagerTest.java index 699bb4bd0..b5daa700b 100644 --- a/parse/src/test/java/com/parse/ParseAuthenticationManagerTest.java +++ b/parse/src/test/java/com/parse/ParseAuthenticationManagerTest.java @@ -17,7 +17,7 @@ import java.util.HashMap; import java.util.Map; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/parse/src/test/java/com/parse/ParseCloudCodeControllerTest.java b/parse/src/test/java/com/parse/ParseCloudCodeControllerTest.java index 0833a2061..177ab4ae9 100644 --- a/parse/src/test/java/com/parse/ParseCloudCodeControllerTest.java +++ b/parse/src/test/java/com/parse/ParseCloudCodeControllerTest.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.List; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertEquals; diff --git a/parse/src/test/java/com/parse/ParseCloudTest.java b/parse/src/test/java/com/parse/ParseCloudTest.java index a8ee6d8f6..e5e70700a 100644 --- a/parse/src/test/java/com/parse/ParseCloudTest.java +++ b/parse/src/test/java/com/parse/ParseCloudTest.java @@ -20,7 +20,7 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.junit.Assert.assertEquals; diff --git a/parse/src/test/java/com/parse/ParseConfigControllerTest.java b/parse/src/test/java/com/parse/ParseConfigControllerTest.java index 3d55521a7..4525d897b 100644 --- a/parse/src/test/java/com/parse/ParseConfigControllerTest.java +++ b/parse/src/test/java/com/parse/ParseConfigControllerTest.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertArrayEquals; diff --git a/parse/src/test/java/com/parse/ParseConfigTest.java b/parse/src/test/java/com/parse/ParseConfigTest.java index cf1da2fb9..a6dbc4920 100644 --- a/parse/src/test/java/com/parse/ParseConfigTest.java +++ b/parse/src/test/java/com/parse/ParseConfigTest.java @@ -25,7 +25,7 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.junit.Assert.assertArrayEquals; diff --git a/parse/src/test/java/com/parse/ParseCorePluginsTest.java b/parse/src/test/java/com/parse/ParseCorePluginsTest.java index 07672dec2..4694dfa82 100644 --- a/parse/src/test/java/com/parse/ParseCorePluginsTest.java +++ b/parse/src/test/java/com/parse/ParseCorePluginsTest.java @@ -16,7 +16,7 @@ import java.util.List; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertSame; diff --git a/parse/src/test/java/com/parse/ParseCurrentConfigControllerTest.java b/parse/src/test/java/com/parse/ParseCurrentConfigControllerTest.java index b7cbb500c..c66b75c46 100644 --- a/parse/src/test/java/com/parse/ParseCurrentConfigControllerTest.java +++ b/parse/src/test/java/com/parse/ParseCurrentConfigControllerTest.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/parse/src/test/java/com/parse/ParseDefaultACLControllerTest.java b/parse/src/test/java/com/parse/ParseDefaultACLControllerTest.java index 3cd1e4e4c..8289968e0 100644 --- a/parse/src/test/java/com/parse/ParseDefaultACLControllerTest.java +++ b/parse/src/test/java/com/parse/ParseDefaultACLControllerTest.java @@ -14,7 +14,7 @@ import java.lang.ref.WeakReference; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; diff --git a/parse/src/test/java/com/parse/ParseFileControllerTest.java b/parse/src/test/java/com/parse/ParseFileControllerTest.java index b32fcb635..b31f7e45a 100644 --- a/parse/src/test/java/com/parse/ParseFileControllerTest.java +++ b/parse/src/test/java/com/parse/ParseFileControllerTest.java @@ -27,7 +27,7 @@ import java.net.MalformedURLException; import java.net.URL; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertEquals; diff --git a/parse/src/test/java/com/parse/ParseFileRequestTest.java b/parse/src/test/java/com/parse/ParseFileRequestTest.java index 8b685a27e..621a71149 100644 --- a/parse/src/test/java/com/parse/ParseFileRequestTest.java +++ b/parse/src/test/java/com/parse/ParseFileRequestTest.java @@ -16,7 +16,7 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; diff --git a/parse/src/test/java/com/parse/ParseFileTest.java b/parse/src/test/java/com/parse/ParseFileTest.java index 22fd6c31f..61ef9bc21 100644 --- a/parse/src/test/java/com/parse/ParseFileTest.java +++ b/parse/src/test/java/com/parse/ParseFileTest.java @@ -26,7 +26,7 @@ import java.util.Arrays; import java.util.List; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/parse/src/test/java/com/parse/ParseInstallationTest.java b/parse/src/test/java/com/parse/ParseInstallationTest.java index a543670d1..f10a3b572 100644 --- a/parse/src/test/java/com/parse/ParseInstallationTest.java +++ b/parse/src/test/java/com/parse/ParseInstallationTest.java @@ -24,7 +24,7 @@ import java.util.Locale; import java.util.TimeZone; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/parse/src/test/java/com/parse/ParseKeyValueCacheTest.java b/parse/src/test/java/com/parse/ParseKeyValueCacheTest.java index 98e50979f..22e026885 100644 --- a/parse/src/test/java/com/parse/ParseKeyValueCacheTest.java +++ b/parse/src/test/java/com/parse/ParseKeyValueCacheTest.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.concurrent.Callable; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/parse/src/test/java/com/parse/ParseObjectTest.java b/parse/src/test/java/com/parse/ParseObjectTest.java index bd1212953..ae9b096c4 100644 --- a/parse/src/test/java/com/parse/ParseObjectTest.java +++ b/parse/src/test/java/com/parse/ParseObjectTest.java @@ -34,8 +34,8 @@ import java.util.Map; import java.util.Set; -import bolts.Task; -import bolts.TaskCompletionSource; +import com.parse.boltsinternal.Task; +import com.parse.boltsinternal.TaskCompletionSource; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/parse/src/test/java/com/parse/ParsePushControllerTest.java b/parse/src/test/java/com/parse/ParsePushControllerTest.java index 63d9e734f..d716d4a48 100644 --- a/parse/src/test/java/com/parse/ParsePushControllerTest.java +++ b/parse/src/test/java/com/parse/ParsePushControllerTest.java @@ -29,7 +29,7 @@ import java.util.ArrayList; import java.util.List; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertEquals; diff --git a/parse/src/test/java/com/parse/ParsePushTest.java b/parse/src/test/java/com/parse/ParsePushTest.java index 9eac7b4be..e818c2e60 100644 --- a/parse/src/test/java/com/parse/ParsePushTest.java +++ b/parse/src/test/java/com/parse/ParsePushTest.java @@ -23,8 +23,8 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import bolts.Capture; -import bolts.Task; +import com.parse.boltsinternal.Capture; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/parse/src/test/java/com/parse/ParseQueryTest.java b/parse/src/test/java/com/parse/ParseQueryTest.java index c85d2e3f6..5ba86a89b 100644 --- a/parse/src/test/java/com/parse/ParseQueryTest.java +++ b/parse/src/test/java/com/parse/ParseQueryTest.java @@ -24,9 +24,9 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Pattern; -import bolts.Continuation; -import bolts.Task; -import bolts.TaskCompletionSource; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; +import com.parse.boltsinternal.TaskCompletionSource; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertEquals; diff --git a/parse/src/test/java/com/parse/ParseRESTCommandTest.java b/parse/src/test/java/com/parse/ParseRESTCommandTest.java index f00ce5bc2..7f8747cfb 100644 --- a/parse/src/test/java/com/parse/ParseRESTCommandTest.java +++ b/parse/src/test/java/com/parse/ParseRESTCommandTest.java @@ -28,7 +28,7 @@ import java.io.InputStream; import java.net.URL; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/parse/src/test/java/com/parse/ParseRequestTest.java b/parse/src/test/java/com/parse/ParseRequestTest.java index 91a3e7681..39f723062 100644 --- a/parse/src/test/java/com/parse/ParseRequestTest.java +++ b/parse/src/test/java/com/parse/ParseRequestTest.java @@ -26,7 +26,7 @@ import java.util.LinkedList; import java.util.List; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/parse/src/test/java/com/parse/ParseTaskUtilsTest.java b/parse/src/test/java/com/parse/ParseTaskUtilsTest.java index 5f35181af..173415618 100644 --- a/parse/src/test/java/com/parse/ParseTaskUtilsTest.java +++ b/parse/src/test/java/com/parse/ParseTaskUtilsTest.java @@ -13,15 +13,15 @@ import java.util.ArrayList; import java.util.concurrent.Callable; -import bolts.AggregateException; -import bolts.Task; +import com.parse.boltsinternal.AggregateException; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertTrue; public class ParseTaskUtilsTest { /** - * Verifies {@link bolts.AggregateException} gets wrapped with {@link ParseException} when thrown from - * {@link com.parse.ParseTaskUtils#wait(bolts.Task)}. + * Verifies {@link AggregateException} gets wrapped with {@link ParseException} when thrown from + * {@link com.parse.ParseTaskUtils#wait(Task)}. */ @Test public void testWaitForTaskWrapsAggregateExceptionAsParseException() { diff --git a/parse/src/test/java/com/parse/ParseTestUtils.java b/parse/src/test/java/com/parse/ParseTestUtils.java index cefa94018..501e65c21 100644 --- a/parse/src/test/java/com/parse/ParseTestUtils.java +++ b/parse/src/test/java/com/parse/ParseTestUtils.java @@ -19,7 +19,7 @@ import java.io.File; import java.io.IOException; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; diff --git a/parse/src/test/java/com/parse/ParseUserTest.java b/parse/src/test/java/com/parse/ParseUserTest.java index f71689b5a..3c65c2b8b 100644 --- a/parse/src/test/java/com/parse/ParseUserTest.java +++ b/parse/src/test/java/com/parse/ParseUserTest.java @@ -33,9 +33,9 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import bolts.Capture; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.Capture; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/parse/src/test/java/com/parse/TaskQueueTestHelper.java b/parse/src/test/java/com/parse/TaskQueueTestHelper.java index f6897e656..5fa8e0296 100644 --- a/parse/src/test/java/com/parse/TaskQueueTestHelper.java +++ b/parse/src/test/java/com/parse/TaskQueueTestHelper.java @@ -11,9 +11,9 @@ import java.util.ArrayList; import java.util.List; -import bolts.Continuation; -import bolts.Task; -import bolts.TaskCompletionSource; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; +import com.parse.boltsinternal.TaskCompletionSource; /** * Helper class to step through a {@link TaskQueue}. diff --git a/twitter/src/main/java/com/parse/twitter/ParseTwitterUtils.java b/twitter/src/main/java/com/parse/twitter/ParseTwitterUtils.java index 8a3bbd0d4..fcc9f051d 100644 --- a/twitter/src/main/java/com/parse/twitter/ParseTwitterUtils.java +++ b/twitter/src/main/java/com/parse/twitter/ParseTwitterUtils.java @@ -19,9 +19,9 @@ import java.util.Map; import java.util.concurrent.CancellationException; -import bolts.AggregateException; -import bolts.Continuation; -import bolts.Task; +import com.parse.boltsinternal.AggregateException; +import com.parse.boltsinternal.Continuation; +import com.parse.boltsinternal.Task; /** * Provides a set of utilities for using Parse with Twitter. diff --git a/twitter/src/main/java/com/parse/twitter/TwitterController.java b/twitter/src/main/java/com/parse/twitter/TwitterController.java index d88e7dcae..0e0665d94 100644 --- a/twitter/src/main/java/com/parse/twitter/TwitterController.java +++ b/twitter/src/main/java/com/parse/twitter/TwitterController.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.Map; -import bolts.Task; +import com.parse.boltsinternal.Task; class TwitterController { diff --git a/twitter/src/test/java/com/parse/twitter/ParseTwitterUtilsTest.java b/twitter/src/test/java/com/parse/twitter/ParseTwitterUtilsTest.java index 6619e8083..2ee17ff98 100644 --- a/twitter/src/test/java/com/parse/twitter/ParseTwitterUtilsTest.java +++ b/twitter/src/test/java/com/parse/twitter/ParseTwitterUtilsTest.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.Map; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/twitter/src/test/java/com/parse/twitter/TwitterControllerTest.java b/twitter/src/test/java/com/parse/twitter/TwitterControllerTest.java index 2119cbabf..27879654d 100644 --- a/twitter/src/test/java/com/parse/twitter/TwitterControllerTest.java +++ b/twitter/src/test/java/com/parse/twitter/TwitterControllerTest.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import bolts.Task; +import com.parse.boltsinternal.Task; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame;