From f7b1fc5fceb7acdb64ba46943b6322d57dc90e88 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 9 May 2016 18:09:56 +0200 Subject: [PATCH] Removing custom RxJavaPlugins reset impl. With RxJava 1.1.4, `RxJavaPlugins.reset()` method has been made public (though `experimental`). With this update, we no longer require to manually wrapp and expose the `reset()` method of RxJavaPlugins. This PR is in conjunction with [Spring-Cloud-Netflix PR] (https://github.com/spring-cloud/spring-cloud-netflix/pull/1007) since RxJava version is maintained as a part of that dependency. Merge this PR only after the Spring-Cloud-Netflix PR is merged to avoid compile errors. --- .../rxjava/SleuthRxJavaSchedulersHook.java | 4 +--- .../java/rx/plugins/SleuthRxJavaPlugins.java | 19 ------------------- .../SleuthRxJavaSchedulersHookTests.java | 3 +-- .../instrument/rxjava/SleuthRxJavaTests.java | 4 ++-- 4 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 spring-cloud-sleuth-core/src/main/java/rx/plugins/SleuthRxJavaPlugins.java diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaSchedulersHook.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaSchedulersHook.java index f164de280..34816b95e 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaSchedulersHook.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaSchedulersHook.java @@ -5,13 +5,11 @@ import org.apache.commons.logging.LogFactory; import org.springframework.cloud.sleuth.Span; import org.springframework.cloud.sleuth.TraceKeys; import org.springframework.cloud.sleuth.Tracer; - import rx.functions.Action0; import rx.plugins.RxJavaErrorHandler; import rx.plugins.RxJavaObservableExecutionHook; import rx.plugins.RxJavaPlugins; import rx.plugins.RxJavaSchedulersHook; -import rx.plugins.SleuthRxJavaPlugins; /** * {@link RxJavaSchedulersHook} that wraps an {@link Action0} into its tracing @@ -41,7 +39,7 @@ class SleuthRxJavaSchedulersHook extends RxJavaSchedulersHook { RxJavaObservableExecutionHook observableExecutionHook = RxJavaPlugins.getInstance().getObservableExecutionHook(); logCurrentStateOfRxJavaPlugins(errorHandler, observableExecutionHook); - SleuthRxJavaPlugins.resetPlugins(); + RxJavaPlugins.getInstance().reset(); RxJavaPlugins.getInstance().registerSchedulersHook(this); RxJavaPlugins.getInstance().registerErrorHandler(errorHandler); RxJavaPlugins.getInstance().registerObservableExecutionHook(observableExecutionHook); diff --git a/spring-cloud-sleuth-core/src/main/java/rx/plugins/SleuthRxJavaPlugins.java b/spring-cloud-sleuth-core/src/main/java/rx/plugins/SleuthRxJavaPlugins.java deleted file mode 100644 index 0e746eb04..000000000 --- a/spring-cloud-sleuth-core/src/main/java/rx/plugins/SleuthRxJavaPlugins.java +++ /dev/null @@ -1,19 +0,0 @@ -package rx.plugins; - -/** - * {@link RxJavaPlugins} helper class to access the package scope method of - * {@link RxJavaPlugins#reset()}. - * - * @deprecated Will disappear once this gets closed - * https://github.com/ReactiveX/RxJava/issues/2297 - * - * @author Shivang Shah - */ -@Deprecated -public class SleuthRxJavaPlugins { - - public static void resetPlugins() { - RxJavaPlugins.getInstance().reset(); - } - -} diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaSchedulersHookTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaSchedulersHookTests.java index 4d30ba702..17f1c482f 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaSchedulersHookTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaSchedulersHookTests.java @@ -16,7 +16,6 @@ import rx.plugins.RxJavaErrorHandler; import rx.plugins.RxJavaObservableExecutionHook; import rx.plugins.RxJavaPlugins; import rx.plugins.RxJavaSchedulersHook; -import rx.plugins.SleuthRxJavaPlugins; /** * @@ -34,7 +33,7 @@ public class SleuthRxJavaSchedulersHookTests { @Before @After public void setup() { - SleuthRxJavaPlugins.resetPlugins(); + RxJavaPlugins.getInstance().reset(); caller = new StringBuilder(); } diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaTests.java index 4c1215d90..d4326f59d 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaTests.java @@ -25,11 +25,11 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import rx.Observable; import rx.functions.Action0; -import rx.plugins.SleuthRxJavaPlugins; import rx.schedulers.Schedulers; import static com.jayway.awaitility.Awaitility.await; import static org.springframework.cloud.sleuth.assertions.SleuthAssertions.then; +import rx.plugins.RxJavaPlugins; @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration(classes = {SleuthRxJavaTests.TestConfig.class}) @@ -53,7 +53,7 @@ public class SleuthRxJavaTests { @BeforeClass @AfterClass public static void cleanUp() { - SleuthRxJavaPlugins.resetPlugins(); + RxJavaPlugins.getInstance().reset(); } @Test