Merge branch 'dev' into remove_storage

Conflicts: microsoft-azure-api-media/src/main/resources/META-INF/services/com.microsoft.windowsazure.services.core.Builder$Exports microsoft-azure-api-parent/pom.xml microsoft-azure-api-storage/src/main/resources/META-INF/services/com.microsoft.windowsazure.services.core.Builder$Exports
Azure · Dec 17, 2013 · f729149 · f729149
2 parents e1c0a15 + a742050
commit f729149
Show file tree

Hide file tree

Showing 216 changed files with 19,725 additions and 1,793 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,42 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# Azure Tooling #
+node_modules
+
+# Eclipse #
+*.pydevproject
+.project
+.metadata
+bin/**
+tmp/**
+tmp/**/*
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# Other Tooling #
 .classpath
 .project
 target
-node_modules
 .idea
 *.iml
+
+# Mac OS #
+.DS_Store
+.DS_Store?
+
+# Windows #
+Thumbs.db
diff --git a/...ure-api-core/src/main/java/com/microsoft/windowsazure/services/core/ServiceException.java b/...ure-api-core/src/main/java/com/microsoft/windowsazure/services/core/ServiceException.java
@@ -133,6 +133,20 @@ public String getRawResponseBody() {
     public static ServiceException createFromXml(HttpRequest httpRequest, String requestContent, HttpResponse httpResponse, HttpEntity entity)
     {
         try {
+            // TODO: actually implement this
+            ServiceException serviceException = new ServiceException();
+            serviceException.setErrorMessage(EntityUtils.toString(entity));
+            return serviceException;
+        }
+        catch (IOException e) {
+            return new ServiceException();
+        }
+    }
+
+    public static ServiceException createFromJson(HttpRequest httpRequest, String requestContent, HttpResponse httpResponse, HttpEntity entity)
+    {
+        try {
+            // TODO: actually implement this
             ServiceException serviceException = new ServiceException();
             serviceException.setErrorMessage(EntityUtils.toString(entity));
             return serviceException;

diff --git a/...pi-core/src/main/java/com/microsoft/windowsazure/services/core/TimeSpan8601Converter.java b/...pi-core/src/main/java/com/microsoft/windowsazure/services/core/TimeSpan8601Converter.java
@@ -0,0 +1,38 @@
+/**
+ * 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.core;
+
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
+
+public class TimeSpan8601Converter {
+    public static String format(Duration duration) {
+        return duration.toString();
+    }
+
+    public static Duration parse(String duration) {
+        try {
+            DatatypeFactory factory = DatatypeFactory.newInstance();
+            return factory.newDuration(duration);
+        }
+        catch (DatatypeConfigurationException e)
+        {
+            String msg = String.format("The value \"%s\" is not a valid ISO8601 duration.", duration);
+            throw new IllegalArgumentException(msg, e);
+        }
+    }
+}
diff --git a/...main/resources/META-INF/services/com.microsoft.windowsazure.services.core.Builder$Exports b/...main/resources/META-INF/services/com.microsoft.windowsazure.services.core.Builder$Exports
@@ -1,9 +1,2 @@
-com.microsoft.windowsazure.services.blob.Exports
-com.microsoft.windowsazure.services.queue.Exports
-com.microsoft.windowsazure.services.table.Exports
-com.microsoft.windowsazure.services.serviceBus.Exports
-com.microsoft.windowsazure.services.serviceBus.implementation.Exports
 com.microsoft.windowsazure.services.core.utils.Exports
-com.microsoft.windowsazure.services.core.utils.pipeline.Exports
-com.microsoft.windowsazure.services.media.Exports
-com.microsoft.windowsazure.services.management.Exports
+com.microsoft.windowsazure.services.core.utils.pipeline.Exports
diff --git a/...re/src/test/java/com/microsoft/windowsazure/services/core/TimeSpan8601ConverterTests.java b/...re/src/test/java/com/microsoft/windowsazure/services/core/TimeSpan8601ConverterTests.java
@@ -0,0 +1,43 @@
+/**
+ * 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.core;
+
+import static org.junit.Assert.*;
+
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
+import org.junit.Test;
+
+public class TimeSpan8601ConverterTests {
+    @Test
+    public void formatShouldWork() throws Exception {
+        DatatypeFactory dataTypeFactory = DatatypeFactory.newInstance();
+        Duration duration = dataTypeFactory.newDurationDayTime(true, 0, 3, 10, 2);
+        String durationString = TimeSpan8601Converter.format(duration);
+
+        assertEquals("P0DT3H10M2S", durationString);
+    }
+
+    @Test
+    public void parseShouldWork() throws Exception {
+        Duration duration = TimeSpan8601Converter.parse("P0DT3H10M2S");
+
+        assertEquals(0, duration.getDays());
+        assertEquals(3, duration.getHours());
+        assertEquals(10, duration.getMinutes());
+        assertEquals(2, duration.getSeconds());
+    }
+}
diff --git a/...src/main/java/com/microsoft/windowsazure/management/compute/DeploymentOperationsImpl.java b/...src/main/java/com/microsoft/windowsazure/management/compute/DeploymentOperationsImpl.java
@@ -81,7 +81,7 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
-import java.util.Map.Entry;
+import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -270,7 +270,7 @@ public OperationResponse beginChangingConfigurationByName(String serviceName, St
         if (parameters.getExtendedProperties() != null)
         {
             Element extendedPropertiesDictionaryElement = requestDoc.createElementNS("http://schemas.microsoft.com/windowsazure", "ExtendedProperties");
-            for (Entry<String, String> entry : parameters.getExtendedProperties().entrySet())
+            for (Map.Entry<String, String> entry : parameters.getExtendedProperties().entrySet())
             {
                 String extendedPropertiesKey = entry.getKey();
                 String extendedPropertiesValue = entry.getValue();
@@ -505,7 +505,7 @@ public OperationResponse beginChangingConfigurationBySlot(String serviceName, De
         if (parameters.getExtendedProperties() != null)
         {
             Element extendedPropertiesDictionaryElement = requestDoc.createElementNS("http://schemas.microsoft.com/windowsazure", "ExtendedProperties");
-            for (Entry<String, String> entry : parameters.getExtendedProperties().entrySet())
+            for (Map.Entry<String, String> entry : parameters.getExtendedProperties().entrySet())
             {
                 String extendedPropertiesKey = entry.getKey();
                 String extendedPropertiesValue = entry.getValue();
@@ -764,7 +764,7 @@ public OperationResponse beginCreating(String serviceName, DeploymentSlot deploy
         if (parameters.getExtendedProperties() != null)
         {
             Element extendedPropertiesDictionaryElement = requestDoc.createElementNS("http://schemas.microsoft.com/windowsazure", "ExtendedProperties");
-            for (Entry<String, String> entry : parameters.getExtendedProperties().entrySet())
+            for (Map.Entry<String, String> entry : parameters.getExtendedProperties().entrySet())
             {
                 String extendedPropertiesKey = entry.getKey();
                 String extendedPropertiesValue = entry.getValue();
@@ -1977,7 +1977,7 @@ public OperationResponse beginUpgradingByName(String serviceName, String deploym
         if (parameters.getExtendedProperties() != null)
         {
             Element extendedPropertiesDictionaryElement = requestDoc.createElementNS("http://schemas.microsoft.com/windowsazure", "ExtendedProperties");
-            for (Entry<String, String> entry : parameters.getExtendedProperties().entrySet())
+            for (Map.Entry<String, String> entry : parameters.getExtendedProperties().entrySet())
             {
                 String extendedPropertiesKey = entry.getKey();
                 String extendedPropertiesValue = entry.getValue();
@@ -2271,7 +2271,7 @@ public OperationResponse beginUpgradingBySlot(String serviceName, DeploymentSlot
         if (parameters.getExtendedProperties() != null)
         {
             Element extendedPropertiesDictionaryElement = requestDoc.createElementNS("http://schemas.microsoft.com/windowsazure", "ExtendedProperties");
-            for (Entry<String, String> entry : parameters.getExtendedProperties().entrySet())
+            for (Map.Entry<String, String> entry : parameters.getExtendedProperties().entrySet())
             {
                 String extendedPropertiesKey = entry.getKey();
                 String extendedPropertiesValue = entry.getValue();

diff --git a/.../main/java/com/microsoft/windowsazure/management/compute/HostedServiceOperationsImpl.java b/.../main/java/com/microsoft/windowsazure/management/compute/HostedServiceOperationsImpl.java
@@ -83,7 +83,7 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
-import java.util.Map.Entry;
+import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -675,7 +675,7 @@ public OperationResponse create(HostedServiceCreateParameters parameters) throws
         if (parameters.getExtendedProperties() != null)
         {
             Element extendedPropertiesDictionaryElement = requestDoc.createElementNS("http://schemas.microsoft.com/windowsazure", "ExtendedProperties");
-            for (Entry<String, String> entry : parameters.getExtendedProperties().entrySet())
+            for (Map.Entry<String, String> entry : parameters.getExtendedProperties().entrySet())
             {
                 String extendedPropertiesKey = entry.getKey();
                 String extendedPropertiesValue = entry.getValue();
@@ -3240,7 +3240,7 @@ public OperationResponse update(String serviceName, HostedServiceUpdateParameter
         if (parameters.getExtendedProperties() != null)
         {
             Element extendedPropertiesDictionaryElement = requestDoc.createElementNS("http://schemas.microsoft.com/windowsazure", "ExtendedProperties");
-            for (Entry<String, String> entry : parameters.getExtendedProperties().entrySet())
+            for (Map.Entry<String, String> entry : parameters.getExtendedProperties().entrySet())
             {
                 String extendedPropertiesKey = entry.getKey();
                 String extendedPropertiesValue = entry.getValue();

diff --git a/...java/com/microsoft/windowsazure/management/compute/VirtualMachineImageOperationsImpl.java b/...java/com/microsoft/windowsazure/management/compute/VirtualMachineImageOperationsImpl.java
@@ -42,6 +42,7 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.TimeZone;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -210,7 +211,9 @@ public VirtualMachineImageCreateResponse create(VirtualMachineImageCreateParamet
         if (parameters.getPublishedDate() != null)
         {
             Element publishedDateElement = requestDoc.createElementNS("http://schemas.microsoft.com/windowsazure", "PublishedDate");
-            publishedDateElement.appendChild(requestDoc.createTextNode(parameters.getPublishedDate().toString()));
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mmZ");
+            simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+            publishedDateElement.appendChild(requestDoc.createTextNode(simpleDateFormat.format(parameters.getPublishedDate().getTime())));
             oSImageElement.appendChild(publishedDateElement);
         }
 
@@ -386,9 +389,9 @@ public VirtualMachineImageCreateResponse create(VirtualMachineImageCreateParamet
             if (publishedDateElement2 != null && (publishedDateElement2.getTextContent() != null && publishedDateElement2.getTextContent().isEmpty() != true) == false)
             {
                 Calendar publishedDateInstance;
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss z yyyy");
+                SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("EEE MMM dd HH:mm:ss z yyyy");
                 Calendar calendar = Calendar.getInstance();
-                calendar.setTime(simpleDateFormat.parse(publishedDateElement2.getTextContent()));
+                calendar.setTime(simpleDateFormat2.parse(publishedDateElement2.getTextContent()));
                 publishedDateInstance = calendar;
                 result.setPublishedDate(publishedDateInstance);
             }
@@ -1183,7 +1186,9 @@ public VirtualMachineImageUpdateResponse update(String imageName, VirtualMachine
         if (parameters.getPublishedDate() != null)
         {
             Element publishedDateElement = requestDoc.createElementNS("http://schemas.microsoft.com/windowsazure", "PublishedDate");
-            publishedDateElement.appendChild(requestDoc.createTextNode(parameters.getPublishedDate().toString()));
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mmZ");
+            simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+            publishedDateElement.appendChild(requestDoc.createTextNode(simpleDateFormat.format(parameters.getPublishedDate().getTime())));
             oSImageElement.appendChild(publishedDateElement);
         }
 
@@ -1355,9 +1360,9 @@ public VirtualMachineImageUpdateResponse update(String imageName, VirtualMachine
             if (publishedDateElement2 != null && (publishedDateElement2.getTextContent() != null && publishedDateElement2.getTextContent().isEmpty() != true) == false)
             {
                 Calendar publishedDateInstance;
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss z yyyy");
+                SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("EEE MMM dd HH:mm:ss z yyyy");
                 Calendar calendar = Calendar.getInstance();
-                calendar.setTime(simpleDateFormat.parse(publishedDateElement2.getTextContent()));
+                calendar.setTime(simpleDateFormat2.parse(publishedDateElement2.getTextContent()));
                 publishedDateInstance = calendar;
                 result.setPublishedDate(publishedDateInstance);
             }

diff --git a/...main/java/com/microsoft/windowsazure/management/compute/models/AccessControlListRule.java b/...main/java/com/microsoft/windowsazure/management/compute/models/AccessControlListRule.java
@@ -21,7 +21,6 @@
 
 package com.microsoft.windowsazure.management.compute.models;
 
-
 /**
 * An access control rule for a public endpoint
 */

diff --git a/...t/windowsazure/management/compute/models/DeploymentRollbackUpdateOrUpgradeParameters.java b/...t/windowsazure/management/compute/models/DeploymentRollbackUpdateOrUpgradeParameters.java
@@ -21,7 +21,6 @@
 
 package com.microsoft.windowsazure.management.compute.models;
 
-
 /**
 * Parameters supplied to the Rollback Update Or Upgrade operation.
 */

diff --git a/...om/microsoft/windowsazure/management/compute/models/DeploymentUpdateStatusParameters.java b/...om/microsoft/windowsazure/management/compute/models/DeploymentUpdateStatusParameters.java
@@ -21,7 +21,6 @@
 
 package com.microsoft.windowsazure.management.compute.models;
 
-
 /**
 * Parameters supplied to the Update Deployment Status operation.
 */

diff --git a/...rc/main/java/com/microsoft/windowsazure/management/compute/models/DomainJoinSettings.java b/...rc/main/java/com/microsoft/windowsazure/management/compute/models/DomainJoinSettings.java
@@ -21,7 +21,6 @@
 
 package com.microsoft.windowsazure.management.compute.models;
 
-
 /**
 * Optional.  Contains properties that specify a domain to which the virtual
 * machine will be joined. This element is only used with the

diff --git a/...src/main/java/com/microsoft/windowsazure/management/compute/models/LoadBalancerProbe.java b/...src/main/java/com/microsoft/windowsazure/management/compute/models/LoadBalancerProbe.java
@@ -21,7 +21,6 @@
 
 package com.microsoft.windowsazure.management.compute.models;
 
-
 /**
 * Contains properties that specify the endpoint settings which the Windows
 * Azure load balancer uses to monitor the availability of this virtual machine

diff --git a/.../microsoft/windowsazure/management/compute/models/ServiceCertificateCreateParameters.java b/.../microsoft/windowsazure/management/compute/models/ServiceCertificateCreateParameters.java
@@ -21,7 +21,6 @@
 
 package com.microsoft.windowsazure.management.compute.models;
 
-
 /**
 * Parameters supplied to the Create Service Certificate operation.
 */

diff --git a/...ute/src/main/java/com/microsoft/windowsazure/management/compute/models/UpgradeStatus.java b/...ute/src/main/java/com/microsoft/windowsazure/management/compute/models/UpgradeStatus.java
@@ -21,7 +21,6 @@
 
 package com.microsoft.windowsazure.management.compute.models;
 
-
 /**
 * Contains upgrade details of the deployment.
 */

diff --git a/...com/microsoft/windowsazure/management/compute/models/VirtualMachineCaptureParameters.java b/...com/microsoft/windowsazure/management/compute/models/VirtualMachineCaptureParameters.java
@@ -21,7 +21,6 @@
 
 package com.microsoft.windowsazure.management.compute.models;
 
-
 /**
 * Parameters supplied to the Capture Virtual Machine operation.
 */

diff --git a/...om/microsoft/windowsazure/management/compute/models/VirtualMachineShutdownParameters.java b/...om/microsoft/windowsazure/management/compute/models/VirtualMachineShutdownParameters.java
@@ -21,7 +21,6 @@
 
 package com.microsoft.windowsazure.management.compute.models;
 
-
 /**
 * The parameters required for shutting down the virtual machine
 */

diff --git a/...com/microsoft/windowsazure/management/compute/models/WindowsRemoteManagementListener.java b/...com/microsoft/windowsazure/management/compute/models/WindowsRemoteManagementListener.java
@@ -21,7 +21,6 @@
 
 package com.microsoft.windowsazure.management.compute.models;
 
-
 /**
 * Contains the type and certificate information for the listener.
 */
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,6 @@ @@
     package com.microsoft.windowsazure.management.compute.models;
     /**
     * An access control rule for a public endpoint
     */
@@ Expand Down @@