SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removing custom RxJavaPlugins reset impl.

Browse Source 
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.
This commit is contained in:
Marcin Grzejszczak
2016-05-09 18:09:56 +02:00
parent 657bba35b3
commit f7b1fc5fce
4 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaSchedulersHook.java
View File

@@ -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);

19
spring-cloud-sleuth-core/src/main/java/rx/plugins/SleuthRxJavaPlugins.java
View File

@@ -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();
}
}

3
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaSchedulersHookTests.java
View File

@@ -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();
}

4
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaTests.java
View File

@@ -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