Skip to content

Commit 7ca3113

Browse files
improved error parsing
1 parent 57fedb3 commit 7ca3113

1 file changed

Lines changed: 34 additions & 24 deletions

File tree

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

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.io.ByteArrayInputStream;
2626
import java.io.IOException;
2727
import java.io.InputStream;
28-
import java.nio.charset.StandardCharsets;
2928
import java.util.LinkedList;
3029
import java.util.List;
3130
import java.util.Locale;
@@ -35,6 +34,7 @@
3534
import javax.annotation.Nullable;
3635
import javax.annotation.Nonnull;
3736

37+
import com.google.common.io.ByteStreams;
3838
import com.google.gson.Gson;
3939
import com.google.gson.GsonBuilder;
4040
import com.microsoft.graph.core.ClientException;
@@ -43,6 +43,8 @@
4343
import com.microsoft.graph.options.HeaderOption;
4444
import com.microsoft.graph.serializer.ISerializer;
4545

46+
import org.jetbrains.annotations.NotNull;
47+
4648
import okhttp3.Response;
4749

4850
import static java.nio.charset.StandardCharsets.UTF_8;
@@ -381,30 +383,8 @@ public static <T> GraphServiceException createFromResponse(@Nonnull final IHttpR
381383
}
382384

383385
final String responseMessage = response.message();
384-
String rawOutput;
385386

386-
InputStream is = response.body().byteStream();
387-
try {
388-
rawOutput = CoreHttpProvider.streamToString(is);
389-
} finally {
390-
closeQuietly(is);
391-
}
392-
GraphErrorResponse error;
393-
try {
394-
// we need a "copy" of the stream, so we can log the raw output if it cannot be parsed
395-
error = serializer.deserializeObject(
396-
new ByteArrayInputStream(rawOutput.getBytes(UTF_8)),
397-
GraphErrorResponse.class,
398-
responseHeadersHelper.getResponseHeadersAsMapOfStringList(response)
399-
);
400-
} catch (final Exception ex) {
401-
error = new GraphErrorResponse();
402-
error.error = new GraphError();
403-
error.error.code = "Unable to parse error response message";
404-
error.error.message = "Raw error: " + rawOutput;
405-
error.error.innererror = new GraphInnerError();
406-
error.error.innererror.code = ex.getMessage();
407-
}
387+
GraphErrorResponse error = parseErrorResponse(serializer, response);
408388

409389
if (responseCode >= INTERNAL_SERVER_ERROR) {
410390
return new GraphFatalServiceException(method,
@@ -428,4 +408,34 @@ public static <T> GraphServiceException createFromResponse(@Nonnull final IHttpR
428408
error,
429409
isVerbose);
430410
}
411+
412+
private static GraphErrorResponse parseErrorResponse(@NotNull ISerializer serializer,
413+
@NotNull Response response)
414+
throws IOException {
415+
416+
byte[] responseBytes;
417+
InputStream is = response.body().byteStream();
418+
try {
419+
responseBytes = ByteStreams.toByteArray(is);
420+
} finally {
421+
closeQuietly(is);
422+
}
423+
GraphErrorResponse error;
424+
try {
425+
// we need a "copy" of the stream, so we can log the raw output if it cannot be parsed
426+
error = serializer.deserializeObject(
427+
new ByteArrayInputStream(responseBytes),
428+
GraphErrorResponse.class,
429+
responseHeadersHelper.getResponseHeadersAsMapOfStringList(response)
430+
);
431+
} catch (final Exception ex) {
432+
error = new GraphErrorResponse();
433+
error.error = new GraphError();
434+
error.error.code = "Unable to parse error response message";
435+
error.error.message = "Raw error: " + new String(responseBytes, UTF_8);
436+
error.error.innererror = new GraphInnerError();
437+
error.error.innererror.code = ex.getMessage();
438+
}
439+
return error;
440+
}
431441
}

0 commit comments

Comments
 (0)