From 58a2b162177c4f189c93dda1d64c2188cd274407 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Thu, 24 Feb 2022 17:54:47 -0600 Subject: [PATCH] Drop apache http client, avoid rebase issues in S3 storage code --- DynmapCore/build.gradle | 7 ------- .../java/org/dynmap/storage/aws_s3/AWSS3MapStorage.java | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/DynmapCore/build.gradle b/DynmapCore/build.gradle index 66d386d1..93f386d2 100644 --- a/DynmapCore/build.gradle +++ b/DynmapCore/build.gradle @@ -21,11 +21,7 @@ dependencies { implementation 'io.github.linktosriram:s3-lite-api:0.2.0' implementation 'io.github.linktosriram:s3-lite-http-client-url-connection:0.2.0' implementation 'io.github.linktosriram:s3-lite-http-client-spi:0.2.0' - implementation 'io.github.linktosriram:s3-lite-http-client-apache:0.2.0' implementation 'io.github.linktosriram:s3-lite-util:0.2.0' - implementation 'org.apache.httpcomponents:httpclient:4.5.9' - implementation 'javax.xml.bind:jaxb-api:2.3.1' - implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.1' } processResources { @@ -64,9 +60,7 @@ shadowJar { include(dependency('io.github.linktosriram:s3-lite-api:')) include(dependency('io.github.linktosriram:s3-lite-http-client-url-connection:')) include(dependency('io.github.linktosriram:s3-lite-http-client-spi:')) - include(dependency('io.github.linktosriram:s3-lite-http-client-apache:')) include(dependency('io.github.linktosriram:s3-lite-util:')) - include(dependency('org.apache.httpcomponents:httpclient:')) include(dependency(':DynmapCoreAPI')) exclude("META-INF/maven/**") exclude("META-INF/services/**") @@ -78,7 +72,6 @@ shadowJar { relocate('javax.servlet', 'org.dynmap.javax.servlet' ) relocate('org.postgresql', 'org.dynmap.org.postgresql') relocate('io.github.linktosriram.s3lite', 'org.dynmap.s3lite') - relocate('org.apache', 'org.dynmap.apache') destinationDir = file '../target' classifier = '' diff --git a/DynmapCore/src/main/java/org/dynmap/storage/aws_s3/AWSS3MapStorage.java b/DynmapCore/src/main/java/org/dynmap/storage/aws_s3/AWSS3MapStorage.java index 58d18ab1..12c7aa34 100644 --- a/DynmapCore/src/main/java/org/dynmap/storage/aws_s3/AWSS3MapStorage.java +++ b/DynmapCore/src/main/java/org/dynmap/storage/aws_s3/AWSS3MapStorage.java @@ -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");