Merge pull request #1084 from jianghaolu/master

Regen Redis from updated swagger

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

@@ -8,67 +8,61 @@
 
 package com.microsoft.azure.management.redis;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 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");
+public enum DayOfWeek {
+    /** Enum value Monday. */
+    MONDAY("Monday"),
 
-    /** Static value Tuesday for DayOfWeek. */
-    public static final DayOfWeek TUESDAY = new DayOfWeek("Tuesday");
+    /** Enum value Tuesday. */
+    TUESDAY("Tuesday"),
 
-    /** Static value Wednesday for DayOfWeek. */
-    public static final DayOfWeek WEDNESDAY = new DayOfWeek("Wednesday");
+    /** Enum value Wednesday. */
+    WEDNESDAY("Wednesday"),
 
-    /** Static value Thursday for DayOfWeek. */
-    public static final DayOfWeek THURSDAY = new DayOfWeek("Thursday");
+    /** Enum value Thursday. */
+    THURSDAY("Thursday"),
 
-    /** Static value Friday for DayOfWeek. */
-    public static final DayOfWeek FRIDAY = new DayOfWeek("Friday");
+    /** Enum value Friday. */
+    FRIDAY("Friday"),
 
-    /** Static value Saturday for DayOfWeek. */
-    public static final DayOfWeek SATURDAY = new DayOfWeek("Saturday");
+    /** Enum value Saturday. */
+    SATURDAY("Saturday"),
 
-    /** Static value Sunday for DayOfWeek. */
-    public static final DayOfWeek SUNDAY = new DayOfWeek("Sunday");
+    /** Enum value Sunday. */
+    SUNDAY("Sunday");
 
+    /** The actual serialized value for a DayOfWeek instance. */
     private String value;
 
+    DayOfWeek(String value) {
+        this.value = value;
+    }
+
     /**
-     * Creates a custom value for DayOfWeek.
-     * @param value the custom value
+     * Parses a serialized value to a DayOfWeek instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed DayOfWeek object, or null if unable to parse.
      */
-    public DayOfWeek(String value) {
-        this.value = value;
+    @JsonCreator
+    public static DayOfWeek fromString(String value) {
+        DayOfWeek[] items = DayOfWeek.values();
+        for (DayOfWeek item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
     }
 
     @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);
-        }
+        return this.value;
     }
 }

azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/implementation/ScheduleEntryInner.java → azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/ScheduleEntry.java

@@ -6,16 +6,15 @@
  * Code generated by Microsoft (R) AutoRest Code Generator.
  */
 
-package com.microsoft.azure.management.redis.implementation;
+package com.microsoft.azure.management.redis;
 
-import com.microsoft.azure.management.redis.DayOfWeek;
 import org.joda.time.Period;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * The ScheduleEntryInner model.
+ * The ScheduleEntry model.
  */
-public class ScheduleEntryInner {
+public class ScheduleEntry {
     /**
      * Day of week when cache can be patched. Possible values include:
      * 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday',
@@ -48,9 +47,9 @@ public DayOfWeek dayOfWeek() {
      * Set the dayOfWeek value.
      *
      * @param dayOfWeek the dayOfWeek value to set
-     * @return the ScheduleEntryInner object itself.
+     * @return the ScheduleEntry object itself.
      */
-    public ScheduleEntryInner withDayOfWeek(DayOfWeek dayOfWeek) {
+    public ScheduleEntry withDayOfWeek(DayOfWeek dayOfWeek) {
         this.dayOfWeek = dayOfWeek;
         return this;
     }
@@ -68,9 +67,9 @@ public int startHourUtc() {
      * Set the startHourUtc value.
      *
      * @param startHourUtc the startHourUtc value to set
-     * @return the ScheduleEntryInner object itself.
+     * @return the ScheduleEntry object itself.
      */
-    public ScheduleEntryInner withStartHourUtc(int startHourUtc) {
+    public ScheduleEntry withStartHourUtc(int startHourUtc) {
         this.startHourUtc = startHourUtc;
         return this;
     }
@@ -88,9 +87,9 @@ public Period maintenanceWindow() {
      * Set the maintenanceWindow value.
      *
      * @param maintenanceWindow the maintenanceWindow value to set
-     * @return the ScheduleEntryInner object itself.
+     * @return the ScheduleEntry object itself.
      */
-    public ScheduleEntryInner withMaintenanceWindow(Period maintenanceWindow) {
+    public ScheduleEntry withMaintenanceWindow(Period maintenanceWindow) {
         this.maintenanceWindow = maintenanceWindow;
         return this;
     }

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

@@ -20,7 +20,7 @@ public class ExportRDBParametersInner {
     private String format;
 
     /**
-     * Prifix to use for exported files.
+     * Prefix to use for exported files.
      */
     @JsonProperty(required = true)
     private String prefix;