Initial checkin for Storage file #4414
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,4 +45,3 @@ private static synchronized void loadProperties() { | |
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <parent> | ||
| <groupId>com.azure</groupId> | ||
| <artifactId>azure-client-sdk-parent</artifactId> | ||
| <version>1.1.0</version> | ||
| <relativePath>../../../pom.client.xml</relativePath> | ||
| </parent> | ||
|
|
||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <groupId>com.azure</groupId> | ||
| <artifactId>azure-storage-file</artifactId> | ||
| <version>12.0.0-preview.1</version> | ||
|
|
||
| <name>azure-storage-file</name> | ||
| <url>https://github.com/Azure/azure-sdk-for-java</url> | ||
|
|
||
| <distributionManagement> | ||
| <site> | ||
| <id>azure-java-build-docs</id> | ||
| <url>${site.url}/site/${project.artifactId}</url> | ||
| </site> | ||
| </distributionManagement> | ||
|
|
||
| <scm> | ||
| <url>scm:git:https://github.com/Azure/azure-sdk-for-java</url> | ||
| <connection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</connection> | ||
| <tag>HEAD</tag> | ||
| </scm> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>com.azure</groupId> | ||
| <artifactId>azure-core</artifactId> | ||
| <version>1.0.0-preview.2</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-api</artifactId> | ||
| </dependency> | ||
|
There was a problem hiding this comment. slf4j-api should come in transitively and not need to be included here. |
||
|
|
||
| <!-- Added this dependency to include necessary annotations used by reactor core. | ||
| Without this dependency, javadoc throws a warning as it cannot find enum When.MAYBE | ||
| which is used in @Nullable annotation in reactor core classes --> | ||
| <dependency> | ||
| <groupId>com.google.code.findbugs</groupId> | ||
| <artifactId>jsr305</artifactId> | ||
| <version>3.0.2</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>com.azure</groupId> | ||
| <artifactId>azure-core-test</artifactId> | ||
| <version>1.0.0-preview.2</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.azure</groupId> | ||
| <artifactId>azure-identity</artifactId> | ||
| <version>1.0.0-preview.1</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-simple</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.projectreactor</groupId> | ||
| <artifactId>reactor-test</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.microsoft.azure</groupId> | ||
| <artifactId>adal4j</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
|
There was a problem hiding this comment. Same as in queues - is slf4j-simple, reactor-test, and adal4j required here? There was a problem hiding this comment. reactor-test is necessary for async tests. Removed adal4j , slf4j-simple |
||
| <dependency> | ||
| <groupId>org.spockframework</groupId> | ||
| <artifactId>spock-core</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>cglib</groupId> | ||
| <artifactId>cglib-nodep</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>uk.org.lidalia</groupId> | ||
| <artifactId>slf4j-test</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| </project> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,8 +29,8 @@ public final class SharedKeyCredential { | |
| private static final String AUTHORIZATION_HEADER_FORMAT = "SharedKey %s:%s"; | ||
|
|
||
| // Pieces of the connection string that are needed. | ||
| private static final String ACCOUNT_NAME = "accountname"; | ||
| private static final String ACCOUNT_KEY = "accountkey"; | ||
|
|
||
| private final String accountName; | ||
| private final byte[] accountKey; | ||
|
|
@@ -59,7 +59,7 @@ public static SharedKeyCredential fromConnectionString(String connectionString) | |
| HashMap<String, String> connectionStringPieces = new HashMap<>(); | ||
| for (String connectionStringPiece : connectionString.split(";")) { | ||
| String[] kvp = connectionStringPiece.split("=", 2); | ||
| connectionStringPieces.put(kvp[0].toLowerCase(Locale.ROOT), kvp[1]); | ||
| } | ||
|
|
||
| String accountName = connectionStringPieces.get(ACCOUNT_NAME); | ||
|
|
@@ -98,9 +98,13 @@ public String generateAuthorizationHeader(URL requestURL, String httpMethod, Map | |
| * | ||
| * @param stringToSign The UTF-8-encoded string to sign. | ||
| * @return A {@code String} that contains the HMAC-SHA256-encoded signature. | ||
| * @throws RuntimeException for one of the following cases: | ||
| * <ul> | ||
| * <li> If the HMAC-SHA256 signature for {@code sharedKeyCredentials} fails to generate. </li> | ||
| * <li> If the an invalid key has been given to the client. </li> | ||
| * </ul> | ||
|
|
||
| */ | ||
| public String computeHmac256(final String stringToSign) { | ||
| try { | ||
| /* | ||
| We must get a new instance of the Mac calculator for each signature calculated because the instances are | ||
|
|
@@ -111,8 +115,10 @@ public String computeHmac256(final String stringToSign) throws InvalidKeyExcepti | |
| hmacSha256.init(new SecretKeySpec(this.accountKey, "HmacSHA256")); | ||
| byte[] utf8Bytes = stringToSign.getBytes(StandardCharsets.UTF_8); | ||
| return Base64.getEncoder().encodeToString(hmacSha256.doFinal(utf8Bytes)); | ||
| } catch (final NoSuchAlgorithmException e) { | ||
| throw new RuntimeException("There is no such algorithm. Error Details: " + e.getMessage()); | ||
| } catch (InvalidKeyException e) { | ||
| throw new RuntimeException("Please double check the account key. Error details: " + e.getMessage()); | ||
|
There was a problem hiding this comment. Use clientLogger logAndThrow API There was a problem hiding this comment. The log and throw API is not available to preview 2. |
||
| } | ||
| } | ||
|
|
||
|
|
@@ -121,20 +127,20 @@ private String buildStringToSign(URL requestURL, String httpMethod, Map<String, | |
| contentLength = contentLength.equals("0") ? "" : contentLength; | ||
|
|
||
| // If the x-ms-header exists ignore the Date header | ||
| String dateHeader = (headers.containsKey("x-ms-date")) ? "" : getStandardHeaderValue(headers, "Date"); | ||
|
|
||
| return String.join("\n", | ||
| httpMethod, | ||
| getStandardHeaderValue(headers, "Content-Encoding"), | ||
| getStandardHeaderValue(headers, "Content-Language"), | ||
| contentLength, | ||
| getStandardHeaderValue(headers, "Content-MD5"), | ||
| getStandardHeaderValue(headers, "Content-Type"), | ||
| dateHeader, | ||
| getStandardHeaderValue(headers, "If-Modified-Since"), | ||
| getStandardHeaderValue(headers, "If-Match"), | ||
| getStandardHeaderValue(headers, "If-None-Match"), | ||
| getStandardHeaderValue(headers, "If-Unmodified-Since"), | ||
| getStandardHeaderValue(headers, "Range"), | ||
| getAdditionalXmsHeaders(headers), | ||
| getCanonicalizedResource(requestURL)); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't duplicate the pattern - put it in the
Orclause above instead.