Version bump to 1.0.3

Author: mpodwysocki

NotificationHubs/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.windowsazure</groupId>
 	<artifactId>Notification-Hubs-java-sdk</artifactId>
-	<version>1.0.2</version>
+	<version>1.0.3</version>
 	<name>Windows Azure Notification Hubs Java SDK</name>
   <url>https://github.com/Azure/azure-notificationhubs-java-backend</url>
   <description>Azure Notification Hubs Java SDK for interacting with the data and management plane operations.</description>

NotificationHubs/src/com/windowsazure/messaging/NotificationHubJob.java

@@ -135,6 +135,7 @@ public NotificationHubJobStatus getJobStatus() {
      * @param value The Azure Notification Hubs job output container URI value to set.
      */
     public void setOutputContainerUri(String value) {
+        // Keep the raw URI and strip the CDATA
         if (value.matches(CDATA_PATTERN)) {
             value = value.replaceAll(CDATA_PATTERN, "");
         }
@@ -151,7 +152,13 @@ public void setOutputContainerUri(String value) {
      * Sets the Azure Notification Hubs job file import URI.
      * @param value The Azure Notification Hubs job file import URI value to set.
      */
-    public void setImportFileUri(String value) { importFileUri = value; }
+    public void setImportFileUri(String value) {
+        // Keep the raw URI and strip the CDATA
+        if (value.matches(CDATA_PATTERN)) {
+            value = value.replaceAll(CDATA_PATTERN, "");
+        }
+        importFileUri = value;
+    }
 
     /**
      * Gets the Azure Notification Hubs job failure message.
@@ -237,6 +244,8 @@ public String getXml() {
         if (this.jobType != null) {
             buf.append("<Type>").append(this.jobType.name()).append("</Type>");
         }
+
+        // Wrap URIs in CDATA sections due to illegal XML characters
         if (this.outputContainerUri != null) {
             String outputContainerUri = this.outputContainerUri;
             if (!outputContainerUri.matches(CDATA_PATTERN)) {
@@ -245,7 +254,12 @@ public String getXml() {
             buf.append("<OutputContainerUri>").append(outputContainerUri).append("</OutputContainerUri>");
         }
         if (this.importFileUri != null) {
-            buf.append("<ImportFileUri>").append(this.importFileUri).append("</ImportFileUri>");
+            String importFileUri = this.importFileUri;
+            if (!importFileUri.matches(CDATA_PATTERN)) {
+                importFileUri = "<![CDATA[" + importFileUri + "]]>";
+            }
+
+            buf.append("<ImportFileUri>").append(importFileUri).append("</ImportFileUri>");
         }
         buf.append(XML_FOOTER);
         return buf.toString();

NotificationHubs/test/com/windowsazure/messaging/NotificationHubJobIncoming

@@ -11,7 +11,7 @@
       <Type>ImportCreateRegistrations</Type>
       <Status>Completed</Status>
       <OutputContainerUri><![CDATA[https://test.blob.core.windows.net/testjobs]]></OutputContainerUri>
-      <ImportFileUri>https://test.blob.core.windows.net/testjobs/CreateFile.txt</ImportFileUri>
+      <ImportFileUri><![CDATA[https://test.blob.core.windows.net/testjobs/CreateFile.txt]]></ImportFileUri>
       <OutputProperties xmlns:d3p1="http://schemas.microsoft.com/2003/10/Serialization/Arrays">
         <d3p1:KeyValueOfstringstring>
           <d3p1:Key>OutputFilePath</d3p1:Key>

NotificationHubs/test/com/windowsazure/messaging/NotificationHubJobOutgoing

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><entry xmlns="http://www.w3.org/2005/Atom"><content type="application/atom+xml;type=entry;charset=utf-8"><NotificationHubJob xmlns:i="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.microsoft.com/netservices/2010/10/servicebus/connect"><Type>ImportCreateRegistrations</Type><OutputContainerUri><![CDATA[https://test.blob.core.windows.net/testjobs]]></OutputContainerUri><ImportFileUri>https://test.blob.core.windows.net/testjobs/CreateFile.txt</ImportFileUri></NotificationHubJob></content></entry>
+<?xml version="1.0" encoding="utf-8"?><entry xmlns="http://www.w3.org/2005/Atom"><content type="application/atom+xml;type=entry;charset=utf-8"><NotificationHubJob xmlns:i="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.microsoft.com/netservices/2010/10/servicebus/connect"><Type>ImportCreateRegistrations</Type><OutputContainerUri><![CDATA[https://test.blob.core.windows.net/testjobs]]></OutputContainerUri><ImportFileUri><![CDATA[https://test.blob.core.windows.net/testjobs/CreateFile.txt]]></ImportFileUri></NotificationHubJob></content></entry>