Merge branch 'master' of github.com:Azure/azure-sdk-for-java into rx

AUTH.md

@@ -45,7 +45,7 @@ If you save such service principal-based credentials as a file, or store them in
 
 >:warning: Note: exercise caution when saving credentials in a file. Anyone that gains access to that file will have the same access privileges to Azure as your application. In general, file-based authentication is not recommended in production scenarios and should only be used as a quick shortcut to getting started in dev/test scenarios.
 
-You can create a service principal and grant it access privileges for a given subscription by following these steps:
+You can create a service principal and grant it access privileges for a given subscription by following these steps (or through [Azure PowerShell/Xplat CLI](https://azure.microsoft.com/en-us/documentation/articles/resource-group-authenticate-service-principal/)):
 
 1. Log into [your Azure account](http://portal.azure.com).
 1. Select **Browse > Active Directory**.

README.md

@@ -33,10 +33,9 @@ VirtualMachine linuxVM = azure.virtualMachines().define("myLinuxVM")
 	.withSsh(sshKey)
 	.withSize(VirtualMachineSizeTypes.STANDARD_D3_V2)
 	.create();
-```
-
+
 System.out.println("Created a Linux VM: " + linuxVM.id());
-
+```
 
 **Update a Virtual Machine**
 

appveyor.yml

@@ -16,7 +16,7 @@ build_script:
 on_success:
   - cd docs
   - git add .
-  - git diff --quiet --exit-code --cached || git commit -m "CI Updates" || git push -u origin master
+  - git diff --quiet --exit-code --cached || git commit -m "CI Updates" && git push -u origin master
 #on_finish:
 #  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 

azure-mgmt-redis/pom.xml

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>azure-mgmt-redis</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Microsoft Azure SDK for Redis Cache Management</name>
+    <description>This package contains Microsoft Azure Redis Cache SDK.</description>
+    <url>https://github.com/Azure/azure-sdk-for-java</url>
+
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.storage</excludePackageNames>
+                    <bottom><![CDATA[<code>/**
+<br />* Copyright (c) Microsoft Corporation. All rights reserved.
+<br />* Licensed under the MIT License. See License.txt in the project root for
+<br />* license information.
+<br />*/</code>]]></bottom>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+
+</project>

azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/DayOfWeek.java

@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.redis;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for DayOfWeek.
+ */
+public final class DayOfWeek {
+    /** Static value Monday for DayOfWeek. */
+    public static final DayOfWeek MONDAY = new DayOfWeek("Monday");
+
+    /** Static value Tuesday for DayOfWeek. */
+    public static final DayOfWeek TUESDAY = new DayOfWeek("Tuesday");
+
+    /** Static value Wednesday for DayOfWeek. */
+    public static final DayOfWeek WEDNESDAY = new DayOfWeek("Wednesday");
+
+    /** Static value Thursday for DayOfWeek. */
+    public static final DayOfWeek THURSDAY = new DayOfWeek("Thursday");
+
+    /** Static value Friday for DayOfWeek. */
+    public static final DayOfWeek FRIDAY = new DayOfWeek("Friday");
+
+    /** Static value Saturday for DayOfWeek. */
+    public static final DayOfWeek SATURDAY = new DayOfWeek("Saturday");
+
+    /** Static value Sunday for DayOfWeek. */
+    public static final DayOfWeek SUNDAY = new DayOfWeek("Sunday");
+
+    private String value;
+
+    /**
+     * Creates a custom value for DayOfWeek.
+     * @param value the custom value
+     */
+    public DayOfWeek(String value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    @Override
+    public int hashCode() {
+        return value.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof DayOfWeek)) {
+            return false;
+        }
+        if (obj == this) {
+            return true;
+        }
+        DayOfWeek rhs = (DayOfWeek) obj;
+        if (value == null) {
+            return rhs.value == null;
+        } else {
+            return value.equals(rhs.value);
+        }
+    }
+}

azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RebootType.java

@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.redis;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for RebootType.
+ */
+public final class RebootType {
+    /** Static value PrimaryNode for RebootType. */
+    public static final RebootType PRIMARY_NODE = new RebootType("PrimaryNode");
+
+    /** Static value SecondaryNode for RebootType. */
+    public static final RebootType SECONDARY_NODE = new RebootType("SecondaryNode");
+
+    /** Static value AllNodes for RebootType. */
+    public static final RebootType ALL_NODES = new RebootType("AllNodes");
+
+    private String value;
+
+    /**
+     * Creates a custom value for RebootType.
+     * @param value the custom value
+     */
+    public RebootType(String value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    @Override
+    public int hashCode() {
+        return value.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof RebootType)) {
+            return false;
+        }
+        if (obj == this) {
+            return true;
+        }
+        RebootType rhs = (RebootType) obj;
+        if (value == null) {
+            return rhs.value == null;
+        } else {
+            return value.equals(rhs.value);
+        }
+    }
+}

azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisAccessKeys.java

@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.redis;
+
+
+/**
+ * Redis cache access keys.
+ */
+public class RedisAccessKeys {
+    /**
+     * The current primary key that clients can use to authenticate with redis
+     * cache.
+     */
+    private String primaryKey;
+
+    /**
+     * The current secondary key that clients can use to authenticate with
+     * redis cache.
+     */
+    private String secondaryKey;
+
+    /**
+     * Get the primaryKey value.
+     *
+     * @return the primaryKey value
+     */
+    public String primaryKey() {
+        return this.primaryKey;
+    }
+
+    /**
+     * Set the primaryKey value.
+     *
+     * @param primaryKey the primaryKey value to set
+     * @return the RedisAccessKeys object itself.
+     */
+    public RedisAccessKeys withPrimaryKey(String primaryKey) {
+        this.primaryKey = primaryKey;
+        return this;
+    }
+
+    /**
+     * Get the secondaryKey value.
+     *
+     * @return the secondaryKey value
+     */
+    public String secondaryKey() {
+        return this.secondaryKey;
+    }
+
+    /**
+     * Set the secondaryKey value.
+     *
+     * @param secondaryKey the secondaryKey value to set
+     * @return the RedisAccessKeys object itself.
+     */
+    public RedisAccessKeys withSecondaryKey(String secondaryKey) {
+        this.secondaryKey = secondaryKey;
+        return this;
+    }
+
+}