Merge pull request #17 from andrerod/remove_storage

Remove storage module

microsoft-azure-api-core/pom.xml

@@ -57,8 +57,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpasyncclient</artifactId>
-      <version>4.0</version>
+      <artifactId>httpclient</artifactId>
+      <version>4.3.1</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>

microsoft-azure-api-management-compute/pom.xml

@@ -78,8 +78,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpasyncclient</artifactId>
-      <version>4.0</version>
+      <artifactId>httpclient</artifactId>
+      <version>4.3.1</version>
     </dependency>
 
     <dependency>

microsoft-azure-api-media/pom.xml

@@ -60,11 +60,6 @@
       <artifactId>microsoft-azure-api-core</artifactId>
       <version>0.4.6</version>
     </dependency>
-    <dependency> 
-      <groupId>${project.groupId}</groupId>
-      <artifactId>microsoft-azure-api-storage</artifactId>
-      <version>0.4.6</version>
-    </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-client</artifactId>

microsoft-azure-api-storage/src/main/java/com/microsoft/windowsazure/services/blob/core/storage/SharedAccessSignatureHelper.java → microsoft-azure-api-media/src/main/java/com/microsoft/windowsazure/services/blob/core/storage/SharedAccessSignatureHelper.java

@@ -28,7 +28,6 @@
 import com.microsoft.windowsazure.services.core.storage.utils.UriQueryBuilder;
 import com.microsoft.windowsazure.services.core.storage.utils.Utility;
 import com.microsoft.windowsazure.services.queue.client.SharedAccessQueuePolicy;
-import com.microsoft.windowsazure.services.table.client.SharedAccessTablePolicy;
 
 /**
  * RESERVED FOR INTERNAL USE. Contains helper methods for implementing shared access signatures.
@@ -219,28 +218,6 @@ public static UriQueryBuilder generateSharedAccessSignature(final String permiss
         return builder;
     }
 
-    /**
-     * Get the complete query builder for creating the Shared Access Signature query.
-     */
-    public static UriQueryBuilder generateSharedAccessSignature(final SharedAccessTablePolicy policy,
-            final String startPartitionKey, final String startRowKey, final String endPartitionKey,
-            final String endRowKey, final String accessPolicyIdentifier, final String tableName,
-            final String signature, final String accountKeyName) throws StorageException {
-
-        String permissionString = null;
-        Date startTime = null;
-        Date expiryTime = null;
-
-        if (policy != null) {
-            permissionString = SharedAccessTablePolicy.permissionsToString(policy.getPermissions());
-            startTime = policy.getSharedAccessStartTime();
-            expiryTime = policy.getSharedAccessExpiryTime();
-        }
-
-        return generateSharedAccessSignature(permissionString, startTime, expiryTime, startPartitionKey, startRowKey,
-                endPartitionKey, endRowKey, accessPolicyIdentifier, null, tableName, signature, accountKeyName);
-    }
-
     /**
      * Get the signature hash embedded inside the Shared Access Signature for blob service.
      * 
@@ -347,43 +324,6 @@ public static String generateSharedAccessSignatureHash(final String permissions,
         return signature;
     }
 
-    /**
-     * Get the signature hash embedded inside the Shared Access Signature for blob service.
-     * 
-     * @param policy
-     *            The shared access policy to hash.
-     * @param accessPolicyIdentifier
-     *            An optional identifier for the policy.
-     * @param resourceName
-     *            the resource name.
-     * @param client
-     *            the ServiceClient associated with the object.
-     * @param opContext
-     *            an object used to track the execution of the operation
-     * @return the signature hash embedded inside the Shared Access Signature.
-     * @throws InvalidKeyException
-     * @throws StorageException
-     */
-    public static String generateSharedAccessSignatureHash(final SharedAccessTablePolicy policy,
-            final String accessPolicyIdentifier, final String resourceName, final String startPartitionKey,
-            final String startRowKey, final String endPartitionKey, final String endRowKey, final ServiceClient client,
-            final OperationContext opContext) throws InvalidKeyException, StorageException {
-        String permissionString = null;
-        Date startTime = null;
-        Date expiryTime = null;
-
-        if (policy != null) {
-            permissionString = SharedAccessTablePolicy.permissionsToString(policy.getPermissions());
-            startTime = policy.getSharedAccessStartTime();
-            expiryTime = policy.getSharedAccessExpiryTime();
-        }
-
-        return generateSharedAccessSignatureHash(permissionString, startTime, expiryTime, resourceName,
-                accessPolicyIdentifier, true, startPartitionKey, startRowKey, endPartitionKey, endRowKey, client,
-                opContext);
-
-    }
-
     /**
      * Parses the query parameters and populates a StorageCredentialsSharedAccessSignature object if one is present.
      * 

microsoft-azure-api-storage/src/main/java/com/microsoft/windowsazure/services/core/storage/CloudStorageAccount.java → microsoft-azure-api-media/src/main/java/com/microsoft/windowsazure/services/core/storage/CloudStorageAccount.java

@@ -23,14 +23,9 @@
 import java.util.Map.Entry;
 
 import com.microsoft.windowsazure.services.core.storage.utils.Utility;
-import com.microsoft.windowsazure.services.queue.client.CloudQueueClient;
-import com.microsoft.windowsazure.services.table.client.CloudTableClient;
 
-/*
 import com.microsoft.windowsazure.services.blob.client.CloudBlobClient;
 import com.microsoft.windowsazure.services.queue.client.CloudQueueClient;
-import com.microsoft.windowsazure.services.table.client.CloudTableClient;
-*/
 
 /**
  * Represents a Windows Azure storage account.
@@ -544,26 +539,6 @@ public CloudQueueClient createCloudQueueClient() {
         }
         return new CloudQueueClient(this.getQueueEndpoint(), this.getCredentials());
     }
-
-    /**
-     * Creates a new table service client.
-     * 
-     * @return A client object that uses the Table service endpoint.
-     */
-    public CloudTableClient createCloudTableClient() {
-        if (this.getTableEndpoint() == null) {
-            throw new IllegalArgumentException("No table endpoint configured.");
-        }
-
-        if (this.credentials == null) {
-            throw new IllegalArgumentException("No credentials provided.");
-        }
-
-        if (!this.credentials.canCredentialsSignRequest()) {
-            throw new IllegalArgumentException("CloudTableClient requires a credential that can sign request");
-        }
-        return new CloudTableClient(this.getTableEndpoint(), this.getCredentials());
-    }
 
     /**
      * Returns the endpoint for the Blob service, as configured for the storage account. This method is not supported

microsoft-azure-api-storage/src/main/java/com/microsoft/windowsazure/services/table/implementation/InputStreamDataSource.java → microsoft-azure-api-media/src/main/java/com/microsoft/windowsazure/services/core/storage/utils/implementation/InputStreamDataSource.java

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.microsoft.windowsazure.services.table.implementation;
+package com.microsoft.windowsazure.services.core.storage.utils.implementation;
 
 import java.io.IOException;
 import java.io.InputStream;

microsoft-azure-api-media/src/main/java/com/microsoft/windowsazure/services/media/implementation/MediaBatchOperations.java

@@ -44,13 +44,13 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import com.microsoft.windowsazure.services.core.ServiceException;
+import com.microsoft.windowsazure.services.core.storage.utils.implementation.InputStreamDataSource;
 import com.microsoft.windowsazure.services.media.entityoperations.EntityBatchOperation;
 import com.microsoft.windowsazure.services.media.implementation.atom.EntryType;
 import com.microsoft.windowsazure.services.media.models.Job;
 import com.microsoft.windowsazure.services.media.models.JobInfo;
 import com.microsoft.windowsazure.services.media.models.Task;
 import com.microsoft.windowsazure.services.media.models.TaskInfo;
-import com.microsoft.windowsazure.services.table.implementation.InputStreamDataSource;
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.UniformInterfaceException;
 import com.sun.jersey.core.header.InBoundHeaders;

microsoft-azure-api-media/src/main/resources/META-INF/services/com.microsoft.windowsazure.services.core.Builder$Exports

@@ -1 +1,3 @@
+com.microsoft.windowsazure.services.blob.Exports
+com.microsoft.windowsazure.services.queue.Exports
 com.microsoft.windowsazure.services.media.Exports

microsoft-azure-api-media/src/test/java/com/microsoft/windowsazure/services/media/implementation/StatusLineTest.java

@@ -15,6 +15,7 @@
 
 package com.microsoft.windowsazure.services.media.implementation;
 
+import com.microsoft.windowsazure.services.core.storage.utils.implementation.InputStreamDataSource;
 import static org.junit.Assert.*;
 
 import java.io.ByteArrayInputStream;
@@ -23,8 +24,6 @@
 
 import org.junit.Test;
 
-import com.microsoft.windowsazure.services.table.implementation.InputStreamDataSource;
-
 public class StatusLineTest {
 
     @Test

microsoft-azure-api-media/src/test/java/com/microsoft/windowsazure/services/scenarios/ScenarioTestBase.java

@@ -26,7 +26,6 @@
 import com.microsoft.windowsazure.services.core.Configuration;
 import com.microsoft.windowsazure.services.media.MediaConfiguration;
 import com.microsoft.windowsazure.services.queue.QueueConfiguration;
-import com.microsoft.windowsazure.services.table.TableConfiguration;
 
 @SuppressWarnings("deprecation")
 public abstract class ScenarioTestBase {
@@ -46,10 +45,6 @@ protected static void initializeConfig() {
         overrideWithEnv(config, QueueConfiguration.ACCOUNT_KEY);
         overrideWithEnv(config, QueueConfiguration.URI);
 
-        overrideWithEnv(config, TableConfiguration.ACCOUNT_NAME);
-        overrideWithEnv(config, TableConfiguration.ACCOUNT_KEY);
-        overrideWithEnv(config, TableConfiguration.URI);
-
         overrideWithEnv(config, MediaConfiguration.URI);
         overrideWithEnv(config, MediaConfiguration.OAUTH_URI);
         overrideWithEnv(config, MediaConfiguration.OAUTH_CLIENT_ID);

microsoft-azure-api-parent/pom.xml

@@ -332,7 +332,6 @@
     <module>../microsoft-azure-api-scheduler</module>
     <module>../microsoft-azure-api-serviceBus</module>
     <module>../microsoft-azure-api-serviceRuntime</module>
-    <module>../microsoft-azure-api-storage</module>
     <module>../microsoft-azure-api-subscription</module>
   </modules>
 </project>