Dev

microsoft-azure-api/pom.xml

@@ -104,6 +104,12 @@
       <artifactId>commons-lang3</artifactId>
       <version>3.1</version>
     </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk16</artifactId>
+      <version>1.46</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/PipelineHelpers.java

@@ -27,17 +27,29 @@
 import com.sun.jersey.api.client.WebResource.Builder;
 
 public class PipelineHelpers {
+
+    private static String createErrorMessage(ClientResponse clientResponse) {
+        clientResponse.bufferEntity();
+        String errorMessage = clientResponse.toString();
+        if (clientResponse.hasEntity()) {
+            errorMessage = errorMessage + " " + clientResponse.getEntity(String.class);
+        }
+        return errorMessage;
+    }
+
     public static void ThrowIfNotSuccess(ClientResponse clientResponse) {
         int statusCode = clientResponse.getStatus();
 
         if ((statusCode < 200) || (statusCode >= 300)) {
-            throw new UniformInterfaceException(clientResponse);
+            String errorMessage = createErrorMessage(clientResponse);
+            throw new UniformInterfaceException(errorMessage, clientResponse);
         }
     }
 
     public static void ThrowIfError(ClientResponse clientResponse) {
         if (clientResponse.getStatus() >= 400) {
-            throw new UniformInterfaceException(clientResponse);
+            String errorMessage = createErrorMessage(clientResponse);
+            throw new UniformInterfaceException(errorMessage, clientResponse);
         }
     }
 

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/entityoperations/EntityRestProxy.java

@@ -172,6 +172,7 @@ public <T> T action(EntityTypeActionOperation<T> entityTypeActionOperation) thro
                 .queryParams(entityTypeActionOperation.getQueryParameters())
                 .accept(entityTypeActionOperation.getAcceptType()).accept(MediaType.APPLICATION_XML_TYPE)
                 .entity(entityTypeActionOperation.getRequestContents(), MediaType.APPLICATION_XML_TYPE);
+
         ClientResponse clientResponse = webResource.method(entityTypeActionOperation.getVerb(), ClientResponse.class);
         return entityTypeActionOperation.processTypeResponse(clientResponse);
     }

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

@@ -36,7 +36,7 @@ public URI getBaseURI() {
 
     public URI getRedirectedURI(URI originalURI) {
         UriBuilder uriBuilder = UriBuilder.fromUri(baseURI).path(originalURI.getPath());
-        String queryString = originalURI.getQuery();
+        String queryString = originalURI.getRawQuery();
 
         if (queryString != null && !queryString.isEmpty()) {
             uriBuilder.replaceQuery(queryString);

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

@@ -53,7 +53,7 @@ public static StatusLine create(DataSource dataSource) {
 
     private static void expect(Reader reader, String string) {
         try {
-            byte[] byteArray = string.getBytes();
+            byte[] byteArray = string.getBytes("UTF-8");
             int ch;
             for (int i = 0; i < string.length(); i++) {
                 ch = reader.read();

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

@@ -105,11 +105,20 @@ public ContentKeyRestType createContentKeyRestType() {
     }
 
     /**
-     * Create an instance of {@link AssetFileType}
+     * Create an instance of {@link AssetFileType}.
      * 
      * @return a new AssetFileType instance.
      */
     public AssetFileType createAssetFileType() {
         return new AssetFileType();
     }
+
+    /**
+     * Creates an instance of (@link RebindContentKeyType).
+     * 
+     * @return the rebind content key type instance.
+     */
+    public RebindContentKeyType createRebindContentKeyType() {
+        return new RebindContentKeyType();
+    }
 }

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

@@ -0,0 +1,53 @@
+/**
+ * Copyright 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 javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlValue;
+
+/**
+ * The Class RebindContentKeyType.
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "RebindContentKey", namespace = Constants.ODATA_DATA_NS)
+public class RebindContentKeyType implements MediaServiceDTO {
+
+    /** The rebind content key. */
+    @XmlValue
+    String rebindContentKey;
+
+    /**
+     * Gets the content key.
+     * 
+     * @return the content key
+     */
+    public String getContentKey() {
+        return rebindContentKey;
+    }
+
+    /**
+     * Sets the content key.
+     * 
+     * @param rebindContentKey
+     *            the new content key
+     */
+    public void setContentKey(String rebindContentKey) {
+        this.rebindContentKey = rebindContentKey;
+    }
+
+}

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/ContentKey.java

@@ -15,14 +15,30 @@
 
 package com.microsoft.windowsazure.services.media.models;
 
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.security.InvalidParameterException;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.transform.stream.StreamSource;
+
+import com.microsoft.windowsazure.services.core.utils.pipeline.PipelineHelpers;
 import com.microsoft.windowsazure.services.media.entityoperations.DefaultDeleteOperation;
+import com.microsoft.windowsazure.services.media.entityoperations.DefaultEntityTypeActionOperation;
 import com.microsoft.windowsazure.services.media.entityoperations.DefaultGetOperation;
 import com.microsoft.windowsazure.services.media.entityoperations.DefaultListOperation;
 import com.microsoft.windowsazure.services.media.entityoperations.EntityCreateOperation;
 import com.microsoft.windowsazure.services.media.entityoperations.EntityDeleteOperation;
 import com.microsoft.windowsazure.services.media.entityoperations.EntityGetOperation;
 import com.microsoft.windowsazure.services.media.entityoperations.EntityOperationSingleResultBase;
+import com.microsoft.windowsazure.services.media.entityoperations.EntityTypeActionOperation;
 import com.microsoft.windowsazure.services.media.implementation.content.ContentKeyRestType;
+import com.microsoft.windowsazure.services.media.implementation.content.RebindContentKeyType;
+import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.GenericType;
 
 /**
@@ -213,4 +229,82 @@ public static EntityDeleteOperation delete(String contentKeyId) {
         return new DefaultDeleteOperation(ENTITY_SET, contentKeyId);
     }
 
+    /**
+     * Rebind content key with specified content key and X509 Certificate.
+     * 
+     * @param contentKeyId
+     *            the content key id
+     * @param x509Certificate
+     *            the x509 certificate
+     * @return the entity action operation
+     */
+    public static EntityTypeActionOperation<String> rebind(String contentKeyId, String x509Certificate) {
+        return new RebindContentKeyActionOperation(contentKeyId, x509Certificate);
+    }
+
+    /**
+     * Rebind content key with specified content key Id.
+     * 
+     * @param contentKeyId
+     *            the content key id
+     * @return the entity action operation
+     */
+    public static EntityTypeActionOperation<String> rebind(String contentKeyId) {
+        return rebind(contentKeyId, "");
+    }
+
+    private static class RebindContentKeyActionOperation extends DefaultEntityTypeActionOperation<String> {
+        private final JAXBContext jaxbContext;
+
+        private final Unmarshaller unmarshaller;
+
+        public RebindContentKeyActionOperation(String contentKeyId, String x509Certificate) {
+            super("RebindContentKey");
+
+            String escapedContentKeyId;
+            try {
+                escapedContentKeyId = URLEncoder.encode(contentKeyId, "UTF-8");
+            }
+            catch (UnsupportedEncodingException e) {
+                throw new InvalidParameterException("UTF-8 encoding is not supported.");
+            }
+            this.addQueryParameter("x509Certificate", "'" + x509Certificate + "'");
+            this.addQueryParameter("id", "'" + escapedContentKeyId + "'");
+
+            try {
+                jaxbContext = JAXBContext.newInstance(RebindContentKeyType.class);
+            }
+            catch (JAXBException e) {
+                throw new RuntimeException(e);
+            }
+
+            try {
+                unmarshaller = jaxbContext.createUnmarshaller();
+            }
+            catch (JAXBException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        @Override
+        public String processTypeResponse(ClientResponse clientResponse) {
+            PipelineHelpers.ThrowIfNotSuccess(clientResponse);
+            RebindContentKeyType rebindContentKeyType = parseResponse(clientResponse);
+            return rebindContentKeyType.getContentKey();
+        }
+
+        private RebindContentKeyType parseResponse(ClientResponse clientResponse) {
+            InputStream inputStream = clientResponse.getEntityInputStream();
+            JAXBElement<RebindContentKeyType> rebindContentKeyTypeJaxbElement;
+            try {
+                rebindContentKeyTypeJaxbElement = unmarshaller.unmarshal(new StreamSource(inputStream),
+                        RebindContentKeyType.class);
+            }
+            catch (JAXBException e) {
+                throw new RuntimeException(e);
+            }
+            return rebindContentKeyTypeJaxbElement.getValue();
+        }
+
+    }
 }

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusRestProxy.java

@@ -183,6 +183,10 @@ else if (options.isPeekLock()) {
             throw new RuntimeException("Unknown ReceiveMode");
         }
 
+        if (clientResult.getStatus() == 204) {
+            return null;
+        }
+
         BrokerProperties brokerProperties;
         if (clientResult.getHeaders().containsKey("BrokerProperties")) {
             brokerProperties = mapper.fromString(clientResult.getHeaders().getFirst("BrokerProperties"));

microsoft-azure-api/src/test/java/com/microsoft/windowsazure/serviceruntime/Protocol1RuntimeGoalStateClientTests.java

@@ -153,7 +153,7 @@ public RoleEnvironmentData deserialize(InputStream stream) {
         }
 
         try {
-            Thread.sleep(1000);
+            Thread.sleep(2000);
         }
         catch (InterruptedException e) {
             e.printStackTrace();