-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'fix228' of github.com:jcookems/azure-sdk-for-java into …
…fix228
- Loading branch information
Showing
59 changed files
with
5,438 additions
and
133 deletions.
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
53 changes: 0 additions & 53 deletions
53
...va/com/microsoft/windowsazure/services/blob/implementation/ContainerACLDateConverter.java
This file was deleted.
Oops, something went wrong.
80 changes: 80 additions & 0 deletions
80
...in/java/com/microsoft/windowsazure/services/blob/implementation/ISO8601DateConverter.java
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,80 @@ | ||
| /** | ||
| * Copyright 2011 Microsoft Corporation | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.microsoft.windowsazure.services.blob.implementation; | ||
|
|
||
| import java.text.DateFormat; | ||
| import java.text.ParseException; | ||
| import java.text.SimpleDateFormat; | ||
| import java.util.Calendar; | ||
| import java.util.Date; | ||
| import java.util.Locale; | ||
| import java.util.TimeZone; | ||
|
|
||
| /* | ||
| * "not quite" ISO 8601 date time conversion routines | ||
| */ | ||
| public class ISO8601DateConverter { | ||
| // Note: because of the trailing "0000000", this is not quite ISO 8601 compatible | ||
| private static final String DATETIME_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"; | ||
| private static final String DATETIME_PATTERN_NO_S = "yyyy-MM-dd'T'HH:mm'Z'"; | ||
| private static final String DATETIME_PATTERN_NO_MS = "yyyy-MM-dd'T'HH:mm:ss'Z'"; | ||
| private static final String DATETIME_PATTERN_TO_DECIMAL = "yyyy-MM-dd'T'HH:mm:ss."; | ||
|
|
||
| public String format(Date date) { | ||
| DateFormat iso8601Format = new SimpleDateFormat(DATETIME_PATTERN, Locale.US); | ||
| iso8601Format.setTimeZone(TimeZone.getTimeZone("GMT")); | ||
| return iso8601Format.format(date); | ||
| } | ||
|
|
||
| public Date parse(String date) throws ParseException { | ||
| if (date == null) | ||
| return null; | ||
|
|
||
| int length = date.length(); | ||
| if (length == 17) { | ||
| // [2012-01-04T23:21Z] length = 17 | ||
| return parseDateFromString(date, DATETIME_PATTERN_NO_S); | ||
| } | ||
| else if (length == 20) { | ||
| // [2012-01-04T23:21:59Z] length = 20 | ||
| return parseDateFromString(date, DATETIME_PATTERN_NO_MS); | ||
| } | ||
| else if (length >= 22 && length <= 28) { | ||
| // [2012-01-04T23:21:59.1Z] length = 22 | ||
| // [2012-01-04T23:21:59.1234567Z] length = 28 | ||
| // Need to handle the milliseconds gently. | ||
|
|
||
| Date allExceptMilliseconds = parseDateFromString(date, DATETIME_PATTERN_TO_DECIMAL); | ||
| long timeWithSecondGranularity = allExceptMilliseconds.getTime(); | ||
| // Decimal point is at 19 | ||
| String secondDecimalString = date.substring(19, date.indexOf('Z')); | ||
| Float secondDecimal = Float.parseFloat(secondDecimalString); | ||
| int milliseconds = Math.round(secondDecimal * 1000); | ||
| long timeInMS = timeWithSecondGranularity + milliseconds; | ||
| Calendar cal = Calendar.getInstance(); | ||
| cal.setTimeInMillis(timeInMS); | ||
| return cal.getTime(); | ||
| } | ||
| else { | ||
| throw new IllegalArgumentException(String.format("Invalid Date String: %s", date)); | ||
| } | ||
| } | ||
|
|
||
| public static Date parseDateFromString(final String value, final String pattern) throws ParseException { | ||
| DateFormat iso8601Format = new SimpleDateFormat(pattern, Locale.US); | ||
| iso8601Format.setTimeZone(TimeZone.getTimeZone("GMT")); | ||
| return iso8601Format.parse(value); | ||
| } | ||
| } |
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
47 changes: 47 additions & 0 deletions
47
...-api/src/main/java/com/microsoft/windowsazure/services/core/utils/CommaStringBuilder.java
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,47 @@ | ||
| package com.microsoft.windowsazure.services.core.utils; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class CommaStringBuilder { | ||
| private final StringBuilder sb = new StringBuilder(); | ||
|
|
||
| public void add(String representation) { | ||
| if (sb.length() > 0) { | ||
| sb.append(","); | ||
| } | ||
| sb.append(representation); | ||
| } | ||
|
|
||
| public void addValue(boolean value, String representation) { | ||
| if (value) { | ||
| add(representation); | ||
| } | ||
| } | ||
|
|
||
| public static String join(List<String> values) { | ||
| CommaStringBuilder sb = new CommaStringBuilder(); | ||
|
|
||
| for (String value : values) { | ||
| sb.add(value); | ||
| } | ||
|
|
||
| return sb.toString(); | ||
| } | ||
|
|
||
| public static String join(String... values) { | ||
| CommaStringBuilder sb = new CommaStringBuilder(); | ||
|
|
||
| for (String value : values) { | ||
| sb.add(value); | ||
| } | ||
|
|
||
| return sb.toString(); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| if (sb.length() == 0) | ||
| return null; | ||
| return sb.toString(); | ||
| } | ||
| } |
Oops, something went wrong.