Revert "[AutoPR network/resource-manager] Merge Network-2018-02-01 to…

… Master Networking Swagger Changes for Feb 2018 (Azure#372)" (Azure#380)

This reverts commit bc67af9.

azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Access.java

@@ -8,34 +8,52 @@
 
 package com.microsoft.azure.management.network;
 
-import java.util.Collection;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.microsoft.rest.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonValue;
 
 /**
  * Defines values for Access.
  */
-public final class Access extends ExpandableStringEnum<Access> {
+public final class Access {
     /** Static value Allow for Access. */
-    public static final Access ALLOW = fromString("Allow");
+    public static final Access ALLOW = new Access("Allow");
 
     /** Static value Deny for Access. */
-    public static final Access DENY = fromString("Deny");
+    public static final Access DENY = new Access("Deny");
+
+    private String value;
 
     /**
-     * Creates or finds a Access from its string representation.
-     * @param name a name to look for
-     * @return the corresponding Access
+     * Creates a custom value for Access.
+     * @param value the custom value
      */
-    @JsonCreator
-    public static Access fromString(String name) {
-        return fromString(name, Access.class);
+    public Access(String value) {
+        this.value = value;
     }
 
-    /**
-     * @return known Access values
-     */
-    public static Collection<Access> values() {
-        return values(Access.class);
+    @JsonValue
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    @Override
+    public int hashCode() {
+        return value.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof Access)) {
+            return false;
+        }
+        if (obj == this) {
+            return true;
+        }
+        Access rhs = (Access) obj;
+        if (value == null) {
+            return rhs.value == null;
+        } else {
+            return value.equals(rhs.value);
+        }
     }
 }

azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayBackendAddress.java

@@ -61,7 +61,7 @@ public String ipAddress() {
      * @param ipAddress the ipAddress value to set
      * @return the ApplicationGatewayBackendAddress object itself.
      */
-    public ApplicationGatewayBackendAddress withIpAddress(String ipAddress) {
+    public ApplicationGatewayBackendAddress withIPAddress(String ipAddress) {
         this.ipAddress = ipAddress;
         return this;
     }

azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayBackendHealthServerHealth.java

@@ -8,43 +8,61 @@
 
 package com.microsoft.azure.management.network;
 
-import java.util.Collection;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.microsoft.rest.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonValue;
 
 /**
  * Defines values for ApplicationGatewayBackendHealthServerHealth.
  */
-public final class ApplicationGatewayBackendHealthServerHealth extends ExpandableStringEnum<ApplicationGatewayBackendHealthServerHealth> {
+public final class ApplicationGatewayBackendHealthServerHealth {
     /** Static value Unknown for ApplicationGatewayBackendHealthServerHealth. */
-    public static final ApplicationGatewayBackendHealthServerHealth UNKNOWN = fromString("Unknown");
+    public static final ApplicationGatewayBackendHealthServerHealth UNKNOWN = new ApplicationGatewayBackendHealthServerHealth("Unknown");
 
     /** Static value Up for ApplicationGatewayBackendHealthServerHealth. */
-    public static final ApplicationGatewayBackendHealthServerHealth UP = fromString("Up");
+    public static final ApplicationGatewayBackendHealthServerHealth UP = new ApplicationGatewayBackendHealthServerHealth("Up");
 
     /** Static value Down for ApplicationGatewayBackendHealthServerHealth. */
-    public static final ApplicationGatewayBackendHealthServerHealth DOWN = fromString("Down");
+    public static final ApplicationGatewayBackendHealthServerHealth DOWN = new ApplicationGatewayBackendHealthServerHealth("Down");
 
     /** Static value Partial for ApplicationGatewayBackendHealthServerHealth. */
-    public static final ApplicationGatewayBackendHealthServerHealth PARTIAL = fromString("Partial");
+    public static final ApplicationGatewayBackendHealthServerHealth PARTIAL = new ApplicationGatewayBackendHealthServerHealth("Partial");
 
     /** Static value Draining for ApplicationGatewayBackendHealthServerHealth. */
-    public static final ApplicationGatewayBackendHealthServerHealth DRAINING = fromString("Draining");
+    public static final ApplicationGatewayBackendHealthServerHealth DRAINING = new ApplicationGatewayBackendHealthServerHealth("Draining");
+
+    private String value;
 
     /**
-     * Creates or finds a ApplicationGatewayBackendHealthServerHealth from its string representation.
-     * @param name a name to look for
-     * @return the corresponding ApplicationGatewayBackendHealthServerHealth
+     * Creates a custom value for ApplicationGatewayBackendHealthServerHealth.
+     * @param value the custom value
      */
-    @JsonCreator
-    public static ApplicationGatewayBackendHealthServerHealth fromString(String name) {
-        return fromString(name, ApplicationGatewayBackendHealthServerHealth.class);
+    public ApplicationGatewayBackendHealthServerHealth(String value) {
+        this.value = value;
     }
 
-    /**
-     * @return known ApplicationGatewayBackendHealthServerHealth values
-     */
-    public static Collection<ApplicationGatewayBackendHealthServerHealth> values() {
-        return values(ApplicationGatewayBackendHealthServerHealth.class);
+    @JsonValue
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    @Override
+    public int hashCode() {
+        return value.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ApplicationGatewayBackendHealthServerHealth)) {
+            return false;
+        }
+        if (obj == this) {
+            return true;
+        }
+        ApplicationGatewayBackendHealthServerHealth rhs = (ApplicationGatewayBackendHealthServerHealth) obj;
+        if (value == null) {
+            return rhs.value == null;
+        } else {
+            return value.equals(rhs.value);
+        }
     }
 }

azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayCookieBasedAffinity.java

@@ -8,34 +8,52 @@
 
 package com.microsoft.azure.management.network;
 
-import java.util.Collection;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.microsoft.rest.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonValue;
 
 /**
  * Defines values for ApplicationGatewayCookieBasedAffinity.
  */
-public final class ApplicationGatewayCookieBasedAffinity extends ExpandableStringEnum<ApplicationGatewayCookieBasedAffinity> {
+public final class ApplicationGatewayCookieBasedAffinity {
     /** Static value Enabled for ApplicationGatewayCookieBasedAffinity. */
-    public static final ApplicationGatewayCookieBasedAffinity ENABLED = fromString("Enabled");
+    public static final ApplicationGatewayCookieBasedAffinity ENABLED = new ApplicationGatewayCookieBasedAffinity("Enabled");
 
     /** Static value Disabled for ApplicationGatewayCookieBasedAffinity. */
-    public static final ApplicationGatewayCookieBasedAffinity DISABLED = fromString("Disabled");
+    public static final ApplicationGatewayCookieBasedAffinity DISABLED = new ApplicationGatewayCookieBasedAffinity("Disabled");
+
+    private String value;
 
     /**
-     * Creates or finds a ApplicationGatewayCookieBasedAffinity from its string representation.
-     * @param name a name to look for
-     * @return the corresponding ApplicationGatewayCookieBasedAffinity
+     * Creates a custom value for ApplicationGatewayCookieBasedAffinity.
+     * @param value the custom value
      */
-    @JsonCreator
-    public static ApplicationGatewayCookieBasedAffinity fromString(String name) {
-        return fromString(name, ApplicationGatewayCookieBasedAffinity.class);
+    public ApplicationGatewayCookieBasedAffinity(String value) {
+        this.value = value;
     }
 
-    /**
-     * @return known ApplicationGatewayCookieBasedAffinity values
-     */
-    public static Collection<ApplicationGatewayCookieBasedAffinity> values() {
-        return values(ApplicationGatewayCookieBasedAffinity.class);
+    @JsonValue
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    @Override
+    public int hashCode() {
+        return value.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ApplicationGatewayCookieBasedAffinity)) {
+            return false;
+        }
+        if (obj == this) {
+            return true;
+        }
+        ApplicationGatewayCookieBasedAffinity rhs = (ApplicationGatewayCookieBasedAffinity) obj;
+        if (value == null) {
+            return rhs.value == null;
+        } else {
+            return value.equals(rhs.value);
+        }
     }
 }

azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayFirewallMode.java

@@ -8,34 +8,52 @@
 
 package com.microsoft.azure.management.network;
 
-import java.util.Collection;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.microsoft.rest.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonValue;
 
 /**
  * Defines values for ApplicationGatewayFirewallMode.
  */
-public final class ApplicationGatewayFirewallMode extends ExpandableStringEnum<ApplicationGatewayFirewallMode> {
+public final class ApplicationGatewayFirewallMode {
     /** Static value Detection for ApplicationGatewayFirewallMode. */
-    public static final ApplicationGatewayFirewallMode DETECTION = fromString("Detection");
+    public static final ApplicationGatewayFirewallMode DETECTION = new ApplicationGatewayFirewallMode("Detection");
 
     /** Static value Prevention for ApplicationGatewayFirewallMode. */
-    public static final ApplicationGatewayFirewallMode PREVENTION = fromString("Prevention");
+    public static final ApplicationGatewayFirewallMode PREVENTION = new ApplicationGatewayFirewallMode("Prevention");
+
+    private String value;
 
     /**
-     * Creates or finds a ApplicationGatewayFirewallMode from its string representation.
-     * @param name a name to look for
-     * @return the corresponding ApplicationGatewayFirewallMode
+     * Creates a custom value for ApplicationGatewayFirewallMode.
+     * @param value the custom value
      */
-    @JsonCreator
-    public static ApplicationGatewayFirewallMode fromString(String name) {
-        return fromString(name, ApplicationGatewayFirewallMode.class);
+    public ApplicationGatewayFirewallMode(String value) {
+        this.value = value;
     }
 
-    /**
-     * @return known ApplicationGatewayFirewallMode values
-     */
-    public static Collection<ApplicationGatewayFirewallMode> values() {
-        return values(ApplicationGatewayFirewallMode.class);
+    @JsonValue
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    @Override
+    public int hashCode() {
+        return value.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ApplicationGatewayFirewallMode)) {
+            return false;
+        }
+        if (obj == this) {
+            return true;
+        }
+        ApplicationGatewayFirewallMode rhs = (ApplicationGatewayFirewallMode) obj;
+        if (value == null) {
+            return rhs.value == null;
+        } else {
+            return value.equals(rhs.value);
+        }
     }
 }

azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayOperationalState.java

@@ -8,40 +8,58 @@
 
 package com.microsoft.azure.management.network;
 
-import java.util.Collection;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.microsoft.rest.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonValue;
 
 /**
  * Defines values for ApplicationGatewayOperationalState.
  */
-public final class ApplicationGatewayOperationalState extends ExpandableStringEnum<ApplicationGatewayOperationalState> {
+public final class ApplicationGatewayOperationalState {
     /** Static value Stopped for ApplicationGatewayOperationalState. */
-    public static final ApplicationGatewayOperationalState STOPPED = fromString("Stopped");
+    public static final ApplicationGatewayOperationalState STOPPED = new ApplicationGatewayOperationalState("Stopped");
 
     /** Static value Starting for ApplicationGatewayOperationalState. */
-    public static final ApplicationGatewayOperationalState STARTING = fromString("Starting");
+    public static final ApplicationGatewayOperationalState STARTING = new ApplicationGatewayOperationalState("Starting");
 
     /** Static value Running for ApplicationGatewayOperationalState. */
-    public static final ApplicationGatewayOperationalState RUNNING = fromString("Running");
+    public static final ApplicationGatewayOperationalState RUNNING = new ApplicationGatewayOperationalState("Running");
 
     /** Static value Stopping for ApplicationGatewayOperationalState. */
-    public static final ApplicationGatewayOperationalState STOPPING = fromString("Stopping");
+    public static final ApplicationGatewayOperationalState STOPPING = new ApplicationGatewayOperationalState("Stopping");
+
+    private String value;
 
     /**
-     * Creates or finds a ApplicationGatewayOperationalState from its string representation.
-     * @param name a name to look for
-     * @return the corresponding ApplicationGatewayOperationalState
+     * Creates a custom value for ApplicationGatewayOperationalState.
+     * @param value the custom value
      */
-    @JsonCreator
-    public static ApplicationGatewayOperationalState fromString(String name) {
-        return fromString(name, ApplicationGatewayOperationalState.class);
+    public ApplicationGatewayOperationalState(String value) {
+        this.value = value;
     }
 
-    /**
-     * @return known ApplicationGatewayOperationalState values
-     */
-    public static Collection<ApplicationGatewayOperationalState> values() {
-        return values(ApplicationGatewayOperationalState.class);
+    @JsonValue
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    @Override
+    public int hashCode() {
+        return value.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ApplicationGatewayOperationalState)) {
+            return false;
+        }
+        if (obj == this) {
+            return true;
+        }
+        ApplicationGatewayOperationalState rhs = (ApplicationGatewayOperationalState) obj;
+        if (value == null) {
+            return rhs.value == null;
+        } else {
+            return value.equals(rhs.value);
+        }
     }
 }