Update to global response handlers.

Stephen Cobbe · Stephen Cobbe · commit cc2bef4177f2 · 2017-05-12T12:17:13.000-07:00
diff --git a/examples/global-callbacks/src/main/java/com/dropbox/core/examples/global-callbacks/DbxExampleNetworkErrorCallback.java b/examples/global-callbacks/src/main/java/com/dropbox/core/examples/global-callbacks/DbxExampleNetworkErrorCallback.java
@@ -1,13 +1,14 @@
 package com.dropbox.core.examples.global_callbacks;
 
 import com.dropbox.core.v2.callbacks.DbxNetworkErrorCallback;
+import com.dropbox.core.DbxException;
 import com.dropbox.core.InvalidAccessTokenException;
 
 public class DbxExampleNetworkErrorCallback extends DbxNetworkErrorCallback {
     @Override
-    public void run() {
-        if (this.getNetworkError() instanceof InvalidAccessTokenException) {
-            System.out.println("GLOBAL NETWORK ERROR HANDLER: " + this.getNetworkError() + "\n");
+    public void onNetworkError(DbxException networkError) {
+        if (networkError instanceof InvalidAccessTokenException) {
+            System.out.println("GLOBAL NETWORK ERROR HANDLER (InvalidAccessTokenException): " + networkError + "\n");
             // do some work
         }
     }
diff --git a/examples/global-callbacks/src/main/java/com/dropbox/core/examples/global-callbacks/Main.java b/examples/global-callbacks/src/main/java/com/dropbox/core/examples/global-callbacks/Main.java
@@ -21,7 +21,7 @@
 import java.io.IOException;
 
 public class Main {
-    private static final String ACCESS_TOKEN = "<ACCESS TOKEN>";
+    private static final String ACCESS_TOKEN = "<ACCESS_TOKEN>";
 
     public static void main(String args[]) throws DbxException, IOException {
         // Create Dropbox client
@@ -33,7 +33,7 @@ public static void main(String args[]) throws DbxException, IOException {
 
         try {
             // Get files and folder metadata from Dropbox root directory
-            client.files().listFolder("/does/not/exist");
+            client.files().listFolder("/does/not/exist/folder/");
         }
         catch (ListFolderErrorException ex) {
             System.err.println("STANDARD ROUTE ERROR HANDLER: " + ex.errorValue + "\n");
@@ -42,16 +42,16 @@ public static void main(String args[]) throws DbxException, IOException {
             System.err.println("STANDARD NETWORK ERROR HANDLER: " + ex + "\n");
         }
 
-//        try {
-//            // Get files and folder metadata from Dropbox root directory
-//            client.auth().tokenRevoke();
-//            client.files().listFolder("/does/not/exist");
-//        }
-//        catch (ListFolderErrorException ex) {
-//            System.err.println("STANDARD ROUTE ERROR HANDLER2: " + ex.errorValue + "\n");
-//        }
-//        catch (DbxException ex) {
-//            System.err.println("STANDARD NETWORK ERROR HANDLER2: " + ex + "\n");
-//        }
+        try {
+            // Get files and folder metadata from Dropbox root directory
+            client.auth().tokenRevoke();
+            client.files().listFolder("/does/not/exist");
+        }
+        catch (ListFolderErrorException ex) {
+            System.err.println("STANDARD ROUTE ERROR HANDLER2: " + ex.errorValue + "\n");
+        }
+        catch (DbxException ex) {
+            System.err.println("STANDARD NETWORK ERROR HANDLER2: " + ex + "\n");
+        }
     }
 }
diff --git a/src/main/java/com/dropbox/core/DbxRequestUtil.java b/src/main/java/com/dropbox/core/DbxRequestUtil.java
@@ -330,8 +330,7 @@ public static DbxException unexpectedStatus(HttpRequestor.Response response)
         DbxGlobalCallbackFactory factory = DbxRequestUtil.sharedCallbackFactory;
         if (factory != null) {
             DbxNetworkErrorCallback callback = factory.createNetworkErrorCallback();
-            callback.setNetworkError(networkError);
-            callback.run();
+            callback.onNetworkError(networkError);
         }
 
         return networkError;
diff --git a/src/main/java/com/dropbox/core/v2/callbacks/DbxNetworkErrorCallback.java b/src/main/java/com/dropbox/core/v2/callbacks/DbxNetworkErrorCallback.java
@@ -5,14 +5,6 @@
 /**
  * Abstract class for network error callback.
  */
-public abstract class DbxNetworkErrorCallback implements Runnable {
-    private DbxException networkError = null;
-
-    public DbxException getNetworkError() {
-        return networkError;
-    }
-
-    public void setNetworkError(DbxException networkError) {
-        this.networkError = networkError;
-    }
+public abstract class DbxNetworkErrorCallback {
+    public abstract void onNetworkError(DbxException networkError);
 }

Original file line number	Diff line number	Diff line change
`@@ -330,8 +330,7 @@ public static DbxException unexpectedStatus(HttpRequestor.Response response)`
`330`	`330`	`DbxGlobalCallbackFactory factory = DbxRequestUtil.sharedCallbackFactory;`
`331`	`331`	`if (factory != null) {`
`332`	`332`	`DbxNetworkErrorCallback callback = factory.createNetworkErrorCallback();`
`333`		`- callback.setNetworkError(networkError);`
`334`		`- callback.run();`
	`333`	`+ callback.onNetworkError(networkError);`
`335`	`334`	`}`
`336`	`335`
`337`	`336`	`return networkError;`