Author: mattryan Date: Thu Sep 12 18:14:20 2019 New Revision: 1866860 URL: http://svn.apache.org/viewvc?rev=1866860&view=rev Log: OAK-8599: Fix direct binary upload init to return null if disabled
Modified: jackrabbit/oak/branches/1.10/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java jackrabbit/oak/branches/1.10/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java jackrabbit/oak/branches/1.10/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/directaccess/AbstractDataRecordAccessProviderTest.java Modified: jackrabbit/oak/branches/1.10/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java?rev=1866860&r1=1866859&r2=1866860&view=diff ============================================================================== --- jackrabbit/oak/branches/1.10/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java (original) +++ jackrabbit/oak/branches/1.10/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java Thu Sep 12 18:14:20 2019 @@ -910,29 +910,36 @@ public class AzureBlobStoreBackend exten Base64.encode(String.format("%06d", blockId))); uploadPartURIs.add(createPresignedURI(key, perms, httpUploadURIExpirySeconds, presignedURIRequestParams)); } - } - try { - byte[] secret = getOrCreateReferenceKey(); - String uploadToken = new DataRecordUploadToken(blobId, uploadId).getEncodedToken(secret); - return new DataRecordUpload() { - @Override - @NotNull - public String getUploadToken() { return uploadToken; } + try { + byte[] secret = getOrCreateReferenceKey(); + String uploadToken = new DataRecordUploadToken(blobId, uploadId).getEncodedToken(secret); + return new DataRecordUpload() { + @Override + @NotNull + public String getUploadToken() { + return uploadToken; + } - @Override - public long getMinPartSize() { return minPartSize; } + @Override + public long getMinPartSize() { + return minPartSize; + } - @Override - public long getMaxPartSize() { return maxPartSize; } + @Override + public long getMaxPartSize() { + return maxPartSize; + } - @Override - @NotNull - public Collection<URI> getUploadURIs() { return uploadPartURIs; } - }; - } - catch (DataStoreException e) { - LOG.warn("Unable to obtain data store key"); + @Override + @NotNull + public Collection<URI> getUploadURIs() { + return uploadPartURIs; + } + }; + } catch (DataStoreException e) { + LOG.warn("Unable to obtain data store key"); + } } return null; Modified: jackrabbit/oak/branches/1.10/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java?rev=1866860&r1=1866859&r2=1866860&view=diff ============================================================================== --- jackrabbit/oak/branches/1.10/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java (original) +++ jackrabbit/oak/branches/1.10/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java Thu Sep 12 18:14:20 2019 @@ -868,30 +868,37 @@ public class S3Backend extends AbstractS presignedURIRequestParams)); } } - } - try { - byte[] secret = getOrCreateReferenceKey(); - String uploadToken = new DataRecordUploadToken(blobId, uploadId).getEncodedToken(secret); - - return new DataRecordUpload() { - @Override - @NotNull - public String getUploadToken() { return uploadToken; } - - @Override - public long getMinPartSize() { return minPartSize; } - - @Override - public long getMaxPartSize() { return maxPartSize; } - - @Override - @NotNull - public Collection<URI> getUploadURIs() { return uploadPartURIs; } - }; - } - catch (DataStoreException e) { - LOG.warn("Unable to obtain data store key"); + try { + byte[] secret = getOrCreateReferenceKey(); + String uploadToken = new DataRecordUploadToken(blobId, uploadId).getEncodedToken(secret); + + return new DataRecordUpload() { + @Override + @NotNull + public String getUploadToken() { + return uploadToken; + } + + @Override + public long getMinPartSize() { + return minPartSize; + } + + @Override + public long getMaxPartSize() { + return maxPartSize; + } + + @Override + @NotNull + public Collection<URI> getUploadURIs() { + return uploadPartURIs; + } + }; + } catch (DataStoreException e) { + LOG.warn("Unable to obtain data store key"); + } } return null; Modified: jackrabbit/oak/branches/1.10/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/directaccess/AbstractDataRecordAccessProviderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/directaccess/AbstractDataRecordAccessProviderTest.java?rev=1866860&r1=1866859&r2=1866860&view=diff ============================================================================== --- jackrabbit/oak/branches/1.10/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/directaccess/AbstractDataRecordAccessProviderTest.java (original) +++ jackrabbit/oak/branches/1.10/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/directaccess/AbstractDataRecordAccessProviderTest.java Thu Sep 12 18:14:20 2019 @@ -319,11 +319,8 @@ public abstract class AbstractDataRecord ConfigurableDataRecordAccessProvider ds = getDataStore(); try { ds.setDirectUploadURIExpirySeconds(0); - DataRecordUpload uploadContext = ds.initiateDataRecordUpload(TWENTY_MB, 10); - assertEquals(0, uploadContext.getUploadURIs().size()); - - uploadContext = ds.initiateDataRecordUpload(20, 1); - assertEquals(0, uploadContext.getUploadURIs().size()); + assertNull(ds.initiateDataRecordUpload(TWENTY_MB, 10)); + assertNull(ds.initiateDataRecordUpload(20, 1)); } finally { ds.setDirectUploadURIExpirySeconds(expirySeconds);