Merge branch 'master' into dev

Author: mirobers

microsoft-azure-storage/src/com/microsoft/azure/storage/AccessCondition.java

@@ -346,9 +346,6 @@ public void applySourceConditionToRequest(final HttpURLConnection request) {
      * @param request
      *            A <code>java.net.HttpURLConnection</code> object that represents the request to which the condition is
      *            being applied.
-     * 
-     * @throws StorageException
-     *             If there is an error parsing the date value of the access condition.
      */
     public void applyAppendConditionToRequest(final HttpURLConnection request) {
         if (this.ifMaxSizeLessThanOrEqual != null) {

microsoft-azure-storage/src/com/microsoft/azure/storage/LoggingProperties.java

@@ -27,7 +27,7 @@ public final class LoggingProperties {
     private String version = "1.0";
 
     /**
-     * An <code>EnumSet<code> of <code>LoggingOperations</code> that represents which storage operations should be logged.
+     * An <code>EnumSet</code> of <code>LoggingOperations</code> that represents which storage operations should be logged.
      */
     private EnumSet<LoggingOperations> logOperationTypes = EnumSet.noneOf(LoggingOperations.class);
 
@@ -37,9 +37,9 @@ public final class LoggingProperties {
     private Integer retentionIntervalInDays;
 
     /**
-     * Gets an <code>EnumSet<code> of <code>{@link LoggingOperations}</code> that represents which storage operations should be logged.
+     * Gets an <code>EnumSet</code> of <code>{@link LoggingOperations}</code> that represents which storage operations should be logged.
      * 
-     * @return An <code>EnumSet<code> of <code>{@link LoggingOperations}</code>.
+     * @return An <code>EnumSet</code> of <code>{@link LoggingOperations}</code>.
      */
     public EnumSet<LoggingOperations> getLogOperationTypes() {
         return this.logOperationTypes;
@@ -67,7 +67,7 @@ public String getVersion() {
      * Sets the <code>{@link LoggingOperations}</code> for which storage operations should be logged.
      * 
      * @param logOperationTypes
-     *        An <code>EnumSet<code> of <code>{@link LoggingOperations}</code> to set.
+     *        An <code>EnumSet</code> of <code>{@link LoggingOperations}</code> to set.
      */
     public void setLogOperationTypes(final EnumSet<LoggingOperations> logOperationTypes) {
         this.logOperationTypes = logOperationTypes;

microsoft-azure-storage/src/com/microsoft/azure/storage/OperationContext.java

@@ -186,7 +186,7 @@ public OperationContext() {
     /**
      * Gets the client side trace ID.
      * 
-     * @return A <code>String</cod> which represents the client request ID.
+     * @return A <code>String</code> which represents the client request ID.
      */
     public String getClientRequestID() {
         return this.clientRequestID;

microsoft-azure-storage/src/com/microsoft/azure/storage/RetryInfo.java

@@ -45,7 +45,7 @@ public RetryInfo() {
     }
 
     /**
-     * Initializes a new instance of the {@link "RetryInfo"} class.
+     * Initializes a new instance of the {@link RetryInfo} class.
      * 
      * @param retryContext
      *            The {@link RetryContext} object that was passed in to the retry policy.
@@ -114,7 +114,7 @@ public void setUpdatedLocationMode(LocationMode updatedLocationMode) {
     }
 
     /**
-     * Returns a string that represents the current {@link "RetryInfo"} instance.
+     * Returns a string that represents the current {@link RetryInfo} instance.
      * 
      * @return A <code>String</code> which represents the current <code>RetryInfo</code> instance.
      */

microsoft-azure-storage/src/com/microsoft/azure/storage/SharedAccessPolicyHandler.java

@@ -58,8 +58,6 @@ private SharedAccessPolicyHandler(final Class<T> cls) {
      * @return the HashMap of SharedAccessPolicies from the response
      * @throws SAXException
      * @throws ParserConfigurationException
-     * @throws ParseException
-     *             if a date is incorrectly encoded in the stream
      * @throws IOException
      */
     public static <T extends SharedAccessPolicy> HashMap<String, T> getAccessIdentifiers(final InputStream stream,

microsoft-azure-storage/src/com/microsoft/azure/storage/analytics/CloudAnalyticsClient.java

@@ -385,9 +385,7 @@ public Iterable<LogRecord> listLogRecords(StorageService service, Date startTime
      * @param logBlobs
      *            An {@link Iterable} of blobs to parse LogRecords from.
      * @return
-     *         An enumerable collection of objects that implement {@link LogRecords} and are retrieved lazily.
-     * @throws StorageException
-     * @throws URISyntaxException
+     *         An enumerable collection of objects that implement {@link LogRecord} and are retrieved lazily.
      */
     public static Iterable<LogRecord> parseLogBlobs(Iterable<ListBlobItem> logBlobs) {
         Utility.assertNotNull("logBlobs", logBlobs);
@@ -398,12 +396,10 @@ public static Iterable<LogRecord> parseLogBlobs(Iterable<ListBlobItem> logBlobs)
     /**
      * Returns an enumerable collection of log records, retrieved lazily.
      * 
-     * @param logBlobs
-     *            An {@link Iterable} of blobs to parse LogRecords from.
+     * @param logBlob
+     *            A single blob to parse LogRecords from.
      * @return
-     *         An enumerable collection of objects that implement {@link LogRecords} and are retrieved lazily.
-     * @throws StorageException
-     * @throws URISyntaxException
+     *         An enumerable collection of objects that implement {@link LogRecord} and are retrieved lazily.
      */
     public static Iterable<LogRecord> parseLogBlob(ListBlobItem logBlob) {
         Utility.assertNotNull("logBlob", logBlob);

microsoft-azure-storage/src/com/microsoft/azure/storage/blob/BlobContainerProperties.java

@@ -107,11 +107,11 @@ public LeaseDuration getLeaseDuration() {
 
     /**
      * Gets the public access level for the container.
-     * This field should only be set using the container's {@link #create(BlobContainerPublicAccessType,
-     * BlobRequestOptions, OperationContext) create} method or
-     * {@link #uploadPermissions(BlobContainerPermissions) uploadPermissions} method.
-     * 
-     * @return A <code>{@link BlobContainerPublicAccessLevel}</code> that specifies the level of public access
+     * This field should only be set using the container's {@link CloudBlobContainer#create(BlobContainerPublicAccessType,
+     * BlobRequestOptions, com.microsoft.azure.storage.OperationContext) create} method or
+     * {@link CloudBlobContainer#uploadPermissions(BlobContainerPermissions) uploadPermissions} method.
+     *
+     * @return A <code>{@link BlobContainerPublicAccessType}</code> that specifies the level of public access
      * that is allowed on the container.
      */
     public BlobContainerPublicAccessType getPublicAccess() {
@@ -170,9 +170,10 @@ protected void setLeaseDuration(final LeaseDuration leaseDuration) {
 
     /**
      * Sets the public access level on the container.
-     * This should only be set using the container's {@link #create(BlobContainerPublicAccessType,
-     * BlobRequestOptions, OperationContext) create} method or
-     * {@link #uploadPermissions(BlobContainerPermissions) uploadPermissions} method.
+     * This should only be set using the container's {@link CloudBlobContainer#create(BlobContainerPublicAccessType,
+     * BlobRequestOptions, com.microsoft.azure.storage.OperationContext) create} method or
+     * {@link CloudBlobContainer#uploadPermissions(BlobContainerPermissions) uploadPermissions} method.
+     *
      * @param publicAccess
      *            A <code>{@link BlobContainerPublicAccessType}</code> object
      *            which represents the public access level on the container.

microsoft-azure-storage/src/com/microsoft/azure/storage/blob/BlobInputStream.java

@@ -337,7 +337,7 @@ else if (numberOfBytesRead == 0) {
      * elements <code>b[0]</code> through <code>b[k-1]</code>, leaving elements <code>b[k]</code> through
      * <code>b[b.length-1]</code> unaffected.
      * 
-     * The <code>read(b) method for class {@link InputStream} has the same effect as:
+     * The <code>read(b)</code> method for class {@link InputStream} has the same effect as:
      * 
      * <code>read(b, 0, b.length)</code>
      * 

microsoft-azure-storage/src/com/microsoft/azure/storage/blob/BlobProperties.java

@@ -304,7 +304,7 @@ public Date getLastModified() {
     /**
      * Gets a value indicating if the tier of the blob has been inferred.
      *
-     * @return A {@Link java.lang.Boolean} object which represents if the blob tier was inferred.
+     * @return A {@link java.lang.Boolean} object which represents if the blob tier was inferred.
      */
     public Boolean isBlobTierInferred() { return this.isBlobTierInferredTier; }
 

microsoft-azure-storage/src/com/microsoft/azure/storage/blob/CloudAppendBlob.java

@@ -357,7 +357,7 @@ public Long appendBlock(final InputStream sourceStream, final long length) throw
      *            An {@link OperationContext} object which represents the context for the current operation. This object
      *            is used to track requests to the storage service, and to provide additional runtime information about
      *            the operation.
-     * @return The offset at which the block was appended.</returns>
+     * @return The offset at which the block was appended.
      * @throws IOException
      *             If an I/O exception occurred.
      * @throws StorageException