Merge pull request #1777 from abersnaze/javadoc-exclude

Excluding things from the javadoc

Author: benjchristensen

build.gradle

@@ -12,3 +12,7 @@ dependencies {
     testCompile 'org.mockito:mockito-core:1.8.5'
 }
 
+javadoc {
+    exclude "**/rx/internal/**"
+}
+

src/main/java/rx/plugins/RxJavaErrorHandlerDefault.java

@@ -55,6 +55,9 @@ public static RxJavaPlugins getInstance() {
         INSTANCE.schedulersHook.set(null);
     }
 
+    static final RxJavaErrorHandler DEFAULT_ERROR_HANDLER = new RxJavaErrorHandler() {
+    };
+
     /**
      * Retrieves an instance of {@link RxJavaErrorHandler} to use based on order of precedence as defined in
      * {@link RxJavaPlugins} class header.
@@ -70,7 +73,7 @@ public RxJavaErrorHandler getErrorHandler() {
             Object impl = getPluginImplementationViaProperty(RxJavaErrorHandler.class);
             if (impl == null) {
                 // nothing set via properties so initialize with default 
-                errorHandler.compareAndSet(null, RxJavaErrorHandlerDefault.getInstance());
+                errorHandler.compareAndSet(null, DEFAULT_ERROR_HANDLER);
                 // we don't return from here but call get() again in case of thread-race so the winner will always get returned
             } else {
                 // we received an implementation from the system property so use it

src/main/java/rx/plugins/RxJavaPlugins.java

@@ -16,6 +16,7 @@
 package rx.plugins;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -41,7 +42,7 @@ public void resetAfter() {
     @Test
     public void testErrorHandlerDefaultImpl() {
         RxJavaErrorHandler impl = new RxJavaPlugins().getErrorHandler();
-        assertTrue(impl instanceof RxJavaErrorHandlerDefault);
+        assertSame(RxJavaPlugins.DEFAULT_ERROR_HANDLER, impl);
     }
 
     @Test