Permalink
Browse files

Merge pull request #96 from WindowsAzure/dev

Dev
  • Loading branch information...
2 parents 6ef0e49 + 410e861 commit 9daaf47fb6031ac4bf81bd8b72b85f8a5cdb0e9b Albert Cheng committed Jan 11, 2013
Showing with 179 additions and 181 deletions.
  1. +1 −1 microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/MediaContract.java
  2. +9 −9 ...dowsazure/services/media/{implementation/entities → entityoperations}/DefaultActionOperation.java
  3. +2 −2 ...dowsazure/services/media/{implementation/entities → entityoperations}/DefaultDeleteOperation.java
  4. +13 −13 ...services/media/{implementation/entities → entityoperations}/DefaultEntityTypeActionOperation.java
  5. +1 −1 ...windowsazure/services/media/{implementation/entities → entityoperations}/DefaultGetOperation.java
  6. +2 −2 ...indowsazure/services/media/{implementation/entities → entityoperations}/DefaultListOperation.java
  7. +1 −1 ...ndowsazure/services/media/{implementation/entities → entityoperations}/EntityActionOperation.java
  8. +1 −1 ...indowsazure/services/media/{implementation/entities → entityoperations}/EntityBatchOperation.java
  9. +1 −1 ...soft/windowsazure/services/media/{implementation/entities → entityoperations}/EntityContract.java
  10. +1 −1 ...ndowsazure/services/media/{implementation/entities → entityoperations}/EntityCreateOperation.java
  11. +1 −1 ...ndowsazure/services/media/{implementation/entities → entityoperations}/EntityDeleteOperation.java
  12. +1 −1 .../windowsazure/services/media/{implementation/entities → entityoperations}/EntityGetOperation.java
  13. +3 −3 ...windowsazure/services/media/{implementation/entities → entityoperations}/EntityLinkOperation.java
  14. +1 −1 ...windowsazure/services/media/{implementation/entities → entityoperations}/EntityListOperation.java
  15. +1 −1 ...oft/windowsazure/services/media/{implementation/entities → entityoperations}/EntityOperation.java
  16. +3 −3 ...windowsazure/services/media/{implementation/entities → entityoperations}/EntityOperationBase.java
  17. +1 −1 ...zure/services/media/{implementation/entities → entityoperations}/EntityOperationSingleResult.java
  18. +1 −1 .../services/media/{implementation/entities → entityoperations}/EntityOperationSingleResultBase.java
  19. +1 −1 ...oft/windowsazure/services/media/{implementation/entities → entityoperations}/EntityProxyData.java
  20. +8 −8 ...oft/windowsazure/services/media/{implementation/entities → entityoperations}/EntityRestProxy.java
  21. +1 −1 ...sazure/services/media/{implementation/entities → entityoperations}/EntityTypeActionOperation.java
  22. +1 −1 ...ndowsazure/services/media/{implementation/entities → entityoperations}/EntityUpdateOperation.java
  23. +1 −1 .../src/main/java/com/microsoft/windowsazure/services/media/implementation/MediaBatchOperations.java
  24. +14 −14 ...c/main/java/com/microsoft/windowsazure/services/media/implementation/MediaExceptionProcessor.java
  25. +3 −3 ...re-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/MediaRestProxy.java
  26. +7 −7 microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/AccessPolicy.java
  27. +14 −14 microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/Asset.java
  28. +13 −13 microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/AssetFile.java
  29. +8 −8 microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/ContentKey.java
  30. +15 −15 microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/Job.java
  31. +13 −13 microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/Locator.java
  32. +1 −1 ...soft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/MediaProcessor.java
  33. +4 −4 ...osoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/ProtectionKey.java
  34. +2 −2 microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/Task.java
  35. +3 −5 ...ure-api/src/test/java/com/microsoft/windowsazure/services/media/ProtectionKeyIntegrationTest.java
  36. +2 −2 ...api/src/test/java/com/microsoft/windowsazure/services/media/implementation/LinkRetrievalTest.java
  37. +3 −3 ...re-api/src/test/java/com/microsoft/windowsazure/services/media/models/AccessPolicyEntityTest.java
  38. +4 −4 ...oft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/models/AssetEntityTest.java
  39. +6 −6 ...azure-api/src/test/java/com/microsoft/windowsazure/services/media/models/AssetFileEntityTest.java
  40. +3 −3 ...zure-api/src/test/java/com/microsoft/windowsazure/services/media/models/ContentKeyEntityTest.java
  41. +2 −2 ...osoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/models/JobEntityTest.java
  42. +4 −4 ...t-azure-api/src/test/java/com/microsoft/windowsazure/services/media/models/LocatorEntityTest.java
  43. +1 −1 ...-api/src/test/java/com/microsoft/windowsazure/services/media/models/MediaProcessorEntityTest.java
  44. +1 −1 ...ft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceWrapper.java
@@ -16,7 +16,7 @@
package com.microsoft.windowsazure.services.media;
import com.microsoft.windowsazure.services.core.FilterableService;
-import com.microsoft.windowsazure.services.media.implementation.entities.EntityContract;
+import com.microsoft.windowsazure.services.media.entityoperations.EntityContract;
import com.microsoft.windowsazure.services.media.models.LocatorInfo;
/**
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.media.implementation.entities;
+package com.microsoft.windowsazure.services.media.entityoperations;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
@@ -62,7 +62,7 @@ public DefaultActionOperation() {
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityOperation#setProxyData(com.microsoft.windowsazure.services.media.implementation.entities.EntityProxyData)
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityOperation#setProxyData(com.microsoft.windowsazure.services.media.entityoperations.EntityProxyData)
*/
@Override
public void setProxyData(EntityProxyData proxyData) {
@@ -87,15 +87,15 @@ public String getUri() {
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityActionOperation#getQueryParameters()
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityActionOperation#getQueryParameters()
*/
@Override
public MultivaluedMap<String, String> getQueryParameters() {
return this.queryParameters;
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityActionOperation#addQueryParameter(java.lang.String, java.lang.String)
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityActionOperation#addQueryParameter(java.lang.String, java.lang.String)
*/
@Override
public DefaultActionOperation addQueryParameter(String key, String value) {
@@ -104,7 +104,7 @@ public DefaultActionOperation addQueryParameter(String key, String value) {
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityOperation#getContentType()
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityOperation#getContentType()
*/
@Override
public MediaType getContentType() {
@@ -125,7 +125,7 @@ public DefaultActionOperation setContentType(MediaType contentType) {
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityOperation#getAcceptType()
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityOperation#getAcceptType()
*/
@Override
public MediaType getAcceptType() {
@@ -145,23 +145,23 @@ public DefaultActionOperation setAcceptType(MediaType acceptType) {
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityActionOperation#getVerb()
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityActionOperation#getVerb()
*/
@Override
public String getVerb() {
return "GET";
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityActionOperation#getRequestContents()
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityActionOperation#getRequestContents()
*/
@Override
public Object getRequestContents() {
return null;
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityOperation#processResponse(java.lang.Object)
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityOperation#processResponse(java.lang.Object)
*/
@Override
public Object processResponse(Object rawResponse) throws ServiceException {
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.media.implementation.entities;
+package com.microsoft.windowsazure.services.media.entityoperations;
/**
* Generic implementation of Delete operation usable by most entities
@@ -31,7 +31,7 @@ public DefaultDeleteOperation(String entityUri, String entityId) {
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityDeleteOperation#setProxyData(com.microsoft.windowsazure.services.media.implementation.entities.EntityProxyData)
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityDeleteOperation#setProxyData(com.microsoft.windowsazure.services.media.entityoperations.EntityProxyData)
*/
@Override
public void setProxyData(EntityProxyData proxyData) {
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.media.implementation.entities;
+package com.microsoft.windowsazure.services.media.entityoperations;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
@@ -64,79 +64,79 @@ public DefaultEntityTypeActionOperation() {
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityTypeActionOperation#processTypeResponse(com.sun.jersey.api.client.ClientResponse)
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityTypeActionOperation#processTypeResponse(com.sun.jersey.api.client.ClientResponse)
*/
@Override
public T processTypeResponse(ClientResponse clientResponse) {
return null;
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityTypeActionOperation#getQueryParameters()
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityTypeActionOperation#getQueryParameters()
*/
@Override
public MultivaluedMap<String, String> getQueryParameters() {
return this.queryParameters;
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityTypeActionOperation#getVerb()
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityTypeActionOperation#getVerb()
*/
@Override
public String getVerb() {
return "GET";
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityTypeActionOperation#getRequestContents()
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityTypeActionOperation#getRequestContents()
*/
@Override
public Object getRequestContents() {
return null;
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityOperation#setProxyData(com.microsoft.windowsazure.services.media.implementation.entities.EntityProxyData)
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityOperation#setProxyData(com.microsoft.windowsazure.services.media.entityoperations.EntityProxyData)
*/
@Override
public void setProxyData(EntityProxyData proxyData) {
this.proxyData = proxyData;
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityOperation#getUri()
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityOperation#getUri()
*/
@Override
public String getUri() {
return this.name;
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityOperation#getContentType()
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityOperation#getContentType()
*/
@Override
public MediaType getContentType() {
return this.contentType;
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityOperation#getAcceptType()
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityOperation#getAcceptType()
*/
@Override
public MediaType getAcceptType() {
return this.acceptType;
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityOperation#processResponse(java.lang.Object)
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityOperation#processResponse(java.lang.Object)
*/
@Override
public Object processResponse(Object rawResponse) throws ServiceException {
return null;
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityTypeActionOperation#addQueryParameter(java.lang.String, java.lang.String)
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityTypeActionOperation#addQueryParameter(java.lang.String, java.lang.String)
*/
@Override
public DefaultEntityTypeActionOperation<T> addQueryParameter(String key, String value) {
@@ -145,7 +145,7 @@ public Object processResponse(Object rawResponse) throws ServiceException {
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityTypeActionOperation#setContentType(javax.ws.rs.core.MediaType)
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityTypeActionOperation#setContentType(javax.ws.rs.core.MediaType)
*/
@Override
public EntityTypeActionOperation<T> setContentType(MediaType contentType) {
@@ -154,7 +154,7 @@ public Object processResponse(Object rawResponse) throws ServiceException {
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityTypeActionOperation#setAcceptType(javax.ws.rs.core.MediaType)
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityTypeActionOperation#setAcceptType(javax.ws.rs.core.MediaType)
*/
@Override
public EntityTypeActionOperation<T> setAcceptType(MediaType acceptType) {
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.media.implementation.entities;
+package com.microsoft.windowsazure.services.media.entityoperations;
/**
* Generic implementation of the get operation usable for most entities
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.media.implementation.entities;
+package com.microsoft.windowsazure.services.media.entityoperations;
import javax.ws.rs.core.MultivaluedMap;
@@ -97,7 +97,7 @@ public DefaultListOperation(String entityUri, GenericType<ListResult<T>> respons
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityOperationBase#processResponse(java.lang.Object)
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityOperationBase#processResponse(java.lang.Object)
*/
@Override
public Object processResponse(Object rawResponse) throws ServiceException {
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.media.implementation.entities;
+package com.microsoft.windowsazure.services.media.entityoperations;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.media.implementation.entities;
+package com.microsoft.windowsazure.services.media.entityoperations;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.media.implementation.entities;
+package com.microsoft.windowsazure.services.media.entityoperations;
import com.microsoft.windowsazure.services.core.ServiceException;
import com.microsoft.windowsazure.services.media.models.ListResult;
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.media.implementation.entities;
+package com.microsoft.windowsazure.services.media.entityoperations;
import com.microsoft.windowsazure.services.core.ServiceException;
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.media.implementation.entities;
+package com.microsoft.windowsazure.services.media.entityoperations;
public interface EntityDeleteOperation {
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.media.implementation.entities;
+package com.microsoft.windowsazure.services.media.entityoperations;
/**
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.media.implementation.entities;
+package com.microsoft.windowsazure.services.media.entityoperations;
import java.io.UnsupportedEncodingException;
import java.net.URI;
@@ -120,15 +120,15 @@ public String getUri() {
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.DefaultActionOperation#getVerb()
+ * @see com.microsoft.windowsazure.services.media.entityoperations.DefaultActionOperation#getVerb()
*/
@Override
public String getVerb() {
return "POST";
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.DefaultActionOperation#getRequestContents()
+ * @see com.microsoft.windowsazure.services.media.entityoperations.DefaultActionOperation#getRequestContents()
*/
@Override
public Object getRequestContents() {
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.media.implementation.entities;
+package com.microsoft.windowsazure.services.media.entityoperations;
import javax.ws.rs.core.MultivaluedMap;
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.media.implementation.entities;
+package com.microsoft.windowsazure.services.media.entityoperations;
import javax.ws.rs.core.MediaType;
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.media.implementation.entities;
+package com.microsoft.windowsazure.services.media.entityoperations;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
@@ -62,7 +62,7 @@ protected EntityOperationBase(EntityUriBuilder uriBuilder) {
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityOperation#setProxyData(com.microsoft.windowsazure.services.media.implementation.entities.EntityProxyData)
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityOperation#setProxyData(com.microsoft.windowsazure.services.media.entityoperations.EntityProxyData)
*/
@Override
public void setProxyData(EntityProxyData proxyData) {
@@ -103,7 +103,7 @@ public MediaType getAcceptType() {
}
/* (non-Javadoc)
- * @see com.microsoft.windowsazure.services.media.implementation.entities.EntityOperation#processResponse(java.lang.Object)
+ * @see com.microsoft.windowsazure.services.media.entityoperations.EntityOperation#processResponse(java.lang.Object)
*/
@Override
public Object processResponse(Object rawResponse) throws ServiceException {
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.media.implementation.entities;
+package com.microsoft.windowsazure.services.media.entityoperations;
public interface EntityOperationSingleResult<T> extends EntityOperation {
/**
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.media.implementation.entities;
+package com.microsoft.windowsazure.services.media.entityoperations;
import com.microsoft.windowsazure.services.core.ServiceException;
Oops, something went wrong.

0 comments on commit 9daaf47

Please sign in to comment.