You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2018/08/22 06:45:55 UTC
svn commit: r1838611 - in
/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3:
S3Backend.java S3Constants.java
Author: mreutegg
Date: Wed Aug 22 06:45:54 2018
New Revision: 1838611
URL: http://svn.apache.org/viewvc?rev=1838611&view=rev
Log:
OAK-7712: Configuration property names to manage direct binary access should be consistent
Patch provided by Matt Ryan
Modified:
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Constants.java
Modified: jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java?rev=1838611&r1=1838610&r2=1838611&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java Wed Aug 22 06:45:54 2018
@@ -215,18 +215,18 @@ public class S3Backend extends AbstractS
// settings around pre-signing
- String putExpiry = properties.getProperty(S3Constants.PRESIGNED_PUT_EXPIRY_SEC);
+ String putExpiry = properties.getProperty(S3Constants.PRESIGNED_HTTP_UPLOAD_URI_EXPIRY_SECONDS);
if (putExpiry != null) {
setHttpUploadURIExpirySeconds(Integer.parseInt(putExpiry));
}
- String getExpiry = properties.getProperty(S3Constants.PRESIGNED_GET_EXPIRY_SEC);
+ String getExpiry = properties.getProperty(S3Constants.PRESIGNED_HTTP_DOWNLOAD_URI_EXPIRY_SECONDS);
if (getExpiry != null) {
final int getExpirySeconds = Integer.parseInt(getExpiry);
setHttpDownloadURIExpirySeconds(getExpirySeconds);
int cacheMaxSize = 0; // off by default
- String cacheMaxSizeStr = properties.getProperty(S3Constants.PRESIGNED_GET_URI_CACHE_MAX_SIZE);
+ String cacheMaxSizeStr = properties.getProperty(S3Constants.PRESIGNED_HTTP_DOWNLOAD_URI_CACHE_MAX_SIZE);
if (cacheMaxSizeStr != null) {
cacheMaxSize = Integer.parseInt(cacheMaxSizeStr);
}
Modified: jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Constants.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Constants.java?rev=1838611&r1=1838610&r2=1838611&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Constants.java (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Constants.java Wed Aug 22 06:45:54 2018
@@ -112,11 +112,11 @@ public final class S3Constants {
*/
public static final String PROXY_PORT = "proxyPort";
- public static final String PRESIGNED_PUT_EXPIRY_SEC = "presignedPutExpirySeconds";
+ public static final String PRESIGNED_HTTP_UPLOAD_URI_EXPIRY_SECONDS = "presignedHttpUploadURIExpirySeconds";
- public static final String PRESIGNED_GET_EXPIRY_SEC = "presignedGetExpirySeconds";
+ public static final String PRESIGNED_HTTP_DOWNLOAD_URI_EXPIRY_SECONDS = "presignedHttpDownloadURIExpirySeconds";
- public static final String PRESIGNED_GET_URI_CACHE_MAX_SIZE = "presignedGetURICacheMaxSize";
+ public static final String PRESIGNED_HTTP_DOWNLOAD_URI_CACHE_MAX_SIZE = "presignedHttpDownloadURICacheMaxSize";
public static final String PRESIGNED_URI_ENABLE_ACCELERATION = "presignedURIEnableTransferAcceleration";