Skip to content

Add type annotations to avoid reflection #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add type annotations to avoid reflection #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions src/aws/sdk/s3.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,17 @@ Map may also contain the configuration keys :conn-timeout,
(defn bucket-exists?
"Returns true if the supplied bucket name already exists in S3."
[cred name]
(.doesBucketExist (s3-client cred) name))
(.doesBucketExist ^AmazonS3Client (s3-client cred) name))

(defn create-bucket
"Create a new S3 bucket with the supplied name."
[cred ^String name]
(to-map (.createBucket (s3-client cred) name)))
(to-map (.createBucket ^AmazonS3Client (s3-client cred) name)))

(defn delete-bucket
"Delete the S3 bucket with the supplied name."
[cred ^String name]
(.deleteBucket (s3-client cred) name))
(.deleteBucket ^AmazonS3Client (s3-client cred) name))

(defn list-buckets
"List all the S3 buckets for the supplied credentials. The buckets will be
Expand All @@ -107,7 +107,7 @@ Map may also contain the configuration keys :conn-timeout,
:creation-date - the date when the bucket was created
:owner - the owner of the bucket"
[cred]
(map to-map (.listBuckets (s3-client cred))))
(map to-map (.listBuckets ^AmazonS3Client (s3-client cred))))

(defprotocol ^{:no-doc true} ToPutRequest
"A protocol for constructing a map that represents an S3 put request."
Expand Down Expand Up @@ -195,33 +195,33 @@ Map may also contain the configuration keys :conn-timeout,
(let [req (->> (merge (put-request value) metadata)
(->PutObjectRequest bucket key))]
(when permissions
(.setAccessControlList req (create-acl permissions)))
(.putObject (s3-client cred) req)))
(.setAccessControlList ^PutObjectRequest req (create-acl permissions)))
(.putObject ^AmazonS3Client (s3-client cred) req)))

(defn- initiate-multipart-upload
[cred bucket key]
(.getUploadId (.initiateMultipartUpload
(s3-client cred)
(.getUploadId (.initiateMultipartUpload
^AmazonS3Client (s3-client cred)
(InitiateMultipartUploadRequest. bucket key))))

(defn- abort-multipart-upload
[{cred :cred bucket :bucket key :key upload-id :upload-id}]
(.abortMultipartUpload
(s3-client cred)
^AmazonS3Client (s3-client cred)
(AbortMultipartUploadRequest. bucket key upload-id)))

(defn- complete-multipart-upload
[{cred :cred bucket :bucket key :key upload-id :upload-id e-tags :e-tags}]
(.completeMultipartUpload
(s3-client cred)
^AmazonS3Client (s3-client cred)
(CompleteMultipartUploadRequest. bucket key upload-id e-tags)))

(defn- upload-part
[{cred :cred bucket :bucket key :key upload-id :upload-id
part-size :part-size offset :offset ^java.io.File file :file}]
(.getPartETag
(.uploadPart
(s3-client cred)
^AmazonS3Client (s3-client cred)
(doto (UploadPartRequest.)
(.setBucketName bucket)
(.setKey key)
Expand Down Expand Up @@ -335,7 +335,7 @@ Map may also contain the configuration keys :conn-timeout,
:bucket - the name of the bucket
:key - the object's key"
[cred ^String bucket ^String key]
(to-map (.getObject (s3-client cred) bucket key)))
(to-map (.getObject ^AmazonS3Client (s3-client cred) bucket key)))

(defn- map->GetObjectMetadataRequest
"Create a ListObjectsRequest instance from a map of values."
Expand All @@ -360,7 +360,7 @@ Map may also contain the configuration keys :conn-timeout,
[cred bucket key & [options]]
(to-map
(.getObjectMetadata
(s3-client cred)
^AmazonS3Client (s3-client cred)
(map->GetObjectMetadataRequest (merge {:bucket bucket :key key} options)))))

(defn- map->ListObjectsRequest
Expand All @@ -384,7 +384,7 @@ Map may also contain the configuration keys :conn-timeout,
[cred bucket key & [options]]
(.toString
(.generatePresignedUrl
(s3-client cred)
^AmazonS3Client (s3-client cred)
bucket
key
(coerce/to-date (:expires options (-> 1 t/days t/from-now)))
Expand All @@ -410,13 +410,13 @@ Map may also contain the configuration keys :conn-timeout,
[cred bucket & [options]]
(to-map
(.listObjects
(s3-client cred)
^AmazonS3Client (s3-client cred)
(map->ListObjectsRequest (merge {:bucket bucket} options)))))

(defn delete-object
"Delete an object from an S3 bucket."
[cred bucket key]
(.deleteObject (s3-client cred) bucket key))
(.deleteObject ^AmazonS3Client (s3-client cred) bucket key))

(defn object-exists?
"Returns true if an object exists in the supplied bucket and key."
Expand All @@ -435,7 +435,7 @@ Map may also contain the configuration keys :conn-timeout,
([cred bucket src-key dest-key]
(copy-object cred bucket src-key bucket dest-key))
([cred src-bucket src-key dest-bucket dest-key]
(to-map (.copyObject (s3-client cred) src-bucket src-key dest-bucket dest-key))))
(to-map (.copyObject ^AmazonS3Client (s3-client cred) src-bucket src-key dest-bucket dest-key))))

(defn- map->ListVersionsRequest
"Create a ListVersionsRequest instance from a map of values."
Expand Down Expand Up @@ -475,13 +475,13 @@ Map may also contain the configuration keys :conn-timeout,
[cred bucket & [options]]
(to-map
(.listVersions
(s3-client cred)
^AmazonS3Client (s3-client cred)
(map->ListVersionsRequest (merge {:bucket bucket} options)))))

(defn delete-version
"Deletes a specific version of the specified object in the specified bucket."
[cred bucket key version-id]
(.deleteVersion (s3-client cred) bucket key version-id))
(.deleteVersion ^AmazonS3Client (s3-client cred) bucket key version-id))

(defprotocol ^{:no-doc true} ToClojure
"Convert an object into an idiomatic Clojure value."
Expand Down Expand Up @@ -531,13 +531,13 @@ Map may also contain the configuration keys :conn-timeout,
:permission - the type of permission (:read, :write, :read-acp, :write-acp or
:full-control)."
[cred ^String bucket]
(to-map (.getBucketAcl (s3-client cred) bucket)))
(to-map (.getBucketAcl ^AmazonS3Client (s3-client cred) bucket)))

(defn get-object-acl
"Get the access control list (ACL) for the supplied object. See get-bucket-acl
for a detailed description of the return value."
[cred bucket key]
(to-map (.getObjectAcl (s3-client cred) bucket key)))
(to-map (.getObjectAcl ^AmazonS3Client (s3-client cred) bucket key)))

(defn- permission [perm]
(case perm
Expand Down Expand Up @@ -592,17 +592,17 @@ Map may also contain the configuration keys :conn-timeout,
(grant {:email \"[email protected]\"} :full-control)
(revoke {:email \"[email protected]\"} :write))"
[cred ^String bucket & funcs]
(let [acl (.getBucketAcl (s3-client cred) bucket)]
(let [acl (.getBucketAcl ^AmazonS3Client (s3-client cred) bucket)]
(update-acl acl funcs)
(.setBucketAcl (s3-client cred) bucket acl)))
(.setBucketAcl ^AmazonS3Client (s3-client cred) bucket acl)))

(defn update-object-acl
"Updates the access control list (ACL) for the supplied object using functions
that update a set of grants (see update-bucket-acl for more details)."
[cred ^String bucket ^String key & funcs]
(let [acl (.getObjectAcl (s3-client cred) bucket key)]
(let [acl (.getObjectAcl ^AmazonS3Client (s3-client cred) bucket key)]
(update-acl acl funcs)
(.setObjectAcl (s3-client cred) bucket key acl)))
(.setObjectAcl ^AmazonS3Client (s3-client cred) bucket key acl)))

(defn grant
"Returns a function that adds a new grant map to a set of grants.
Expand Down