From 9977e8f9a4cc6acefad1e1cdcb790c42aa075c7a Mon Sep 17 00:00:00 2001 From: Chris Tavares Date: Tue, 11 Dec 2012 15:46:31 -0800 Subject: [PATCH] Renamed EncryptionOption to AssetOption --- .../services/media/models/Asset.java | 4 ++-- .../services/media/models/AssetInfo.java | 4 ++-- ...{EncryptionOption.java => AssetOption.java} | 16 ++++++++-------- .../services/media/AssetIntegrationTest.java | 18 +++++++++--------- .../services/media/models/AssetInfoTest.java | 5 +++-- .../scenarios/MediaServiceScenarioTest.java | 16 ++++++++-------- .../scenarios/MediaServiceValidation.java | 4 ++-- .../scenarios/MediaServiceWrapper.java | 4 ++-- 8 files changed, 36 insertions(+), 35 deletions(-) rename microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/{EncryptionOption.java => AssetOption.java} (80%) diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/Asset.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/Asset.java index aea5c606241d0..e736b536d9e0e 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/Asset.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/Asset.java @@ -71,7 +71,7 @@ public static class Creator extends EntityOperationSingleResultBase i private String alternateId; /** The options. */ - private EncryptionOption options; + private AssetOption options; /** The state. */ private AssetState state; @@ -132,7 +132,7 @@ public Creator setAlternateId(String alternateId) { * the options * @return the creator */ - public Creator setOptions(EncryptionOption options) { + public Creator setOptions(AssetOption options) { this.options = options; return this; } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/AssetInfo.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/AssetInfo.java index f403eb492d91d..7572827f3c411 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/AssetInfo.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/AssetInfo.java @@ -98,7 +98,7 @@ public String getAlternateId() { * * @return the options */ - public EncryptionOption getOptions() { - return EncryptionOption.fromCode(getContent().getOptions()); + public AssetOption getOptions() { + return AssetOption.fromCode(getContent().getOptions()); } } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/EncryptionOption.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/AssetOption.java similarity index 80% rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/EncryptionOption.java rename to microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/AssetOption.java index 6b989e3aa279d..6acd1f144c41f 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/EncryptionOption.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/AssetOption.java @@ -20,7 +20,7 @@ /** * Specifies the options for encryption. */ -public enum EncryptionOption { +public enum AssetOption { /** The None. */ None(0), @@ -38,7 +38,7 @@ public enum EncryptionOption { * @param encryptionOptionCode * the encryption option code */ - private EncryptionOption(int encryptionOptionCode) { + private AssetOption(int encryptionOptionCode) { this.encryptionOptionCode = encryptionOptionCode; } @@ -52,21 +52,21 @@ public int getCode() { } /** - * Create an EncryptionOption instance based on the + * Create an AssetOption instance based on the * given integer. * * @param option * the integer value of option - * @return The EncryptionOption + * @return The AssetOption */ - public static EncryptionOption fromCode(int option) { + public static AssetOption fromCode(int option) { switch (option) { case 0: - return EncryptionOption.None; + return AssetOption.None; case 1: - return EncryptionOption.StorageEncrypted; + return AssetOption.StorageEncrypted; case 2: - return EncryptionOption.CommonEncryptionProtected; + return AssetOption.CommonEncryptionProtected; default: throw new InvalidParameterException("option"); } diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/AssetIntegrationTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/AssetIntegrationTest.java index 8696fb1819bdb..acfbfa7868271 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/AssetIntegrationTest.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/AssetIntegrationTest.java @@ -38,7 +38,7 @@ import com.microsoft.windowsazure.services.media.models.ContentKey; import com.microsoft.windowsazure.services.media.models.ContentKeyInfo; import com.microsoft.windowsazure.services.media.models.ContentKeyType; -import com.microsoft.windowsazure.services.media.models.EncryptionOption; +import com.microsoft.windowsazure.services.media.models.AssetOption; import com.sun.jersey.core.util.MultivaluedMapImpl; public class AssetIntegrationTest extends IntegrationTestBase { @@ -49,12 +49,12 @@ private void verifyInfosEqual(String message, AssetInfo expected, AssetInfo actu } private void verifyAssetProperties(String message, String testName, String altId, - EncryptionOption encryptionOption, AssetState assetState, AssetInfo actualAsset) { + AssetOption encryptionOption, AssetState assetState, AssetInfo actualAsset) { verifyAssetProperties(message, testName, altId, encryptionOption, assetState, null, null, null, actualAsset); } private void verifyAssetProperties(String message, String testName, String altId, - EncryptionOption encryptionOption, AssetState assetState, String id, Date created, Date lastModified, + AssetOption encryptionOption, AssetState assetState, String id, Date created, Date lastModified, AssetInfo actualAsset) { assertNotNull(message, actualAsset); assertEquals(message + " Name", testName, actualAsset.getName()); @@ -77,7 +77,7 @@ public void createAssetOptionsSuccess() throws Exception { // Arrange String testName = testAssetPrefix + "createAssetOptionsSuccess"; String altId = "altId"; - EncryptionOption encryptionOption = EncryptionOption.StorageEncrypted; + AssetOption encryptionOption = AssetOption.StorageEncrypted; AssetState assetState = AssetState.Published; // Act @@ -113,7 +113,7 @@ public void createAssetNullNameSuccess() throws Exception { try { actualAsset = service.create(Asset.create()); // Assert - verifyAssetProperties("actualAsset", "", "", EncryptionOption.None, AssetState.Initialized, actualAsset); + verifyAssetProperties("actualAsset", "", "", AssetOption.None, AssetState.Initialized, actualAsset); } finally { // Clean up the anonymous asset now while we have the id, because we @@ -134,7 +134,7 @@ public void getAssetSuccess() throws Exception { // Arrange String testName = testAssetPrefix + "GetAssetSuccess"; String altId = "altId"; - EncryptionOption encryptionOption = EncryptionOption.StorageEncrypted; + AssetOption encryptionOption = AssetOption.StorageEncrypted; AssetState assetState = AssetState.Published; AssetInfo assetInfo = service.create(Asset.create().setName(testName).setAlternateId(altId) @@ -165,7 +165,7 @@ public void getAssetNonexistId() throws ServiceException { public void listAssetSuccess() throws ServiceException { // Arrange String altId = "altId"; - EncryptionOption encryptionOption = EncryptionOption.StorageEncrypted; + AssetOption encryptionOption = AssetOption.StorageEncrypted; AssetState assetState = AssetState.Published; String[] assetNames = new String[] { testAssetPrefix + "assetA", testAssetPrefix + "assetB" }; @@ -213,7 +213,7 @@ public void canListAssetsWithOptions() throws ServiceException { public void updateAssetSuccess() throws Exception { // Arrange String originalTestName = testAssetPrefix + "updateAssetSuccessOriginal"; - EncryptionOption originalEncryptionOption = EncryptionOption.StorageEncrypted; + AssetOption originalEncryptionOption = AssetOption.StorageEncrypted; AssetState originalAssetState = AssetState.Initialized; AssetInfo originalAsset = service.create(Asset.create().setName(originalTestName).setAlternateId("altId") .setOptions(originalEncryptionOption)); @@ -285,7 +285,7 @@ public void linkAssetContentKeySuccess() throws ServiceException, URISyntaxExcep // Arrange String originalTestName = testAssetPrefix + "linkAssetContentKeyInvalidIdFailed"; AssetInfo assetInfo = service.create(Asset.create().setName(originalTestName) - .setOptions(EncryptionOption.StorageEncrypted)); + .setOptions(AssetOption.StorageEncrypted)); String contentKeyId = String.format("nb:kid:UUID:%s", UUID.randomUUID()); String encryptedContentKey = "dummyEncryptedContentKey"; ContentKeyInfo contentKeyInfo = service.create(ContentKey.create(contentKeyId, diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/models/AssetInfoTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/models/AssetInfoTest.java index 3f794f40d6127..21eba4a11ded9 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/models/AssetInfoTest.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/media/models/AssetInfoTest.java @@ -108,11 +108,12 @@ public void testGetSetName() { @Test public void testGetSetOptions() { // Arrange - EncryptionOption expectedOptions = EncryptionOption.None; + + AssetOption expectedOptions = AssetOption.None; AssetInfo assetInfo = new AssetInfo(null, new AssetType().setOptions(expectedOptions.getCode())); // Act - EncryptionOption actualOptions = assetInfo.getOptions(); + AssetOption actualOptions = assetInfo.getOptions(); // Assert assertEquals(expectedOptions, actualOptions); diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceScenarioTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceScenarioTest.java index fa213a687e31f..55dca19d3a94c 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceScenarioTest.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceScenarioTest.java @@ -32,7 +32,7 @@ import com.microsoft.windowsazure.services.media.MediaContract; import com.microsoft.windowsazure.services.media.MediaService; import com.microsoft.windowsazure.services.media.models.AssetInfo; -import com.microsoft.windowsazure.services.media.models.EncryptionOption; +import com.microsoft.windowsazure.services.media.models.AssetOption; import com.microsoft.windowsazure.services.media.models.JobInfo; import com.microsoft.windowsazure.services.media.models.ListResult; import com.microsoft.windowsazure.services.media.models.Task; @@ -60,8 +60,8 @@ public static void cleanup() throws ServiceException { @Test public void newAsset() throws Exception { - AssetInfo asset = wrapper.createAsset(testAssetPrefix + "newAsset", EncryptionOption.None); - validator.validateAsset(asset, testAssetPrefix + "newAsset", EncryptionOption.None); + AssetInfo asset = wrapper.createAsset(testAssetPrefix + "newAsset", AssetOption.None); + validator.validateAsset(asset, testAssetPrefix + "newAsset", AssetOption.None); } @Test @@ -70,7 +70,7 @@ public void pageOverAssets() throws ServiceException { String rootName = testAssetPrefix + "pageOverAssets"; List assetNames = createListOfAssetNames(rootName, 4); for (String assetName : assetNames) { - wrapper.createAsset(assetName, EncryptionOption.None); + wrapper.createAsset(assetName, AssetOption.None); } signalSetupFinished(); @@ -81,7 +81,7 @@ public void pageOverAssets() throws ServiceException { @Test public void uploadFiles() throws Exception { signalSetupStarting(); - AssetInfo asset = wrapper.createAsset(testAssetPrefix + "uploadFiles", EncryptionOption.None); + AssetInfo asset = wrapper.createAsset(testAssetPrefix + "uploadFiles", AssetOption.None); signalSetupFinished(); wrapper.uploadFilesToAsset(asset, 10, getTestAssetFiles()); @@ -91,7 +91,7 @@ public void uploadFiles() throws Exception { @Test public void downloadFiles() throws Exception { signalSetupStarting(); - AssetInfo asset = wrapper.createAsset(testAssetPrefix + "downloadFiles", EncryptionOption.None); + AssetInfo asset = wrapper.createAsset(testAssetPrefix + "downloadFiles", AssetOption.None); wrapper.uploadFilesToAsset(asset, 10, getTestAssetFiles()); signalSetupFinished(); @@ -102,7 +102,7 @@ public void downloadFiles() throws Exception { @Test public void createJob() throws Exception { signalSetupStarting(); - AssetInfo asset = wrapper.createAsset(testAssetPrefix + "createJob", EncryptionOption.None); + AssetInfo asset = wrapper.createAsset(testAssetPrefix + "createJob", AssetOption.None); wrapper.uploadFilesToAsset(asset, 10, getTestAssetFiles()); signalSetupFinished(); @@ -114,7 +114,7 @@ public void createJob() throws Exception { @Test public void transformAsset() throws Exception { signalSetupStarting(); - AssetInfo asset = wrapper.createAsset(testAssetPrefix + "transformAsset", EncryptionOption.None); + AssetInfo asset = wrapper.createAsset(testAssetPrefix + "transformAsset", AssetOption.None); wrapper.uploadFilesToAsset(asset, 10, getTestAssetFiles()); String jobName = "my job transformAsset"; JobInfo job = wrapper.createJob(jobName, asset, createTasks()); diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceValidation.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceValidation.java index 4579a543a39cb..7de78be033c23 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceValidation.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceValidation.java @@ -33,7 +33,7 @@ import com.microsoft.windowsazure.services.media.models.AssetFileInfo; import com.microsoft.windowsazure.services.media.models.AssetInfo; import com.microsoft.windowsazure.services.media.models.AssetState; -import com.microsoft.windowsazure.services.media.models.EncryptionOption; +import com.microsoft.windowsazure.services.media.models.AssetOption; import com.microsoft.windowsazure.services.media.models.JobInfo; import com.microsoft.windowsazure.services.media.models.ListResult; import com.microsoft.windowsazure.services.media.models.Task; @@ -45,7 +45,7 @@ public MediaServiceValidation(MediaContract service) { this.service = service; } - public void validateAsset(AssetInfo asset, String name, EncryptionOption encryption) throws ServiceException { + public void validateAsset(AssetInfo asset, String name, AssetOption encryption) throws ServiceException { // Check the asset state. assertNotNull("asset", asset); assertNotNull("asset.getId", asset.getId()); diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceWrapper.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceWrapper.java index 0ff1dc01cda9b..c0d85220473ed 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceWrapper.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceWrapper.java @@ -40,7 +40,7 @@ import com.microsoft.windowsazure.services.media.models.AssetFile; 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.AssetOption; import com.microsoft.windowsazure.services.media.models.Job; import com.microsoft.windowsazure.services.media.models.Job.Creator; import com.microsoft.windowsazure.services.media.models.JobInfo; @@ -107,7 +107,7 @@ public MediaServiceWrapper(MediaContract service) { } // Manage - public AssetInfo createAsset(String name, EncryptionOption encryption) throws ServiceException { + public AssetInfo createAsset(String name, AssetOption encryption) throws ServiceException { // Create asset. The SDK's top-level method is the simplest way to do that. return service.create(Asset.create().setName(name).setAlternateId("altId").setOptions(encryption)); }