diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/pom.xml b/sdk/postgresql/mgmt-v2017_12_01_preview/pom.xml
index 905d75371ce9..a37b03b0e75a 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/pom.xml
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/pom.xml
@@ -11,14 +11,14 @@
com.microsoft.azure
azure-arm-parent
- 1.2.0
- ../../parents/azure-arm-parent
+ 1.1.0
+ ../../../pom.management.xml
- azure-mgmt-postgresql
+ azure-mgmt-dbforpostgresql
1.0.0-beta
jar
- Microsoft Azure SDK for DBforPostgreSQL Management
- This package contains Microsoft DBforPostgreSQL Management SDK.
+ Microsoft Azure SDK for DBForPostgreSQL Management
+ This package contains Microsoft DBForPostgreSQL Management SDK.
https://github.com/Azure/azure-sdk-for-java
@@ -71,6 +71,8 @@
azure-arm-client-runtime
test-jar
test
+
+ 1.6.5
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/AzureEntityResource.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/AzureEntityResource.java
new file mode 100644
index 000000000000..2fa1c2635ba8
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/AzureEntityResource.java
@@ -0,0 +1,34 @@
+/**
+ * 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.postgresql.v2017_12_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * The resource model definition for a Azure Resource Manager resource with an
+ * etag.
+ */
+public class AzureEntityResource extends ProxyResource {
+ /**
+ * Resource Etag.
+ */
+ @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+ private String etag;
+
+ /**
+ * Get resource Etag.
+ *
+ * @return the etag value
+ */
+ public String etag() {
+ return this.etag;
+ }
+
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Configuration.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Configuration.java
index 6fee6d1c98d3..92e00e59a39e 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Configuration.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Configuration.java
@@ -16,12 +16,12 @@
import com.microsoft.azure.arm.model.Appliable;
import com.microsoft.azure.arm.model.Creatable;
import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.DBForPostgreSQLManager;
/**
* Type representing Configuration.
*/
-public interface Configuration extends HasInner, Indexable, Refreshable, Updatable, HasManager {
+public interface Configuration extends HasInner, Indexable, Refreshable, Updatable, HasManager {
/**
* @return the allowedValues value.
*/
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Database.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Database.java
index 7b0ca1515493..8ae29c11987f 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Database.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Database.java
@@ -16,12 +16,12 @@
import com.microsoft.azure.arm.model.Appliable;
import com.microsoft.azure.arm.model.Creatable;
import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.DBForPostgreSQLManager;
/**
* Type representing Database.
*/
-public interface Database extends HasInner, Indexable, Refreshable, Updatable, HasManager {
+public interface Database extends HasInner, Indexable, Refreshable, Updatable, HasManager {
/**
* @return the charset value.
*/
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/FirewallRule.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/FirewallRule.java
index 4398beeacb83..6bfe798e2e00 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/FirewallRule.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/FirewallRule.java
@@ -16,12 +16,12 @@
import com.microsoft.azure.arm.model.Appliable;
import com.microsoft.azure.arm.model.Creatable;
import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.DBForPostgreSQLManager;
/**
* Type representing FirewallRule.
*/
-public interface FirewallRule extends HasInner, Indexable, Refreshable, Updatable, HasManager {
+public interface FirewallRule extends HasInner, Indexable, Refreshable, Updatable, HasManager {
/**
* @return the endIpAddress value.
*/
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/IdentityType.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/IdentityType.java
new file mode 100644
index 000000000000..c0b8c9b6d01f
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/IdentityType.java
@@ -0,0 +1,38 @@
+/**
+ * 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.postgresql.v2017_12_01_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for IdentityType.
+ */
+public final class IdentityType extends ExpandableStringEnum {
+ /** Static value SystemAssigned for IdentityType. */
+ public static final IdentityType SYSTEM_ASSIGNED = fromString("SystemAssigned");
+
+ /**
+ * Creates or finds a IdentityType from its string representation.
+ * @param name a name to look for
+ * @return the corresponding IdentityType
+ */
+ @JsonCreator
+ public static IdentityType fromString(String name) {
+ return fromString(name, IdentityType.class);
+ }
+
+ /**
+ * @return known IdentityType values
+ */
+ public static Collection values() {
+ return values(IdentityType.class);
+ }
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/InfrastructureEncryption.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/InfrastructureEncryption.java
new file mode 100644
index 000000000000..e7ed21a2ac8e
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/InfrastructureEncryption.java
@@ -0,0 +1,41 @@
+/**
+ * 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.postgresql.v2017_12_01_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for InfrastructureEncryption.
+ */
+public final class InfrastructureEncryption extends ExpandableStringEnum {
+ /** Static value Enabled for InfrastructureEncryption. */
+ public static final InfrastructureEncryption ENABLED = fromString("Enabled");
+
+ /** Static value Disabled for InfrastructureEncryption. */
+ public static final InfrastructureEncryption DISABLED = fromString("Disabled");
+
+ /**
+ * Creates or finds a InfrastructureEncryption from its string representation.
+ * @param name a name to look for
+ * @return the corresponding InfrastructureEncryption
+ */
+ @JsonCreator
+ public static InfrastructureEncryption fromString(String name) {
+ return fromString(name, InfrastructureEncryption.class);
+ }
+
+ /**
+ * @return known InfrastructureEncryption values
+ */
+ public static Collection values() {
+ return values(InfrastructureEncryption.class);
+ }
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/LogFile.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/LogFile.java
index d1dfc05ba0d2..213bb438e35a 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/LogFile.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/LogFile.java
@@ -11,13 +11,13 @@
import com.microsoft.azure.arm.model.HasInner;
import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.LogFileInner;
import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.DBForPostgreSQLManager;
import org.joda.time.DateTime;
/**
* Type representing LogFile.
*/
-public interface LogFile extends HasInner, HasManager {
+public interface LogFile extends HasInner, HasManager {
/**
* @return the createdTime value.
*/
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/MinimalTlsVersionEnum.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/MinimalTlsVersionEnum.java
new file mode 100644
index 000000000000..0c3b6324f1e6
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/MinimalTlsVersionEnum.java
@@ -0,0 +1,47 @@
+/**
+ * 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.postgresql.v2017_12_01_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for MinimalTlsVersionEnum.
+ */
+public final class MinimalTlsVersionEnum extends ExpandableStringEnum {
+ /** Static value TLS1_0 for MinimalTlsVersionEnum. */
+ public static final MinimalTlsVersionEnum TLS1_0 = fromString("TLS1_0");
+
+ /** Static value TLS1_1 for MinimalTlsVersionEnum. */
+ public static final MinimalTlsVersionEnum TLS1_1 = fromString("TLS1_1");
+
+ /** Static value TLS1_2 for MinimalTlsVersionEnum. */
+ public static final MinimalTlsVersionEnum TLS1_2 = fromString("TLS1_2");
+
+ /** Static value TLSEnforcementDisabled for MinimalTlsVersionEnum. */
+ public static final MinimalTlsVersionEnum TLSENFORCEMENT_DISABLED = fromString("TLSEnforcementDisabled");
+
+ /**
+ * Creates or finds a MinimalTlsVersionEnum from its string representation.
+ * @param name a name to look for
+ * @return the corresponding MinimalTlsVersionEnum
+ */
+ @JsonCreator
+ public static MinimalTlsVersionEnum fromString(String name) {
+ return fromString(name, MinimalTlsVersionEnum.class);
+ }
+
+ /**
+ * @return known MinimalTlsVersionEnum values
+ */
+ public static Collection values() {
+ return values(MinimalTlsVersionEnum.class);
+ }
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/NameAvailability.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/NameAvailability.java
index c6d2bb868600..4587521c17a1 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/NameAvailability.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/NameAvailability.java
@@ -10,13 +10,13 @@
import com.microsoft.azure.arm.model.HasInner;
import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.DBForPostgreSQLManager;
import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.NameAvailabilityInner;
/**
* Type representing NameAvailability.
*/
-public interface NameAvailability extends HasInner, HasManager {
+public interface NameAvailability extends HasInner, HasManager {
/**
* @return the message value.
*/
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/OperationListResult.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/OperationListResult.java
index f85e4fc6d7fd..7123b071b85a 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/OperationListResult.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/OperationListResult.java
@@ -10,7 +10,7 @@
import com.microsoft.azure.arm.model.HasInner;
import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.DBForPostgreSQLManager;
import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.OperationListResultInner;
import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.OperationInner;
import java.util.List;
@@ -18,7 +18,7 @@
/**
* Type representing OperationListResult.
*/
-public interface OperationListResult extends HasInner, HasManager {
+public interface OperationListResult extends HasInner, HasManager {
/**
* @return the value value.
*/
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PerformanceTierProperties.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PerformanceTierProperties.java
index 96e5b561c016..942354f8d9bd 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PerformanceTierProperties.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PerformanceTierProperties.java
@@ -11,13 +11,13 @@
import com.microsoft.azure.arm.model.HasInner;
import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.PerformanceTierPropertiesInner;
import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.DBForPostgreSQLManager;
import java.util.List;
/**
* Type representing PerformanceTierProperties.
*/
-public interface PerformanceTierProperties extends HasInner, HasManager {
+public interface PerformanceTierProperties extends HasInner, HasManager {
/**
* @return the id value.
*/
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PrivateEndpointConnectionProperties.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PrivateEndpointConnectionProperties.java
new file mode 100644
index 000000000000..9acf6ab93659
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PrivateEndpointConnectionProperties.java
@@ -0,0 +1,85 @@
+/**
+ * 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.postgresql.v2017_12_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Properties of a private endpoint connection.
+ */
+public class PrivateEndpointConnectionProperties {
+ /**
+ * Private endpoint which the connection belongs to.
+ */
+ @JsonProperty(value = "privateEndpoint")
+ private PrivateEndpointProperty privateEndpoint;
+
+ /**
+ * Connection state of the private endpoint connection.
+ */
+ @JsonProperty(value = "privateLinkServiceConnectionState")
+ private PrivateLinkServiceConnectionStateProperty privateLinkServiceConnectionState;
+
+ /**
+ * State of the private endpoint connection. Possible values include:
+ * 'Approving', 'Ready', 'Dropping', 'Failed', 'Rejecting'.
+ */
+ @JsonProperty(value = "provisioningState", access = JsonProperty.Access.WRITE_ONLY)
+ private PrivateEndpointProvisioningState provisioningState;
+
+ /**
+ * Get private endpoint which the connection belongs to.
+ *
+ * @return the privateEndpoint value
+ */
+ public PrivateEndpointProperty privateEndpoint() {
+ return this.privateEndpoint;
+ }
+
+ /**
+ * Set private endpoint which the connection belongs to.
+ *
+ * @param privateEndpoint the privateEndpoint value to set
+ * @return the PrivateEndpointConnectionProperties object itself.
+ */
+ public PrivateEndpointConnectionProperties withPrivateEndpoint(PrivateEndpointProperty privateEndpoint) {
+ this.privateEndpoint = privateEndpoint;
+ return this;
+ }
+
+ /**
+ * Get connection state of the private endpoint connection.
+ *
+ * @return the privateLinkServiceConnectionState value
+ */
+ public PrivateLinkServiceConnectionStateProperty privateLinkServiceConnectionState() {
+ return this.privateLinkServiceConnectionState;
+ }
+
+ /**
+ * Set connection state of the private endpoint connection.
+ *
+ * @param privateLinkServiceConnectionState the privateLinkServiceConnectionState value to set
+ * @return the PrivateEndpointConnectionProperties object itself.
+ */
+ public PrivateEndpointConnectionProperties withPrivateLinkServiceConnectionState(PrivateLinkServiceConnectionStateProperty privateLinkServiceConnectionState) {
+ this.privateLinkServiceConnectionState = privateLinkServiceConnectionState;
+ return this;
+ }
+
+ /**
+ * Get state of the private endpoint connection. Possible values include: 'Approving', 'Ready', 'Dropping', 'Failed', 'Rejecting'.
+ *
+ * @return the provisioningState value
+ */
+ public PrivateEndpointProvisioningState provisioningState() {
+ return this.provisioningState;
+ }
+
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PrivateEndpointProperty.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PrivateEndpointProperty.java
new file mode 100644
index 000000000000..f7ea6ad2f953
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PrivateEndpointProperty.java
@@ -0,0 +1,43 @@
+/**
+ * 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.postgresql.v2017_12_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The PrivateEndpointProperty model.
+ */
+public class PrivateEndpointProperty {
+ /**
+ * Resource id of the private endpoint.
+ */
+ @JsonProperty(value = "id")
+ private String id;
+
+ /**
+ * Get resource id of the private endpoint.
+ *
+ * @return the id value
+ */
+ public String id() {
+ return this.id;
+ }
+
+ /**
+ * Set resource id of the private endpoint.
+ *
+ * @param id the id value to set
+ * @return the PrivateEndpointProperty object itself.
+ */
+ public PrivateEndpointProperty withId(String id) {
+ this.id = id;
+ return this;
+ }
+
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PrivateEndpointProvisioningState.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PrivateEndpointProvisioningState.java
new file mode 100644
index 000000000000..890002003590
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PrivateEndpointProvisioningState.java
@@ -0,0 +1,50 @@
+/**
+ * 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.postgresql.v2017_12_01_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for PrivateEndpointProvisioningState.
+ */
+public final class PrivateEndpointProvisioningState extends ExpandableStringEnum {
+ /** Static value Approving for PrivateEndpointProvisioningState. */
+ public static final PrivateEndpointProvisioningState APPROVING = fromString("Approving");
+
+ /** Static value Ready for PrivateEndpointProvisioningState. */
+ public static final PrivateEndpointProvisioningState READY = fromString("Ready");
+
+ /** Static value Dropping for PrivateEndpointProvisioningState. */
+ public static final PrivateEndpointProvisioningState DROPPING = fromString("Dropping");
+
+ /** Static value Failed for PrivateEndpointProvisioningState. */
+ public static final PrivateEndpointProvisioningState FAILED = fromString("Failed");
+
+ /** Static value Rejecting for PrivateEndpointProvisioningState. */
+ public static final PrivateEndpointProvisioningState REJECTING = fromString("Rejecting");
+
+ /**
+ * Creates or finds a PrivateEndpointProvisioningState from its string representation.
+ * @param name a name to look for
+ * @return the corresponding PrivateEndpointProvisioningState
+ */
+ @JsonCreator
+ public static PrivateEndpointProvisioningState fromString(String name) {
+ return fromString(name, PrivateEndpointProvisioningState.class);
+ }
+
+ /**
+ * @return known PrivateEndpointProvisioningState values
+ */
+ public static Collection values() {
+ return values(PrivateEndpointProvisioningState.class);
+ }
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PrivateLinkServiceConnectionStateActionsRequire.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PrivateLinkServiceConnectionStateActionsRequire.java
new file mode 100644
index 000000000000..06dae492bc88
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PrivateLinkServiceConnectionStateActionsRequire.java
@@ -0,0 +1,38 @@
+/**
+ * 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.postgresql.v2017_12_01_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for PrivateLinkServiceConnectionStateActionsRequire.
+ */
+public final class PrivateLinkServiceConnectionStateActionsRequire extends ExpandableStringEnum {
+ /** Static value None for PrivateLinkServiceConnectionStateActionsRequire. */
+ public static final PrivateLinkServiceConnectionStateActionsRequire NONE = fromString("None");
+
+ /**
+ * Creates or finds a PrivateLinkServiceConnectionStateActionsRequire from its string representation.
+ * @param name a name to look for
+ * @return the corresponding PrivateLinkServiceConnectionStateActionsRequire
+ */
+ @JsonCreator
+ public static PrivateLinkServiceConnectionStateActionsRequire fromString(String name) {
+ return fromString(name, PrivateLinkServiceConnectionStateActionsRequire.class);
+ }
+
+ /**
+ * @return known PrivateLinkServiceConnectionStateActionsRequire values
+ */
+ public static Collection values() {
+ return values(PrivateLinkServiceConnectionStateActionsRequire.class);
+ }
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PrivateLinkServiceConnectionStateProperty.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PrivateLinkServiceConnectionStateProperty.java
new file mode 100644
index 000000000000..4f8be9359a72
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PrivateLinkServiceConnectionStateProperty.java
@@ -0,0 +1,86 @@
+/**
+ * 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.postgresql.v2017_12_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The PrivateLinkServiceConnectionStateProperty model.
+ */
+public class PrivateLinkServiceConnectionStateProperty {
+ /**
+ * The private link service connection status. Possible values include:
+ * 'Approved', 'Pending', 'Rejected', 'Disconnected'.
+ */
+ @JsonProperty(value = "status", required = true)
+ private PrivateLinkServiceConnectionStateStatus status;
+
+ /**
+ * The private link service connection description.
+ */
+ @JsonProperty(value = "description", required = true)
+ private String description;
+
+ /**
+ * The actions required for private link service connection. Possible
+ * values include: 'None'.
+ */
+ @JsonProperty(value = "actionsRequired", access = JsonProperty.Access.WRITE_ONLY)
+ private PrivateLinkServiceConnectionStateActionsRequire actionsRequired;
+
+ /**
+ * Get the private link service connection status. Possible values include: 'Approved', 'Pending', 'Rejected', 'Disconnected'.
+ *
+ * @return the status value
+ */
+ public PrivateLinkServiceConnectionStateStatus status() {
+ return this.status;
+ }
+
+ /**
+ * Set the private link service connection status. Possible values include: 'Approved', 'Pending', 'Rejected', 'Disconnected'.
+ *
+ * @param status the status value to set
+ * @return the PrivateLinkServiceConnectionStateProperty object itself.
+ */
+ public PrivateLinkServiceConnectionStateProperty withStatus(PrivateLinkServiceConnectionStateStatus status) {
+ this.status = status;
+ return this;
+ }
+
+ /**
+ * Get the private link service connection description.
+ *
+ * @return the description value
+ */
+ public String description() {
+ return this.description;
+ }
+
+ /**
+ * Set the private link service connection description.
+ *
+ * @param description the description value to set
+ * @return the PrivateLinkServiceConnectionStateProperty object itself.
+ */
+ public PrivateLinkServiceConnectionStateProperty withDescription(String description) {
+ this.description = description;
+ return this;
+ }
+
+ /**
+ * Get the actions required for private link service connection. Possible values include: 'None'.
+ *
+ * @return the actionsRequired value
+ */
+ public PrivateLinkServiceConnectionStateActionsRequire actionsRequired() {
+ return this.actionsRequired;
+ }
+
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PrivateLinkServiceConnectionStateStatus.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PrivateLinkServiceConnectionStateStatus.java
new file mode 100644
index 000000000000..0b559a0be755
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PrivateLinkServiceConnectionStateStatus.java
@@ -0,0 +1,47 @@
+/**
+ * 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.postgresql.v2017_12_01_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for PrivateLinkServiceConnectionStateStatus.
+ */
+public final class PrivateLinkServiceConnectionStateStatus extends ExpandableStringEnum {
+ /** Static value Approved for PrivateLinkServiceConnectionStateStatus. */
+ public static final PrivateLinkServiceConnectionStateStatus APPROVED = fromString("Approved");
+
+ /** Static value Pending for PrivateLinkServiceConnectionStateStatus. */
+ public static final PrivateLinkServiceConnectionStateStatus PENDING = fromString("Pending");
+
+ /** Static value Rejected for PrivateLinkServiceConnectionStateStatus. */
+ public static final PrivateLinkServiceConnectionStateStatus REJECTED = fromString("Rejected");
+
+ /** Static value Disconnected for PrivateLinkServiceConnectionStateStatus. */
+ public static final PrivateLinkServiceConnectionStateStatus DISCONNECTED = fromString("Disconnected");
+
+ /**
+ * Creates or finds a PrivateLinkServiceConnectionStateStatus from its string representation.
+ * @param name a name to look for
+ * @return the corresponding PrivateLinkServiceConnectionStateStatus
+ */
+ @JsonCreator
+ public static PrivateLinkServiceConnectionStateStatus fromString(String name) {
+ return fromString(name, PrivateLinkServiceConnectionStateStatus.class);
+ }
+
+ /**
+ * @return known PrivateLinkServiceConnectionStateStatus values
+ */
+ public static Collection values() {
+ return values(PrivateLinkServiceConnectionStateStatus.class);
+ }
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PublicNetworkAccessEnum.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PublicNetworkAccessEnum.java
new file mode 100644
index 000000000000..01dae33d7dc8
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PublicNetworkAccessEnum.java
@@ -0,0 +1,41 @@
+/**
+ * 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.postgresql.v2017_12_01_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for PublicNetworkAccessEnum.
+ */
+public final class PublicNetworkAccessEnum extends ExpandableStringEnum {
+ /** Static value Enabled for PublicNetworkAccessEnum. */
+ public static final PublicNetworkAccessEnum ENABLED = fromString("Enabled");
+
+ /** Static value Disabled for PublicNetworkAccessEnum. */
+ public static final PublicNetworkAccessEnum DISABLED = fromString("Disabled");
+
+ /**
+ * Creates or finds a PublicNetworkAccessEnum from its string representation.
+ * @param name a name to look for
+ * @return the corresponding PublicNetworkAccessEnum
+ */
+ @JsonCreator
+ public static PublicNetworkAccessEnum fromString(String name) {
+ return fromString(name, PublicNetworkAccessEnum.class);
+ }
+
+ /**
+ * @return known PublicNetworkAccessEnum values
+ */
+ public static Collection values() {
+ return values(PublicNetworkAccessEnum.class);
+ }
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ResourceIdentity.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ResourceIdentity.java
new file mode 100644
index 000000000000..cb74468ae709
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ResourceIdentity.java
@@ -0,0 +1,76 @@
+/**
+ * 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.postgresql.v2017_12_01_preview;
+
+import java.util.UUID;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Azure Active Directory identity configuration for a resource.
+ */
+public class ResourceIdentity {
+ /**
+ * The Azure Active Directory principal id.
+ */
+ @JsonProperty(value = "principalId", access = JsonProperty.Access.WRITE_ONLY)
+ private UUID principalId;
+
+ /**
+ * The identity type. Set this to 'SystemAssigned' in order to
+ * automatically create and assign an Azure Active Directory principal for
+ * the resource. Possible values include: 'SystemAssigned'.
+ */
+ @JsonProperty(value = "type")
+ private IdentityType type;
+
+ /**
+ * The Azure Active Directory tenant id.
+ */
+ @JsonProperty(value = "tenantId", access = JsonProperty.Access.WRITE_ONLY)
+ private UUID tenantId;
+
+ /**
+ * Get the Azure Active Directory principal id.
+ *
+ * @return the principalId value
+ */
+ public UUID principalId() {
+ return this.principalId;
+ }
+
+ /**
+ * Get the identity type. Set this to 'SystemAssigned' in order to automatically create and assign an Azure Active Directory principal for the resource. Possible values include: 'SystemAssigned'.
+ *
+ * @return the type value
+ */
+ public IdentityType type() {
+ return this.type;
+ }
+
+ /**
+ * Set the identity type. Set this to 'SystemAssigned' in order to automatically create and assign an Azure Active Directory principal for the resource. Possible values include: 'SystemAssigned'.
+ *
+ * @param type the type value to set
+ * @return the ResourceIdentity object itself.
+ */
+ public ResourceIdentity withType(IdentityType type) {
+ this.type = type;
+ return this;
+ }
+
+ /**
+ * Get the Azure Active Directory tenant id.
+ *
+ * @return the tenantId value
+ */
+ public UUID tenantId() {
+ return this.tenantId;
+ }
+
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Server.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Server.java
index 86d16a3e36d5..be8bbb267905 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Server.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Server.java
@@ -17,19 +17,25 @@
import com.microsoft.azure.arm.model.Appliable;
import com.microsoft.azure.arm.model.Creatable;
import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.DBForPostgreSQLManager;
import org.joda.time.DateTime;
+import java.util.List;
import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.ServerInner;
/**
* Type representing Server.
*/
-public interface Server extends HasInner, Resource, GroupableResourceCore, HasResourceGroup, Refreshable, Updatable, HasManager {
+public interface Server extends HasInner, Resource, GroupableResourceCore, HasResourceGroup, Refreshable, Updatable, HasManager {
/**
* @return the administratorLogin value.
*/
String administratorLogin();
+ /**
+ * @return the byokEnforcement value.
+ */
+ String byokEnforcement();
+
/**
* @return the earliestRestoreDate value.
*/
@@ -40,11 +46,36 @@ public interface Server extends HasInner, Resource, GroupableResour
*/
String fullyQualifiedDomainName();
+ /**
+ * @return the identity value.
+ */
+ ResourceIdentity identity();
+
+ /**
+ * @return the infrastructureEncryption value.
+ */
+ InfrastructureEncryption infrastructureEncryption();
+
/**
* @return the masterServerId value.
*/
String masterServerId();
+ /**
+ * @return the minimalTlsVersion value.
+ */
+ MinimalTlsVersionEnum minimalTlsVersion();
+
+ /**
+ * @return the privateEndpointConnections value.
+ */
+ List privateEndpointConnections();
+
+ /**
+ * @return the publicNetworkAccess value.
+ */
+ PublicNetworkAccessEnum publicNetworkAccess();
+
/**
* @return the replicaCapacity value.
*/
@@ -137,7 +168,7 @@ interface WithCreate extends Creatable, Resource.DefinitionWithTags, Resource.UpdateWithTags, UpdateStages.WithAdministratorLoginPassword, UpdateStages.WithReplicationRole, UpdateStages.WithSku, UpdateStages.WithSslEnforcement, UpdateStages.WithStorageProfile, UpdateStages.WithVersion {
+ interface Update extends Appliable, Resource.UpdateWithTags, UpdateStages.WithAdministratorLoginPassword, UpdateStages.WithMinimalTlsVersion, UpdateStages.WithReplicationRole, UpdateStages.WithSku, UpdateStages.WithSslEnforcement, UpdateStages.WithStorageProfile, UpdateStages.WithVersion {
}
/**
@@ -156,6 +187,18 @@ interface WithAdministratorLoginPassword {
Update withAdministratorLoginPassword(String administratorLoginPassword);
}
+ /**
+ * The stage of the server update allowing to specify MinimalTlsVersion.
+ */
+ interface WithMinimalTlsVersion {
+ /**
+ * Specifies minimalTlsVersion.
+ * @param minimalTlsVersion Enforce a minimal Tls version for the server. Possible values include: 'TLS1_0', 'TLS1_1', 'TLS1_2', 'TLSEnforcementDisabled'
+ * @return the next update stage
+ */
+ Update withMinimalTlsVersion(MinimalTlsVersionEnum minimalTlsVersion);
+ }
+
/**
* The stage of the server update allowing to specify ReplicationRole.
*/
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerAdministratorResource.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerAdministratorResource.java
new file mode 100644
index 000000000000..b76c40aaf5d5
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerAdministratorResource.java
@@ -0,0 +1,56 @@
+/**
+ * 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.postgresql.v2017_12_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.ServerAdministratorResourceInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.DBForPostgreSQLManager;
+import java.util.UUID;
+
+/**
+ * Type representing ServerAdministratorResource.
+ */
+public interface ServerAdministratorResource extends HasInner, HasManager {
+ /**
+ * @return the administratorType value.
+ */
+ String administratorType();
+
+ /**
+ * @return the id value.
+ */
+ String id();
+
+ /**
+ * @return the login value.
+ */
+ String login();
+
+ /**
+ * @return the name value.
+ */
+ String name();
+
+ /**
+ * @return the sid value.
+ */
+ UUID sid();
+
+ /**
+ * @return the tenantId value.
+ */
+ UUID tenantId();
+
+ /**
+ * @return the type value.
+ */
+ String type();
+
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerAdministrators.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerAdministrators.java
new file mode 100644
index 000000000000..2517fd2f00e3
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerAdministrators.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.postgresql.v2017_12_01_preview;
+
+import rx.Observable;
+import rx.Completable;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.ServerAdministratorResourceInner;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.ServerAdministratorsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ServerAdministrators.
+ */
+public interface ServerAdministrators extends HasInner {
+ /**
+ * Gets information about a AAD server administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the observable for the request
+ */
+ Observable getAsync(String resourceGroupName, String serverName);
+
+ /**
+ * Creates or update active directory administrator on an existing server. The update action will overwrite the existing administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @param properties The required parameters for creating or updating an AAD server administrator.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the observable for the request
+ */
+ Observable createOrUpdateAsync(String resourceGroupName, String serverName, ServerAdministratorResourceInner properties);
+
+ /**
+ * Deletes AAD Administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the observable for the request
+ */
+ Completable deleteAsync(String resourceGroupName, String serverName);
+
+ /**
+ * Returns a list of server Administrators.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the observable for the request
+ */
+ Observable listAsync(String resourceGroupName, String serverName);
+
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPrivateEndpointConnection.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPrivateEndpointConnection.java
new file mode 100644
index 000000000000..bc23992a0165
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPrivateEndpointConnection.java
@@ -0,0 +1,47 @@
+/**
+ * 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.postgresql.v2017_12_01_preview;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A private endpoint connection under a server.
+ */
+public class ServerPrivateEndpointConnection {
+ /**
+ * Resource Id of the private endpoint connection.
+ */
+ @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
+ private String id;
+
+ /**
+ * Private endpoint connection properties.
+ */
+ @JsonProperty(value = "properties", access = JsonProperty.Access.WRITE_ONLY)
+ private PrivateEndpointConnectionProperties properties;
+
+ /**
+ * Get resource Id of the private endpoint connection.
+ *
+ * @return the id value
+ */
+ public String id() {
+ return this.id;
+ }
+
+ /**
+ * Get private endpoint connection properties.
+ *
+ * @return the properties value
+ */
+ public PrivateEndpointConnectionProperties properties() {
+ return this.properties;
+ }
+
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForCreate.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForCreate.java
index 2c9b9a8b7ffc..25ab1c94ab38 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForCreate.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForCreate.java
@@ -16,7 +16,7 @@
/**
* The properties used to create a new server.
*/
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode", defaultImpl = ServerPropertiesForCreate.class)
@JsonTypeName("ServerPropertiesForCreate")
@JsonSubTypes({
@JsonSubTypes.Type(name = "Default", value = ServerPropertiesForDefaultCreate.class),
@@ -39,6 +39,13 @@ public class ServerPropertiesForCreate {
@JsonProperty(value = "sslEnforcement")
private SslEnforcementEnum sslEnforcement;
+ /**
+ * Enforce a minimal Tls version for the server. Possible values include:
+ * 'TLS1_0', 'TLS1_1', 'TLS1_2', 'TLSEnforcementDisabled'.
+ */
+ @JsonProperty(value = "minimalTlsVersion")
+ private MinimalTlsVersionEnum minimalTlsVersion;
+
/**
* Storage profile of a server.
*/
@@ -85,6 +92,26 @@ public ServerPropertiesForCreate withSslEnforcement(SslEnforcementEnum sslEnforc
return this;
}
+ /**
+ * Get enforce a minimal Tls version for the server. Possible values include: 'TLS1_0', 'TLS1_1', 'TLS1_2', 'TLSEnforcementDisabled'.
+ *
+ * @return the minimalTlsVersion value
+ */
+ public MinimalTlsVersionEnum minimalTlsVersion() {
+ return this.minimalTlsVersion;
+ }
+
+ /**
+ * Set enforce a minimal Tls version for the server. Possible values include: 'TLS1_0', 'TLS1_1', 'TLS1_2', 'TLSEnforcementDisabled'.
+ *
+ * @param minimalTlsVersion the minimalTlsVersion value to set
+ * @return the ServerPropertiesForCreate object itself.
+ */
+ public ServerPropertiesForCreate withMinimalTlsVersion(MinimalTlsVersionEnum minimalTlsVersion) {
+ this.minimalTlsVersion = minimalTlsVersion;
+ return this;
+ }
+
/**
* Get storage profile of a server.
*
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForDefaultCreate.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForDefaultCreate.java
index 5f7479e1a387..469547c2e4d9 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForDefaultCreate.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForDefaultCreate.java
@@ -15,7 +15,7 @@
/**
* The properties used to create a new server.
*/
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode", defaultImpl = ServerPropertiesForDefaultCreate.class)
@JsonTypeName("Default")
public class ServerPropertiesForDefaultCreate extends ServerPropertiesForCreate {
/**
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForGeoRestore.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForGeoRestore.java
index 6a35988a9e13..1779c24284a1 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForGeoRestore.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForGeoRestore.java
@@ -16,7 +16,7 @@
* The properties used to create a new server by restoring to a different
* region from a geo replicated backup.
*/
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode", defaultImpl = ServerPropertiesForGeoRestore.class)
@JsonTypeName("GeoRestore")
public class ServerPropertiesForGeoRestore extends ServerPropertiesForCreate {
/**
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForReplica.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForReplica.java
index 8ba0935d815c..6d5c8dceca2d 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForReplica.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForReplica.java
@@ -15,7 +15,7 @@
/**
* The properties to create a new replica.
*/
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode", defaultImpl = ServerPropertiesForReplica.class)
@JsonTypeName("Replica")
public class ServerPropertiesForReplica extends ServerPropertiesForCreate {
/**
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForRestore.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForRestore.java
index b9a34435dd4e..df4e874075c5 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForRestore.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerPropertiesForRestore.java
@@ -16,7 +16,7 @@
/**
* The properties used to create a new server by restoring from a backup.
*/
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode", defaultImpl = ServerPropertiesForRestore.class)
@JsonTypeName("PointInTimeRestore")
public class ServerPropertiesForRestore extends ServerPropertiesForCreate {
/**
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerSecurityAlertPolicy.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerSecurityAlertPolicy.java
index a5339386f6dc..d629071bf63d 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerSecurityAlertPolicy.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerSecurityAlertPolicy.java
@@ -16,13 +16,13 @@
import com.microsoft.azure.arm.model.Appliable;
import com.microsoft.azure.arm.model.Creatable;
import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.DBForPostgreSQLManager;
import java.util.List;
/**
* Type representing ServerSecurityAlertPolicy.
*/
-public interface ServerSecurityAlertPolicy extends HasInner, Indexable, Refreshable, Updatable, HasManager {
+public interface ServerSecurityAlertPolicy extends HasInner, Indexable, Refreshable, Updatable, HasManager {
/**
* @return the disabledAlerts value.
*/
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerServer.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerServer.java
index 87a6c18619bb..8eddd7c7d8a9 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerServer.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerServer.java
@@ -11,19 +11,25 @@
import com.microsoft.azure.arm.model.HasInner;
import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.ServerInner;
import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.DBForPostgreSQLManager;
import org.joda.time.DateTime;
+import java.util.List;
import java.util.Map;
/**
* Type representing ServerServer.
*/
-public interface ServerServer extends HasInner, HasManager {
+public interface ServerServer extends HasInner, HasManager {
/**
* @return the administratorLogin value.
*/
String administratorLogin();
+ /**
+ * @return the byokEnforcement value.
+ */
+ String byokEnforcement();
+
/**
* @return the earliestRestoreDate value.
*/
@@ -39,6 +45,16 @@ public interface ServerServer extends HasInner, HasManager, HasManager privateEndpointConnections();
+
+ /**
+ * @return the publicNetworkAccess value.
+ */
+ PublicNetworkAccessEnum publicNetworkAccess();
+
/**
* @return the replicaCapacity value.
*/
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerState.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerState.java
index fb1872ebf6d7..c1b5b0ca83ab 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerState.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerState.java
@@ -25,6 +25,9 @@ public final class ServerState extends ExpandableStringEnum {
/** Static value Disabled for ServerState. */
public static final ServerState DISABLED = fromString("Disabled");
+ /** Static value Inaccessible for ServerState. */
+ public static final ServerState INACCESSIBLE = fromString("Inaccessible");
+
/**
* Creates or finds a ServerState from its string representation.
* @param name a name to look for
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerUpdateParameters.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerUpdateParameters.java
index cc04ea84e7a8..03fb990742b2 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerUpdateParameters.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerUpdateParameters.java
@@ -49,6 +49,13 @@ public class ServerUpdateParameters {
@JsonProperty(value = "properties.sslEnforcement")
private SslEnforcementEnum sslEnforcement;
+ /**
+ * Enforce a minimal Tls version for the server. Possible values include:
+ * 'TLS1_0', 'TLS1_1', 'TLS1_2', 'TLSEnforcementDisabled'.
+ */
+ @JsonProperty(value = "properties.minimalTlsVersion")
+ private MinimalTlsVersionEnum minimalTlsVersion;
+
/**
* The replication role of the server.
*/
@@ -161,6 +168,26 @@ public ServerUpdateParameters withSslEnforcement(SslEnforcementEnum sslEnforceme
return this;
}
+ /**
+ * Get enforce a minimal Tls version for the server. Possible values include: 'TLS1_0', 'TLS1_1', 'TLS1_2', 'TLSEnforcementDisabled'.
+ *
+ * @return the minimalTlsVersion value
+ */
+ public MinimalTlsVersionEnum minimalTlsVersion() {
+ return this.minimalTlsVersion;
+ }
+
+ /**
+ * Set enforce a minimal Tls version for the server. Possible values include: 'TLS1_0', 'TLS1_1', 'TLS1_2', 'TLSEnforcementDisabled'.
+ *
+ * @param minimalTlsVersion the minimalTlsVersion value to set
+ * @return the ServerUpdateParameters object itself.
+ */
+ public ServerUpdateParameters withMinimalTlsVersion(MinimalTlsVersionEnum minimalTlsVersion) {
+ this.minimalTlsVersion = minimalTlsVersion;
+ return this;
+ }
+
/**
* Get the replication role of the server.
*
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Sku.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Sku.java
index 2f466d7508b8..b68de82fc533 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Sku.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Sku.java
@@ -18,7 +18,7 @@ public class Sku {
* The name of the sku, typically, tier + family + cores, e.g. B_Gen4_1,
* GP_Gen5_8.
*/
- @JsonProperty(value = "name")
+ @JsonProperty(value = "name", required = true)
private String name;
/**
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/VirtualNetworkRule.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/VirtualNetworkRule.java
index 86ca46074630..f63d06ea1fd3 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/VirtualNetworkRule.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/VirtualNetworkRule.java
@@ -16,12 +16,12 @@
import com.microsoft.azure.arm.model.Appliable;
import com.microsoft.azure.arm.model.Creatable;
import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.DBForPostgreSQLManager;
/**
* Type representing VirtualNetworkRule.
*/
-public interface VirtualNetworkRule extends HasInner, Indexable, Refreshable, Updatable, HasManager {
+public interface VirtualNetworkRule extends HasInner, Indexable, Refreshable, Updatable, HasManager {
/**
* @return the id value.
*/
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/CheckNameAvailabilitysImpl.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/CheckNameAvailabilitysImpl.java
index 3efd848712e1..dc2537c463fa 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/CheckNameAvailabilitysImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/CheckNameAvailabilitysImpl.java
@@ -17,14 +17,14 @@
import com.microsoft.azure.management.postgresql.v2017_12_01_preview.NameAvailabilityRequest;
class CheckNameAvailabilitysImpl extends WrapperImpl implements CheckNameAvailabilitys {
- private final PostgreSQLManager manager;
+ private final DBForPostgreSQLManager manager;
- CheckNameAvailabilitysImpl(PostgreSQLManager manager) {
+ CheckNameAvailabilitysImpl(DBForPostgreSQLManager manager) {
super(manager.inner().checkNameAvailabilitys());
this.manager = manager;
}
- public PostgreSQLManager manager() {
+ public DBForPostgreSQLManager manager() {
return this.manager;
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/CheckNameAvailabilitysInner.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/CheckNameAvailabilitysInner.java
index 08066960d9e7..7b85672f26e9 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/CheckNameAvailabilitysInner.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/CheckNameAvailabilitysInner.java
@@ -55,7 +55,7 @@ public CheckNameAvailabilitysInner(Retrofit retrofit, PostgreSQLManagementClient
*/
interface CheckNameAvailabilitysService {
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.CheckNameAvailabilitys execute" })
- @POST("subscriptions/{subscriptionId}/providers/Microsoft.DBforPostgreSQL/checkNameAvailability")
+ @POST("subscriptions/{subscriptionId}/providers/Microsoft.DBForPostgreSQL/checkNameAvailability")
Observable> execute(@Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Body NameAvailabilityRequest nameAvailabilityRequest, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ConfigurationImpl.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ConfigurationImpl.java
index 5797fc860ef2..4918c09cb0c4 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ConfigurationImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ConfigurationImpl.java
@@ -13,12 +13,12 @@
import rx.Observable;
class ConfigurationImpl extends CreatableUpdatableImpl implements Configuration, Configuration.Definition, Configuration.Update {
- private final PostgreSQLManager manager;
+ private final DBForPostgreSQLManager manager;
private String resourceGroupName;
private String serverName;
private String configurationName;
- ConfigurationImpl(String name, PostgreSQLManager manager) {
+ ConfigurationImpl(String name, DBForPostgreSQLManager manager) {
super(name, new ConfigurationInner());
this.manager = manager;
// Set resource name
@@ -26,7 +26,7 @@ class ConfigurationImpl extends CreatableUpdatableImpl implements Configurations {
- private final PostgreSQLManager manager;
+ private final DBForPostgreSQLManager manager;
- ConfigurationsImpl(PostgreSQLManager manager) {
+ ConfigurationsImpl(DBForPostgreSQLManager manager) {
super(manager.inner().configurations());
this.manager = manager;
}
- public PostgreSQLManager manager() {
+ public DBForPostgreSQLManager manager() {
return this.manager;
}
@@ -63,10 +63,14 @@ public Configuration call(ConfigurationInner inner) {
public Observable getAsync(String resourceGroupName, String serverName, String configurationName) {
ConfigurationsInner client = this.inner();
return client.getAsync(resourceGroupName, serverName, configurationName)
- .map(new Func1() {
+ .flatMap(new Func1>() {
@Override
- public Configuration call(ConfigurationInner inner) {
- return wrapModel(inner);
+ public Observable call(ConfigurationInner inner) {
+ if (inner == null) {
+ return Observable.empty();
+ } else {
+ return Observable.just((Configuration)wrapModel(inner));
+ }
}
});
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ConfigurationsInner.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ConfigurationsInner.java
index 3c08824a159c..2a3451be8d3e 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ConfigurationsInner.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ConfigurationsInner.java
@@ -56,19 +56,19 @@ public ConfigurationsInner(Retrofit retrofit, PostgreSQLManagementClientImpl cli
*/
interface ConfigurationsService {
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.Configurations createOrUpdate" })
- @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/configurations/{configurationName}")
+ @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/configurations/{configurationName}")
Observable> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("configurationName") String configurationName, @Query("api-version") String apiVersion, @Body ConfigurationInner parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.Configurations beginCreateOrUpdate" })
- @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/configurations/{configurationName}")
+ @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/configurations/{configurationName}")
Observable> beginCreateOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("configurationName") String configurationName, @Query("api-version") String apiVersion, @Body ConfigurationInner parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.Configurations get" })
- @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/configurations/{configurationName}")
+ @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/configurations/{configurationName}")
Observable> get(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("configurationName") String configurationName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.Configurations listByServer" })
- @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/configurations")
+ @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/configurations")
Observable> listByServer(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DBForPostgreSQLManager.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DBForPostgreSQLManager.java
new file mode 100644
index 000000000000..6689eb4d524a
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DBForPostgreSQLManager.java
@@ -0,0 +1,231 @@
+/**
+ * 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.postgresql.v2017_12_01_preview.implementation;
+
+import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.AzureResponseBuilder;
+import com.microsoft.azure.credentials.AzureTokenCredentials;
+import com.microsoft.azure.management.apigeneration.Beta;
+import com.microsoft.azure.management.apigeneration.Beta.SinceVersion;
+import com.microsoft.azure.arm.resources.AzureConfigurable;
+import com.microsoft.azure.serializer.AzureJacksonAdapter;
+import com.microsoft.rest.RestClient;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.Servers;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.Replicas;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.FirewallRules;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.VirtualNetworkRules;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.Databases;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.Configurations;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.LogFiles;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.ServerAdministrators;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.LocationBasedPerformanceTiers;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.CheckNameAvailabilitys;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.ServerSecurityAlertPolicies;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.Operations;
+import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
+import com.microsoft.azure.arm.resources.implementation.ManagerCore;
+
+/**
+ * Entry point to Azure DBForPostgreSQL resource management.
+ */
+public final class DBForPostgreSQLManager extends ManagerCore {
+ private Servers servers;
+ private Replicas replicas;
+ private FirewallRules firewallRules;
+ private VirtualNetworkRules virtualNetworkRules;
+ private Databases databases;
+ private Configurations configurations;
+ private LogFiles logFiles;
+ private ServerAdministrators serverAdministrators;
+ private LocationBasedPerformanceTiers locationBasedPerformanceTiers;
+ private CheckNameAvailabilitys checkNameAvailabilitys;
+ private ServerSecurityAlertPolicies serverSecurityAlertPolicies;
+ private Operations operations;
+ /**
+ * Get a Configurable instance that can be used to create DBForPostgreSQLManager with optional configuration.
+ *
+ * @return the instance allowing configurations
+ */
+ public static Configurable configure() {
+ return new DBForPostgreSQLManager.ConfigurableImpl();
+ }
+ /**
+ * Creates an instance of DBForPostgreSQLManager that exposes DBForPostgreSQL resource management API entry points.
+ *
+ * @param credentials the credentials to use
+ * @param subscriptionId the subscription UUID
+ * @return the DBForPostgreSQLManager
+ */
+ public static DBForPostgreSQLManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+ return new DBForPostgreSQLManager(new RestClient.Builder()
+ .withBaseUrl(credentials.environment(), AzureEnvironment.Endpoint.RESOURCE_MANAGER)
+ .withCredentials(credentials)
+ .withSerializerAdapter(new AzureJacksonAdapter())
+ .withResponseBuilderFactory(new AzureResponseBuilder.Factory())
+ .build(), subscriptionId);
+ }
+ /**
+ * Creates an instance of DBForPostgreSQLManager that exposes DBForPostgreSQL resource management API entry points.
+ *
+ * @param restClient the RestClient to be used for API calls.
+ * @param subscriptionId the subscription UUID
+ * @return the DBForPostgreSQLManager
+ */
+ public static DBForPostgreSQLManager authenticate(RestClient restClient, String subscriptionId) {
+ return new DBForPostgreSQLManager(restClient, subscriptionId);
+ }
+ /**
+ * The interface allowing configurations to be set.
+ */
+ public interface Configurable extends AzureConfigurable {
+ /**
+ * Creates an instance of DBForPostgreSQLManager that exposes DBForPostgreSQL management API entry points.
+ *
+ * @param credentials the credentials to use
+ * @param subscriptionId the subscription UUID
+ * @return the interface exposing DBForPostgreSQL management API entry points that work across subscriptions
+ */
+ DBForPostgreSQLManager authenticate(AzureTokenCredentials credentials, String subscriptionId);
+ }
+
+ /**
+ * @return Entry point to manage Servers.
+ */
+ public Servers servers() {
+ if (this.servers == null) {
+ this.servers = new ServersImpl(this);
+ }
+ return this.servers;
+ }
+
+ /**
+ * @return Entry point to manage Replicas.
+ */
+ public Replicas replicas() {
+ if (this.replicas == null) {
+ this.replicas = new ReplicasImpl(this);
+ }
+ return this.replicas;
+ }
+
+ /**
+ * @return Entry point to manage FirewallRules.
+ */
+ public FirewallRules firewallRules() {
+ if (this.firewallRules == null) {
+ this.firewallRules = new FirewallRulesImpl(this);
+ }
+ return this.firewallRules;
+ }
+
+ /**
+ * @return Entry point to manage VirtualNetworkRules.
+ */
+ public VirtualNetworkRules virtualNetworkRules() {
+ if (this.virtualNetworkRules == null) {
+ this.virtualNetworkRules = new VirtualNetworkRulesImpl(this);
+ }
+ return this.virtualNetworkRules;
+ }
+
+ /**
+ * @return Entry point to manage Databases.
+ */
+ public Databases databases() {
+ if (this.databases == null) {
+ this.databases = new DatabasesImpl(this);
+ }
+ return this.databases;
+ }
+
+ /**
+ * @return Entry point to manage Configurations.
+ */
+ public Configurations configurations() {
+ if (this.configurations == null) {
+ this.configurations = new ConfigurationsImpl(this);
+ }
+ return this.configurations;
+ }
+
+ /**
+ * @return Entry point to manage LogFiles.
+ */
+ public LogFiles logFiles() {
+ if (this.logFiles == null) {
+ this.logFiles = new LogFilesImpl(this);
+ }
+ return this.logFiles;
+ }
+
+ /**
+ * @return Entry point to manage ServerAdministrators.
+ */
+ public ServerAdministrators serverAdministrators() {
+ if (this.serverAdministrators == null) {
+ this.serverAdministrators = new ServerAdministratorsImpl(this);
+ }
+ return this.serverAdministrators;
+ }
+
+ /**
+ * @return Entry point to manage LocationBasedPerformanceTiers.
+ */
+ public LocationBasedPerformanceTiers locationBasedPerformanceTiers() {
+ if (this.locationBasedPerformanceTiers == null) {
+ this.locationBasedPerformanceTiers = new LocationBasedPerformanceTiersImpl(this);
+ }
+ return this.locationBasedPerformanceTiers;
+ }
+
+ /**
+ * @return Entry point to manage CheckNameAvailabilitys.
+ */
+ public CheckNameAvailabilitys checkNameAvailabilitys() {
+ if (this.checkNameAvailabilitys == null) {
+ this.checkNameAvailabilitys = new CheckNameAvailabilitysImpl(this);
+ }
+ return this.checkNameAvailabilitys;
+ }
+
+ /**
+ * @return Entry point to manage ServerSecurityAlertPolicies.
+ */
+ public ServerSecurityAlertPolicies serverSecurityAlertPolicies() {
+ if (this.serverSecurityAlertPolicies == null) {
+ this.serverSecurityAlertPolicies = new ServerSecurityAlertPoliciesImpl(this);
+ }
+ return this.serverSecurityAlertPolicies;
+ }
+
+ /**
+ * @return Entry point to manage Operations.
+ */
+ public Operations operations() {
+ if (this.operations == null) {
+ this.operations = new OperationsImpl(this);
+ }
+ return this.operations;
+ }
+
+ /**
+ * The implementation for Configurable interface.
+ */
+ private static final class ConfigurableImpl extends AzureConfigurableCoreImpl implements Configurable {
+ public DBForPostgreSQLManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+ return DBForPostgreSQLManager.authenticate(buildRestClient(credentials), subscriptionId);
+ }
+ }
+ private DBForPostgreSQLManager(RestClient restClient, String subscriptionId) {
+ super(
+ restClient,
+ subscriptionId,
+ new PostgreSQLManagementClientImpl(restClient).withSubscriptionId(subscriptionId));
+ }
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DatabaseImpl.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DatabaseImpl.java
index 232cdf57c94e..f3e74b69a2a5 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DatabaseImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DatabaseImpl.java
@@ -13,12 +13,12 @@
import rx.Observable;
class DatabaseImpl extends CreatableUpdatableImpl implements Database, Database.Definition, Database.Update {
- private final PostgreSQLManager manager;
+ private final DBForPostgreSQLManager manager;
private String resourceGroupName;
private String serverName;
private String databaseName;
- DatabaseImpl(String name, PostgreSQLManager manager) {
+ DatabaseImpl(String name, DBForPostgreSQLManager manager) {
super(name, new DatabaseInner());
this.manager = manager;
// Set resource name
@@ -26,7 +26,7 @@ class DatabaseImpl extends CreatableUpdatableImpl implements Databases {
- private final PostgreSQLManager manager;
+ private final DBForPostgreSQLManager manager;
- DatabasesImpl(PostgreSQLManager manager) {
+ DatabasesImpl(DBForPostgreSQLManager manager) {
super(manager.inner().databases());
this.manager = manager;
}
- public PostgreSQLManager manager() {
+ public DBForPostgreSQLManager manager() {
return this.manager;
}
@@ -64,10 +64,14 @@ public Database call(DatabaseInner inner) {
public Observable getAsync(String resourceGroupName, String serverName, String databaseName) {
DatabasesInner client = this.inner();
return client.getAsync(resourceGroupName, serverName, databaseName)
- .map(new Func1() {
+ .flatMap(new Func1>() {
@Override
- public Database call(DatabaseInner inner) {
- return wrapModel(inner);
+ public Observable call(DatabaseInner inner) {
+ if (inner == null) {
+ return Observable.empty();
+ } else {
+ return Observable.just((Database)wrapModel(inner));
+ }
}
});
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DatabasesInner.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DatabasesInner.java
index 599c33cc8767..db83660e9ebd 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DatabasesInner.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DatabasesInner.java
@@ -57,27 +57,27 @@ public DatabasesInner(Retrofit retrofit, PostgreSQLManagementClientImpl client)
*/
interface DatabasesService {
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.Databases createOrUpdate" })
- @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/databases/{databaseName}")
+ @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/databases/{databaseName}")
Observable> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("databaseName") String databaseName, @Query("api-version") String apiVersion, @Body DatabaseInner parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.Databases beginCreateOrUpdate" })
- @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/databases/{databaseName}")
+ @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/databases/{databaseName}")
Observable> beginCreateOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("databaseName") String databaseName, @Query("api-version") String apiVersion, @Body DatabaseInner parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.Databases delete" })
- @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/databases/{databaseName}", method = "DELETE", hasBody = true)
+ @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/databases/{databaseName}", method = "DELETE", hasBody = true)
Observable> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("databaseName") String databaseName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.Databases beginDelete" })
- @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/databases/{databaseName}", method = "DELETE", hasBody = true)
+ @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/databases/{databaseName}", method = "DELETE", hasBody = true)
Observable> beginDelete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("databaseName") String databaseName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.Databases get" })
- @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/databases/{databaseName}")
+ @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/databases/{databaseName}")
Observable> get(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("databaseName") String databaseName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.Databases listByServer" })
- @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/databases")
+ @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/databases")
Observable> listByServer(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/FirewallRuleImpl.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/FirewallRuleImpl.java
index d077940aa779..7a2042f36df8 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/FirewallRuleImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/FirewallRuleImpl.java
@@ -13,12 +13,12 @@
import rx.Observable;
class FirewallRuleImpl extends CreatableUpdatableImpl implements FirewallRule, FirewallRule.Definition, FirewallRule.Update {
- private final PostgreSQLManager manager;
+ private final DBForPostgreSQLManager manager;
private String resourceGroupName;
private String serverName;
private String firewallRuleName;
- FirewallRuleImpl(String name, PostgreSQLManager manager) {
+ FirewallRuleImpl(String name, DBForPostgreSQLManager manager) {
super(name, new FirewallRuleInner());
this.manager = manager;
// Set resource name
@@ -26,7 +26,7 @@ class FirewallRuleImpl extends CreatableUpdatableImpl implements FirewallRules {
- private final PostgreSQLManager manager;
+ private final DBForPostgreSQLManager manager;
- FirewallRulesImpl(PostgreSQLManager manager) {
+ FirewallRulesImpl(DBForPostgreSQLManager manager) {
super(manager.inner().firewallRules());
this.manager = manager;
}
- public PostgreSQLManager manager() {
+ public DBForPostgreSQLManager manager() {
return this.manager;
}
@@ -64,10 +64,14 @@ public FirewallRule call(FirewallRuleInner inner) {
public Observable getAsync(String resourceGroupName, String serverName, String firewallRuleName) {
FirewallRulesInner client = this.inner();
return client.getAsync(resourceGroupName, serverName, firewallRuleName)
- .map(new Func1() {
+ .flatMap(new Func1>() {
@Override
- public FirewallRule call(FirewallRuleInner inner) {
- return wrapModel(inner);
+ public Observable call(FirewallRuleInner inner) {
+ if (inner == null) {
+ return Observable.empty();
+ } else {
+ return Observable.just((FirewallRule)wrapModel(inner));
+ }
}
});
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/FirewallRulesInner.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/FirewallRulesInner.java
index d4aabb9fb7b5..1351b4e2d1f4 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/FirewallRulesInner.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/FirewallRulesInner.java
@@ -57,27 +57,27 @@ public FirewallRulesInner(Retrofit retrofit, PostgreSQLManagementClientImpl clie
*/
interface FirewallRulesService {
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.FirewallRules createOrUpdate" })
- @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/firewallRules/{firewallRuleName}")
+ @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/firewallRules/{firewallRuleName}")
Observable> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("firewallRuleName") String firewallRuleName, @Query("api-version") String apiVersion, @Body FirewallRuleInner parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.FirewallRules beginCreateOrUpdate" })
- @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/firewallRules/{firewallRuleName}")
+ @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/firewallRules/{firewallRuleName}")
Observable> beginCreateOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("firewallRuleName") String firewallRuleName, @Query("api-version") String apiVersion, @Body FirewallRuleInner parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.FirewallRules delete" })
- @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/firewallRules/{firewallRuleName}", method = "DELETE", hasBody = true)
+ @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/firewallRules/{firewallRuleName}", method = "DELETE", hasBody = true)
Observable> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("firewallRuleName") String firewallRuleName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.FirewallRules beginDelete" })
- @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/firewallRules/{firewallRuleName}", method = "DELETE", hasBody = true)
+ @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/firewallRules/{firewallRuleName}", method = "DELETE", hasBody = true)
Observable> beginDelete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("firewallRuleName") String firewallRuleName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.FirewallRules get" })
- @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/firewallRules/{firewallRuleName}")
+ @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/firewallRules/{firewallRuleName}")
Observable> get(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Path("firewallRuleName") String firewallRuleName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.FirewallRules listByServer" })
- @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/firewallRules")
+ @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/firewallRules")
Observable> listByServer(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LocationBasedPerformanceTiersImpl.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LocationBasedPerformanceTiersImpl.java
index bb1715b7c2dd..962f7492b4dd 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LocationBasedPerformanceTiersImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LocationBasedPerformanceTiersImpl.java
@@ -17,14 +17,14 @@
import com.microsoft.azure.management.postgresql.v2017_12_01_preview.PerformanceTierProperties;
class LocationBasedPerformanceTiersImpl extends WrapperImpl implements LocationBasedPerformanceTiers {
- private final PostgreSQLManager manager;
+ private final DBForPostgreSQLManager manager;
- LocationBasedPerformanceTiersImpl(PostgreSQLManager manager) {
+ LocationBasedPerformanceTiersImpl(DBForPostgreSQLManager manager) {
super(manager.inner().locationBasedPerformanceTiers());
this.manager = manager;
}
- public PostgreSQLManager manager() {
+ public DBForPostgreSQLManager manager() {
return this.manager;
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LocationBasedPerformanceTiersInner.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LocationBasedPerformanceTiersInner.java
index 7bb70861f515..c0e696e8de58 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LocationBasedPerformanceTiersInner.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LocationBasedPerformanceTiersInner.java
@@ -53,7 +53,7 @@ public LocationBasedPerformanceTiersInner(Retrofit retrofit, PostgreSQLManagemen
*/
interface LocationBasedPerformanceTiersService {
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.LocationBasedPerformanceTiers list" })
- @GET("subscriptions/{subscriptionId}/providers/Microsoft.DBforPostgreSQL/locations/{locationName}/performanceTiers")
+ @GET("subscriptions/{subscriptionId}/providers/Microsoft.DBForPostgreSQL/locations/{locationName}/performanceTiers")
Observable> list(@Path("subscriptionId") String subscriptionId, @Path("locationName") String locationName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LogFileImpl.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LogFileImpl.java
index 7b7f0d6a2957..001e2e83d109 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LogFileImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LogFileImpl.java
@@ -14,15 +14,15 @@
import org.joda.time.DateTime;
class LogFileImpl extends WrapperImpl implements LogFile {
- private final PostgreSQLManager manager;
+ private final DBForPostgreSQLManager manager;
- LogFileImpl(LogFileInner inner, PostgreSQLManager manager) {
+ LogFileImpl(LogFileInner inner, DBForPostgreSQLManager manager) {
super(inner);
this.manager = manager;
}
@Override
- public PostgreSQLManager manager() {
+ public DBForPostgreSQLManager manager() {
return this.manager;
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LogFilesImpl.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LogFilesImpl.java
index 97eefa1b6136..9820531944a0 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LogFilesImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LogFilesImpl.java
@@ -17,14 +17,14 @@
import com.microsoft.azure.management.postgresql.v2017_12_01_preview.LogFile;
class LogFilesImpl extends WrapperImpl implements LogFiles {
- private final PostgreSQLManager manager;
+ private final DBForPostgreSQLManager manager;
- LogFilesImpl(PostgreSQLManager manager) {
+ LogFilesImpl(DBForPostgreSQLManager manager) {
super(manager.inner().logFiles());
this.manager = manager;
}
- public PostgreSQLManager manager() {
+ public DBForPostgreSQLManager manager() {
return this.manager;
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LogFilesInner.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LogFilesInner.java
index fadbe10a198f..777dfb6880e0 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LogFilesInner.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LogFilesInner.java
@@ -53,7 +53,7 @@ public LogFilesInner(Retrofit retrofit, PostgreSQLManagementClientImpl client) {
*/
interface LogFilesService {
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.LogFiles listByServer" })
- @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/logFiles")
+ @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/logFiles")
Observable> listByServer(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/NameAvailabilityImpl.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/NameAvailabilityImpl.java
index f9a48025c369..031da0f443a2 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/NameAvailabilityImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/NameAvailabilityImpl.java
@@ -12,14 +12,14 @@
import com.microsoft.azure.arm.model.implementation.WrapperImpl;
class NameAvailabilityImpl extends WrapperImpl implements NameAvailability {
- private final PostgreSQLManager manager;
- NameAvailabilityImpl(NameAvailabilityInner inner, PostgreSQLManager manager) {
+ private final DBForPostgreSQLManager manager;
+ NameAvailabilityImpl(NameAvailabilityInner inner, DBForPostgreSQLManager manager) {
super(inner);
this.manager = manager;
}
@Override
- public PostgreSQLManager manager() {
+ public DBForPostgreSQLManager manager() {
return this.manager;
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/OperationListResultImpl.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/OperationListResultImpl.java
index e699189ad89c..4124e9068c08 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/OperationListResultImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/OperationListResultImpl.java
@@ -13,14 +13,14 @@
import java.util.List;
class OperationListResultImpl extends WrapperImpl implements OperationListResult {
- private final PostgreSQLManager manager;
- OperationListResultImpl(OperationListResultInner inner, PostgreSQLManager manager) {
+ private final DBForPostgreSQLManager manager;
+ OperationListResultImpl(OperationListResultInner inner, DBForPostgreSQLManager manager) {
super(inner);
this.manager = manager;
}
@Override
- public PostgreSQLManager manager() {
+ public DBForPostgreSQLManager manager() {
return this.manager;
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/OperationsImpl.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/OperationsImpl.java
index 65f024003a52..9153cac00105 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/OperationsImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/OperationsImpl.java
@@ -16,14 +16,14 @@
import com.microsoft.azure.management.postgresql.v2017_12_01_preview.OperationListResult;
class OperationsImpl extends WrapperImpl implements Operations {
- private final PostgreSQLManager manager;
+ private final DBForPostgreSQLManager manager;
- OperationsImpl(PostgreSQLManager manager) {
+ OperationsImpl(DBForPostgreSQLManager manager) {
super(manager.inner().operations());
this.manager = manager;
}
- public PostgreSQLManager manager() {
+ public DBForPostgreSQLManager manager() {
return this.manager;
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/OperationsInner.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/OperationsInner.java
index 24120415b2b6..67a15fc0d96b 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/OperationsInner.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/OperationsInner.java
@@ -51,7 +51,7 @@ public OperationsInner(Retrofit retrofit, PostgreSQLManagementClientImpl client)
*/
interface OperationsService {
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.Operations list" })
- @GET("providers/Microsoft.DBforPostgreSQL/operations")
+ @GET("providers/Microsoft.DBForPostgreSQL/operations")
Observable> list(@Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/PerformanceTierPropertiesImpl.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/PerformanceTierPropertiesImpl.java
index 87dceb2f6148..51351c9ca4cc 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/PerformanceTierPropertiesImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/PerformanceTierPropertiesImpl.java
@@ -15,15 +15,15 @@
import com.microsoft.azure.management.postgresql.v2017_12_01_preview.PerformanceTierServiceLevelObjectives;
class PerformanceTierPropertiesImpl extends WrapperImpl implements PerformanceTierProperties {
- private final PostgreSQLManager manager;
+ private final DBForPostgreSQLManager manager;
- PerformanceTierPropertiesImpl(PerformanceTierPropertiesInner inner, PostgreSQLManager manager) {
+ PerformanceTierPropertiesImpl(PerformanceTierPropertiesInner inner, DBForPostgreSQLManager manager) {
super(inner);
this.manager = manager;
}
@Override
- public PostgreSQLManager manager() {
+ public DBForPostgreSQLManager manager() {
return this.manager;
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/PostgreSQLManagementClientImpl.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/PostgreSQLManagementClientImpl.java
index 54dfa8f85466..72d644c3f2db 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/PostgreSQLManagementClientImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/PostgreSQLManagementClientImpl.java
@@ -223,6 +223,19 @@ public LogFilesInner logFiles() {
return this.logFiles;
}
+ /**
+ * The ServerAdministratorsInner object to access its operations.
+ */
+ private ServerAdministratorsInner serverAdministrators;
+
+ /**
+ * Gets the ServerAdministratorsInner object to access its operations.
+ * @return the ServerAdministratorsInner object.
+ */
+ public ServerAdministratorsInner serverAdministrators() {
+ return this.serverAdministrators;
+ }
+
/**
* The LocationBasedPerformanceTiersInner object to access its operations.
*/
@@ -317,6 +330,7 @@ protected void initialize() {
this.databases = new DatabasesInner(restClient().retrofit(), this);
this.configurations = new ConfigurationsInner(restClient().retrofit(), this);
this.logFiles = new LogFilesInner(restClient().retrofit(), this);
+ this.serverAdministrators = new ServerAdministratorsInner(restClient().retrofit(), this);
this.locationBasedPerformanceTiers = new LocationBasedPerformanceTiersInner(restClient().retrofit(), this);
this.checkNameAvailabilitys = new CheckNameAvailabilitysInner(restClient().retrofit(), this);
this.serverSecurityAlertPolicies = new ServerSecurityAlertPoliciesInner(restClient().retrofit(), this);
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ReplicasImpl.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ReplicasImpl.java
index 4c3ed2ded43d..6b74cd9ec8f7 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ReplicasImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ReplicasImpl.java
@@ -17,14 +17,14 @@
import com.microsoft.azure.management.postgresql.v2017_12_01_preview.ServerServer;
class ReplicasImpl extends WrapperImpl implements Replicas {
- private final PostgreSQLManager manager;
+ private final DBForPostgreSQLManager manager;
- ReplicasImpl(PostgreSQLManager manager) {
+ ReplicasImpl(DBForPostgreSQLManager manager) {
super(manager.inner().replicas());
this.manager = manager;
}
- public PostgreSQLManager manager() {
+ public DBForPostgreSQLManager manager() {
return this.manager;
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ReplicasInner.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ReplicasInner.java
index d407061a5a5a..31be79bc9512 100644
--- a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ReplicasInner.java
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ReplicasInner.java
@@ -53,7 +53,7 @@ public ReplicasInner(Retrofit retrofit, PostgreSQLManagementClientImpl client) {
*/
interface ReplicasService {
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.Replicas listByServer" })
- @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/Replicas")
+ @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/Replicas")
Observable> listByServer(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerAdministratorResourceImpl.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerAdministratorResourceImpl.java
new file mode 100644
index 000000000000..4cc2cb7ca4e9
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerAdministratorResourceImpl.java
@@ -0,0 +1,66 @@
+/**
+ * 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.postgresql.v2017_12_01_preview.implementation;
+
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.ServerAdministratorResource;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import rx.Observable;
+import java.util.UUID;
+
+class ServerAdministratorResourceImpl extends WrapperImpl implements ServerAdministratorResource {
+ private final DBForPostgreSQLManager manager;
+
+ ServerAdministratorResourceImpl(ServerAdministratorResourceInner inner, DBForPostgreSQLManager manager) {
+ super(inner);
+ this.manager = manager;
+ }
+
+ @Override
+ public DBForPostgreSQLManager manager() {
+ return this.manager;
+ }
+
+
+
+ @Override
+ public String administratorType() {
+ return this.inner().administratorType();
+ }
+
+ @Override
+ public String id() {
+ return this.inner().id();
+ }
+
+ @Override
+ public String login() {
+ return this.inner().login();
+ }
+
+ @Override
+ public String name() {
+ return this.inner().name();
+ }
+
+ @Override
+ public UUID sid() {
+ return this.inner().sid();
+ }
+
+ @Override
+ public UUID tenantId() {
+ return this.inner().tenantId();
+ }
+
+ @Override
+ public String type() {
+ return this.inner().type();
+ }
+
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerAdministratorResourceInner.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerAdministratorResourceInner.java
new file mode 100644
index 000000000000..b44761d09742
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerAdministratorResourceInner.java
@@ -0,0 +1,135 @@
+/**
+ * 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.postgresql.v2017_12_01_preview.implementation;
+
+import java.util.UUID;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * Represents a and external administrator to be created.
+ */
+@JsonFlatten
+public class ServerAdministratorResourceInner extends ProxyResource {
+ /**
+ * The type of administrator.
+ */
+ @JsonProperty(value = "properties.administratorType", required = true)
+ private String administratorType;
+
+ /**
+ * The server administrator login account name.
+ */
+ @JsonProperty(value = "properties.login", required = true)
+ private String login;
+
+ /**
+ * The server administrator Sid (Secure ID).
+ */
+ @JsonProperty(value = "properties.sid", required = true)
+ private UUID sid;
+
+ /**
+ * The server Active Directory Administrator tenant id.
+ */
+ @JsonProperty(value = "properties.tenantId", required = true)
+ private UUID tenantId;
+
+ /**
+ * Creates an instance of ServerAdministratorResourceInner class.
+ * @param login the server administrator login account name.
+ * @param sid the server administrator Sid (Secure ID).
+ * @param tenantId the server Active Directory Administrator tenant id.
+ */
+ public ServerAdministratorResourceInner() {
+ administratorType = "ActiveDirectory";
+ }
+
+ /**
+ * Get the type of administrator.
+ *
+ * @return the administratorType value
+ */
+ public String administratorType() {
+ return this.administratorType;
+ }
+
+ /**
+ * Set the type of administrator.
+ *
+ * @param administratorType the administratorType value to set
+ * @return the ServerAdministratorResourceInner object itself.
+ */
+ public ServerAdministratorResourceInner withAdministratorType(String administratorType) {
+ this.administratorType = administratorType;
+ return this;
+ }
+
+ /**
+ * Get the server administrator login account name.
+ *
+ * @return the login value
+ */
+ public String login() {
+ return this.login;
+ }
+
+ /**
+ * Set the server administrator login account name.
+ *
+ * @param login the login value to set
+ * @return the ServerAdministratorResourceInner object itself.
+ */
+ public ServerAdministratorResourceInner withLogin(String login) {
+ this.login = login;
+ return this;
+ }
+
+ /**
+ * Get the server administrator Sid (Secure ID).
+ *
+ * @return the sid value
+ */
+ public UUID sid() {
+ return this.sid;
+ }
+
+ /**
+ * Set the server administrator Sid (Secure ID).
+ *
+ * @param sid the sid value to set
+ * @return the ServerAdministratorResourceInner object itself.
+ */
+ public ServerAdministratorResourceInner withSid(UUID sid) {
+ this.sid = sid;
+ return this;
+ }
+
+ /**
+ * Get the server Active Directory Administrator tenant id.
+ *
+ * @return the tenantId value
+ */
+ public UUID tenantId() {
+ return this.tenantId;
+ }
+
+ /**
+ * Set the server Active Directory Administrator tenant id.
+ *
+ * @param tenantId the tenantId value to set
+ * @return the ServerAdministratorResourceInner object itself.
+ */
+ public ServerAdministratorResourceInner withTenantId(UUID tenantId) {
+ this.tenantId = tenantId;
+ return this;
+ }
+
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerAdministratorsImpl.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerAdministratorsImpl.java
new file mode 100644
index 000000000000..76d86d323b7e
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerAdministratorsImpl.java
@@ -0,0 +1,84 @@
+/**
+ * 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.postgresql.v2017_12_01_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.ServerAdministrators;
+import rx.Observable;
+import rx.functions.Func1;
+import java.util.List;
+import rx.Completable;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.ServerAdministratorResource;
+
+class ServerAdministratorsImpl extends WrapperImpl implements ServerAdministrators {
+ private final DBForPostgreSQLManager manager;
+
+ ServerAdministratorsImpl(DBForPostgreSQLManager manager) {
+ super(manager.inner().serverAdministrators());
+ this.manager = manager;
+ }
+
+ public DBForPostgreSQLManager manager() {
+ return this.manager;
+ }
+
+ private ServerAdministratorResourceImpl wrapModel(ServerAdministratorResourceInner inner) {
+ return new ServerAdministratorResourceImpl(inner, manager());
+ }
+
+ @Override
+ public Observable getAsync(String resourceGroupName, String serverName) {
+ ServerAdministratorsInner client = this.inner();
+ return client.getAsync(resourceGroupName, serverName)
+ .map(new Func1() {
+ @Override
+ public ServerAdministratorResource call(ServerAdministratorResourceInner inner) {
+ return new ServerAdministratorResourceImpl(inner, manager());
+ }
+ });
+ }
+
+ @Override
+ public Observable createOrUpdateAsync(String resourceGroupName, String serverName, ServerAdministratorResourceInner properties) {
+ ServerAdministratorsInner client = this.inner();
+ return client.createOrUpdateAsync(resourceGroupName, serverName, properties)
+ .map(new Func1() {
+ @Override
+ public ServerAdministratorResource call(ServerAdministratorResourceInner inner) {
+ return new ServerAdministratorResourceImpl(inner, manager());
+ }
+ });
+ }
+
+ @Override
+ public Completable deleteAsync(String resourceGroupName, String serverName) {
+ ServerAdministratorsInner client = this.inner();
+ return client.deleteAsync(resourceGroupName, serverName).toCompletable();
+ }
+
+ @Override
+ public Observable listAsync(String resourceGroupName, String serverName) {
+ ServerAdministratorsInner client = this.inner();
+ return client.listAsync(resourceGroupName, serverName)
+ .flatMap(new Func1, Observable>() {
+ @Override
+ public Observable call(List innerList) {
+ return Observable.from(innerList);
+ }
+ })
+ .map(new Func1() {
+ @Override
+ public ServerAdministratorResource call(ServerAdministratorResourceInner inner) {
+ return wrapModel(inner);
+ }
+ });
+ }
+
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerAdministratorsInner.java b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerAdministratorsInner.java
new file mode 100644
index 000000000000..b05e09582c51
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerAdministratorsInner.java
@@ -0,0 +1,590 @@
+/**
+ * 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.postgresql.v2017_12_01_preview.implementation;
+
+import com.microsoft.azure.arm.collection.InnerSupportsDelete;
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.CloudException;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.Path;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ServerAdministrators.
+ */
+public class ServerAdministratorsInner implements InnerSupportsDelete {
+ /** The Retrofit service to perform REST calls. */
+ private ServerAdministratorsService service;
+ /** The service client containing this operation class. */
+ private PostgreSQLManagementClientImpl client;
+
+ /**
+ * Initializes an instance of ServerAdministratorsInner.
+ *
+ * @param retrofit the Retrofit instance built from a Retrofit Builder.
+ * @param client the instance of the service client containing this operation class.
+ */
+ public ServerAdministratorsInner(Retrofit retrofit, PostgreSQLManagementClientImpl client) {
+ this.service = retrofit.create(ServerAdministratorsService.class);
+ this.client = client;
+ }
+
+ /**
+ * The interface defining all the services for ServerAdministrators to be
+ * used by Retrofit to perform actually REST calls.
+ */
+ interface ServerAdministratorsService {
+ @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.ServerAdministrators get" })
+ @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/Administrators/activeDirectory")
+ Observable> get(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+ @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.ServerAdministrators createOrUpdate" })
+ @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/Administrators/activeDirectory")
+ Observable> createOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Query("api-version") String apiVersion, @Body ServerAdministratorResourceInner properties, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+ @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.ServerAdministrators beginCreateOrUpdate" })
+ @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/Administrators/activeDirectory")
+ Observable> beginCreateOrUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Query("api-version") String apiVersion, @Body ServerAdministratorResourceInner properties, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+ @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.ServerAdministrators delete" })
+ @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/Administrators/activeDirectory", method = "DELETE", hasBody = true)
+ Observable> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+ @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.ServerAdministrators beginDelete" })
+ @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/Administrators/activeDirectory", method = "DELETE", hasBody = true)
+ Observable> beginDelete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+ @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.postgresql.v2017_12_01_preview.ServerAdministrators list" })
+ @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForPostgreSQL/servers/{serverName}/administrators")
+ Observable> list(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("serverName") String serverName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+ }
+
+ /**
+ * Gets information about a AAD server administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @throws CloudException thrown if the request is rejected by server
+ * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+ * @return the ServerAdministratorResourceInner object if successful.
+ */
+ public ServerAdministratorResourceInner get(String resourceGroupName, String serverName) {
+ return getWithServiceResponseAsync(resourceGroupName, serverName).toBlocking().single().body();
+ }
+
+ /**
+ * Gets information about a AAD server administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the {@link ServiceFuture} object
+ */
+ public ServiceFuture getAsync(String resourceGroupName, String serverName, final ServiceCallback serviceCallback) {
+ return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, serverName), serviceCallback);
+ }
+
+ /**
+ * Gets information about a AAD server administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the observable to the ServerAdministratorResourceInner object
+ */
+ public Observable getAsync(String resourceGroupName, String serverName) {
+ return getWithServiceResponseAsync(resourceGroupName, serverName).map(new Func1, ServerAdministratorResourceInner>() {
+ @Override
+ public ServerAdministratorResourceInner call(ServiceResponse response) {
+ return response.body();
+ }
+ });
+ }
+
+ /**
+ * Gets information about a AAD server administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the observable to the ServerAdministratorResourceInner object
+ */
+ public Observable> getWithServiceResponseAsync(String resourceGroupName, String serverName) {
+ if (this.client.subscriptionId() == null) {
+ throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+ }
+ if (resourceGroupName == null) {
+ throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+ }
+ if (serverName == null) {
+ throw new IllegalArgumentException("Parameter serverName is required and cannot be null.");
+ }
+ if (this.client.apiVersion() == null) {
+ throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+ }
+ return service.get(this.client.subscriptionId(), resourceGroupName, serverName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+ .flatMap(new Func1, Observable>>() {
+ @Override
+ public Observable> call(Response response) {
+ try {
+ ServiceResponse clientResponse = getDelegate(response);
+ return Observable.just(clientResponse);
+ } catch (Throwable t) {
+ return Observable.error(t);
+ }
+ }
+ });
+ }
+
+ private ServiceResponse getDelegate(Response response) throws CloudException, IOException, IllegalArgumentException {
+ return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter())
+ .register(200, new TypeToken() { }.getType())
+ .registerError(CloudException.class)
+ .build(response);
+ }
+
+ /**
+ * Creates or update active directory administrator on an existing server. The update action will overwrite the existing administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @param properties The required parameters for creating or updating an AAD server administrator.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @throws CloudException thrown if the request is rejected by server
+ * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+ * @return the ServerAdministratorResourceInner object if successful.
+ */
+ public ServerAdministratorResourceInner createOrUpdate(String resourceGroupName, String serverName, ServerAdministratorResourceInner properties) {
+ return createOrUpdateWithServiceResponseAsync(resourceGroupName, serverName, properties).toBlocking().last().body();
+ }
+
+ /**
+ * Creates or update active directory administrator on an existing server. The update action will overwrite the existing administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @param properties The required parameters for creating or updating an AAD server administrator.
+ * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the {@link ServiceFuture} object
+ */
+ public ServiceFuture createOrUpdateAsync(String resourceGroupName, String serverName, ServerAdministratorResourceInner properties, final ServiceCallback serviceCallback) {
+ return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, serverName, properties), serviceCallback);
+ }
+
+ /**
+ * Creates or update active directory administrator on an existing server. The update action will overwrite the existing administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @param properties The required parameters for creating or updating an AAD server administrator.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the observable for the request
+ */
+ public Observable createOrUpdateAsync(String resourceGroupName, String serverName, ServerAdministratorResourceInner properties) {
+ return createOrUpdateWithServiceResponseAsync(resourceGroupName, serverName, properties).map(new Func1, ServerAdministratorResourceInner>() {
+ @Override
+ public ServerAdministratorResourceInner call(ServiceResponse response) {
+ return response.body();
+ }
+ });
+ }
+
+ /**
+ * Creates or update active directory administrator on an existing server. The update action will overwrite the existing administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @param properties The required parameters for creating or updating an AAD server administrator.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the observable for the request
+ */
+ public Observable> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String serverName, ServerAdministratorResourceInner properties) {
+ if (this.client.subscriptionId() == null) {
+ throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+ }
+ if (resourceGroupName == null) {
+ throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+ }
+ if (serverName == null) {
+ throw new IllegalArgumentException("Parameter serverName is required and cannot be null.");
+ }
+ if (this.client.apiVersion() == null) {
+ throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+ }
+ if (properties == null) {
+ throw new IllegalArgumentException("Parameter properties is required and cannot be null.");
+ }
+ Validator.validate(properties);
+ Observable> observable = service.createOrUpdate(this.client.subscriptionId(), resourceGroupName, serverName, this.client.apiVersion(), properties, this.client.acceptLanguage(), this.client.userAgent());
+ return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken() { }.getType());
+ }
+
+ /**
+ * Creates or update active directory administrator on an existing server. The update action will overwrite the existing administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @param properties The required parameters for creating or updating an AAD server administrator.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @throws CloudException thrown if the request is rejected by server
+ * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+ * @return the ServerAdministratorResourceInner object if successful.
+ */
+ public ServerAdministratorResourceInner beginCreateOrUpdate(String resourceGroupName, String serverName, ServerAdministratorResourceInner properties) {
+ return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, serverName, properties).toBlocking().single().body();
+ }
+
+ /**
+ * Creates or update active directory administrator on an existing server. The update action will overwrite the existing administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @param properties The required parameters for creating or updating an AAD server administrator.
+ * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the {@link ServiceFuture} object
+ */
+ public ServiceFuture beginCreateOrUpdateAsync(String resourceGroupName, String serverName, ServerAdministratorResourceInner properties, final ServiceCallback serviceCallback) {
+ return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, serverName, properties), serviceCallback);
+ }
+
+ /**
+ * Creates or update active directory administrator on an existing server. The update action will overwrite the existing administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @param properties The required parameters for creating or updating an AAD server administrator.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the observable to the ServerAdministratorResourceInner object
+ */
+ public Observable beginCreateOrUpdateAsync(String resourceGroupName, String serverName, ServerAdministratorResourceInner properties) {
+ return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, serverName, properties).map(new Func1, ServerAdministratorResourceInner>() {
+ @Override
+ public ServerAdministratorResourceInner call(ServiceResponse response) {
+ return response.body();
+ }
+ });
+ }
+
+ /**
+ * Creates or update active directory administrator on an existing server. The update action will overwrite the existing administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @param properties The required parameters for creating or updating an AAD server administrator.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the observable to the ServerAdministratorResourceInner object
+ */
+ public Observable> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String serverName, ServerAdministratorResourceInner properties) {
+ if (this.client.subscriptionId() == null) {
+ throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+ }
+ if (resourceGroupName == null) {
+ throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+ }
+ if (serverName == null) {
+ throw new IllegalArgumentException("Parameter serverName is required and cannot be null.");
+ }
+ if (this.client.apiVersion() == null) {
+ throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+ }
+ if (properties == null) {
+ throw new IllegalArgumentException("Parameter properties is required and cannot be null.");
+ }
+ Validator.validate(properties);
+ return service.beginCreateOrUpdate(this.client.subscriptionId(), resourceGroupName, serverName, this.client.apiVersion(), properties, this.client.acceptLanguage(), this.client.userAgent())
+ .flatMap(new Func1, Observable>>() {
+ @Override
+ public Observable> call(Response response) {
+ try {
+ ServiceResponse clientResponse = beginCreateOrUpdateDelegate(response);
+ return Observable.just(clientResponse);
+ } catch (Throwable t) {
+ return Observable.error(t);
+ }
+ }
+ });
+ }
+
+ private ServiceResponse beginCreateOrUpdateDelegate(Response response) throws CloudException, IOException, IllegalArgumentException {
+ return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter())
+ .register(200, new TypeToken() { }.getType())
+ .register(202, new TypeToken() { }.getType())
+ .registerError(CloudException.class)
+ .build(response);
+ }
+
+ /**
+ * Deletes AAD Administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @throws CloudException thrown if the request is rejected by server
+ * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+ */
+ public void delete(String resourceGroupName, String serverName) {
+ deleteWithServiceResponseAsync(resourceGroupName, serverName).toBlocking().last().body();
+ }
+
+ /**
+ * Deletes AAD Administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the {@link ServiceFuture} object
+ */
+ public ServiceFuture deleteAsync(String resourceGroupName, String serverName, final ServiceCallback serviceCallback) {
+ return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, serverName), serviceCallback);
+ }
+
+ /**
+ * Deletes AAD Administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the observable for the request
+ */
+ public Observable deleteAsync(String resourceGroupName, String serverName) {
+ return deleteWithServiceResponseAsync(resourceGroupName, serverName).map(new Func1, Void>() {
+ @Override
+ public Void call(ServiceResponse response) {
+ return response.body();
+ }
+ });
+ }
+
+ /**
+ * Deletes AAD Administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the observable for the request
+ */
+ public Observable> deleteWithServiceResponseAsync(String resourceGroupName, String serverName) {
+ if (this.client.subscriptionId() == null) {
+ throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+ }
+ if (resourceGroupName == null) {
+ throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+ }
+ if (serverName == null) {
+ throw new IllegalArgumentException("Parameter serverName is required and cannot be null.");
+ }
+ if (this.client.apiVersion() == null) {
+ throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+ }
+ Observable> observable = service.delete(this.client.subscriptionId(), resourceGroupName, serverName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+ return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType());
+ }
+
+ /**
+ * Deletes AAD Administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @throws CloudException thrown if the request is rejected by server
+ * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+ */
+ public void beginDelete(String resourceGroupName, String serverName) {
+ beginDeleteWithServiceResponseAsync(resourceGroupName, serverName).toBlocking().single().body();
+ }
+
+ /**
+ * Deletes AAD Administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the {@link ServiceFuture} object
+ */
+ public ServiceFuture beginDeleteAsync(String resourceGroupName, String serverName, final ServiceCallback serviceCallback) {
+ return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, serverName), serviceCallback);
+ }
+
+ /**
+ * Deletes AAD Administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the {@link ServiceResponse} object if successful.
+ */
+ public Observable beginDeleteAsync(String resourceGroupName, String serverName) {
+ return beginDeleteWithServiceResponseAsync(resourceGroupName, serverName).map(new Func1, Void>() {
+ @Override
+ public Void call(ServiceResponse response) {
+ return response.body();
+ }
+ });
+ }
+
+ /**
+ * Deletes AAD Administrator.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the {@link ServiceResponse} object if successful.
+ */
+ public Observable> beginDeleteWithServiceResponseAsync(String resourceGroupName, String serverName) {
+ if (this.client.subscriptionId() == null) {
+ throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+ }
+ if (resourceGroupName == null) {
+ throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+ }
+ if (serverName == null) {
+ throw new IllegalArgumentException("Parameter serverName is required and cannot be null.");
+ }
+ if (this.client.apiVersion() == null) {
+ throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+ }
+ return service.beginDelete(this.client.subscriptionId(), resourceGroupName, serverName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+ .flatMap(new Func1, Observable>>() {
+ @Override
+ public Observable> call(Response response) {
+ try {
+ ServiceResponse clientResponse = beginDeleteDelegate(response);
+ return Observable.just(clientResponse);
+ } catch (Throwable t) {
+ return Observable.error(t);
+ }
+ }
+ });
+ }
+
+ private ServiceResponse beginDeleteDelegate(Response response) throws CloudException, IOException, IllegalArgumentException {
+ return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter())
+ .register(200, new TypeToken() { }.getType())
+ .register(202, new TypeToken() { }.getType())
+ .register(204, new TypeToken() { }.getType())
+ .registerError(CloudException.class)
+ .build(response);
+ }
+
+ /**
+ * Returns a list of server Administrators.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @throws CloudException thrown if the request is rejected by server
+ * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+ * @return the List<ServerAdministratorResourceInner> object if successful.
+ */
+ public List list(String resourceGroupName, String serverName) {
+ return listWithServiceResponseAsync(resourceGroupName, serverName).toBlocking().single().body();
+ }
+
+ /**
+ * Returns a list of server Administrators.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the {@link ServiceFuture} object
+ */
+ public ServiceFuture> listAsync(String resourceGroupName, String serverName, final ServiceCallback> serviceCallback) {
+ return ServiceFuture.fromResponse(listWithServiceResponseAsync(resourceGroupName, serverName), serviceCallback);
+ }
+
+ /**
+ * Returns a list of server Administrators.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the observable to the List<ServerAdministratorResourceInner> object
+ */
+ public Observable> listAsync(String resourceGroupName, String serverName) {
+ return listWithServiceResponseAsync(resourceGroupName, serverName).map(new Func1>, List>() {
+ @Override
+ public List call(ServiceResponse> response) {
+ return response.body();
+ }
+ });
+ }
+
+ /**
+ * Returns a list of server Administrators.
+ *
+ * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+ * @param serverName The name of the server.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the observable to the List<ServerAdministratorResourceInner> object
+ */
+ public Observable>> listWithServiceResponseAsync(String resourceGroupName, String serverName) {
+ if (this.client.subscriptionId() == null) {
+ throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+ }
+ if (resourceGroupName == null) {
+ throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+ }
+ if (serverName == null) {
+ throw new IllegalArgumentException("Parameter serverName is required and cannot be null.");
+ }
+ if (this.client.apiVersion() == null) {
+ throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+ }
+ return service.list(this.client.subscriptionId(), resourceGroupName, serverName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+ .flatMap(new Func1, Observable>>>() {
+ @Override
+ public Observable>> call(Response response) {
+ try {
+ ServiceResponse> result = listDelegate(response);
+ List items = null;
+ if (result.body() != null) {
+ items = result.body().items();
+ }
+ ServiceResponse> clientResponse = new ServiceResponse