Fixed styles

Azure · Jul 12, 2016 · a66019f · a66019f
1 parent fbd530a
commit a66019f
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 35 deletions.
diff --git a/.../windowsazure/services/media/implementation/templates/fairplay/FairPlayConfiguration.java b/.../windowsazure/services/media/implementation/templates/fairplay/FairPlayConfiguration.java
@@ -11,49 +11,63 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class FairPlayConfiguration {
 
-    @JsonProperty("ASkId")
-    public String ASkId;
-
-    @JsonProperty("FairPlayPfxPasswordId")
-    public String FairPlayPfxPasswordId;
-
-    @JsonProperty("FairPlayPfx")
-    public String FairPlayPfx;
-
-    @JsonProperty("ContentEncryptionIV")
-    public String ContentEncryptionIV;
-
-	public static String createSerializedFairPlayOptionConfiguration(
-		  KeyStore keyStore, String pfxPassword, String pfxPasswordKeyId, String askId,
-	      String contentIv)
-    {
+    private String askId;
+
+    private String fairPlayPfxPasswordId;
+
+    private String fairPlayPfx;
+
+    private String contentEncryptionIV;
+
+    public static String createSerializedFairPlayOptionConfiguration(
+          KeyStore keyStore, String pfxPassword, String pfxPasswordKeyId, String askId,
+          String contentIv) {
         try {
             ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
             keyStore.store(outputStream, pfxPassword.toCharArray());
             String certString = Base64.encode(outputStream.toByteArray());
             FairPlayConfiguration config = new FairPlayConfiguration();
-            config.ASkId = askId;
-            config.ContentEncryptionIV = contentIv;
-            config.FairPlayPfx = certString;
-            config.FairPlayPfxPasswordId = pfxPasswordKeyId;
+            config.askId = askId;
+            config.contentEncryptionIV = contentIv;
+            config.fairPlayPfx = certString;
+            config.fairPlayPfxPasswordId = pfxPasswordKeyId;
             ObjectMapper mapper = new ObjectMapper();
             String configuration = mapper.writeValueAsString(config);
 
             return configuration;
-        } catch(Throwable t){
+        } catch (Throwable t) {
             throw new RuntimeException(t);
         }
     }
 
-	final public static char[] hexArray = "0123456789ABCDEF".toCharArray();
-	public static String bytesToHex(byte[] bytes) {
-	    char[] hexChars = new char[bytes.length * 2];
-	    for ( int j = 0; j < bytes.length; j++ ) {
-	        int v = bytes[j] & 0xFF;
-	        hexChars[j * 2] = hexArray[v >>> 4];
-	        hexChars[j * 2 + 1] = hexArray[v & 0x0F];
-	    }
-	    return new String(hexChars);
-	}
+    static final char[] HEXARRAY = "0123456789ABCDEF".toCharArray();
+    public static String bytesToHex(byte[] bytes) {
+        char[] hexChars = new char[bytes.length * 2];
+        for (int j = 0; j < bytes.length; j++) {
+            int v = bytes[j] & 0xFF;
+            hexChars[j * 2] = HEXARRAY[v >>> 4];
+            hexChars[j * 2 + 1] = HEXARRAY[v & 0x0F];
+        }
+        return new String(hexChars);
+    }
+
+    @JsonProperty("ASkId")
+    public String getASkId() {
+        return askId;
+    }
+
+    @JsonProperty("FairPlayPfxPasswordId")
+    public String getFairPlayPfxPasswordId() {
+        return fairPlayPfxPasswordId;
+    }
 
+    @JsonProperty("FairPlayPfx")
+    public String getFairPlayPfx() {
+        return fairPlayPfx;
+    }
+
+    @JsonProperty("ContentEncryptionIV")
+    public String getContentEncryptionIV() {
+        return contentEncryptionIV;
+    };
 }
diff --git a/...microsoft/windowsazure/services/media/implementation/templates/fairplay/package-info.java b/...microsoft/windowsazure/services/media/implementation/templates/fairplay/package-info.java
@@ -0,0 +1 @@
+package com.microsoft.windowsazure.services.media.implementation.templates.fairplay;
diff --git a/...com/microsoft/windowsazure/services/media/models/AssetDeliveryPolicyConfigurationKey.java b/...com/microsoft/windowsazure/services/media/models/AssetDeliveryPolicyConfigurationKey.java
@@ -98,11 +98,11 @@ public static AssetDeliveryPolicyConfigurationKey fromCode(int option) {
         case 8:
             return AssetDeliveryPolicyConfigurationKey.WidevineBaseLicenseAcquisitionUrl;
         case 9:
-        	return AssetDeliveryPolicyConfigurationKey.FairPlayLicenseAcquisitionUrl;
+            return AssetDeliveryPolicyConfigurationKey.FairPlayLicenseAcquisitionUrl;
         case 10:
-        	return AssetDeliveryPolicyConfigurationKey.FairPlayBaseLicenseAcquisitionUrl;
+            return AssetDeliveryPolicyConfigurationKey.FairPlayBaseLicenseAcquisitionUrl;
         case 11:
-        	return AssetDeliveryPolicyConfigurationKey.CommonEncryptionIVForCbcs;
+            return AssetDeliveryPolicyConfigurationKey.CommonEncryptionIVForCbcs;
         default:
             throw new InvalidParameterException("option");
         }

diff --git a/...rc/main/java/com/microsoft/windowsazure/services/media/models/ContentKeyDeliveryType.java b/...rc/main/java/com/microsoft/windowsazure/services/media/models/ContentKeyDeliveryType.java
@@ -73,7 +73,7 @@ public static ContentKeyDeliveryType fromCode(int option) {
         case 3:
             return ContentKeyDeliveryType.Widevine;
         case 4:
-        	return ContentKeyDeliveryType.FairPlay;
+            return ContentKeyDeliveryType.FairPlay;
         default:
             throw new InvalidParameterException("option");
         }