Merge pull request #7 from loudej/tables

Tables implementation work by rpaquay

microsoft-azure-api/pom.xml

@@ -80,6 +80,11 @@
       <artifactId>commons-logging</artifactId>
       <version>1.1.1</version>
     </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>1.4</version>
+    </dependency>
   </dependencies>
 
   <build>

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/Exports.java

@@ -2,20 +2,21 @@
  * 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
+ * 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.
+ * 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;
 
 import com.microsoft.windowsazure.services.blob.implementation.BlobExceptionProcessor;
 import com.microsoft.windowsazure.services.blob.implementation.BlobRestProxy;
+import com.microsoft.windowsazure.services.blob.implementation.ISO8601DateConverter;
 import com.microsoft.windowsazure.services.blob.implementation.SharedKeyFilter;
 import com.microsoft.windowsazure.services.blob.implementation.SharedKeyLiteFilter;
 import com.microsoft.windowsazure.services.core.Builder;
@@ -28,5 +29,6 @@ public void register(Builder.Registry registry) {
         registry.add(BlobRestProxy.class);
         registry.add(SharedKeyLiteFilter.class);
         registry.add(SharedKeyFilter.class);
+        registry.add(ISO8601DateConverter.class);
     }
 }

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobRestProxy.java

@@ -69,10 +69,10 @@
 import com.microsoft.windowsazure.services.blob.models.SetContainerMetadataOptions;
 import com.microsoft.windowsazure.services.core.ServiceException;
 import com.microsoft.windowsazure.services.core.ServiceFilter;
+import com.microsoft.windowsazure.services.core.utils.CommaStringBuilder;
 import com.microsoft.windowsazure.services.core.utils.pipeline.ClientFilterAdapter;
 import com.microsoft.windowsazure.services.core.utils.pipeline.HttpURLConnectionClient;
 import com.microsoft.windowsazure.services.core.utils.pipeline.PipelineHelpers;
-import com.microsoft.windowsazure.services.core.utils.pipeline.PipelineHelpers.EnumCommaStringBuilder;
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.WebResource;
 import com.sun.jersey.api.client.WebResource.Builder;
@@ -155,18 +155,18 @@ private HashMap<String, String> getMetadataFromHeaders(ClientResponse response)
     }
 
     private WebResource addOptionalBlobListingIncludeQueryParam(ListBlobsOptions options, WebResource webResource) {
-        EnumCommaStringBuilder sb = new EnumCommaStringBuilder();
+        CommaStringBuilder sb = new CommaStringBuilder();
         sb.addValue(options.isIncludeSnapshots(), "snapshots");
         sb.addValue(options.isIncludeUncommittedBlobs(), "uncommittedblobs");
         sb.addValue(options.isIncludeMetadata(), "metadata");
-        webResource = addOptionalQueryParam(webResource, "include", sb.getValue());
+        webResource = addOptionalQueryParam(webResource, "include", sb.toString());
         return webResource;
     }
 
     private WebResource addOptionalContainerIncludeQueryParam(ListContainersOptions options, WebResource webResource) {
-        EnumCommaStringBuilder sb = new EnumCommaStringBuilder();
+        CommaStringBuilder sb = new CommaStringBuilder();
         sb.addValue(options.isIncludeMetadata(), "metadata");
-        webResource = addOptionalQueryParam(webResource, "include", sb.getValue());
+        webResource = addOptionalQueryParam(webResource, "include", sb.toString());
         return webResource;
     }
 

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/ContainerACLDateAdapter.java

@@ -25,11 +25,11 @@ public class ContainerACLDateAdapter extends XmlAdapter<String, Date> {
 
     @Override
     public Date unmarshal(String arg0) throws Exception {
-        return new ContainerACLDateConverter().parse(arg0);
+        return new ISO8601DateConverter().parse(arg0);
     }
 
     @Override
     public String marshal(Date arg0) throws Exception {
-        return new ContainerACLDateConverter().format(arg0);
+        return new ISO8601DateConverter().format(arg0);
     }
 }

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/ISO8601DateConverter.java

@@ -0,0 +1,59 @@
+/**
+ * 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.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.SSSSSSS'Z'";
+    private static final String SHORT_DATETIME_PATTERN = "yyyy-MM-dd'T'HH:mm:ss'Z'";
+
+    public String format(Date date) {
+        return getFormat().format(date);
+    }
+
+    public Date parse(String date) throws ParseException {
+        if (date == null)
+            return null;
+
+        // Sometimes, the date comes back without the ".SSSSSSS" part (presumably when the decimal value
+        // of the date is "0". Use the short format in that case.
+        if (date.indexOf('.') < 0)
+            return getShortFormat().parse(date);
+        else
+            return getFormat().parse(date);
+    }
+
+    private DateFormat getFormat() {
+        DateFormat iso8601Format = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
+        iso8601Format.setTimeZone(TimeZone.getTimeZone("GMT"));
+        return iso8601Format;
+    }
+
+    private DateFormat getShortFormat() {
+        DateFormat iso8601Format = new SimpleDateFormat(SHORT_DATETIME_PATTERN, Locale.US);
+        iso8601Format.setTimeZone(TimeZone.getTimeZone("GMT"));
+        return iso8601Format;
+    }
+}

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/SharedKeyFilter.java

@@ -2,15 +2,15 @@
  * 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
+ * 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.
+ * 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;
 
@@ -44,6 +44,18 @@ public SharedKeyFilter(@Named(BlobConfiguration.ACCOUNT_NAME) String accountName
         this.signer = new HmacSHA256Sign(accountKey);
     }
 
+    protected String getHeader(ClientRequest cr, String headerKey) {
+        return SharedKeyUtils.getHeader(cr, headerKey);
+    }
+
+    protected HmacSHA256Sign getSigner() {
+        return signer;
+    }
+
+    protected String getAccountName() {
+        return accountName;
+    }
+
     @Override
     public ClientResponse handle(ClientRequest cr) throws ClientHandlerException {
         // Only sign if no other filter is handling authorization
@@ -60,6 +72,7 @@ public ClientResponse handle(ClientRequest cr) throws ClientHandlerException {
         return this.getNext().handle(cr);
     }
 
+    @Override
     public void onBeforeStreamingEntity(ClientRequest clientRequest) {
         // All headers should be known at this point, time to sign!
         sign(clientRequest);
@@ -105,11 +118,11 @@ public void sign(ClientRequest cr) {
         cr.getHeaders().putSingle("Authorization", "SharedKey " + this.accountName + ":" + signature);
     }
 
-    private void addOptionalDateHeader(ClientRequest cr) {
+    protected void addOptionalDateHeader(ClientRequest cr) {
         String date = getHeader(cr, "Date");
         if (date == "") {
             date = new RFC1123DateConverter().format(new Date());
-            cr.getHeaders().add("Date", date);
+            cr.getHeaders().putSingle("Date", date);
         }
     }
 
@@ -209,8 +222,4 @@ private String getCanonicalizedResource(ClientRequest cr) {
 
         return result;
     }
-
-    private String getHeader(ClientRequest cr, String headerKey) {
-        return SharedKeyUtils.getHeader(cr, headerKey);
-    }
 }

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/SharedKeyLiteFilter.java

@@ -2,15 +2,15 @@
  * 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
+ * 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.
+ * 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;
 
@@ -59,6 +59,7 @@ public ClientResponse handle(ClientRequest cr) throws ClientHandlerException {
         return this.getNext().handle(cr);
     }
 
+    @Override
     public void onBeforeStreamingEntity(ClientRequest clientRequest) {
         // All headers should be known at this point, time to sign!
         sign(clientRequest);

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/CommaStringBuilder.java

@@ -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();
+    }
+}