Merge pull request Azure#41 from gcheng/contentkey

Implementation of Contentkey Entity

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

@@ -36,6 +36,7 @@
 import com.microsoft.windowsazure.services.media.implementation.content.AccessPolicyType;
 import com.microsoft.windowsazure.services.media.implementation.content.AssetType;
 import com.microsoft.windowsazure.services.media.implementation.content.Constants;
+import com.microsoft.windowsazure.services.media.implementation.content.ContentKeyRestType;
 import com.microsoft.windowsazure.services.media.implementation.content.JobType;
 import com.microsoft.windowsazure.services.media.implementation.content.LocatorRestType;
 import com.microsoft.windowsazure.services.media.implementation.content.TaskType;
@@ -129,6 +130,7 @@ private static Class<?>[] getMarshalledClasses() {
         classes.add(JobType.class);
         classes.add(LocatorRestType.class);
         classes.add(TaskType.class);
+        classes.add(ContentKeyRestType.class);
         return classes.toArray(new Class<?>[0]);
     }
 }

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

@@ -0,0 +1,256 @@
+/**
+ * Copyright 2012 Microsoft Corporation
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.windowsazure.services.media.implementation.content;
+
+import java.util.Date;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+
+/**
+ * This type maps the XML returned in the odata ATOM serialization
+ * for Asset entities.
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+public class ContentKeyRestType implements MediaServiceDTO {
+
+    /** The id. */
+    @XmlElement(name = "Id", namespace = Constants.ODATA_DATA_NS)
+    protected String id;
+
+    /** The created. */
+    @XmlElement(name = "Created", namespace = Constants.ODATA_DATA_NS)
+    protected Date created;
+
+    /** The last modified. */
+    @XmlElement(name = "LastModified", namespace = Constants.ODATA_DATA_NS)
+    protected Date lastModified;
+
+    /** The content key type. */
+    @XmlElement(name = "ContentKeyType", namespace = Constants.ODATA_DATA_NS)
+    protected Integer contentKeyType;
+
+    /** The encrypted content key. */
+    @XmlElement(name = "EncryptedContentKey", namespace = Constants.ODATA_DATA_NS)
+    protected String encryptedContentKey;
+
+    /** The name. */
+    @XmlElement(name = "Name", namespace = Constants.ODATA_DATA_NS)
+    protected String name;
+
+    /** The protection key id. */
+    @XmlElement(name = "ProtectionKeyId", namespace = Constants.ODATA_DATA_NS)
+    protected String protectionKeyId;
+
+    /** The protection key type. */
+    @XmlElement(name = "ProtectionKeyType", namespace = Constants.ODATA_DATA_NS)
+    private Integer protectionKeyType;
+
+    /** The checksum. */
+    @XmlElement(name = "Checksum", namespace = Constants.ODATA_DATA_NS)
+    protected String checksum;
+
+    /**
+     * Gets the id.
+     * 
+     * @return the id
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the id.
+     * 
+     * @param id
+     *            the id to set
+     * @return the content key rest type
+     */
+    public ContentKeyRestType setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * Gets the created.
+     * 
+     * @return the created
+     */
+    public Date getCreated() {
+        return created;
+    }
+
+    /**
+     * Sets the created.
+     * 
+     * @param created
+     *            the created to set
+     * @return the content key rest type
+     */
+    public ContentKeyRestType setCreated(Date created) {
+        this.created = created;
+        return this;
+    }
+
+    /**
+     * Gets the last modified.
+     * 
+     * @return the lastModified
+     */
+    public Date getLastModified() {
+        return lastModified;
+    }
+
+    /**
+     * Sets the last modified.
+     * 
+     * @param lastModified
+     *            the lastModified to set
+     * @return the content key rest type
+     */
+    public ContentKeyRestType setLastModified(Date lastModified) {
+        this.lastModified = lastModified;
+        return this;
+    }
+
+    /**
+     * Gets the content key type.
+     * 
+     * @return the content key type
+     */
+    public Integer getContentKeyType() {
+        return contentKeyType;
+    }
+
+    /**
+     * Sets the content key type.
+     * 
+     * @param contentKeyType
+     *            the new content key type
+     * @return the content key rest type
+     */
+    public ContentKeyRestType setContentKeyType(Integer contentKeyType) {
+        this.contentKeyType = contentKeyType;
+        return this;
+    }
+
+    /**
+     * Gets the name.
+     * 
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the name.
+     * 
+     * @param name
+     *            the name to set
+     * @return the content key rest type
+     */
+    public ContentKeyRestType setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Sets the checksum.
+     * 
+     * @param checksum
+     *            the new checksum
+     * @return the content key rest type
+     */
+    public ContentKeyRestType setChecksum(String checksum) {
+        this.checksum = checksum;
+        return this;
+    }
+
+    /**
+     * Gets the checksum.
+     * 
+     * @return the checksum
+     */
+    public String getChecksum() {
+        return this.checksum;
+    }
+
+    /**
+     * Sets the protection key type.
+     * 
+     * @param protectionKeyType
+     *            the new protection key type
+     * @return the content key rest type
+     */
+    public ContentKeyRestType setProtectionKeyType(Integer protectionKeyType) {
+        this.protectionKeyType = protectionKeyType;
+        return this;
+    }
+
+    /**
+     * Gets the protection key type.
+     * 
+     * @return the protection key type
+     */
+    public Integer getProtectionKeyType() {
+        return this.protectionKeyType;
+    }
+
+    /**
+     * Sets the protection key id.
+     * 
+     * @param protectionKeyId
+     *            the new protection key id
+     * @return the content key rest type
+     */
+    public ContentKeyRestType setProtectionKeyId(String protectionKeyId) {
+        this.protectionKeyId = protectionKeyId;
+        return this;
+    }
+
+    /**
+     * Gets the protection key id.
+     * 
+     * @return the protection key id
+     */
+    public String getProtectionKeyId() {
+        return this.protectionKeyId;
+    }
+
+    /**
+     * Sets the encrypted content key.
+     * 
+     * @param encryptedContentKey
+     *            the encrypted content key
+     * @return the content key rest type
+     */
+    public ContentKeyRestType setEncryptedContentKey(String encryptedContentKey) {
+        this.encryptedContentKey = encryptedContentKey;
+        return this;
+    }
+
+    /**
+     * Gets the encrypted content key.
+     * 
+     * @return the encrypted content key
+     */
+    public String getEncryptedContentKey() {
+        return this.encryptedContentKey;
+    }
+}

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

@@ -33,7 +33,7 @@ public ObjectFactory() {
     }
 
     /**
-     * Create an instance of {@link AssetType }
+     * Create an instance of {@link AssetType }.
      * 
      * @return a new AssetType instance.
      */
@@ -42,7 +42,7 @@ public AssetType createAssetType() {
     }
 
     /**
-     * Create an instance of {@link ODataActionType }
+     * Create an instance of {@link ODataActionType }.
      * 
      * @return a new ODataActionType instance.
      */
@@ -51,7 +51,7 @@ public ODataActionType createODataActionType() {
     }
 
     /**
-     * Create an instance of {@link AccessPolicyType }
+     * Create an instance of {@link AccessPolicyType }.
      * 
      * @return a new AccessPolicyType instance.
      */
@@ -60,38 +60,47 @@ public AccessPolicyType createAccessPolicyType() {
     }
 
     /**
-     * Create an instance of {@link LocatorRestType }
-     *
+     * Create an instance of {@link LocatorRestType }.
+     * 
      * @return a new LocatorRestType instance.
      */
     public LocatorRestType createLocatorRestType() {
         return new LocatorRestType();
     }
 
     /**
-     * Create an instance of {@link MediaProcessorType }
-     *
+     * Create an instance of {@link MediaProcessorType }.
+     * 
      * @return a new MediaProcessorType instance.
      */
     public MediaProcessorType createMediaProcessorType() {
         return new MediaProcessorType();
     }
 
     /**
-     * Create an instance of {@link JobType}
-     *
+     * Create an instance of {@link JobType}.
+     * 
      * @return a new JobType instance.
      */
     public JobType createJobType() {
         return new JobType();
     }
 
     /**
-     * Create an instance of {@link TaskType}
-     *
+     * Create an instance of {@link TaskType}.
+     * 
      * @return a new TaskType instance.
      */
     public TaskType createTaskType() {
         return new TaskType();
     }
+
+    /**
+     * Creates a new Object object.
+     * 
+     * @return the content key rest type
+     */
+    public ContentKeyRestType createContentKeyRestType() {
+        return new ContentKeyRestType();
+    }
 }