Repository: jclouds-labs Updated Branches: refs/heads/master ee729fe70 -> b78f7513f
JCLOUDS-948: jdbc Cache-Control support Fixes JCLOUDS-1009. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/b78f7513 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/b78f7513 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/b78f7513 Branch: refs/heads/master Commit: b78f7513f354363725ab98a7a7ce6fc391bd9da5 Parents: ee729fe Author: Andrew Gaul <[email protected]> Authored: Tue Jan 19 12:27:25 2016 -0800 Committer: Andrew Gaul <[email protected]> Committed: Tue Jan 19 14:08:30 2016 -0800 ---------------------------------------------------------------------- .../jdbc/conversion/BlobEntityToBlob.java | 1 + .../jdbc/conversion/BlobToBlobEntity.java | 1 + .../org/jclouds/jdbc/entity/PayloadEntity.java | 20 ++++++++++++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b78f7513/jdbc/src/main/java/org/jclouds/jdbc/conversion/BlobEntityToBlob.java ---------------------------------------------------------------------- diff --git a/jdbc/src/main/java/org/jclouds/jdbc/conversion/BlobEntityToBlob.java b/jdbc/src/main/java/org/jclouds/jdbc/conversion/BlobEntityToBlob.java index ccf3578..a91a3bc 100644 --- a/jdbc/src/main/java/org/jclouds/jdbc/conversion/BlobEntityToBlob.java +++ b/jdbc/src/main/java/org/jclouds/jdbc/conversion/BlobEntityToBlob.java @@ -65,6 +65,7 @@ public class BlobEntityToBlob implements Function<BlobEntity, Blob> { blob.getMetadata().setSize(blobEntity.getSize()); blob.getMetadata().setUserMetadata(blobEntity.getUserMetadata()); + blob.getMetadata().getContentMetadata().setCacheControl(payload.getCacheControl()); blob.getMetadata().getContentMetadata().setContentType(payload.getContentType()); blob.getMetadata().getContentMetadata().setContentDisposition(payload.getContentDisposition()); blob.getMetadata().getContentMetadata().setContentEncoding(payload.getContentEncoding()); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b78f7513/jdbc/src/main/java/org/jclouds/jdbc/conversion/BlobToBlobEntity.java ---------------------------------------------------------------------- diff --git a/jdbc/src/main/java/org/jclouds/jdbc/conversion/BlobToBlobEntity.java b/jdbc/src/main/java/org/jclouds/jdbc/conversion/BlobToBlobEntity.java index bc396de..d217404 100644 --- a/jdbc/src/main/java/org/jclouds/jdbc/conversion/BlobToBlobEntity.java +++ b/jdbc/src/main/java/org/jclouds/jdbc/conversion/BlobToBlobEntity.java @@ -29,6 +29,7 @@ public class BlobToBlobEntity implements Function<Blob, BlobEntity> { MutableBlobMetadata metadata = blob.getMetadata(); ContentMetadata contentMetadata = metadata.getContentMetadata(); PayloadEntity payload = PayloadEntity.builder() + .cacheControl(contentMetadata.getCacheControl()) .contentDisposition(contentMetadata.getContentDisposition()) .contentEncoding(contentMetadata.getContentEncoding()) .contentLanguage(contentMetadata.getContentLanguage()) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b78f7513/jdbc/src/main/java/org/jclouds/jdbc/entity/PayloadEntity.java ---------------------------------------------------------------------- diff --git a/jdbc/src/main/java/org/jclouds/jdbc/entity/PayloadEntity.java b/jdbc/src/main/java/org/jclouds/jdbc/entity/PayloadEntity.java index 457a6f4..534c260 100644 --- a/jdbc/src/main/java/org/jclouds/jdbc/entity/PayloadEntity.java +++ b/jdbc/src/main/java/org/jclouds/jdbc/entity/PayloadEntity.java @@ -37,6 +37,7 @@ public class PayloadEntity { @ElementCollection(fetch = FetchType.EAGER) private List<Long> chunks; + private String cacheControl; private String contentType; private Long contentLength; private byte[] contentMD5; @@ -45,9 +46,10 @@ public class PayloadEntity { private String contentEncoding; private Date expires; - public PayloadEntity(List<Long> chunks, String contentType, Long contentLength, byte[] contentMD5, + public PayloadEntity(List<Long> chunks, String cacheControl, String contentType, Long contentLength, byte[] contentMD5, String contentDisposition, String contentLanguage, String contentEncoding, Date expires) { this.chunks = chunks; + this.cacheControl = cacheControl; this.contentType = contentType; this.contentLength = contentLength; this.contentMD5 = contentMD5; @@ -76,6 +78,14 @@ public class PayloadEntity { this.chunks = chunks; } + public String getCacheControl() { + return cacheControl; + } + + public void setCacheControl(String cacheControl) { + this.cacheControl = cacheControl; + } + public String getContentType() { return contentType; } @@ -138,6 +148,7 @@ public class PayloadEntity { public static class Builder { private List<Long> chunks; + private String cacheControl; private String contentType; private Long contentLength; private byte[] contentMD5; @@ -155,6 +166,11 @@ public class PayloadEntity { return this; } + public Builder cacheControl(String cacheControl) { + this.cacheControl = cacheControl; + return this; + } + public Builder contentType(String contentType) { this.contentType = contentType; return this; @@ -191,7 +207,7 @@ public class PayloadEntity { } public PayloadEntity build() { - return new PayloadEntity(chunks, contentType, contentLength, contentMD5, contentDisposition, contentLanguage, contentEncoding, expires); + return new PayloadEntity(chunks, cacheControl, contentType, contentLength, contentMD5, contentDisposition, contentLanguage, contentEncoding, expires); } }
