Skip to content
This repository was archived by the owner on Feb 26, 2025. It is now read-only.

Commit 2624c0f

Browse files
committed
🎉 bump version 2.1.0
Add SIGNER_OVERRIDE property
1 parent 98ee900 commit 2624c0f

File tree

3 files changed

+8
-18
lines changed

3 files changed

+8
-18
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.upplication</groupId>
55
<artifactId>s3fs</artifactId>
66
<packaging>jar</packaging>
7-
<version>2.0.0</version>
7+
<version>2.1.0</version>
88
<name>s3fs</name>
99
<description>S3 filesystem provider for Java 7</description>
1010
<url>https://github.com/Upplication/Amazon-S3-FileSystem-NIO2</url>

src/main/java/com/upplication/s3fs/AmazonS3Factory.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public abstract class AmazonS3Factory {
3434
public static final String SOCKET_RECEIVE_BUFFER_SIZE_HINT = "s3fs_socket_receive_buffer_size_hint";
3535
public static final String SOCKET_TIMEOUT = "s3fs_socket_timeout";
3636
public static final String USER_AGENT = "s3fs_user_agent";
37+
public static final String SIGNER_OVERRIDE = "s3fs_signer_override";
3738

3839
/**
3940
* Build a new Amazon S3 instance with the URI and the properties provided
@@ -116,6 +117,8 @@ protected ClientConfiguration getClientConfiguration(Properties props) {
116117
clientConfiguration.setSocketTimeout(Integer.parseInt(props.getProperty(SOCKET_TIMEOUT)));
117118
if (props.getProperty(USER_AGENT) != null)
118119
clientConfiguration.setUserAgentPrefix(props.getProperty(USER_AGENT));
120+
if (props.getProperty(SIGNER_OVERRIDE) != null)
121+
clientConfiguration.setSignerOverride(props.getProperty(SIGNER_OVERRIDE));
119122
return clientConfiguration;
120123
}
121124

src/test/java/com/upplication/s3fs/AmazonS3ClientFactoryTest.java

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,7 @@
22

33
import static com.amazonaws.SDKGlobalConfiguration.ACCESS_KEY_SYSTEM_PROPERTY;
44
import static com.amazonaws.SDKGlobalConfiguration.SECRET_KEY_SYSTEM_PROPERTY;
5-
import static com.upplication.s3fs.AmazonS3Factory.ACCESS_KEY;
6-
import static com.upplication.s3fs.AmazonS3Factory.CONNECTION_TIMEOUT;
7-
import static com.upplication.s3fs.AmazonS3Factory.MAX_CONNECTIONS;
8-
import static com.upplication.s3fs.AmazonS3Factory.MAX_ERROR_RETRY;
9-
import static com.upplication.s3fs.AmazonS3Factory.PROTOCOL;
10-
import static com.upplication.s3fs.AmazonS3Factory.PROXY_DOMAIN;
11-
import static com.upplication.s3fs.AmazonS3Factory.PROXY_HOST;
12-
import static com.upplication.s3fs.AmazonS3Factory.PROXY_PASSWORD;
13-
import static com.upplication.s3fs.AmazonS3Factory.PROXY_PORT;
14-
import static com.upplication.s3fs.AmazonS3Factory.PROXY_USERNAME;
15-
import static com.upplication.s3fs.AmazonS3Factory.PROXY_WORKSTATION;
16-
import static com.upplication.s3fs.AmazonS3Factory.REQUEST_METRIC_COLLECTOR_CLASS;
17-
import static com.upplication.s3fs.AmazonS3Factory.SECRET_KEY;
18-
import static com.upplication.s3fs.AmazonS3Factory.SOCKET_RECEIVE_BUFFER_SIZE_HINT;
19-
import static com.upplication.s3fs.AmazonS3Factory.SOCKET_SEND_BUFFER_SIZE_HINT;
20-
import static com.upplication.s3fs.AmazonS3Factory.SOCKET_TIMEOUT;
21-
import static com.upplication.s3fs.AmazonS3Factory.USER_AGENT;
5+
import static com.upplication.s3fs.AmazonS3Factory.*;
226
import static org.junit.Assert.assertEquals;
237
import static org.junit.Assert.assertNull;
248
import static org.junit.Assert.assertTrue;
@@ -58,6 +42,7 @@ public void neverTrustTheDefaults() {
5842
props.setProperty(SOCKET_RECEIVE_BUFFER_SIZE_HINT, "49000");
5943
props.setProperty(SOCKET_TIMEOUT, "30");
6044
props.setProperty(USER_AGENT, "I-am-Groot");
45+
props.setProperty(SIGNER_OVERRIDE, "S3SignerType");
6146
ExposingAmazonS3Client client = (ExposingAmazonS3Client) clientFactory.getAmazonS3(S3EndpointConstant.S3_GLOBAL_URI_TEST, props);
6247
AWSCredentialsProvider credentialsProvider = client.getAWSCredentialsProvider();
6348
AWSCredentials credentials = credentialsProvider.getCredentials();
@@ -79,6 +64,7 @@ public void neverTrustTheDefaults() {
7964
assertEquals(49000, clientConfiguration.getSocketBufferSizeHints()[1]);
8065
assertEquals(30, clientConfiguration.getSocketTimeout());
8166
assertEquals("I-am-Groot", clientConfiguration.getUserAgent());
67+
assertEquals("S3SignerType", clientConfiguration.getSignerOverride());
8268
}
8369

8470
@Test
@@ -108,6 +94,7 @@ public void theDefaults() {
10894
assertEquals(0, clientConfiguration.getSocketBufferSizeHints()[1]);
10995
assertEquals(50000, clientConfiguration.getSocketTimeout());
11096
assertTrue(clientConfiguration.getUserAgent().startsWith("aws-sdk-java"));
97+
assertNull(clientConfiguration.getSignerOverride());
11198
}
11299

113100
@Test(expected = IllegalArgumentException.class)

0 commit comments

Comments
 (0)