You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jclouds.apache.org by Andrew Gaul <no...@github.com> on 2016/02/13 06:38:18 UTC

[jclouds] JCLOUDS-651: Conditional copy blob (#919)

This pull request changes the `CopyOptions` interface which is annotated as `@Beta`.
You can view, comment on, or merge this pull request online at:

  https://github.com/jclouds/jclouds/pull/919

-- Commit Summary --

  * Convert CopyOptions into an AutoValue
  * JCLOUDS-651: Portable support for conditional copies
  * JCLOUDS-651: Local blobstore support for conditional copies
  * JCLOUDS-651: Atmos support for conditional copies
  * JCLOUDS-651: Azure support for conditional copies
  * JCLOUDS-651: S3 support for conditional copies
  * JCLOUDS-651: Swift support for conditional copies

-- File Changes --

    M apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java (13)
    M apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosIntegrationLiveTest.java (24)
    M apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java (28)
    M apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/blobstore/integration/SwiftBlobIntegrationLiveTest.java (14)
    M apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobStore.java (33)
    M blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java (31)
    M blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java (43)
    M blobstore/src/main/java/org/jclouds/blobstore/options/CopyOptions.java (73)
    M blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java (236)
    M providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/integration/AWSS3BlobIntegrationLiveTest.java (6)
    M providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureBlobStore.java (34)

-- Patch Links --

https://github.com/jclouds/jclouds/pull/919.patch
https://github.com/jclouds/jclouds/pull/919.diff

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/919

Re: [jclouds] JCLOUDS-651: Conditional copy blob (#919)

Posted by Zack Shoylev <no...@github.com>.
> +   @Nullable
> +   public abstract Map<String, String> userMetadata();
> +
> +   @Nullable
> +   public abstract Date ifModifiedSince();
> +   @Nullable
> +   public abstract Date ifUnmodifiedSince();
> +   @Nullable
> +   public abstract String ifMatch();
> +   @Nullable
> +   public abstract String ifNoneMatch();
> +
> +   @AutoValue.Builder
> +   public abstract static class Builder {
> +      public abstract Builder contentMetadata(ContentMetadata contentMetadata);
> +      public abstract Builder userMetadata(Map<String, String> userMetadata);

You still need ImmutableMap.copyOf, so you will have to use autoBuild, like this:

https://github.com/jclouds/jclouds-labs-openstack/blob/master/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/options/UpdateStack.java

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/919/files#r52929028

Re: [jclouds] JCLOUDS-651: Conditional copy blob (#919)

Posted by Zack Shoylev <no...@github.com>.
> +   @Nullable
> +   public abstract Map<String, String> userMetadata();
> +
> +   @Nullable
> +   public abstract Date ifModifiedSince();
> +   @Nullable
> +   public abstract Date ifUnmodifiedSince();
> +   @Nullable
> +   public abstract String ifMatch();
> +   @Nullable
> +   public abstract String ifNoneMatch();
> +
> +   @AutoValue.Builder
> +   public abstract static class Builder {
> +      public abstract Builder contentMetadata(ContentMetadata contentMetadata);
> +      public abstract Builder userMetadata(Map<String, String> userMetadata);

I would suggest using String instead of Date :) Or use an immutable Date class or wrapper, maybe. Basically, don't use Date here if at all possible.

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/919/files#r53033441

Re: [jclouds] JCLOUDS-651: Conditional copy blob (#919)

Posted by Andrew Gaul <no...@github.com>.
@zack-shoylev Please review.

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/919#issuecomment-183596264

Re: [jclouds] JCLOUDS-651: Conditional copy blob (#919)

Posted by Zack Shoylev <no...@github.com>.
> +   @Nullable
> +   public abstract Map<String, String> userMetadata();
> +
> +   @Nullable
> +   public abstract Date ifModifiedSince();
> +   @Nullable
> +   public abstract Date ifUnmodifiedSince();
> +   @Nullable
> +   public abstract String ifMatch();
> +   @Nullable
> +   public abstract String ifNoneMatch();
> +
> +   @AutoValue.Builder
> +   public abstract static class Builder {
> +      public abstract Builder contentMetadata(ContentMetadata contentMetadata);
> +      public abstract Builder userMetadata(Map<String, String> userMetadata);

Sounds good.

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/919/files#r53107533

Re: [jclouds] JCLOUDS-651: Conditional copy blob (#919)

Posted by Andrew Gaul <no...@github.com>.
> +   @Nullable
> +   public abstract Map<String, String> userMetadata();
> +
> +   @Nullable
> +   public abstract Date ifModifiedSince();
> +   @Nullable
> +   public abstract Date ifUnmodifiedSince();
> +   @Nullable
> +   public abstract String ifMatch();
> +   @Nullable
> +   public abstract String ifNoneMatch();
> +
> +   @AutoValue.Builder
> +   public abstract static class Builder {
> +      public abstract Builder contentMetadata(ContentMetadata contentMetadata);
> +      public abstract Builder userMetadata(Map<String, String> userMetadata);

I could not find an low effort solution and will punt on this for now.  We can revisit immutable `Date` when we move to Java 8 and can use `Instant`.

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/919/files#r53104201

Re: [jclouds] JCLOUDS-651: Conditional copy blob (#919)

Posted by Zack Shoylev <no...@github.com>.
One note, but otherwise looks good.

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/919#issuecomment-184335423

Re: [jclouds] JCLOUDS-651: Conditional copy blob (#919)

Posted by Andrew Gaul <no...@github.com>.
> +   @Nullable
> +   public abstract Map<String, String> userMetadata();
> +
> +   @Nullable
> +   public abstract Date ifModifiedSince();
> +   @Nullable
> +   public abstract Date ifUnmodifiedSince();
> +   @Nullable
> +   public abstract String ifMatch();
> +   @Nullable
> +   public abstract String ifNoneMatch();
> +
> +   @AutoValue.Builder
> +   public abstract static class Builder {
> +      public abstract Builder contentMetadata(ContentMetadata contentMetadata);
> +      public abstract Builder userMetadata(Map<String, String> userMetadata);

Done.  Any idea how to make the getters for `Date` objects call `clone`?

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/919/files#r52949192