Instance methods for Copy functions in Errors

Author: ramsessanchez

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

@@ -88,16 +88,15 @@ protected String transformErrorCodeCase(@Nonnull final String original) {
     }
 
     /**
-     * Makes a deep copy of specified error
-     * @param error The error we wish to copy
-     * @return The copy of the specified error
+     * Makes a deep copy of this GraphError
+     * @return The copy of this GraphError
      */
-    public static final GraphError graphErrorCopy(GraphError error) {
+    public final GraphError copy() {
         GraphError errorCopy = new GraphError();
-        errorCopy.message = error.message;
-        errorCopy.code = error.code;
-        if(error.innererror!=null) {
-            errorCopy.innererror = GraphInnerError.graphInnerErrorCopy(error.innererror);
+        errorCopy.message = this.message;
+        errorCopy.code = this.code;
+        if(this.innererror != null) {
+            errorCopy.innererror = this.innererror.copy();
         }
         return errorCopy;
     }

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

@@ -73,16 +73,14 @@ public final AdditionalDataManager additionalDataManager() {
     }
 
     /**
-     * Make a deep copy the specified GraphErrorResponse object.
-     * @param response The GraphErrorResponse we want to copy
-     * @return The copy of the specified GraphErrorResponse
+     * Make and return a deep copy of this GraphErrorResponse.
+     * @return The copy of this GraphErrorResponse.
      */
-    public static GraphErrorResponse getErrorResponseCopy(GraphErrorResponse response)
-    {
-        GraphErrorResponse copy = new GraphErrorResponse();
-        copy.additionalDataManager = response.additionalDataManager(); //We are okay with keeping the dataManager intact
-        copy.rawObject = response.rawObject.deepCopy();
-        copy.error = GraphError.graphErrorCopy(response.error);
-        return copy;
+    public GraphErrorResponse copy() {
+        GraphErrorResponse responseCopy = new GraphErrorResponse();
+        responseCopy.additionalDataManager = this.additionalDataManager;
+        responseCopy.rawObject = this.rawObject.deepCopy();
+        responseCopy.error = this.error.copy();
+        return responseCopy;
     }
 }

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

@@ -62,19 +62,18 @@ public class GraphInnerError {
     public GraphInnerError innererror;
 
     /**
-     * Make a deep copy of the specified GraphInnerError, this includes all it's subsequent InnerError's.
-     * @param InnerError The InnerError we want to copy.
-     * @return The copy of the specified InnerError
+     * Make a deep copy this GraphInnerError, this includes all it's subsequent InnerError's.
+     * @return The copy of this InnerError
      */
-    public static final GraphInnerError graphInnerErrorCopy(GraphInnerError InnerError) {
+    public final GraphInnerError copy() {
         GraphInnerError innerErrorCopy = new GraphInnerError();
-        innerErrorCopy.code = InnerError.code;
-        innerErrorCopy.errorType = InnerError.errorType;
-        innerErrorCopy.debugMessage = InnerError.debugMessage;
-        innerErrorCopy.stackTrace = InnerError.stackTrace;
-        innerErrorCopy.throwSite = InnerError.throwSite;
-        if (InnerError.innererror != null) {
-            innerErrorCopy.innererror = graphInnerErrorCopy(InnerError.innererror);
+        innerErrorCopy.code = this.code;
+        innerErrorCopy.errorType = this.code;
+        innerErrorCopy.debugMessage = this.debugMessage;
+        innerErrorCopy.stackTrace = this.stackTrace;
+        innerErrorCopy.throwSite = this.throwSite;
+        if(this.innererror != null) {
+            innerErrorCopy.innererror = this.innererror.copy();
         }
         return innerErrorCopy;
     }

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

@@ -212,7 +212,7 @@ public List<String> getResponseHeaders() {
      */
     @Nullable
     public GraphErrorResponse getError() {
-        return GraphErrorResponse.getErrorResponseCopy(error);
+        return this.error.copy();
     }
 
     /**

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

@@ -50,7 +50,7 @@ public void testGraphErrorResponseCopy() {
         errorResponse.error = error;
 
         //Copy the errorResponse and its subsequent innerErrors
-        GraphErrorResponse errorResponseCopy = GraphErrorResponse.getErrorResponseCopy(errorResponse);
+        GraphErrorResponse errorResponseCopy = errorResponse.copy();
         //Ensure subsequent innerErrors have the expected messages in the expected order.
         assertEquals(errorResponseCopy.error.message, expectedMessage0);
         assertEquals(errorResponseCopy.error.innererror.debugMessage, expectedMessage1);