diff --git a/.gitignore b/.gitignore
index 1760b790d8515..1b07ae5c5817a 100644
--- 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
\ No newline at end of file
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 034592cc26044..d0d8f8f005b4d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,7 @@
+2014.04.2 Version 0.5.0
+ * Add multiple service management modules
+ * Split the SDK into multiple sub-modules
+
2013.09.30 Version 0.4.6
* Allow users to set the client-request-id for better tracking/debugging of storage requests. This is set on the OperationContext.
* Prevent a potential arithmetic overflow while calculating the exponential retry back-off interval in storage.
diff --git a/README.md b/README.md
index 93e0046cec226..b5c98c31e1b32 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-#Windows Azure SDK for Java
+#Microsoft Azure SDK for Java
-This project provides a client library in Java that makes it easy to consume Windows Azure services. For documentation please see the [Windows Azure Java Developer Center](http://www.windowsazure.com/en-us/develop/java/).
+This project provides a client library in Java that makes it easy to consume Microsoft Azure services. For documentation please see the [Microsoft Azure Java Developer Center](http://azure.microsoft.com/en-us/develop/java/).
#Features
@@ -38,10 +38,14 @@ This project provides a client library in Java that makes it easy to consume Win
* Add/Get job notifications
* Create/Read/Update/Delete notification endpoints
* Service Management
- * Manage affinity groups
+ * Compute Management
+ * Web Site Management
+ * Virtual Network Management
+ * Storage Management
+ * Sql Database Management
* Service Runtime
* Retrieve information about the state of your Azure Compute instances
-
+
#Getting Started
@@ -50,7 +54,7 @@ This project provides a client library in Java that makes it easy to consume Win
To get the source code of the SDK via git just type:
- git clone git://github.com/WindowsAzure/azure-sdk-for-java.git
+ git clone git://github.com/Azure/azure-sdk-for-java.git
cd ./azure-sdk-for-java/microsoft-azure-api/
mvn compile
@@ -71,19 +75,19 @@ within your project you can also have them installed by the Java package manager
* Java 1.6
* (Optional) Maven
-
+
##Usage
-To use this SDK to call Windows Azure services, you need to first create an
-account. To host your Java code in Windows Azure, you additionally need to download
-the full Windows Azure SDK for Java - which includes packaging, emulation, and
+To use this SDK to call Microsoft Azure services, you need to first create an
+account. To host your Java code in Microsoft Azure, you additionally need to download
+the full Microsoft Azure SDK for Java - which includes packaging, emulation, and
deployment tools.
##Code Sample
The following is a quick example on how to set up a Azure blob using the API
-and uploading a file to it. For additional information on using the client libraries to access Azure services see the How To guides listed [here](http://www.windowsazure.com/en-us/develop/java/).
+and uploading a file to it. For additional information on using the client libraries to access Azure services see the How To guides listed [here](http://azure.microsoft.com/en-us/develop/java/).
```java
import java.io.*;
@@ -92,63 +96,63 @@ import com.microsoft.windowsazure.services.core.storage.*;
import com.microsoft.windowsazure.services.blob.client.*;
public class BlobSample {
- public static final String storageConnectionString =
- "DefaultEndpointsProtocol=http;"
- + "AccountName=your_account_name;"
- + "AccountKey= your_account_key";
-
- public static void main(String[] args) {
- try {
- CloudStorageAccount account;
- CloudBlobClient serviceClient;
- CloudBlobContainer container;
- CloudBlockBlob blob;
-
- account = CloudStorageAccount.parse(storageConnectionString);
- serviceClient = account.createCloudBlobClient();
- // Container name must be lower case.
- container = serviceClient.getContainerReference("blobsample");
- container.createIfNotExist();
-
- // Set anonymous access on the container.
- BlobContainerPermissions containerPermissions;
- containerPermissions = new BlobContainerPermissions();
- container.uploadPermissions(containerPermissions);
-
- // Upload an image file.
- blob = container.getBlockBlobReference("image1.jpg");
- File fileReference = new File("c:\\myimages\\image1.jpg");
- blob.upload(new FileInputStream(fileReference), fileReference.length());
- } catch (FileNotFoundException fileNotFoundException) {
- System.out.print("FileNotFoundException encountered: ");
- System.out.println(fileNotFoundException.getMessage());
- System.exit(-1);
- } catch (StorageException storageException) {
- System.out.print("StorageException encountered: ");
- System.out.println(storageException.getMessage());
- System.exit(-1);
- } catch (Exception e) {
- System.out.print("Exception encountered: ");
- System.out.println(e.getMessage());
- System.exit(-1);
- }
-
- }
+ public static final String storageConnectionString =
+ "DefaultEndpointsProtocol=http;"
+ + "AccountName=your_account_name;"
+ + "AccountKey= your_account_key";
+
+ public static void main(String[] args) {
+ try {
+ CloudStorageAccount account;
+ CloudBlobClient serviceClient;
+ CloudBlobContainer container;
+ CloudBlockBlob blob;
+
+ account = CloudStorageAccount.parse(storageConnectionString);
+ serviceClient = account.createCloudBlobClient();
+ // Container name must be lower case.
+ container = serviceClient.getContainerReference("blobsample");
+ container.createIfNotExist();
+
+ // Set anonymous access on the container.
+ BlobContainerPermissions containerPermissions;
+ containerPermissions = new BlobContainerPermissions();
+ container.uploadPermissions(containerPermissions);
+
+ // Upload an image file.
+ blob = container.getBlockBlobReference("image1.jpg");
+ File fileReference = new File("c:\\myimages\\image1.jpg");
+ blob.upload(new FileInputStream(fileReference), fileReference.length());
+ } catch (FileNotFoundException fileNotFoundException) {
+ System.out.print("FileNotFoundException encountered: ");
+ System.out.println(fileNotFoundException.getMessage());
+ System.exit(-1);
+ } catch (StorageException storageException) {
+ System.out.print("StorageException encountered: ");
+ System.out.println(storageException.getMessage());
+ System.exit(-1);
+ } catch (Exception e) {
+ System.out.print("Exception encountered: ");
+ System.out.println(e.getMessage());
+ System.exit(-1);
+ }
+
+ }
}
```
#Need Help?
-Be sure to check out the Windows Azure [Developer Forums on Stack Overflow](http://go.microsoft.com/fwlink/?LinkId=234489) if you have trouble with the provided code.
+Be sure to check out the Microsoft Azure [Developer Forums on Stack Overflow](http://go.microsoft.com/fwlink/?LinkId=234489) if you have trouble with the provided code.
#Contribute Code or Provide Feedback
-If you would like to become an active contributor to this project please follow the instructions provided in [Windows Azure Projects Contribution Guidelines](http://windowsazure.github.com/guidelines.html).
+If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](http://azure.github.com/guidelines.html).
-If you encounter any bugs with the library please file an issue in the [Issues](https://github.com/WindowsAzure/azure-sdk-for-java/issues) section of the project.
+If you encounter any bugs with the library please file an issue in the [Issues](https://github.com/Azure/azure-sdk-for-java/issues) section of the project.
#Learn More
-* [Windows Azure Java Developer Center](http://www.windowsazure.com/en-us/develop/java/)
+* [Microsoft Azure Java Developer Center](http://azure.microsoft.com/en-us/develop/java/)
* [JavaDocs](http://dl.windowsazure.com/javadoc/)
diff --git a/core-test/pom.xml b/core-test/pom.xml
new file mode 100644
index 0000000000000..78100f8a60d89
--- /dev/null
+++ b/core-test/pom.xml
@@ -0,0 +1,95 @@
+
+
+ 4.0.0
+
+ com.microsoft.windowsazure
+ microsoft-azure-api-parent
+ 0.5.0
+ ../parent/pom.xml
+
+
+ microsoft-azure-api-core-test
+ jar
+
+ Microsoft Azure Core Test Client API
+ API for Testing Microsoft Azure Clients
+ https://github.com/Azure/azure-sdk-for-java
+
+
+
+ The Apache Software License, Version 2.0
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+ repo
+
+
+
+
+ scm:git:https://github.com/Azure/azure-sdk-for-java
+ scm:git:git://github.com/Azure/azure-sdk-for-java.git
+
+
+
+ UTF-8
+
+
+
+
+
+ microsoft
+ Microsoft
+
+
+
+
+
+ ${project.groupId}
+ microsoft-azure-api-core
+ 0.5.0
+
+
+ ${project.groupId}
+ microsoft-azure-api-management
+ 0.5.0
+
+
+ ${project.groupId}
+ microsoft-azure-api-management-websites
+ 0.5.0
+
+
+ ${project.groupId}
+ microsoft-azure-api-management-storage
+ 0.5.0
+
+
+ ${project.groupId}
+ microsoft-azure-api-management-sql
+ 0.5.0
+
+
+
+ info.cukes
+ cucumber-java
+ test
+
+
+ info.cukes
+ cucumber-junit
+ test
+
+
+
diff --git a/core-test/src/test/java/com/microsoft/windowsazure/ManagementResourceStepdefs.java b/core-test/src/test/java/com/microsoft/windowsazure/ManagementResourceStepdefs.java
new file mode 100644
index 0000000000000..c16257e3a9a99
--- /dev/null
+++ b/core-test/src/test/java/com/microsoft/windowsazure/ManagementResourceStepdefs.java
@@ -0,0 +1,693 @@
+/**
+ * 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;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Random;
+
+import org.junit.Assert;
+
+import com.microsoft.windowsazure.core.utils.KeyStoreType;
+import com.microsoft.windowsazure.management.configuration.ManagementConfiguration;
+
+import cucumber.api.java.en.And;
+import cucumber.api.java.en.Given;
+import cucumber.api.java.en.Then;
+import cucumber.api.java.en.When;
+
+/**
+ * The Class ManagementResourceStepdefs.
+ */
+public class ManagementResourceStepdefs {
+ /** The objects. */
+ private HashMap objects = new HashMap();
+
+ /** The random. */
+ private static Random random = new Random();
+
+ /**
+ * I_create_a_character_random_string_with_name.
+ *
+ * @param length the length
+ * @param name the name
+ * @param prefix the prefix
+ */
+ @And("^I create a \"([^\"]*)\" character random String with name \"([^\"]*)\" and prefix \"([^\"]*)\"$")
+ public void i_create_a_character_random_string_with_name(int length, String name, String prefix) {
+ StringBuilder stringBuilder = new StringBuilder(length);
+ for (int i=0; i serviceClass = Class.forName("com.microsoft.windowsazure.management.ManagementService");
+ Method method = serviceClass.getMethod("create", Configuration.class);
+ objects.put(name, method.invoke(null, createConfiguration()));
+ }
+ else if (objectType.equals("WebSiteManagementClient")) {
+ Class serviceClass = Class.forName("com.microsoft.windowsazure.management.websites.WebSiteManagementService");
+ Method method = serviceClass.getMethod("create", Configuration.class);
+ objects.put(name, method.invoke(null, createConfiguration()));
+ }
+ else if (objectType.equals("StorageManagementClient")) {
+ Class serviceClass = Class.forName("com.microsoft.windowsazure.management.storage.StorageManagementService");
+ Method method = serviceClass.getMethod("create", Configuration.class);
+ objects.put(name, method.invoke(null, createConfiguration()));
+ }
+ else if (objectType.equals("SqlManagementClient")) {
+ Class serviceClass = Class.forName("com.microsoft.windowsazure.management.sql.SqlManagementService");
+ Method method = serviceClass.getMethod("create", Configuration.class);
+ objects.put(name, method.invoke(null, createConfiguration()));
+ }
+ else {
+ Class objectClass = TextUtility.getJavaType(objectType);
+ objects.put(name, objectClass.newInstance());
+ }
+ }
+
+ /**
+ * Set_property_obj.
+ *
+ * @param propertyName the property name
+ * @param propertyObj the property obj
+ * @param propertyType the property type
+ * @throws ClassNotFoundException the class not found exception
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ */
+ @Given("^set \"([^\"]*)\" with \"([^\"]*)\" of type \"([^\"]*)\"$")
+ public void set_property_obj(String propertyName, String propertyObj, String propertyType) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+ String[] parts = propertyName.split("\\.");
+ Object object = getObject(parts);
+ if (parts.length > 1) {
+ Method method = object.getClass().getMethod("set" + TextUtility.ToPascalCase(parts[parts.length - 1]), TextUtility.getJavaType(propertyType));
+ method.invoke(object, objects.get(propertyObj));
+ }
+ else {
+ objects.put(propertyName, objects.get(propertyObj));
+ }
+ }
+
+ /**
+ * Set_property.
+ *
+ * @param propertyName the property name
+ * @param propertyValue the property value
+ * @param propertyType the property type
+ * @throws ClassNotFoundException the class not found exception
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ */
+ @Given("^set \"([^\"]*)\" with value \"([^\"]*)\" of type \"([^\"]*)\"$")
+ public void set_property(String propertyName, String propertyValue, String propertyType) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+ String[] parts = propertyName.split("\\.");
+ Object object = getObject(parts);
+ if (parts.length > 1) {
+ Method method = object.getClass().getMethod("set" + TextUtility.ToPascalCase(parts[parts.length - 1]), TextUtility.getJavaType(propertyType));
+ method.invoke(object, TextUtility.convertStringTo(propertyValue, propertyType));
+ }
+ else {
+ objects.put(propertyName, TextUtility.convertStringTo(propertyValue, propertyType));
+ }
+ }
+
+ /**
+ * Set_property_from_path.
+ *
+ * @param propertyName the property name
+ * @param valuePath the value path
+ * @param propertyType the property type
+ * @throws ClassNotFoundException the class not found exception
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ */
+ @Given("^set \"([^\"]*)\" with value from path \"([^\"]*)\" of type \"([^\"]*)\"$")
+ public void set_property_from_path(String propertyName, String valuePath, String propertyType) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+ String[] propertyParts = valuePath.split("\\.");
+ Object propertyObject = getObject(propertyParts);
+
+ Object propertyValue = getPropertyValue(propertyObject, propertyParts[propertyParts.length - 1]);
+
+ String[] parts = propertyName.split("\\.");
+ Object object = getObject(parts);
+ if (parts.length > 1) {
+ Method method = object.getClass().getMethod("set" + TextUtility.ToPascalCase(parts[parts.length - 1]), TextUtility.getJavaType(propertyType));
+ method.invoke(object, propertyValue);
+ }
+ else {
+ objects.put(propertyName, propertyValue);
+ }
+ }
+
+ /**
+ * Set_value_where_equals.
+ *
+ * @param objectName the object name
+ * @param path the path
+ * @param propertyPath the property path
+ * @param propertyType the property type
+ * @param value the value
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ * @throws ClassNotFoundException the class not found exception
+ */
+ @And("^set \"([^\"]*)\" with value from list \"([^\"]*)\" where \"([^\"]*)\" of type \"([^\"]*)\" equals \"([^\"]*)\"$")
+ public void set_value_where_equals(String objectName, String path, String propertyPath, String propertyType, String value) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, ClassNotFoundException {
+ String[] parts = path.split("\\.");
+ Object parent = getObject(parts);
+ ArrayList arrayObject = (ArrayList) getPropertyValue(parent, parts[parts.length - 1]);
+
+ for (int i = 0; i < arrayObject.size(); i++) {
+ String[] propertyParts = propertyPath.split("\\.");
+ Object propertyParent = getObject(arrayObject.get(i), propertyParts);
+ Object propertyValue = getPropertyValue(propertyParent, propertyParts[propertyParts.length - 1]);
+ if (propertyValue.equals(TextUtility.convertStringTo(value, propertyType))) {
+ objects.put(objectName, arrayObject.get(i));
+ return;
+ }
+ }
+
+ throw new NullPointerException();
+ }
+
+ /**
+ * Set_value_where_equals_parameter.
+ *
+ * @param objectName the object name
+ * @param path the path
+ * @param propertyPath the property path
+ * @param propertyType the property type
+ * @param parameterName the parameter name
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ * @throws ClassNotFoundException the class not found exception
+ */
+ @And("^set \"([^\"]*)\" with value from list \"([^\"]*)\" where \"([^\"]*)\" of type \"([^\"]*)\" equals parameter \"([^\"]*)\"$")
+ public void set_value_where_equals_parameter(String objectName, String path, String propertyPath, String propertyType, String parameterName) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, ClassNotFoundException {
+ String[] parts = path.split("\\.");
+ Object parent = getObject(parts);
+ ArrayList arrayObject = (ArrayList) getPropertyValue(parent, parts[parts.length - 1]);
+ Object value = objects.get(parameterName);
+ for (int i = 0; i < arrayObject.size(); i++) {
+ String[] propertyParts = propertyPath.split("\\.");
+ Object propertyParent = getObject(arrayObject.get(i), propertyParts);
+ Object propertyValue = getPropertyValue(propertyParent, propertyParts[propertyParts.length - 1]);
+ if (propertyValue.equals(value)) {
+ objects.put(objectName, arrayObject.get(i));
+ return;
+ }
+ }
+
+ throw new NullPointerException();
+ }
+
+ /**
+ * Gets the property value.
+ *
+ * @param parent the parent
+ * @param propertyName the property name
+ * @return the property value
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ */
+ private Object getPropertyValue(Object parent, String propertyName) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+ Method method;
+ if (propertyName.toLowerCase().equals("length")) {
+ method = parent.getClass().getMethod("size");
+ }
+ else {
+ method = parent.getClass().getMethod("get" + TextUtility.ToPascalCase(propertyName));
+ }
+
+ return method.invoke(parent);
+ }
+
+ /**
+ * And_get_property_equals.
+ *
+ * @param propertyType the property type
+ * @param propertyName the property name
+ * @param propertyValue the property value
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ * @throws ClassNotFoundException the class not found exception
+ */
+ @And("^property with type \"([^\"]*)\" and path \"([^\"]*)\" should equal \"([^\"]*)\"$")
+ public void and_get_property_equals(String propertyType, String propertyName, String propertyValue) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, ClassNotFoundException {
+ String[] parts = propertyName.split("\\.");
+ Object object = getObject(parts);
+
+ Object result = getPropertyValue(object, parts[parts.length - 1]);
+
+ // Assert
+ Assert.assertEquals(TextUtility.convertStringTo(propertyValue, propertyType), result);
+ }
+
+ @And("^property with type \"([^\"]*)\" and path \"([^\"]*)\" should equal parameter \"([^\"]*)\"$")
+ public void and_get_property_equals_parameters(String propertyType, String propertyName, String parameterName) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, ClassNotFoundException {
+ String[] parts = propertyName.split("\\.");
+ Object object = getObject(parts);
+
+ Object result = getPropertyValue(object, parts[parts.length - 1]);
+
+ Object parameterValue = objects.get(parameterName);
+ // Assert
+ Assert.assertEquals(parameterValue, result);
+ }
+
+ /**
+ * And_get_property_not_equals.
+ *
+ * @param propertyType the property type
+ * @param propertyName the property name
+ * @param propertyValue the property value
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ * @throws ClassNotFoundException the class not found exception
+ */
+ @And("^property with type \"([^\"]*)\" and path \"([^\"]*)\" should not equal \"([^\"]*)\"$")
+ public void and_get_property_not_equals(String propertyType, String propertyName, String propertyValue) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, ClassNotFoundException {
+ String[] parts = propertyName.split("\\.");
+ Object object = getObject(parts);
+
+ Method method = object.getClass().getMethod("get" + TextUtility.ToPascalCase(parts[parts.length - 1]));
+ Object result = method.invoke(object);
+
+ // Assert
+ Assert.assertNotEquals(TextUtility.convertStringTo(propertyValue, propertyType), result);
+ }
+
+ /**
+ * When_invoke_with_parameter_value_get_result.
+ *
+ * @param methodName the method name
+ * @param parameterValue the parameter value
+ * @param parameterType the parameter type
+ * @param resultName the result name
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ * @throws ClassNotFoundException the class not found exception
+ */
+ @When("^I invoke \"([^\"]*)\" with parameter value \"([^\"]*)\" of type \"([^\"]*)\" I get the result into \"([^\"]*)\"$")
+ public void when_invoke_with_parameter_value_get_result(String methodName, String parameterValue, String parameterType, String resultName) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, ClassNotFoundException {
+ objects.put(resultName, when_invoke_with_parameter_converted_value(methodName, TextUtility.convertStringTo(parameterValue, parameterType), parameterType));
+ }
+
+ /**
+ * When_invoke_with_parameter_get_result.
+ *
+ * @param methodName the method name
+ * @param parameterName the parameter name
+ * @param resultName the result name
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ * @throws ClassNotFoundException the class not found exception
+ */
+ @When("^I invoke \"([^\"]*)\" with parameter \"([^\"]*)\" I get the result into \"([^\"]*)\"$")
+ public void when_invoke_with_parameter_get_result(String methodName, String parameterName, String resultName) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, ClassNotFoundException {
+ Object parameter = objects.get(parameterName);
+ objects.put(resultName, when_invoke_with_parameter_converted_value(methodName, parameter, parameter.getClass().getName()));
+ }
+
+ /**
+ * When_invoke_get_result.
+ *
+ * @param methodName the method name
+ * @param resultName the result name
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ */
+ @When("^I invoke \"([^\"]*)\" I get the result into \"([^\"]*)\"$")
+ public void when_invoke_get_result(String methodName, String resultName) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+ objects.put(resultName, when_invoke(methodName));
+ }
+
+ /**
+ * When_invoke.
+ *
+ * @param methodName the method name
+ * @return the object
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ */
+ @When("^I invoke \"([^\"]*)\"$")
+ public Object when_invoke(String methodName) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+ String[] parts = methodName.split("\\.");
+ Object object = getObject(parts);
+
+ Method method = object.getClass().getMethod(TextUtility.ToCamelCase(parts[parts.length - 1]));
+ return method.invoke(object);
+ }
+
+ /**
+ * When_invoke_with_parameter_values.
+ *
+ * @param methodName the method name
+ * @param parameter1 the parameter1
+ * @param parameter1Type the parameter1 type
+ * @param parameter2 the parameter2
+ * @param parameter2Type the parameter2 type
+ * @return the object
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ * @throws ClassNotFoundException the class not found exception
+ */
+ public Object when_invoke_with_parameter_values(String methodName, Object parameter1, String parameter1Type, Object parameter2, String parameter2Type) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, ClassNotFoundException {
+ String[] parts = methodName.split("\\.");
+ Object object = getObject(parts);
+
+ Method method = object.getClass().getMethod(TextUtility.ToCamelCase(parts[parts.length - 1]), TextUtility.getJavaType(parameter1Type), TextUtility.getJavaType(parameter2Type));
+ return method.invoke(object, parameter1, parameter2);
+ }
+
+ public Object when_invoke_with_parameter_values(String methodName, Object parameter1, String parameter1Type, Object parameter2, String parameter2Type, Object parameter3, String parameter3Type) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, ClassNotFoundException {
+ String[] parts = methodName.split("\\.");
+ Object object = getObject(parts);
+
+ Method method = object.getClass().getMethod(TextUtility.ToCamelCase(parts[parts.length - 1]), TextUtility.getJavaType(parameter1Type), TextUtility.getJavaType(parameter2Type), TextUtility.getJavaType(parameter3Type));
+ return method.invoke(object, parameter1, parameter2, parameter3);
+ }
+
+ /**
+ * When_invoke_with_parameter_values_string.
+ *
+ * @param methodName the method name
+ * @param parameter1 the parameter1
+ * @param parameter1Type the parameter1 type
+ * @param parameter2 the parameter2
+ * @param parameter2Type the parameter2 type
+ * @return the object
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ * @throws ClassNotFoundException the class not found exception
+ */
+ @When("^I invoke \"([^\"]*)\" with parameter values \"([^\"]*)\" of type \"([^\"]*)\" and \"([^\"]*)\" of type \"([^\"]*)\"$")
+ public Object when_invoke_with_parameter_values_string(String methodName, String parameter1, String parameter1Type, String parameter2, String parameter2Type) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, ClassNotFoundException {
+ return when_invoke_with_parameter_values(methodName, TextUtility.convertStringTo(parameter1, parameter1Type), parameter1Type, TextUtility.convertStringTo(parameter2, parameter2Type), parameter2Type);
+ }
+
+ /**
+ * When_invoke_with_parameter_value.
+ *
+ * @param methodName the method name
+ * @param parameterValue the parameter value
+ * @param parameterType the parameter type
+ * @return the object
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ * @throws ClassNotFoundException the class not found exception
+ */
+ @When("^I invoke \"([^\"]*)\" with parameter value \"([^\"]*)\" of type \"([^\"]*)\"$")
+ public Object when_invoke_with_parameter_value(String methodName, String parameterValue, String parameterType) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, ClassNotFoundException {
+ return when_invoke_with_parameter_converted_value(methodName, TextUtility.convertStringTo(parameterValue, parameterType), parameterType);
+ }
+
+ /**
+ * When_invoke_with_parameter_converted_value.
+ *
+ * @param methodName the method name
+ * @param parameterValue the parameter value
+ * @param parameterType the parameter type
+ * @return the object
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ * @throws ClassNotFoundException the class not found exception
+ */
+ public Object when_invoke_with_parameter_converted_value(String methodName, Object parameterValue, String parameterType) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, ClassNotFoundException {
+ String[] parts = methodName.split("\\.");
+ Object object = getObject(parts);
+
+ Method method = object.getClass().getMethod(TextUtility.ToCamelCase(parts[parts.length - 1]), TextUtility.getJavaType(parameterType));
+ return method.invoke(object, parameterValue);
+ }
+
+ /**
+ * When_invoke_with_parameter.
+ *
+ * @param methodName the method name
+ * @param parameterName the parameter name
+ * @return the object
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ * @throws ClassNotFoundException the class not found exception
+ */
+ @When("^I invoke \"([^\"]*)\" with parameter \"([^\"]*)\"$")
+ public Object when_invoke_with_parameter(String methodName, String parameterName) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, ClassNotFoundException {
+ Object parameter = objects.get(parameterName);
+ return when_invoke_with_parameter_converted_value(methodName, parameter, parameter.getClass().getName());
+ }
+
+ /**
+ * When_invoke_with_parameter.
+ *
+ * @param methodName the method name
+ * @param parameter1Name the parameter1 name
+ * @param parameter2Name the parameter2 name
+ * @return the object
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ * @throws ClassNotFoundException the class not found exception
+ */
+ @When("^I invoke \"([^\"]*)\" with parameters \"([^\"]*)\" and \"([^\"]*)\"$")
+ public Object when_invoke_with_parameter(String methodName, String parameter1Name, String parameter2Name) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, ClassNotFoundException {
+ String[] parts1 = parameter1Name.split("\\.");
+ Object parameter1 = getObject(parts1);
+
+ String[] parts2 = parameter2Name.split("\\.");
+ Object parameter2 = getObject(parts2);
+
+ return when_invoke_with_parameter_values(methodName, parameter1, parameter1.getClass().getName(), parameter2, parameter2.getClass().getName());
+ }
+
+ /**
+ * When_invoke_with_parameter.
+ *
+ * @param methodName the method name
+ * @param parameter1Name the parameter1 name
+ * @param parameter2Name the parameter2 name
+ * @return the object
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ * @throws ClassNotFoundException the class not found exception
+ */
+ @When("^I invoke \"([^\"]*)\" with parameters \"([^\"]*)\" and \"([^\"]*)\" and \"([^\"]*)\"$")
+ public Object when_invoke_with_parameter(String methodName, String parameter1Name, String parameter2Name, String parameter3Name) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, ClassNotFoundException {
+ String[] parts1 = parameter1Name.split("\\.");
+ Object parameter1 = getObject(parts1);
+
+ String[] parts2 = parameter2Name.split("\\.");
+ Object parameter2 = getObject(parts2);
+
+ String[] parts3 = parameter3Name.split("\\.");
+ Object parameter3 = getObject(parts3);
+
+ return when_invoke_with_parameter_values(methodName, parameter1, parameter1.getClass().getName(), parameter2, parameter2.getClass().getName(), parameter3, parameter3.getClass().getName());
+ }
+
+ /**
+ * When_invoke_with_parameters_get_result.
+ *
+ * @param methodName the method name
+ * @param parameter1Name the parameter1 name
+ * @param parameter2Name the parameter2 name
+ * @param resultName the result name
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ * @throws ClassNotFoundException the class not found exception
+ */
+ @When("^I invoke \"([^\"]*)\" with parameters \"([^\"]*)\" and \"([^\"]*)\" I get the result into \"([^\"]*)\"$")
+ public void when_invoke_with_parameters_get_result(String methodName, String parameter1Name, String parameter2Name, String resultName) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, ClassNotFoundException {
+ objects.put(resultName, when_invoke_with_parameter(methodName, parameter1Name, parameter2Name));
+ }
+
+ /**
+ * Then_invoke_with_parameter_of_type.
+ *
+ * @param methodName the method name
+ * @param parameter the parameter
+ * @param parameterType the parameter type
+ * @return the object
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ * @throws SecurityException the security exception
+ * @throws ClassNotFoundException the class not found exception
+ */
+ @Then("^invoke \"([^\"]*)\" with parameter \"([^\"]*)\" of type \"([^\"]*)\"$")
+ public Object then_invoke_with_parameter_of_type(String methodName, Object parameter, String parameterType) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, SecurityException, ClassNotFoundException {
+ String[] parts = methodName.split("\\.");
+ Object object = getObject(parts);
+ Object parameterObject = objects.get(parameter);
+ Method method = object.getClass().getMethod(TextUtility.ToCamelCase(parts[parts.length - 1]), TextUtility.getJavaType(parameterType));
+ return method.invoke(object, parameterObject);
+ }
+
+ /**
+ * Then_invoke_with_parameter_value.
+ *
+ * @param methodName the method name
+ * @param parameter the parameter
+ * @param parameterType the parameter type
+ * @return the object
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ * @throws ClassNotFoundException the class not found exception
+ */
+ @Then("^invoke \"([^\"]*)\" with parameter value \"([^\"]*)\" of type \"([^\"]*)\"$")
+ public Object then_invoke_with_parameter_value(String methodName, Object parameter, String parameterType) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, ClassNotFoundException {
+ return when_invoke_with_parameter_converted_value(methodName, parameter, parameterType);
+ }
+
+ /**
+ * I_invoke_with_parameter_values_of_type_and_of_type_ i_get_the_result_into.
+ *
+ * @param methodName the method name
+ * @param parameter1 the parameter1
+ * @param parameter1Type the parameter1 type
+ * @param parameter2 the parameter2
+ * @param parameter2Type the parameter2 type
+ * @param resultName the result name
+ * @throws Throwable the throwable
+ */
+ @When("^I invoke \"([^\"]*)\" with parameter values \"([^\"]*)\" of type \"([^\"]*)\" and \"([^\"]*)\" of type \"([^\"]*)\" I get the result into \"([^\"]*)\"$")
+ public void I_invoke_with_parameter_values_of_type_and_of_type_I_get_the_result_into(String methodName, String parameter1, String parameter1Type, String parameter2, String parameter2Type, String resultName) throws Throwable {
+ objects.put(resultName, when_invoke_with_parameter_values(methodName, TextUtility.convertStringTo(parameter1, parameter1Type), parameter1Type, TextUtility.convertStringTo(parameter2, parameter2Type), parameter2Type));
+ }
+
+ /**
+ * Then_invoke_with_parameter_values.
+ *
+ * @param methodName the method name
+ * @param parameter1 the parameter1
+ * @param parameter1Type the parameter1 type
+ * @param parameter2 the parameter2
+ * @param parameter2Type the parameter2 type
+ * @return the object
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ * @throws ClassNotFoundException the class not found exception
+ */
+ @Then("^invoke \"([^\"]*)\" with parameter values \"([^\"]*)\" of type \"([^\"]*)\" and \"([^\"]*)\" of type \"([^\"]*)\"$")
+ public Object then_invoke_with_parameter_values(String methodName, Object parameter1, String parameter1Type, Object parameter2, String parameter2Type) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, ClassNotFoundException {
+ return when_invoke_with_parameter_values(methodName, parameter1, parameter1Type, parameter2, parameter2Type);
+ }
+
+ /**
+ * Gets the object.
+ *
+ * @param parts the parts
+ * @return the object
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ */
+ private Object getObject(String[] parts) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+ if (objects.containsKey(parts[0])) {
+ Object object = objects.get(parts[0]);
+
+ String[] memberParts = Arrays.copyOfRange(parts, 1, parts.length);
+ return getObject(object, memberParts);
+ }
+
+ return null;
+ }
+
+ /**
+ * Gets the object.
+ *
+ * @param parent the parent
+ * @param parts the parts
+ * @return the object
+ * @throws NoSuchMethodException the no such method exception
+ * @throws InvocationTargetException the invocation target exception
+ * @throws IllegalAccessException the illegal access exception
+ */
+ private Object getObject(Object parent, String[] parts) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+ for (int i = 0; i < (parts.length - 1); i++) {
+ if (parts[i].endsWith("]")) {
+ String propertyName = parts[i].substring(0, parts[i].lastIndexOf("["));
+ Method method = parent.getClass().getMethod("get" + TextUtility.ToPascalCase(propertyName));
+ parent = method.invoke(parent);
+
+ int index = Integer.parseInt(parts[i].substring(parts[i].lastIndexOf("[") + 1, parts[i].length() - 1));
+ Method indexMethod = parent.getClass().getMethod("get", int.class);
+ parent = indexMethod.invoke(parent, index);
+ }
+ else {
+ Method method = parent.getClass().getMethod("get" + TextUtility.ToPascalCase(parts[i]));
+ parent = method.invoke(parent);
+ }
+ }
+
+ return parent;
+ }
+
+ /**
+ * Creates the configuration.
+ *
+ * @return the configuration
+ * @throws Exception the exception
+ */
+ protected static Configuration createConfiguration() throws Exception {
+ String baseUri = System.getenv(ManagementConfiguration.URI);
+ return ManagementConfiguration.configure(
+ baseUri != null ? new URI(baseUri) : null,
+ System.getenv(ManagementConfiguration.SUBSCRIPTION_ID),
+ System.getenv(ManagementConfiguration.KEYSTORE_PATH),
+ System.getenv(ManagementConfiguration.KEYSTORE_PASSWORD),
+ KeyStoreType.fromString(System.getenv(ManagementConfiguration.KEYSTORE_TYPE))
+ );
+ }
+}
\ No newline at end of file
diff --git a/core-test/src/test/java/com/microsoft/windowsazure/RunCukesTest.java b/core-test/src/test/java/com/microsoft/windowsazure/RunCukesTest.java
new file mode 100644
index 0000000000000..e6f4dd10363d3
--- /dev/null
+++ b/core-test/src/test/java/com/microsoft/windowsazure/RunCukesTest.java
@@ -0,0 +1,26 @@
+/**
+ * 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;
+
+import cucumber.api.junit.Cucumber;
+import cucumber.api.CucumberOptions;
+
+import org.junit.runner.RunWith;
+
+@RunWith(Cucumber.class)
+@CucumberOptions(format = {"html:target/cucumber-html-report", "json:target/cucumber-json-report.json"})
+public class RunCukesTest {
+}
\ No newline at end of file
diff --git a/core-test/src/test/java/com/microsoft/windowsazure/TextUtility.java b/core-test/src/test/java/com/microsoft/windowsazure/TextUtility.java
new file mode 100644
index 0000000000000..91b823482ea2d
--- /dev/null
+++ b/core-test/src/test/java/com/microsoft/windowsazure/TextUtility.java
@@ -0,0 +1,105 @@
+/**
+ * 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;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Calendar;
+
+import javax.xml.bind.DatatypeConverter;
+
+import com.microsoft.windowsazure.management.websites.models.WebSiteCreateParameters;
+
+public final class TextUtility
+{
+ public static String ToPascalCase(String input)
+ {
+ return input.substring(0, 1).toUpperCase() +
+ input.substring(1);
+ }
+
+ public static String ToCamelCase(String input)
+ {
+ return input.substring(0, 1).toLowerCase() +
+ input.substring(1);
+ }
+
+ public static Object convertStringTo(String input, String type) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException
+ {
+ if (input.equals("null"))
+ {
+ return null;
+ }
+
+ if (type.equals("System.Int32"))
+ {
+ return DatatypeConverter.parseInt(input);
+ }
+ else if (type.equals("System.String"))
+ {
+ return input;
+ }
+ else if (type.equals("System.DateTime"))
+ {
+ if (input.equals("DateTime.Now"))
+ {
+ return Calendar.getInstance();
+ }
+
+ return DatatypeConverter.parseDateTime(input);
+ }
+ else if (Enum.class.isAssignableFrom(getJavaType(type)))
+ {
+ Class enumType = getJavaType(type);
+ Method method = enumType.getMethod("valueOf", String.class);
+ return method.invoke(null, input);
+ }
+ else
+ {
+ throw new UnsupportedOperationException();
+ }
+ }
+
+ public static Class getJavaType(String csharpType) throws ClassNotFoundException
+ {
+ if (csharpType.equals("System.Int32"))
+ {
+ return int.class;
+ }
+ else if (csharpType.equals("System.String"))
+ {
+ return String.class;
+ }
+ else if (csharpType.equals("System.DateTime"))
+ {
+ return Calendar.class;
+ }
+ else if (csharpType.equals("Microsoft.WindowsAzure.Management.WebSites.Models.WebSiteCreateParameters.WebSpaceDetails"))
+ {
+ return WebSiteCreateParameters.WebSpaceDetails.class;
+ }
+ else
+ {
+ return Class.forName(csharpType
+ .replace("Microsoft.WindowsAzure.Management",
+ "com.microsoft.windowsazure.management")
+ .replace(".Models", ".models")
+ .replace(".WebSites.", ".websites.")
+ .replace(".Sql.", ".sql.")
+ .replace(".Storage.", ".storage."));
+ }
+ }
+}
diff --git a/core-test/src/test/resources/com/microsoft/windowsazure/management/affinitygroups.feature b/core-test/src/test/resources/com/microsoft/windowsazure/management/affinitygroups.feature
new file mode 100644
index 0000000000000..19529d7726e4a
--- /dev/null
+++ b/core-test/src/test/resources/com/microsoft/windowsazure/management/affinitygroups.feature
@@ -0,0 +1,41 @@
+Feature: Affinity groups should work
+
+Background:
+ Given I create a "ManagementClient" with name "management"
+
+Scenario: Create an AffinityGroup
+ Given I create a "Microsoft.WindowsAzure.Management.Models.AffinityGroupCreateParameters" with name "parameters"
+ And I create a "10" character random String with name "testAffinityGroupName1" and prefix "azure-java-test-"
+ And set "parameters.Name" with "testAffinityGroupName1" of type "System.String"
+ And set "parameters.Location" with value "West US" of type "System.String"
+ And set "parameters.Label" with value "Great AF" of type "System.String"
+ When I invoke "management.AffinityGroupsOperations.Create" with parameter "parameters" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "201"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
+ Then invoke "management.AffinityGroupsOperations.Delete" with parameter "testAffinityGroupName1" of type "System.String"
+
+Scenario: Get an AffinityGroup
+ Given I create a "Microsoft.WindowsAzure.Management.Models.AffinityGroupCreateParameters" with name "parameters"
+ And I create a "10" character random String with name "testAffinityGroupName2" and prefix "azure-java-test-"
+ And set "parameters.Name" with "testAffinityGroupName2" of type "System.String"
+ And set "parameters.Location" with value "West US" of type "System.String"
+ And set "parameters.Label" with value "Great AF2" of type "System.String"
+ And I invoke "management.AffinityGroupsOperations.Create" with parameter "parameters"
+ When I invoke "management.AffinityGroupsOperations.Get" with parameter value "AF2" of type "System.String" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
+ Then invoke "management.AffinityGroupsOperations.Delete" with parameter "testAffinityGroupName2" of type "System.String"
+
+Scenario: List AffinityGroups
+ Given I create a "Microsoft.WindowsAzure.Management.Models.AffinityGroupCreateParameters" with name "parameters"
+ And I create a "10" character random String with name "testAffinityGroupName3" and prefix "azure-java-test-"
+ And set "parameters.Name" with "testAffinityGroupName3" of type "System.String"
+ And set "parameters.Location" with value "West US" of type "System.String"
+ And set "parameters.Label" with value "Great AF3" of type "System.String"
+ And I invoke "management.AffinityGroupsOperations.Create" with parameter "parameters"
+ When I invoke "management.AffinityGroupsOperations.List" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
+ And set "element" with value from list "operationResponse.AffinityGroups" where "Name" of type "System.String" equals "AF3"
+ And property with type "System.String" and path "element.Name" should equal "AF3"
+ Then invoke "management.AffinityGroupsOperations.Delete" with parameter "testAffinityGroupName3" of type "System.String"
\ No newline at end of file
diff --git a/core-test/src/test/resources/com/microsoft/windowsazure/management/certificates.feature b/core-test/src/test/resources/com/microsoft/windowsazure/management/certificates.feature
new file mode 100644
index 0000000000000..7db12600fc7b0
--- /dev/null
+++ b/core-test/src/test/resources/com/microsoft/windowsazure/management/certificates.feature
@@ -0,0 +1,9 @@
+Feature: Management Certificates should work
+
+Background:
+ Given I create a "ManagementClient" with name "management"
+
+Scenario: Get a Certificate
+ When I invoke "management.ManagementCertificatesOperations.Get" with parameter value "00EC75B90F4F59F172C3C321C150FE7E79FC29AB" of type "System.String" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
\ No newline at end of file
diff --git a/core-test/src/test/resources/com/microsoft/windowsazure/management/locations.feature b/core-test/src/test/resources/com/microsoft/windowsazure/management/locations.feature
new file mode 100644
index 0000000000000..5ecef17e5660f
--- /dev/null
+++ b/core-test/src/test/resources/com/microsoft/windowsazure/management/locations.feature
@@ -0,0 +1,13 @@
+Feature: Locations should work
+
+Background:
+ Given I create a "ManagementClient" with name "management"
+
+Scenario: List Locations
+ When I invoke "management.LocationsOperations.List" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
+ And set "element1" with value from list "operationResponse.Locations" where "Name" of type "System.String" equals "Southeast Asia"
+ And property with type "System.String" and path "element1.Name" should equal "Southeast Asia"
+ And set "element2" with value from list "operationResponse.Locations" where "Name" of type "System.String" equals "East Asia"
+ And property with type "System.String" and path "element2.Name" should equal "East Asia"
\ No newline at end of file
diff --git a/core-test/src/test/resources/com/microsoft/windowsazure/management/sql/sql.feature b/core-test/src/test/resources/com/microsoft/windowsazure/management/sql/sql.feature
new file mode 100644
index 0000000000000..bc9a155ae557f
--- /dev/null
+++ b/core-test/src/test/resources/com/microsoft/windowsazure/management/sql/sql.feature
@@ -0,0 +1,47 @@
+Feature: SqlServer should work
+
+Background:
+ Given I create a "SqlManagementClient" with name "management"
+
+Scenario: Create SQL Server
+ Given I create a "Microsoft.WindowsAzure.Management.Sql.Models.ServerCreateParameters" with name "parameters"
+ And set "parameters.Location" with value "West US" of type "System.String"
+ And set "parameters.AdministratorPassword" with value "TestPassword12!" of type "System.String"
+ And set "parameters.AdministratorUserName" with value "testadministrator" of type "System.String"
+ And I invoke "management.ServersOperations.Create" with parameter "parameters" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "201"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
+
+Scenario: List SQL Server
+ When I invoke "management.ServersOperations.List" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
+ And set "element1" with value from list "operationResponse.Servers" where "Location" of type "System.String" equals "West US"
+
+Scenario: Create SQL Database
+ Given I invoke "management.ServersOperations.List" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
+ And set "element1" with value from list "operationResponse.Servers" where "Location" of type "System.String" equals "West US"
+ And set "serverName" with value from path "element1.Name" of type "System.String"
+ When I create a "Microsoft.WindowsAzure.Management.Sql.Models.DatabaseCreateParameters" with name "parameters"
+ And set "parameters.MaximumDatabaseSizeInGB" with value "1" of type "System.Int32"
+ And set "parameters.Name" with value "expecteddatabasename" of type "System.String"
+ And set "parameters.CollationName" with value "SQL_Latin1_General_CP1_CI_AS" of type "System.String"
+ And set "parameters.Edition" with value "Web" of type "System.String"
+ And I invoke "management.DatabasesOperations.Create" with parameters "serverName" and "parameters" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "201"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
+
+Scenario: Delete SQL Server
+ Given I invoke "management.ServersOperations.List" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
+ And set "element1" with value from list "operationResponse.Servers" where "Location" of type "System.String" equals "West US"
+ And set "serverName" with value from path "element1.Name" of type "System.String"
+ And I create a "System.String" with name "param1"
+ And set "param1" with value "expecteddatabasename" of type "System.String"
+ When I invoke "management.DatabasesOperations.Delete" with parameters "serverName" and "param1" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
+
\ No newline at end of file
diff --git a/core-test/src/test/resources/com/microsoft/windowsazure/management/storage/storageservice.feature b/core-test/src/test/resources/com/microsoft/windowsazure/management/storage/storageservice.feature
new file mode 100644
index 0000000000000..647a063286ce6
--- /dev/null
+++ b/core-test/src/test/resources/com/microsoft/windowsazure/management/storage/storageservice.feature
@@ -0,0 +1,40 @@
+Feature: Managing Storage accounts
+
+Background:
+ Given I create a "StorageManagementClient" with name "management"
+
+Scenario: Create, List and Delete a storage account
+ Given I create a "Microsoft.WindowsAzure.Management.Storage.Models.StorageAccountCreateParameters" with name "parameters"
+ And I create a "10" character random String with name "testStorageAccountName1" and prefix "azurejavatest"
+ And set "parameters.Name" with "testStorageAccountName1" of type "System.String"
+ And set "parameters.Location" with value "West US" of type "System.String"
+ And set "parameters.Description" with value "Hi there" of type "System.String"
+ And set "parameters.Label" with value "Great St account" of type "System.String"
+ When I invoke "management.StorageAccountsOperations.Create" with parameter "parameters" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+
+Scenario: List a storage account
+ Given I create a "Microsoft.WindowsAzure.Management.Storage.Models.StorageAccountCreateParameters" with name "parameters"
+ And I create a "10" character random String with name "testStorageAccountName2" and prefix "azurejavatest"
+ And set "parameters.Name" with "testStorageAccountName2" of type "System.String"
+ And set "parameters.Location" with value "West US" of type "System.String"
+ And set "parameters.Description" with value "Hi there" of type "System.String"
+ And set "parameters.Label" with value "Great St account" of type "System.String"
+ When I invoke "management.StorageAccountsOperations.Create" with parameter "parameters" I get the result into "operationResponse"
+ When I invoke "management.StorageAccountsOperations.List" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
+ And set "element" with value from list "operationResponse.StorageAccounts" where "Name" of type "System.String" equals parameter "testStorageAccountName2"
+ And property with type "System.String" and path "element.Name" should equal parameter "testStorageAccountName2"
+
+Scenario: Delete storage account
+ Given I create a "Microsoft.WindowsAzure.Management.Storage.Models.StorageAccountCreateParameters" with name "parameters"
+ And I create a "10" character random String with name "testStorageAccountName3" and prefix "azurejavatest"
+ And set "parameters.Name" with "testStorageAccountName3" of type "System.String"
+ And set "parameters.Location" with value "West US" of type "System.String"
+ And set "parameters.Description" with value "Hi there" of type "System.String"
+ And set "parameters.Label" with value "Great St account" of type "System.String"
+ When I invoke "management.StorageAccountsOperations.Create" with parameter "parameters" I get the result into "operationResponse"
+ When I invoke "management.StorageAccountsOperations.Delete" with parameter "testStorageAccountName3" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
\ No newline at end of file
diff --git a/core-test/src/test/resources/com/microsoft/windowsazure/management/subscriptions.feature b/core-test/src/test/resources/com/microsoft/windowsazure/management/subscriptions.feature
new file mode 100644
index 0000000000000..2ae1bfb73b821
--- /dev/null
+++ b/core-test/src/test/resources/com/microsoft/windowsazure/management/subscriptions.feature
@@ -0,0 +1,12 @@
+Feature: Subscriptions should work
+
+Background:
+ Given I create a "ManagementClient" with name "management"
+
+Scenario: List subscription operations with start and end time
+ Given I create a "Microsoft.WindowsAzure.Management.Models.SubscriptionListOperationsParameters" with name "parameters"
+ And set "parameters.StartTime" with value "DateTime.Now" of type "System.DateTime"
+ And set "parameters.EndTime" with value "DateTime.Now" of type "System.DateTime"
+ When I invoke "management.SubscriptionsOperations.ListOperations" with parameter "parameters" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
\ No newline at end of file
diff --git a/core-test/src/test/resources/com/microsoft/windowsazure/management/websites/serverfarm.feature b/core-test/src/test/resources/com/microsoft/windowsazure/management/websites/serverfarm.feature
new file mode 100644
index 0000000000000..68fd521b64f6e
--- /dev/null
+++ b/core-test/src/test/resources/com/microsoft/windowsazure/management/websites/serverfarm.feature
@@ -0,0 +1,24 @@
+Feature: ServerFarm should work
+
+Background:
+ Given I create a "WebSiteManagementClient" with name "management"
+
+Scenario: Create Server Farm
+ Given I create a "Microsoft.WindowsAzure.Management.WebSites.Models.ServerFarmCreateParameters" with name "parameters"
+ And set "parameters.NumberOfWorkers" with value "1" of type "System.Int32"
+ And set "parameters.WorkerSize" with value "Small" of type "Microsoft.WindowsAzure.Management.WebSites.Models.ServerFarmWorkerSize"
+ And I create a "System.String" with name "param1"
+ And set "param1" with value "eastuswebspace" of type "System.String"
+ And I invoke "management.ServerFarmsOperations.Create" with parameters "param1" and "parameters" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
+
+Scenario: List Server Farm
+ When I invoke "management.ServerFarmsOperations.List" with parameter value "eastuswebspace" of type "System.String" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
+
+Scenario: Delete Server Farm
+ When I invoke "management.ServerFarmsOperations.Delete" with parameter value "eastuswebspace" of type "System.String" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
diff --git a/core-test/src/test/resources/com/microsoft/windowsazure/management/websites/website.feature b/core-test/src/test/resources/com/microsoft/windowsazure/management/websites/website.feature
new file mode 100644
index 0000000000000..af11ca684520f
--- /dev/null
+++ b/core-test/src/test/resources/com/microsoft/windowsazure/management/websites/website.feature
@@ -0,0 +1,40 @@
+Feature: WebSite should work
+
+Background:
+ Given I create a "WebSiteManagementClient" with name "management"
+
+Scenario: Create WebSite
+ Given I create a "Microsoft.WindowsAzure.Management.WebSites.Models.WebSiteCreateParameters" with name "parameters"
+ And set "webspace" with value "eastuswebspace" of type "System.String"
+ And I create a "10" character random String with name "testWebSiteName1" and prefix "azurejavatest"
+ And set "parameters.Name" with "testWebSiteName1" of type "System.String"
+ And set "parameters.WebSpaceName" with value "eastuswebspace" of type "System.String"
+ And I create a "Microsoft.WindowsAzure.Management.WebSites.Models.WebSiteCreateParameters.WebSpaceDetails" with name "webSpaceObj"
+ And set "webSpaceObj.Name" with value "eastuswebspace" of type "System.String"
+ And set "webSpaceObj.GeoRegion" with value "East US" of type "System.String"
+ And set "webSpaceObj.Plan" with value "VirtualDedicatedPlan" of type "System.String"
+ And set "parameters.WebSpace" with "webSpaceObj" of type "Microsoft.WindowsAzure.Management.WebSites.Models.WebSiteCreateParameters.WebSpaceDetails"
+ And I create a "System.String" with name "param1"
+ And set "param1" with value "eastuswebspace" of type "System.String"
+ And I invoke "management.WebSitesOperations.Create" with parameters "param1" and "parameters" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
+ And I create a "Microsoft.WindowsAzure.Management.WebSites.Models.WebSiteDeleteParameters" with name "deleteParameters"
+ When I invoke "management.WebSitesOperations.Delete" with parameters "webspace" and "testWebSiteName1" and "deleteParameters"
+
+Scenario: List websites
+ When I invoke "management.WebSpacesOperations.ListWebSites" with parameter values "eastuswebspace" of type "System.String" and "null" of type "Microsoft.WindowsAzure.Management.WebSites.Models.WebSiteListParameters" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
+ And set "element1" with value from list "operationResponse.WebSites" where "Name" of type "System.String" equals "newtstsite"
+ And property with type "System.String" and path "element1.Name" should equal "newtstsite"
+
+Scenario: Create repository
+ When I invoke "management.WebSitesOperations.CreateRepository" with parameter values "eastuswebspace" of type "System.String" and "newtstsite" of type "System.String" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
+
+Scenario: Generate password
+ When I invoke "management.WebSitesOperations.GeneratePassword" with parameter values "eastuswebspace" of type "System.String" and "newtstsite" of type "System.String" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
diff --git a/core-test/src/test/resources/com/microsoft/windowsazure/management/websites/webspace.feature b/core-test/src/test/resources/com/microsoft/windowsazure/management/websites/webspace.feature
new file mode 100644
index 0000000000000..4e27290d5efbd
--- /dev/null
+++ b/core-test/src/test/resources/com/microsoft/windowsazure/management/websites/webspace.feature
@@ -0,0 +1,12 @@
+Feature: WebSpace should work
+
+Background:
+ Given I create a "WebSiteManagementClient" with name "management"
+
+Scenario: List webspaces
+ When I invoke "management.WebSpacesOperations.List" I get the result into "operationResponse"
+ Then property with type "System.Int32" and path "operationResponse.StatusCode" should equal "200"
+ And property with type "System.String" and path "operationResponse.RequestId" should not equal "null"
+ And set "element1" with value from list "operationResponse.WebSpaces" where "GeoRegion" of type "System.String" equals "East US"
+ And property with type "System.String" and path "element1.GeoRegion" should equal "East US"
+ And property with type "System.String" and path "element1.Name" should equal "destanko-EastUSwebspace"
diff --git a/core/pom.xml b/core/pom.xml
new file mode 100644
index 0000000000000..16ca199a30500
--- /dev/null
+++ b/core/pom.xml
@@ -0,0 +1,223 @@
+
+
+ 4.0.0
+
+ com.microsoft.windowsazure
+ microsoft-azure-api-parent
+ 0.5.0
+ ../parent/pom.xml
+
+
+ microsoft-azure-api-core
+ jar
+
+ Microsoft Azure Core Client API
+ API for Microsoft Azure Clients
+ https://github.com/Azure/azure-sdk-for-java
+
+
+
+ The Apache Software License, Version 2.0
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+ repo
+
+
+
+
+ scm:git:https://github.com/Azure/azure-sdk-for-java
+ scm:git:git://github.com/Azure/azure-sdk-for-java.git
+
+
+
+ UTF-8
+
+
+
+
+
+ microsoft
+ Microsoft
+
+
+
+
+
+ org.apache.httpcomponents
+ httpclient
+
+
+ javax.xml.bind
+ jaxb-api
+ provided
+
+
+ javax.mail
+ mail
+
+
+ javax.inject
+ javax.inject
+
+
+ com.sun.jersey
+ jersey-client
+
+
+ com.sun.jersey
+ jersey-json
+
+
+ org.bouncycastle
+ bcprov-jdk16
+
+
+
+
+ org.hamcrest
+ hamcrest-all
+ test
+
+
+ org.mockito
+ mockito-all
+ test
+
+
+ junit
+ junit
+ test
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-help-plugin
+ 2.1.1
+
+
+ validate
+
+ evaluate
+
+
+ legal
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.1
+
+ 1.6
+ 1.6
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ 2.8
+
+ *.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.storage
+ /**
+ * 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.
+ */]]>
+
+
+
+
+
+
+
+
+ org.eclipse.m2e
+ lifecycle-mapping
+ 1.0.0
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-help-plugin
+ [2.1.1,)
+
+ evaluate
+
+
+
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+ 2.4.3
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 2.12
+
+
+ **/Test*.java
+ **/*Test.java
+ **/*Tests.java
+ **/*TestCase.java
+
+
+
+
+
+
+
+
+
+ org.codehaus.mojo
+ emma-maven-plugin
+ 1.0-alpha-3
+ true
+
+
+ org.codehaus.mojo
+ surefire-report-maven-plugin
+ 2.0-beta-1
+ true
+
+
+
+
diff --git a/core/src/main/java/com/microsoft/windowsazure/Configuration.java b/core/src/main/java/com/microsoft/windowsazure/Configuration.java
new file mode 100644
index 0000000000000..101722a62328f
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/Configuration.java
@@ -0,0 +1,135 @@
+/**
+ * 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;
+
+import com.microsoft.windowsazure.core.Builder;
+import com.microsoft.windowsazure.core.DefaultBuilder;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class Configuration {
+ /**
+ * Property name for socket connection timeout used by services created with
+ * this configuration.
+ */
+ public static final String PROPERTY_CONNECT_TIMEOUT = "com.microsoft.windowsazure.Configuration.connectTimeout";
+
+ /**
+ * Property name for socket read timeout used by services created with this
+ * configuration.
+ */
+ public static final String PROPERTY_READ_TIMEOUT = "com.microsoft.windowsazure.Configuration.readTimeout";
+
+ /**
+ * Property name to control if HTTP logging to console is on or off. If
+ * property is set, logging is on, regardless of value.
+ */
+ public static final String PROPERTY_LOG_HTTP_REQUESTS = "com.microsoft.windowsazure.Configuration.logHttpRequests";
+
+ /**
+ * The configuration instance.
+ */
+ private static Configuration instance;
+
+ /**
+ * The configuration properties.
+ */
+ private final Map properties;
+
+ /**
+ * The builder.
+ */
+ private final Builder builder;
+
+ private static Log log = LogFactory.getLog(Configuration.class);
+
+ public Configuration() {
+ this.properties = new HashMap();
+ this.builder = DefaultBuilder.create();
+ }
+
+ public Configuration(Builder builder) {
+ this.properties = new HashMap();
+ this.builder = builder;
+ }
+
+ public static Configuration getInstance() {
+ if (instance == null) {
+ try {
+ instance = Configuration.load();
+ } catch (IOException e) {
+ log.error(
+ "Unable to load META-INF/com.microsoft.windowsazure.properties",
+ e);
+ instance = new Configuration();
+ }
+ }
+ return instance;
+ }
+
+ public static void setInstance(final Configuration configuration) {
+ Configuration.instance = configuration;
+ }
+
+ public static Configuration load() throws IOException {
+ final Configuration config = new Configuration();
+
+ final InputStream stream = Thread
+ .currentThread()
+ .getContextClassLoader()
+ .getResourceAsStream(
+ "META-INF/com.microsoft.windowsazure.properties");
+ if (stream != null) {
+ final Properties properties = new Properties();
+ properties.load(stream);
+ for (Map.Entry key : properties.entrySet()) {
+ config.setProperty(key.getKey().toString(), key.getValue());
+ }
+ }
+
+ return config;
+ }
+
+ public T create(Class service) {
+ return builder.build("", service, service, properties);
+ }
+
+ public T create(String profile, Class service) {
+ return builder.build(profile, service, service, properties);
+ }
+
+ public Builder getBuilder() {
+ return builder;
+ }
+
+ public Object getProperty(String name) {
+ return properties.get(name);
+ }
+
+ public void setProperty(String name, Object value) {
+ properties.put(name, value);
+ }
+
+ public Map getProperties() {
+ return properties;
+ }
+}
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ConfigurationException.java b/core/src/main/java/com/microsoft/windowsazure/ConfigurationException.java
similarity index 95%
rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ConfigurationException.java
rename to core/src/main/java/com/microsoft/windowsazure/ConfigurationException.java
index b1787a6663277..5ff9a673a09d8 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ConfigurationException.java
+++ b/core/src/main/java/com/microsoft/windowsazure/ConfigurationException.java
@@ -12,7 +12,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.core;
+
+package com.microsoft.windowsazure;
public class ConfigurationException extends RuntimeException {
@@ -32,5 +33,4 @@ public ConfigurationException(Throwable cause) {
public ConfigurationException(String message, Throwable cause) {
super(message, cause);
}
-
}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/Builder.java b/core/src/main/java/com/microsoft/windowsazure/core/Builder.java
new file mode 100644
index 0000000000000..b9b1607be79b4
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/Builder.java
@@ -0,0 +1,48 @@
+/**
+ * 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.core;
+
+import java.util.Map;
+
+public interface Builder {
+
+ T build(String profile, Class service, Class instance,
+ Map properties);
+
+ public interface Factory {
+ T create(String profile, Class service, Builder builder,
+ Map properties);
+ }
+
+ public interface Alteration {
+ T alter(String profile, T instance, Builder builder,
+ Map properties);
+ }
+
+ public interface Registry {
+ Registry add(Class service);
+
+ Registry add(Class service, Class implementation);
+
+ Registry add(Factory factory);
+
+ void alter(Class service, Class instance,
+ Alteration alteration);
+ }
+
+ public interface Exports {
+ void register(Registry registry);
+ }
+}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/DefaultBuilder.java b/core/src/main/java/com/microsoft/windowsazure/core/DefaultBuilder.java
new file mode 100644
index 0000000000000..a48e58d34e976
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/DefaultBuilder.java
@@ -0,0 +1,230 @@
+/**
+ * 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.core;
+
+import com.microsoft.windowsazure.ConfigurationException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+public class DefaultBuilder implements Builder, Builder.Registry {
+ private Map, Factory> factories;
+ private Map, Map, List>>> alterations;
+
+ public DefaultBuilder() {
+ factories = new HashMap, Factory>();
+ alterations = new HashMap, Map, List>>>();
+ }
+
+ public static DefaultBuilder create() {
+ DefaultBuilder builder = new DefaultBuilder();
+
+ for (Builder.Exports exports : ServiceLoader
+ .load(Builder.Exports.class)) {
+ exports.register(builder);
+ }
+
+ return builder;
+ }
+
+ void addFactory(Class service, Factory factory) {
+ factories.put(service, factory);
+ }
+
+ @Override
+ public Builder.Registry add(Class service) {
+ return add(service, service);
+ }
+
+ Constructor findInjectConstructor(Class implementation) {
+
+ Constructor withInject = null;
+ Constructor withoutInject = null;
+ int count = 0;
+
+ for (Constructor ctor : implementation.getConstructors()) {
+ if (ctor.getAnnotation(Inject.class) != null) {
+ if (withInject != null) {
+ throw new RuntimeException(
+ "Class must not have multple @Inject annotations: "
+ + implementation.getName());
+ }
+ withInject = ctor;
+ } else {
+ ++count;
+ withoutInject = ctor;
+ }
+ }
+ if (withInject != null) {
+ return withInject;
+ }
+ if (count != 1) {
+ throw new RuntimeException(
+ "Class without @Inject annotation must have one constructor: "
+ + implementation.getName());
+ }
+ return withoutInject;
+ }
+
+ @Override
+ public Builder.Registry add(Class service,
+ final Class implementation) {
+ final Constructor ctor = findInjectConstructor(implementation);
+ final Class[] parameterTypes = ctor.getParameterTypes();
+ final Annotation[][] parameterAnnotations = ctor
+ .getParameterAnnotations();
+
+ addFactory(service, new Builder.Factory() {
+ @Override
+ @SuppressWarnings("unchecked")
+ public T create(String profile, Class service,
+ Builder builder, Map properties) {
+ Object[] initializationArguments = new Object[parameterTypes.length];
+ for (int i = 0; i != parameterTypes.length; ++i) {
+
+ boolean located = false;
+
+ String named = findNamedAnnotation(parameterAnnotations[i]);
+ String fullName = dotCombine(profile, named);
+
+ boolean probeProperties = fullName != null
+ && fullName != "";
+ int startingIndex = 0;
+ while (!located && probeProperties) {
+ String nameProbe = fullName.substring(startingIndex);
+ if (!located && named != null
+ && properties.containsKey(nameProbe)) {
+ located = true;
+ if (parameterTypes[i] == String.class) {
+ initializationArguments[i] = properties
+ .get(nameProbe);
+ } else {
+ initializationArguments[i] = builder.build(fullName,
+ service, parameterTypes[i], properties);
+ }
+ } else {
+ startingIndex = fullName
+ .indexOf('.', startingIndex) + 1;
+ if (startingIndex == 0) {
+ probeProperties = false;
+ }
+ }
+ }
+
+ if (!located) {
+ located = true;
+ initializationArguments[i] = builder.build(fullName,
+ service, parameterTypes[i], properties);
+ }
+ }
+
+ try {
+ return (T) ctor.newInstance(initializationArguments);
+ } catch (InstantiationException e) {
+ throw new ConfigurationException(e);
+ } catch (IllegalAccessException e) {
+ throw new ConfigurationException(e);
+ } catch (InvocationTargetException e) {
+ throw new ConfigurationException(e);
+ }
+ }
+ });
+ return this;
+ }
+
+ protected String dotCombine(String profile, String named) {
+ boolean noProfile = profile == null || profile.isEmpty();
+ boolean noName = named == null || named.isEmpty();
+ if (noName) {
+ return profile;
+ }
+ if (noProfile) {
+ return named;
+ }
+
+ return profile + "." + named;
+ }
+
+ protected String findNamedAnnotation(Annotation[] annotations) {
+ for (Annotation annotation : annotations) {
+ if (Named.class.isAssignableFrom(annotation.getClass())) {
+ return ((Named) annotation).value();
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public Registry add(Factory factory) {
+ for (Type genericInterface : factory.getClass().getGenericInterfaces()) {
+ ParameterizedType parameterizedType = (ParameterizedType) genericInterface;
+ if (parameterizedType.getRawType().equals(Builder.Factory.class)) {
+ Type typeArgument = parameterizedType.getActualTypeArguments()[0];
+ addFactory((Class) typeArgument, factory);
+ }
+ }
+ return this;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public T build(String profile, Class service,
+ Class instanceClass, Map properties) {
+ Factory factory = (Factory) factories.get(instanceClass);
+ if (factory == null) {
+ throw new RuntimeException("Service or property not registered: "
+ + profile + " " + service.getName() + " " + instanceClass);
+ }
+ T instance = factory.create(profile, service, this, properties);
+ Map, List>> alterationMap = alterations
+ .get(service);
+ if (alterationMap != null) {
+ List> alterationList = alterationMap
+ .get(instanceClass);
+ if (alterationList != null) {
+ for (Alteration alteration : alterationList) {
+ instance = ((Alteration) alteration).alter(profile,
+ instance, this, properties);
+ }
+ }
+ }
+ return instance;
+ }
+
+ @Override
+ public void alter(Class service, Class instance,
+ Alteration alteration) {
+ if (!this.alterations.containsKey(service)) {
+ this.alterations.put(service,
+ new HashMap, List>>());
+ }
+ if (!this.alterations.get(service).containsKey(instance)) {
+ this.alterations.get(service).put(instance,
+ new ArrayList>());
+ }
+ this.alterations.get(service).get(instance).add(alteration);
+ }
+
+}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/FilterableService.java b/core/src/main/java/com/microsoft/windowsazure/core/FilterableService.java
new file mode 100644
index 0000000000000..22f360f89f60a
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/FilterableService.java
@@ -0,0 +1,28 @@
+/**
+ * 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.core;
+
+import com.microsoft.windowsazure.core.pipeline.filter.ServiceRequestFilter;
+import com.microsoft.windowsazure.core.pipeline.filter.ServiceResponseFilter;
+
+public interface FilterableService {
+ T withRequestFilterFirst(ServiceRequestFilter serviceRequestFilter);
+
+ T withRequestFilterLast(ServiceRequestFilter serviceRequestFilter);
+
+ T withResponseFilterFirst(ServiceResponseFilter serviceResponseFilter);
+
+ T withResponseFilterLast(ServiceResponseFilter serviceResponseFilter);
+}
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ISO8601DateConverter.java b/core/src/main/java/com/microsoft/windowsazure/core/ISO8601DateConverter.java
similarity index 81%
rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ISO8601DateConverter.java
rename to core/src/main/java/com/microsoft/windowsazure/core/ISO8601DateConverter.java
index 71d5bc3d4992f..1cbb0b4aaad12 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ISO8601DateConverter.java
+++ b/core/src/main/java/com/microsoft/windowsazure/core/ISO8601DateConverter.java
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.core;
+package com.microsoft.windowsazure.core;
import java.text.DateFormat;
import java.text.ParseException;
@@ -26,43 +26,46 @@
* "not quite" ISO 8601 date time conversion routines
*/
public class ISO8601DateConverter {
- // Note: because of the trailing "0000000", this is not quite ISO 8601 compatible
+ // Note: because of the trailing "0000000", this is not quite ISO 8601
+ // compatible
private static final String DATETIME_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
private static final String SHORT_DATETIME_PATTERN = "yyyy-MM-dd'T'HH:mm:ss'Z'";
private static final String DATETIME_PATTERN_NO_S = "yyyy-MM-dd'T'HH:mm'Z'";
private static final String DATETIME_PATTERN_TO_DECIMAL = "yyyy-MM-dd'T'HH:mm:ss.";
public String format(Date date) {
- DateFormat iso8601Format = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
+ DateFormat iso8601Format = new SimpleDateFormat(DATETIME_PATTERN,
+ Locale.US);
iso8601Format.setTimeZone(TimeZone.getTimeZone("GMT"));
return iso8601Format.format(date);
}
public String shortFormat(Date date) {
- DateFormat iso8601Format = new SimpleDateFormat(SHORT_DATETIME_PATTERN, Locale.US);
+ DateFormat iso8601Format = new SimpleDateFormat(SHORT_DATETIME_PATTERN,
+ Locale.US);
iso8601Format.setTimeZone(TimeZone.getTimeZone("GMT"));
return iso8601Format.format(date);
}
public Date parse(String date) throws ParseException {
- if (date == null)
+ if (date == null) {
return null;
+ }
int length = date.length();
if (length == 17) {
// [2012-01-04T23:21Z] length = 17
return parseDateFromString(date, DATETIME_PATTERN_NO_S);
- }
- else if (length == 20) {
+ } else if (length == 20) {
// [2012-01-04T23:21:59Z] length = 20
return parseDateFromString(date, SHORT_DATETIME_PATTERN);
- }
- else if (length >= 22 && length <= 28) {
+ } else if (length >= 22 && length <= 28) {
// [2012-01-04T23:21:59.1Z] length = 22
// [2012-01-04T23:21:59.1234567Z] length = 28
// Need to handle the milliseconds gently.
- Date allExceptMilliseconds = parseDateFromString(date, DATETIME_PATTERN_TO_DECIMAL);
+ Date allExceptMilliseconds = parseDateFromString(date,
+ DATETIME_PATTERN_TO_DECIMAL);
long timeWithSecondGranularity = allExceptMilliseconds.getTime();
// Decimal point is at 19
String secondDecimalString = date.substring(19, date.indexOf('Z'));
@@ -72,14 +75,16 @@ else if (length >= 22 && length <= 28) {
Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(timeInMS);
return calendar.getTime();
- }
- else {
- throw new IllegalArgumentException(String.format("Invalid Date String: %s", date));
+ } else {
+ throw new IllegalArgumentException(String.format(
+ "Invalid Date String: %s", date));
}
}
- private static Date parseDateFromString(final String value, final String pattern) throws ParseException {
- DateFormat iso8601Format = new SimpleDateFormat(pattern, Locale.US);
+ private static Date parseDateFromString(final String value,
+ final String pattern) throws ParseException {
+ final DateFormat iso8601Format = new SimpleDateFormat(pattern,
+ Locale.US);
iso8601Format.setTimeZone(TimeZone.getTimeZone("GMT"));
return iso8601Format.parse(value);
}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/OperationResponse.java b/core/src/main/java/com/microsoft/windowsazure/core/OperationResponse.java
new file mode 100644
index 0000000000000..d1777f1c93014
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/OperationResponse.java
@@ -0,0 +1,60 @@
+/**
+ * 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.core;
+
+public class OperationResponse {
+ private int httpStatusCode;
+
+ /**
+ * Gets the HTTP status code for the request.
+ *
+ * @return The HTTP status code.
+ */
+ public int getStatusCode() {
+ return this.httpStatusCode;
+ }
+
+ /**
+ * Sets the HTTP status code for the request.
+ *
+ * @param httpStatusCode
+ * The HTTP status code.
+ */
+ public void setStatusCode(int httpStatusCode) {
+ this.httpStatusCode = httpStatusCode;
+ }
+
+ private String requestId;
+
+ /**
+ * Gets the request identifier.
+ *
+ * @return The request identifier.
+ */
+ public String getRequestId() {
+ return this.requestId;
+ }
+
+ /**
+ * Sets the request identifier.
+ *
+ * @param requestId
+ * The request identifier.
+ */
+ public void setRequestId(String requestId) {
+ this.requestId = requestId;
+ }
+}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/OperationStatus.java b/core/src/main/java/com/microsoft/windowsazure/core/OperationStatus.java
new file mode 100644
index 0000000000000..4413987861275
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/OperationStatus.java
@@ -0,0 +1,39 @@
+/**
+ *
+ * Copyright (c) Microsoft and contributors. All rights reserved.
+ *
+ * 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.core;
+
+/**
+ * The status of the asynchronous request.
+ */
+public enum OperationStatus {
+ /**
+ * The asynchronous request is in progress.
+ */
+ InProgress,
+
+ /**
+ * The asynchronous request succeeded.
+ */
+ Succeeded,
+
+ /**
+ * The asynchronous request failed.
+ */
+ Failed,
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/OperationStatusResponse.java b/core/src/main/java/com/microsoft/windowsazure/core/OperationStatusResponse.java
new file mode 100644
index 0000000000000..db2ff1c194043
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/OperationStatusResponse.java
@@ -0,0 +1,171 @@
+/**
+ * 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.core;
+
+/**
+ * The response body contains the status of the specified asynchronous
+ * operation, indicating whether it has succeeded, is inprogress, or has failed.
+ * Note that this status is distinct from the HTTP status code returned for the
+ * Get Operation Status operation itself. If the asynchronous operation
+ * succeeded, the response body includes the HTTP status code for the successful
+ * request. If the asynchronous operation failed, the response body includes the
+ * HTTP status code for the failed request, and also includes error information
+ * regarding the failure.
+ */
+public class OperationStatusResponse extends OperationResponse {
+ private OperationStatusResponse.ErrorDetails error;
+
+ /**
+ * If the asynchronous operation failed, the response body includes the HTTP
+ * status code for the failed request, and also includes error information
+ * regarding the failure.
+ *
+ * @return The Error value.
+ */
+ public OperationStatusResponse.ErrorDetails getError() {
+ return this.error;
+ }
+
+ /**
+ * If the asynchronous operation failed, the response body includes the HTTP
+ * status code for the failed request, and also includes error information
+ * regarding the failure.
+ *
+ * @param errorValue
+ * The Error value.
+ */
+ public void setError(final OperationStatusResponse.ErrorDetails errorValue) {
+ this.error = errorValue;
+ }
+
+ private Integer httpStatusCode;
+
+ /**
+ * The HTTP status code for the asynchronous request.
+ *
+ * @return The HttpStatusCode value.
+ */
+ public Integer getHttpStatusCode() {
+ return this.httpStatusCode;
+ }
+
+ /**
+ * The HTTP status code for the asynchronous request.
+ *
+ * @param httpStatusCodeValue
+ * The HttpStatusCode value.
+ */
+ public void setHttpStatusCode(final Integer httpStatusCodeValue) {
+ this.httpStatusCode = httpStatusCodeValue;
+ }
+
+ private String id;
+
+ /**
+ * The request ID of the asynchronous request. This value is returned in the
+ * x-ms-request-id response header of the asynchronous request.
+ *
+ * @return The Id value.
+ */
+ public String getId() {
+ return this.id;
+ }
+
+ /**
+ * The request ID of the asynchronous request. This value is returned in the
+ * x-ms-request-id response header of the asynchronous request.
+ *
+ * @param idValue
+ * The Id value.
+ */
+ public void setId(final String idValue) {
+ this.id = idValue;
+ }
+
+ private OperationStatus status;
+
+ /**
+ * The status of the asynchronous request.
+ *
+ * @return The Status value.
+ */
+ public OperationStatus getStatus() {
+ return this.status;
+ }
+
+ /**
+ * The status of the asynchronous request.
+ *
+ * @param statusValue
+ * The Status value.
+ */
+ public void setStatus(final OperationStatus statusValue) {
+ this.status = statusValue;
+ }
+
+ /**
+ * If the asynchronous operation failed, the response body includes the HTTP
+ * status code for the failed request, and also includes error information
+ * regarding the failure.
+ */
+ public static class ErrorDetails {
+ private String code;
+
+ /**
+ * The management service error code returned if the asynchronous
+ * request failed.
+ *
+ * @return The Code value.
+ */
+ public String getCode() {
+ return this.code;
+ }
+
+ /**
+ * The management service error code returned if the asynchronous
+ * request failed.
+ *
+ * @param codeValue
+ * The Code value.
+ */
+ public void setCode(final String codeValue) {
+ this.code = codeValue;
+ }
+
+ private String message;
+
+ /**
+ * The management service error message returned if the asynchronous
+ * request failed.
+ *
+ * @return The Message value.
+ */
+ public String getMessage() {
+ return this.message;
+ }
+
+ /**
+ * The management service error message returned if the asynchronous
+ * request failed.
+ *
+ * @param messageValue
+ * The Message value.
+ */
+ public void setMessage(final String messageValue) {
+ this.message = messageValue;
+ }
+ }
+}
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/RFC1123DateAdapter.java b/core/src/main/java/com/microsoft/windowsazure/core/RFC1123DateAdapter.java
similarity index 95%
rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/RFC1123DateAdapter.java
rename to core/src/main/java/com/microsoft/windowsazure/core/RFC1123DateAdapter.java
index 559abd770daab..42796fa9d1690 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/RFC1123DateAdapter.java
+++ b/core/src/main/java/com/microsoft/windowsazure/core/RFC1123DateAdapter.java
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.core;
+package com.microsoft.windowsazure.core;
import java.util.Date;
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/RFC1123DateConverter.java b/core/src/main/java/com/microsoft/windowsazure/core/RFC1123DateConverter.java
similarity index 85%
rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/RFC1123DateConverter.java
rename to core/src/main/java/com/microsoft/windowsazure/core/RFC1123DateConverter.java
index 418a5782ba4b9..d2e2a84c66b5f 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/RFC1123DateConverter.java
+++ b/core/src/main/java/com/microsoft/windowsazure/core/RFC1123DateConverter.java
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.core;
+package com.microsoft.windowsazure.core;
import java.text.DateFormat;
import java.text.ParseException;
@@ -34,15 +34,16 @@ public String format(Date date) {
public Date parse(String date) {
try {
return getFormat().parse(date);
- }
- catch (ParseException e) {
- String msg = String.format("The value \"%s\" is not a valid RFC 1123 date.", date);
+ } catch (ParseException e) {
+ String msg = String.format(
+ "The value \"%s\" is not a valid RFC 1123 date.", date);
throw new IllegalArgumentException(msg, e);
}
}
private DateFormat getFormat() {
- DateFormat rfc1123Format = new SimpleDateFormat(RFC1123_PATTERN, Locale.US);
+ DateFormat rfc1123Format = new SimpleDateFormat(RFC1123_PATTERN,
+ Locale.US);
rfc1123Format.setTimeZone(TimeZone.getTimeZone("GMT"));
return rfc1123Format;
}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/ServiceClient.java b/core/src/main/java/com/microsoft/windowsazure/core/ServiceClient.java
new file mode 100644
index 0000000000000..d385a2757c58a
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/ServiceClient.java
@@ -0,0 +1,108 @@
+/**
+ * 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.core;
+
+import com.microsoft.windowsazure.core.pipeline.filter.ServiceRequestFilter;
+import com.microsoft.windowsazure.core.pipeline.apache.HttpRequestInterceptorAdapter;
+import com.microsoft.windowsazure.core.pipeline.filter.ServiceResponseFilter;
+import com.microsoft.windowsazure.core.pipeline.apache.HttpResponseInterceptorAdapter;
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.concurrent.ExecutorService;
+
+import org.apache.http.HttpHost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+
+public abstract class ServiceClient implements
+ FilterableService, Closeable {
+ private final ExecutorService executorService;
+
+ public ExecutorService getExecutorService() {
+ return this.executorService;
+ }
+
+ private CloseableHttpClient httpClient;
+
+ public CloseableHttpClient getHttpClient() {
+ if (this.httpClient == null) {
+ String proxyHost = System.getProperty("http.proxyHost");
+ String proxyPort = System.getProperty("http.proxyPort");
+ if ((proxyHost != null) && (proxyPort != null)) {
+ HttpHost proxy = new HttpHost(proxyHost, Integer.parseInt(proxyPort));
+ if (proxy != null) {
+ httpClientBuilder.setProxy(proxy);
+ }
+ }
+
+ this.httpClient = httpClientBuilder.build();
+ }
+
+ return this.httpClient;
+ }
+
+ private final HttpClientBuilder httpClientBuilder;
+
+ protected ServiceClient(HttpClientBuilder httpClientBuilder,
+ ExecutorService executorService) {
+ this.httpClientBuilder = httpClientBuilder;
+ this.executorService = executorService;
+ }
+
+ protected abstract TClient newInstance(HttpClientBuilder httpClientBuilder,
+ ExecutorService executorService);
+
+ @Override
+ public TClient withRequestFilterFirst(
+ ServiceRequestFilter serviceRequestFilter) {
+ httpClientBuilder
+ .addInterceptorFirst(new HttpRequestInterceptorAdapter(
+ serviceRequestFilter));
+ return this.newInstance(httpClientBuilder, executorService);
+ }
+
+ @Override
+ public TClient withRequestFilterLast(
+ ServiceRequestFilter serviceRequestFilter) {
+ httpClientBuilder.addInterceptorLast(new HttpRequestInterceptorAdapter(
+ serviceRequestFilter));
+ return this.newInstance(httpClientBuilder, executorService);
+ }
+
+ @Override
+ public TClient withResponseFilterFirst(
+ ServiceResponseFilter serviceResponseFilter) {
+ httpClientBuilder
+ .addInterceptorFirst(new HttpResponseInterceptorAdapter(
+ serviceResponseFilter));
+ return this.newInstance(httpClientBuilder, executorService);
+ }
+
+ @Override
+ public TClient withResponseFilterLast(
+ ServiceResponseFilter serviceResponseFilter) {
+ httpClientBuilder
+ .addInterceptorLast(new HttpResponseInterceptorAdapter(
+ serviceResponseFilter));
+ return this.newInstance(httpClientBuilder, executorService);
+ }
+
+ @Override
+ public void close() throws IOException {
+ if (httpClient != null) {
+ httpClient.close();
+ }
+ }
+}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/ServiceOperations.java b/core/src/main/java/com/microsoft/windowsazure/core/ServiceOperations.java
new file mode 100644
index 0000000000000..6bc4b9fe6f3b1
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/ServiceOperations.java
@@ -0,0 +1,19 @@
+/**
+ * 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.core;
+
+public interface ServiceOperations {
+ TClient getClient();
+}
\ No newline at end of file
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ServiceTimeoutException.java b/core/src/main/java/com/microsoft/windowsazure/core/ServiceTimeoutException.java
similarity index 93%
rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ServiceTimeoutException.java
rename to core/src/main/java/com/microsoft/windowsazure/core/ServiceTimeoutException.java
index 4e67f7b214622..9139a96512191 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/ServiceTimeoutException.java
+++ b/core/src/main/java/com/microsoft/windowsazure/core/ServiceTimeoutException.java
@@ -13,7 +13,9 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.core;
+package com.microsoft.windowsazure.core;
+
+import com.microsoft.windowsazure.exception.ServiceException;
/**
* Exception indicating a service operation has timed out.
@@ -39,8 +41,8 @@ public ServiceTimeoutException(String message) {
}
/**
- * Construct a ServiceTimeoutException instance with specified
- * message and cause
+ * Construct a ServiceTimeoutException instance with specified message and
+ * cause
*
* @param message
* Exception message
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/TimeSpan8601Converter.java b/core/src/main/java/com/microsoft/windowsazure/core/TimeSpan8601Converter.java
new file mode 100644
index 0000000000000..a9c5b6e760725
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/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.core;
+
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
+
+public abstract 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/core/src/main/java/com/microsoft/windowsazure/core/UserAgentFilter.java b/core/src/main/java/com/microsoft/windowsazure/core/UserAgentFilter.java
new file mode 100644
index 0000000000000..d56577de31d10
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/UserAgentFilter.java
@@ -0,0 +1,96 @@
+/**
+ * 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.core;
+
+import com.microsoft.windowsazure.core.pipeline.filter.ServiceRequestContext;
+import com.microsoft.windowsazure.core.pipeline.filter.ServiceRequestFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+/**
+ * The Class UserAgentFilter.
+ */
+public class UserAgentFilter implements ServiceRequestFilter {
+
+ /** The azure SDK product token. */
+ private static String azureSDKProductToken;
+
+ /**
+ * Instantiates a new user agent filter.
+ */
+ public UserAgentFilter() {
+ if ((azureSDKProductToken == null) || azureSDKProductToken.isEmpty()) {
+ azureSDKProductToken = createAzureSDKProductToken();
+ }
+ }
+
+ @Override
+ public void filter(ServiceRequestContext request) {
+ String userAgent;
+
+ if (request.getHeader("User-Agent") != null) {
+ String currentUserAgent = request.getHeader("User-Agent");
+ userAgent = azureSDKProductToken + " " + currentUserAgent;
+ request.removeHeader("User-Agent");
+ } else {
+ userAgent = azureSDKProductToken;
+ }
+
+ request.setHeader("User-Agent", userAgent);
+ }
+
+ /**
+ * Creates the azure SDK product token.
+ *
+ * @return the string
+ */
+ private String createAzureSDKProductToken() {
+ String version = getVersionFromResources();
+ String productToken;
+ if ((version != null) && (!version.isEmpty())) {
+ productToken = "Azure-SDK-For-Java/" + version;
+ } else {
+ productToken = "Azure-SDK-For-Java";
+ }
+
+ return productToken;
+ }
+
+ /**
+ * Gets the version of the SDK from resources.
+ *
+ * @return the version from resources
+ */
+ private String getVersionFromResources() {
+ String version = "unknown";
+ Properties properties = new Properties();
+ try {
+ InputStream inputStream = getClass()
+ .getClassLoader()
+ .getResourceAsStream(
+ "META-INF/maven/com.microsoft.windowsazure/microsoft-windowsazure-api-core/pom.properties");
+ if (inputStream != null) {
+ properties.load(inputStream);
+ version = properties.getProperty("version");
+ inputStream.close();
+ }
+ } catch (IOException e) {
+ // Do nothing
+ }
+
+ return version;
+ }
+}
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/package.html b/core/src/main/java/com/microsoft/windowsazure/core/package.html
similarity index 100%
rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/package.html
rename to core/src/main/java/com/microsoft/windowsazure/core/package.html
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/Base64StringAdapter.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/Base64StringAdapter.java
similarity index 94%
rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/Base64StringAdapter.java
rename to core/src/main/java/com/microsoft/windowsazure/core/pipeline/Base64StringAdapter.java
index f9aedb2faf946..c682da78695a1 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/Base64StringAdapter.java
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/Base64StringAdapter.java
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.core.utils.pipeline;
+package com.microsoft.windowsazure.core.pipeline;
import javax.xml.bind.annotation.adapters.XmlAdapter;
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/ConnectionStringField.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/ConnectionStringField.java
similarity index 79%
rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/ConnectionStringField.java
rename to core/src/main/java/com/microsoft/windowsazure/core/pipeline/ConnectionStringField.java
index ef773b7054655..2b98ac9305dde 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/ConnectionStringField.java
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/ConnectionStringField.java
@@ -13,21 +13,19 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.core.utils.pipeline;
+package com.microsoft.windowsazure.core.pipeline;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-
/**
- * Annotation used to mark method setters to be used
- * when the field name in the connection string isn't
- * a valid Java method name.
+ * Annotation used to mark method setters to be used when the field name in the
+ * connection string isn't a valid Java method name.
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface ConnectionStringField {
- public String name();
+ String name();
}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/PipelineHelpers.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/PipelineHelpers.java
new file mode 100644
index 0000000000000..633bbbc6609a6
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/PipelineHelpers.java
@@ -0,0 +1,156 @@
+/**
+ * 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.core.pipeline;
+
+import com.microsoft.windowsazure.core.utils.AccessConditionHeader;
+import com.microsoft.windowsazure.core.utils.AccessConditionHeaderType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.api.client.WebResource.Builder;
+
+public final class PipelineHelpers {
+ private 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)) {
+ String errorMessage = createErrorMessage(clientResponse);
+ throw new UniformInterfaceException(errorMessage, clientResponse);
+ }
+ }
+
+ public static void throwIfError(ClientResponse clientResponse) {
+ if (clientResponse.getStatus() >= 400) {
+ String errorMessage = createErrorMessage(clientResponse);
+ throw new UniformInterfaceException(errorMessage, clientResponse);
+ }
+ }
+
+ public static WebResource addOptionalQueryParam(WebResource webResource,
+ String key, Object value) {
+ if (value != null) {
+ webResource = webResource.queryParam(key, value.toString());
+ }
+ return webResource;
+ }
+
+ public static WebResource addOptionalQueryParam(WebResource webResource,
+ String key, int value, int defaultValue) {
+ if (value != defaultValue) {
+ webResource = webResource.queryParam(key, Integer.toString(value));
+ }
+ return webResource;
+ }
+
+ public static Builder addOptionalHeader(Builder builder, String name,
+ Object value) {
+ if (value != null) {
+ builder = builder.header(name, value);
+ }
+ return builder;
+ }
+
+ public static Builder addOptionalMetadataHeader(Builder builder,
+ Map metadata) {
+ for (Entry entry : metadata.entrySet()) {
+ builder = builder.header("x-ms-meta-" + entry.getKey(),
+ entry.getValue());
+ }
+ return builder;
+ }
+
+ public static Builder addOptionalRangeHeader(Builder builder,
+ Long rangeStart, Long rangeEnd) {
+ if (rangeStart != null) {
+ String range = rangeStart.toString() + "-";
+ if (rangeEnd != null) {
+ range += rangeEnd.toString();
+ }
+ builder = addOptionalHeader(builder, "Range", "bytes=" + range);
+ }
+ return builder;
+ }
+
+ public static Builder addOptionalAccessConditionHeader(Builder builder,
+ AccessConditionHeader accessCondition) {
+ if (accessCondition != null) {
+ if (accessCondition.getHeader() != AccessConditionHeaderType.NONE) {
+ builder = addOptionalHeader(builder, accessCondition
+ .getHeader().toString(), accessCondition.getValue());
+ }
+ }
+ return builder;
+ }
+
+ public static Builder addOptionalSourceAccessConditionHeader(
+ Builder builder, AccessConditionHeader accessCondition) {
+ if (accessCondition != null) {
+ if (accessCondition.getHeader() != AccessConditionHeaderType.NONE) {
+ String headerName;
+ switch (accessCondition.getHeader()) {
+ case IF_MATCH:
+ headerName = "x-ms-source-if-match";
+ break;
+ case IF_UNMODIFIED_SINCE:
+ headerName = "x-ms-source-if-unmodified-since";
+ break;
+ case IF_MODIFIED_SINCE:
+ headerName = "x-ms-source-if-modified-since";
+ break;
+ case IF_NONE_MATCH:
+ headerName = "x-ms-source-if-none-match";
+ break;
+ default:
+ headerName = "";
+ }
+ builder = addOptionalHeader(builder, headerName,
+ accessCondition.getValue());
+ }
+ }
+ return builder;
+ }
+
+ public static HashMap getMetadataFromHeaders(
+ ClientResponse response) {
+ HashMap metadata = new HashMap();
+ for (Entry> entry : response.getHeaders()
+ .entrySet()) {
+ if (entry.getKey().startsWith("x-ms-meta-")) {
+ String name = entry.getKey().substring("x-ms-meta-".length());
+ String value = entry.getValue().get(0);
+ metadata.put(name, value);
+ }
+ }
+ return metadata;
+ }
+
+}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/ApacheConfigSettings.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/ApacheConfigSettings.java
new file mode 100644
index 0000000000000..9d2a9115d52fc
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/ApacheConfigSettings.java
@@ -0,0 +1,84 @@
+/**
+ * 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.core.pipeline.apache;
+
+import java.util.Map;
+import org.apache.http.HttpHost;
+import org.apache.http.client.HttpRequestRetryHandler;
+import org.apache.http.conn.HttpClientConnectionManager;
+import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
+import org.apache.http.impl.client.HttpClientBuilder;
+
+public class ApacheConfigSettings {
+ private final String profile;
+ private final Map properties;
+
+ public ApacheConfigSettings(String profile, Map properties) {
+ this.profile = profile;
+ this.properties = properties;
+ }
+
+ /**
+ * Update the given {@link HttpClientBuilder} object with the appropriate
+ * settings from configuration.
+ *
+ * @param httpClientBuilder
+ * The object to update.
+ * @return The updates httpClientBuilder
+ */
+ public HttpClientBuilder applyConfig(HttpClientBuilder httpClientBuilder) {
+ if (properties
+ .containsKey(profile
+ + ApacheConfigurationProperties.PROPERTY_SSL_CONNECTION_SOCKET_FACTORY)) {
+ httpClientBuilder
+ .setSSLSocketFactory((LayeredConnectionSocketFactory) properties
+ .get(profile
+ + ApacheConfigurationProperties.PROPERTY_SSL_CONNECTION_SOCKET_FACTORY));
+ }
+
+ if (properties.containsKey(profile
+ + ApacheConfigurationProperties.PROPERTY_CONNECTION_MANAGER)) {
+ httpClientBuilder
+ .setConnectionManager((HttpClientConnectionManager) properties
+ .get(profile
+ + ApacheConfigurationProperties.PROPERTY_CONNECTION_MANAGER));
+ }
+
+ if (properties.containsKey(profile
+ + ApacheConfigurationProperties.PROPERTY_PROXY_URI)) {
+ httpClientBuilder
+ .setProxy(new HttpHost((String) properties.get(profile
+ + ApacheConfigurationProperties.PROPERTY_PROXY_URI)));
+ }
+
+ if (properties.containsKey(profile
+ + ApacheConfigurationProperties.PROPERTY_RETRY_HANDLER)) {
+ httpClientBuilder
+ .setRetryHandler((HttpRequestRetryHandler) properties
+ .get(profile
+ + ApacheConfigurationProperties.PROPERTY_RETRY_HANDLER));
+ }
+
+ if (properties.containsKey(profile
+ + ApacheConfigurationProperties.PROPERTY_HTTP_CLIENT_BUILDER)) {
+ return (HttpClientBuilder) properties
+ .get(profile
+ + ApacheConfigurationProperties.PROPERTY_HTTP_CLIENT_BUILDER);
+ }
+
+ return httpClientBuilder;
+ }
+}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/ApacheConfigurationProperties.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/ApacheConfigurationProperties.java
new file mode 100644
index 0000000000000..9147e475cd6a6
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/ApacheConfigurationProperties.java
@@ -0,0 +1,28 @@
+/**
+ * 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.core.pipeline.apache;
+
+public abstract class ApacheConfigurationProperties {
+ public static final String PROPERTY_SSL_CONNECTION_SOCKET_FACTORY = "com.microsoft.windowsazure.Configuration.sslConnectionSocketFactory";
+
+ public static final String PROPERTY_CONNECTION_MANAGER = "com.microsoft.windowsazure.Configuration.connectionManager";
+
+ public static final String PROPERTY_PROXY_URI = "com.microsoft.windowsazure.Configuration.proxy";
+
+ public static final String PROPERTY_RETRY_HANDLER = "com.microsoft.windowsazure.Configuration.retryHandler";
+
+ public static final String PROPERTY_HTTP_CLIENT_BUILDER = "com.microsoft.windowsazure.Configuration.httpClientBuilder";
+}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/CustomHttpDelete.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/CustomHttpDelete.java
new file mode 100644
index 0000000000000..8d595175422df
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/CustomHttpDelete.java
@@ -0,0 +1,29 @@
+/**
+ * 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.core.pipeline.apache;
+
+import org.apache.http.client.methods.HttpPost;
+
+public class CustomHttpDelete extends HttpPost {
+ public CustomHttpDelete(String url) {
+ super(url);
+ }
+
+ @Override
+ public String getMethod() {
+ return "DELETE";
+ }
+}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/Exports.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/Exports.java
new file mode 100644
index 0000000000000..c9b762ccde296
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/Exports.java
@@ -0,0 +1,71 @@
+/**
+ * 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.core.pipeline.apache;
+
+import java.util.Map;
+
+import com.microsoft.windowsazure.core.Builder;
+import com.microsoft.windowsazure.core.Builder.Registry;
+import com.microsoft.windowsazure.credentials.CloudCredentials;
+import com.microsoft.windowsazure.management.configuration.ManagementConfiguration;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+
+public class Exports implements Builder.Exports {
+
+ @Override
+ public void register(Registry registry) {
+ registry.add(new Builder.Factory() {
+ @Override
+ public ExecutorService create(String profile, Class service,
+ Builder builder, Map properties) {
+
+ return Executors.newCachedThreadPool();
+ }
+ });
+
+ registry.add(new Builder.Factory() {
+ @Override
+ public ApacheConfigSettings create(String profile,
+ Class service, Builder builder,
+ Map properties) {
+
+ if (properties
+ .containsKey(ManagementConfiguration.SUBSCRIPTION_CLOUD_CREDENTIALS)) {
+ CloudCredentials cloudCredentials = (CloudCredentials) properties
+ .get(ManagementConfiguration.SUBSCRIPTION_CLOUD_CREDENTIALS);
+ cloudCredentials.applyConfig(profile, properties);
+ }
+
+ return new ApacheConfigSettings(profile, properties);
+ }
+ });
+
+ registry.add(new Builder.Factory() {
+ @Override
+ public HttpClientBuilder create(String profile,
+ Class service, Builder builder,
+ Map properties) {
+
+ HttpClientBuilder httpClientBuilder = HttpClients.custom();
+ ApacheConfigSettings settings = builder.build(profile, service,
+ ApacheConfigSettings.class, properties);
+ return settings.applyConfig(httpClientBuilder);
+ }
+ });
+ }
+}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/HttpRequestInterceptorAdapter.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/HttpRequestInterceptorAdapter.java
new file mode 100644
index 0000000000000..cd20f3e684988
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/HttpRequestInterceptorAdapter.java
@@ -0,0 +1,33 @@
+/**
+ * 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.core.pipeline.apache;
+
+import com.microsoft.windowsazure.core.pipeline.filter.ServiceRequestFilter;
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpRequestInterceptor;
+import org.apache.http.protocol.HttpContext;
+
+public class HttpRequestInterceptorAdapter implements HttpRequestInterceptor {
+ private ServiceRequestFilter filter;
+
+ public HttpRequestInterceptorAdapter(ServiceRequestFilter filter) {
+ this.filter = filter;
+ }
+
+ @Override
+ public void process(HttpRequest request, HttpContext context) {
+ filter.filter(new HttpServiceRequestContext(request, context));
+ }
+}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/HttpResponseInterceptorAdapter.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/HttpResponseInterceptorAdapter.java
new file mode 100644
index 0000000000000..7687f381b4413
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/HttpResponseInterceptorAdapter.java
@@ -0,0 +1,33 @@
+/**
+ * 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.core.pipeline.apache;
+
+import com.microsoft.windowsazure.core.pipeline.filter.ServiceResponseFilter;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpResponseInterceptor;
+import org.apache.http.protocol.HttpContext;
+
+public class HttpResponseInterceptorAdapter implements HttpResponseInterceptor {
+ private ServiceResponseFilter filter;
+
+ public HttpResponseInterceptorAdapter(ServiceResponseFilter filter) {
+ this.filter = filter;
+ }
+
+ @Override
+ public void process(HttpResponse response, HttpContext context) {
+ filter.filter(null, new HttpServiceResponseContext(response, context));
+ }
+}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/HttpServiceRequestContext.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/HttpServiceRequestContext.java
new file mode 100644
index 0000000000000..47c358f1a58b0
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/HttpServiceRequestContext.java
@@ -0,0 +1,95 @@
+/**
+ * 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.core.pipeline.apache;
+
+import com.microsoft.windowsazure.core.pipeline.filter.ServiceRequestContext;
+import java.net.URI;
+import java.net.URISyntaxException;
+import org.apache.http.Header;
+import org.apache.http.HttpRequest;
+import org.apache.http.protocol.HttpContext;
+
+public class HttpServiceRequestContext implements ServiceRequestContext {
+ private final HttpRequest clientRequest;
+ private final HttpContext httpContext;
+
+ public HttpServiceRequestContext(HttpRequest clientRequest,
+ HttpContext httpContext) {
+ this.clientRequest = clientRequest;
+ this.httpContext = httpContext;
+ }
+
+ @Override
+ public Object getProperty(final String name) {
+ return httpContext.getAttribute(name);
+ }
+
+ @Override
+ public void setProperty(final String name, final Object value) {
+ httpContext.setAttribute(name, value);
+ }
+
+ @Override
+ public URI getURI() {
+ try {
+ return new URI(clientRequest.getRequestLine().getUri());
+ } catch (URISyntaxException e) {
+ return null;
+ }
+ }
+
+ @Override
+ public void setURI(final URI uri) {
+ // Do nothing. not supported
+ }
+
+ @Override
+ public String getMethod() {
+ return clientRequest.getRequestLine().getMethod();
+ }
+
+ @Override
+ public void setMethod(String method) {
+ // Do nothing. not supported
+ }
+
+ @Override
+ public Object getEntity() {
+ // Do nothing. not supported
+ return null;
+ }
+
+ @Override
+ public void setEntity(final Object entity) {
+ // Do nothing. not supported
+ }
+
+ @Override
+ public String getHeader(final String name) {
+ final Header first = clientRequest.getFirstHeader(name);
+ return first != null ? first.getValue() : null;
+ }
+
+ @Override
+ public void setHeader(final String name, final String value) {
+ clientRequest.setHeader(name, value);
+ }
+
+ @Override
+ public void removeHeader(final String name) {
+ clientRequest.removeHeaders(name);
+ }
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/HttpServiceResponseContext.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/HttpServiceResponseContext.java
new file mode 100644
index 0000000000000..35238d3b048a2
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/HttpServiceResponseContext.java
@@ -0,0 +1,96 @@
+/**
+ * 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.core.pipeline.apache;
+
+import com.microsoft.windowsazure.core.pipeline.filter.ServiceResponseContext;
+import java.io.IOException;
+import java.io.InputStream;
+import org.apache.http.Header;
+import org.apache.http.HttpResponse;
+import org.apache.http.entity.InputStreamEntity;
+import org.apache.http.protocol.HttpContext;
+
+public class HttpServiceResponseContext implements ServiceResponseContext {
+ private HttpResponse clientResponse;
+ private HttpContext httpContext;
+
+ public HttpServiceResponseContext(HttpResponse clientResponse,
+ HttpContext httpContext) {
+ this.clientResponse = clientResponse;
+ this.httpContext = httpContext;
+ }
+
+ @Override
+ public Object getProperty(String name) {
+ return httpContext.getAttribute(name);
+ }
+
+ @Override
+ public void setProperty(String name, Object value) {
+ httpContext.setAttribute(name, value);
+ }
+
+ @Override
+ public int getStatus() {
+ return clientResponse.getStatusLine().getStatusCode();
+ }
+
+ @Override
+ public void setStatus(int status) {
+ clientResponse.setStatusCode(status);
+ }
+
+ @Override
+ public boolean hasEntity() {
+ return clientResponse.getEntity() != null;
+ }
+
+ @Override
+ public String getHeader(String name) {
+ Header first = clientResponse.getFirstHeader(name);
+ if (first != null) {
+ return first.getValue();
+ }
+
+ return null;
+ }
+
+ @Override
+ public void setHeader(String name, String value) {
+ clientResponse.setHeader(name, value);
+ }
+
+ @Override
+ public void removeHeader(String name) {
+ clientResponse.removeHeaders(name);
+ }
+
+ @Override
+ public InputStream getEntityInputStream() {
+ try {
+ return clientResponse.getEntity().getContent();
+ } catch (IOException e) {
+ return null;
+ } catch (IllegalStateException e) {
+ return null;
+ }
+ }
+
+ @Override
+ public void setEntityInputStream(InputStream entity) {
+ clientResponse.setEntity(new InputStreamEntity(entity));
+ }
+}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/package.html b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/package.html
new file mode 100644
index 0000000000000..513ca5833c7a6
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/apache/package.html
@@ -0,0 +1,5 @@
+
+
+This package contains the core classes across difference services.
+
+
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/filter/ServiceRequestContext.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/filter/ServiceRequestContext.java
new file mode 100644
index 0000000000000..0d8d8ebd4565d
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/filter/ServiceRequestContext.java
@@ -0,0 +1,42 @@
+/**
+ * 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.core.pipeline.filter;
+
+import java.net.URI;
+
+public interface ServiceRequestContext {
+ String getMethod();
+
+ void setMethod(String method);
+
+ URI getURI();
+
+ void setURI(URI uri);
+
+ String getHeader(String name);
+
+ void setHeader(String name, String value);
+
+ void removeHeader(String name);
+
+ Object getEntity();
+
+ void setEntity(Object entity);
+
+ Object getProperty(String name);
+
+ void setProperty(String name, Object value);
+}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/filter/ServiceRequestFilter.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/filter/ServiceRequestFilter.java
new file mode 100644
index 0000000000000..8963e8710492c
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/filter/ServiceRequestFilter.java
@@ -0,0 +1,20 @@
+/**
+ * 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.core.pipeline.filter;
+
+public interface ServiceRequestFilter {
+ void filter(ServiceRequestContext request);
+}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/filter/ServiceResponseContext.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/filter/ServiceResponseContext.java
new file mode 100644
index 0000000000000..990d6d0defd73
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/filter/ServiceResponseContext.java
@@ -0,0 +1,40 @@
+/**
+ * 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.core.pipeline.filter;
+
+import java.io.InputStream;
+
+public interface ServiceResponseContext {
+ int getStatus();
+
+ void setStatus(int status);
+
+ String getHeader(String name);
+
+ void setHeader(String name, String value);
+
+ void removeHeader(String name);
+
+ boolean hasEntity();
+
+ InputStream getEntityInputStream();
+
+ void setEntityInputStream(InputStream entity);
+
+ Object getProperty(String name);
+
+ void setProperty(String name, Object value);
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/filter/ServiceResponseFilter.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/filter/ServiceResponseFilter.java
new file mode 100644
index 0000000000000..38c0135f8b03c
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/filter/ServiceResponseFilter.java
@@ -0,0 +1,20 @@
+/**
+ * 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.core.pipeline.filter;
+
+public interface ServiceResponseFilter {
+ void filter(ServiceRequestContext request, ServiceResponseContext response);
+}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/filter/package.html b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/filter/package.html
new file mode 100644
index 0000000000000..513ca5833c7a6
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/filter/package.html
@@ -0,0 +1,5 @@
+
+
+This package contains the core classes across difference services.
+
+
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/ClientConfigSettings.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/ClientConfigSettings.java
similarity index 89%
rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/ClientConfigSettings.java
rename to core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/ClientConfigSettings.java
index b7421b9ed6564..e3764cf212d51 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/ClientConfigSettings.java
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/ClientConfigSettings.java
@@ -13,14 +13,14 @@
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.core.utils.pipeline;
+package com.microsoft.windowsazure.core.pipeline.jersey;
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.config.ClientConfig;
import com.sun.jersey.api.client.filter.LoggingFilter;
/**
- * Class used for injecting timeout settings into the various places that need it.
+ * Class used for injecting settings into the various places that need it.
*
*/
public class ClientConfigSettings {
@@ -41,8 +41,7 @@ public ClientConfigSettings() {
}
/**
- * Construct a {@link ClientConfigSettings} object wit the given
- * settings.
+ * Construct a {@link ClientConfigSettings} object wit the given settings.
*
* @param connectTimeout
* Connection timeout in milliseconds
@@ -51,7 +50,8 @@ public ClientConfigSettings() {
* @param shouldLog
* if true, add logging filter to clients.
*/
- public ClientConfigSettings(Object connectTimeout, Object readTimeout, boolean shouldLog) {
+ public ClientConfigSettings(Object connectTimeout, Object readTimeout,
+ boolean shouldLog) {
this.connectTimeout = getTimeout(connectTimeout);
this.readTimeout = getTimeout(readTimeout);
this.shouldLog = shouldLog;
@@ -65,13 +65,15 @@ public ClientConfigSettings(Object connectTimeout, Object readTimeout, boolean s
* object to update.
*/
public void applyConfig(ClientConfig clientConfig) {
- clientConfig.getProperties().put(ClientConfig.PROPERTY_CONNECT_TIMEOUT, connectTimeout);
- clientConfig.getProperties().put(ClientConfig.PROPERTY_READ_TIMEOUT, readTimeout);
+ clientConfig.getProperties().put(ClientConfig.PROPERTY_CONNECT_TIMEOUT,
+ connectTimeout);
+ clientConfig.getProperties().put(ClientConfig.PROPERTY_READ_TIMEOUT,
+ readTimeout);
}
/**
- * Update the given {@link client} object with the appropriate settings
- * from configuration.
+ * Update the given {@link client} object with the appropriate settings from
+ * configuration.
*
* @param client
*/
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/ClientFilterAdapter.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/ClientFilterAdapter.java
new file mode 100644
index 0000000000000..a6ef01ea4f2f6
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/ClientFilterAdapter.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.core.pipeline.jersey;
+
+import com.microsoft.windowsazure.core.pipeline.filter.ServiceRequestContext;
+import com.microsoft.windowsazure.core.pipeline.filter.ServiceResponseContext;
+
+import com.sun.jersey.api.client.ClientHandlerException;
+import com.sun.jersey.api.client.ClientRequest;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.filter.ClientFilter;
+
+public class ClientFilterAdapter extends ClientFilter {
+ private ServiceFilter filter;
+
+ public ClientFilterAdapter(ServiceFilter filter) {
+ this.filter = filter;
+ }
+
+ @Override
+ public ClientResponse handle(ClientRequest clientRequest) {
+
+ final ClientRequest cr = clientRequest;
+ try {
+ ServiceResponseContext resp = filter.handle(
+ new JerseyServiceRequestContext(clientRequest),
+ new ServiceFilter.Next() {
+ @Override
+ public ServiceResponseContext handle(
+ ServiceRequestContext request) {
+ return new JerseyServiceResponseContext(getNext()
+ .handle(cr));
+ }
+ });
+
+ return ((JerseyServiceResponseContext) resp).getClientResponse();
+ } catch (Exception e) {
+ throw new ClientHandlerException(e);
+ }
+ }
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/ClientFilterRequestAdapter.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/ClientFilterRequestAdapter.java
new file mode 100644
index 0000000000000..501adc9200b15
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/ClientFilterRequestAdapter.java
@@ -0,0 +1,35 @@
+/**
+ * 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.core.pipeline.jersey;
+
+import com.microsoft.windowsazure.core.pipeline.filter.ServiceRequestFilter;
+
+import com.sun.jersey.api.client.ClientRequest;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.filter.ClientFilter;
+
+public class ClientFilterRequestAdapter extends ClientFilter {
+ private ServiceRequestFilter filter;
+
+ public ClientFilterRequestAdapter(ServiceRequestFilter filter) {
+ this.filter = filter;
+ }
+
+ @Override
+ public ClientResponse handle(ClientRequest clientRequest) {
+ filter.filter(new JerseyServiceRequestContext(clientRequest));
+ return getNext().handle(clientRequest);
+ }
+}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/ClientFilterResponseAdapter.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/ClientFilterResponseAdapter.java
new file mode 100644
index 0000000000000..41f010f8ae7ae
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/ClientFilterResponseAdapter.java
@@ -0,0 +1,37 @@
+/**
+ * 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.core.pipeline.jersey;
+
+import com.microsoft.windowsazure.core.pipeline.filter.ServiceResponseFilter;
+
+import com.sun.jersey.api.client.ClientRequest;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.filter.ClientFilter;
+
+public class ClientFilterResponseAdapter extends ClientFilter {
+ private ServiceResponseFilter filter;
+
+ public ClientFilterResponseAdapter(ServiceResponseFilter filter) {
+ this.filter = filter;
+ }
+
+ @Override
+ public ClientResponse handle(ClientRequest clientRequest) {
+ ClientResponse clientResponse = getNext().handle(clientRequest);
+ filter.filter(new JerseyServiceRequestContext(clientRequest),
+ new JerseyServiceResponseContext(clientResponse));
+ return clientResponse;
+ }
+}
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/EntityStreamingListener.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/EntityStreamingListener.java
similarity index 81%
rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/EntityStreamingListener.java
rename to core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/EntityStreamingListener.java
index f0a2b98cfe684..ddb15c74edae5 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/EntityStreamingListener.java
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/EntityStreamingListener.java
@@ -12,14 +12,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.core.utils.pipeline;
+package com.microsoft.windowsazure.core.pipeline.jersey;
import com.sun.jersey.api.client.ClientRequest;
public interface EntityStreamingListener {
/**
- * This method is called just before the entity is streamed to the underlying connection. This is the last chance
- * for filters to inspect and modify the headers of the client request if necessary.
+ * This method is called just before the entity is streamed to the
+ * underlying connection. This is the last chance for filters to inspect and
+ * modify the headers of the client request if necessary.
*
* @param clientRequest
* The client request
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/ExponentialRetryPolicy.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/ExponentialRetryPolicy.java
new file mode 100644
index 0000000000000..883f6c905167c
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/ExponentialRetryPolicy.java
@@ -0,0 +1,80 @@
+/**
+ * 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.core.pipeline.jersey;
+
+import com.microsoft.windowsazure.core.pipeline.filter.ServiceResponseContext;
+import java.util.Arrays;
+import java.util.Random;
+
+public class ExponentialRetryPolicy extends RetryPolicy {
+ private final int deltaBackoffIntervalInMs;
+ private final int maximumAttempts;
+ private final Random randRef = new Random();
+ private final int resolvedMaxBackoff = DEFAULT_MAX_BACKOFF;
+ private final int resolvedMinBackoff = DEFAULT_MIN_BACKOFF;
+ private final int[] retryableStatusCodes;
+
+ public ExponentialRetryPolicy(int[] retryableStatusCodes) {
+ this(DEFAULT_CLIENT_BACKOFF, DEFAULT_CLIENT_RETRY_COUNT,
+ retryableStatusCodes);
+ }
+
+ public ExponentialRetryPolicy(int deltaBackoff, int maximumAttempts,
+ int[] retryableStatusCodes) {
+ this.deltaBackoffIntervalInMs = deltaBackoff;
+ this.maximumAttempts = maximumAttempts;
+ this.retryableStatusCodes = Arrays.copyOf(retryableStatusCodes,
+ retryableStatusCodes.length);
+ Arrays.sort(this.retryableStatusCodes);
+ }
+
+ @Override
+ public boolean shouldRetry(int retryCount, ServiceResponseContext response,
+ Exception error) {
+ if (response == null) {
+ return false;
+ }
+
+ if (retryCount >= this.maximumAttempts) {
+ return false;
+ }
+
+ // Don't retry if not retryable status code
+ if (Arrays
+ .binarySearch(this.retryableStatusCodes, response.getStatus()) < 0) {
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int calculateBackoff(int currentRetryCount,
+ ServiceResponseContext response, Exception error) {
+ // Calculate backoff Interval between 80% and 120% of the desired
+ // backoff, multiply by 2^n -1 for
+ // exponential
+ int incrementDelta = (int) (Math.pow(2, currentRetryCount) - 1);
+ int boundedRandDelta = (int) (this.deltaBackoffIntervalInMs * 0.8)
+ + this.randRef
+ .nextInt((int) (this.deltaBackoffIntervalInMs * 1.2)
+ - (int) (this.deltaBackoffIntervalInMs * 0.8));
+ incrementDelta *= boundedRandDelta;
+
+ // Enforce max / min backoffs
+ return Math.min(this.resolvedMinBackoff + incrementDelta,
+ this.resolvedMaxBackoff);
+ }
+}
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/Exports.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/Exports.java
new file mode 100644
index 0000000000000..78368186a30d2
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/Exports.java
@@ -0,0 +1,94 @@
+/**
+ * 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.core.pipeline.jersey;
+
+import com.microsoft.windowsazure.Configuration;
+import static com.microsoft.windowsazure.core.utils.ExportUtils.getPropertyIfExists;
+
+import java.util.Map;
+
+import com.microsoft.windowsazure.core.Builder;
+import com.microsoft.windowsazure.core.Builder.Registry;
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.config.ClientConfig;
+import com.sun.jersey.api.client.config.DefaultClientConfig;
+
+public class Exports implements Builder.Exports {
+
+ @Override
+ public void register(Registry registry) {
+ registry.add(new Builder.Factory() {
+ @Override
+ public ClientConfig create(String profile, Class service,
+ Builder builder, Map properties) {
+ ClientConfig clientConfig = new DefaultClientConfig();
+ ClientConfigSettings settings = builder.build(profile, service,
+ ClientConfigSettings.class, properties);
+ settings.applyConfig(clientConfig);
+ return clientConfig;
+ }
+ });
+
+ registry.add(new Builder.Factory() {
+
+ @Override
+ public ClientConfigSettings create(String profile,
+ Class service, Builder builder,
+ Map properties) {
+ Object connectTimeout = getPropertyIfExists(profile,
+ properties, Configuration.PROPERTY_CONNECT_TIMEOUT);
+ Object readTimeout = getPropertyIfExists(profile, properties,
+ Configuration.PROPERTY_READ_TIMEOUT);
+
+ return new ClientConfigSettings(
+ connectTimeout,
+ readTimeout,
+ getPropertyIfExists(profile, properties,
+ Configuration.PROPERTY_LOG_HTTP_REQUESTS) != null);
+ }
+
+ });
+
+ registry.add(new Builder.Factory() {
+ @Override
+ public Client create(String profile, Class service,
+ Builder builder, Map properties) {
+ ClientConfig clientConfig = builder.build(profile, service,
+ ClientConfig.class, properties);
+ ClientConfigSettings settings = builder.build(profile, service,
+ ClientConfigSettings.class, properties);
+ Client client = Client.create(clientConfig);
+ settings.applyConfig(client);
+ return client;
+ }
+ });
+
+ registry.add(new Builder.Factory() {
+ @Override
+ public HttpURLConnectionClient create(String profile,
+ Class service, Builder builder,
+ Map properties) {
+ ClientConfig clientConfig = builder.build(profile, service,
+ ClientConfig.class, properties);
+ ClientConfigSettings settings = builder.build(profile, service,
+ ClientConfigSettings.class, properties);
+ HttpURLConnectionClient client = HttpURLConnectionClient
+ .create(clientConfig);
+ settings.applyConfig(client);
+ return client;
+ }
+ });
+ }
+}
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/HttpURLConnectionClient.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/HttpURLConnectionClient.java
similarity index 88%
rename from microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/HttpURLConnectionClient.java
rename to core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/HttpURLConnectionClient.java
index a5751d7480b5f..8900f630db74c 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/utils/pipeline/HttpURLConnectionClient.java
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/HttpURLConnectionClient.java
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.microsoft.windowsazure.services.core.utils.pipeline;
+package com.microsoft.windowsazure.core.pipeline.jersey;
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.config.ClientConfig;
@@ -20,13 +20,15 @@
public class HttpURLConnectionClient extends Client {
private final HttpURLConnectionClientHandler rootHandler;
- public HttpURLConnectionClient(HttpURLConnectionClientHandler handler, ClientConfig config) {
+ public HttpURLConnectionClient(HttpURLConnectionClientHandler handler,
+ ClientConfig config) {
super(handler, config);
this.rootHandler = handler;
}
public static HttpURLConnectionClient create(ClientConfig config) {
- return new HttpURLConnectionClient(new HttpURLConnectionClientHandler(config), config);
+ return new HttpURLConnectionClient(new HttpURLConnectionClientHandler(
+ config), config);
}
public HttpURLConnectionClientHandler getRootHandler() {
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/HttpURLConnectionClientHandler.java b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/HttpURLConnectionClientHandler.java
new file mode 100644
index 0000000000000..54fb5967c334a
--- /dev/null
+++ b/core/src/main/java/com/microsoft/windowsazure/core/pipeline/jersey/HttpURLConnectionClientHandler.java
@@ -0,0 +1,357 @@
+/**
+ * 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.core.pipeline.jersey;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.core.MultivaluedMap;
+
+import com.microsoft.windowsazure.core.utils.CommaStringBuilder;
+import com.sun.jersey.api.client.ClientHandlerException;
+import com.sun.jersey.api.client.ClientRequest;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.CommittingOutputStream;
+import com.sun.jersey.api.client.TerminatingClientHandler;
+import com.sun.jersey.api.client.config.ClientConfig;
+import com.sun.jersey.core.header.InBoundHeaders;
+
+public class HttpURLConnectionClientHandler extends TerminatingClientHandler {
+
+ private final int connectionTimeoutMillis;
+ private final int readTimeoutMillis;
+
+ public HttpURLConnectionClientHandler(ClientConfig clientConfig) {
+ connectionTimeoutMillis = readTimeoutFromConfig(clientConfig,
+ ClientConfig.PROPERTY_CONNECT_TIMEOUT);
+ readTimeoutMillis = readTimeoutFromConfig(clientConfig,
+ ClientConfig.PROPERTY_READ_TIMEOUT);
+ }
+
+ private static int readTimeoutFromConfig(ClientConfig config,
+ String propertyName) {
+ Integer property = (Integer) config.getProperty(propertyName);
+ if (property != null) {
+ return property.intValue();
+ }
+ throw new IllegalArgumentException(propertyName);
+ }
+
+ /**
+ * Empty "no-op" listener if none registered
+ */
+ private static final EntityStreamingListener EMPTY_STREAMING_LISTENER = new EntityStreamingListener() {
+ @Override
+ public void onBeforeStreamingEntity(ClientRequest clientRequest) {
+ }
+ };
+
+ /**
+ * OutputStream used for buffering entity body when "Content-Length" is not
+ * known in advance.
+ */
+ private final class BufferingOutputStream extends OutputStream {
+ private final ByteArrayOutputStream outputStream;
+ private final HttpURLConnection urlConnection;
+ private final ClientRequest clientRequest;
+ private final EntityStreamingListener entityStreamingListener;
+ private boolean closed;
+
+ private BufferingOutputStream(HttpURLConnection urlConnection,
+ ClientRequest clientRequest,
+ EntityStreamingListener entityStreamingListener) {
+ this.outputStream = new ByteArrayOutputStream();
+ this.urlConnection = urlConnection;
+ this.clientRequest = clientRequest;
+ this.entityStreamingListener = entityStreamingListener;
+ }
+
+ @Override
+ public void close() throws IOException {
+ outputStream.close();
+
+ if (!closed) {
+ closed = true;
+
+ // Give the listener a last change to modify headers now that
+ // the content length is known
+ setContentLengthHeader(clientRequest, outputStream.size());
+ entityStreamingListener.onBeforeStreamingEntity(clientRequest);
+
+ // Write headers, then entity to the http connection.
+ setURLConnectionHeaders(clientRequest.getHeaders(),
+ urlConnection);
+
+ // Since we buffered the entity and we know the content size, we
+ // might as well
+ // use the "fixed length" streaming mode of HttpURLConnection to
+ // stream
+ // the buffer directly.
+ urlConnection.setFixedLengthStreamingMode(outputStream.size());
+ OutputStream httpOutputStream = urlConnection.getOutputStream();
+ outputStream.writeTo(httpOutputStream);
+ httpOutputStream.flush();
+ httpOutputStream.close();
+ }
+ }
+
+ @Override
+ public void flush() throws IOException {
+ outputStream.flush();
+ }
+
+ @Override
+ public void write(byte[] b, int off, int len) {
+ outputStream.write(b, off, len);
+ }
+
+ @Override
+ public void write(byte[] b) throws IOException {
+ outputStream.write(b);
+ }
+
+ @Override
+ public void write(int b) {
+ outputStream.write(b);
+ }
+ }
+
+ /**
+ * OutputStream used for directly streaming entity to url connection stream.
+ * Headers are written just before sending the first bytes to the output
+ * stream.
+ */
+ private final class StreamingOutputStream extends CommittingOutputStream {
+ private final HttpURLConnection urlConnection;
+ private final ClientRequest clientRequest;
+
+ private StreamingOutputStream(HttpURLConnection urlConnection,
+ ClientRequest clientRequest) {
+ this.urlConnection = urlConnection;
+ this.clientRequest = clientRequest;
+ }
+
+ @Override
+ protected OutputStream getOutputStream() throws IOException {
+ return urlConnection.getOutputStream();
+ }
+
+ @Override
+ public void commit() throws IOException {
+ setURLConnectionHeaders(clientRequest.getHeaders(), urlConnection);
+ }
+ }
+
+ /**
+ * Simple response implementation around an HttpURLConnection response
+ */
+ private final class URLConnectionResponse extends ClientResponse {
+ private final String method;
+ private final HttpURLConnection urlConnection;
+
+ URLConnectionResponse(int status, InBoundHeaders headers,
+ InputStream entity, String method,
+ HttpURLConnection urlConnection) {
+ super(status, headers, entity, getMessageBodyWorkers());
+ this.method = method;
+ this.urlConnection = urlConnection;
+ }
+
+ @Override
+ public boolean hasEntity() {
+ if (method.equals("HEAD") || getEntityInputStream() == null) {
+ return false;
+ }
+
+ // Length "-1" means "unknown"
+ int length = urlConnection.getContentLength();
+ return length > 0 || length == -1;
+ }
+
+ @Override
+ public String toString() {
+ return urlConnection.getRequestMethod() + " "
+ + urlConnection.getURL()
+ + " returned a response status of " + this.getStatus()
+ + " " + this.getClientResponseStatus();
+ }
+ }
+
+ @Override
+ public ClientResponse handle(final ClientRequest ro) {
+ try {
+ return doHandle(ro);
+ } catch (Exception e) {
+ throw new ClientHandlerException(e);
+ }
+ }
+
+ private ClientResponse doHandle(final ClientRequest clientRequest)
+ throws IOException {
+ final HttpURLConnection urlConnection = (HttpURLConnection) clientRequest
+ .getURI().toURL().openConnection();
+ urlConnection.setReadTimeout(readTimeoutMillis);
+ urlConnection.setConnectTimeout(connectionTimeoutMillis);
+
+ final EntityStreamingListener entityStreamingListener = getEntityStreamingListener(clientRequest);
+
+ urlConnection.setRequestMethod(clientRequest.getMethod());
+
+ // Write the request headers
+ setURLConnectionHeaders(clientRequest.getHeaders(), urlConnection);
+
+ // Write the entity (if any)
+ Object entity = clientRequest.getEntity();
+
+ // If no entity and "PUT method, force an empty entity to force the
+ // underlying
+ // connection to set the "Content-Length" header to 0.
+ // This is needed because some web servers require a "Content-Length"
+ // field for
+ // all PUT method calls (unless chunked encoding is used).
+ if (entity == null && "PUT".equals(clientRequest.getMethod())) {
+ entity = new byte[0];
+ clientRequest.setEntity(entity);
+ }
+
+ // Send headers and entity on the wire
+ if (entity != null) {
+ urlConnection.setDoOutput(true);
+
+ writeRequestEntity(clientRequest,
+ new RequestEntityWriterListener() {
+ private boolean inStreamingMode;
+
+ @Override
+ public void onRequestEntitySize(long size) {
+ if (size != -1 && size < Integer.MAX_VALUE) {
+ inStreamingMode = true;
+ setContentLengthHeader(clientRequest,
+ (int) size);
+ entityStreamingListener
+ .onBeforeStreamingEntity(clientRequest);
+
+ urlConnection
+ .setFixedLengthStreamingMode((int) size);
+ } else {
+ Integer chunkedEncodingSize = (Integer) clientRequest
+ .getProperties()
+ .get(ClientConfig.PROPERTY_CHUNKED_ENCODING_SIZE);
+ if (chunkedEncodingSize != null) {
+ inStreamingMode = true;
+ entityStreamingListener
+ .onBeforeStreamingEntity(clientRequest);
+
+ urlConnection
+ .setChunkedStreamingMode(chunkedEncodingSize);
+ }
+ }
+ }
+
+ @Override
+ public OutputStream onGetOutputStream()
+ throws IOException {
+ if (inStreamingMode) {
+ return new StreamingOutputStream(urlConnection,
+ clientRequest);
+ } else {
+ return new BufferingOutputStream(urlConnection,
+ clientRequest, entityStreamingListener);
+ }
+ }
+ });
+ } else {
+ entityStreamingListener.onBeforeStreamingEntity(clientRequest);
+ setURLConnectionHeaders(clientRequest.getHeaders(), urlConnection);
+ }
+
+ // Return the in-bound response
+ return new URLConnectionResponse(urlConnection.getResponseCode(),
+ getInBoundHeaders(urlConnection),
+ getInputStream(urlConnection), clientRequest.getMethod(),
+ urlConnection);
+ }
+
+ private EntityStreamingListener getEntityStreamingListener(
+ final ClientRequest clientRequest) {
+ EntityStreamingListener result = (EntityStreamingListener) clientRequest
+ .getProperties().get(EntityStreamingListener.class.getName());
+
+ if (result != null) {
+ return result;
+ }
+
+ return EMPTY_STREAMING_LISTENER;
+ }
+
+ private void setContentLengthHeader(ClientRequest clientRequest, int size) {
+ // Skip if already set
+ if (clientRequest.getHeaders().getFirst("Content-Length") != null) {
+ return;
+ }
+
+ // Skip if size is unknown
+ if (size < 0) {
+ return;
+ }
+
+ clientRequest.getHeaders().putSingle("Content-Length", size);
+ }
+
+ private void setURLConnectionHeaders(
+ MultivaluedMap headers,
+ HttpURLConnection urlConnection) {
+ for (Map.Entry> e : headers.entrySet()) {
+ List