Skip to content

Commit

Permalink
Merge pull request Azure#408 from Azure/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
rickle-msft authored Nov 20, 2018
2 parents 5365419 + 13abebb commit e5d51ee
Show file tree
Hide file tree
Showing 16 changed files with 821 additions and 114 deletions.
9 changes: 8 additions & 1 deletion ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2018.11.19 Version 10.3.0
* Added support for SLF4J.
* Included default logging to log warnings and errors to the temp directory by default.
* Fixed a bug in hierarchical listings that would sometimes return incomplete results.
* Included the whole HTTP Request in log statements (except for sensitive authorization information, which is redacted).
* Fixed a bug that made the request property on the response object always null.

2018.10.29 Version 10.2.0
* Added overloads which only accept the required parameters.
* Added CopyFromURL, which will do a synchronous server-side copy, meaning the service will not return an HTTP response until it has completed the copy.
Expand Down Expand Up @@ -53,4 +60,4 @@
* Updated the defaults for RequestRetryOptions.

2018.04.27 Version 10.0.0-preview
* Initial Release. Please see the README and wiki for information on the new design.
* Initial Release. Please see the README and wiki for information on the new design.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ To get the binaries of this library as distributed by Microsoft, ready for use w
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>10.2.0</version>
<version>10.3.0</version>
</dependency>
```

Expand Down
13 changes: 12 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<groupId>com.microsoft.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>10.2.0</version>
<version>10.3.0</version>

<name>Azure Storage Blob</name>
<description>The Azure Storage Java Blob library.</description>
Expand Down Expand Up @@ -67,6 +67,11 @@
<artifactId>client-runtime</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -97,6 +102,12 @@
<version>2.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>uk.org.lidalia</groupId>
<artifactId>slf4j-test</artifactId>
<version>1.2.0</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
103 changes: 102 additions & 1 deletion src/main/java/com/microsoft/azure/storage/blob/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ final class Constants {
* The query parameter for snapshots.
*/
static final String SNAPSHOT_QUERY_PARAMETER = "snapshot";
/**
* The word redacted.
*/
static final String REDACTED = "REDACTED";
/**
* The default amount of parallelism for TransferManager operations.
*/
Expand Down Expand Up @@ -152,6 +156,16 @@ static final class HeaderConstants {
*/
static final String RANGE_HEADER_FORMAT = "bytes=%d-%d";

/**
* The copy source header.
*/
static final String COPY_SOURCE = "x-ms-copy-source";

/**
* The version header.
*/
static final String VERSION = "x-ms-version";

/**
* The current storage version header value.
*/
Expand All @@ -170,10 +184,97 @@ static final class HeaderConstants {
/**
* Specifies the value to use for UserAgent header.
*/
static final String USER_AGENT_VERSION = "10.2.0";
static final String USER_AGENT_VERSION = "10.3.0";

private HeaderConstants() {
// Private to prevent construction.
}
}

static final class UrlConstants {

/**
* The SAS service version parameter.
*/
static final String SAS_SERVICE_VERSION = "sv";

/**
* The SAS services parameter.
*/
static final String SAS_SERVICES = "ss";

/**
* The SAS resource types parameter.
*/
static final String SAS_RESOURCES_TYPES = "srt";

/**
* The SAS protocol parameter.
*/
static final String SAS_PROTOCOL = "spr";

/**
* The SAS start time parameter.
*/
static final String SAS_START_TIME = "st";

/**
* The SAS expiration time parameter.
*/
static final String SAS_EXPIRY_TIME = "se";

/**
* The SAS IP range parameter.
*/
static final String SAS_IP_RANGE = "sip";

/**
* The SAS signed identifier parameter.
*/
static final String SAS_SIGNED_IDENTIFIER = "si";

/**
* The SAS signed resource parameter.
*/
static final String SAS_SIGNED_RESOURCE = "sr";

/**
* The SAS signed permissions parameter.
*/
static final String SAS_SIGNED_PERMISSIONS = "sp";

/**
* The SAS signature parameter.
*/
static final String SAS_SIGNATURE = "sig";

/**
* The SAS cache control parameter.
*/
static final String SAS_CACHE_CONTROL = "rscc";

/**
* The SAS content disposition parameter.
*/
static final String SAS_CONTENT_DISPOSITION = "rscd";

/**
* The SAS content encoding parameter.
*/
static final String SAS_CONTENT_ENCODING = "rsce";

/**
* The SAS content language parameter.
*/
static final String SAS_CONTENT_LANGUAGE = "rscl";

/**
* The SAS content type parameter.
*/
static final String SAS_CONTENT_TYPE = "rsct";

private UrlConstants() {
// Private to prevent construction.
}
}
}
Loading

0 comments on commit e5d51ee

Please sign in to comment.