Merge pull request Azure#136 from rpaquay/formatting

Namespaces and formatting settings
joostdenijs · Nov 28, 2011 · c4d2268 · c4d2268
2 parents 6082ca6 + d93a124
commit c4d2268
Show file tree

Hide file tree

Showing 86 changed files with 602 additions and 537 deletions.
diff --git a/microsoft-azure-api/pom.xml b/microsoft-azure-api/pom.xml
@@ -76,6 +76,14 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.jvnet.jaxb2.maven2</groupId>
         <artifactId>maven-jaxb2-plugin</artifactId>

diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/BlobContract.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/BlobContract.java
@@ -3,8 +3,6 @@
 import java.io.InputStream;
 import java.util.HashMap;
 
-import com.microsoft.windowsazure.common.FilterableService;
-import com.microsoft.windowsazure.common.ServiceException;
 import com.microsoft.windowsazure.services.blob.models.AcquireLeaseOptions;
 import com.microsoft.windowsazure.services.blob.models.AcquireLeaseResult;
 import com.microsoft.windowsazure.services.blob.models.BlobServiceOptions;
@@ -17,6 +15,7 @@
 import com.microsoft.windowsazure.services.blob.models.CreateBlobPagesOptions;
 import com.microsoft.windowsazure.services.blob.models.CreateBlobPagesResult;
 import com.microsoft.windowsazure.services.blob.models.CreateBlobSnapshotOptions;
+import com.microsoft.windowsazure.services.blob.models.CreateBlobSnapshotResult;
 import com.microsoft.windowsazure.services.blob.models.CreateContainerOptions;
 import com.microsoft.windowsazure.services.blob.models.DeleteBlobOptions;
 import com.microsoft.windowsazure.services.blob.models.DeleteContainerOptions;
@@ -26,7 +25,6 @@
 import com.microsoft.windowsazure.services.blob.models.GetBlobPropertiesOptions;
 import com.microsoft.windowsazure.services.blob.models.GetBlobPropertiesResult;
 import com.microsoft.windowsazure.services.blob.models.GetBlobResult;
-import com.microsoft.windowsazure.services.blob.models.CreateBlobSnapshotResult;
 import com.microsoft.windowsazure.services.blob.models.GetContainerACLResult;
 import com.microsoft.windowsazure.services.blob.models.GetContainerPropertiesResult;
 import com.microsoft.windowsazure.services.blob.models.GetServicePropertiesResult;
@@ -45,6 +43,8 @@
 import com.microsoft.windowsazure.services.blob.models.SetBlobPropertiesOptions;
 import com.microsoft.windowsazure.services.blob.models.SetBlobPropertiesResult;
 import com.microsoft.windowsazure.services.blob.models.SetContainerMetadataOptions;
+import com.microsoft.windowsazure.services.core.FilterableService;
+import com.microsoft.windowsazure.services.core.ServiceException;
 
 public interface BlobContract extends FilterableService<BlobContract> {
     GetServicePropertiesResult getServiceProperties() throws ServiceException;
@@ -69,11 +69,13 @@ public interface BlobContract extends FilterableService<BlobContract> {
 
     GetContainerPropertiesResult getContainerProperties(String container) throws ServiceException;
 
-    GetContainerPropertiesResult getContainerProperties(String container, BlobServiceOptions options) throws ServiceException;
+    GetContainerPropertiesResult getContainerProperties(String container, BlobServiceOptions options)
+            throws ServiceException;
 
     GetContainerPropertiesResult getContainerMetadata(String container) throws ServiceException;
 
-    GetContainerPropertiesResult getContainerMetadata(String container, BlobServiceOptions options) throws ServiceException;
+    GetContainerPropertiesResult getContainerMetadata(String container, BlobServiceOptions options)
+            throws ServiceException;
 
     GetContainerACLResult getContainerACL(String container) throws ServiceException;
 
@@ -85,7 +87,8 @@ public interface BlobContract extends FilterableService<BlobContract> {
 
     void setContainerMetadata(String container, HashMap<String, String> metadata) throws ServiceException;
 
-    void setContainerMetadata(String container, HashMap<String, String> metadata, SetContainerMetadataOptions options) throws ServiceException;
+    void setContainerMetadata(String container, HashMap<String, String> metadata, SetContainerMetadataOptions options)
+            throws ServiceException;
 
     ListBlobsResult listBlobs(String container) throws ServiceException;
 
@@ -97,50 +100,62 @@ public interface BlobContract extends FilterableService<BlobContract> {
 
     void createBlockBlob(String container, String blob, InputStream contentStream) throws ServiceException;
 
-    void createBlockBlob(String container, String blob, InputStream contentStream, CreateBlobOptions options) throws ServiceException;
+    void createBlockBlob(String container, String blob, InputStream contentStream, CreateBlobOptions options)
+            throws ServiceException;
 
     CreateBlobPagesResult clearBlobPages(String container, String blob, PageRange range) throws ServiceException;
 
-    CreateBlobPagesResult clearBlobPages(String container, String blob, PageRange range, CreateBlobPagesOptions options) throws ServiceException;
+    CreateBlobPagesResult clearBlobPages(String container, String blob, PageRange range, CreateBlobPagesOptions options)
+            throws ServiceException;
 
-    CreateBlobPagesResult createBlobPages(String container, String blob, PageRange range, long length, InputStream contentStream) throws ServiceException;
+    CreateBlobPagesResult createBlobPages(String container, String blob, PageRange range, long length,
+            InputStream contentStream) throws ServiceException;
 
-    CreateBlobPagesResult createBlobPages(String container, String blob, PageRange range, long length, InputStream contentStream, CreateBlobPagesOptions options)
-            throws ServiceException;
+    CreateBlobPagesResult createBlobPages(String container, String blob, PageRange range, long length,
+            InputStream contentStream, CreateBlobPagesOptions options) throws ServiceException;
 
-    void createBlobBlock(String container, String blob, String blockId, InputStream contentStream) throws ServiceException;
+    void createBlobBlock(String container, String blob, String blockId, InputStream contentStream)
+            throws ServiceException;
 
-    void createBlobBlock(String container, String blob, String blockId, InputStream contentStream, CreateBlobBlockOptions options) throws ServiceException;
+    void createBlobBlock(String container, String blob, String blockId, InputStream contentStream,
+            CreateBlobBlockOptions options) throws ServiceException;
 
     void commitBlobBlocks(String container, String blob, BlockList blockList) throws ServiceException;
 
-    void commitBlobBlocks(String container, String blob, BlockList blockList, CommitBlobBlocksOptions options) throws ServiceException;
+    void commitBlobBlocks(String container, String blob, BlockList blockList, CommitBlobBlocksOptions options)
+            throws ServiceException;
 
     ListBlobBlocksResult listBlobBlocks(String container, String blob) throws ServiceException;
 
-    ListBlobBlocksResult listBlobBlocks(String container, String blob, ListBlobBlocksOptions options) throws ServiceException;
+    ListBlobBlocksResult listBlobBlocks(String container, String blob, ListBlobBlocksOptions options)
+            throws ServiceException;
 
     GetBlobPropertiesResult getBlobProperties(String container, String blob) throws ServiceException;
 
-    GetBlobPropertiesResult getBlobProperties(String container, String blob, GetBlobPropertiesOptions options) throws ServiceException;
+    GetBlobPropertiesResult getBlobProperties(String container, String blob, GetBlobPropertiesOptions options)
+            throws ServiceException;
 
     GetBlobMetadataResult getBlobMetadata(String container, String blob) throws ServiceException;
 
-    GetBlobMetadataResult getBlobMetadata(String container, String blob, GetBlobMetadataOptions options) throws ServiceException;
+    GetBlobMetadataResult getBlobMetadata(String container, String blob, GetBlobMetadataOptions options)
+            throws ServiceException;
 
     ListBlobRegionsResult listBlobRegions(String container, String blob) throws ServiceException;
 
-    ListBlobRegionsResult listBlobRegions(String container, String blob, ListBlobRegionsOptions options) throws ServiceException;
+    ListBlobRegionsResult listBlobRegions(String container, String blob, ListBlobRegionsOptions options)
+            throws ServiceException;
 
     SetBlobPropertiesResult setBlobProperties(String container, String blob) throws ServiceException;
 
-    SetBlobPropertiesResult setBlobProperties(String container, String blob, SetBlobPropertiesOptions options) throws ServiceException;
-
-    SetBlobMetadataResult setBlobMetadata(String container, String blob, HashMap<String, String> metadata) throws ServiceException;
+    SetBlobPropertiesResult setBlobProperties(String container, String blob, SetBlobPropertiesOptions options)
+            throws ServiceException;
 
-    SetBlobMetadataResult setBlobMetadata(String container, String blob, HashMap<String, String> metadata, SetBlobMetadataOptions options)
+    SetBlobMetadataResult setBlobMetadata(String container, String blob, HashMap<String, String> metadata)
             throws ServiceException;
 
+    SetBlobMetadataResult setBlobMetadata(String container, String blob, HashMap<String, String> metadata,
+            SetBlobMetadataOptions options) throws ServiceException;
+
     GetBlobResult getBlob(String container, String blob) throws ServiceException;
 
     GetBlobResult getBlob(String container, String blob, GetBlobOptions options) throws ServiceException;
@@ -151,24 +166,28 @@ SetBlobMetadataResult setBlobMetadata(String container, String blob, HashMap<Str
 
     CreateBlobSnapshotResult createBlobSnapshot(String container, String blob) throws ServiceException;
 
-    CreateBlobSnapshotResult createBlobSnapshot(String container, String blob, CreateBlobSnapshotOptions options) throws ServiceException;
-
-    void copyBlob(String destinationContainer, String destinationBlob, String sourceContainer, String sourceBlob) throws ServiceException;
+    CreateBlobSnapshotResult createBlobSnapshot(String container, String blob, CreateBlobSnapshotOptions options)
+            throws ServiceException;
 
-    void copyBlob(String destinationContainer, String destinationBlob, String sourceContainer, String sourceBlob, CopyBlobOptions options)
+    void copyBlob(String destinationContainer, String destinationBlob, String sourceContainer, String sourceBlob)
             throws ServiceException;
 
+    void copyBlob(String destinationContainer, String destinationBlob, String sourceContainer, String sourceBlob,
+            CopyBlobOptions options) throws ServiceException;
+
     AcquireLeaseResult acquireLease(String container, String blob) throws ServiceException;
 
     AcquireLeaseResult acquireLease(String container, String blob, AcquireLeaseOptions options) throws ServiceException;
 
     AcquireLeaseResult renewLease(String container, String blob, String leaseId) throws ServiceException;
 
-    AcquireLeaseResult renewLease(String container, String blob, String leaseId, BlobServiceOptions options) throws ServiceException;
+    AcquireLeaseResult renewLease(String container, String blob, String leaseId, BlobServiceOptions options)
+            throws ServiceException;
 
     void releaseLease(String container, String blob, String leaseId) throws ServiceException;
 
-    void releaseLease(String container, String blob, String leaseId, BlobServiceOptions options) throws ServiceException;
+    void releaseLease(String container, String blob, String leaseId, BlobServiceOptions options)
+            throws ServiceException;
 
     void breakLease(String container, String blob, String leaseId) throws ServiceException;