Remove errorCode parameter from exception

Author: Caitlin Bales (MSFT)

src/main/java/com/microsoft/graph/core/ClientException.java

@@ -27,28 +27,13 @@
  */
 public class ClientException extends RuntimeException {
 
-    /**
-     * The error code for this exception.
-     */
-    private final GraphErrorCodes errorCode;
-
     /**
      * Creates the client exception.
      * @param message The message to display.
      * @param ex The exception from.
      * @param errorCode The error code for this exception.
      */
-    public ClientException(final String message, final Throwable ex, final GraphErrorCodes errorCode) {
+    public ClientException(final String message, final Throwable ex) {
         super(message, ex);
-        this.errorCode = errorCode;
-    }
-
-    /**
-     * Determines if the given error code is expected.
-     * @param expectedCode The expected error code.
-     * @return true if the error code matches, and false if there was no match.
-     */
-    public boolean isError(final GraphErrorCodes expectedCode) {
-        return this.errorCode == expectedCode;
     }
 }

src/main/java/com/microsoft/graph/http/BaseRequest.java

@@ -153,7 +153,7 @@ public URL getRequestUrl() {
         try {
             return new URL(uriBuilder.build().toString());
         } catch (final MalformedURLException e) {
-            throw new ClientException("Invalid URL: " + uriBuilder.toString(), e, GraphErrorCodes.INVALID_REQUEST);
+            throw new ClientException("Invalid URL: " + uriBuilder.toString(), e);
         }
     }
 

src/main/java/com/microsoft/graph/http/DefaultHttpProvider.java

@@ -335,8 +335,7 @@ private <Result, Body, DeserializeType> Result sendRequestInternal(final IHttpRe
             throw ex;
         } catch (final Exception ex) {
             final ClientException clientException = new ClientException("Error during http request",
-                    ex,
-                    GraphErrorCodes.GENERAL_EXCEPTION);
+                    ex);
             logger.logError("Error during http request", clientException);
             throw clientException;
         }

src/main/java/com/microsoft/graph/http/GraphFatalServiceException.java

@@ -29,11 +29,6 @@
  */
 public class GraphFatalServiceException extends GraphServiceException {
 
-    /**
-     * The web site to report issues on this SDK.
-     */
-    public static final String SDK_BUG_URL = "https://github.com/microsoftgraph/msgraph-sdk-java/issues";
-
     /**
      * Create a fatal Graph service exception.
      * @param method The method that caused the exception.

src/main/java/com/microsoft/graph/http/GraphServiceException.java

@@ -125,7 +125,7 @@ protected GraphServiceException(final String method,
                                     final String responseMessage,
                                     final List<String> responseHeaders,
                                     final GraphErrorResponse error) {
-        super(responseMessage, null, null);
+        super(responseMessage, null);
         this.method = method;
         this.url = url;
         this.requestHeaders = requestHeaders;
@@ -216,14 +216,6 @@ public GraphError getServiceError() {
         return error.error;
     }
 
-    @Override
-    public boolean isError(final GraphErrorCodes expectedCode) {
-        if (getServiceError() != null) {
-            return getServiceError().isError(expectedCode);
-        }
-        return false;
-    }
-
     /**
      * Creates a Graph service exception from a given failed HTTP request.
      *

src/main/java/com/microsoft/graph/requests/extensions/ChunkedUploadRequest.java

@@ -124,7 +124,6 @@ public <UploadType> ChunkedUploadResult upload(
         }
 
         return new ChunkedUploadResult(
-                new ClientException("Upload session failed to many times.", null,
-                        GraphErrorCodes.UPLOAD_SESSION_INCOMPLETE));
+                new ClientException("Upload session failed to many times.", null));
     }
 }

src/main/java/com/microsoft/graph/requests/extensions/ChunkedUploadResult.java

@@ -67,7 +67,7 @@ public ChunkedUploadResult(ClientException error) {
      * @param exception The exception received from server.
      */
     public ChunkedUploadResult(GraphServiceException exception) {
-        this(new ClientException(exception.getMessage(/* verbose */ true), exception, GraphErrorCodes.UPLOAD_SESSION_FAILED));
+        this(new ClientException(exception.getMessage(/* verbose */ true), exception));
     }
 
     /**

src/test/java/com/microsoft/graph/concurrency/DefaultExecutorsTests.java

@@ -7,7 +7,6 @@
 import org.junit.Test;
 
 import com.microsoft.graph.core.ClientException;
-import com.microsoft.graph.core.GraphErrorCodes;
 import com.microsoft.graph.logger.MockLogger;
 
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -95,14 +94,13 @@ public void testPerformOnForegroundWithClientException() {
         final String expectedLogMessage = "Starting foreground task, current active count:0, with exception com.microsoft.graph.core.ClientException: client exception message";
         final ExecutorTestCallback<String> callback = new ExecutorTestCallback<>();
 
-        defaultExecutors.performOnForeground(new ClientException(expectedExceptionMessage,null, GraphErrorCodes.INVALID_ACCEPT_TYPE),
+        defaultExecutors.performOnForeground(new ClientException(expectedExceptionMessage,null),
                 callback);
 
         callback._completionWaiter.waitForSignal();
         assertFalse(callback._successCalled.get());
         assertTrue(callback._failureCalled.get());
         assertEquals(expectedExceptionMessage, callback._exceptionResult.get().getMessage());
-        assertTrue(callback._exceptionResult.get().isError(GraphErrorCodes.INVALID_ACCEPT_TYPE));
         assertEquals(1,mLogger.getLogMessages().size());
         assertTrue(mLogger.hasMessage(expectedLogMessage));
     }

src/test/java/com/microsoft/graph/core/ClientExceptionTests.java

@@ -8,14 +8,12 @@
 
 public class ClientExceptionTests {
 
-	private GraphErrorCodes graphErrorCodes;
     private ClientException clientException;
     private String expectMessage = "This is test exception message";
 
 	@Before
 	public void setUp() throws Exception {
-		graphErrorCodes = GraphErrorCodes.ACCESS_DENIED;
-        clientException = new ClientException(expectMessage, null, graphErrorCodes);
+        clientException = new ClientException(expectMessage, null);
 	}
 
 	@Test
@@ -25,7 +23,6 @@ public void testNotNull() {
 
 	@Test
     public void testClientException() {
-        assertTrue(clientException.isError(graphErrorCodes));
         assertEquals(expectMessage, clientException.getMessage());
     }
 

src/test/java/com/microsoft/graph/http/DefaultHttpProviderTests.java

@@ -259,7 +259,6 @@ public Map<String, String> getHeaders() {
             mProvider.send(new MockHttpRequest(), DriveItem.class, null);
             fail("Expected exception in previous statement");
         } catch (final GraphServiceException e) {
-            assertTrue(e.isError(expectedErrorCode));
             assertEquals(expectedMessage, e.getServiceError().message);
         }
     }