Merge pull request Azure#49 from gcheng/locatorupdate

Locatorupdate according to latest info
joostdenijs · Dec 4, 2012 · 4157475 · 4157475
2 parents 2c2b23c + 766ef32
commit 4157475
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/...azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/LocatorType.java b/...azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/LocatorType.java
@@ -27,9 +27,7 @@ public enum LocatorType {
     /** The sas. */
     SAS(1),
     /** The Origin. */
-    Origin(2),
-    /** The third party locator. */
-    ThirdParty(3);
+    OnDemandOrigin(2);
 
     /** The locator type code. */
     private int locatorTypeCode;
@@ -67,9 +65,7 @@ public static LocatorType fromCode(int type) {
             case 1:
                 return LocatorType.SAS;
             case 2:
-                return LocatorType.Origin;
-            case 3:
-                return LocatorType.ThirdParty;
+                return LocatorType.OnDemandOrigin;
             default:
                 throw new InvalidParameterException("type");
         }

diff --git a/...-api/src/test/java/com/microsoft/windowsazure/services/media/LocatorIntegrationTests.java b/...-api/src/test/java/com/microsoft/windowsazure/services/media/LocatorIntegrationTests.java
@@ -106,7 +106,7 @@ public void instanceSetup() throws Exception {
     @Test
     public void createLocatorSuccess() throws ServiceException {
         // Arrange
-        LocatorType locatorType = LocatorType.Origin;
+        LocatorType locatorType = LocatorType.SAS;
         Date expectedExpirationDateTime = calculateDefaultExpectedExpDate(accessPolicyInfoRead, assetInfo);
 
         // Act
@@ -229,7 +229,7 @@ public void listLocatorsWithOptions() throws ServiceException {
     @Test
     public void updateLocatorSuccess() throws ServiceException {
         // Arrange
-        LocatorType locatorType = LocatorType.Origin;
+        LocatorType locatorType = LocatorType.OnDemandOrigin;
         LocatorInfo locatorInfo = service.create(Locator.create(accessPolicyInfoRead.getId(), assetInfo.getId(),
                 locatorType));
 
@@ -252,7 +252,7 @@ public void updateLocatorSuccess() throws ServiceException {
     @Test
     public void updateLocatorNoChangesSuccess() throws ServiceException {
         // Arrange
-        LocatorType locatorType = LocatorType.Origin;
+        LocatorType locatorType = LocatorType.OnDemandOrigin;
         Date expirationDateTime = new Date();
         expirationDateTime.setTime(expirationDateTime.getTime() + tenMinutesInMS);
         Date startTime = new Date();

diff --git a/...e-api/src/test/java/com/microsoft/windowsazure/services/media/models/LocatorInfoTest.java b/...e-api/src/test/java/com/microsoft/windowsazure/services/media/models/LocatorInfoTest.java
@@ -52,7 +52,7 @@ public void testGetSetExpirationDateTime() {
     @Test
     public void testGetSetType() {
         // Arrange
-        LocatorType expectedLocatorType = LocatorType.Origin;
+        LocatorType expectedLocatorType = LocatorType.SAS;
         LocatorInfo locatorInfo = new LocatorInfo();
 
         // Act 

diff --git a/...-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceWrapper.java b/...-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceWrapper.java
@@ -38,9 +38,9 @@
 import com.microsoft.windowsazure.services.media.models.AccessPolicyInfo;
 import com.microsoft.windowsazure.services.media.models.AccessPolicyPermission;
 import com.microsoft.windowsazure.services.media.models.Asset;
+import com.microsoft.windowsazure.services.media.models.AssetFileInfo;
 import com.microsoft.windowsazure.services.media.models.AssetInfo;
 import com.microsoft.windowsazure.services.media.models.EncryptionOption;
-import com.microsoft.windowsazure.services.media.models.AssetFileInfo;
 import com.microsoft.windowsazure.services.media.models.ListResult;
 import com.microsoft.windowsazure.services.media.models.Locator;
 import com.microsoft.windowsazure.services.media.models.LocatorInfo;
@@ -278,14 +278,14 @@ public void cancelJob(JobInfo job) throws InterruptedException {
     public List<URL> createOriginUrlsForStreamingContent(AssetInfo asset, int availabilityWindowInMinutes)
             throws ServiceException, MalformedURLException {
         return createOriginUrlsForStreamingContentWorker(asset, availabilityWindowInMinutes, true, "",
-                LocatorType.Origin);
+                LocatorType.OnDemandOrigin);
     }
 
     // Deliver
     public List<URL> createOriginUrlsForAppleHLSContent(AssetInfo asset, int availabilityWindowInMinutes)
             throws ServiceException, MalformedURLException {
         return createOriginUrlsForStreamingContentWorker(asset, availabilityWindowInMinutes, true,
-                "(format=m3u8-aapl)", LocatorType.Origin);
+                "(format=m3u8-aapl)", LocatorType.OnDemandOrigin);
     }
 
     // Deliver