HDDS-1213. Support plain text S3 MPU initialization request #549
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * <p> | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.hadoop.ozone.s3.endpoint; | ||
|
|
||
| import javax.ws.rs.Consumes; | ||
| import javax.ws.rs.WebApplicationException; | ||
| import javax.ws.rs.core.MediaType; | ||
| import javax.ws.rs.core.MultivaluedMap; | ||
| import javax.ws.rs.ext.MessageBodyReader; | ||
| import javax.ws.rs.ext.Provider; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.lang.annotation.Annotation; | ||
| import java.lang.reflect.Type; | ||
|
|
||
| /** | ||
| * Body reader to accept plain text MPU. | ||
| * <p> | ||
| * Aws s3 api sends a multipartupload request with the content type | ||
| * 'text/plain' in case of using 'aws s3 cp' (instead of aws s3api). | ||
| * <p> | ||
| * Our generic ObjectEndpoint.multipartUpload has a | ||
| * CompleteMultipartUploadRequest parameter, which is required only for the | ||
| * completion request. | ||
| * <p> | ||
| * But JaxRS tries to parse it from the body for the requests and in case of | ||
| * text/plain requests this parsing is failed. This simple BodyReader enables | ||
| * to parse an empty text/plain message and return with an empty completion | ||
| * request. | ||
| */ | ||
| @Provider | ||
| @Consumes("text/plain") | ||
| public class PlainTextMultipartUploadReader | ||
| implements MessageBodyReader<CompleteMultipartUploadRequest> { | ||
|
|
||
| @Override | ||
| public boolean isReadable(Class<?> type, Type genericType, | ||
| Annotation[] annotations, MediaType mediaType) { | ||
| return type.equals(CompleteMultipartUploadRequest.class) | ||
| && mediaType.equals(MediaType.TEXT_PLAIN_TYPE); | ||
| } | ||
|
|
||
| @Override | ||
| public CompleteMultipartUploadRequest readFrom( | ||
| Class<CompleteMultipartUploadRequest> type, Type genericType, | ||
| Annotation[] annotations, MediaType mediaType, | ||
| MultivaluedMap<String, String> httpHeaders, InputStream entityStream) | ||
| throws IOException, WebApplicationException { | ||
| return new CompleteMultipartUploadRequest(); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are these unintended changes? As I see the change is indentation.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yetus asked me to not use tab. Without fixing the tabs the patch would cause a whitespace mismatch (my new lines with spaces and the old lines with tabs). So it's intentional, but I can move to a different