From 5b1c3d04304c50ecb048a0f9f221f108661b3807 Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Mon, 9 Nov 2020 02:58:06 +0000 Subject: [PATCH] Generated from fb066395f93026ab5f860bda502d97cc7a8ef101 remove require for nic --- sdk/datamigration/mgmt-v2018_03_31_preview/pom.xml | 6 ++++-- .../ConnectToSourceSqlServerTaskOutput.java | 2 +- ...ectToSourceSqlServerTaskOutputAgentJobLevel.java | 2 +- ...ectToSourceSqlServerTaskOutputDatabaseLevel.java | 2 +- ...onnectToSourceSqlServerTaskOutputLoginLevel.java | 2 +- ...ConnectToSourceSqlServerTaskOutputTaskLevel.java | 2 +- .../ConnectToSourceSqlServerTaskProperties.java | 2 +- .../ConnectToTargetSqlDbTaskProperties.java | 2 +- .../ConnectToTargetSqlMITaskProperties.java | 2 +- .../v2018_03_31_preview/ConnectionInfo.java | 13 +++---------- .../GetUserTablesSqlTaskProperties.java | 2 +- .../MigrateSqlServerSqlDbTaskOutput.java | 2 +- ...igrateSqlServerSqlDbTaskOutputDatabaseLevel.java | 2 +- .../MigrateSqlServerSqlDbTaskOutputError.java | 2 +- ...grateSqlServerSqlDbTaskOutputMigrationLevel.java | 2 +- .../MigrateSqlServerSqlDbTaskOutputTableLevel.java | 2 +- .../MigrateSqlServerSqlDbTaskProperties.java | 2 +- .../MigrateSqlServerSqlMITaskOutput.java | 2 +- ...igrateSqlServerSqlMITaskOutputAgentJobLevel.java | 2 +- ...igrateSqlServerSqlMITaskOutputDatabaseLevel.java | 2 +- .../MigrateSqlServerSqlMITaskOutputError.java | 2 +- .../MigrateSqlServerSqlMITaskOutputLoginLevel.java | 2 +- ...grateSqlServerSqlMITaskOutputMigrationLevel.java | 2 +- .../MigrateSqlServerSqlMITaskProperties.java | 2 +- .../MigrationEligibilityInfo.java | 10 +++++----- .../v2018_03_31_preview/ProjectTaskProperties.java | 5 ++--- .../v2018_03_31_preview/SqlConnectionInfo.java | 2 +- ...eMigrationInputSqlServerSqlMITaskProperties.java | 2 +- .../implementation/ProjectsImpl.java | 10 +++++++--- .../implementation/TasksImpl.java | 10 +++++++--- 30 files changed, 52 insertions(+), 50 deletions(-) diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/pom.xml b/sdk/datamigration/mgmt-v2018_03_31_preview/pom.xml index 6342f158ab78..f0c0fd35a1a5 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/pom.xml +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.2.0 - ../../parents/azure-arm-parent + 1.1.0 + ../../../pom.management.xml azure-mgmt-datamigration 1.0.0-beta @@ -71,6 +71,8 @@ azure-arm-client-runtime test-jar test + + 1.6.5 diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutput.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutput.java index d47b24acfeca..4624918b00b2 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutput.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutput.java @@ -17,7 +17,7 @@ * Output for the task that validates connection to SQL Server and also * validates source server requirements. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = ConnectToSourceSqlServerTaskOutput.class) @JsonTypeName("ConnectToSourceSqlServerTaskOutput") @JsonSubTypes({ @JsonSubTypes.Type(name = "AgentJobLevelOutput", value = ConnectToSourceSqlServerTaskOutputAgentJobLevel.class), diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutputAgentJobLevel.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutputAgentJobLevel.java index e807a0d0a6f5..3f7d5d230722 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutputAgentJobLevel.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutputAgentJobLevel.java @@ -17,7 +17,7 @@ * AgentJob level output for the task that validates connection to SQL Server * and also validates source server requirements. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = ConnectToSourceSqlServerTaskOutputAgentJobLevel.class) @JsonTypeName("AgentJobLevelOutput") public class ConnectToSourceSqlServerTaskOutputAgentJobLevel extends ConnectToSourceSqlServerTaskOutput { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutputDatabaseLevel.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutputDatabaseLevel.java index 1b7f9b9dd097..8bfb8beec800 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutputDatabaseLevel.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutputDatabaseLevel.java @@ -17,7 +17,7 @@ * Database level output for the task that validates connection to SQL Server * and also validates source server requirements. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = ConnectToSourceSqlServerTaskOutputDatabaseLevel.class) @JsonTypeName("DatabaseLevelOutput") public class ConnectToSourceSqlServerTaskOutputDatabaseLevel extends ConnectToSourceSqlServerTaskOutput { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutputLoginLevel.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutputLoginLevel.java index 06e4a86d03e5..1dd359e619d8 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutputLoginLevel.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutputLoginLevel.java @@ -16,7 +16,7 @@ * Login level output for the task that validates connection to SQL Server and * also validates source server requirements. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = ConnectToSourceSqlServerTaskOutputLoginLevel.class) @JsonTypeName("LoginLevelOutput") public class ConnectToSourceSqlServerTaskOutputLoginLevel extends ConnectToSourceSqlServerTaskOutput { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutputTaskLevel.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutputTaskLevel.java index b1d538e292a8..651b531c4b13 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutputTaskLevel.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskOutputTaskLevel.java @@ -18,7 +18,7 @@ * Task level output for the task that validates connection to SQL Server and * also validates source server requirements. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = ConnectToSourceSqlServerTaskOutputTaskLevel.class) @JsonTypeName("TaskLevelOutput") public class ConnectToSourceSqlServerTaskOutputTaskLevel extends ConnectToSourceSqlServerTaskOutput { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskProperties.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskProperties.java index 5f275f6afeeb..954d824dd296 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskProperties.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToSourceSqlServerTaskProperties.java @@ -17,7 +17,7 @@ * Properties for the task that validates connection to SQL Server and also * validates source server requirements. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ConnectToSourceSqlServerTaskProperties.class) @JsonTypeName("ConnectToSource.SqlServer") public class ConnectToSourceSqlServerTaskProperties extends ProjectTaskProperties { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToTargetSqlDbTaskProperties.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToTargetSqlDbTaskProperties.java index 0e250308d2a9..4d6946e0211c 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToTargetSqlDbTaskProperties.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToTargetSqlDbTaskProperties.java @@ -17,7 +17,7 @@ * Properties for the task that validates connection to SQL DB and target * server requirements. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ConnectToTargetSqlDbTaskProperties.class) @JsonTypeName("ConnectToTarget.SqlDb") public class ConnectToTargetSqlDbTaskProperties extends ProjectTaskProperties { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToTargetSqlMITaskProperties.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToTargetSqlMITaskProperties.java index 00a278611a83..c502cad057c5 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToTargetSqlMITaskProperties.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectToTargetSqlMITaskProperties.java @@ -17,7 +17,7 @@ * Properties for the task that validates connection to Azure SQL Database * Managed Instance. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ConnectToTargetSqlMITaskProperties.class) @JsonTypeName("ConnectToTarget.AzureSqlDbMI") public class ConnectToTargetSqlMITaskProperties extends ProjectTaskProperties { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectionInfo.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectionInfo.java index e2f687cae47e..b1b714403628 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectionInfo.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ConnectionInfo.java @@ -16,17 +16,10 @@ /** * Defines the connection properties of a server. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") -@JsonTypeName("Unknown") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = ConnectionInfo.class) +@JsonTypeName("ConnectionInfo") @JsonSubTypes({ - @JsonSubTypes.Type(name = "SqlConnectionInfo", value = SqlConnectionInfo.class), - @JsonSubTypes.Type(name = "ValidateMigrationInput.SqlServer.AzureSqlDbMI", value = ValidateMigrationInputSqlServerSqlMITaskProperties.class), - @JsonSubTypes.Type(name = "Migrate.SqlServer.SqlDb", value = MigrateSqlServerSqlDbTaskProperties.class), - @JsonSubTypes.Type(name = "Migrate.SqlServer.AzureSqlDbMI", value = MigrateSqlServerSqlMITaskProperties.class), - @JsonSubTypes.Type(name = "GetUserTables.Sql", value = GetUserTablesSqlTaskProperties.class), - @JsonSubTypes.Type(name = "ConnectToTarget.SqlDb", value = ConnectToTargetSqlDbTaskProperties.class), - @JsonSubTypes.Type(name = "ConnectToTarget.AzureSqlDbMI", value = ConnectToTargetSqlMITaskProperties.class), - @JsonSubTypes.Type(name = "ConnectToSource.SqlServer", value = ConnectToSourceSqlServerTaskProperties.class) + @JsonSubTypes.Type(name = "SqlConnectionInfo", value = SqlConnectionInfo.class) }) public class ConnectionInfo { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/GetUserTablesSqlTaskProperties.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/GetUserTablesSqlTaskProperties.java index e697d098548d..6cb48168a413 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/GetUserTablesSqlTaskProperties.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/GetUserTablesSqlTaskProperties.java @@ -17,7 +17,7 @@ * Properties for the task that collects user tables for the given list of * databases. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = GetUserTablesSqlTaskProperties.class) @JsonTypeName("GetUserTables.Sql") public class GetUserTablesSqlTaskProperties extends ProjectTaskProperties { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutput.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutput.java index 038268a68ce6..79928331ba0e 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutput.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutput.java @@ -17,7 +17,7 @@ * Output for the task that migrates on-prem SQL Server databases to Azure SQL * Database. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbTaskOutput.class) @JsonTypeName("MigrateSqlServerSqlDbTaskOutput") @JsonSubTypes({ @JsonSubTypes.Type(name = "ErrorOutput", value = MigrateSqlServerSqlDbTaskOutputError.class), diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutputDatabaseLevel.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutputDatabaseLevel.java index d343a2ad1a20..632e98d9fedf 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutputDatabaseLevel.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutputDatabaseLevel.java @@ -18,7 +18,7 @@ /** * The MigrateSqlServerSqlDbTaskOutputDatabaseLevel model. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbTaskOutputDatabaseLevel.class) @JsonTypeName("DatabaseLevelOutput") public class MigrateSqlServerSqlDbTaskOutputDatabaseLevel extends MigrateSqlServerSqlDbTaskOutput { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutputError.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutputError.java index 3f305dd835f8..e3cbfcba93aa 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutputError.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutputError.java @@ -15,7 +15,7 @@ /** * The MigrateSqlServerSqlDbTaskOutputError model. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbTaskOutputError.class) @JsonTypeName("ErrorOutput") public class MigrateSqlServerSqlDbTaskOutputError extends MigrateSqlServerSqlDbTaskOutput { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutputMigrationLevel.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutputMigrationLevel.java index 5d5d54cfb120..f32b214b98c5 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutputMigrationLevel.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutputMigrationLevel.java @@ -18,7 +18,7 @@ /** * The MigrateSqlServerSqlDbTaskOutputMigrationLevel model. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbTaskOutputMigrationLevel.class) @JsonTypeName("MigrationLevelOutput") public class MigrateSqlServerSqlDbTaskOutputMigrationLevel extends MigrateSqlServerSqlDbTaskOutput { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutputTableLevel.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutputTableLevel.java index e0611daf63af..ffcd2c3ed35c 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutputTableLevel.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskOutputTableLevel.java @@ -16,7 +16,7 @@ /** * The MigrateSqlServerSqlDbTaskOutputTableLevel model. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlDbTaskOutputTableLevel.class) @JsonTypeName("TableLevelOutput") public class MigrateSqlServerSqlDbTaskOutputTableLevel extends MigrateSqlServerSqlDbTaskOutput { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskProperties.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskProperties.java index 7d129f386516..ae209ef384f9 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskProperties.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlDbTaskProperties.java @@ -17,7 +17,7 @@ * Properties for the task that migrates on-prem SQL Server databases to Azure * SQL Database. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = MigrateSqlServerSqlDbTaskProperties.class) @JsonTypeName("Migrate.SqlServer.SqlDb") public class MigrateSqlServerSqlDbTaskProperties extends ProjectTaskProperties { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutput.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutput.java index 8258e69349d0..087e2edd25c1 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutput.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutput.java @@ -17,7 +17,7 @@ * Output for task that migrates SQL Server databases to Azure SQL Database * Managed Instance. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlMITaskOutput.class) @JsonTypeName("MigrateSqlServerSqlMITaskOutput") @JsonSubTypes({ @JsonSubTypes.Type(name = "ErrorOutput", value = MigrateSqlServerSqlMITaskOutputError.class), diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputAgentJobLevel.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputAgentJobLevel.java index bd6acb9fb503..835e117e713a 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputAgentJobLevel.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputAgentJobLevel.java @@ -17,7 +17,7 @@ /** * The MigrateSqlServerSqlMITaskOutputAgentJobLevel model. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlMITaskOutputAgentJobLevel.class) @JsonTypeName("AgentJobLevelOutput") public class MigrateSqlServerSqlMITaskOutputAgentJobLevel extends MigrateSqlServerSqlMITaskOutput { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputDatabaseLevel.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputDatabaseLevel.java index 5a412fb15414..4c0374f70f3b 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputDatabaseLevel.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputDatabaseLevel.java @@ -17,7 +17,7 @@ /** * The MigrateSqlServerSqlMITaskOutputDatabaseLevel model. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlMITaskOutputDatabaseLevel.class) @JsonTypeName("DatabaseLevelOutput") public class MigrateSqlServerSqlMITaskOutputDatabaseLevel extends MigrateSqlServerSqlMITaskOutput { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputError.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputError.java index d3d9fffd8379..0f8ea2c94afa 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputError.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputError.java @@ -15,7 +15,7 @@ /** * The MigrateSqlServerSqlMITaskOutputError model. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlMITaskOutputError.class) @JsonTypeName("ErrorOutput") public class MigrateSqlServerSqlMITaskOutputError extends MigrateSqlServerSqlMITaskOutput { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputLoginLevel.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputLoginLevel.java index 3663bac3571f..4bcc0dbda266 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputLoginLevel.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputLoginLevel.java @@ -17,7 +17,7 @@ /** * The MigrateSqlServerSqlMITaskOutputLoginLevel model. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlMITaskOutputLoginLevel.class) @JsonTypeName("LoginLevelOutput") public class MigrateSqlServerSqlMITaskOutputLoginLevel extends MigrateSqlServerSqlMITaskOutput { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputMigrationLevel.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputMigrationLevel.java index 0f916a2aced4..3361799b39dc 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputMigrationLevel.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskOutputMigrationLevel.java @@ -18,7 +18,7 @@ /** * The MigrateSqlServerSqlMITaskOutputMigrationLevel model. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "resultType", defaultImpl = MigrateSqlServerSqlMITaskOutputMigrationLevel.class) @JsonTypeName("MigrationLevelOutput") public class MigrateSqlServerSqlMITaskOutputMigrationLevel extends MigrateSqlServerSqlMITaskOutput { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskProperties.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskProperties.java index ed2a82741885..e761721896ab 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskProperties.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrateSqlServerSqlMITaskProperties.java @@ -17,7 +17,7 @@ * Properties for task that migrates SQL Server databases to Azure SQL Database * Managed Instance. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = MigrateSqlServerSqlMITaskProperties.class) @JsonTypeName("Migrate.SqlServer.AzureSqlDbMI") public class MigrateSqlServerSqlMITaskProperties extends ProjectTaskProperties { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrationEligibilityInfo.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrationEligibilityInfo.java index 930e56e55533..71caa8a56826 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrationEligibilityInfo.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/MigrationEligibilityInfo.java @@ -18,8 +18,8 @@ public class MigrationEligibilityInfo { /** * Whether object is eligible for migration or not. */ - @JsonProperty(value = "isEligibileForMigration", access = JsonProperty.Access.WRITE_ONLY) - private Boolean isEligibileForMigration; + @JsonProperty(value = "isEligibleForMigration", access = JsonProperty.Access.WRITE_ONLY) + private Boolean isEligibleForMigration; /** * Information about eligibility failure for the server object. @@ -30,10 +30,10 @@ public class MigrationEligibilityInfo { /** * Get whether object is eligible for migration or not. * - * @return the isEligibileForMigration value + * @return the isEligibleForMigration value */ - public Boolean isEligibileForMigration() { - return this.isEligibileForMigration; + public Boolean isEligibleForMigration() { + return this.isEligibleForMigration; } /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ProjectTaskProperties.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ProjectTaskProperties.java index 0dfaa967222e..38309803b499 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ProjectTaskProperties.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ProjectTaskProperties.java @@ -18,10 +18,9 @@ * Base class for all types of DMS task properties. If task is not supported by * current client, this object is returned. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType") -@JsonTypeName("Unknown") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ProjectTaskProperties.class) +@JsonTypeName("ProjectTaskProperties") @JsonSubTypes({ - @JsonSubTypes.Type(name = "SqlConnectionInfo", value = SqlConnectionInfo.class), @JsonSubTypes.Type(name = "ValidateMigrationInput.SqlServer.AzureSqlDbMI", value = ValidateMigrationInputSqlServerSqlMITaskProperties.class), @JsonSubTypes.Type(name = "Migrate.SqlServer.SqlDb", value = MigrateSqlServerSqlDbTaskProperties.class), @JsonSubTypes.Type(name = "Migrate.SqlServer.AzureSqlDbMI", value = MigrateSqlServerSqlMITaskProperties.class), diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/SqlConnectionInfo.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/SqlConnectionInfo.java index 3d4e9d755e6f..633d89b929f1 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/SqlConnectionInfo.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/SqlConnectionInfo.java @@ -15,7 +15,7 @@ /** * Information for connecting to SQL database server. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = SqlConnectionInfo.class) @JsonTypeName("SqlConnectionInfo") public class SqlConnectionInfo extends ConnectionInfo { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ValidateMigrationInputSqlServerSqlMITaskProperties.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ValidateMigrationInputSqlServerSqlMITaskProperties.java index 2539fb209c65..2ccbc9978b8e 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ValidateMigrationInputSqlServerSqlMITaskProperties.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/ValidateMigrationInputSqlServerSqlMITaskProperties.java @@ -17,7 +17,7 @@ * Properties for task that validates migration input for SQL to Azure SQL * Database Managed Instance. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType", defaultImpl = ValidateMigrationInputSqlServerSqlMITaskProperties.class) @JsonTypeName("ValidateMigrationInput.SqlServer.AzureSqlDbMI") public class ValidateMigrationInputSqlServerSqlMITaskProperties extends ProjectTaskProperties { /** diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/implementation/ProjectsImpl.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/implementation/ProjectsImpl.java index 25f7d0926fc5..e6a0e169f4b6 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/implementation/ProjectsImpl.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/implementation/ProjectsImpl.java @@ -64,10 +64,14 @@ public Project call(ProjectInner inner) { public Observable getAsync(String groupName, String serviceName, String projectName) { ProjectsInner client = this.inner(); return client.getAsync(groupName, serviceName, projectName) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public Project call(ProjectInner inner) { - return wrapModel(inner); + public Observable call(ProjectInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((Project)wrapModel(inner)); + } } }); } diff --git a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/implementation/TasksImpl.java b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/implementation/TasksImpl.java index 1658ff2d0ff2..02a3b84c6c5f 100644 --- a/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/implementation/TasksImpl.java +++ b/sdk/datamigration/mgmt-v2018_03_31_preview/src/main/java/com/microsoft/azure/management/datamigration/v2018_03_31_preview/implementation/TasksImpl.java @@ -76,10 +76,14 @@ public ProjectTask call(ProjectTaskInner inner) { public Observable getAsync(String groupName, String serviceName, String projectName, String taskName) { TasksInner client = this.inner(); return client.getAsync(groupName, serviceName, projectName, taskName) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public ProjectTask call(ProjectTaskInner inner) { - return wrapModel(inner); + public Observable call(ProjectTaskInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((ProjectTask)wrapModel(inner)); + } } }); }