Sulkta-OSS/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop apache http client, avoid rebase issues in S3 storage code

Browse source
This commit is contained in:
Mike Primm 2022-02-24 17:54:47 -06:00
parent cf528d22cc
commit 58a2b16217
2 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
DynmapCore/src/main/java/org/dynmap/storage/aws_s3/AWSS3MapStorage.java
View file

@ -41,8 +41,8 @@ import io.github.linktosriram.s3lite.api.response.ResponseBytes;
import io.github.linktosriram.s3lite.api.response.S3Object;
import io.github.linktosriram.s3lite.core.auth.AwsBasicCredentials;
import io.github.linktosriram.s3lite.core.client.DefaultS3ClientBuilder;
import io.github.linktosriram.s3lite.http.apache.ApacheSdkHttpClient;
import io.github.linktosriram.s3lite.http.spi.request.RequestBody;
import io.github.linktosriram.s3lite.http.urlconnection.URLConnectionSdkHttpClient;
public class AWSS3MapStorage extends MapStorage {
public class StorageTile extends MapStorageTile {
@ -738,7 +738,7 @@ public class AWSS3MapStorage extends MapStorage {
c = new DefaultS3ClientBuilder()
.credentialsProvider(() -> AwsBasicCredentials.create(access_key_id, secret_access_key))
.region(Region.fromString(region))
.httpClient(ApacheSdkHttpClient.defaultClient())
.httpClient(URLConnectionSdkHttpClient.create())
.build();
if (c == null) {
Log.severe("Error creating S3 access client");