5151 *
5252 * @param <UploadType> the expected uploaded item
5353 */
54- public class LargeFileUploadResponseHandler <UploadType >
55- implements IStatefulResponseHandler <LargeFileUploadResult <UploadType >, UploadType > {
54+ class LargeFileUploadResponseHandler <UploadType >
55+ implements IStatefulResponseHandler <LargeFileUploadResponse <UploadType >, UploadType > {
5656 /**
5757 * The expected deserialized upload type
5858 */
@@ -70,75 +70,60 @@ protected LargeFileUploadResponseHandler(@Nonnull final Class<UploadType> upload
7070 this .uploadSessionClass = Objects .requireNonNull (uploadSessionType , "parameter uploadSessionType cannot be null" );
7171 }
7272
73- /**
74- * Do nothing before getting the response
75- *
76- * @param response The response
77- */
78- @ Override
79- public void configConnection (@ Nonnull final Response response ) {
80- return ;
81- }
82-
83- /**
84- * Generate the chunked upload response result
85- *
86- * @param request the HTTP request
87- * @param response the HTTP response
88- * @param serializer the serializer
89- * @param logger the system logger
90- * @return the chunked upload result, which could be either an uploaded item or error
91- * @throws Exception an exception occurs if the request was unable to complete for any reason
92- */
9373 @ Override
9474 @ Nullable
95- public LargeFileUploadResult <UploadType > generateResult (
75+ public < ResponseType > LargeFileUploadResponse <UploadType > generateResult (
9676 @ Nonnull final IHttpRequest request ,
97- @ Nonnull final Response response ,
77+ @ Nonnull final ResponseType response ,
9878 @ Nonnull final ISerializer serializer ,
9979 @ Nonnull final ILogger logger ) throws Exception {
10080 Objects .requireNonNull (request , "parameter request cannot be null" );
10181 Objects .requireNonNull (response , "parameter response cannot be null" );
10282 Objects .requireNonNull (serializer , "parameter serializer cannot be null" );
10383 Objects .requireNonNull (logger , "parameter logger cannot be null" );
104- if (response .code () >= HttpResponseCode .HTTP_CLIENT_ERROR ) {
84+ if (!(response instanceof Response )) {
85+ throw new ClientException ("unsupported response type" , null );
86+ }
87+ final Response nativeResponse = (Response )response ;
88+
89+ if (nativeResponse .code () >= HttpResponseCode .HTTP_CLIENT_ERROR ) {
10590 logger .logDebug ("Receiving error during upload, see detail on result error" );
10691
107- return new LargeFileUploadResult <>(
92+ return new LargeFileUploadResponse <>(
10893 GraphServiceException .createFromResponse (request , null , serializer ,
109- response , logger ));
110- } else if (response .code () >= HTTP_OK
111- && response .code () < HttpResponseCode .HTTP_MULTIPLE_CHOICES ) {
112- try (final ResponseBody body = response .body ()) {
113- final String location = response .headers ().get ("Location" );
94+ nativeResponse , logger ));
95+ } else if (nativeResponse .code () >= HTTP_OK
96+ && nativeResponse .code () < HttpResponseCode .HTTP_MULTIPLE_CHOICES ) {
97+ try (final ResponseBody body = nativeResponse .body ()) {
98+ final String location = nativeResponse .headers ().get ("Location" );
11499 final MediaType contentType = body .contentType ();
115100 final String subType = contentType == null ? null : contentType .subtype ();
116101 if (subType != null && subType .contains ("json" )) {
117102 return parseJsonUploadResult (body , serializer , logger );
118103 } else if (location != null ) {
119104 logger .logDebug ("Upload session is completed (Outlook), uploaded item returned." );
120- return new LargeFileUploadResult <>(this . deserializeTypeClass . getDeclaredConstructor (). newInstance () );
105+ return new LargeFileUploadResponse <>(location );
121106 } else {
122107 logger .logDebug ("Upload session returned an unexpected response" );
123108 }
124109 }
125110 }
126- return new LargeFileUploadResult <>(new ClientException ("Received an unexpected response from the service, response code: " + response .code (), null ));
111+ return new LargeFileUploadResponse <>(new ClientException ("Received an unexpected response from the service, response code: " + nativeResponse .code (), null ));
127112 }
128113
129114 @ Nonnull
130- private LargeFileUploadResult <UploadType > parseJsonUploadResult (@ Nonnull final ResponseBody responseBody , @ Nonnull final ISerializer serializer , @ Nonnull final ILogger logger ) throws IOException {
115+ private LargeFileUploadResponse <UploadType > parseJsonUploadResult (@ Nonnull final ResponseBody responseBody , @ Nonnull final ISerializer serializer , @ Nonnull final ILogger logger ) throws IOException {
131116 try (final InputStream in = responseBody .byteStream ()) {
132117 final byte [] responseBytes = ByteStreams .toByteArray (in );
133118 final IUploadSession session = serializer .deserializeObject (new ByteArrayInputStream (responseBytes ), uploadSessionClass );
134119
135120 if (session == null || session .getNextExpectedRanges () == null ) {
136121 logger .logDebug ("Upload session is completed (ODSP), uploaded item returned." );
137122 final UploadType uploadedItem = serializer .deserializeObject (new ByteArrayInputStream (responseBytes ), this .deserializeTypeClass );
138- return new LargeFileUploadResult <>(uploadedItem );
123+ return new LargeFileUploadResponse <>(uploadedItem );
139124 } else {
140125 logger .logDebug ("Chunk bytes has been accepted by the server." );
141- return new LargeFileUploadResult <>(session );
126+ return new LargeFileUploadResponse <>(session );
142127 }
143128 }
144129 }
0 commit comments