0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #2552 minio 8.1.0

Browse source
This commit is contained in:
Shinsuke Sugaya 2021-04-01 13:37:03 +09:00
parent 57daea9559
commit 2c8d33bc6b
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -50,7 +50,7 @@
<asm.version>9.1</asm.version>
<tika.version>1.26</tika.version>
<groovy.version>3.0.7</groovy.version>
<minio.version>7.1.4</minio.version>
<minio.version>8.1.0</minio.version>
<okhttp.version>3.14.9</okhttp.version>
<!-- Crawler -->

10
src/main/java/org/codelibs/fess/app/web/admin/storage/AdminStorageAction.java
View file

@ -43,13 +43,11 @@ import org.lastaflute.web.ruts.multipart.MultipartFormFile;
import org.lastaflute.web.ruts.process.ActionRuntime;
import org.lastaflute.web.servlet.request.stream.WrittenStreamOut;
import io.minio.ErrorCode;
import io.minio.GetObjectArgs;
import io.minio.ListObjectsArgs;
import io.minio.MakeBucketArgs;
import io.minio.MinioClient;
import io.minio.PutObjectArgs;
import io.minio.PutObjectOptions;
import io.minio.RemoveObjectArgs;
import io.minio.Result;
import io.minio.errors.ErrorResponseException;
@ -167,10 +165,8 @@ public class AdminStorageAction extends FessAdminAction {
try (final InputStream in = uploadFile.getInputStream()) {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
final MinioClient minioClient = createClient(fessConfig);
final PutObjectOptions options = new PutObjectOptions(uploadFile.getFileSize(), -1);
final PutObjectArgs args = PutObjectArgs.builder().bucket(fessConfig.getStorageBucket()).object(objectName)
.stream(in, options.objectSize(), options.partSize()).contentType(options.contentType()).headers(options.headers())
.sse(options.sse()).build();
.stream(in, uploadFile.getFileSize(), -1).contentType("application/octet-stream").build();
minioClient.putObject(args);
} catch (final Exception e) {
throw new StorageException("Failed to upload " + objectName, e);
@ -233,8 +229,8 @@ public class AdminStorageAction extends FessAdminAction {
}
}
} catch (final ErrorResponseException e) {
final ErrorCode code = e.errorResponse().errorCode();
if (code == ErrorCode.NO_SUCH_BUCKET) {
final String code = e.errorResponse().code();
if ("NoSuchBucket".equals(code)) {
final MinioClient minioClient = createClient(fessConfig);
try {
final MakeBucketArgs args = MakeBucketArgs.builder().bucket(fessConfig.getStorageBucket()).build();