From 37affb4097ccb4a3881e67efd993a9adad4bdc68 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Mon, 30 May 2022 03:16:59 +0000 Subject: [PATCH] CodeGen from PR 19264 in Azure/azure-rest-api-specs Merge ea213c774e0ecfdb0ec006e21fa41727097a7f59 into fa094e06104cabd79725bc52c18e4fe578b3e66c --- .../CHANGELOG.md | 4 +- .../README.md | 4 +- .../SAMPLE.md | 603 ++++------- .../pom.xml | 2 +- .../MachineLearningManager.java | 37 +- .../fluent/BatchDeploymentsClient.java | 44 +- .../fluent/BatchEndpointsClient.java | 52 +- .../fluent/CodeContainersClient.java | 18 +- .../fluent/CodeVersionsClient.java | 18 +- .../fluent/ComponentContainersClient.java | 18 +- .../fluent/ComponentVersionsClient.java | 18 +- .../fluent/DataContainersClient.java | 18 +- .../fluent/DataVersionsClient.java | 18 +- .../fluent/DatastoresClient.java | 17 +- .../fluent/EnvironmentContainersClient.java | 22 +- .../fluent/EnvironmentVersionsClient.java | 18 +- .../machinelearning/fluent/JobsClient.java | 58 +- .../fluent/ModelContainersClient.java | 18 +- .../fluent/ModelVersionsClient.java | 18 +- .../fluent/OnlineDeploymentsClient.java | 44 +- .../fluent/OnlineEndpointsClient.java | 52 +- .../fluent/WorkspaceConnectionsClient.java | 89 +- ...taInner.java => BatchDeploymentInner.java} | 35 +- ...DataInner.java => BatchEndpointInner.java} | 35 +- ...DataInner.java => CodeContainerInner.java} | 17 +- ...onDataInner.java => CodeVersionInner.java} | 16 +- ...nner.java => ComponentContainerInner.java} | 16 +- ...aInner.java => ComponentVersionInner.java} | 16 +- ...DataInner.java => DataContainerInner.java} | 17 +- ...taInner.java => DataVersionBaseInner.java} | 17 +- ...toreDataInner.java => DatastoreInner.java} | 16 +- .../fluent/models/DatastoreSecretsInner.java | 4 - ...er.java => EnvironmentContainerInner.java} | 16 +- ...nner.java => EnvironmentVersionInner.java} | 16 +- ...obBaseDataInner.java => JobBaseInner.java} | 16 +- ...ataInner.java => ModelContainerInner.java} | 17 +- ...nDataInner.java => ModelVersionInner.java} | 17 +- ...aInner.java => OnlineDeploymentInner.java} | 34 +- ...ataInner.java => OnlineEndpointInner.java} | 35 +- .../models/WorkspaceConnectionInner.java | 172 --- ...nectionPropertiesV2BasicResourceInner.java | 79 ++ .../fluent/models/WorkspaceInner.java | 25 + .../models/WorkspacePropertiesInner.java | 29 + .../AzureMachineLearningWorkspacesImpl.java | 2 +- ...DataImpl.java => BatchDeploymentImpl.java} | 83 +- .../BatchDeploymentsClientImpl.java | 142 ++- .../implementation/BatchDeploymentsImpl.java | 37 +- ...ntDataImpl.java => BatchEndpointImpl.java} | 83 +- .../BatchEndpointsClientImpl.java | 162 ++- .../implementation/BatchEndpointsImpl.java | 36 +- ...erDataImpl.java => CodeContainerImpl.java} | 42 +- .../CodeContainersClientImpl.java | 60 +- .../implementation/CodeContainersImpl.java | 36 +- ...sionDataImpl.java => CodeVersionImpl.java} | 41 +- .../CodeVersionsClientImpl.java | 60 +- .../implementation/CodeVersionsImpl.java | 36 +- ...aImpl.java => ComponentContainerImpl.java} | 42 +- .../ComponentContainersClientImpl.java | 68 +- .../ComponentContainersImpl.java | 36 +- ...ataImpl.java => ComponentVersionImpl.java} | 43 +- .../ComponentVersionsClientImpl.java | 61 +- .../implementation/ComponentVersionsImpl.java | 37 +- ...erDataImpl.java => DataContainerImpl.java} | 42 +- .../DataContainersClientImpl.java | 60 +- .../implementation/DataContainersImpl.java | 36 +- ...DataImpl.java => DataVersionBaseImpl.java} | 42 +- .../DataVersionsClientImpl.java | 60 +- .../implementation/DataVersionsImpl.java | 37 +- ...astoreDataImpl.java => DatastoreImpl.java} | 43 +- .../implementation/DatastoresClientImpl.java | 64 +- .../implementation/DatastoresImpl.java | 36 +- ...mpl.java => EnvironmentContainerImpl.java} | 42 +- .../EnvironmentContainersClientImpl.java | 69 +- .../EnvironmentContainersImpl.java | 37 +- ...aImpl.java => EnvironmentVersionImpl.java} | 43 +- .../EnvironmentVersionsClientImpl.java | 63 +- .../EnvironmentVersionsImpl.java | 36 +- ...{JobBaseDataImpl.java => JobBaseImpl.java} | 45 +- .../implementation/JobsClientImpl.java | 236 +++-- .../implementation/JobsImpl.java | 48 +- ...rDataImpl.java => ModelContainerImpl.java} | 42 +- .../ModelContainersClientImpl.java | 60 +- .../implementation/ModelContainersImpl.java | 36 +- ...ionDataImpl.java => ModelVersionImpl.java} | 41 +- .../ModelVersionsClientImpl.java | 60 +- .../implementation/ModelVersionsImpl.java | 36 +- ...ataImpl.java => OnlineDeploymentImpl.java} | 84 +- .../OnlineDeploymentsClientImpl.java | 142 ++- .../implementation/OnlineDeploymentsImpl.java | 37 +- ...tDataImpl.java => OnlineEndpointImpl.java} | 83 +- .../OnlineEndpointsClientImpl.java | 143 ++- .../implementation/OnlineEndpointsImpl.java | 36 +- ...nectionPropertiesV2BasicResourceImpl.java} | 80 +- .../WorkspaceConnectionsClientImpl.java | 541 +++++----- .../WorkspaceConnectionsImpl.java | 54 +- .../implementation/WorkspaceImpl.java | 9 + .../WorkspacePropertiesImpl.java | 4 + .../models/AmlComputeProperties.java | 9 +- .../models/AutoForecastHorizon.java | 25 - .../machinelearning/models/AutoMLJob.java | 263 ----- .../models/AutoMLVertical.java | 67 -- .../models/AutoNCrossValidations.java | 25 - .../models/AutoSeasonality.java | 25 - .../models/AutoTargetLags.java | 25 - .../models/AutoTargetRollingWindowSize.java | 25 - .../models/AzureBlobDatastore.java | 2 +- .../models/AzureDataLakeGen1Datastore.java | 2 +- .../models/AzureDataLakeGen2Datastore.java | 2 +- .../models/AzureFileDatastore.java | 2 +- ...ploymentData.java => BatchDeployment.java} | 100 +- ...ls.java => BatchDeploymentProperties.java} | 52 +- ...mentTrackedResourceArmPaginatedResult.java | 8 +- .../models/BatchDeployments.java | 18 +- ...chEndpointData.java => BatchEndpoint.java} | 101 +- ...ails.java => BatchEndpointProperties.java} | 14 +- ...ointTrackedResourceArmPaginatedResult.java | 8 +- .../models/BatchEndpoints.java | 18 +- .../models/Classification.java | 228 ---- .../models/ClassificationModels.java | 71 -- ...lassificationMultilabelPrimaryMetrics.java | 53 - .../models/ClassificationPrimaryMetrics.java | 48 - ...tContainerData.java => CodeContainer.java} | 52 +- ...ails.java => CodeContainerProperties.java} | 10 +- ...deContainerResourceArmPaginatedResult.java | 8 +- .../models/CodeContainers.java | 18 +- ...{CodeVersionData.java => CodeVersion.java} | 52 +- ...etails.java => CodeVersionProperties.java} | 16 +- ...CodeVersionResourceArmPaginatedResult.java | 8 +- .../machinelearning/models/CodeVersions.java | 18 +- .../models/ColumnTransformer.java | 76 -- .../machinelearning/models/CommandJob.java | 9 +- ...ainerData.java => ComponentContainer.java} | 50 +- ...java => ComponentContainerProperties.java} | 10 +- ...ntContainerResourceArmPaginatedResult.java | 8 +- .../models/ComponentContainers.java | 18 +- ...VersionData.java => ComponentVersion.java} | 50 +- ...s.java => ComponentVersionProperties.java} | 16 +- ...nentVersionResourceArmPaginatedResult.java | 8 +- .../models/ComponentVersions.java | 18 +- .../models/ComputeStartStopSchedule.java | 6 +- .../models/ConnectionAuthType.java | 47 + .../models/ConnectionCategory.java | 41 + .../models/CredentialsType.java | 6 - .../machinelearning/models/CronSchedule.java | 92 -- .../models/CustomForecastHorizon.java | 52 - .../models/CustomModelJobInput.java | 65 +- .../models/CustomModelJobOutput.java | 57 +- .../models/CustomNCrossValidations.java | 52 - .../models/CustomSeasonality.java | 52 - .../models/CustomTargetLags.java | 61 -- .../models/CustomTargetRollingWindowSize.java | 52 - ...aContainerData.java => DataContainer.java} | 52 +- ...ails.java => DataContainerProperties.java} | 19 +- ...taContainerResourceArmPaginatedResult.java | 8 +- .../models/DataContainers.java | 18 +- .../machinelearning/models/DataSettings.java | 119 --- .../machinelearning/models/DataType.java | 12 +- ...sionBaseData.java => DataVersionBase.java} | 50 +- ...ls.java => DataVersionBaseProperties.java} | 37 +- ...VersionBaseResourceArmPaginatedResult.java | 8 +- .../machinelearning/models/DataVersions.java | 18 +- .../{DatastoreData.java => Datastore.java} | 56 +- .../models/DatastoreCredentials.java | 2 - ...eDetails.java => DatastoreProperties.java} | 23 +- .../DatastoreResourceArmPaginatedResult.java | 8 +- .../machinelearning/models/DatastoreType.java | 3 - .../machinelearning/models/Datastores.java | 19 +- .../models/EgressPublicNetworkAccessType.java | 38 - .../EndpointDeploymentPropertiesBase.java | 10 +- ...nerData.java => EnvironmentContainer.java} | 52 +- ...va => EnvironmentContainerProperties.java} | 10 +- ...ntContainerResourceArmPaginatedResult.java | 8 +- .../models/EnvironmentContainers.java | 18 +- ...rsionData.java => EnvironmentVersion.java} | 50 +- ...java => EnvironmentVersionProperties.java} | 32 +- ...mentVersionResourceArmPaginatedResult.java | 8 +- .../models/EnvironmentVersions.java | 18 +- .../machinelearning/models/FeatureLags.java | 38 - .../models/FeaturizationMode.java | 41 - .../models/FeaturizationSettings.java | 46 - .../models/ForecastHorizon.java | 32 - .../models/ForecastHorizonMode.java | 38 - .../machinelearning/models/Forecasting.java | 257 ----- .../models/ForecastingModels.java | 89 -- .../models/ForecastingPrimaryMetrics.java | 46 - .../models/ForecastingSettings.java | 414 -------- .../machinelearning/models/HdfsDatastore.java | 144 --- .../models/ImageClassification.java | 227 ---- .../models/ImageClassificationBase.java | 105 -- .../models/ImageClassificationMultilabel.java | 228 ---- .../models/ImageInstanceSegmentation.java | 227 ---- .../models/ImageLimitSettings.java | 99 -- .../ImageModelDistributionSettings.java | 848 --------------- ...delDistributionSettingsClassification.java | 350 ------- ...elDistributionSettingsObjectDetection.java | 639 ------------ .../models/ImageModelSettings.java | 982 ------------------ .../ImageModelSettingsClassification.java | 380 ------- .../ImageModelSettingsObjectDetection.java | 664 ------------ .../models/ImageObjectDetection.java | 227 ---- .../models/ImageObjectDetectionBase.java | 105 -- .../models/ImageSweepLimitSettings.java | 72 -- .../models/ImageSweepSettings.java | 118 --- .../machinelearning/models/ImageVertical.java | 124 --- .../models/ImageVerticalDataSettings.java | 72 -- .../ImageVerticalValidationDataSettings.java | 35 - .../InstanceSegmentationPrimaryMetrics.java | 35 - .../models/{JobBaseData.java => JobBase.java} | 60 +- ...aseDetails.java => JobBaseProperties.java} | 70 +- .../JobBaseResourceArmPaginatedResult.java | 8 +- .../machinelearning/models/JobInput.java | 14 +- .../machinelearning/models/JobInputType.java | 28 +- .../machinelearning/models/JobOutput.java | 12 +- .../machinelearning/models/JobOutputType.java | 24 +- .../machinelearning/models/JobStatus.java | 3 - .../machinelearning/models/JobType.java | 3 - .../machinelearning/models/Jobs.java | 29 +- .../models/KerberosCredentials.java | 122 --- .../models/KerberosKeytabCredentials.java | 162 --- .../models/KerberosKeytabSecrets.java | 53 - .../models/KerberosPasswordCredentials.java | 162 --- .../models/KerberosPasswordSecrets.java | 53 - .../models/KubernetesOnlineDeployment.java | 17 +- .../models/LearningRateScheduler.java | 41 - .../models/LiteralJobInput.java | 2 +- .../machinelearning/models/LogVerbosity.java | 50 - .../models/MLFlowModelJobInput.java | 65 +- .../models/MLFlowModelJobOutput.java | 57 +- .../machinelearning/models/MLTableData.java | 4 +- .../models/MLTableJobInput.java | 65 +- .../models/MLTableJobOutput.java | 57 +- ...AuthTypeWorkspaceConnectionProperties.java | 84 ++ .../models/ManagedOnlineDeployment.java | 17 +- ...ContainerData.java => ModelContainer.java} | 50 +- ...ils.java => ModelContainerProperties.java} | 12 +- ...elContainerResourceArmPaginatedResult.java | 8 +- .../models/ModelContainers.java | 18 +- .../machinelearning/models/ModelSize.java | 47 - .../machinelearning/models/ModelType.java | 41 - ...odelVersionData.java => ModelVersion.java} | 52 +- ...tails.java => ModelVersionProperties.java} | 32 +- ...odelVersionResourceArmPaginatedResult.java | 8 +- .../machinelearning/models/ModelVersions.java | 18 +- .../models/NCrossValidations.java | 32 - .../models/NCrossValidationsMode.java | 38 - .../machinelearning/models/NlpVertical.java | 107 -- .../models/NlpVerticalDataSettings.java | 72 -- .../NlpVerticalFeaturizationSettings.java | 28 - .../models/NlpVerticalLimitSettings.java | 99 -- .../NlpVerticalValidationDataSettings.java | 35 - ...AuthTypeWorkspaceConnectionProperties.java | 53 + .../models/ObjectDetectionPrimaryMetrics.java | 35 - ...loymentData.java => OnlineDeployment.java} | 100 +- ...s.java => OnlineDeploymentProperties.java} | 109 +- ...mentTrackedResourceArmPaginatedResult.java | 8 +- .../models/OnlineDeployments.java | 19 +- ...eEndpointData.java => OnlineEndpoint.java} | 99 +- ...ils.java => OnlineEndpointProperties.java} | 77 +- ...ointTrackedResourceArmPaginatedResult.java | 8 +- .../models/OnlineEndpoints.java | 18 +- .../PaginatedWorkspaceConnectionsList.java | 78 -- .../models/PartialAssetReferenceBase.java | 33 - .../models/PartialBatchDeployment.java | 370 ------- ...lMinimalTrackedResourceWithProperties.java | 79 ++ ...BatchDeploymentPartialTrackedResource.java | 192 ---- .../models/PartialBatchEndpoint.java | 49 - ...alBatchEndpointPartialTrackedResource.java | 192 ---- .../models/PartialBatchRetrySettings.java | 73 -- .../models/PartialCodeConfiguration.java | 72 -- .../models/PartialDataPathAssetReference.java | 78 -- .../models/PartialIdAssetReference.java | 52 - .../PartialKubernetesOnlineDeployment.java | 25 - .../PartialManagedOnlineDeployment.java | 25 - .../models/PartialMinimalTrackedResource.java | 49 + ...ialMinimalTrackedResourceWithIdentity.java | 60 ++ .../PartialMinimalTrackedResourceWithSku.java | 59 ++ .../models/PartialOnlineDeployment.java | 32 - ...nlineDeploymentPartialTrackedResource.java | 192 ---- .../models/PartialOnlineEndpoint.java | 111 -- ...lOnlineEndpointPartialTrackedResource.java | 192 ---- .../PartialOutputPathAssetReference.java | 78 -- ...AuthTypeWorkspaceConnectionProperties.java | 84 ++ .../machinelearning/models/PipelineJob.java | 9 +- .../models/PublicNetworkAccessType.java | 38 - .../models/RecurrenceFrequency.java | 47 - .../models/RecurrencePattern.java | 112 -- .../models/RecurrenceSchedule.java | 144 --- .../machinelearning/models/Regression.java | 228 ---- .../models/RegressionModels.java | 62 -- .../models/RegressionPrimaryMetrics.java | 46 - ...AuthTypeWorkspaceConnectionProperties.java | 84 ++ .../machinelearning/models/ScheduleBase.java | 116 +-- .../models/ScheduleProvisioningState.java | 41 + .../machinelearning/models/ScheduleType.java | 38 - .../machinelearning/models/Seasonality.java | 32 - .../models/SeasonalityMode.java | 38 - .../machinelearning/models/SecretsType.java | 6 - .../ShortSeriesHandlingConfiguration.java | 44 - .../models/SslConfigStatus.java | 41 + .../models/SslConfiguration.java | 6 +- .../models/SslConfigurationStatus.java | 41 - .../models/StackEnsembleSettings.java | 105 -- .../models/StackMetaLearnerType.java | 56 - .../models/StochasticOptimizer.java | 44 - .../machinelearning/models/SweepJob.java | 9 +- .../machinelearning/models/TableVertical.java | 136 --- .../models/TableVerticalDataSettings.java | 101 -- .../TableVerticalFeaturizationSettings.java | 215 ---- .../models/TableVerticalLimitSettings.java | 206 ---- .../TableVerticalValidationDataSettings.java | 95 -- .../models/TargetAggregationFunction.java | 47 - .../machinelearning/models/TargetLags.java | 32 - .../models/TargetLagsMode.java | 38 - .../models/TargetRollingWindowSize.java | 32 - .../models/TargetRollingWindowSizeMode.java | 38 - .../machinelearning/models/TaskType.java | 62 -- .../models/TestDataSettings.java | 80 -- .../models/TextClassification.java | 146 --- .../models/TextClassificationMultilabel.java | 139 --- .../machinelearning/models/TextNer.java | 138 --- .../models/TrainingDataSettings.java | 56 - .../models/TrainingSettings.java | 213 ---- .../models/TritonModelJobInput.java | 65 +- .../models/TritonModelJobOutput.java | 57 +- .../models/UriFileDataVersion.java | 4 +- .../models/UriFileJobInput.java | 65 +- .../models/UriFileJobOutput.java | 57 +- .../models/UriFolderDataVersion.java | 4 +- .../models/UriFolderJobInput.java | 65 +- .../models/UriFolderJobOutput.java | 57 +- .../machinelearning/models/UseStl.java | 41 - ...AuthTypeWorkspaceConnectionProperties.java | 84 ++ .../models/ValidationDataSettings.java | 80 -- .../models/ValidationMetricType.java | 44 - .../machinelearning/models/Weekday.java | 53 - .../machinelearning/models/Workspace.java | 22 +- .../models/WorkspaceConnection.java | 193 ---- .../WorkspaceConnectionManagedIdentity.java | 72 ++ ...orkspaceConnectionPersonalAccessToken.java | 46 + .../WorkspaceConnectionPropertiesV2.java} | 83 +- ...ceConnectionPropertiesV2BasicResource.java | 127 +++ ...tiesV2BasicResourceArmPaginatedResult.java | 67 ++ ...kspaceConnectionSharedAccessSignature.java | 46 + .../WorkspaceConnectionUsernamePassword.java | 72 ++ .../models/WorkspaceConnections.java | 69 +- .../models/WorkspaceProperties.java | 8 + ...BatchDeploymentsCreateOrUpdateSamples.java | 6 +- .../BatchDeploymentsDeleteSamples.java | 2 +- .../generated/BatchDeploymentsGetSamples.java | 2 +- .../BatchDeploymentsListSamples.java | 2 +- .../BatchDeploymentsUpdateSamples.java | 58 +- .../BatchEndpointsCreateOrUpdateSamples.java | 6 +- .../BatchEndpointsDeleteSamples.java | 2 +- .../generated/BatchEndpointsGetSamples.java | 2 +- .../BatchEndpointsListKeysSamples.java | 2 +- .../generated/BatchEndpointsListSamples.java | 2 +- .../BatchEndpointsUpdateSamples.java | 20 +- .../CodeContainersCreateOrUpdateSamples.java | 6 +- .../CodeContainersDeleteSamples.java | 2 +- .../generated/CodeContainersGetSamples.java | 2 +- .../generated/CodeContainersListSamples.java | 2 +- .../CodeVersionsCreateOrUpdateSamples.java | 6 +- .../generated/CodeVersionsDeleteSamples.java | 2 +- .../generated/CodeVersionsGetSamples.java | 2 +- .../generated/CodeVersionsListSamples.java | 2 +- ...ponentContainersCreateOrUpdateSamples.java | 6 +- .../ComponentContainersDeleteSamples.java | 2 +- .../ComponentContainersGetSamples.java | 2 +- .../ComponentContainersListSamples.java | 2 +- ...omponentVersionsCreateOrUpdateSamples.java | 6 +- .../ComponentVersionsDeleteSamples.java | 2 +- .../ComponentVersionsGetSamples.java | 2 +- .../ComponentVersionsListSamples.java | 2 +- .../ComputeCreateOrUpdateSamples.java | 16 +- .../generated/ComputeDeleteSamples.java | 2 +- .../generated/ComputeGetSamples.java | 8 +- .../generated/ComputeListKeysSamples.java | 2 +- .../generated/ComputeListNodesSamples.java | 2 +- .../generated/ComputeListSamples.java | 2 +- .../generated/ComputeRestartSamples.java | 2 +- .../generated/ComputeStartSamples.java | 2 +- .../generated/ComputeStopSamples.java | 2 +- .../generated/ComputeUpdateSamples.java | 2 +- .../DataContainersCreateOrUpdateSamples.java | 8 +- .../DataContainersDeleteSamples.java | 2 +- .../generated/DataContainersGetSamples.java | 2 +- .../generated/DataContainersListSamples.java | 2 +- .../DataVersionsCreateOrUpdateSamples.java | 2 +- .../generated/DataVersionsDeleteSamples.java | 2 +- .../generated/DataVersionsGetSamples.java | 2 +- .../generated/DataVersionsListSamples.java | 2 +- .../DatastoresCreateOrUpdateSamples.java | 8 +- .../generated/DatastoresDeleteSamples.java | 2 +- .../generated/DatastoresGetSamples.java | 2 +- .../generated/DatastoresListSamples.java | 2 +- .../DatastoresListSecretsSamples.java | 2 +- ...onmentContainersCreateOrUpdateSamples.java | 6 +- .../EnvironmentContainersDeleteSamples.java | 2 +- .../EnvironmentContainersGetSamples.java | 2 +- .../EnvironmentContainersListSamples.java | 2 +- ...ironmentVersionsCreateOrUpdateSamples.java | 6 +- .../EnvironmentVersionsDeleteSamples.java | 2 +- .../EnvironmentVersionsGetSamples.java | 2 +- .../EnvironmentVersionsListSamples.java | 2 +- .../generated/JobsCancelSamples.java | 4 +- .../generated/JobsCreateOrUpdateSamples.java | 104 +- .../generated/JobsDeleteSamples.java | 2 +- .../generated/JobsGetSamples.java | 18 +- .../generated/JobsListSamples.java | 24 +- .../ModelContainersCreateOrUpdateSamples.java | 6 +- .../ModelContainersDeleteSamples.java | 2 +- .../generated/ModelContainersGetSamples.java | 2 +- .../generated/ModelContainersListSamples.java | 2 +- .../ModelVersionsCreateOrUpdateSamples.java | 9 +- .../generated/ModelVersionsDeleteSamples.java | 2 +- .../generated/ModelVersionsGetSamples.java | 2 +- .../generated/ModelVersionsListSamples.java | 2 +- ...nlineDeploymentsCreateOrUpdateSamples.java | 4 +- .../OnlineDeploymentsDeleteSamples.java | 2 +- .../OnlineDeploymentsGetLogsSamples.java | 2 +- .../OnlineDeploymentsGetSamples.java | 4 +- .../OnlineDeploymentsListSamples.java | 2 +- .../OnlineDeploymentsListSkusSamples.java | 4 +- .../OnlineDeploymentsUpdateSamples.java | 43 +- .../OnlineEndpointsCreateOrUpdateSamples.java | 6 +- .../OnlineEndpointsDeleteSamples.java | 2 +- .../generated/OnlineEndpointsGetSamples.java | 2 +- .../OnlineEndpointsGetTokenSamples.java | 2 +- .../OnlineEndpointsListKeysSamples.java | 2 +- .../generated/OnlineEndpointsListSamples.java | 2 +- .../OnlineEndpointsRegenerateKeysSamples.java | 2 +- .../OnlineEndpointsUpdateSamples.java | 18 +- .../generated/OperationsListSamples.java | 2 +- ...pointConnectionsCreateOrUpdateSamples.java | 2 +- ...ivateEndpointConnectionsDeleteSamples.java | 2 +- .../PrivateEndpointConnectionsGetSamples.java | 2 +- ...PrivateEndpointConnectionsListSamples.java | 2 +- .../PrivateLinkResourcesListSamples.java | 2 +- .../generated/QuotasListSamples.java | 2 +- .../generated/QuotasUpdateSamples.java | 2 +- .../generated/UsagesListSamples.java | 2 +- .../VirtualMachineSizesListSamples.java | 2 +- .../WorkspaceConnectionsCreateSamples.java | 13 +- .../WorkspaceConnectionsDeleteSamples.java | 2 +- .../WorkspaceConnectionsGetSamples.java | 2 +- .../WorkspaceConnectionsListSamples.java | 6 +- .../WorkspaceFeaturesListSamples.java | 2 +- .../WorkspacesCreateOrUpdateSamples.java | 2 +- .../generated/WorkspacesDeleteSamples.java | 2 +- .../generated/WorkspacesDiagnoseSamples.java | 2 +- .../WorkspacesGetByResourceGroupSamples.java | 2 +- .../WorkspacesListByResourceGroupSamples.java | 2 +- .../generated/WorkspacesListKeysSamples.java | 2 +- ...kspacesListNotebookAccessTokenSamples.java | 2 +- .../WorkspacesListNotebookKeysSamples.java | 2 +- ...ndNetworkDependenciesEndpointsSamples.java | 2 +- .../generated/WorkspacesListSamples.java | 2 +- ...rkspacesListStorageAccountKeysSamples.java | 2 +- .../WorkspacesPrepareNotebookSamples.java | 2 +- .../WorkspacesResyncKeysSamples.java | 2 +- .../generated/WorkspacesUpdateSamples.java | 2 +- 460 files changed, 5268 insertions(+), 19703 deletions(-) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/{BatchDeploymentDataInner.java => BatchDeploymentInner.java} (80%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/{BatchEndpointDataInner.java => BatchEndpointInner.java} (78%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/{CodeContainerDataInner.java => CodeContainerInner.java} (80%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/{CodeVersionDataInner.java => CodeVersionInner.java} (84%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/{ComponentContainerDataInner.java => ComponentContainerInner.java} (83%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/{ComponentVersionDataInner.java => ComponentVersionInner.java} (83%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/{DataContainerDataInner.java => DataContainerInner.java} (80%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/{DataVersionBaseDataInner.java => DataVersionBaseInner.java} (79%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/{DatastoreDataInner.java => DatastoreInner.java} (84%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/{EnvironmentContainerDataInner.java => EnvironmentContainerInner.java} (82%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/{EnvironmentVersionDataInner.java => EnvironmentVersionInner.java} (83%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/{JobBaseDataInner.java => JobBaseInner.java} (82%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/{ModelContainerDataInner.java => ModelContainerInner.java} (79%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/{ModelVersionDataInner.java => ModelVersionInner.java} (80%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/{OnlineDeploymentDataInner.java => OnlineDeploymentInner.java} (82%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/{OnlineEndpointDataInner.java => OnlineEndpointInner.java} (80%) delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/WorkspaceConnectionInner.java create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/WorkspaceConnectionPropertiesV2BasicResourceInner.java rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/{BatchDeploymentDataImpl.java => BatchDeploymentImpl.java} (71%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/{BatchEndpointDataImpl.java => BatchEndpointImpl.java} (70%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/{CodeContainerDataImpl.java => CodeContainerImpl.java} (77%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/{CodeVersionDataImpl.java => CodeVersionImpl.java} (77%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/{ComponentContainerDataImpl.java => ComponentContainerImpl.java} (77%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/{ComponentVersionDataImpl.java => ComponentVersionImpl.java} (77%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/{DataContainerDataImpl.java => DataContainerImpl.java} (77%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/{DataVersionBaseDataImpl.java => DataVersionBaseImpl.java} (77%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/{DatastoreDataImpl.java => DatastoreImpl.java} (80%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/{EnvironmentContainerDataImpl.java => EnvironmentContainerImpl.java} (77%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/{EnvironmentVersionDataImpl.java => EnvironmentVersionImpl.java} (78%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/{JobBaseDataImpl.java => JobBaseImpl.java} (72%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/{ModelContainerDataImpl.java => ModelContainerImpl.java} (77%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/{ModelVersionDataImpl.java => ModelVersionImpl.java} (78%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/{OnlineDeploymentDataImpl.java => OnlineDeploymentImpl.java} (72%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/{OnlineEndpointDataImpl.java => OnlineEndpointImpl.java} (74%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/{WorkspaceConnectionImpl.java => WorkspaceConnectionPropertiesV2BasicResourceImpl.java} (60%) delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoForecastHorizon.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoMLJob.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoMLVertical.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoNCrossValidations.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoSeasonality.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoTargetLags.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoTargetRollingWindowSize.java rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{BatchDeploymentData.java => BatchDeployment.java} (69%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{BatchDeploymentDetails.java => BatchDeploymentProperties.java} (83%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{BatchEndpointData.java => BatchEndpoint.java} (71%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{BatchEndpointDetails.java => BatchEndpointProperties.java} (81%) delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Classification.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ClassificationModels.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ClassificationMultilabelPrimaryMetrics.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ClassificationPrimaryMetrics.java rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{ComponentContainerData.java => CodeContainer.java} (70%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{CodeContainerDetails.java => CodeContainerProperties.java} (72%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{CodeVersionData.java => CodeVersion.java} (73%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{CodeVersionDetails.java => CodeVersionProperties.java} (74%) delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ColumnTransformer.java rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{ModelContainerData.java => ComponentContainer.java} (75%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{ComponentContainerDetails.java => ComponentContainerProperties.java} (73%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{ComponentVersionData.java => ComponentVersion.java} (73%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{ComponentVersionDetails.java => ComponentVersionProperties.java} (78%) create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ConnectionAuthType.java create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ConnectionCategory.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CronSchedule.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomForecastHorizon.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomNCrossValidations.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomSeasonality.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomTargetLags.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomTargetRollingWindowSize.java rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{DataContainerData.java => DataContainer.java} (72%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{DataContainerDetails.java => DataContainerProperties.java} (72%) delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataSettings.java rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{DataVersionBaseData.java => DataVersionBase.java} (74%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{DataVersionBaseDetails.java => DataVersionBaseProperties.java} (67%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{DatastoreData.java => Datastore.java} (78%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{DatastoreDetails.java => DatastoreProperties.java} (82%) delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EgressPublicNetworkAccessType.java rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{EnvironmentContainerData.java => EnvironmentContainer.java} (71%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{EnvironmentContainerDetails.java => EnvironmentContainerProperties.java} (70%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{EnvironmentVersionData.java => EnvironmentVersion.java} (74%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{EnvironmentVersionDetails.java => EnvironmentVersionProperties.java} (83%) delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/FeatureLags.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/FeaturizationMode.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/FeaturizationSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastHorizon.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastHorizonMode.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Forecasting.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastingModels.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastingPrimaryMetrics.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastingSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/HdfsDatastore.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageClassification.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageClassificationBase.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageClassificationMultilabel.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageInstanceSegmentation.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageLimitSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelDistributionSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelDistributionSettingsClassification.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelDistributionSettingsObjectDetection.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelSettingsClassification.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelSettingsObjectDetection.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageObjectDetection.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageObjectDetectionBase.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageSweepLimitSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageSweepSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageVertical.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageVerticalDataSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageVerticalValidationDataSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/InstanceSegmentationPrimaryMetrics.java rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{JobBaseData.java => JobBase.java} (75%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{JobBaseDetails.java => JobBaseProperties.java} (75%) delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosCredentials.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosKeytabCredentials.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosKeytabSecrets.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosPasswordCredentials.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosPasswordSecrets.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/LearningRateScheduler.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/LogVerbosity.java create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ManagedIdentityAuthTypeWorkspaceConnectionProperties.java rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{CodeContainerData.java => ModelContainer.java} (73%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{ModelContainerDetails.java => ModelContainerProperties.java} (68%) delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelSize.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelType.java rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{ModelVersionData.java => ModelVersion.java} (73%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{ModelVersionDetails.java => ModelVersionProperties.java} (78%) delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NCrossValidations.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NCrossValidationsMode.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVertical.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVerticalDataSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVerticalFeaturizationSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVerticalLimitSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVerticalValidationDataSettings.java create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NoneAuthTypeWorkspaceConnectionProperties.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ObjectDetectionPrimaryMetrics.java rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{OnlineDeploymentData.java => OnlineDeployment.java} (72%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{OnlineDeploymentDetails.java => OnlineDeploymentProperties.java} (66%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{OnlineEndpointData.java => OnlineEndpoint.java} (76%) rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/{OnlineEndpointDetails.java => OnlineEndpointProperties.java} (52%) delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PaginatedWorkspaceConnectionsList.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialAssetReferenceBase.java create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchDeploymentPartialTrackedResource.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchEndpoint.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchEndpointPartialTrackedResource.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchRetrySettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialCodeConfiguration.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialDataPathAssetReference.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialIdAssetReference.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialKubernetesOnlineDeployment.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialManagedOnlineDeployment.java create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialMinimalTrackedResource.java create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialMinimalTrackedResourceWithIdentity.java create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialMinimalTrackedResourceWithSku.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOnlineDeployment.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOnlineDeploymentPartialTrackedResource.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOnlineEndpoint.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOnlineEndpointPartialTrackedResource.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOutputPathAssetReference.java create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PatAuthTypeWorkspaceConnectionProperties.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PublicNetworkAccessType.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RecurrenceFrequency.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RecurrencePattern.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RecurrenceSchedule.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Regression.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RegressionModels.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RegressionPrimaryMetrics.java create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SasAuthTypeWorkspaceConnectionProperties.java create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ScheduleProvisioningState.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ScheduleType.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Seasonality.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SeasonalityMode.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ShortSeriesHandlingConfiguration.java create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SslConfigStatus.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SslConfigurationStatus.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/StackEnsembleSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/StackMetaLearnerType.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/StochasticOptimizer.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVertical.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVerticalDataSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVerticalFeaturizationSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVerticalLimitSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVerticalValidationDataSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetAggregationFunction.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetLags.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetLagsMode.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetRollingWindowSize.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetRollingWindowSizeMode.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TaskType.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TestDataSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TextClassification.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TextClassificationMultilabel.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TextNer.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TrainingDataSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TrainingSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UseStl.java create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UsernamePasswordAuthTypeWorkspaceConnectionProperties.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ValidationDataSettings.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ValidationMetricType.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Weekday.java delete mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnection.java create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionManagedIdentity.java create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionPersonalAccessToken.java rename sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/{fluent/models/WorkspaceConnectionProps.java => models/WorkspaceConnectionPropertiesV2.java} (51%) create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionPropertiesV2BasicResource.java create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionPropertiesV2BasicResourceArmPaginatedResult.java create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionSharedAccessSignature.java create mode 100644 sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionUsernamePassword.java diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/CHANGELOG.md b/sdk/machinelearning/azure-resourcemanager-machinelearning/CHANGELOG.md index f4d8ab12ac0c..da502557d402 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/CHANGELOG.md +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/CHANGELOG.md @@ -1,6 +1,8 @@ # Release History -## 1.0.0-beta.3 (Unreleased) +## 1.0.0-beta.1 (2022-05-30) + +- Azure Resource Manager Machine Learning client library for Java. This package contains Microsoft Azure SDK for Machine Learning Management SDK. These APIs allow end users to operate on Azure Machine Learning Workspace resources. Package tag package-2022-05-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt). ### Features Added diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/README.md b/sdk/machinelearning/azure-resourcemanager-machinelearning/README.md index 1c3706cbd2c4..cbfd9a3dc4e9 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/README.md +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/README.md @@ -2,7 +2,7 @@ Azure Resource Manager Machine Learning client library for Java. -This package contains Microsoft Azure SDK for Machine Learning Management SDK. These APIs allow end users to operate on Azure Machine Learning Workspace resources. Package tag package-2022-02-01-preview. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt). +This package contains Microsoft Azure SDK for Machine Learning Management SDK. These APIs allow end users to operate on Azure Machine Learning Workspace resources. Package tag package-2022-05-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt). ## We'd love to hear your feedback @@ -32,7 +32,7 @@ Various documentation is available to help you get started com.azure.resourcemanager azure-resourcemanager-machinelearning - 1.0.0-beta.2 + 1.0.0-beta.3 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/SAMPLE.md b/sdk/machinelearning/azure-resourcemanager-machinelearning/SAMPLE.md index b28a237d2e91..1382624d1e1f 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/SAMPLE.md +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/SAMPLE.md @@ -198,7 +198,7 @@ ```java import com.azure.core.management.serializer.SerializerFactory; import com.azure.core.util.serializer.SerializerEncoding; -import com.azure.resourcemanager.machinelearning.models.BatchDeploymentDetails; +import com.azure.resourcemanager.machinelearning.models.BatchDeploymentProperties; import com.azure.resourcemanager.machinelearning.models.BatchLoggingLevel; import com.azure.resourcemanager.machinelearning.models.BatchOutputAction; import com.azure.resourcemanager.machinelearning.models.BatchRetrySettings; @@ -218,7 +218,7 @@ import java.util.Map; /** Samples for BatchDeployments CreateOrUpdate. */ public final class BatchDeploymentsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchDeployment/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchDeployment/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Batch Deployment. @@ -233,7 +233,7 @@ public final class BatchDeploymentsCreateOrUpdateSamples { .withRegion("string") .withExistingBatchEndpoint("test-rg", "my-aml-workspace", "testEndpointName") .withProperties( - new BatchDeploymentDetails() + new BatchDeploymentProperties() .withCodeConfiguration(new CodeConfiguration().withCodeId("string").withScoringScript("string")) .withDescription("string") .withEnvironmentId("string") @@ -298,7 +298,7 @@ import com.azure.core.util.Context; /** Samples for BatchDeployments Delete. */ public final class BatchDeploymentsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchDeployment/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchDeployment/delete.json */ /** * Sample code: Delete Batch Deployment. @@ -321,7 +321,7 @@ import com.azure.core.util.Context; /** Samples for BatchDeployments Get. */ public final class BatchDeploymentsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchDeployment/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchDeployment/get.json */ /** * Sample code: Get Batch Deployment. @@ -344,7 +344,7 @@ import com.azure.core.util.Context; /** Samples for BatchDeployments List. */ public final class BatchDeploymentsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchDeployment/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchDeployment/list.json */ /** * Sample code: List Batch Deployment. @@ -362,38 +362,24 @@ public final class BatchDeploymentsListSamples { ### BatchDeployments_Update ```java -import com.azure.core.management.serializer.SerializerFactory; import com.azure.core.util.Context; -import com.azure.core.util.serializer.SerializerEncoding; -import com.azure.resourcemanager.machinelearning.models.BatchDeploymentData; -import com.azure.resourcemanager.machinelearning.models.BatchLoggingLevel; -import com.azure.resourcemanager.machinelearning.models.BatchOutputAction; -import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentityType; +import com.azure.resourcemanager.machinelearning.models.BatchDeployment; import com.azure.resourcemanager.machinelearning.models.PartialBatchDeployment; -import com.azure.resourcemanager.machinelearning.models.PartialBatchRetrySettings; -import com.azure.resourcemanager.machinelearning.models.PartialCodeConfiguration; -import com.azure.resourcemanager.machinelearning.models.PartialIdAssetReference; -import com.azure.resourcemanager.machinelearning.models.PartialManagedServiceIdentity; -import com.azure.resourcemanager.machinelearning.models.PartialSku; -import com.azure.resourcemanager.machinelearning.models.SkuTier; -import java.io.IOException; -import java.time.Duration; import java.util.HashMap; import java.util.Map; /** Samples for BatchDeployments Update. */ public final class BatchDeploymentsUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchDeployment/update.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchDeployment/update.json */ /** * Sample code: Update Batch Deployment. * * @param manager Entry point to MachineLearningManager. */ - public static void updateBatchDeployment(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) - throws IOException { - BatchDeploymentData resource = + public static void updateBatchDeployment(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { + BatchDeployment resource = manager .batchDeployments() .getWithResponse("test-rg", "my-aml-workspace", "testEndpointName", "testDeploymentName", Context.NONE) @@ -401,41 +387,7 @@ public final class BatchDeploymentsUpdateSamples { resource .update() .withTags(mapOf()) - .withIdentity( - new PartialManagedServiceIdentity() - .withType(ManagedServiceIdentityType.SYSTEM_ASSIGNED) - .withUserAssignedIdentities( - mapOf( - "string", - SerializerFactory - .createDefaultManagementSerializerAdapter() - .deserialize("{}", Object.class, SerializerEncoding.JSON)))) - .withKind("string") - .withProperties( - new PartialBatchDeployment() - .withCodeConfiguration( - new PartialCodeConfiguration().withCodeId("string").withScoringScript("string")) - .withCompute("string") - .withDescription("string") - .withEnvironmentId("string") - .withEnvironmentVariables(mapOf("string", "string")) - .withErrorThreshold(1) - .withLoggingLevel(BatchLoggingLevel.INFO) - .withMaxConcurrencyPerInstance(1) - .withMiniBatchSize(1L) - .withModel(new PartialIdAssetReference().withAssetId("string")) - .withOutputAction(BatchOutputAction.SUMMARY_ONLY) - .withOutputFileName("string") - .withProperties(mapOf("string", "string")) - .withRetrySettings( - new PartialBatchRetrySettings().withMaxRetries(1).withTimeout(Duration.parse("PT5M")))) - .withSku( - new PartialSku() - .withCapacity(1) - .withFamily("string") - .withName("string") - .withSize("string") - .withTier(SkuTier.FREE)) + .withProperties(new PartialBatchDeployment().withDescription("string")) .apply(); } @@ -456,7 +408,7 @@ public final class BatchDeploymentsUpdateSamples { ```java import com.azure.resourcemanager.machinelearning.models.BatchEndpointDefaults; -import com.azure.resourcemanager.machinelearning.models.BatchEndpointDetails; +import com.azure.resourcemanager.machinelearning.models.BatchEndpointProperties; import com.azure.resourcemanager.machinelearning.models.EndpointAuthMode; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentity; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentityType; @@ -469,7 +421,7 @@ import java.util.Map; /** Samples for BatchEndpoints CreateOrUpdate. */ public final class BatchEndpointsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchEndpoint/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchEndpoint/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Batch Endpoint. @@ -484,7 +436,7 @@ public final class BatchEndpointsCreateOrUpdateSamples { .withRegion("string") .withExistingWorkspace("test-rg", "my-aml-workspace") .withProperties( - new BatchEndpointDetails() + new BatchEndpointProperties() .withAuthMode(EndpointAuthMode.AMLTOKEN) .withDescription("string") .withProperties(mapOf("string", "string")) @@ -526,7 +478,7 @@ import com.azure.core.util.Context; /** Samples for BatchEndpoints Delete. */ public final class BatchEndpointsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchEndpoint/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchEndpoint/delete.json */ /** * Sample code: Delete Batch Endpoint. @@ -547,7 +499,7 @@ import com.azure.core.util.Context; /** Samples for BatchEndpoints Get. */ public final class BatchEndpointsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchEndpoint/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchEndpoint/get.json */ /** * Sample code: Get Batch Endpoint. @@ -568,7 +520,7 @@ import com.azure.core.util.Context; /** Samples for BatchEndpoints List. */ public final class BatchEndpointsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchEndpoint/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchEndpoint/list.json */ /** * Sample code: List Batch Endpoint. @@ -589,7 +541,7 @@ import com.azure.core.util.Context; /** Samples for BatchEndpoints ListKeys. */ public final class BatchEndpointsListKeysSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchEndpoint/listKeys.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchEndpoint/listKeys.json */ /** * Sample code: ListKeys Batch Endpoint. @@ -608,13 +560,9 @@ public final class BatchEndpointsListKeysSamples { import com.azure.core.management.serializer.SerializerFactory; import com.azure.core.util.Context; import com.azure.core.util.serializer.SerializerEncoding; -import com.azure.resourcemanager.machinelearning.models.BatchEndpointData; -import com.azure.resourcemanager.machinelearning.models.BatchEndpointDefaults; +import com.azure.resourcemanager.machinelearning.models.BatchEndpoint; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentityType; -import com.azure.resourcemanager.machinelearning.models.PartialBatchEndpoint; import com.azure.resourcemanager.machinelearning.models.PartialManagedServiceIdentity; -import com.azure.resourcemanager.machinelearning.models.PartialSku; -import com.azure.resourcemanager.machinelearning.models.SkuTier; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -622,7 +570,7 @@ import java.util.Map; /** Samples for BatchEndpoints Update. */ public final class BatchEndpointsUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchEndpoint/update.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchEndpoint/update.json */ /** * Sample code: Update Batch Endpoint. @@ -631,7 +579,7 @@ public final class BatchEndpointsUpdateSamples { */ public static void updateBatchEndpoint(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) throws IOException { - BatchEndpointData resource = + BatchEndpoint resource = manager .batchEndpoints() .getWithResponse("test-rg", "my-aml-workspace", "testEndpointName", Context.NONE) @@ -648,16 +596,6 @@ public final class BatchEndpointsUpdateSamples { SerializerFactory .createDefaultManagementSerializerAdapter() .deserialize("{}", Object.class, SerializerEncoding.JSON)))) - .withKind("string") - .withProperties( - new PartialBatchEndpoint().withDefaults(new BatchEndpointDefaults().withDeploymentName("string"))) - .withSku( - new PartialSku() - .withCapacity(1) - .withFamily("string") - .withName("string") - .withSize("string") - .withTier(SkuTier.FREE)) .apply(); } @@ -677,14 +615,14 @@ public final class BatchEndpointsUpdateSamples { ### CodeContainers_CreateOrUpdate ```java -import com.azure.resourcemanager.machinelearning.models.CodeContainerDetails; +import com.azure.resourcemanager.machinelearning.models.CodeContainerProperties; import java.util.HashMap; import java.util.Map; /** Samples for CodeContainers CreateOrUpdate. */ public final class CodeContainersCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/CodeContainer/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/CodeContainer/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Code Container. @@ -698,7 +636,7 @@ public final class CodeContainersCreateOrUpdateSamples { .define("testContainer") .withExistingWorkspace("testrg123", "testworkspace") .withProperties( - new CodeContainerDetails() + new CodeContainerProperties() .withDescription("string") .withTags(mapOf("tag1", "value1", "tag2", "value2"))) .create(); @@ -725,7 +663,7 @@ import com.azure.core.util.Context; /** Samples for CodeContainers Delete. */ public final class CodeContainersDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/CodeContainer/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/CodeContainer/delete.json */ /** * Sample code: Delete Code Container. @@ -746,7 +684,7 @@ import com.azure.core.util.Context; /** Samples for CodeContainers Get. */ public final class CodeContainersGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/CodeContainer/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/CodeContainer/get.json */ /** * Sample code: Get Code Container. @@ -767,7 +705,7 @@ import com.azure.core.util.Context; /** Samples for CodeContainers List. */ public final class CodeContainersListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/CodeContainer/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/CodeContainer/list.json */ /** * Sample code: List Code Container. @@ -783,14 +721,14 @@ public final class CodeContainersListSamples { ### CodeVersions_CreateOrUpdate ```java -import com.azure.resourcemanager.machinelearning.models.CodeVersionDetails; +import com.azure.resourcemanager.machinelearning.models.CodeVersionProperties; import java.util.HashMap; import java.util.Map; /** Samples for CodeVersions CreateOrUpdate. */ public final class CodeVersionsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/CodeVersion/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/CodeVersion/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Code Version. @@ -804,7 +742,7 @@ public final class CodeVersionsCreateOrUpdateSamples { .define("string") .withExistingCode("test-rg", "my-aml-workspace", "string") .withProperties( - new CodeVersionDetails() + new CodeVersionProperties() .withDescription("string") .withProperties(mapOf("string", "string")) .withTags(mapOf("string", "string")) @@ -834,7 +772,7 @@ import com.azure.core.util.Context; /** Samples for CodeVersions Delete. */ public final class CodeVersionsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/CodeVersion/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/CodeVersion/delete.json */ /** * Sample code: Delete Code Version. @@ -855,7 +793,7 @@ import com.azure.core.util.Context; /** Samples for CodeVersions Get. */ public final class CodeVersionsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/CodeVersion/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/CodeVersion/get.json */ /** * Sample code: Get Code Version. @@ -876,7 +814,7 @@ import com.azure.core.util.Context; /** Samples for CodeVersions List. */ public final class CodeVersionsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/CodeVersion/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/CodeVersion/list.json */ /** * Sample code: List Code Version. @@ -892,14 +830,14 @@ public final class CodeVersionsListSamples { ### ComponentContainers_CreateOrUpdate ```java -import com.azure.resourcemanager.machinelearning.models.ComponentContainerDetails; +import com.azure.resourcemanager.machinelearning.models.ComponentContainerProperties; import java.util.HashMap; import java.util.Map; /** Samples for ComponentContainers CreateOrUpdate. */ public final class ComponentContainersCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ComponentContainer/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ComponentContainer/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Component Container. @@ -913,7 +851,7 @@ public final class ComponentContainersCreateOrUpdateSamples { .define("string") .withExistingWorkspace("test-rg", "my-aml-workspace") .withProperties( - new ComponentContainerDetails() + new ComponentContainerProperties() .withDescription("string") .withProperties(mapOf("string", "string")) .withTags(mapOf("string", "string"))) @@ -941,7 +879,7 @@ import com.azure.core.util.Context; /** Samples for ComponentContainers Delete. */ public final class ComponentContainersDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ComponentContainer/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ComponentContainer/delete.json */ /** * Sample code: Delete Component Container. @@ -963,7 +901,7 @@ import com.azure.core.util.Context; /** Samples for ComponentContainers Get. */ public final class ComponentContainersGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ComponentContainer/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ComponentContainer/get.json */ /** * Sample code: Get Component Container. @@ -984,7 +922,7 @@ import com.azure.core.util.Context; /** Samples for ComponentContainers List. */ public final class ComponentContainersListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ComponentContainer/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ComponentContainer/list.json */ /** * Sample code: List Component Container. @@ -1003,7 +941,7 @@ public final class ComponentContainersListSamples { ```java import com.azure.core.management.serializer.SerializerFactory; import com.azure.core.util.serializer.SerializerEncoding; -import com.azure.resourcemanager.machinelearning.models.ComponentVersionDetails; +import com.azure.resourcemanager.machinelearning.models.ComponentVersionProperties; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -1011,7 +949,7 @@ import java.util.Map; /** Samples for ComponentVersions CreateOrUpdate. */ public final class ComponentVersionsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ComponentVersion/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ComponentVersion/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Component Version. @@ -1025,7 +963,7 @@ public final class ComponentVersionsCreateOrUpdateSamples { .define("string") .withExistingComponent("test-rg", "my-aml-workspace", "string") .withProperties( - new ComponentVersionDetails() + new ComponentVersionProperties() .withDescription("string") .withProperties(mapOf("string", "string")) .withTags(mapOf("string", "string")) @@ -1061,7 +999,7 @@ import com.azure.core.util.Context; /** Samples for ComponentVersions Delete. */ public final class ComponentVersionsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ComponentVersion/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ComponentVersion/delete.json */ /** * Sample code: Delete Component Version. @@ -1083,7 +1021,7 @@ import com.azure.core.util.Context; /** Samples for ComponentVersions Get. */ public final class ComponentVersionsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ComponentVersion/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ComponentVersion/get.json */ /** * Sample code: Get Component Version. @@ -1104,7 +1042,7 @@ import com.azure.core.util.Context; /** Samples for ComponentVersions List. */ public final class ComponentVersionsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ComponentVersion/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ComponentVersion/list.json */ /** * Sample code: List Component Version. @@ -1152,7 +1090,7 @@ import java.util.Map; /** Samples for Compute CreateOrUpdate. */ public final class ComputeCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/createOrUpdate/BasicAKSCompute.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/createOrUpdate/BasicAKSCompute.json */ /** * Sample code: Create an AKS Compute. @@ -1170,7 +1108,7 @@ public final class ComputeCreateOrUpdateSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/createOrUpdate/AKSCompute.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/createOrUpdate/AKSCompute.json */ /** * Sample code: Update an AKS Compute. @@ -1193,7 +1131,7 @@ public final class ComputeCreateOrUpdateSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/createOrUpdate/KubernetesCompute.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/createOrUpdate/KubernetesCompute.json */ /** * Sample code: Attach a Kubernetes Compute. @@ -1230,7 +1168,7 @@ public final class ComputeCreateOrUpdateSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/createOrUpdate/BasicAmlCompute.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/createOrUpdate/BasicAmlCompute.json */ /** * Sample code: Create a AML Compute. @@ -1266,7 +1204,7 @@ public final class ComputeCreateOrUpdateSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/createOrUpdate/ComputeInstance.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/createOrUpdate/ComputeInstance.json */ /** * Sample code: Create an ComputeInstance Compute. @@ -1300,7 +1238,7 @@ public final class ComputeCreateOrUpdateSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/createOrUpdate/ComputeInstanceMinimal.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/createOrUpdate/ComputeInstanceMinimal.json */ /** * Sample code: Create an ComputeInstance Compute with minimal inputs. @@ -1320,7 +1258,7 @@ public final class ComputeCreateOrUpdateSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/createOrUpdate/AmlCompute.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/createOrUpdate/AmlCompute.json */ /** * Sample code: Update a AML Compute. @@ -1347,7 +1285,7 @@ public final class ComputeCreateOrUpdateSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/createOrUpdate/BasicDataFactoryCompute.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/createOrUpdate/BasicDataFactoryCompute.json */ /** * Sample code: Create a DataFactory Compute. @@ -1387,7 +1325,7 @@ import com.azure.resourcemanager.machinelearning.models.UnderlyingResourceAction /** Samples for Compute Delete. */ public final class ComputeDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/delete.json */ /** * Sample code: Delete Compute. @@ -1410,7 +1348,7 @@ import com.azure.core.util.Context; /** Samples for Compute Get. */ public final class ComputeGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/get/AKSCompute.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/get/AKSCompute.json */ /** * Sample code: Get a AKS Compute. @@ -1422,7 +1360,7 @@ public final class ComputeGetSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/get/KubernetesCompute.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/get/KubernetesCompute.json */ /** * Sample code: Get a Kubernetes Compute. @@ -1434,7 +1372,7 @@ public final class ComputeGetSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/get/ComputeInstance.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/get/ComputeInstance.json */ /** * Sample code: Get an ComputeInstance. @@ -1446,7 +1384,7 @@ public final class ComputeGetSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/get/AmlCompute.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/get/AmlCompute.json */ /** * Sample code: Get a AML Compute. @@ -1467,7 +1405,7 @@ import com.azure.core.util.Context; /** Samples for Compute List. */ public final class ComputeListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/list.json */ /** * Sample code: Get Computes. @@ -1488,7 +1426,7 @@ import com.azure.core.util.Context; /** Samples for Compute ListKeys. */ public final class ComputeListKeysSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/listKeys.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/listKeys.json */ /** * Sample code: List AKS Compute Keys. @@ -1509,7 +1447,7 @@ import com.azure.core.util.Context; /** Samples for Compute ListNodes. */ public final class ComputeListNodesSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/listNodes.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/listNodes.json */ /** * Sample code: Get compute nodes information for a compute. @@ -1531,7 +1469,7 @@ import com.azure.core.util.Context; /** Samples for Compute Restart. */ public final class ComputeRestartSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/restart.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/restart.json */ /** * Sample code: Restart ComputeInstance Compute. @@ -1553,7 +1491,7 @@ import com.azure.core.util.Context; /** Samples for Compute Start. */ public final class ComputeStartSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/start.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/start.json */ /** * Sample code: Start ComputeInstance Compute. @@ -1575,7 +1513,7 @@ import com.azure.core.util.Context; /** Samples for Compute Stop. */ public final class ComputeStopSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/stop.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/stop.json */ /** * Sample code: Stop ComputeInstance Compute. @@ -1601,7 +1539,7 @@ import java.time.Duration; /** Samples for Compute Update. */ public final class ComputeUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/patch.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/patch.json */ /** * Sample code: Update a AmlCompute Compute. @@ -1629,7 +1567,7 @@ public final class ComputeUpdateSamples { ### DataContainers_CreateOrUpdate ```java -import com.azure.resourcemanager.machinelearning.models.DataContainerDetails; +import com.azure.resourcemanager.machinelearning.models.DataContainerProperties; import com.azure.resourcemanager.machinelearning.models.DataType; import java.util.HashMap; import java.util.Map; @@ -1637,7 +1575,7 @@ import java.util.Map; /** Samples for DataContainers CreateOrUpdate. */ public final class DataContainersCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/DataContainer/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/DataContainer/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Data Container. @@ -1651,11 +1589,11 @@ public final class DataContainersCreateOrUpdateSamples { .define("datacontainer123") .withExistingWorkspace("testrg123", "workspace123") .withProperties( - new DataContainerDetails() + new DataContainerProperties() .withDescription("string") .withProperties(mapOf("properties1", "value1", "properties2", "value2")) .withTags(mapOf("tag1", "value1", "tag2", "value2")) - .withDataType(DataType.URI_FILE)) + .withDataType(DataType.fromString("UriFile"))) .create(); } @@ -1680,7 +1618,7 @@ import com.azure.core.util.Context; /** Samples for DataContainers Delete. */ public final class DataContainersDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/DataContainer/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/DataContainer/delete.json */ /** * Sample code: Delete Data Container. @@ -1701,7 +1639,7 @@ import com.azure.core.util.Context; /** Samples for DataContainers Get. */ public final class DataContainersGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/DataContainer/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/DataContainer/get.json */ /** * Sample code: Get Data Container. @@ -1722,7 +1660,7 @@ import com.azure.core.util.Context; /** Samples for DataContainers List. */ public final class DataContainersListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/DataContainer/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/DataContainer/list.json */ /** * Sample code: List Data Container. @@ -1745,7 +1683,7 @@ import java.util.Map; /** Samples for DataVersions CreateOrUpdate. */ public final class DataVersionsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/DataVersionBase/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/DataVersionBase/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Data Version Base. @@ -1789,7 +1727,7 @@ import com.azure.core.util.Context; /** Samples for DataVersions Delete. */ public final class DataVersionsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/DataVersionBase/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/DataVersionBase/delete.json */ /** * Sample code: Delete Data Version Base. @@ -1810,7 +1748,7 @@ import com.azure.core.util.Context; /** Samples for DataVersions Get. */ public final class DataVersionsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/DataVersionBase/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/DataVersionBase/get.json */ /** * Sample code: Get Data Version Base. @@ -1831,7 +1769,7 @@ import com.azure.core.util.Context; /** Samples for DataVersions List. */ public final class DataVersionsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/DataVersionBase/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/DataVersionBase/list.json */ /** * Sample code: List Data Version Base. @@ -1864,7 +1802,7 @@ import java.util.UUID; /** Samples for Datastores CreateOrUpdate. */ public final class DatastoresCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Datastore/AzureDataLakeGen1WServicePrincipal/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Datastore/AzureDataLakeGen1WServicePrincipal/createOrUpdate.json */ /** * Sample code: CreateOrUpdate datastore (Azure Data Lake Gen1 w/ ServicePrincipal). @@ -1894,7 +1832,7 @@ public final class DatastoresCreateOrUpdateSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Datastore/AzureDataLakeGen2WServicePrincipal/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Datastore/AzureDataLakeGen2WServicePrincipal/createOrUpdate.json */ /** * Sample code: CreateOrUpdate datastore (Azure Data Lake Gen2 w/ Service Principal). @@ -1927,7 +1865,7 @@ public final class DatastoresCreateOrUpdateSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Datastore/AzureBlobWAccountKey/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Datastore/AzureBlobWAccountKey/createOrUpdate.json */ /** * Sample code: CreateOrUpdate datastore (AzureBlob w/ AccountKey). @@ -1956,7 +1894,7 @@ public final class DatastoresCreateOrUpdateSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Datastore/AzureFileWAccountKey/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Datastore/AzureFileWAccountKey/createOrUpdate.json */ /** * Sample code: CreateOrUpdate datastore (Azure File store w/ AccountKey). @@ -2005,7 +1943,7 @@ import com.azure.core.util.Context; /** Samples for Datastores Delete. */ public final class DatastoresDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Datastore/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Datastore/delete.json */ /** * Sample code: Delete datastore. @@ -2026,7 +1964,7 @@ import com.azure.core.util.Context; /** Samples for Datastores Get. */ public final class DatastoresGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Datastore/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Datastore/get.json */ /** * Sample code: Get datastore. @@ -2048,7 +1986,7 @@ import java.util.Arrays; /** Samples for Datastores List. */ public final class DatastoresListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Datastore/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Datastore/list.json */ /** * Sample code: List datastores. @@ -2081,7 +2019,7 @@ import com.azure.core.util.Context; /** Samples for Datastores ListSecrets. */ public final class DatastoresListSecretsSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Datastore/listSecrets.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Datastore/listSecrets.json */ /** * Sample code: Get datastore secrets. @@ -2097,14 +2035,14 @@ public final class DatastoresListSecretsSamples { ### EnvironmentContainers_CreateOrUpdate ```java -import com.azure.resourcemanager.machinelearning.models.EnvironmentContainerDetails; +import com.azure.resourcemanager.machinelearning.models.EnvironmentContainerProperties; import java.util.HashMap; import java.util.Map; /** Samples for EnvironmentContainers CreateOrUpdate. */ public final class EnvironmentContainersCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/EnvironmentContainer/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/EnvironmentContainer/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Environment Container. @@ -2118,7 +2056,7 @@ public final class EnvironmentContainersCreateOrUpdateSamples { .define("testEnvironment") .withExistingWorkspace("testrg123", "testworkspace") .withProperties( - new EnvironmentContainerDetails() + new EnvironmentContainerProperties() .withDescription("string") .withProperties( mapOf("additionalProp1", "string", "additionalProp2", "string", "additionalProp3", "string")) @@ -2148,7 +2086,7 @@ import com.azure.core.util.Context; /** Samples for EnvironmentContainers Delete. */ public final class EnvironmentContainersDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/EnvironmentContainer/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/EnvironmentContainer/delete.json */ /** * Sample code: Delete Environment Container. @@ -2170,7 +2108,7 @@ import com.azure.core.util.Context; /** Samples for EnvironmentContainers Get. */ public final class EnvironmentContainersGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/EnvironmentContainer/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/EnvironmentContainer/get.json */ /** * Sample code: Get Environment Container. @@ -2192,7 +2130,7 @@ import com.azure.core.util.Context; /** Samples for EnvironmentContainers List. */ public final class EnvironmentContainersListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/EnvironmentContainer/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/EnvironmentContainer/list.json */ /** * Sample code: List Environment Container. @@ -2210,7 +2148,7 @@ public final class EnvironmentContainersListSamples { ```java import com.azure.resourcemanager.machinelearning.models.BuildContext; -import com.azure.resourcemanager.machinelearning.models.EnvironmentVersionDetails; +import com.azure.resourcemanager.machinelearning.models.EnvironmentVersionProperties; import com.azure.resourcemanager.machinelearning.models.InferenceContainerProperties; import com.azure.resourcemanager.machinelearning.models.Route; import java.util.HashMap; @@ -2219,7 +2157,7 @@ import java.util.Map; /** Samples for EnvironmentVersions CreateOrUpdate. */ public final class EnvironmentVersionsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/EnvironmentVersion/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/EnvironmentVersion/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Environment Version. @@ -2233,7 +2171,7 @@ public final class EnvironmentVersionsCreateOrUpdateSamples { .define("string") .withExistingEnvironment("test-rg", "my-aml-workspace", "string") .withProperties( - new EnvironmentVersionDetails() + new EnvironmentVersionProperties() .withDescription("string") .withProperties(mapOf("string", "string")) .withTags(mapOf("string", "string")) @@ -2274,7 +2212,7 @@ import com.azure.core.util.Context; /** Samples for EnvironmentVersions Delete. */ public final class EnvironmentVersionsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/EnvironmentVersion/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/EnvironmentVersion/delete.json */ /** * Sample code: Delete Environment Version. @@ -2298,7 +2236,7 @@ import com.azure.core.util.Context; /** Samples for EnvironmentVersions Get. */ public final class EnvironmentVersionsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/EnvironmentVersion/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/EnvironmentVersion/get.json */ /** * Sample code: Get Environment Version. @@ -2319,7 +2257,7 @@ import com.azure.core.util.Context; /** Samples for EnvironmentVersions List. */ public final class EnvironmentVersionsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/EnvironmentVersion/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/EnvironmentVersion/list.json */ /** * Sample code: List Environment Version. @@ -2343,7 +2281,7 @@ import com.azure.core.util.Context; /** Samples for Jobs Cancel. */ public final class JobsCancelSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/cancel.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/cancel.json */ /** * Sample code: Cancel Job. @@ -2351,7 +2289,7 @@ public final class JobsCancelSamples { * @param manager Entry point to MachineLearningManager. */ public static void cancelJob(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { - manager.jobs().cancelWithResponse("test-rg", "my-aml-workspace", "string", Context.NONE); + manager.jobs().cancel("test-rg", "my-aml-workspace", "string", Context.NONE); } } ``` @@ -2362,122 +2300,32 @@ public final class JobsCancelSamples { import com.azure.core.management.serializer.SerializerFactory; import com.azure.core.util.serializer.SerializerEncoding; import com.azure.resourcemanager.machinelearning.models.AmlToken; -import com.azure.resourcemanager.machinelearning.models.AutoMLJob; import com.azure.resourcemanager.machinelearning.models.CommandJob; import com.azure.resourcemanager.machinelearning.models.CommandJobLimits; -import com.azure.resourcemanager.machinelearning.models.CronSchedule; import com.azure.resourcemanager.machinelearning.models.Goal; import com.azure.resourcemanager.machinelearning.models.GridSamplingAlgorithm; -import com.azure.resourcemanager.machinelearning.models.ImageClassification; -import com.azure.resourcemanager.machinelearning.models.ImageLimitSettings; -import com.azure.resourcemanager.machinelearning.models.ImageModelDistributionSettingsClassification; -import com.azure.resourcemanager.machinelearning.models.ImageModelSettingsClassification; -import com.azure.resourcemanager.machinelearning.models.ImageVerticalDataSettings; import com.azure.resourcemanager.machinelearning.models.JobService; import com.azure.resourcemanager.machinelearning.models.LiteralJobInput; -import com.azure.resourcemanager.machinelearning.models.MLTableJobInput; import com.azure.resourcemanager.machinelearning.models.MedianStoppingPolicy; import com.azure.resourcemanager.machinelearning.models.Mpi; import com.azure.resourcemanager.machinelearning.models.Objective; import com.azure.resourcemanager.machinelearning.models.OutputDeliveryMode; import com.azure.resourcemanager.machinelearning.models.PipelineJob; import com.azure.resourcemanager.machinelearning.models.ResourceConfiguration; -import com.azure.resourcemanager.machinelearning.models.ScheduleStatus; import com.azure.resourcemanager.machinelearning.models.SweepJob; import com.azure.resourcemanager.machinelearning.models.SweepJobLimits; import com.azure.resourcemanager.machinelearning.models.TensorFlow; -import com.azure.resourcemanager.machinelearning.models.TrainingDataSettings; import com.azure.resourcemanager.machinelearning.models.TrialComponent; import com.azure.resourcemanager.machinelearning.models.UriFileJobOutput; import java.io.IOException; import java.time.Duration; -import java.time.OffsetDateTime; -import java.util.Arrays; import java.util.HashMap; import java.util.Map; /** Samples for Jobs CreateOrUpdate. */ public final class JobsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/AutoMLJob/createOrUpdate.json - */ - /** - * Sample code: CreateOrUpdate AutoML Job. - * - * @param manager Entry point to MachineLearningManager. - */ - public static void createOrUpdateAutoMLJob(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) - throws IOException { - manager - .jobs() - .define("string") - .withExistingWorkspace("test-rg", "my-aml-workspace") - .withProperties( - new AutoMLJob() - .withDescription("string") - .withProperties(mapOf("string", "string")) - .withTags(mapOf("string", "string")) - .withComputeId("string") - .withDisplayName("string") - .withExperimentName("string") - .withIdentity(new AmlToken()) - .withIsArchived(false) - .withSchedule( - new CronSchedule() - .withEndTime(OffsetDateTime.parse("2020-01-01T12:34:56.999Z")) - .withScheduleStatus(ScheduleStatus.DISABLED) - .withStartTime(OffsetDateTime.parse("2020-01-01T12:34:56.999Z")) - .withTimeZone("string") - .withExpression("string")) - .withServices( - mapOf( - "string", - new JobService() - .withEndpoint("string") - .withJobServiceType("string") - .withPort(1) - .withProperties(mapOf("string", "string")))) - .withEnvironmentId("string") - .withEnvironmentVariables(mapOf("string", "string")) - .withOutputs( - mapOf( - "string", - new UriFileJobOutput() - .withDescription("string") - .withMode(OutputDeliveryMode.READ_WRITE_MOUNT) - .withUri("string"))) - .withResources( - new ResourceConfiguration() - .withInstanceCount(1) - .withInstanceType("string") - .withProperties( - mapOf( - "string", - SerializerFactory - .createDefaultManagementSerializerAdapter() - .deserialize( - "{\"9bec0ab0-c62f-4fa9-a97c-7b24bbcc90ad\":null}", - Object.class, - SerializerEncoding.JSON)))) - .withTaskDetails( - new ImageClassification() - .withModelSettings(new ImageModelSettingsClassification().withValidationCropSize(2)) - .withSearchSpace( - Arrays - .asList( - new ImageModelDistributionSettingsClassification() - .withValidationCropSize("choice(2, 360)"))) - .withDataSettings( - new ImageVerticalDataSettings() - .withTargetColumnName("string") - .withTrainingData( - new TrainingDataSettings().withData(new MLTableJobInput().withUri("string")))) - .withLimitSettings(new ImageLimitSettings().withMaxTrials(2)))) - .create(); - } - - /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/SweepJob/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/SweepJob/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Sweep Job. @@ -2542,7 +2390,7 @@ public final class JobsCreateOrUpdateSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/PipelineJob/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/PipelineJob/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Pipeline Job. @@ -2576,9 +2424,9 @@ public final class JobsCreateOrUpdateSamples { mapOf( "string", new UriFileJobOutput() - .withDescription("string") .withMode(OutputDeliveryMode.UPLOAD) - .withUri("string"))) + .withUri("string") + .withDescription("string"))) .withSettings( SerializerFactory .createDefaultManagementSerializerAdapter() @@ -2587,7 +2435,7 @@ public final class JobsCreateOrUpdateSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/CommandJob/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/CommandJob/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Command Job. @@ -2628,9 +2476,9 @@ public final class JobsCreateOrUpdateSamples { mapOf( "string", new UriFileJobOutput() - .withDescription("string") .withMode(OutputDeliveryMode.READ_WRITE_MOUNT) - .withUri("string"))) + .withUri("string") + .withDescription("string"))) .withResources( new ResourceConfiguration() .withInstanceCount(1) @@ -2668,7 +2516,7 @@ import com.azure.core.util.Context; /** Samples for Jobs Delete. */ public final class JobsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/delete.json */ /** * Sample code: Delete Job. @@ -2689,7 +2537,7 @@ import com.azure.core.util.Context; /** Samples for Jobs Get. */ public final class JobsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/CommandJob/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/CommandJob/get.json */ /** * Sample code: Get Command Job. @@ -2701,19 +2549,7 @@ public final class JobsGetSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/AutoMLJob/get.json - */ - /** - * Sample code: Get AutoML Job. - * - * @param manager Entry point to MachineLearningManager. - */ - public static void getAutoMLJob(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { - manager.jobs().getWithResponse("test-rg", "my-aml-workspace", "string", Context.NONE); - } - - /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/SweepJob/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/SweepJob/get.json */ /** * Sample code: Get Sweep Job. @@ -2725,7 +2561,7 @@ public final class JobsGetSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/PipelineJob/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/PipelineJob/get.json */ /** * Sample code: Get Pipeline Job. @@ -2746,7 +2582,7 @@ import com.azure.core.util.Context; /** Samples for Jobs List. */ public final class JobsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/CommandJob/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/CommandJob/list.json */ /** * Sample code: List Command Job. @@ -2754,11 +2590,11 @@ public final class JobsListSamples { * @param manager Entry point to MachineLearningManager. */ public static void listCommandJob(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { - manager.jobs().list("test-rg", "my-aml-workspace", null, "string", "string", null, null, null, Context.NONE); + manager.jobs().list("test-rg", "my-aml-workspace", null, "string", "string", null, Context.NONE); } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/PipelineJob/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/PipelineJob/list.json */ /** * Sample code: List Pipeline Job. @@ -2766,11 +2602,11 @@ public final class JobsListSamples { * @param manager Entry point to MachineLearningManager. */ public static void listPipelineJob(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { - manager.jobs().list("test-rg", "my-aml-workspace", null, "string", "string", null, null, null, Context.NONE); + manager.jobs().list("test-rg", "my-aml-workspace", null, "string", "string", null, Context.NONE); } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/SweepJob/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/SweepJob/list.json */ /** * Sample code: List Sweep Job. @@ -2778,19 +2614,7 @@ public final class JobsListSamples { * @param manager Entry point to MachineLearningManager. */ public static void listSweepJob(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { - manager.jobs().list("test-rg", "my-aml-workspace", null, "string", "string", null, null, null, Context.NONE); - } - - /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/AutoMLJob/list.json - */ - /** - * Sample code: List AutoML Job. - * - * @param manager Entry point to MachineLearningManager. - */ - public static void listAutoMLJob(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { - manager.jobs().list("test-rg", "my-aml-workspace", null, null, null, null, null, null, Context.NONE); + manager.jobs().list("test-rg", "my-aml-workspace", null, "string", "string", null, Context.NONE); } } ``` @@ -2798,14 +2622,14 @@ public final class JobsListSamples { ### ModelContainers_CreateOrUpdate ```java -import com.azure.resourcemanager.machinelearning.models.ModelContainerDetails; +import com.azure.resourcemanager.machinelearning.models.ModelContainerProperties; import java.util.HashMap; import java.util.Map; /** Samples for ModelContainers CreateOrUpdate. */ public final class ModelContainersCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ModelContainer/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ModelContainer/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Model Container. @@ -2819,7 +2643,7 @@ public final class ModelContainersCreateOrUpdateSamples { .define("testContainer") .withExistingWorkspace("testrg123", "workspace123") .withProperties( - new ModelContainerDetails() + new ModelContainerProperties() .withDescription("Model container description") .withTags(mapOf("tag1", "value1", "tag2", "value2"))) .create(); @@ -2846,7 +2670,7 @@ import com.azure.core.util.Context; /** Samples for ModelContainers Delete. */ public final class ModelContainersDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ModelContainer/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ModelContainer/delete.json */ /** * Sample code: Delete Model Container. @@ -2867,7 +2691,7 @@ import com.azure.core.util.Context; /** Samples for ModelContainers Get. */ public final class ModelContainersGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ModelContainer/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ModelContainer/get.json */ /** * Sample code: Get Model Container. @@ -2888,7 +2712,7 @@ import com.azure.core.util.Context; /** Samples for ModelContainers List. */ public final class ModelContainersListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ModelContainer/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ModelContainer/list.json */ /** * Sample code: List Model Container. @@ -2905,15 +2729,14 @@ public final class ModelContainersListSamples { ```java import com.azure.resourcemanager.machinelearning.models.FlavorData; -import com.azure.resourcemanager.machinelearning.models.ModelType; -import com.azure.resourcemanager.machinelearning.models.ModelVersionDetails; +import com.azure.resourcemanager.machinelearning.models.ModelVersionProperties; import java.util.HashMap; import java.util.Map; /** Samples for ModelVersions CreateOrUpdate. */ public final class ModelVersionsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ModelVersion/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ModelVersion/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Model Version. @@ -2927,13 +2750,13 @@ public final class ModelVersionsCreateOrUpdateSamples { .define("string") .withExistingModel("test-rg", "my-aml-workspace", "string") .withProperties( - new ModelVersionDetails() + new ModelVersionProperties() .withDescription("string") .withProperties(mapOf("string", "string")) .withTags(mapOf("string", "string")) .withIsAnonymous(false) .withFlavors(mapOf("string", new FlavorData().withData(mapOf("string", "string")))) - .withModelType(ModelType.CUSTOM_MODEL) + .withModelType("CustomModel") .withModelUri("string")) .create(); } @@ -2959,7 +2782,7 @@ import com.azure.core.util.Context; /** Samples for ModelVersions Delete. */ public final class ModelVersionsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ModelVersion/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ModelVersion/delete.json */ /** * Sample code: Delete Model Version. @@ -2980,7 +2803,7 @@ import com.azure.core.util.Context; /** Samples for ModelVersions Get. */ public final class ModelVersionsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ModelVersion/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ModelVersion/get.json */ /** * Sample code: Get Model Version. @@ -3001,7 +2824,7 @@ import com.azure.core.util.Context; /** Samples for ModelVersions List. */ public final class ModelVersionsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ModelVersion/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ModelVersion/list.json */ /** * Sample code: List Model Version. @@ -3053,7 +2876,7 @@ import java.util.Map; /** Samples for OnlineDeployments CreateOrUpdate. */ public final class OnlineDeploymentsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/KubernetesOnlineDeployment/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/KubernetesOnlineDeployment/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Kubernetes Online Deployment. @@ -3117,7 +2940,7 @@ public final class OnlineDeploymentsCreateOrUpdateSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/ManagedOnlineDeployment/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/ManagedOnlineDeployment/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Managed Online Deployment. @@ -3199,7 +3022,7 @@ import com.azure.core.util.Context; /** Samples for OnlineDeployments Delete. */ public final class OnlineDeploymentsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/delete.json */ /** * Sample code: Delete Online Deployment. @@ -3221,7 +3044,7 @@ import com.azure.core.util.Context; /** Samples for OnlineDeployments Get. */ public final class OnlineDeploymentsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/KubernetesOnlineDeployment/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/KubernetesOnlineDeployment/get.json */ /** * Sample code: Get Kubernetes Online Deployment. @@ -3236,7 +3059,7 @@ public final class OnlineDeploymentsGetSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/ManagedOnlineDeployment/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/ManagedOnlineDeployment/get.json */ /** * Sample code: Get Managed Online Deployment. @@ -3262,7 +3085,7 @@ import com.azure.resourcemanager.machinelearning.models.DeploymentLogsRequest; /** Samples for OnlineDeployments GetLogs. */ public final class OnlineDeploymentsGetLogsSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/getLogs.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/getLogs.json */ /** * Sample code: Get Online Deployment Logs. @@ -3292,7 +3115,7 @@ import com.azure.core.util.Context; /** Samples for OnlineDeployments List. */ public final class OnlineDeploymentsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/list.json */ /** * Sample code: List Online Deployments. @@ -3315,7 +3138,7 @@ import com.azure.core.util.Context; /** Samples for OnlineDeployments ListSkus. */ public final class OnlineDeploymentsListSkusSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/ManagedOnlineDeployment/listSkus.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/ManagedOnlineDeployment/listSkus.json */ /** * Sample code: List Managed Online Deployment Skus. @@ -3330,7 +3153,7 @@ public final class OnlineDeploymentsListSkusSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/KubernetesOnlineDeployment/listSkus.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/KubernetesOnlineDeployment/listSkus.json */ /** * Sample code: List Kubernetes Online Deployment Skus. @@ -3349,24 +3172,17 @@ public final class OnlineDeploymentsListSkusSamples { ### OnlineDeployments_Update ```java -import com.azure.core.management.serializer.SerializerFactory; import com.azure.core.util.Context; -import com.azure.core.util.serializer.SerializerEncoding; -import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentityType; -import com.azure.resourcemanager.machinelearning.models.OnlineDeploymentData; -import com.azure.resourcemanager.machinelearning.models.PartialKubernetesOnlineDeployment; -import com.azure.resourcemanager.machinelearning.models.PartialManagedOnlineDeployment; -import com.azure.resourcemanager.machinelearning.models.PartialManagedServiceIdentity; +import com.azure.resourcemanager.machinelearning.models.OnlineDeployment; import com.azure.resourcemanager.machinelearning.models.PartialSku; import com.azure.resourcemanager.machinelearning.models.SkuTier; -import java.io.IOException; import java.util.HashMap; import java.util.Map; /** Samples for OnlineDeployments Update. */ public final class OnlineDeploymentsUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/ManagedOnlineDeployment/update.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/ManagedOnlineDeployment/update.json */ /** * Sample code: Update Managed Online Deployment. @@ -3374,8 +3190,8 @@ public final class OnlineDeploymentsUpdateSamples { * @param manager Entry point to MachineLearningManager. */ public static void updateManagedOnlineDeployment( - com.azure.resourcemanager.machinelearning.MachineLearningManager manager) throws IOException { - OnlineDeploymentData resource = + com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { + OnlineDeployment resource = manager .onlineDeployments() .getWithResponse("test-rg", "my-aml-workspace", "testEndpointName", "testDeploymentName", Context.NONE) @@ -3383,17 +3199,6 @@ public final class OnlineDeploymentsUpdateSamples { resource .update() .withTags(mapOf()) - .withIdentity( - new PartialManagedServiceIdentity() - .withType(ManagedServiceIdentityType.SYSTEM_ASSIGNED) - .withUserAssignedIdentities( - mapOf( - "string", - SerializerFactory - .createDefaultManagementSerializerAdapter() - .deserialize("{}", Object.class, SerializerEncoding.JSON)))) - .withKind("string") - .withProperties(new PartialManagedOnlineDeployment()) .withSku( new PartialSku() .withCapacity(1) @@ -3405,7 +3210,7 @@ public final class OnlineDeploymentsUpdateSamples { } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/KubernetesOnlineDeployment/update.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/KubernetesOnlineDeployment/update.json */ /** * Sample code: Update Kubernetes Online Deployment. @@ -3413,8 +3218,8 @@ public final class OnlineDeploymentsUpdateSamples { * @param manager Entry point to MachineLearningManager. */ public static void updateKubernetesOnlineDeployment( - com.azure.resourcemanager.machinelearning.MachineLearningManager manager) throws IOException { - OnlineDeploymentData resource = + com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { + OnlineDeployment resource = manager .onlineDeployments() .getWithResponse("test-rg", "my-aml-workspace", "testEndpointName", "testDeploymentName", Context.NONE) @@ -3422,17 +3227,6 @@ public final class OnlineDeploymentsUpdateSamples { resource .update() .withTags(mapOf()) - .withIdentity( - new PartialManagedServiceIdentity() - .withType(ManagedServiceIdentityType.SYSTEM_ASSIGNED) - .withUserAssignedIdentities( - mapOf( - "string", - SerializerFactory - .createDefaultManagementSerializerAdapter() - .deserialize("{}", Object.class, SerializerEncoding.JSON)))) - .withKind("string") - .withProperties(new PartialKubernetesOnlineDeployment()) .withSku( new PartialSku() .withCapacity(1) @@ -3462,7 +3256,7 @@ public final class OnlineDeploymentsUpdateSamples { import com.azure.resourcemanager.machinelearning.models.EndpointAuthMode; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentity; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentityType; -import com.azure.resourcemanager.machinelearning.models.OnlineEndpointDetails; +import com.azure.resourcemanager.machinelearning.models.OnlineEndpointProperties; import com.azure.resourcemanager.machinelearning.models.Sku; import com.azure.resourcemanager.machinelearning.models.SkuTier; import com.azure.resourcemanager.machinelearning.models.UserAssignedIdentity; @@ -3472,7 +3266,7 @@ import java.util.Map; /** Samples for OnlineEndpoints CreateOrUpdate. */ public final class OnlineEndpointsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineEndpoint/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineEndpoint/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Online Endpoint. @@ -3487,7 +3281,7 @@ public final class OnlineEndpointsCreateOrUpdateSamples { .withRegion("string") .withExistingWorkspace("test-rg", "my-aml-workspace") .withProperties( - new OnlineEndpointDetails() + new OnlineEndpointProperties() .withAuthMode(EndpointAuthMode.AMLTOKEN) .withDescription("string") .withProperties(mapOf("string", "string")) @@ -3530,7 +3324,7 @@ import com.azure.core.util.Context; /** Samples for OnlineEndpoints Delete. */ public final class OnlineEndpointsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineEndpoint/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineEndpoint/delete.json */ /** * Sample code: Delete Online Endpoint. @@ -3551,7 +3345,7 @@ import com.azure.core.util.Context; /** Samples for OnlineEndpoints Get. */ public final class OnlineEndpointsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineEndpoint/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineEndpoint/get.json */ /** * Sample code: Get Online Endpoint. @@ -3572,7 +3366,7 @@ import com.azure.core.util.Context; /** Samples for OnlineEndpoints GetToken. */ public final class OnlineEndpointsGetTokenSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineEndpoint/getToken.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineEndpoint/getToken.json */ /** * Sample code: GetToken Online Endpoint. @@ -3596,7 +3390,7 @@ import com.azure.resourcemanager.machinelearning.models.OrderString; /** Samples for OnlineEndpoints List. */ public final class OnlineEndpointsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineEndpoint/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineEndpoint/list.json */ /** * Sample code: List Online Endpoint. @@ -3629,7 +3423,7 @@ import com.azure.core.util.Context; /** Samples for OnlineEndpoints ListKeys. */ public final class OnlineEndpointsListKeysSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineEndpoint/listKeys.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineEndpoint/listKeys.json */ /** * Sample code: ListKeys Online Endpoint. @@ -3653,7 +3447,7 @@ import com.azure.resourcemanager.machinelearning.models.RegenerateEndpointKeysRe /** Samples for OnlineEndpoints RegenerateKeys. */ public final class OnlineEndpointsRegenerateKeysSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineEndpoint/regenerateKeys.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineEndpoint/regenerateKeys.json */ /** * Sample code: RegenerateKeys Online Endpoint. @@ -3681,11 +3475,8 @@ import com.azure.core.management.serializer.SerializerFactory; import com.azure.core.util.Context; import com.azure.core.util.serializer.SerializerEncoding; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentityType; -import com.azure.resourcemanager.machinelearning.models.OnlineEndpointData; +import com.azure.resourcemanager.machinelearning.models.OnlineEndpoint; import com.azure.resourcemanager.machinelearning.models.PartialManagedServiceIdentity; -import com.azure.resourcemanager.machinelearning.models.PartialOnlineEndpoint; -import com.azure.resourcemanager.machinelearning.models.PartialSku; -import com.azure.resourcemanager.machinelearning.models.SkuTier; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -3693,7 +3484,7 @@ import java.util.Map; /** Samples for OnlineEndpoints Update. */ public final class OnlineEndpointsUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineEndpoint/update.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineEndpoint/update.json */ /** * Sample code: Update Online Endpoint. @@ -3702,7 +3493,7 @@ public final class OnlineEndpointsUpdateSamples { */ public static void updateOnlineEndpoint(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) throws IOException { - OnlineEndpointData resource = + OnlineEndpoint resource = manager .onlineEndpoints() .getWithResponse("test-rg", "my-aml-workspace", "testEndpointName", Context.NONE) @@ -3719,15 +3510,6 @@ public final class OnlineEndpointsUpdateSamples { SerializerFactory .createDefaultManagementSerializerAdapter() .deserialize("{}", Object.class, SerializerEncoding.JSON)))) - .withKind("string") - .withProperties(new PartialOnlineEndpoint().withTraffic(mapOf("string", 1))) - .withSku( - new PartialSku() - .withCapacity(1) - .withFamily("string") - .withName("string") - .withSize("string") - .withTier(SkuTier.FREE)) .apply(); } @@ -3752,7 +3534,7 @@ import com.azure.core.util.Context; /** Samples for Operations List. */ public final class OperationsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/operationsList.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/operationsList.json */ /** * Sample code: OperationsList. @@ -3774,7 +3556,7 @@ import com.azure.resourcemanager.machinelearning.models.PrivateLinkServiceConnec /** Samples for PrivateEndpointConnections CreateOrUpdate. */ public final class PrivateEndpointConnectionsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/PrivateEndpointConnection/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/PrivateEndpointConnection/createOrUpdate.json */ /** * Sample code: WorkspacePutPrivateEndpointConnection. @@ -3804,7 +3586,7 @@ import com.azure.core.util.Context; /** Samples for PrivateEndpointConnections Delete. */ public final class PrivateEndpointConnectionsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/PrivateEndpointConnection/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/PrivateEndpointConnection/delete.json */ /** * Sample code: WorkspaceDeletePrivateEndpointConnection. @@ -3828,7 +3610,7 @@ import com.azure.core.util.Context; /** Samples for PrivateEndpointConnections Get. */ public final class PrivateEndpointConnectionsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/PrivateEndpointConnection/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/PrivateEndpointConnection/get.json */ /** * Sample code: WorkspaceGetPrivateEndpointConnection. @@ -3852,7 +3634,7 @@ import com.azure.core.util.Context; /** Samples for PrivateEndpointConnections List. */ public final class PrivateEndpointConnectionsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/PrivateEndpointConnection/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/PrivateEndpointConnection/list.json */ /** * Sample code: StorageAccountListPrivateEndpointConnections. @@ -3874,7 +3656,7 @@ import com.azure.core.util.Context; /** Samples for PrivateLinkResources List. */ public final class PrivateLinkResourcesListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/PrivateLinkResource/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/PrivateLinkResource/list.json */ /** * Sample code: WorkspaceListPrivateLinkResources. @@ -3896,7 +3678,7 @@ import com.azure.core.util.Context; /** Samples for Quotas List. */ public final class QuotasListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Quota/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Quota/list.json */ /** * Sample code: List workspace quotas by VMFamily. @@ -3922,7 +3704,7 @@ import java.util.Arrays; /** Samples for Quotas Update. */ public final class QuotasUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Quota/update.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Quota/update.json */ /** * Sample code: update quotas. @@ -3963,7 +3745,7 @@ import com.azure.core.util.Context; /** Samples for Usages List. */ public final class UsagesListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Usage/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Usage/list.json */ /** * Sample code: List Usages. @@ -3984,7 +3766,7 @@ import com.azure.core.util.Context; /** Samples for VirtualMachineSizes List. */ public final class VirtualMachineSizesListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/VirtualMachineSize/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/VirtualMachineSize/list.json */ /** * Sample code: List VM Sizes. @@ -4000,10 +3782,13 @@ public final class VirtualMachineSizesListSamples { ### WorkspaceConnections_Create ```java +import com.azure.resourcemanager.machinelearning.models.ConnectionCategory; +import com.azure.resourcemanager.machinelearning.models.NoneAuthTypeWorkspaceConnectionProperties; + /** Samples for WorkspaceConnections Create. */ public final class WorkspaceConnectionsCreateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/WorkspaceConnection/create.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/WorkspaceConnection/create.json */ /** * Sample code: CreateWorkspaceConnection. @@ -4016,10 +3801,10 @@ public final class WorkspaceConnectionsCreateSamples { .workspaceConnections() .define("connection-1") .withExistingWorkspace("resourceGroup-1", "workspace-1") - .withCategory("ACR") - .withTarget("www.facebook.com") - .withAuthType("PAT") - .withValue("secrets") + .withProperties( + new NoneAuthTypeWorkspaceConnectionProperties() + .withCategory(ConnectionCategory.CONTAINER_REGISTRY) + .withTarget("www.facebook.com")) .create(); } } @@ -4033,7 +3818,7 @@ import com.azure.core.util.Context; /** Samples for WorkspaceConnections Delete. */ public final class WorkspaceConnectionsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/WorkspaceConnection/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/WorkspaceConnection/delete.json */ /** * Sample code: DeleteWorkspaceConnection. @@ -4057,7 +3842,7 @@ import com.azure.core.util.Context; /** Samples for WorkspaceConnections Get. */ public final class WorkspaceConnectionsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/WorkspaceConnection/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/WorkspaceConnection/get.json */ /** * Sample code: GetWorkspaceConnection. @@ -4079,7 +3864,7 @@ import com.azure.core.util.Context; /** Samples for WorkspaceConnections List. */ public final class WorkspaceConnectionsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/WorkspaceConnection/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/WorkspaceConnection/list.json */ /** * Sample code: ListWorkspaceConnections. @@ -4088,7 +3873,9 @@ public final class WorkspaceConnectionsListSamples { */ public static void listWorkspaceConnections( com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { - manager.workspaceConnections().list("resourceGroup-1", "workspace-1", "www.facebook.com", "ACR", Context.NONE); + manager + .workspaceConnections() + .list("resourceGroup-1", "workspace-1", "www.facebook.com", "ContainerRegistry", Context.NONE); } } ``` @@ -4101,7 +3888,7 @@ import com.azure.core.util.Context; /** Samples for WorkspaceFeatures List. */ public final class WorkspaceFeaturesListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/WorkspaceFeature/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/WorkspaceFeature/list.json */ /** * Sample code: List Workspace features. @@ -4133,7 +3920,7 @@ import java.util.Map; /** Samples for Workspaces CreateOrUpdate. */ public final class WorkspacesCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/create.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/create.json */ /** * Sample code: Create Workspace. @@ -4212,7 +3999,7 @@ import com.azure.core.util.Context; /** Samples for Workspaces Delete. */ public final class WorkspacesDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/delete.json */ /** * Sample code: Delete Workspace. @@ -4237,7 +4024,7 @@ import java.util.Map; /** Samples for Workspaces Diagnose. */ public final class WorkspacesDiagnoseSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/diagnose.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/diagnose.json */ /** * Sample code: Diagnose Workspace. @@ -4286,7 +4073,7 @@ import com.azure.core.util.Context; /** Samples for Workspaces GetByResourceGroup. */ public final class WorkspacesGetByResourceGroupSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/get.json */ /** * Sample code: Get Workspace. @@ -4307,7 +4094,7 @@ import com.azure.core.util.Context; /** Samples for Workspaces List. */ public final class WorkspacesListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/listBySubscription.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/listBySubscription.json */ /** * Sample code: Get Workspaces by subscription. @@ -4329,7 +4116,7 @@ import com.azure.core.util.Context; /** Samples for Workspaces ListByResourceGroup. */ public final class WorkspacesListByResourceGroupSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/listByResourceGroup.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/listByResourceGroup.json */ /** * Sample code: Get Workspaces by Resource Group. @@ -4351,7 +4138,7 @@ import com.azure.core.util.Context; /** Samples for Workspaces ListKeys. */ public final class WorkspacesListKeysSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/listKeys.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/listKeys.json */ /** * Sample code: List Workspace Keys. @@ -4372,7 +4159,7 @@ import com.azure.core.util.Context; /** Samples for Workspaces ListNotebookAccessToken. */ public final class WorkspacesListNotebookAccessTokenSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/listNotebookAccessToken.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/listNotebookAccessToken.json */ /** * Sample code: List Workspace Keys. @@ -4393,7 +4180,7 @@ import com.azure.core.util.Context; /** Samples for Workspaces ListNotebookKeys. */ public final class WorkspacesListNotebookKeysSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Notebook/listKeys.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Notebook/listKeys.json */ /** * Sample code: List Workspace Keys. @@ -4414,7 +4201,7 @@ import com.azure.core.util.Context; /** Samples for Workspaces ListOutboundNetworkDependenciesEndpoints. */ public final class WorkspacesListOutboundNetworkDependenciesEndpointsSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ExternalFQDN/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ExternalFQDN/get.json */ /** * Sample code: ListOutboundNetworkDependenciesEndpoints. @@ -4438,7 +4225,7 @@ import com.azure.core.util.Context; /** Samples for Workspaces ListStorageAccountKeys. */ public final class WorkspacesListStorageAccountKeysSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/listStorageAccountKeys.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/listStorageAccountKeys.json */ /** * Sample code: List Workspace Keys. @@ -4459,7 +4246,7 @@ import com.azure.core.util.Context; /** Samples for Workspaces PrepareNotebook. */ public final class WorkspacesPrepareNotebookSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Notebook/prepare.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Notebook/prepare.json */ /** * Sample code: Prepare Notebook. @@ -4480,7 +4267,7 @@ import com.azure.core.util.Context; /** Samples for Workspaces ResyncKeys. */ public final class WorkspacesResyncKeysSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/resyncKeys.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/resyncKeys.json */ /** * Sample code: Resync Workspace Keys. @@ -4503,7 +4290,7 @@ import com.azure.resourcemanager.machinelearning.models.Workspace; /** Samples for Workspaces Update. */ public final class WorkspacesUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/update.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/update.json */ /** * Sample code: Update Workspace. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/pom.xml b/sdk/machinelearning/azure-resourcemanager-machinelearning/pom.xml index 15b6313e05e8..78036b048cd8 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/pom.xml +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/pom.xml @@ -13,7 +13,7 @@ jar Microsoft Azure SDK for Machine Learning Management - This package contains Microsoft Azure SDK for Machine Learning Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. These APIs allow end users to operate on Azure Machine Learning Workspace resources. Package tag package-2022-02-01-preview. + This package contains Microsoft Azure SDK for Machine Learning Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. These APIs allow end users to operate on Azure Machine Learning Workspace resources. Package tag package-2022-05-01. https://github.com/Azure/azure-sdk-for-java diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/MachineLearningManager.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/MachineLearningManager.java index 763294717f94..b4b6b5953192 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/MachineLearningManager.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/MachineLearningManager.java @@ -306,7 +306,7 @@ public MachineLearningManager authenticate(TokenCredential credential, AzureProf .append("-") .append("com.azure.resourcemanager.machinelearning") .append("/") - .append("1.0.0-beta.2"); + .append("1.0.0-beta.1"); if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) { userAgentBuilder .append(" (") @@ -461,7 +461,8 @@ public PrivateLinkResources privateLinkResources() { } /** - * Gets the resource collection API of WorkspaceConnections. It manages WorkspaceConnection. + * Gets the resource collection API of WorkspaceConnections. It manages + * WorkspaceConnectionPropertiesV2BasicResource. * * @return Resource collection API of WorkspaceConnections. */ @@ -473,7 +474,7 @@ public WorkspaceConnections workspaceConnections() { } /** - * Gets the resource collection API of BatchEndpoints. It manages BatchEndpointData. + * Gets the resource collection API of BatchEndpoints. It manages BatchEndpoint. * * @return Resource collection API of BatchEndpoints. */ @@ -485,7 +486,7 @@ public BatchEndpoints batchEndpoints() { } /** - * Gets the resource collection API of BatchDeployments. It manages BatchDeploymentData. + * Gets the resource collection API of BatchDeployments. It manages BatchDeployment. * * @return Resource collection API of BatchDeployments. */ @@ -497,7 +498,7 @@ public BatchDeployments batchDeployments() { } /** - * Gets the resource collection API of CodeContainers. It manages CodeContainerData. + * Gets the resource collection API of CodeContainers. It manages CodeContainer. * * @return Resource collection API of CodeContainers. */ @@ -509,7 +510,7 @@ public CodeContainers codeContainers() { } /** - * Gets the resource collection API of CodeVersions. It manages CodeVersionData. + * Gets the resource collection API of CodeVersions. It manages CodeVersion. * * @return Resource collection API of CodeVersions. */ @@ -521,7 +522,7 @@ public CodeVersions codeVersions() { } /** - * Gets the resource collection API of ComponentContainers. It manages ComponentContainerData. + * Gets the resource collection API of ComponentContainers. It manages ComponentContainer. * * @return Resource collection API of ComponentContainers. */ @@ -533,7 +534,7 @@ public ComponentContainers componentContainers() { } /** - * Gets the resource collection API of ComponentVersions. It manages ComponentVersionData. + * Gets the resource collection API of ComponentVersions. It manages ComponentVersion. * * @return Resource collection API of ComponentVersions. */ @@ -545,7 +546,7 @@ public ComponentVersions componentVersions() { } /** - * Gets the resource collection API of DataContainers. It manages DataContainerData. + * Gets the resource collection API of DataContainers. It manages DataContainer. * * @return Resource collection API of DataContainers. */ @@ -557,7 +558,7 @@ public DataContainers dataContainers() { } /** - * Gets the resource collection API of DataVersions. It manages DataVersionBaseData. + * Gets the resource collection API of DataVersions. It manages DataVersionBase. * * @return Resource collection API of DataVersions. */ @@ -569,7 +570,7 @@ public DataVersions dataVersions() { } /** - * Gets the resource collection API of Datastores. It manages DatastoreData. + * Gets the resource collection API of Datastores. It manages Datastore. * * @return Resource collection API of Datastores. */ @@ -581,7 +582,7 @@ public Datastores datastores() { } /** - * Gets the resource collection API of EnvironmentContainers. It manages EnvironmentContainerData. + * Gets the resource collection API of EnvironmentContainers. It manages EnvironmentContainer. * * @return Resource collection API of EnvironmentContainers. */ @@ -593,7 +594,7 @@ public EnvironmentContainers environmentContainers() { } /** - * Gets the resource collection API of EnvironmentVersions. It manages EnvironmentVersionData. + * Gets the resource collection API of EnvironmentVersions. It manages EnvironmentVersion. * * @return Resource collection API of EnvironmentVersions. */ @@ -605,7 +606,7 @@ public EnvironmentVersions environmentVersions() { } /** - * Gets the resource collection API of Jobs. It manages JobBaseData. + * Gets the resource collection API of Jobs. It manages JobBase. * * @return Resource collection API of Jobs. */ @@ -617,7 +618,7 @@ public Jobs jobs() { } /** - * Gets the resource collection API of ModelContainers. It manages ModelContainerData. + * Gets the resource collection API of ModelContainers. It manages ModelContainer. * * @return Resource collection API of ModelContainers. */ @@ -629,7 +630,7 @@ public ModelContainers modelContainers() { } /** - * Gets the resource collection API of ModelVersions. It manages ModelVersionData. + * Gets the resource collection API of ModelVersions. It manages ModelVersion. * * @return Resource collection API of ModelVersions. */ @@ -641,7 +642,7 @@ public ModelVersions modelVersions() { } /** - * Gets the resource collection API of OnlineEndpoints. It manages OnlineEndpointData. + * Gets the resource collection API of OnlineEndpoints. It manages OnlineEndpoint. * * @return Resource collection API of OnlineEndpoints. */ @@ -653,7 +654,7 @@ public OnlineEndpoints onlineEndpoints() { } /** - * Gets the resource collection API of OnlineDeployments. It manages OnlineDeploymentData. + * Gets the resource collection API of OnlineDeployments. It manages OnlineDeployment. * * @return Resource collection API of OnlineDeployments. */ diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/BatchDeploymentsClient.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/BatchDeploymentsClient.java index cfc4d11cfdb4..547a679cd918 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/BatchDeploymentsClient.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/BatchDeploymentsClient.java @@ -11,8 +11,8 @@ import com.azure.core.management.polling.PollResult; import com.azure.core.util.Context; import com.azure.core.util.polling.SyncPoller; -import com.azure.resourcemanager.machinelearning.fluent.models.BatchDeploymentDataInner; -import com.azure.resourcemanager.machinelearning.models.PartialBatchDeploymentPartialTrackedResource; +import com.azure.resourcemanager.machinelearning.fluent.models.BatchDeploymentInner; +import com.azure.resourcemanager.machinelearning.models.PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties; /** An instance of this class provides access to all the operations defined in BatchDeploymentsClient. */ public interface BatchDeploymentsClient { @@ -28,7 +28,7 @@ public interface BatchDeploymentsClient { * @return a paginated list of BatchDeployment entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list(String resourceGroupName, String workspaceName, String endpointName); + PagedIterable list(String resourceGroupName, String workspaceName, String endpointName); /** * Lists Batch inference deployments in the workspace. @@ -46,7 +46,7 @@ public interface BatchDeploymentsClient { * @return a paginated list of BatchDeployment entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String endpointName, @@ -131,7 +131,7 @@ void delete( * @return a batch inference deployment by id. */ @ServiceMethod(returns = ReturnType.SINGLE) - BatchDeploymentDataInner get( + BatchDeploymentInner get( String resourceGroupName, String workspaceName, String endpointName, String deploymentName); /** @@ -148,7 +148,7 @@ BatchDeploymentDataInner get( * @return a batch inference deployment by id along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, Context context); /** @@ -165,12 +165,12 @@ Response getWithResponse( * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, BatchDeploymentDataInner> beginUpdate( + SyncPoller, BatchDeploymentInner> beginUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialBatchDeploymentPartialTrackedResource body); + PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties body); /** * Update a batch inference deployment (asynchronous). @@ -187,12 +187,12 @@ SyncPoller, BatchDeploymentDataInner> begin * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, BatchDeploymentDataInner> beginUpdate( + SyncPoller, BatchDeploymentInner> beginUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialBatchDeploymentPartialTrackedResource body, + PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties body, Context context); /** @@ -209,12 +209,12 @@ SyncPoller, BatchDeploymentDataInner> begin * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - BatchDeploymentDataInner update( + BatchDeploymentInner update( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialBatchDeploymentPartialTrackedResource body); + PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties body); /** * Update a batch inference deployment (asynchronous). @@ -231,12 +231,12 @@ BatchDeploymentDataInner update( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - BatchDeploymentDataInner update( + BatchDeploymentInner update( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialBatchDeploymentPartialTrackedResource body, + PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties body, Context context); /** @@ -253,12 +253,12 @@ BatchDeploymentDataInner update( * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, BatchDeploymentDataInner> beginCreateOrUpdate( + SyncPoller, BatchDeploymentInner> beginCreateOrUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - BatchDeploymentDataInner body); + BatchDeploymentInner body); /** * Creates/updates a batch inference deployment (asynchronous). @@ -275,12 +275,12 @@ SyncPoller, BatchDeploymentDataInner> begin * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, BatchDeploymentDataInner> beginCreateOrUpdate( + SyncPoller, BatchDeploymentInner> beginCreateOrUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - BatchDeploymentDataInner body, + BatchDeploymentInner body, Context context); /** @@ -297,12 +297,12 @@ SyncPoller, BatchDeploymentDataInner> begin * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - BatchDeploymentDataInner createOrUpdate( + BatchDeploymentInner createOrUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - BatchDeploymentDataInner body); + BatchDeploymentInner body); /** * Creates/updates a batch inference deployment (asynchronous). @@ -319,11 +319,11 @@ BatchDeploymentDataInner createOrUpdate( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - BatchDeploymentDataInner createOrUpdate( + BatchDeploymentInner createOrUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - BatchDeploymentDataInner body, + BatchDeploymentInner body, Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/BatchEndpointsClient.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/BatchEndpointsClient.java index 5b61e1422061..df3d62f87436 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/BatchEndpointsClient.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/BatchEndpointsClient.java @@ -11,9 +11,9 @@ import com.azure.core.management.polling.PollResult; import com.azure.core.util.Context; import com.azure.core.util.polling.SyncPoller; -import com.azure.resourcemanager.machinelearning.fluent.models.BatchEndpointDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.BatchEndpointInner; import com.azure.resourcemanager.machinelearning.fluent.models.EndpointAuthKeysInner; -import com.azure.resourcemanager.machinelearning.models.PartialBatchEndpointPartialTrackedResource; +import com.azure.resourcemanager.machinelearning.models.PartialMinimalTrackedResourceWithIdentity; /** An instance of this class provides access to all the operations defined in BatchEndpointsClient. */ public interface BatchEndpointsClient { @@ -28,7 +28,7 @@ public interface BatchEndpointsClient { * @return a paginated list of BatchEndpoint entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list(String resourceGroupName, String workspaceName); + PagedIterable list(String resourceGroupName, String workspaceName); /** * Lists Batch inference endpoint in the workspace. @@ -44,7 +44,7 @@ public interface BatchEndpointsClient { * @return a paginated list of BatchEndpoint entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, Integer count, String skip, Context context); /** @@ -116,7 +116,7 @@ SyncPoller, Void> beginDelete( * @return a batch inference endpoint by name. */ @ServiceMethod(returns = ReturnType.SINGLE) - BatchEndpointDataInner get(String resourceGroupName, String workspaceName, String endpointName); + BatchEndpointInner get(String resourceGroupName, String workspaceName, String endpointName); /** * Gets a batch inference endpoint by name. @@ -131,7 +131,7 @@ SyncPoller, Void> beginDelete( * @return a batch inference endpoint by name along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String endpointName, Context context); /** @@ -147,11 +147,11 @@ Response getWithResponse( * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, BatchEndpointDataInner> beginUpdate( + SyncPoller, BatchEndpointInner> beginUpdate( String resourceGroupName, String workspaceName, String endpointName, - PartialBatchEndpointPartialTrackedResource body); + PartialMinimalTrackedResourceWithIdentity body); /** * Update a batch inference endpoint (asynchronous). @@ -167,11 +167,11 @@ SyncPoller, BatchEndpointDataInner> beginUpda * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, BatchEndpointDataInner> beginUpdate( + SyncPoller, BatchEndpointInner> beginUpdate( String resourceGroupName, String workspaceName, String endpointName, - PartialBatchEndpointPartialTrackedResource body, + PartialMinimalTrackedResourceWithIdentity body, Context context); /** @@ -187,11 +187,11 @@ SyncPoller, BatchEndpointDataInner> beginUpda * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - BatchEndpointDataInner update( + BatchEndpointInner update( String resourceGroupName, String workspaceName, String endpointName, - PartialBatchEndpointPartialTrackedResource body); + PartialMinimalTrackedResourceWithIdentity body); /** * Update a batch inference endpoint (asynchronous). @@ -207,11 +207,11 @@ BatchEndpointDataInner update( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - BatchEndpointDataInner update( + BatchEndpointInner update( String resourceGroupName, String workspaceName, String endpointName, - PartialBatchEndpointPartialTrackedResource body, + PartialMinimalTrackedResourceWithIdentity body, Context context); /** @@ -227,8 +227,8 @@ BatchEndpointDataInner update( * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, BatchEndpointDataInner> beginCreateOrUpdate( - String resourceGroupName, String workspaceName, String endpointName, BatchEndpointDataInner body); + SyncPoller, BatchEndpointInner> beginCreateOrUpdate( + String resourceGroupName, String workspaceName, String endpointName, BatchEndpointInner body); /** * Creates a batch inference endpoint (asynchronous). @@ -244,12 +244,8 @@ SyncPoller, BatchEndpointDataInner> beginCrea * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, BatchEndpointDataInner> beginCreateOrUpdate( - String resourceGroupName, - String workspaceName, - String endpointName, - BatchEndpointDataInner body, - Context context); + SyncPoller, BatchEndpointInner> beginCreateOrUpdate( + String resourceGroupName, String workspaceName, String endpointName, BatchEndpointInner body, Context context); /** * Creates a batch inference endpoint (asynchronous). @@ -264,8 +260,8 @@ SyncPoller, BatchEndpointDataInner> beginCrea * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - BatchEndpointDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String endpointName, BatchEndpointDataInner body); + BatchEndpointInner createOrUpdate( + String resourceGroupName, String workspaceName, String endpointName, BatchEndpointInner body); /** * Creates a batch inference endpoint (asynchronous). @@ -281,12 +277,8 @@ BatchEndpointDataInner createOrUpdate( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - BatchEndpointDataInner createOrUpdate( - String resourceGroupName, - String workspaceName, - String endpointName, - BatchEndpointDataInner body, - Context context); + BatchEndpointInner createOrUpdate( + String resourceGroupName, String workspaceName, String endpointName, BatchEndpointInner body, Context context); /** * Lists batch Inference Endpoint keys. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/CodeContainersClient.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/CodeContainersClient.java index 03d7ba0721be..84e54dd52dfb 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/CodeContainersClient.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/CodeContainersClient.java @@ -9,7 +9,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.Response; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.CodeContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.CodeContainerInner; /** An instance of this class provides access to all the operations defined in CodeContainersClient. */ public interface CodeContainersClient { @@ -24,7 +24,7 @@ public interface CodeContainersClient { * @return a paginated list of CodeContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list(String resourceGroupName, String workspaceName); + PagedIterable list(String resourceGroupName, String workspaceName); /** * List containers. @@ -39,7 +39,7 @@ public interface CodeContainersClient { * @return a paginated list of CodeContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String skip, Context context); /** @@ -82,7 +82,7 @@ PagedIterable list( * @return container. */ @ServiceMethod(returns = ReturnType.SINGLE) - CodeContainerDataInner get(String resourceGroupName, String workspaceName, String name); + CodeContainerInner get(String resourceGroupName, String workspaceName, String name); /** * Get container. @@ -97,7 +97,7 @@ PagedIterable list( * @return container along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context); /** @@ -113,8 +113,8 @@ Response getWithResponse( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - CodeContainerDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, CodeContainerDataInner body); + CodeContainerInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, CodeContainerInner body); /** * Create or update container. @@ -130,6 +130,6 @@ CodeContainerDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response createOrUpdateWithResponse( - String resourceGroupName, String workspaceName, String name, CodeContainerDataInner body, Context context); + Response createOrUpdateWithResponse( + String resourceGroupName, String workspaceName, String name, CodeContainerInner body, Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/CodeVersionsClient.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/CodeVersionsClient.java index da65902f46c4..6284f9bdcd46 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/CodeVersionsClient.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/CodeVersionsClient.java @@ -9,7 +9,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.Response; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.CodeVersionDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.CodeVersionInner; /** An instance of this class provides access to all the operations defined in CodeVersionsClient. */ public interface CodeVersionsClient { @@ -25,7 +25,7 @@ public interface CodeVersionsClient { * @return a paginated list of CodeVersion entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list(String resourceGroupName, String workspaceName, String name); + PagedIterable list(String resourceGroupName, String workspaceName, String name); /** * List versions. @@ -43,7 +43,7 @@ public interface CodeVersionsClient { * @return a paginated list of CodeVersion entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -96,7 +96,7 @@ Response deleteWithResponse( * @return version. */ @ServiceMethod(returns = ReturnType.SINGLE) - CodeVersionDataInner get(String resourceGroupName, String workspaceName, String name, String version); + CodeVersionInner get(String resourceGroupName, String workspaceName, String name, String version); /** * Get version. @@ -112,7 +112,7 @@ Response deleteWithResponse( * @return version along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context); /** @@ -129,8 +129,8 @@ Response getWithResponse( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - CodeVersionDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, String version, CodeVersionDataInner body); + CodeVersionInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, String version, CodeVersionInner body); /** * Create or update version. @@ -147,11 +147,11 @@ CodeVersionDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response createOrUpdateWithResponse( + Response createOrUpdateWithResponse( String resourceGroupName, String workspaceName, String name, String version, - CodeVersionDataInner body, + CodeVersionInner body, Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/ComponentContainersClient.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/ComponentContainersClient.java index eb2edf8ff681..2a80c6222557 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/ComponentContainersClient.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/ComponentContainersClient.java @@ -9,7 +9,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.Response; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.ComponentContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.ComponentContainerInner; import com.azure.resourcemanager.machinelearning.models.ListViewType; /** An instance of this class provides access to all the operations defined in ComponentContainersClient. */ @@ -25,7 +25,7 @@ public interface ComponentContainersClient { * @return a paginated list of ComponentContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list(String resourceGroupName, String workspaceName); + PagedIterable list(String resourceGroupName, String workspaceName); /** * List component containers. @@ -41,7 +41,7 @@ public interface ComponentContainersClient { * @return a paginated list of ComponentContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType, Context context); /** @@ -84,7 +84,7 @@ PagedIterable list( * @return container. */ @ServiceMethod(returns = ReturnType.SINGLE) - ComponentContainerDataInner get(String resourceGroupName, String workspaceName, String name); + ComponentContainerInner get(String resourceGroupName, String workspaceName, String name); /** * Get container. @@ -99,7 +99,7 @@ PagedIterable list( * @return container along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context); /** @@ -115,8 +115,8 @@ Response getWithResponse( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - ComponentContainerDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, ComponentContainerDataInner body); + ComponentContainerInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, ComponentContainerInner body); /** * Create or update container. @@ -132,6 +132,6 @@ ComponentContainerDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response createOrUpdateWithResponse( - String resourceGroupName, String workspaceName, String name, ComponentContainerDataInner body, Context context); + Response createOrUpdateWithResponse( + String resourceGroupName, String workspaceName, String name, ComponentContainerInner body, Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/ComponentVersionsClient.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/ComponentVersionsClient.java index a1f3e0bae9ec..a3da844db0a6 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/ComponentVersionsClient.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/ComponentVersionsClient.java @@ -9,7 +9,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.Response; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.ComponentVersionDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.ComponentVersionInner; import com.azure.resourcemanager.machinelearning.models.ListViewType; /** An instance of this class provides access to all the operations defined in ComponentVersionsClient. */ @@ -26,7 +26,7 @@ public interface ComponentVersionsClient { * @return a paginated list of ComponentVersion entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list(String resourceGroupName, String workspaceName, String name); + PagedIterable list(String resourceGroupName, String workspaceName, String name); /** * List component versions. @@ -45,7 +45,7 @@ public interface ComponentVersionsClient { * @return a paginated list of ComponentVersion entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -99,7 +99,7 @@ Response deleteWithResponse( * @return version. */ @ServiceMethod(returns = ReturnType.SINGLE) - ComponentVersionDataInner get(String resourceGroupName, String workspaceName, String name, String version); + ComponentVersionInner get(String resourceGroupName, String workspaceName, String name, String version); /** * Get version. @@ -115,7 +115,7 @@ Response deleteWithResponse( * @return version along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context); /** @@ -132,8 +132,8 @@ Response getWithResponse( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - ComponentVersionDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, String version, ComponentVersionDataInner body); + ComponentVersionInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, String version, ComponentVersionInner body); /** * Create or update version. @@ -150,11 +150,11 @@ ComponentVersionDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response createOrUpdateWithResponse( + Response createOrUpdateWithResponse( String resourceGroupName, String workspaceName, String name, String version, - ComponentVersionDataInner body, + ComponentVersionInner body, Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/DataContainersClient.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/DataContainersClient.java index 533a6f679bbb..bcb3faa55ed8 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/DataContainersClient.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/DataContainersClient.java @@ -9,7 +9,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.Response; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.DataContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.DataContainerInner; import com.azure.resourcemanager.machinelearning.models.ListViewType; /** An instance of this class provides access to all the operations defined in DataContainersClient. */ @@ -25,7 +25,7 @@ public interface DataContainersClient { * @return a paginated list of DataContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list(String resourceGroupName, String workspaceName); + PagedIterable list(String resourceGroupName, String workspaceName); /** * List data containers. @@ -41,7 +41,7 @@ public interface DataContainersClient { * @return a paginated list of DataContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType, Context context); /** @@ -84,7 +84,7 @@ PagedIterable list( * @return container. */ @ServiceMethod(returns = ReturnType.SINGLE) - DataContainerDataInner get(String resourceGroupName, String workspaceName, String name); + DataContainerInner get(String resourceGroupName, String workspaceName, String name); /** * Get container. @@ -99,7 +99,7 @@ PagedIterable list( * @return container along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context); /** @@ -115,8 +115,8 @@ Response getWithResponse( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - DataContainerDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, DataContainerDataInner body); + DataContainerInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, DataContainerInner body); /** * Create or update container. @@ -132,6 +132,6 @@ DataContainerDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response createOrUpdateWithResponse( - String resourceGroupName, String workspaceName, String name, DataContainerDataInner body, Context context); + Response createOrUpdateWithResponse( + String resourceGroupName, String workspaceName, String name, DataContainerInner body, Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/DataVersionsClient.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/DataVersionsClient.java index f7aa9b60dbda..e83b7a4f1a0a 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/DataVersionsClient.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/DataVersionsClient.java @@ -9,7 +9,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.Response; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.DataVersionBaseDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.DataVersionBaseInner; import com.azure.resourcemanager.machinelearning.models.ListViewType; /** An instance of this class provides access to all the operations defined in DataVersionsClient. */ @@ -26,7 +26,7 @@ public interface DataVersionsClient { * @return a paginated list of DataVersionBase entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list(String resourceGroupName, String workspaceName, String name); + PagedIterable list(String resourceGroupName, String workspaceName, String name); /** * List data versions in the data container. @@ -48,7 +48,7 @@ public interface DataVersionsClient { * @return a paginated list of DataVersionBase entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -103,7 +103,7 @@ Response deleteWithResponse( * @return version. */ @ServiceMethod(returns = ReturnType.SINGLE) - DataVersionBaseDataInner get(String resourceGroupName, String workspaceName, String name, String version); + DataVersionBaseInner get(String resourceGroupName, String workspaceName, String name, String version); /** * Get version. @@ -119,7 +119,7 @@ Response deleteWithResponse( * @return version along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context); /** @@ -136,8 +136,8 @@ Response getWithResponse( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - DataVersionBaseDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, String version, DataVersionBaseDataInner body); + DataVersionBaseInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, String version, DataVersionBaseInner body); /** * Create or update version. @@ -154,11 +154,11 @@ DataVersionBaseDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response createOrUpdateWithResponse( + Response createOrUpdateWithResponse( String resourceGroupName, String workspaceName, String name, String version, - DataVersionBaseDataInner body, + DataVersionBaseInner body, Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/DatastoresClient.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/DatastoresClient.java index 039579d9f50f..ae4a5f982a28 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/DatastoresClient.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/DatastoresClient.java @@ -9,7 +9,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.Response; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.DatastoreDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.DatastoreInner; import com.azure.resourcemanager.machinelearning.fluent.models.DatastoreSecretsInner; import java.util.List; @@ -26,7 +26,7 @@ public interface DatastoresClient { * @return a paginated list of Datastore entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list(String resourceGroupName, String workspaceName); + PagedIterable list(String resourceGroupName, String workspaceName); /** * List datastores. @@ -47,7 +47,7 @@ public interface DatastoresClient { * @return a paginated list of Datastore entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String skip, @@ -99,7 +99,7 @@ PagedIterable list( * @return datastore. */ @ServiceMethod(returns = ReturnType.SINGLE) - DatastoreDataInner get(String resourceGroupName, String workspaceName, String name); + DatastoreInner get(String resourceGroupName, String workspaceName, String name); /** * Get datastore. @@ -114,7 +114,7 @@ PagedIterable list( * @return datastore along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context); /** @@ -130,8 +130,7 @@ Response getWithResponse( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - DatastoreDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, DatastoreDataInner body); + DatastoreInner createOrUpdate(String resourceGroupName, String workspaceName, String name, DatastoreInner body); /** * Create or update datastore. @@ -148,11 +147,11 @@ DatastoreDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response createOrUpdateWithResponse( + Response createOrUpdateWithResponse( String resourceGroupName, String workspaceName, String name, - DatastoreDataInner body, + DatastoreInner body, Boolean skipValidation, Context context); diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/EnvironmentContainersClient.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/EnvironmentContainersClient.java index 2585f01d46cd..8444385bf89e 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/EnvironmentContainersClient.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/EnvironmentContainersClient.java @@ -9,7 +9,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.Response; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentContainerInner; import com.azure.resourcemanager.machinelearning.models.ListViewType; /** An instance of this class provides access to all the operations defined in EnvironmentContainersClient. */ @@ -25,7 +25,7 @@ public interface EnvironmentContainersClient { * @return a paginated list of EnvironmentContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list(String resourceGroupName, String workspaceName); + PagedIterable list(String resourceGroupName, String workspaceName); /** * List environment containers. @@ -41,7 +41,7 @@ public interface EnvironmentContainersClient { * @return a paginated list of EnvironmentContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType, Context context); /** @@ -84,7 +84,7 @@ PagedIterable list( * @return container. */ @ServiceMethod(returns = ReturnType.SINGLE) - EnvironmentContainerDataInner get(String resourceGroupName, String workspaceName, String name); + EnvironmentContainerInner get(String resourceGroupName, String workspaceName, String name); /** * Get container. @@ -99,7 +99,7 @@ PagedIterable list( * @return container along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context); /** @@ -115,8 +115,8 @@ Response getWithResponse( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - EnvironmentContainerDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, EnvironmentContainerDataInner body); + EnvironmentContainerInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, EnvironmentContainerInner body); /** * Create or update container. @@ -132,10 +132,6 @@ EnvironmentContainerDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response createOrUpdateWithResponse( - String resourceGroupName, - String workspaceName, - String name, - EnvironmentContainerDataInner body, - Context context); + Response createOrUpdateWithResponse( + String resourceGroupName, String workspaceName, String name, EnvironmentContainerInner body, Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/EnvironmentVersionsClient.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/EnvironmentVersionsClient.java index ee7be12767ad..2f4805271c2c 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/EnvironmentVersionsClient.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/EnvironmentVersionsClient.java @@ -9,7 +9,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.Response; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentVersionDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentVersionInner; import com.azure.resourcemanager.machinelearning.models.ListViewType; /** An instance of this class provides access to all the operations defined in EnvironmentVersionsClient. */ @@ -26,7 +26,7 @@ public interface EnvironmentVersionsClient { * @return a paginated list of EnvironmentVersion entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list(String resourceGroupName, String workspaceName, String name); + PagedIterable list(String resourceGroupName, String workspaceName, String name); /** * List versions. @@ -45,7 +45,7 @@ public interface EnvironmentVersionsClient { * @return a paginated list of EnvironmentVersion entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -99,7 +99,7 @@ Response deleteWithResponse( * @return version. */ @ServiceMethod(returns = ReturnType.SINGLE) - EnvironmentVersionDataInner get(String resourceGroupName, String workspaceName, String name, String version); + EnvironmentVersionInner get(String resourceGroupName, String workspaceName, String name, String version); /** * Get version. @@ -115,7 +115,7 @@ Response deleteWithResponse( * @return version along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context); /** @@ -132,8 +132,8 @@ Response getWithResponse( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - EnvironmentVersionDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, String version, EnvironmentVersionDataInner body); + EnvironmentVersionInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, String version, EnvironmentVersionInner body); /** * Creates or updates an EnvironmentVersion. @@ -150,11 +150,11 @@ EnvironmentVersionDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response createOrUpdateWithResponse( + Response createOrUpdateWithResponse( String resourceGroupName, String workspaceName, String name, String version, - EnvironmentVersionDataInner body, + EnvironmentVersionInner body, Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/JobsClient.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/JobsClient.java index 6d280d7c1f6f..5dd51170be28 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/JobsClient.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/JobsClient.java @@ -11,7 +11,7 @@ import com.azure.core.management.polling.PollResult; import com.azure.core.util.Context; import com.azure.core.util.polling.SyncPoller; -import com.azure.resourcemanager.machinelearning.fluent.models.JobBaseDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.JobBaseInner; import com.azure.resourcemanager.machinelearning.models.ListViewType; /** An instance of this class provides access to all the operations defined in JobsClient. */ @@ -27,7 +27,7 @@ public interface JobsClient { * @return a paginated list of JobBase entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list(String resourceGroupName, String workspaceName); + PagedIterable list(String resourceGroupName, String workspaceName); /** * Lists Jobs in the workspace. @@ -38,8 +38,6 @@ public interface JobsClient { * @param jobType Type of job to be returned. * @param tag Jobs returned will have this tag key. * @param listViewType View type for including/excluding (for example) archived entities. - * @param scheduled Indicator whether the job is scheduled job. - * @param scheduleId The scheduled id for listing the job triggered from. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. @@ -47,15 +45,13 @@ public interface JobsClient { * @return a paginated list of JobBase entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String skip, String jobType, String tag, ListViewType listViewType, - Boolean scheduled, - String scheduleId, Context context); /** @@ -127,7 +123,7 @@ SyncPoller, Void> beginDelete( * @return a Job by name/id. */ @ServiceMethod(returns = ReturnType.SINGLE) - JobBaseDataInner get(String resourceGroupName, String workspaceName, String id); + JobBaseInner get(String resourceGroupName, String workspaceName, String id); /** * Gets a Job by name/id. @@ -142,8 +138,7 @@ SyncPoller, Void> beginDelete( * @return a Job by name/id along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response getWithResponse( - String resourceGroupName, String workspaceName, String id, Context context); + Response getWithResponse(String resourceGroupName, String workspaceName, String id, Context context); /** * Creates and executes a Job. @@ -158,7 +153,7 @@ Response getWithResponse( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - JobBaseDataInner createOrUpdate(String resourceGroupName, String workspaceName, String id, JobBaseDataInner body); + JobBaseInner createOrUpdate(String resourceGroupName, String workspaceName, String id, JobBaseInner body); /** * Creates and executes a Job. @@ -174,11 +169,41 @@ Response getWithResponse( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response createOrUpdateWithResponse( - String resourceGroupName, String workspaceName, String id, JobBaseDataInner body, Context context); + Response createOrUpdateWithResponse( + String resourceGroupName, String workspaceName, String id, JobBaseInner body, Context context); + + /** + * Cancels a Job (asynchronous). + * + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param id The name and identifier for the Job. This is case-sensitive. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link SyncPoller} for polling of long-running operation. + */ + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) + SyncPoller, Void> beginCancel(String resourceGroupName, String workspaceName, String id); + + /** + * Cancels a Job (asynchronous). + * + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param id The name and identifier for the Job. This is case-sensitive. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link SyncPoller} for polling of long-running operation. + */ + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) + SyncPoller, Void> beginCancel( + String resourceGroupName, String workspaceName, String id, Context context); /** - * Cancels a Job. + * Cancels a Job (asynchronous). * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. @@ -191,7 +216,7 @@ Response createOrUpdateWithResponse( void cancel(String resourceGroupName, String workspaceName, String id); /** - * Cancels a Job. + * Cancels a Job (asynchronous). * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. @@ -200,8 +225,7 @@ Response createOrUpdateWithResponse( * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response cancelWithResponse(String resourceGroupName, String workspaceName, String id, Context context); + void cancel(String resourceGroupName, String workspaceName, String id, Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/ModelContainersClient.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/ModelContainersClient.java index 78142802c0e5..28a7cd2b51f6 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/ModelContainersClient.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/ModelContainersClient.java @@ -9,7 +9,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.Response; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.ModelContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.ModelContainerInner; import com.azure.resourcemanager.machinelearning.models.ListViewType; /** An instance of this class provides access to all the operations defined in ModelContainersClient. */ @@ -25,7 +25,7 @@ public interface ModelContainersClient { * @return a paginated list of ModelContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list(String resourceGroupName, String workspaceName); + PagedIterable list(String resourceGroupName, String workspaceName); /** * List model containers. @@ -42,7 +42,7 @@ public interface ModelContainersClient { * @return a paginated list of ModelContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String skip, @@ -90,7 +90,7 @@ PagedIterable list( * @return container. */ @ServiceMethod(returns = ReturnType.SINGLE) - ModelContainerDataInner get(String resourceGroupName, String workspaceName, String name); + ModelContainerInner get(String resourceGroupName, String workspaceName, String name); /** * Get container. @@ -105,7 +105,7 @@ PagedIterable list( * @return container along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context); /** @@ -121,8 +121,8 @@ Response getWithResponse( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - ModelContainerDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, ModelContainerDataInner body); + ModelContainerInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, ModelContainerInner body); /** * Create or update container. @@ -138,6 +138,6 @@ ModelContainerDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response createOrUpdateWithResponse( - String resourceGroupName, String workspaceName, String name, ModelContainerDataInner body, Context context); + Response createOrUpdateWithResponse( + String resourceGroupName, String workspaceName, String name, ModelContainerInner body, Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/ModelVersionsClient.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/ModelVersionsClient.java index 317537e9c843..0a3bd35fca24 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/ModelVersionsClient.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/ModelVersionsClient.java @@ -9,7 +9,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.Response; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.ModelVersionDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.ModelVersionInner; import com.azure.resourcemanager.machinelearning.models.ListViewType; /** An instance of this class provides access to all the operations defined in ModelVersionsClient. */ @@ -26,7 +26,7 @@ public interface ModelVersionsClient { * @return a paginated list of ModelVersion entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list(String resourceGroupName, String workspaceName, String name); + PagedIterable list(String resourceGroupName, String workspaceName, String name); /** * List model versions. @@ -51,7 +51,7 @@ public interface ModelVersionsClient { * @return a paginated list of ModelVersion entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -111,7 +111,7 @@ Response deleteWithResponse( * @return version. */ @ServiceMethod(returns = ReturnType.SINGLE) - ModelVersionDataInner get(String resourceGroupName, String workspaceName, String name, String version); + ModelVersionInner get(String resourceGroupName, String workspaceName, String name, String version); /** * Get version. @@ -127,7 +127,7 @@ Response deleteWithResponse( * @return version along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context); /** @@ -144,8 +144,8 @@ Response getWithResponse( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - ModelVersionDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, String version, ModelVersionDataInner body); + ModelVersionInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, String version, ModelVersionInner body); /** * Create or update version. @@ -162,11 +162,11 @@ ModelVersionDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response createOrUpdateWithResponse( + Response createOrUpdateWithResponse( String resourceGroupName, String workspaceName, String name, String version, - ModelVersionDataInner body, + ModelVersionInner body, Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/OnlineDeploymentsClient.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/OnlineDeploymentsClient.java index 46bea196ac72..149ff167d432 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/OnlineDeploymentsClient.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/OnlineDeploymentsClient.java @@ -12,10 +12,10 @@ import com.azure.core.util.Context; import com.azure.core.util.polling.SyncPoller; import com.azure.resourcemanager.machinelearning.fluent.models.DeploymentLogsInner; -import com.azure.resourcemanager.machinelearning.fluent.models.OnlineDeploymentDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.OnlineDeploymentInner; import com.azure.resourcemanager.machinelearning.fluent.models.SkuResourceInner; import com.azure.resourcemanager.machinelearning.models.DeploymentLogsRequest; -import com.azure.resourcemanager.machinelearning.models.PartialOnlineDeploymentPartialTrackedResource; +import com.azure.resourcemanager.machinelearning.models.PartialMinimalTrackedResourceWithSku; /** An instance of this class provides access to all the operations defined in OnlineDeploymentsClient. */ public interface OnlineDeploymentsClient { @@ -31,7 +31,7 @@ public interface OnlineDeploymentsClient { * @return a paginated list of OnlineDeployment entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list(String resourceGroupName, String workspaceName, String endpointName); + PagedIterable list(String resourceGroupName, String workspaceName, String endpointName); /** * List Inference Endpoint Deployments. @@ -49,7 +49,7 @@ public interface OnlineDeploymentsClient { * @return a paginated list of OnlineDeployment entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String endpointName, @@ -134,7 +134,7 @@ void delete( * @return inference Deployment Deployment. */ @ServiceMethod(returns = ReturnType.SINGLE) - OnlineDeploymentDataInner get( + OnlineDeploymentInner get( String resourceGroupName, String workspaceName, String endpointName, String deploymentName); /** @@ -151,7 +151,7 @@ OnlineDeploymentDataInner get( * @return inference Deployment Deployment along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, Context context); /** @@ -168,12 +168,12 @@ Response getWithResponse( * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, OnlineDeploymentDataInner> beginUpdate( + SyncPoller, OnlineDeploymentInner> beginUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialOnlineDeploymentPartialTrackedResource body); + PartialMinimalTrackedResourceWithSku body); /** * Update Online Deployment (asynchronous). @@ -190,12 +190,12 @@ SyncPoller, OnlineDeploymentDataInner> beg * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, OnlineDeploymentDataInner> beginUpdate( + SyncPoller, OnlineDeploymentInner> beginUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialOnlineDeploymentPartialTrackedResource body, + PartialMinimalTrackedResourceWithSku body, Context context); /** @@ -212,12 +212,12 @@ SyncPoller, OnlineDeploymentDataInner> beg * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - OnlineDeploymentDataInner update( + OnlineDeploymentInner update( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialOnlineDeploymentPartialTrackedResource body); + PartialMinimalTrackedResourceWithSku body); /** * Update Online Deployment (asynchronous). @@ -234,12 +234,12 @@ OnlineDeploymentDataInner update( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - OnlineDeploymentDataInner update( + OnlineDeploymentInner update( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialOnlineDeploymentPartialTrackedResource body, + PartialMinimalTrackedResourceWithSku body, Context context); /** @@ -256,12 +256,12 @@ OnlineDeploymentDataInner update( * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, OnlineDeploymentDataInner> beginCreateOrUpdate( + SyncPoller, OnlineDeploymentInner> beginCreateOrUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - OnlineDeploymentDataInner body); + OnlineDeploymentInner body); /** * Create or update Inference Endpoint Deployment (asynchronous). @@ -278,12 +278,12 @@ SyncPoller, OnlineDeploymentDataInner> beg * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, OnlineDeploymentDataInner> beginCreateOrUpdate( + SyncPoller, OnlineDeploymentInner> beginCreateOrUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - OnlineDeploymentDataInner body, + OnlineDeploymentInner body, Context context); /** @@ -300,12 +300,12 @@ SyncPoller, OnlineDeploymentDataInner> beg * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - OnlineDeploymentDataInner createOrUpdate( + OnlineDeploymentInner createOrUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - OnlineDeploymentDataInner body); + OnlineDeploymentInner body); /** * Create or update Inference Endpoint Deployment (asynchronous). @@ -322,12 +322,12 @@ OnlineDeploymentDataInner createOrUpdate( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - OnlineDeploymentDataInner createOrUpdate( + OnlineDeploymentInner createOrUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - OnlineDeploymentDataInner body, + OnlineDeploymentInner body, Context context); /** diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/OnlineEndpointsClient.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/OnlineEndpointsClient.java index 7dfed8a382a2..afa0ac76816f 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/OnlineEndpointsClient.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/OnlineEndpointsClient.java @@ -13,10 +13,10 @@ import com.azure.core.util.polling.SyncPoller; import com.azure.resourcemanager.machinelearning.fluent.models.EndpointAuthKeysInner; import com.azure.resourcemanager.machinelearning.fluent.models.EndpointAuthTokenInner; -import com.azure.resourcemanager.machinelearning.fluent.models.OnlineEndpointDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.OnlineEndpointInner; import com.azure.resourcemanager.machinelearning.models.EndpointComputeType; import com.azure.resourcemanager.machinelearning.models.OrderString; -import com.azure.resourcemanager.machinelearning.models.PartialOnlineEndpointPartialTrackedResource; +import com.azure.resourcemanager.machinelearning.models.PartialMinimalTrackedResourceWithIdentity; import com.azure.resourcemanager.machinelearning.models.RegenerateEndpointKeysRequest; /** An instance of this class provides access to all the operations defined in OnlineEndpointsClient. */ @@ -32,7 +32,7 @@ public interface OnlineEndpointsClient { * @return a paginated list of OnlineEndpoint entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list(String resourceGroupName, String workspaceName); + PagedIterable list(String resourceGroupName, String workspaceName); /** * List Online Endpoints. @@ -55,7 +55,7 @@ public interface OnlineEndpointsClient { * @return a paginated list of OnlineEndpoint entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -136,7 +136,7 @@ SyncPoller, Void> beginDelete( * @return online Endpoint. */ @ServiceMethod(returns = ReturnType.SINGLE) - OnlineEndpointDataInner get(String resourceGroupName, String workspaceName, String endpointName); + OnlineEndpointInner get(String resourceGroupName, String workspaceName, String endpointName); /** * Get Online Endpoint. @@ -151,7 +151,7 @@ SyncPoller, Void> beginDelete( * @return online Endpoint along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String endpointName, Context context); /** @@ -167,11 +167,11 @@ Response getWithResponse( * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, OnlineEndpointDataInner> beginUpdate( + SyncPoller, OnlineEndpointInner> beginUpdate( String resourceGroupName, String workspaceName, String endpointName, - PartialOnlineEndpointPartialTrackedResource body); + PartialMinimalTrackedResourceWithIdentity body); /** * Update Online Endpoint (asynchronous). @@ -187,11 +187,11 @@ SyncPoller, OnlineEndpointDataInner> beginUp * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, OnlineEndpointDataInner> beginUpdate( + SyncPoller, OnlineEndpointInner> beginUpdate( String resourceGroupName, String workspaceName, String endpointName, - PartialOnlineEndpointPartialTrackedResource body, + PartialMinimalTrackedResourceWithIdentity body, Context context); /** @@ -207,11 +207,11 @@ SyncPoller, OnlineEndpointDataInner> beginUp * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - OnlineEndpointDataInner update( + OnlineEndpointInner update( String resourceGroupName, String workspaceName, String endpointName, - PartialOnlineEndpointPartialTrackedResource body); + PartialMinimalTrackedResourceWithIdentity body); /** * Update Online Endpoint (asynchronous). @@ -227,11 +227,11 @@ OnlineEndpointDataInner update( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - OnlineEndpointDataInner update( + OnlineEndpointInner update( String resourceGroupName, String workspaceName, String endpointName, - PartialOnlineEndpointPartialTrackedResource body, + PartialMinimalTrackedResourceWithIdentity body, Context context); /** @@ -247,8 +247,8 @@ OnlineEndpointDataInner update( * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, OnlineEndpointDataInner> beginCreateOrUpdate( - String resourceGroupName, String workspaceName, String endpointName, OnlineEndpointDataInner body); + SyncPoller, OnlineEndpointInner> beginCreateOrUpdate( + String resourceGroupName, String workspaceName, String endpointName, OnlineEndpointInner body); /** * Create or update Online Endpoint (asynchronous). @@ -264,12 +264,8 @@ SyncPoller, OnlineEndpointDataInner> beginCr * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, OnlineEndpointDataInner> beginCreateOrUpdate( - String resourceGroupName, - String workspaceName, - String endpointName, - OnlineEndpointDataInner body, - Context context); + SyncPoller, OnlineEndpointInner> beginCreateOrUpdate( + String resourceGroupName, String workspaceName, String endpointName, OnlineEndpointInner body, Context context); /** * Create or update Online Endpoint (asynchronous). @@ -284,8 +280,8 @@ SyncPoller, OnlineEndpointDataInner> beginCr * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - OnlineEndpointDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String endpointName, OnlineEndpointDataInner body); + OnlineEndpointInner createOrUpdate( + String resourceGroupName, String workspaceName, String endpointName, OnlineEndpointInner body); /** * Create or update Online Endpoint (asynchronous). @@ -301,12 +297,8 @@ OnlineEndpointDataInner createOrUpdate( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - OnlineEndpointDataInner createOrUpdate( - String resourceGroupName, - String workspaceName, - String endpointName, - OnlineEndpointDataInner body, - Context context); + OnlineEndpointInner createOrUpdate( + String resourceGroupName, String workspaceName, String endpointName, OnlineEndpointInner body, Context context); /** * List EndpointAuthKeys for an Endpoint using Key-based authentication. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/WorkspaceConnectionsClient.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/WorkspaceConnectionsClient.java index 9f057a3dd81f..c3fbd866c999 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/WorkspaceConnectionsClient.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/WorkspaceConnectionsClient.java @@ -9,94 +9,85 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.Response; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.WorkspaceConnectionInner; +import com.azure.resourcemanager.machinelearning.fluent.models.WorkspaceConnectionPropertiesV2BasicResourceInner; /** An instance of this class provides access to all the operations defined in WorkspaceConnectionsClient. */ public interface WorkspaceConnectionsClient { /** - * List all connections under a AML workspace. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. + * @param connectionName Friendly name of the workspace connection. + * @param parameters The object for creating or updating a new workspace connection. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return paginated list of Workspace connection objects as paginated response with {@link PagedIterable}. + * @return the response. */ - @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list(String resourceGroupName, String workspaceName); + @ServiceMethod(returns = ReturnType.SINGLE) + WorkspaceConnectionPropertiesV2BasicResourceInner create( + String resourceGroupName, + String workspaceName, + String connectionName, + WorkspaceConnectionPropertiesV2BasicResourceInner parameters); /** - * List all connections under a AML workspace. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. - * @param target Target of the workspace connection. - * @param category Category of the workspace connection. + * @param connectionName Friendly name of the workspace connection. + * @param parameters The object for creating or updating a new workspace connection. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return paginated list of Workspace connection objects as paginated response with {@link PagedIterable}. + * @return the response body along with {@link Response}. */ - @ServiceMethod(returns = ReturnType.COLLECTION) - PagedIterable list( - String resourceGroupName, String workspaceName, String target, String category, Context context); + @ServiceMethod(returns = ReturnType.SINGLE) + Response createWithResponse( + String resourceGroupName, + String workspaceName, + String connectionName, + WorkspaceConnectionPropertiesV2BasicResourceInner parameters, + Context context); /** - * Add a new workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection. - * @param parameters The object for creating or updating a new workspace connection. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return workspace connection. + * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - WorkspaceConnectionInner create( - String resourceGroupName, String workspaceName, String connectionName, WorkspaceConnectionInner parameters); + WorkspaceConnectionPropertiesV2BasicResourceInner get( + String resourceGroupName, String workspaceName, String connectionName); /** - * Add a new workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection. - * @param parameters The object for creating or updating a new workspace connection. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return workspace connection along with {@link Response}. + * @return the response body along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response createWithResponse( - String resourceGroupName, - String workspaceName, - String connectionName, - WorkspaceConnectionInner parameters, - Context context); + Response getWithResponse( + String resourceGroupName, String workspaceName, String connectionName, Context context); /** - * Get the detail of a workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the detail of a workspace connection. */ @ServiceMethod(returns = ReturnType.SINGLE) - WorkspaceConnectionInner get(String resourceGroupName, String workspaceName, String connectionName); + void delete(String resourceGroupName, String workspaceName, String connectionName); /** - * Get the detail of a workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection. @@ -104,38 +95,36 @@ Response createWithResponse( * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the detail of a workspace connection along with {@link Response}. + * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response getWithResponse( + Response deleteWithResponse( String resourceGroupName, String workspaceName, String connectionName, Context context); /** - * Delete a workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. - * @param connectionName Friendly name of the workspace connection. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. */ - @ServiceMethod(returns = ReturnType.SINGLE) - void delete(String resourceGroupName, String workspaceName, String connectionName); + @ServiceMethod(returns = ReturnType.COLLECTION) + PagedIterable list( + String resourceGroupName, String workspaceName); /** - * Delete a workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. - * @param connectionName Friendly name of the workspace connection. + * @param target Target of the workspace connection. + * @param category Category of the workspace connection. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link Response}. + * @return the paginated response with {@link PagedIterable}. */ - @ServiceMethod(returns = ReturnType.SINGLE) - Response deleteWithResponse( - String resourceGroupName, String workspaceName, String connectionName, Context context); + @ServiceMethod(returns = ReturnType.COLLECTION) + PagedIterable list( + String resourceGroupName, String workspaceName, String target, String category, Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/BatchDeploymentDataInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/BatchDeploymentInner.java similarity index 80% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/BatchDeploymentDataInner.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/BatchDeploymentInner.java index 5df9352b3489..06c7167718af 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/BatchDeploymentDataInner.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/BatchDeploymentInner.java @@ -8,15 +8,15 @@ import com.azure.core.management.Resource; import com.azure.core.management.SystemData; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.machinelearning.models.BatchDeploymentDetails; +import com.azure.resourcemanager.machinelearning.models.BatchDeploymentProperties; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentity; import com.azure.resourcemanager.machinelearning.models.Sku; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; -/** The BatchDeploymentData model. */ +/** The BatchDeployment model. */ @Fluent -public final class BatchDeploymentDataInner extends Resource { +public final class BatchDeploymentInner extends Resource { /* * Managed service identity (system assigned and/or user assigned * identities) @@ -35,7 +35,7 @@ public final class BatchDeploymentDataInner extends Resource { * [Required] Additional attributes of the entity. */ @JsonProperty(value = "properties", required = true) - private BatchDeploymentDetails properties; + private BatchDeploymentProperties properties; /* * Sku details required for ARM contract for Autoscaling. @@ -63,9 +63,9 @@ public ManagedServiceIdentity identity() { * Set the identity property: Managed service identity (system assigned and/or user assigned identities). * * @param identity the identity value to set. - * @return the BatchDeploymentDataInner object itself. + * @return the BatchDeploymentInner object itself. */ - public BatchDeploymentDataInner withIdentity(ManagedServiceIdentity identity) { + public BatchDeploymentInner withIdentity(ManagedServiceIdentity identity) { this.identity = identity; return this; } @@ -85,9 +85,9 @@ public String kind() { * the same type. * * @param kind the kind value to set. - * @return the BatchDeploymentDataInner object itself. + * @return the BatchDeploymentInner object itself. */ - public BatchDeploymentDataInner withKind(String kind) { + public BatchDeploymentInner withKind(String kind) { this.kind = kind; return this; } @@ -97,7 +97,7 @@ public BatchDeploymentDataInner withKind(String kind) { * * @return the properties value. */ - public BatchDeploymentDetails properties() { + public BatchDeploymentProperties properties() { return this.properties; } @@ -105,9 +105,9 @@ public BatchDeploymentDetails properties() { * Set the properties property: [Required] Additional attributes of the entity. * * @param properties the properties value to set. - * @return the BatchDeploymentDataInner object itself. + * @return the BatchDeploymentInner object itself. */ - public BatchDeploymentDataInner withProperties(BatchDeploymentDetails properties) { + public BatchDeploymentInner withProperties(BatchDeploymentProperties properties) { this.properties = properties; return this; } @@ -125,9 +125,9 @@ public Sku sku() { * Set the sku property: Sku details required for ARM contract for Autoscaling. * * @param sku the sku value to set. - * @return the BatchDeploymentDataInner object itself. + * @return the BatchDeploymentInner object itself. */ - public BatchDeploymentDataInner withSku(Sku sku) { + public BatchDeploymentInner withSku(Sku sku) { this.sku = sku; return this; } @@ -143,14 +143,14 @@ public SystemData systemData() { /** {@inheritDoc} */ @Override - public BatchDeploymentDataInner withLocation(String location) { + public BatchDeploymentInner withLocation(String location) { super.withLocation(location); return this; } /** {@inheritDoc} */ @Override - public BatchDeploymentDataInner withTags(Map tags) { + public BatchDeploymentInner withTags(Map tags) { super.withTags(tags); return this; } @@ -167,8 +167,7 @@ public void validate() { if (properties() == null) { throw LOGGER .logExceptionAsError( - new IllegalArgumentException( - "Missing required property properties in model BatchDeploymentDataInner")); + new IllegalArgumentException("Missing required property properties in model BatchDeploymentInner")); } else { properties().validate(); } @@ -177,5 +176,5 @@ public void validate() { } } - private static final ClientLogger LOGGER = new ClientLogger(BatchDeploymentDataInner.class); + private static final ClientLogger LOGGER = new ClientLogger(BatchDeploymentInner.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/BatchEndpointDataInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/BatchEndpointInner.java similarity index 78% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/BatchEndpointDataInner.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/BatchEndpointInner.java index 2dc693909a68..1e66d571f6b6 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/BatchEndpointDataInner.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/BatchEndpointInner.java @@ -7,15 +7,15 @@ import com.azure.core.annotation.Fluent; import com.azure.core.management.Resource; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.machinelearning.models.BatchEndpointDetails; +import com.azure.resourcemanager.machinelearning.models.BatchEndpointProperties; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentity; import com.azure.resourcemanager.machinelearning.models.Sku; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; -/** The BatchEndpointData model. */ +/** The BatchEndpoint model. */ @Fluent -public final class BatchEndpointDataInner extends Resource { +public final class BatchEndpointInner extends Resource { /* * Managed service identity (system assigned and/or user assigned * identities) @@ -34,7 +34,7 @@ public final class BatchEndpointDataInner extends Resource { * [Required] Additional attributes of the entity. */ @JsonProperty(value = "properties", required = true) - private BatchEndpointDetails properties; + private BatchEndpointProperties properties; /* * Sku details required for ARM contract for Autoscaling. @@ -55,9 +55,9 @@ public ManagedServiceIdentity identity() { * Set the identity property: Managed service identity (system assigned and/or user assigned identities). * * @param identity the identity value to set. - * @return the BatchEndpointDataInner object itself. + * @return the BatchEndpointInner object itself. */ - public BatchEndpointDataInner withIdentity(ManagedServiceIdentity identity) { + public BatchEndpointInner withIdentity(ManagedServiceIdentity identity) { this.identity = identity; return this; } @@ -77,9 +77,9 @@ public String kind() { * the same type. * * @param kind the kind value to set. - * @return the BatchEndpointDataInner object itself. + * @return the BatchEndpointInner object itself. */ - public BatchEndpointDataInner withKind(String kind) { + public BatchEndpointInner withKind(String kind) { this.kind = kind; return this; } @@ -89,7 +89,7 @@ public BatchEndpointDataInner withKind(String kind) { * * @return the properties value. */ - public BatchEndpointDetails properties() { + public BatchEndpointProperties properties() { return this.properties; } @@ -97,9 +97,9 @@ public BatchEndpointDetails properties() { * Set the properties property: [Required] Additional attributes of the entity. * * @param properties the properties value to set. - * @return the BatchEndpointDataInner object itself. + * @return the BatchEndpointInner object itself. */ - public BatchEndpointDataInner withProperties(BatchEndpointDetails properties) { + public BatchEndpointInner withProperties(BatchEndpointProperties properties) { this.properties = properties; return this; } @@ -117,23 +117,23 @@ public Sku sku() { * Set the sku property: Sku details required for ARM contract for Autoscaling. * * @param sku the sku value to set. - * @return the BatchEndpointDataInner object itself. + * @return the BatchEndpointInner object itself. */ - public BatchEndpointDataInner withSku(Sku sku) { + public BatchEndpointInner withSku(Sku sku) { this.sku = sku; return this; } /** {@inheritDoc} */ @Override - public BatchEndpointDataInner withLocation(String location) { + public BatchEndpointInner withLocation(String location) { super.withLocation(location); return this; } /** {@inheritDoc} */ @Override - public BatchEndpointDataInner withTags(Map tags) { + public BatchEndpointInner withTags(Map tags) { super.withTags(tags); return this; } @@ -150,8 +150,7 @@ public void validate() { if (properties() == null) { throw LOGGER .logExceptionAsError( - new IllegalArgumentException( - "Missing required property properties in model BatchEndpointDataInner")); + new IllegalArgumentException("Missing required property properties in model BatchEndpointInner")); } else { properties().validate(); } @@ -160,5 +159,5 @@ public void validate() { } } - private static final ClientLogger LOGGER = new ClientLogger(BatchEndpointDataInner.class); + private static final ClientLogger LOGGER = new ClientLogger(BatchEndpointInner.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/CodeContainerDataInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/CodeContainerInner.java similarity index 80% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/CodeContainerDataInner.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/CodeContainerInner.java index 1b06f986e32f..e785224c1138 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/CodeContainerDataInner.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/CodeContainerInner.java @@ -8,17 +8,17 @@ import com.azure.core.management.ProxyResource; import com.azure.core.management.SystemData; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.machinelearning.models.CodeContainerDetails; +import com.azure.resourcemanager.machinelearning.models.CodeContainerProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** Azure Resource Manager resource envelope. */ @Fluent -public final class CodeContainerDataInner extends ProxyResource { +public final class CodeContainerInner extends ProxyResource { /* * [Required] Additional attributes of the entity. */ @JsonProperty(value = "properties", required = true) - private CodeContainerDetails properties; + private CodeContainerProperties properties; /* * Azure Resource Manager metadata containing createdBy and modifiedBy @@ -32,7 +32,7 @@ public final class CodeContainerDataInner extends ProxyResource { * * @return the properties value. */ - public CodeContainerDetails properties() { + public CodeContainerProperties properties() { return this.properties; } @@ -40,9 +40,9 @@ public CodeContainerDetails properties() { * Set the properties property: [Required] Additional attributes of the entity. * * @param properties the properties value to set. - * @return the CodeContainerDataInner object itself. + * @return the CodeContainerInner object itself. */ - public CodeContainerDataInner withProperties(CodeContainerDetails properties) { + public CodeContainerInner withProperties(CodeContainerProperties properties) { this.properties = properties; return this; } @@ -65,12 +65,11 @@ public void validate() { if (properties() == null) { throw LOGGER .logExceptionAsError( - new IllegalArgumentException( - "Missing required property properties in model CodeContainerDataInner")); + new IllegalArgumentException("Missing required property properties in model CodeContainerInner")); } else { properties().validate(); } } - private static final ClientLogger LOGGER = new ClientLogger(CodeContainerDataInner.class); + private static final ClientLogger LOGGER = new ClientLogger(CodeContainerInner.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/CodeVersionDataInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/CodeVersionInner.java similarity index 84% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/CodeVersionDataInner.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/CodeVersionInner.java index 1e72fd195191..bd10dc7c9eac 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/CodeVersionDataInner.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/CodeVersionInner.java @@ -8,17 +8,17 @@ import com.azure.core.management.ProxyResource; import com.azure.core.management.SystemData; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.machinelearning.models.CodeVersionDetails; +import com.azure.resourcemanager.machinelearning.models.CodeVersionProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** Azure Resource Manager resource envelope. */ @Fluent -public final class CodeVersionDataInner extends ProxyResource { +public final class CodeVersionInner extends ProxyResource { /* * [Required] Additional attributes of the entity. */ @JsonProperty(value = "properties", required = true) - private CodeVersionDetails properties; + private CodeVersionProperties properties; /* * Azure Resource Manager metadata containing createdBy and modifiedBy @@ -32,7 +32,7 @@ public final class CodeVersionDataInner extends ProxyResource { * * @return the properties value. */ - public CodeVersionDetails properties() { + public CodeVersionProperties properties() { return this.properties; } @@ -40,9 +40,9 @@ public CodeVersionDetails properties() { * Set the properties property: [Required] Additional attributes of the entity. * * @param properties the properties value to set. - * @return the CodeVersionDataInner object itself. + * @return the CodeVersionInner object itself. */ - public CodeVersionDataInner withProperties(CodeVersionDetails properties) { + public CodeVersionInner withProperties(CodeVersionProperties properties) { this.properties = properties; return this; } @@ -65,11 +65,11 @@ public void validate() { if (properties() == null) { throw LOGGER .logExceptionAsError( - new IllegalArgumentException("Missing required property properties in model CodeVersionDataInner")); + new IllegalArgumentException("Missing required property properties in model CodeVersionInner")); } else { properties().validate(); } } - private static final ClientLogger LOGGER = new ClientLogger(CodeVersionDataInner.class); + private static final ClientLogger LOGGER = new ClientLogger(CodeVersionInner.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ComponentContainerDataInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ComponentContainerInner.java similarity index 83% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ComponentContainerDataInner.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ComponentContainerInner.java index c947da16fd56..72b2067eea2c 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ComponentContainerDataInner.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ComponentContainerInner.java @@ -8,17 +8,17 @@ import com.azure.core.management.ProxyResource; import com.azure.core.management.SystemData; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.machinelearning.models.ComponentContainerDetails; +import com.azure.resourcemanager.machinelearning.models.ComponentContainerProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** Azure Resource Manager resource envelope. */ @Fluent -public final class ComponentContainerDataInner extends ProxyResource { +public final class ComponentContainerInner extends ProxyResource { /* * [Required] Additional attributes of the entity. */ @JsonProperty(value = "properties", required = true) - private ComponentContainerDetails properties; + private ComponentContainerProperties properties; /* * Azure Resource Manager metadata containing createdBy and modifiedBy @@ -32,7 +32,7 @@ public final class ComponentContainerDataInner extends ProxyResource { * * @return the properties value. */ - public ComponentContainerDetails properties() { + public ComponentContainerProperties properties() { return this.properties; } @@ -40,9 +40,9 @@ public ComponentContainerDetails properties() { * Set the properties property: [Required] Additional attributes of the entity. * * @param properties the properties value to set. - * @return the ComponentContainerDataInner object itself. + * @return the ComponentContainerInner object itself. */ - public ComponentContainerDataInner withProperties(ComponentContainerDetails properties) { + public ComponentContainerInner withProperties(ComponentContainerProperties properties) { this.properties = properties; return this; } @@ -66,11 +66,11 @@ public void validate() { throw LOGGER .logExceptionAsError( new IllegalArgumentException( - "Missing required property properties in model ComponentContainerDataInner")); + "Missing required property properties in model ComponentContainerInner")); } else { properties().validate(); } } - private static final ClientLogger LOGGER = new ClientLogger(ComponentContainerDataInner.class); + private static final ClientLogger LOGGER = new ClientLogger(ComponentContainerInner.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ComponentVersionDataInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ComponentVersionInner.java similarity index 83% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ComponentVersionDataInner.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ComponentVersionInner.java index ba2ad30514b2..f163da3298cd 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ComponentVersionDataInner.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ComponentVersionInner.java @@ -8,17 +8,17 @@ import com.azure.core.management.ProxyResource; import com.azure.core.management.SystemData; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.machinelearning.models.ComponentVersionDetails; +import com.azure.resourcemanager.machinelearning.models.ComponentVersionProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** Azure Resource Manager resource envelope. */ @Fluent -public final class ComponentVersionDataInner extends ProxyResource { +public final class ComponentVersionInner extends ProxyResource { /* * [Required] Additional attributes of the entity. */ @JsonProperty(value = "properties", required = true) - private ComponentVersionDetails properties; + private ComponentVersionProperties properties; /* * Azure Resource Manager metadata containing createdBy and modifiedBy @@ -32,7 +32,7 @@ public final class ComponentVersionDataInner extends ProxyResource { * * @return the properties value. */ - public ComponentVersionDetails properties() { + public ComponentVersionProperties properties() { return this.properties; } @@ -40,9 +40,9 @@ public ComponentVersionDetails properties() { * Set the properties property: [Required] Additional attributes of the entity. * * @param properties the properties value to set. - * @return the ComponentVersionDataInner object itself. + * @return the ComponentVersionInner object itself. */ - public ComponentVersionDataInner withProperties(ComponentVersionDetails properties) { + public ComponentVersionInner withProperties(ComponentVersionProperties properties) { this.properties = properties; return this; } @@ -66,11 +66,11 @@ public void validate() { throw LOGGER .logExceptionAsError( new IllegalArgumentException( - "Missing required property properties in model ComponentVersionDataInner")); + "Missing required property properties in model ComponentVersionInner")); } else { properties().validate(); } } - private static final ClientLogger LOGGER = new ClientLogger(ComponentVersionDataInner.class); + private static final ClientLogger LOGGER = new ClientLogger(ComponentVersionInner.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DataContainerDataInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DataContainerInner.java similarity index 80% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DataContainerDataInner.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DataContainerInner.java index aafdd395ffc8..b19ea74d10b0 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DataContainerDataInner.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DataContainerInner.java @@ -8,17 +8,17 @@ import com.azure.core.management.ProxyResource; import com.azure.core.management.SystemData; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.machinelearning.models.DataContainerDetails; +import com.azure.resourcemanager.machinelearning.models.DataContainerProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** Azure Resource Manager resource envelope. */ @Fluent -public final class DataContainerDataInner extends ProxyResource { +public final class DataContainerInner extends ProxyResource { /* * [Required] Additional attributes of the entity. */ @JsonProperty(value = "properties", required = true) - private DataContainerDetails properties; + private DataContainerProperties properties; /* * Azure Resource Manager metadata containing createdBy and modifiedBy @@ -32,7 +32,7 @@ public final class DataContainerDataInner extends ProxyResource { * * @return the properties value. */ - public DataContainerDetails properties() { + public DataContainerProperties properties() { return this.properties; } @@ -40,9 +40,9 @@ public DataContainerDetails properties() { * Set the properties property: [Required] Additional attributes of the entity. * * @param properties the properties value to set. - * @return the DataContainerDataInner object itself. + * @return the DataContainerInner object itself. */ - public DataContainerDataInner withProperties(DataContainerDetails properties) { + public DataContainerInner withProperties(DataContainerProperties properties) { this.properties = properties; return this; } @@ -65,12 +65,11 @@ public void validate() { if (properties() == null) { throw LOGGER .logExceptionAsError( - new IllegalArgumentException( - "Missing required property properties in model DataContainerDataInner")); + new IllegalArgumentException("Missing required property properties in model DataContainerInner")); } else { properties().validate(); } } - private static final ClientLogger LOGGER = new ClientLogger(DataContainerDataInner.class); + private static final ClientLogger LOGGER = new ClientLogger(DataContainerInner.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DataVersionBaseDataInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DataVersionBaseInner.java similarity index 79% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DataVersionBaseDataInner.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DataVersionBaseInner.java index 6d31b402f3d6..f8ee429ed477 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DataVersionBaseDataInner.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DataVersionBaseInner.java @@ -8,17 +8,17 @@ import com.azure.core.management.ProxyResource; import com.azure.core.management.SystemData; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.machinelearning.models.DataVersionBaseDetails; +import com.azure.resourcemanager.machinelearning.models.DataVersionBaseProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** Azure Resource Manager resource envelope. */ @Fluent -public final class DataVersionBaseDataInner extends ProxyResource { +public final class DataVersionBaseInner extends ProxyResource { /* * [Required] Additional attributes of the entity. */ @JsonProperty(value = "properties", required = true) - private DataVersionBaseDetails properties; + private DataVersionBaseProperties properties; /* * Azure Resource Manager metadata containing createdBy and modifiedBy @@ -32,7 +32,7 @@ public final class DataVersionBaseDataInner extends ProxyResource { * * @return the properties value. */ - public DataVersionBaseDetails properties() { + public DataVersionBaseProperties properties() { return this.properties; } @@ -40,9 +40,9 @@ public DataVersionBaseDetails properties() { * Set the properties property: [Required] Additional attributes of the entity. * * @param properties the properties value to set. - * @return the DataVersionBaseDataInner object itself. + * @return the DataVersionBaseInner object itself. */ - public DataVersionBaseDataInner withProperties(DataVersionBaseDetails properties) { + public DataVersionBaseInner withProperties(DataVersionBaseProperties properties) { this.properties = properties; return this; } @@ -65,12 +65,11 @@ public void validate() { if (properties() == null) { throw LOGGER .logExceptionAsError( - new IllegalArgumentException( - "Missing required property properties in model DataVersionBaseDataInner")); + new IllegalArgumentException("Missing required property properties in model DataVersionBaseInner")); } else { properties().validate(); } } - private static final ClientLogger LOGGER = new ClientLogger(DataVersionBaseDataInner.class); + private static final ClientLogger LOGGER = new ClientLogger(DataVersionBaseInner.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DatastoreDataInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DatastoreInner.java similarity index 84% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DatastoreDataInner.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DatastoreInner.java index befaa4c64e74..7cd9c90bb4bd 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DatastoreDataInner.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DatastoreInner.java @@ -8,17 +8,17 @@ import com.azure.core.management.ProxyResource; import com.azure.core.management.SystemData; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.machinelearning.models.DatastoreDetails; +import com.azure.resourcemanager.machinelearning.models.DatastoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** Azure Resource Manager resource envelope. */ @Fluent -public final class DatastoreDataInner extends ProxyResource { +public final class DatastoreInner extends ProxyResource { /* * [Required] Additional attributes of the entity. */ @JsonProperty(value = "properties", required = true) - private DatastoreDetails properties; + private DatastoreProperties properties; /* * Azure Resource Manager metadata containing createdBy and modifiedBy @@ -32,7 +32,7 @@ public final class DatastoreDataInner extends ProxyResource { * * @return the properties value. */ - public DatastoreDetails properties() { + public DatastoreProperties properties() { return this.properties; } @@ -40,9 +40,9 @@ public DatastoreDetails properties() { * Set the properties property: [Required] Additional attributes of the entity. * * @param properties the properties value to set. - * @return the DatastoreDataInner object itself. + * @return the DatastoreInner object itself. */ - public DatastoreDataInner withProperties(DatastoreDetails properties) { + public DatastoreInner withProperties(DatastoreProperties properties) { this.properties = properties; return this; } @@ -65,11 +65,11 @@ public void validate() { if (properties() == null) { throw LOGGER .logExceptionAsError( - new IllegalArgumentException("Missing required property properties in model DatastoreDataInner")); + new IllegalArgumentException("Missing required property properties in model DatastoreInner")); } else { properties().validate(); } } - private static final ClientLogger LOGGER = new ClientLogger(DatastoreDataInner.class); + private static final ClientLogger LOGGER = new ClientLogger(DatastoreInner.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DatastoreSecretsInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DatastoreSecretsInner.java index 936757cf5fe2..7af3bf363d7c 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DatastoreSecretsInner.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/DatastoreSecretsInner.java @@ -7,8 +7,6 @@ import com.azure.core.annotation.Immutable; import com.azure.resourcemanager.machinelearning.models.AccountKeyDatastoreSecrets; import com.azure.resourcemanager.machinelearning.models.CertificateDatastoreSecrets; -import com.azure.resourcemanager.machinelearning.models.KerberosKeytabSecrets; -import com.azure.resourcemanager.machinelearning.models.KerberosPasswordSecrets; import com.azure.resourcemanager.machinelearning.models.SasDatastoreSecrets; import com.azure.resourcemanager.machinelearning.models.ServicePrincipalDatastoreSecrets; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -25,8 +23,6 @@ @JsonSubTypes({ @JsonSubTypes.Type(name = "AccountKey", value = AccountKeyDatastoreSecrets.class), @JsonSubTypes.Type(name = "Certificate", value = CertificateDatastoreSecrets.class), - @JsonSubTypes.Type(name = "KerberosKeytab", value = KerberosKeytabSecrets.class), - @JsonSubTypes.Type(name = "KerberosPassword", value = KerberosPasswordSecrets.class), @JsonSubTypes.Type(name = "Sas", value = SasDatastoreSecrets.class), @JsonSubTypes.Type(name = "ServicePrincipal", value = ServicePrincipalDatastoreSecrets.class) }) diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/EnvironmentContainerDataInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/EnvironmentContainerInner.java similarity index 82% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/EnvironmentContainerDataInner.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/EnvironmentContainerInner.java index e0b57af590f2..1549bb7c6f03 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/EnvironmentContainerDataInner.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/EnvironmentContainerInner.java @@ -8,17 +8,17 @@ import com.azure.core.management.ProxyResource; import com.azure.core.management.SystemData; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.machinelearning.models.EnvironmentContainerDetails; +import com.azure.resourcemanager.machinelearning.models.EnvironmentContainerProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** Azure Resource Manager resource envelope. */ @Fluent -public final class EnvironmentContainerDataInner extends ProxyResource { +public final class EnvironmentContainerInner extends ProxyResource { /* * [Required] Additional attributes of the entity. */ @JsonProperty(value = "properties", required = true) - private EnvironmentContainerDetails properties; + private EnvironmentContainerProperties properties; /* * Azure Resource Manager metadata containing createdBy and modifiedBy @@ -32,7 +32,7 @@ public final class EnvironmentContainerDataInner extends ProxyResource { * * @return the properties value. */ - public EnvironmentContainerDetails properties() { + public EnvironmentContainerProperties properties() { return this.properties; } @@ -40,9 +40,9 @@ public EnvironmentContainerDetails properties() { * Set the properties property: [Required] Additional attributes of the entity. * * @param properties the properties value to set. - * @return the EnvironmentContainerDataInner object itself. + * @return the EnvironmentContainerInner object itself. */ - public EnvironmentContainerDataInner withProperties(EnvironmentContainerDetails properties) { + public EnvironmentContainerInner withProperties(EnvironmentContainerProperties properties) { this.properties = properties; return this; } @@ -66,11 +66,11 @@ public void validate() { throw LOGGER .logExceptionAsError( new IllegalArgumentException( - "Missing required property properties in model EnvironmentContainerDataInner")); + "Missing required property properties in model EnvironmentContainerInner")); } else { properties().validate(); } } - private static final ClientLogger LOGGER = new ClientLogger(EnvironmentContainerDataInner.class); + private static final ClientLogger LOGGER = new ClientLogger(EnvironmentContainerInner.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/EnvironmentVersionDataInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/EnvironmentVersionInner.java similarity index 83% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/EnvironmentVersionDataInner.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/EnvironmentVersionInner.java index 70dba5130698..acac01c8eb74 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/EnvironmentVersionDataInner.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/EnvironmentVersionInner.java @@ -8,17 +8,17 @@ import com.azure.core.management.ProxyResource; import com.azure.core.management.SystemData; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.machinelearning.models.EnvironmentVersionDetails; +import com.azure.resourcemanager.machinelearning.models.EnvironmentVersionProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** Azure Resource Manager resource envelope. */ @Fluent -public final class EnvironmentVersionDataInner extends ProxyResource { +public final class EnvironmentVersionInner extends ProxyResource { /* * [Required] Additional attributes of the entity. */ @JsonProperty(value = "properties", required = true) - private EnvironmentVersionDetails properties; + private EnvironmentVersionProperties properties; /* * Azure Resource Manager metadata containing createdBy and modifiedBy @@ -32,7 +32,7 @@ public final class EnvironmentVersionDataInner extends ProxyResource { * * @return the properties value. */ - public EnvironmentVersionDetails properties() { + public EnvironmentVersionProperties properties() { return this.properties; } @@ -40,9 +40,9 @@ public EnvironmentVersionDetails properties() { * Set the properties property: [Required] Additional attributes of the entity. * * @param properties the properties value to set. - * @return the EnvironmentVersionDataInner object itself. + * @return the EnvironmentVersionInner object itself. */ - public EnvironmentVersionDataInner withProperties(EnvironmentVersionDetails properties) { + public EnvironmentVersionInner withProperties(EnvironmentVersionProperties properties) { this.properties = properties; return this; } @@ -66,11 +66,11 @@ public void validate() { throw LOGGER .logExceptionAsError( new IllegalArgumentException( - "Missing required property properties in model EnvironmentVersionDataInner")); + "Missing required property properties in model EnvironmentVersionInner")); } else { properties().validate(); } } - private static final ClientLogger LOGGER = new ClientLogger(EnvironmentVersionDataInner.class); + private static final ClientLogger LOGGER = new ClientLogger(EnvironmentVersionInner.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/JobBaseDataInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/JobBaseInner.java similarity index 82% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/JobBaseDataInner.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/JobBaseInner.java index 45a01d708025..5982e5849e27 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/JobBaseDataInner.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/JobBaseInner.java @@ -8,17 +8,17 @@ import com.azure.core.management.ProxyResource; import com.azure.core.management.SystemData; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.machinelearning.models.JobBaseDetails; +import com.azure.resourcemanager.machinelearning.models.JobBaseProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** Azure Resource Manager resource envelope. */ @Fluent -public final class JobBaseDataInner extends ProxyResource { +public final class JobBaseInner extends ProxyResource { /* * [Required] Additional attributes of the entity. */ @JsonProperty(value = "properties", required = true) - private JobBaseDetails properties; + private JobBaseProperties properties; /* * Azure Resource Manager metadata containing createdBy and modifiedBy @@ -32,7 +32,7 @@ public final class JobBaseDataInner extends ProxyResource { * * @return the properties value. */ - public JobBaseDetails properties() { + public JobBaseProperties properties() { return this.properties; } @@ -40,9 +40,9 @@ public JobBaseDetails properties() { * Set the properties property: [Required] Additional attributes of the entity. * * @param properties the properties value to set. - * @return the JobBaseDataInner object itself. + * @return the JobBaseInner object itself. */ - public JobBaseDataInner withProperties(JobBaseDetails properties) { + public JobBaseInner withProperties(JobBaseProperties properties) { this.properties = properties; return this; } @@ -65,11 +65,11 @@ public void validate() { if (properties() == null) { throw LOGGER .logExceptionAsError( - new IllegalArgumentException("Missing required property properties in model JobBaseDataInner")); + new IllegalArgumentException("Missing required property properties in model JobBaseInner")); } else { properties().validate(); } } - private static final ClientLogger LOGGER = new ClientLogger(JobBaseDataInner.class); + private static final ClientLogger LOGGER = new ClientLogger(JobBaseInner.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ModelContainerDataInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ModelContainerInner.java similarity index 79% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ModelContainerDataInner.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ModelContainerInner.java index cf087cc22b9a..30babd2838d6 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ModelContainerDataInner.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ModelContainerInner.java @@ -8,17 +8,17 @@ import com.azure.core.management.ProxyResource; import com.azure.core.management.SystemData; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.machinelearning.models.ModelContainerDetails; +import com.azure.resourcemanager.machinelearning.models.ModelContainerProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** Azure Resource Manager resource envelope. */ @Fluent -public final class ModelContainerDataInner extends ProxyResource { +public final class ModelContainerInner extends ProxyResource { /* * [Required] Additional attributes of the entity. */ @JsonProperty(value = "properties", required = true) - private ModelContainerDetails properties; + private ModelContainerProperties properties; /* * Azure Resource Manager metadata containing createdBy and modifiedBy @@ -32,7 +32,7 @@ public final class ModelContainerDataInner extends ProxyResource { * * @return the properties value. */ - public ModelContainerDetails properties() { + public ModelContainerProperties properties() { return this.properties; } @@ -40,9 +40,9 @@ public ModelContainerDetails properties() { * Set the properties property: [Required] Additional attributes of the entity. * * @param properties the properties value to set. - * @return the ModelContainerDataInner object itself. + * @return the ModelContainerInner object itself. */ - public ModelContainerDataInner withProperties(ModelContainerDetails properties) { + public ModelContainerInner withProperties(ModelContainerProperties properties) { this.properties = properties; return this; } @@ -65,12 +65,11 @@ public void validate() { if (properties() == null) { throw LOGGER .logExceptionAsError( - new IllegalArgumentException( - "Missing required property properties in model ModelContainerDataInner")); + new IllegalArgumentException("Missing required property properties in model ModelContainerInner")); } else { properties().validate(); } } - private static final ClientLogger LOGGER = new ClientLogger(ModelContainerDataInner.class); + private static final ClientLogger LOGGER = new ClientLogger(ModelContainerInner.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ModelVersionDataInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ModelVersionInner.java similarity index 80% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ModelVersionDataInner.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ModelVersionInner.java index 270dd14edc81..ca595aa04e85 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ModelVersionDataInner.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/ModelVersionInner.java @@ -8,17 +8,17 @@ import com.azure.core.management.ProxyResource; import com.azure.core.management.SystemData; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.machinelearning.models.ModelVersionDetails; +import com.azure.resourcemanager.machinelearning.models.ModelVersionProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** Azure Resource Manager resource envelope. */ @Fluent -public final class ModelVersionDataInner extends ProxyResource { +public final class ModelVersionInner extends ProxyResource { /* * [Required] Additional attributes of the entity. */ @JsonProperty(value = "properties", required = true) - private ModelVersionDetails properties; + private ModelVersionProperties properties; /* * Azure Resource Manager metadata containing createdBy and modifiedBy @@ -32,7 +32,7 @@ public final class ModelVersionDataInner extends ProxyResource { * * @return the properties value. */ - public ModelVersionDetails properties() { + public ModelVersionProperties properties() { return this.properties; } @@ -40,9 +40,9 @@ public ModelVersionDetails properties() { * Set the properties property: [Required] Additional attributes of the entity. * * @param properties the properties value to set. - * @return the ModelVersionDataInner object itself. + * @return the ModelVersionInner object itself. */ - public ModelVersionDataInner withProperties(ModelVersionDetails properties) { + public ModelVersionInner withProperties(ModelVersionProperties properties) { this.properties = properties; return this; } @@ -65,12 +65,11 @@ public void validate() { if (properties() == null) { throw LOGGER .logExceptionAsError( - new IllegalArgumentException( - "Missing required property properties in model ModelVersionDataInner")); + new IllegalArgumentException("Missing required property properties in model ModelVersionInner")); } else { properties().validate(); } } - private static final ClientLogger LOGGER = new ClientLogger(ModelVersionDataInner.class); + private static final ClientLogger LOGGER = new ClientLogger(ModelVersionInner.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/OnlineDeploymentDataInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/OnlineDeploymentInner.java similarity index 82% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/OnlineDeploymentDataInner.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/OnlineDeploymentInner.java index 3f1dae7cf453..3870356e40e4 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/OnlineDeploymentDataInner.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/OnlineDeploymentInner.java @@ -9,14 +9,14 @@ import com.azure.core.management.SystemData; import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentity; -import com.azure.resourcemanager.machinelearning.models.OnlineDeploymentDetails; +import com.azure.resourcemanager.machinelearning.models.OnlineDeploymentProperties; import com.azure.resourcemanager.machinelearning.models.Sku; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; -/** The OnlineDeploymentData model. */ +/** The OnlineDeployment model. */ @Fluent -public final class OnlineDeploymentDataInner extends Resource { +public final class OnlineDeploymentInner extends Resource { /* * Managed service identity (system assigned and/or user assigned * identities) @@ -35,7 +35,7 @@ public final class OnlineDeploymentDataInner extends Resource { * [Required] Additional attributes of the entity. */ @JsonProperty(value = "properties", required = true) - private OnlineDeploymentDetails properties; + private OnlineDeploymentProperties properties; /* * Sku details required for ARM contract for Autoscaling. @@ -63,9 +63,9 @@ public ManagedServiceIdentity identity() { * Set the identity property: Managed service identity (system assigned and/or user assigned identities). * * @param identity the identity value to set. - * @return the OnlineDeploymentDataInner object itself. + * @return the OnlineDeploymentInner object itself. */ - public OnlineDeploymentDataInner withIdentity(ManagedServiceIdentity identity) { + public OnlineDeploymentInner withIdentity(ManagedServiceIdentity identity) { this.identity = identity; return this; } @@ -85,9 +85,9 @@ public String kind() { * the same type. * * @param kind the kind value to set. - * @return the OnlineDeploymentDataInner object itself. + * @return the OnlineDeploymentInner object itself. */ - public OnlineDeploymentDataInner withKind(String kind) { + public OnlineDeploymentInner withKind(String kind) { this.kind = kind; return this; } @@ -97,7 +97,7 @@ public OnlineDeploymentDataInner withKind(String kind) { * * @return the properties value. */ - public OnlineDeploymentDetails properties() { + public OnlineDeploymentProperties properties() { return this.properties; } @@ -105,9 +105,9 @@ public OnlineDeploymentDetails properties() { * Set the properties property: [Required] Additional attributes of the entity. * * @param properties the properties value to set. - * @return the OnlineDeploymentDataInner object itself. + * @return the OnlineDeploymentInner object itself. */ - public OnlineDeploymentDataInner withProperties(OnlineDeploymentDetails properties) { + public OnlineDeploymentInner withProperties(OnlineDeploymentProperties properties) { this.properties = properties; return this; } @@ -125,9 +125,9 @@ public Sku sku() { * Set the sku property: Sku details required for ARM contract for Autoscaling. * * @param sku the sku value to set. - * @return the OnlineDeploymentDataInner object itself. + * @return the OnlineDeploymentInner object itself. */ - public OnlineDeploymentDataInner withSku(Sku sku) { + public OnlineDeploymentInner withSku(Sku sku) { this.sku = sku; return this; } @@ -143,14 +143,14 @@ public SystemData systemData() { /** {@inheritDoc} */ @Override - public OnlineDeploymentDataInner withLocation(String location) { + public OnlineDeploymentInner withLocation(String location) { super.withLocation(location); return this; } /** {@inheritDoc} */ @Override - public OnlineDeploymentDataInner withTags(Map tags) { + public OnlineDeploymentInner withTags(Map tags) { super.withTags(tags); return this; } @@ -168,7 +168,7 @@ public void validate() { throw LOGGER .logExceptionAsError( new IllegalArgumentException( - "Missing required property properties in model OnlineDeploymentDataInner")); + "Missing required property properties in model OnlineDeploymentInner")); } else { properties().validate(); } @@ -177,5 +177,5 @@ public void validate() { } } - private static final ClientLogger LOGGER = new ClientLogger(OnlineDeploymentDataInner.class); + private static final ClientLogger LOGGER = new ClientLogger(OnlineDeploymentInner.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/OnlineEndpointDataInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/OnlineEndpointInner.java similarity index 80% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/OnlineEndpointDataInner.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/OnlineEndpointInner.java index 9fad748e05c3..112f128f9de9 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/OnlineEndpointDataInner.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/OnlineEndpointInner.java @@ -9,14 +9,14 @@ import com.azure.core.management.SystemData; import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentity; -import com.azure.resourcemanager.machinelearning.models.OnlineEndpointDetails; +import com.azure.resourcemanager.machinelearning.models.OnlineEndpointProperties; import com.azure.resourcemanager.machinelearning.models.Sku; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; -/** The OnlineEndpointData model. */ +/** The OnlineEndpoint model. */ @Fluent -public final class OnlineEndpointDataInner extends Resource { +public final class OnlineEndpointInner extends Resource { /* * Managed service identity (system assigned and/or user assigned * identities) @@ -35,7 +35,7 @@ public final class OnlineEndpointDataInner extends Resource { * [Required] Additional attributes of the entity. */ @JsonProperty(value = "properties", required = true) - private OnlineEndpointDetails properties; + private OnlineEndpointProperties properties; /* * Sku details required for ARM contract for Autoscaling. @@ -63,9 +63,9 @@ public ManagedServiceIdentity identity() { * Set the identity property: Managed service identity (system assigned and/or user assigned identities). * * @param identity the identity value to set. - * @return the OnlineEndpointDataInner object itself. + * @return the OnlineEndpointInner object itself. */ - public OnlineEndpointDataInner withIdentity(ManagedServiceIdentity identity) { + public OnlineEndpointInner withIdentity(ManagedServiceIdentity identity) { this.identity = identity; return this; } @@ -85,9 +85,9 @@ public String kind() { * the same type. * * @param kind the kind value to set. - * @return the OnlineEndpointDataInner object itself. + * @return the OnlineEndpointInner object itself. */ - public OnlineEndpointDataInner withKind(String kind) { + public OnlineEndpointInner withKind(String kind) { this.kind = kind; return this; } @@ -97,7 +97,7 @@ public OnlineEndpointDataInner withKind(String kind) { * * @return the properties value. */ - public OnlineEndpointDetails properties() { + public OnlineEndpointProperties properties() { return this.properties; } @@ -105,9 +105,9 @@ public OnlineEndpointDetails properties() { * Set the properties property: [Required] Additional attributes of the entity. * * @param properties the properties value to set. - * @return the OnlineEndpointDataInner object itself. + * @return the OnlineEndpointInner object itself. */ - public OnlineEndpointDataInner withProperties(OnlineEndpointDetails properties) { + public OnlineEndpointInner withProperties(OnlineEndpointProperties properties) { this.properties = properties; return this; } @@ -125,9 +125,9 @@ public Sku sku() { * Set the sku property: Sku details required for ARM contract for Autoscaling. * * @param sku the sku value to set. - * @return the OnlineEndpointDataInner object itself. + * @return the OnlineEndpointInner object itself. */ - public OnlineEndpointDataInner withSku(Sku sku) { + public OnlineEndpointInner withSku(Sku sku) { this.sku = sku; return this; } @@ -143,14 +143,14 @@ public SystemData systemData() { /** {@inheritDoc} */ @Override - public OnlineEndpointDataInner withLocation(String location) { + public OnlineEndpointInner withLocation(String location) { super.withLocation(location); return this; } /** {@inheritDoc} */ @Override - public OnlineEndpointDataInner withTags(Map tags) { + public OnlineEndpointInner withTags(Map tags) { super.withTags(tags); return this; } @@ -167,8 +167,7 @@ public void validate() { if (properties() == null) { throw LOGGER .logExceptionAsError( - new IllegalArgumentException( - "Missing required property properties in model OnlineEndpointDataInner")); + new IllegalArgumentException("Missing required property properties in model OnlineEndpointInner")); } else { properties().validate(); } @@ -177,5 +176,5 @@ public void validate() { } } - private static final ClientLogger LOGGER = new ClientLogger(OnlineEndpointDataInner.class); + private static final ClientLogger LOGGER = new ClientLogger(OnlineEndpointInner.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/WorkspaceConnectionInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/WorkspaceConnectionInner.java deleted file mode 100644 index 29a2eba2110c..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/WorkspaceConnectionInner.java +++ /dev/null @@ -1,172 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.fluent.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.management.ProxyResource; -import com.azure.core.management.SystemData; -import com.azure.resourcemanager.machinelearning.models.ValueFormat; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** Workspace connection. */ -@Fluent -public final class WorkspaceConnectionInner extends ProxyResource { - /* - * Properties of workspace connection. - */ - @JsonProperty(value = "properties") - private WorkspaceConnectionProps innerProperties; - - /* - * Azure Resource Manager metadata containing createdBy and modifiedBy - * information. - */ - @JsonProperty(value = "systemData", access = JsonProperty.Access.WRITE_ONLY) - private SystemData systemData; - - /** - * Get the innerProperties property: Properties of workspace connection. - * - * @return the innerProperties value. - */ - private WorkspaceConnectionProps innerProperties() { - return this.innerProperties; - } - - /** - * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. - * - * @return the systemData value. - */ - public SystemData systemData() { - return this.systemData; - } - - /** - * Get the category property: Category of the workspace connection. - * - * @return the category value. - */ - public String category() { - return this.innerProperties() == null ? null : this.innerProperties().category(); - } - - /** - * Set the category property: Category of the workspace connection. - * - * @param category the category value to set. - * @return the WorkspaceConnectionInner object itself. - */ - public WorkspaceConnectionInner withCategory(String category) { - if (this.innerProperties() == null) { - this.innerProperties = new WorkspaceConnectionProps(); - } - this.innerProperties().withCategory(category); - return this; - } - - /** - * Get the target property: Target of the workspace connection. - * - * @return the target value. - */ - public String target() { - return this.innerProperties() == null ? null : this.innerProperties().target(); - } - - /** - * Set the target property: Target of the workspace connection. - * - * @param target the target value to set. - * @return the WorkspaceConnectionInner object itself. - */ - public WorkspaceConnectionInner withTarget(String target) { - if (this.innerProperties() == null) { - this.innerProperties = new WorkspaceConnectionProps(); - } - this.innerProperties().withTarget(target); - return this; - } - - /** - * Get the authType property: Authorization type of the workspace connection. - * - * @return the authType value. - */ - public String authType() { - return this.innerProperties() == null ? null : this.innerProperties().authType(); - } - - /** - * Set the authType property: Authorization type of the workspace connection. - * - * @param authType the authType value to set. - * @return the WorkspaceConnectionInner object itself. - */ - public WorkspaceConnectionInner withAuthType(String authType) { - if (this.innerProperties() == null) { - this.innerProperties = new WorkspaceConnectionProps(); - } - this.innerProperties().withAuthType(authType); - return this; - } - - /** - * Get the value property: Value details of the workspace connection. - * - * @return the value value. - */ - public String value() { - return this.innerProperties() == null ? null : this.innerProperties().value(); - } - - /** - * Set the value property: Value details of the workspace connection. - * - * @param value the value value to set. - * @return the WorkspaceConnectionInner object itself. - */ - public WorkspaceConnectionInner withValue(String value) { - if (this.innerProperties() == null) { - this.innerProperties = new WorkspaceConnectionProps(); - } - this.innerProperties().withValue(value); - return this; - } - - /** - * Get the valueFormat property: format for the workspace connection value. - * - * @return the valueFormat value. - */ - public ValueFormat valueFormat() { - return this.innerProperties() == null ? null : this.innerProperties().valueFormat(); - } - - /** - * Set the valueFormat property: format for the workspace connection value. - * - * @param valueFormat the valueFormat value to set. - * @return the WorkspaceConnectionInner object itself. - */ - public WorkspaceConnectionInner withValueFormat(ValueFormat valueFormat) { - if (this.innerProperties() == null) { - this.innerProperties = new WorkspaceConnectionProps(); - } - this.innerProperties().withValueFormat(valueFormat); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (innerProperties() != null) { - innerProperties().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/WorkspaceConnectionPropertiesV2BasicResourceInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/WorkspaceConnectionPropertiesV2BasicResourceInner.java new file mode 100644 index 000000000000..5e934dc9cc55 --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/WorkspaceConnectionPropertiesV2BasicResourceInner.java @@ -0,0 +1,79 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.fluent.models; + +import com.azure.core.annotation.Fluent; +import com.azure.core.management.ProxyResource; +import com.azure.core.management.SystemData; +import com.azure.core.util.logging.ClientLogger; +import com.azure.resourcemanager.machinelearning.models.WorkspaceConnectionPropertiesV2; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** The WorkspaceConnectionPropertiesV2BasicResource model. */ +@Fluent +public final class WorkspaceConnectionPropertiesV2BasicResourceInner extends ProxyResource { + /* + * The properties property. + */ + @JsonProperty(value = "properties", required = true) + private WorkspaceConnectionPropertiesV2 properties; + + /* + * Azure Resource Manager metadata containing createdBy and modifiedBy + * information. + */ + @JsonProperty(value = "systemData", access = JsonProperty.Access.WRITE_ONLY) + private SystemData systemData; + + /** + * Get the properties property: The properties property. + * + * @return the properties value. + */ + public WorkspaceConnectionPropertiesV2 properties() { + return this.properties; + } + + /** + * Set the properties property: The properties property. + * + * @param properties the properties value to set. + * @return the WorkspaceConnectionPropertiesV2BasicResourceInner object itself. + */ + public WorkspaceConnectionPropertiesV2BasicResourceInner withProperties( + WorkspaceConnectionPropertiesV2 properties) { + this.properties = properties; + return this; + } + + /** + * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. + * + * @return the systemData value. + */ + public SystemData systemData() { + return this.systemData; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + public void validate() { + if (properties() == null) { + throw LOGGER + .logExceptionAsError( + new IllegalArgumentException( + "Missing required property properties in model" + + " WorkspaceConnectionPropertiesV2BasicResourceInner")); + } else { + properties().validate(); + } + } + + private static final ClientLogger LOGGER = + new ClientLogger(WorkspaceConnectionPropertiesV2BasicResourceInner.class); +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/WorkspaceInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/WorkspaceInner.java index dccf0f29f1b6..7848f61bb4a5 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/WorkspaceInner.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/WorkspaceInner.java @@ -601,6 +601,31 @@ public String mlFlowTrackingUri() { return this.innerProperties() == null ? null : this.innerProperties().mlFlowTrackingUri(); } + /** + * Get the v1LegacyMode property: Enabling v1_legacy_mode may prevent you from using features provided by the v2 + * API. + * + * @return the v1LegacyMode value. + */ + public Boolean v1LegacyMode() { + return this.innerProperties() == null ? null : this.innerProperties().v1LegacyMode(); + } + + /** + * Set the v1LegacyMode property: Enabling v1_legacy_mode may prevent you from using features provided by the v2 + * API. + * + * @param v1LegacyMode the v1LegacyMode value to set. + * @return the WorkspaceInner object itself. + */ + public WorkspaceInner withV1LegacyMode(Boolean v1LegacyMode) { + if (this.innerProperties() == null) { + this.innerProperties = new WorkspacePropertiesInner(); + } + this.innerProperties().withV1LegacyMode(v1LegacyMode); + return this; + } + /** * Validates the instance. * diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/WorkspacePropertiesInner.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/WorkspacePropertiesInner.java index afc399e84a5b..8216f3f4308e 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/WorkspacePropertiesInner.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/WorkspacePropertiesInner.java @@ -169,6 +169,13 @@ public final class WorkspacePropertiesInner { @JsonProperty(value = "mlFlowTrackingUri", access = JsonProperty.Access.WRITE_ONLY) private String mlFlowTrackingUri; + /* + * Enabling v1_legacy_mode may prevent you from using features provided by + * the v2 API. + */ + @JsonProperty(value = "v1LegacyMode") + private Boolean v1LegacyMode; + /** * Get the workspaceId property: The immutable id associated with this workspace. * @@ -568,6 +575,28 @@ public String mlFlowTrackingUri() { return this.mlFlowTrackingUri; } + /** + * Get the v1LegacyMode property: Enabling v1_legacy_mode may prevent you from using features provided by the v2 + * API. + * + * @return the v1LegacyMode value. + */ + public Boolean v1LegacyMode() { + return this.v1LegacyMode; + } + + /** + * Set the v1LegacyMode property: Enabling v1_legacy_mode may prevent you from using features provided by the v2 + * API. + * + * @param v1LegacyMode the v1LegacyMode value to set. + * @return the WorkspacePropertiesInner object itself. + */ + public WorkspacePropertiesInner withV1LegacyMode(Boolean v1LegacyMode) { + this.v1LegacyMode = v1LegacyMode; + return this; + } + /** * Validates the instance. * diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/AzureMachineLearningWorkspacesImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/AzureMachineLearningWorkspacesImpl.java index e40efd2bb575..347ea78ea155 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/AzureMachineLearningWorkspacesImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/AzureMachineLearningWorkspacesImpl.java @@ -467,7 +467,7 @@ public WorkspaceFeaturesClient getWorkspaceFeatures() { this.defaultPollInterval = defaultPollInterval; this.subscriptionId = subscriptionId; this.endpoint = endpoint; - this.apiVersion = "2022-02-01-preview"; + this.apiVersion = "2022-05-01"; this.operations = new OperationsClientImpl(this); this.workspaces = new WorkspacesClientImpl(this); this.usages = new UsagesClientImpl(this); diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchDeploymentDataImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchDeploymentImpl.java similarity index 71% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchDeploymentDataImpl.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchDeploymentImpl.java index fe5494f08928..379a98ca04ce 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchDeploymentDataImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchDeploymentImpl.java @@ -7,21 +7,18 @@ import com.azure.core.management.Region; import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.BatchDeploymentDataInner; -import com.azure.resourcemanager.machinelearning.models.BatchDeploymentData; -import com.azure.resourcemanager.machinelearning.models.BatchDeploymentDetails; +import com.azure.resourcemanager.machinelearning.fluent.models.BatchDeploymentInner; +import com.azure.resourcemanager.machinelearning.models.BatchDeployment; +import com.azure.resourcemanager.machinelearning.models.BatchDeploymentProperties; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentity; import com.azure.resourcemanager.machinelearning.models.PartialBatchDeployment; -import com.azure.resourcemanager.machinelearning.models.PartialBatchDeploymentPartialTrackedResource; -import com.azure.resourcemanager.machinelearning.models.PartialManagedServiceIdentity; -import com.azure.resourcemanager.machinelearning.models.PartialSku; +import com.azure.resourcemanager.machinelearning.models.PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties; import com.azure.resourcemanager.machinelearning.models.Sku; import java.util.Collections; import java.util.Map; -public final class BatchDeploymentDataImpl - implements BatchDeploymentData, BatchDeploymentData.Definition, BatchDeploymentData.Update { - private BatchDeploymentDataInner innerObject; +public final class BatchDeploymentImpl implements BatchDeployment, BatchDeployment.Definition, BatchDeployment.Update { + private BatchDeploymentInner innerObject; private final com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager; @@ -58,7 +55,7 @@ public String kind() { return this.innerModel().kind(); } - public BatchDeploymentDetails properties() { + public BatchDeploymentProperties properties() { return this.innerModel().properties(); } @@ -82,7 +79,7 @@ public String resourceGroupName() { return resourceGroupName; } - public BatchDeploymentDataInner innerModel() { + public BatchDeploymentInner innerModel() { return this.innerObject; } @@ -98,9 +95,9 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager private String deploymentName; - private PartialBatchDeploymentPartialTrackedResource updateBody; + private PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties updateBody; - public BatchDeploymentDataImpl withExistingBatchEndpoint( + public BatchDeploymentImpl withExistingBatchEndpoint( String resourceGroupName, String workspaceName, String endpointName) { this.resourceGroupName = resourceGroupName; this.workspaceName = workspaceName; @@ -108,7 +105,7 @@ public BatchDeploymentDataImpl withExistingBatchEndpoint( return this; } - public BatchDeploymentData create() { + public BatchDeployment create() { this.innerObject = serviceManager .serviceClient() @@ -118,7 +115,7 @@ public BatchDeploymentData create() { return this; } - public BatchDeploymentData create(Context context) { + public BatchDeployment create(Context context) { this.innerObject = serviceManager .serviceClient() @@ -128,19 +125,18 @@ public BatchDeploymentData create(Context context) { return this; } - BatchDeploymentDataImpl( - String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { - this.innerObject = new BatchDeploymentDataInner(); + BatchDeploymentImpl(String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { + this.innerObject = new BatchDeploymentInner(); this.serviceManager = serviceManager; this.deploymentName = name; } - public BatchDeploymentDataImpl update() { - this.updateBody = new PartialBatchDeploymentPartialTrackedResource(); + public BatchDeploymentImpl update() { + this.updateBody = new PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties(); return this; } - public BatchDeploymentData apply() { + public BatchDeployment apply() { this.innerObject = serviceManager .serviceClient() @@ -149,7 +145,7 @@ public BatchDeploymentData apply() { return this; } - public BatchDeploymentData apply(Context context) { + public BatchDeployment apply(Context context) { this.innerObject = serviceManager .serviceClient() @@ -158,8 +154,8 @@ public BatchDeploymentData apply(Context context) { return this; } - BatchDeploymentDataImpl( - BatchDeploymentDataInner innerObject, + BatchDeploymentImpl( + BatchDeploymentInner innerObject, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { this.innerObject = innerObject; this.serviceManager = serviceManager; @@ -169,7 +165,7 @@ public BatchDeploymentData apply(Context context) { this.deploymentName = Utils.getValueFromIdByName(innerObject.id(), "deployments"); } - public BatchDeploymentData refresh() { + public BatchDeployment refresh() { this.innerObject = serviceManager .serviceClient() @@ -179,7 +175,7 @@ public BatchDeploymentData refresh() { return this; } - public BatchDeploymentData refresh(Context context) { + public BatchDeployment refresh(Context context) { this.innerObject = serviceManager .serviceClient() @@ -189,22 +185,22 @@ public BatchDeploymentData refresh(Context context) { return this; } - public BatchDeploymentDataImpl withRegion(Region location) { + public BatchDeploymentImpl withRegion(Region location) { this.innerModel().withLocation(location.toString()); return this; } - public BatchDeploymentDataImpl withRegion(String location) { + public BatchDeploymentImpl withRegion(String location) { this.innerModel().withLocation(location); return this; } - public BatchDeploymentDataImpl withProperties(BatchDeploymentDetails properties) { + public BatchDeploymentImpl withProperties(BatchDeploymentProperties properties) { this.innerModel().withProperties(properties); return this; } - public BatchDeploymentDataImpl withTags(Map tags) { + public BatchDeploymentImpl withTags(Map tags) { if (isInCreateMode()) { this.innerModel().withTags(tags); return this; @@ -214,41 +210,26 @@ public BatchDeploymentDataImpl withTags(Map tags) { } } - public BatchDeploymentDataImpl withIdentity(ManagedServiceIdentity identity) { + public BatchDeploymentImpl withIdentity(ManagedServiceIdentity identity) { this.innerModel().withIdentity(identity); return this; } - public BatchDeploymentDataImpl withKind(String kind) { - if (isInCreateMode()) { - this.innerModel().withKind(kind); - return this; - } else { - this.updateBody.withKind(kind); - return this; - } - } - - public BatchDeploymentDataImpl withSku(Sku sku) { - this.innerModel().withSku(sku); + public BatchDeploymentImpl withKind(String kind) { + this.innerModel().withKind(kind); return this; } - public BatchDeploymentDataImpl withIdentity(PartialManagedServiceIdentity identity) { - this.updateBody.withIdentity(identity); + public BatchDeploymentImpl withSku(Sku sku) { + this.innerModel().withSku(sku); return this; } - public BatchDeploymentDataImpl withProperties(PartialBatchDeployment properties) { + public BatchDeploymentImpl withProperties(PartialBatchDeployment properties) { this.updateBody.withProperties(properties); return this; } - public BatchDeploymentDataImpl withSku(PartialSku sku) { - this.updateBody.withSku(sku); - return this; - } - private boolean isInCreateMode() { return this.innerModel().id() == null; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchDeploymentsClientImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchDeploymentsClientImpl.java index 6986819a12fe..ebcc86624e73 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchDeploymentsClientImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchDeploymentsClientImpl.java @@ -33,9 +33,9 @@ import com.azure.core.util.polling.PollerFlux; import com.azure.core.util.polling.SyncPoller; import com.azure.resourcemanager.machinelearning.fluent.BatchDeploymentsClient; -import com.azure.resourcemanager.machinelearning.fluent.models.BatchDeploymentDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.BatchDeploymentInner; import com.azure.resourcemanager.machinelearning.models.BatchDeploymentTrackedResourceArmPaginatedResult; -import com.azure.resourcemanager.machinelearning.models.PartialBatchDeploymentPartialTrackedResource; +import com.azure.resourcemanager.machinelearning.models.PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties; import java.nio.ByteBuffer; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -111,7 +111,7 @@ Mono>> delete( + "/deployments/{deploymentName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( + Mono> get( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -137,7 +137,7 @@ Mono>> update( @PathParam("endpointName") String endpointName, @PathParam("deploymentName") String deploymentName, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") PartialBatchDeploymentPartialTrackedResource body, + @BodyParam("application/json") PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties body, @HeaderParam("Accept") String accept, Context context); @@ -156,7 +156,7 @@ Mono>> createOrUpdate( @PathParam("endpointName") String endpointName, @PathParam("deploymentName") String deploymentName, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") BatchDeploymentDataInner body, + @BodyParam("application/json") BatchDeploymentInner body, @HeaderParam("Accept") String accept, Context context); @@ -187,7 +187,7 @@ Mono> listNext( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String endpointName, String orderBy, Integer top, String skip) { if (this.client.getEndpoint() == null) { return Mono @@ -228,7 +228,7 @@ private Mono> listSinglePageAsync( skip, accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -257,7 +257,7 @@ private Mono> listSinglePageAsync( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String endpointName, @@ -328,7 +328,7 @@ private Mono> listSinglePageAsync( * @return a paginated list of BatchDeployment entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String endpointName, String orderBy, Integer top, String skip) { return new PagedFlux<>( () -> listSinglePageAsync(resourceGroupName, workspaceName, endpointName, orderBy, top, skip), @@ -347,7 +347,7 @@ private PagedFlux listAsync( * @return a paginated list of BatchDeployment entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String endpointName) { final String orderBy = null; final Integer top = null; @@ -373,7 +373,7 @@ private PagedFlux listAsync( * @return a paginated list of BatchDeployment entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String endpointName, @@ -398,7 +398,7 @@ private PagedFlux listAsync( * @return a paginated list of BatchDeployment entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String endpointName) { final String orderBy = null; final Integer top = null; @@ -422,7 +422,7 @@ public PagedIterable list( * @return a paginated list of BatchDeployment entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String endpointName, @@ -721,7 +721,7 @@ public void delete( * @return a batch inference deployment by id along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName) { if (this.client.getEndpoint() == null) { return Mono @@ -780,7 +780,7 @@ private Mono> getWithResponseAsync( * @return a batch inference deployment by id along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -835,7 +835,7 @@ private Mono> getWithResponseAsync( * @return a batch inference deployment by id on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getAsync( + private Mono getAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName) { return getWithResponseAsync(resourceGroupName, workspaceName, endpointName, deploymentName) .flatMap(res -> Mono.justOrEmpty(res.getValue())); @@ -854,7 +854,7 @@ private Mono getAsync( * @return a batch inference deployment by id. */ @ServiceMethod(returns = ReturnType.SINGLE) - public BatchDeploymentDataInner get( + public BatchDeploymentInner get( String resourceGroupName, String workspaceName, String endpointName, String deploymentName) { return getAsync(resourceGroupName, workspaceName, endpointName, deploymentName).block(); } @@ -873,7 +873,7 @@ public BatchDeploymentDataInner get( * @return a batch inference deployment by id along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, Context context) { return getWithResponseAsync(resourceGroupName, workspaceName, endpointName, deploymentName, context).block(); } @@ -897,7 +897,7 @@ private Mono>> updateWithResponseAsync( String workspaceName, String endpointName, String deploymentName, - PartialBatchDeploymentPartialTrackedResource body) { + PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties body) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -967,7 +967,7 @@ private Mono>> updateWithResponseAsync( String workspaceName, String endpointName, String deploymentName, - PartialBatchDeploymentPartialTrackedResource body, + PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties body, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -1029,21 +1029,21 @@ private Mono>> updateWithResponseAsync( * @return the {@link PollerFlux} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, BatchDeploymentDataInner> beginUpdateAsync( + private PollerFlux, BatchDeploymentInner> beginUpdateAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialBatchDeploymentPartialTrackedResource body) { + PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties body) { Mono>> mono = updateWithResponseAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body); return this .client - .getLroResult( + .getLroResult( mono, this.client.getHttpPipeline(), - BatchDeploymentDataInner.class, - BatchDeploymentDataInner.class, + BatchDeploymentInner.class, + BatchDeploymentInner.class, this.client.getContext()); } @@ -1062,24 +1062,20 @@ private PollerFlux, BatchDeploymentDataInne * @return the {@link PollerFlux} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, BatchDeploymentDataInner> beginUpdateAsync( + private PollerFlux, BatchDeploymentInner> beginUpdateAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialBatchDeploymentPartialTrackedResource body, + PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties body, Context context) { context = this.client.mergeContext(context); Mono>> mono = updateWithResponseAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body, context); return this .client - .getLroResult( - mono, - this.client.getHttpPipeline(), - BatchDeploymentDataInner.class, - BatchDeploymentDataInner.class, - context); + .getLroResult( + mono, this.client.getHttpPipeline(), BatchDeploymentInner.class, BatchDeploymentInner.class, context); } /** @@ -1096,12 +1092,12 @@ private PollerFlux, BatchDeploymentDataInne * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, BatchDeploymentDataInner> beginUpdate( + public SyncPoller, BatchDeploymentInner> beginUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialBatchDeploymentPartialTrackedResource body) { + PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties body) { return beginUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body).getSyncPoller(); } @@ -1120,12 +1116,12 @@ public SyncPoller, BatchDeploymentDataInner * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, BatchDeploymentDataInner> beginUpdate( + public SyncPoller, BatchDeploymentInner> beginUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialBatchDeploymentPartialTrackedResource body, + PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties body, Context context) { return beginUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body, context) .getSyncPoller(); @@ -1145,12 +1141,12 @@ public SyncPoller, BatchDeploymentDataInner * @return the response body on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono updateAsync( + private Mono updateAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialBatchDeploymentPartialTrackedResource body) { + PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties body) { return beginUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body) .last() .flatMap(this.client::getLroFinalResultOrError); @@ -1171,12 +1167,12 @@ private Mono updateAsync( * @return the response body on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono updateAsync( + private Mono updateAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialBatchDeploymentPartialTrackedResource body, + PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties body, Context context) { return beginUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body, context) .last() @@ -1197,12 +1193,12 @@ private Mono updateAsync( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public BatchDeploymentDataInner update( + public BatchDeploymentInner update( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialBatchDeploymentPartialTrackedResource body) { + PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties body) { return updateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body).block(); } @@ -1221,12 +1217,12 @@ public BatchDeploymentDataInner update( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public BatchDeploymentDataInner update( + public BatchDeploymentInner update( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialBatchDeploymentPartialTrackedResource body, + PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties body, Context context) { return updateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body, context).block(); } @@ -1250,7 +1246,7 @@ private Mono>> createOrUpdateWithResponseAsync( String workspaceName, String endpointName, String deploymentName, - BatchDeploymentDataInner body) { + BatchDeploymentInner body) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -1320,7 +1316,7 @@ private Mono>> createOrUpdateWithResponseAsync( String workspaceName, String endpointName, String deploymentName, - BatchDeploymentDataInner body, + BatchDeploymentInner body, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -1382,21 +1378,21 @@ private Mono>> createOrUpdateWithResponseAsync( * @return the {@link PollerFlux} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, BatchDeploymentDataInner> beginCreateOrUpdateAsync( + private PollerFlux, BatchDeploymentInner> beginCreateOrUpdateAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - BatchDeploymentDataInner body) { + BatchDeploymentInner body) { Mono>> mono = createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body); return this .client - .getLroResult( + .getLroResult( mono, this.client.getHttpPipeline(), - BatchDeploymentDataInner.class, - BatchDeploymentDataInner.class, + BatchDeploymentInner.class, + BatchDeploymentInner.class, this.client.getContext()); } @@ -1415,12 +1411,12 @@ private PollerFlux, BatchDeploymentDataInne * @return the {@link PollerFlux} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, BatchDeploymentDataInner> beginCreateOrUpdateAsync( + private PollerFlux, BatchDeploymentInner> beginCreateOrUpdateAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - BatchDeploymentDataInner body, + BatchDeploymentInner body, Context context) { context = this.client.mergeContext(context); Mono>> mono = @@ -1428,12 +1424,8 @@ private PollerFlux, BatchDeploymentDataInne resourceGroupName, workspaceName, endpointName, deploymentName, body, context); return this .client - .getLroResult( - mono, - this.client.getHttpPipeline(), - BatchDeploymentDataInner.class, - BatchDeploymentDataInner.class, - context); + .getLroResult( + mono, this.client.getHttpPipeline(), BatchDeploymentInner.class, BatchDeploymentInner.class, context); } /** @@ -1450,12 +1442,12 @@ private PollerFlux, BatchDeploymentDataInne * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, BatchDeploymentDataInner> beginCreateOrUpdate( + public SyncPoller, BatchDeploymentInner> beginCreateOrUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - BatchDeploymentDataInner body) { + BatchDeploymentInner body) { return beginCreateOrUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body) .getSyncPoller(); } @@ -1475,12 +1467,12 @@ public SyncPoller, BatchDeploymentDataInner * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, BatchDeploymentDataInner> beginCreateOrUpdate( + public SyncPoller, BatchDeploymentInner> beginCreateOrUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - BatchDeploymentDataInner body, + BatchDeploymentInner body, Context context) { return beginCreateOrUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body, context) .getSyncPoller(); @@ -1500,12 +1492,12 @@ public SyncPoller, BatchDeploymentDataInner * @return the response body on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( + private Mono createOrUpdateAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - BatchDeploymentDataInner body) { + BatchDeploymentInner body) { return beginCreateOrUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body) .last() .flatMap(this.client::getLroFinalResultOrError); @@ -1526,12 +1518,12 @@ private Mono createOrUpdateAsync( * @return the response body on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( + private Mono createOrUpdateAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - BatchDeploymentDataInner body, + BatchDeploymentInner body, Context context) { return beginCreateOrUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body, context) .last() @@ -1552,12 +1544,12 @@ private Mono createOrUpdateAsync( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public BatchDeploymentDataInner createOrUpdate( + public BatchDeploymentInner createOrUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - BatchDeploymentDataInner body) { + BatchDeploymentInner body) { return createOrUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body).block(); } @@ -1576,12 +1568,12 @@ public BatchDeploymentDataInner createOrUpdate( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public BatchDeploymentDataInner createOrUpdate( + public BatchDeploymentInner createOrUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - BatchDeploymentDataInner body, + BatchDeploymentInner body, Context context) { return createOrUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body, context) .block(); @@ -1598,7 +1590,7 @@ public BatchDeploymentDataInner createOrUpdate( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink) { + private Mono> listNextSinglePageAsync(String nextLink) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } @@ -1611,7 +1603,7 @@ private Mono> listNextSinglePageAsync(St final String accept = "application/json"; return FluxUtil .withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -1635,7 +1627,7 @@ private Mono> listNextSinglePageAsync(St * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink, Context context) { + private Mono> listNextSinglePageAsync(String nextLink, Context context) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchDeploymentsImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchDeploymentsImpl.java index 0432be7ce8f1..6042e7100995 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchDeploymentsImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchDeploymentsImpl.java @@ -10,8 +10,8 @@ import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.machinelearning.fluent.BatchDeploymentsClient; -import com.azure.resourcemanager.machinelearning.fluent.models.BatchDeploymentDataInner; -import com.azure.resourcemanager.machinelearning.models.BatchDeploymentData; +import com.azure.resourcemanager.machinelearning.fluent.models.BatchDeploymentInner; +import com.azure.resourcemanager.machinelearning.models.BatchDeployment; import com.azure.resourcemanager.machinelearning.models.BatchDeployments; public final class BatchDeploymentsImpl implements BatchDeployments { @@ -28,14 +28,13 @@ public BatchDeploymentsImpl( this.serviceManager = serviceManager; } - public PagedIterable list( - String resourceGroupName, String workspaceName, String endpointName) { - PagedIterable inner = + public PagedIterable list(String resourceGroupName, String workspaceName, String endpointName) { + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName, endpointName); - return Utils.mapPage(inner, inner1 -> new BatchDeploymentDataImpl(inner1, this.manager())); + return Utils.mapPage(inner, inner1 -> new BatchDeploymentImpl(inner1, this.manager())); } - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String endpointName, @@ -43,9 +42,9 @@ public PagedIterable list( Integer top, String skip, Context context) { - PagedIterable inner = + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName, endpointName, orderBy, top, skip, context); - return Utils.mapPage(inner, inner1 -> new BatchDeploymentDataImpl(inner1, this.manager())); + return Utils.mapPage(inner, inner1 -> new BatchDeploymentImpl(inner1, this.manager())); } public void delete(String resourceGroupName, String workspaceName, String endpointName, String deploymentName) { @@ -57,20 +56,20 @@ public void delete( this.serviceClient().delete(resourceGroupName, workspaceName, endpointName, deploymentName, context); } - public BatchDeploymentData get( + public BatchDeployment get( String resourceGroupName, String workspaceName, String endpointName, String deploymentName) { - BatchDeploymentDataInner inner = + BatchDeploymentInner inner = this.serviceClient().get(resourceGroupName, workspaceName, endpointName, deploymentName); if (inner != null) { - return new BatchDeploymentDataImpl(inner, this.manager()); + return new BatchDeploymentImpl(inner, this.manager()); } else { return null; } } - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, Context context) { - Response inner = + Response inner = this .serviceClient() .getWithResponse(resourceGroupName, workspaceName, endpointName, deploymentName, context); @@ -79,13 +78,13 @@ public Response getWithResponse( inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new BatchDeploymentDataImpl(inner.getValue(), this.manager())); + new BatchDeploymentImpl(inner.getValue(), this.manager())); } else { return null; } } - public BatchDeploymentData getById(String id) { + public BatchDeployment getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -121,7 +120,7 @@ public BatchDeploymentData getById(String id) { .getValue(); } - public Response getByIdWithResponse(String id, Context context) { + public Response getByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -231,7 +230,7 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager return this.serviceManager; } - public BatchDeploymentDataImpl define(String name) { - return new BatchDeploymentDataImpl(name, this.manager()); + public BatchDeploymentImpl define(String name) { + return new BatchDeploymentImpl(name, this.manager()); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchEndpointDataImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchEndpointImpl.java similarity index 70% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchEndpointDataImpl.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchEndpointImpl.java index 518a953f8c0d..2abf63af55e9 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchEndpointDataImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchEndpointImpl.java @@ -7,22 +7,19 @@ import com.azure.core.http.rest.Response; import com.azure.core.management.Region; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.BatchEndpointDataInner; -import com.azure.resourcemanager.machinelearning.models.BatchEndpointData; -import com.azure.resourcemanager.machinelearning.models.BatchEndpointDetails; +import com.azure.resourcemanager.machinelearning.fluent.models.BatchEndpointInner; +import com.azure.resourcemanager.machinelearning.models.BatchEndpoint; +import com.azure.resourcemanager.machinelearning.models.BatchEndpointProperties; import com.azure.resourcemanager.machinelearning.models.EndpointAuthKeys; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentity; -import com.azure.resourcemanager.machinelearning.models.PartialBatchEndpoint; -import com.azure.resourcemanager.machinelearning.models.PartialBatchEndpointPartialTrackedResource; import com.azure.resourcemanager.machinelearning.models.PartialManagedServiceIdentity; -import com.azure.resourcemanager.machinelearning.models.PartialSku; +import com.azure.resourcemanager.machinelearning.models.PartialMinimalTrackedResourceWithIdentity; import com.azure.resourcemanager.machinelearning.models.Sku; import java.util.Collections; import java.util.Map; -public final class BatchEndpointDataImpl - implements BatchEndpointData, BatchEndpointData.Definition, BatchEndpointData.Update { - private BatchEndpointDataInner innerObject; +public final class BatchEndpointImpl implements BatchEndpoint, BatchEndpoint.Definition, BatchEndpoint.Update { + private BatchEndpointInner innerObject; private final com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager; @@ -59,7 +56,7 @@ public String kind() { return this.innerModel().kind(); } - public BatchEndpointDetails properties() { + public BatchEndpointProperties properties() { return this.innerModel().properties(); } @@ -79,7 +76,7 @@ public String resourceGroupName() { return resourceGroupName; } - public BatchEndpointDataInner innerModel() { + public BatchEndpointInner innerModel() { return this.innerObject; } @@ -93,15 +90,15 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager private String endpointName; - private PartialBatchEndpointPartialTrackedResource updateBody; + private PartialMinimalTrackedResourceWithIdentity updateBody; - public BatchEndpointDataImpl withExistingWorkspace(String resourceGroupName, String workspaceName) { + public BatchEndpointImpl withExistingWorkspace(String resourceGroupName, String workspaceName) { this.resourceGroupName = resourceGroupName; this.workspaceName = workspaceName; return this; } - public BatchEndpointData create() { + public BatchEndpoint create() { this.innerObject = serviceManager .serviceClient() @@ -110,7 +107,7 @@ public BatchEndpointData create() { return this; } - public BatchEndpointData create(Context context) { + public BatchEndpoint create(Context context) { this.innerObject = serviceManager .serviceClient() @@ -119,19 +116,18 @@ public BatchEndpointData create(Context context) { return this; } - BatchEndpointDataImpl( - String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { - this.innerObject = new BatchEndpointDataInner(); + BatchEndpointImpl(String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { + this.innerObject = new BatchEndpointInner(); this.serviceManager = serviceManager; this.endpointName = name; } - public BatchEndpointDataImpl update() { - this.updateBody = new PartialBatchEndpointPartialTrackedResource(); + public BatchEndpointImpl update() { + this.updateBody = new PartialMinimalTrackedResourceWithIdentity(); return this; } - public BatchEndpointData apply() { + public BatchEndpoint apply() { this.innerObject = serviceManager .serviceClient() @@ -140,7 +136,7 @@ public BatchEndpointData apply() { return this; } - public BatchEndpointData apply(Context context) { + public BatchEndpoint apply(Context context) { this.innerObject = serviceManager .serviceClient() @@ -149,8 +145,8 @@ public BatchEndpointData apply(Context context) { return this; } - BatchEndpointDataImpl( - BatchEndpointDataInner innerObject, + BatchEndpointImpl( + BatchEndpointInner innerObject, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { this.innerObject = innerObject; this.serviceManager = serviceManager; @@ -159,7 +155,7 @@ public BatchEndpointData apply(Context context) { this.endpointName = Utils.getValueFromIdByName(innerObject.id(), "batchEndpoints"); } - public BatchEndpointData refresh() { + public BatchEndpoint refresh() { this.innerObject = serviceManager .serviceClient() @@ -169,7 +165,7 @@ public BatchEndpointData refresh() { return this; } - public BatchEndpointData refresh(Context context) { + public BatchEndpoint refresh(Context context) { this.innerObject = serviceManager .serviceClient() @@ -189,22 +185,22 @@ public Response listKeysWithResponse(Context context) { .listKeysWithResponse(resourceGroupName, workspaceName, endpointName, context); } - public BatchEndpointDataImpl withRegion(Region location) { + public BatchEndpointImpl withRegion(Region location) { this.innerModel().withLocation(location.toString()); return this; } - public BatchEndpointDataImpl withRegion(String location) { + public BatchEndpointImpl withRegion(String location) { this.innerModel().withLocation(location); return this; } - public BatchEndpointDataImpl withProperties(BatchEndpointDetails properties) { + public BatchEndpointImpl withProperties(BatchEndpointProperties properties) { this.innerModel().withProperties(properties); return this; } - public BatchEndpointDataImpl withTags(Map tags) { + public BatchEndpointImpl withTags(Map tags) { if (isInCreateMode()) { this.innerModel().withTags(tags); return this; @@ -214,41 +210,26 @@ public BatchEndpointDataImpl withTags(Map tags) { } } - public BatchEndpointDataImpl withIdentity(ManagedServiceIdentity identity) { + public BatchEndpointImpl withIdentity(ManagedServiceIdentity identity) { this.innerModel().withIdentity(identity); return this; } - public BatchEndpointDataImpl withKind(String kind) { - if (isInCreateMode()) { - this.innerModel().withKind(kind); - return this; - } else { - this.updateBody.withKind(kind); - return this; - } + public BatchEndpointImpl withKind(String kind) { + this.innerModel().withKind(kind); + return this; } - public BatchEndpointDataImpl withSku(Sku sku) { + public BatchEndpointImpl withSku(Sku sku) { this.innerModel().withSku(sku); return this; } - public BatchEndpointDataImpl withIdentity(PartialManagedServiceIdentity identity) { + public BatchEndpointImpl withIdentity(PartialManagedServiceIdentity identity) { this.updateBody.withIdentity(identity); return this; } - public BatchEndpointDataImpl withProperties(PartialBatchEndpoint properties) { - this.updateBody.withProperties(properties); - return this; - } - - public BatchEndpointDataImpl withSku(PartialSku sku) { - this.updateBody.withSku(sku); - return this; - } - private boolean isInCreateMode() { return this.innerModel().id() == null; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchEndpointsClientImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchEndpointsClientImpl.java index 31905c31d7ab..b82c7f16d00f 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchEndpointsClientImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchEndpointsClientImpl.java @@ -34,10 +34,10 @@ import com.azure.core.util.polling.PollerFlux; import com.azure.core.util.polling.SyncPoller; import com.azure.resourcemanager.machinelearning.fluent.BatchEndpointsClient; -import com.azure.resourcemanager.machinelearning.fluent.models.BatchEndpointDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.BatchEndpointInner; import com.azure.resourcemanager.machinelearning.fluent.models.EndpointAuthKeysInner; import com.azure.resourcemanager.machinelearning.models.BatchEndpointTrackedResourceArmPaginatedResult; -import com.azure.resourcemanager.machinelearning.models.PartialBatchEndpointPartialTrackedResource; +import com.azure.resourcemanager.machinelearning.models.PartialMinimalTrackedResourceWithIdentity; import java.nio.ByteBuffer; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -107,7 +107,7 @@ Mono>> delete( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/batchEndpoints/{endpointName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( + Mono> get( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -130,7 +130,7 @@ Mono>> update( @PathParam("workspaceName") String workspaceName, @PathParam("endpointName") String endpointName, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") PartialBatchEndpointPartialTrackedResource body, + @BodyParam("application/json") PartialMinimalTrackedResourceWithIdentity body, @HeaderParam("Accept") String accept, Context context); @@ -147,7 +147,7 @@ Mono>> createOrUpdate( @PathParam("workspaceName") String workspaceName, @PathParam("endpointName") String endpointName, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") BatchEndpointDataInner body, + @BodyParam("application/json") BatchEndpointInner body, @HeaderParam("Accept") String accept, Context context); @@ -193,7 +193,7 @@ Mono> listNext( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, Integer count, String skip) { if (this.client.getEndpoint() == null) { return Mono @@ -229,7 +229,7 @@ private Mono> listSinglePageAsync( skip, accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -256,7 +256,7 @@ private Mono> listSinglePageAsync( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, Integer count, String skip, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -314,7 +314,7 @@ private Mono> listSinglePageAsync( * @return a paginated list of BatchEndpoint entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, Integer count, String skip) { return new PagedFlux<>( () -> listSinglePageAsync(resourceGroupName, workspaceName, count, skip), @@ -332,7 +332,7 @@ private PagedFlux listAsync( * @return a paginated list of BatchEndpoint entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync(String resourceGroupName, String workspaceName) { + private PagedFlux listAsync(String resourceGroupName, String workspaceName) { final Integer count = null; final String skip = null; return new PagedFlux<>( @@ -354,7 +354,7 @@ private PagedFlux listAsync(String resourceGroupName, St * @return a paginated list of BatchEndpoint entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, Integer count, String skip, Context context) { return new PagedFlux<>( () -> listSinglePageAsync(resourceGroupName, workspaceName, count, skip, context), @@ -372,7 +372,7 @@ private PagedFlux listAsync( * @return a paginated list of BatchEndpoint entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list(String resourceGroupName, String workspaceName) { + public PagedIterable list(String resourceGroupName, String workspaceName) { final Integer count = null; final String skip = null; return new PagedIterable<>(listAsync(resourceGroupName, workspaceName, count, skip)); @@ -392,7 +392,7 @@ public PagedIterable list(String resourceGroupName, Stri * @return a paginated list of BatchEndpoint entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, Integer count, String skip, Context context) { return new PagedIterable<>(listAsync(resourceGroupName, workspaceName, count, skip, context)); } @@ -661,7 +661,7 @@ public void delete(String resourceGroupName, String workspaceName, String endpoi * @return a batch inference endpoint by name along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String endpointName) { if (this.client.getEndpoint() == null) { return Mono @@ -715,7 +715,7 @@ private Mono> getWithResponseAsync( * @return a batch inference endpoint by name along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String endpointName, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -765,7 +765,7 @@ private Mono> getWithResponseAsync( * @return a batch inference endpoint by name on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getAsync(String resourceGroupName, String workspaceName, String endpointName) { + private Mono getAsync(String resourceGroupName, String workspaceName, String endpointName) { return getWithResponseAsync(resourceGroupName, workspaceName, endpointName) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -782,7 +782,7 @@ private Mono getAsync(String resourceGroupName, String w * @return a batch inference endpoint by name. */ @ServiceMethod(returns = ReturnType.SINGLE) - public BatchEndpointDataInner get(String resourceGroupName, String workspaceName, String endpointName) { + public BatchEndpointInner get(String resourceGroupName, String workspaceName, String endpointName) { return getAsync(resourceGroupName, workspaceName, endpointName).block(); } @@ -799,7 +799,7 @@ public BatchEndpointDataInner get(String resourceGroupName, String workspaceName * @return a batch inference endpoint by name along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String endpointName, Context context) { return getWithResponseAsync(resourceGroupName, workspaceName, endpointName, context).block(); } @@ -821,7 +821,7 @@ private Mono>> updateWithResponseAsync( String resourceGroupName, String workspaceName, String endpointName, - PartialBatchEndpointPartialTrackedResource body) { + PartialMinimalTrackedResourceWithIdentity body) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -885,7 +885,7 @@ private Mono>> updateWithResponseAsync( String resourceGroupName, String workspaceName, String endpointName, - PartialBatchEndpointPartialTrackedResource body, + PartialMinimalTrackedResourceWithIdentity body, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -942,20 +942,20 @@ private Mono>> updateWithResponseAsync( * @return the {@link PollerFlux} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, BatchEndpointDataInner> beginUpdateAsync( + private PollerFlux, BatchEndpointInner> beginUpdateAsync( String resourceGroupName, String workspaceName, String endpointName, - PartialBatchEndpointPartialTrackedResource body) { + PartialMinimalTrackedResourceWithIdentity body) { Mono>> mono = updateWithResponseAsync(resourceGroupName, workspaceName, endpointName, body); return this .client - .getLroResult( + .getLroResult( mono, this.client.getHttpPipeline(), - BatchEndpointDataInner.class, - BatchEndpointDataInner.class, + BatchEndpointInner.class, + BatchEndpointInner.class, this.client.getContext()); } @@ -973,23 +973,19 @@ private PollerFlux, BatchEndpointDataInner> b * @return the {@link PollerFlux} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, BatchEndpointDataInner> beginUpdateAsync( + private PollerFlux, BatchEndpointInner> beginUpdateAsync( String resourceGroupName, String workspaceName, String endpointName, - PartialBatchEndpointPartialTrackedResource body, + PartialMinimalTrackedResourceWithIdentity body, Context context) { context = this.client.mergeContext(context); Mono>> mono = updateWithResponseAsync(resourceGroupName, workspaceName, endpointName, body, context); return this .client - .getLroResult( - mono, - this.client.getHttpPipeline(), - BatchEndpointDataInner.class, - BatchEndpointDataInner.class, - context); + .getLroResult( + mono, this.client.getHttpPipeline(), BatchEndpointInner.class, BatchEndpointInner.class, context); } /** @@ -1005,11 +1001,11 @@ private PollerFlux, BatchEndpointDataInner> b * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, BatchEndpointDataInner> beginUpdate( + public SyncPoller, BatchEndpointInner> beginUpdate( String resourceGroupName, String workspaceName, String endpointName, - PartialBatchEndpointPartialTrackedResource body) { + PartialMinimalTrackedResourceWithIdentity body) { return beginUpdateAsync(resourceGroupName, workspaceName, endpointName, body).getSyncPoller(); } @@ -1027,11 +1023,11 @@ public SyncPoller, BatchEndpointDataInner> be * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, BatchEndpointDataInner> beginUpdate( + public SyncPoller, BatchEndpointInner> beginUpdate( String resourceGroupName, String workspaceName, String endpointName, - PartialBatchEndpointPartialTrackedResource body, + PartialMinimalTrackedResourceWithIdentity body, Context context) { return beginUpdateAsync(resourceGroupName, workspaceName, endpointName, body, context).getSyncPoller(); } @@ -1049,11 +1045,11 @@ public SyncPoller, BatchEndpointDataInner> be * @return the response body on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono updateAsync( + private Mono updateAsync( String resourceGroupName, String workspaceName, String endpointName, - PartialBatchEndpointPartialTrackedResource body) { + PartialMinimalTrackedResourceWithIdentity body) { return beginUpdateAsync(resourceGroupName, workspaceName, endpointName, body) .last() .flatMap(this.client::getLroFinalResultOrError); @@ -1073,11 +1069,11 @@ private Mono updateAsync( * @return the response body on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono updateAsync( + private Mono updateAsync( String resourceGroupName, String workspaceName, String endpointName, - PartialBatchEndpointPartialTrackedResource body, + PartialMinimalTrackedResourceWithIdentity body, Context context) { return beginUpdateAsync(resourceGroupName, workspaceName, endpointName, body, context) .last() @@ -1097,11 +1093,11 @@ private Mono updateAsync( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public BatchEndpointDataInner update( + public BatchEndpointInner update( String resourceGroupName, String workspaceName, String endpointName, - PartialBatchEndpointPartialTrackedResource body) { + PartialMinimalTrackedResourceWithIdentity body) { return updateAsync(resourceGroupName, workspaceName, endpointName, body).block(); } @@ -1119,11 +1115,11 @@ public BatchEndpointDataInner update( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public BatchEndpointDataInner update( + public BatchEndpointInner update( String resourceGroupName, String workspaceName, String endpointName, - PartialBatchEndpointPartialTrackedResource body, + PartialMinimalTrackedResourceWithIdentity body, Context context) { return updateAsync(resourceGroupName, workspaceName, endpointName, body, context).block(); } @@ -1142,7 +1138,7 @@ public BatchEndpointDataInner update( */ @ServiceMethod(returns = ReturnType.SINGLE) private Mono>> createOrUpdateWithResponseAsync( - String resourceGroupName, String workspaceName, String endpointName, BatchEndpointDataInner body) { + String resourceGroupName, String workspaceName, String endpointName, BatchEndpointInner body) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -1203,11 +1199,7 @@ private Mono>> createOrUpdateWithResponseAsync( */ @ServiceMethod(returns = ReturnType.SINGLE) private Mono>> createOrUpdateWithResponseAsync( - String resourceGroupName, - String workspaceName, - String endpointName, - BatchEndpointDataInner body, - Context context) { + String resourceGroupName, String workspaceName, String endpointName, BatchEndpointInner body, Context context) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -1263,17 +1255,17 @@ private Mono>> createOrUpdateWithResponseAsync( * @return the {@link PollerFlux} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, BatchEndpointDataInner> beginCreateOrUpdateAsync( - String resourceGroupName, String workspaceName, String endpointName, BatchEndpointDataInner body) { + private PollerFlux, BatchEndpointInner> beginCreateOrUpdateAsync( + String resourceGroupName, String workspaceName, String endpointName, BatchEndpointInner body) { Mono>> mono = createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, endpointName, body); return this .client - .getLroResult( + .getLroResult( mono, this.client.getHttpPipeline(), - BatchEndpointDataInner.class, - BatchEndpointDataInner.class, + BatchEndpointInner.class, + BatchEndpointInner.class, this.client.getContext()); } @@ -1291,23 +1283,15 @@ private PollerFlux, BatchEndpointDataInner> b * @return the {@link PollerFlux} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, BatchEndpointDataInner> beginCreateOrUpdateAsync( - String resourceGroupName, - String workspaceName, - String endpointName, - BatchEndpointDataInner body, - Context context) { + private PollerFlux, BatchEndpointInner> beginCreateOrUpdateAsync( + String resourceGroupName, String workspaceName, String endpointName, BatchEndpointInner body, Context context) { context = this.client.mergeContext(context); Mono>> mono = createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, endpointName, body, context); return this .client - .getLroResult( - mono, - this.client.getHttpPipeline(), - BatchEndpointDataInner.class, - BatchEndpointDataInner.class, - context); + .getLroResult( + mono, this.client.getHttpPipeline(), BatchEndpointInner.class, BatchEndpointInner.class, context); } /** @@ -1323,8 +1307,8 @@ private PollerFlux, BatchEndpointDataInner> b * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, BatchEndpointDataInner> beginCreateOrUpdate( - String resourceGroupName, String workspaceName, String endpointName, BatchEndpointDataInner body) { + public SyncPoller, BatchEndpointInner> beginCreateOrUpdate( + String resourceGroupName, String workspaceName, String endpointName, BatchEndpointInner body) { return beginCreateOrUpdateAsync(resourceGroupName, workspaceName, endpointName, body).getSyncPoller(); } @@ -1342,12 +1326,8 @@ public SyncPoller, BatchEndpointDataInner> be * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, BatchEndpointDataInner> beginCreateOrUpdate( - String resourceGroupName, - String workspaceName, - String endpointName, - BatchEndpointDataInner body, - Context context) { + public SyncPoller, BatchEndpointInner> beginCreateOrUpdate( + String resourceGroupName, String workspaceName, String endpointName, BatchEndpointInner body, Context context) { return beginCreateOrUpdateAsync(resourceGroupName, workspaceName, endpointName, body, context).getSyncPoller(); } @@ -1364,8 +1344,8 @@ public SyncPoller, BatchEndpointDataInner> be * @return the response body on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( - String resourceGroupName, String workspaceName, String endpointName, BatchEndpointDataInner body) { + private Mono createOrUpdateAsync( + String resourceGroupName, String workspaceName, String endpointName, BatchEndpointInner body) { return beginCreateOrUpdateAsync(resourceGroupName, workspaceName, endpointName, body) .last() .flatMap(this.client::getLroFinalResultOrError); @@ -1385,12 +1365,8 @@ private Mono createOrUpdateAsync( * @return the response body on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( - String resourceGroupName, - String workspaceName, - String endpointName, - BatchEndpointDataInner body, - Context context) { + private Mono createOrUpdateAsync( + String resourceGroupName, String workspaceName, String endpointName, BatchEndpointInner body, Context context) { return beginCreateOrUpdateAsync(resourceGroupName, workspaceName, endpointName, body, context) .last() .flatMap(this.client::getLroFinalResultOrError); @@ -1409,8 +1385,8 @@ private Mono createOrUpdateAsync( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public BatchEndpointDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String endpointName, BatchEndpointDataInner body) { + public BatchEndpointInner createOrUpdate( + String resourceGroupName, String workspaceName, String endpointName, BatchEndpointInner body) { return createOrUpdateAsync(resourceGroupName, workspaceName, endpointName, body).block(); } @@ -1428,12 +1404,8 @@ public BatchEndpointDataInner createOrUpdate( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public BatchEndpointDataInner createOrUpdate( - String resourceGroupName, - String workspaceName, - String endpointName, - BatchEndpointDataInner body, - Context context) { + public BatchEndpointInner createOrUpdate( + String resourceGroupName, String workspaceName, String endpointName, BatchEndpointInner body, Context context) { return createOrUpdateAsync(resourceGroupName, workspaceName, endpointName, body, context).block(); } @@ -1604,7 +1576,7 @@ public Response listKeysWithResponse( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink) { + private Mono> listNextSinglePageAsync(String nextLink) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } @@ -1617,7 +1589,7 @@ private Mono> listNextSinglePageAsync(Stri final String accept = "application/json"; return FluxUtil .withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -1641,7 +1613,7 @@ private Mono> listNextSinglePageAsync(Stri * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink, Context context) { + private Mono> listNextSinglePageAsync(String nextLink, Context context) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchEndpointsImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchEndpointsImpl.java index fb052ad121b6..5b0179dccd10 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchEndpointsImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/BatchEndpointsImpl.java @@ -10,9 +10,9 @@ import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.machinelearning.fluent.BatchEndpointsClient; -import com.azure.resourcemanager.machinelearning.fluent.models.BatchEndpointDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.BatchEndpointInner; import com.azure.resourcemanager.machinelearning.fluent.models.EndpointAuthKeysInner; -import com.azure.resourcemanager.machinelearning.models.BatchEndpointData; +import com.azure.resourcemanager.machinelearning.models.BatchEndpoint; import com.azure.resourcemanager.machinelearning.models.BatchEndpoints; import com.azure.resourcemanager.machinelearning.models.EndpointAuthKeys; @@ -30,16 +30,16 @@ public BatchEndpointsImpl( this.serviceManager = serviceManager; } - public PagedIterable list(String resourceGroupName, String workspaceName) { - PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName); - return Utils.mapPage(inner, inner1 -> new BatchEndpointDataImpl(inner1, this.manager())); + public PagedIterable list(String resourceGroupName, String workspaceName) { + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName); + return Utils.mapPage(inner, inner1 -> new BatchEndpointImpl(inner1, this.manager())); } - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, Integer count, String skip, Context context) { - PagedIterable inner = + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName, count, skip, context); - return Utils.mapPage(inner, inner1 -> new BatchEndpointDataImpl(inner1, this.manager())); + return Utils.mapPage(inner, inner1 -> new BatchEndpointImpl(inner1, this.manager())); } public void delete(String resourceGroupName, String workspaceName, String endpointName) { @@ -50,25 +50,25 @@ public void delete(String resourceGroupName, String workspaceName, String endpoi this.serviceClient().delete(resourceGroupName, workspaceName, endpointName, context); } - public BatchEndpointData get(String resourceGroupName, String workspaceName, String endpointName) { - BatchEndpointDataInner inner = this.serviceClient().get(resourceGroupName, workspaceName, endpointName); + public BatchEndpoint get(String resourceGroupName, String workspaceName, String endpointName) { + BatchEndpointInner inner = this.serviceClient().get(resourceGroupName, workspaceName, endpointName); if (inner != null) { - return new BatchEndpointDataImpl(inner, this.manager()); + return new BatchEndpointImpl(inner, this.manager()); } else { return null; } } - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String endpointName, Context context) { - Response inner = + Response inner = this.serviceClient().getWithResponse(resourceGroupName, workspaceName, endpointName, context); if (inner != null) { return new SimpleResponse<>( inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new BatchEndpointDataImpl(inner.getValue(), this.manager())); + new BatchEndpointImpl(inner.getValue(), this.manager())); } else { return null; } @@ -98,7 +98,7 @@ public Response listKeysWithResponse( } } - public BatchEndpointData getById(String id) { + public BatchEndpoint getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -125,7 +125,7 @@ public BatchEndpointData getById(String id) { return this.getWithResponse(resourceGroupName, workspaceName, endpointName, Context.NONE).getValue(); } - public Response getByIdWithResponse(String id, Context context) { + public Response getByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -214,7 +214,7 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager return this.serviceManager; } - public BatchEndpointDataImpl define(String name) { - return new BatchEndpointDataImpl(name, this.manager()); + public BatchEndpointImpl define(String name) { + return new BatchEndpointImpl(name, this.manager()); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeContainerDataImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeContainerImpl.java similarity index 77% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeContainerDataImpl.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeContainerImpl.java index 0264bd5924f4..f739c63622ac 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeContainerDataImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeContainerImpl.java @@ -6,13 +6,12 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.CodeContainerDataInner; -import com.azure.resourcemanager.machinelearning.models.CodeContainerData; -import com.azure.resourcemanager.machinelearning.models.CodeContainerDetails; +import com.azure.resourcemanager.machinelearning.fluent.models.CodeContainerInner; +import com.azure.resourcemanager.machinelearning.models.CodeContainer; +import com.azure.resourcemanager.machinelearning.models.CodeContainerProperties; -public final class CodeContainerDataImpl - implements CodeContainerData, CodeContainerData.Definition, CodeContainerData.Update { - private CodeContainerDataInner innerObject; +public final class CodeContainerImpl implements CodeContainer, CodeContainer.Definition, CodeContainer.Update { + private CodeContainerInner innerObject; private final com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager; @@ -28,7 +27,7 @@ public String type() { return this.innerModel().type(); } - public CodeContainerDetails properties() { + public CodeContainerProperties properties() { return this.innerModel().properties(); } @@ -40,7 +39,7 @@ public String resourceGroupName() { return resourceGroupName; } - public CodeContainerDataInner innerModel() { + public CodeContainerInner innerModel() { return this.innerObject; } @@ -54,13 +53,13 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager private String name; - public CodeContainerDataImpl withExistingWorkspace(String resourceGroupName, String workspaceName) { + public CodeContainerImpl withExistingWorkspace(String resourceGroupName, String workspaceName) { this.resourceGroupName = resourceGroupName; this.workspaceName = workspaceName; return this; } - public CodeContainerData create() { + public CodeContainer create() { this.innerObject = serviceManager .serviceClient() @@ -70,7 +69,7 @@ public CodeContainerData create() { return this; } - public CodeContainerData create(Context context) { + public CodeContainer create(Context context) { this.innerObject = serviceManager .serviceClient() @@ -80,18 +79,17 @@ public CodeContainerData create(Context context) { return this; } - CodeContainerDataImpl( - String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { - this.innerObject = new CodeContainerDataInner(); + CodeContainerImpl(String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { + this.innerObject = new CodeContainerInner(); this.serviceManager = serviceManager; this.name = name; } - public CodeContainerDataImpl update() { + public CodeContainerImpl update() { return this; } - public CodeContainerData apply() { + public CodeContainer apply() { this.innerObject = serviceManager .serviceClient() @@ -101,7 +99,7 @@ public CodeContainerData apply() { return this; } - public CodeContainerData apply(Context context) { + public CodeContainer apply(Context context) { this.innerObject = serviceManager .serviceClient() @@ -111,8 +109,8 @@ public CodeContainerData apply(Context context) { return this; } - CodeContainerDataImpl( - CodeContainerDataInner innerObject, + CodeContainerImpl( + CodeContainerInner innerObject, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { this.innerObject = innerObject; this.serviceManager = serviceManager; @@ -121,7 +119,7 @@ public CodeContainerData apply(Context context) { this.name = Utils.getValueFromIdByName(innerObject.id(), "codes"); } - public CodeContainerData refresh() { + public CodeContainer refresh() { this.innerObject = serviceManager .serviceClient() @@ -131,7 +129,7 @@ public CodeContainerData refresh() { return this; } - public CodeContainerData refresh(Context context) { + public CodeContainer refresh(Context context) { this.innerObject = serviceManager .serviceClient() @@ -141,7 +139,7 @@ public CodeContainerData refresh(Context context) { return this; } - public CodeContainerDataImpl withProperties(CodeContainerDetails properties) { + public CodeContainerImpl withProperties(CodeContainerProperties properties) { this.innerModel().withProperties(properties); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeContainersClientImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeContainersClientImpl.java index f52e7e3e1240..5dd06e10ac13 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeContainersClientImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeContainersClientImpl.java @@ -29,7 +29,7 @@ import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.resourcemanager.machinelearning.fluent.CodeContainersClient; -import com.azure.resourcemanager.machinelearning.fluent.models.CodeContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.CodeContainerInner; import com.azure.resourcemanager.machinelearning.models.CodeContainerResourceArmPaginatedResult; import reactor.core.publisher.Mono; @@ -97,7 +97,7 @@ Mono> delete( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/codes/{name}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( + Mono> get( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -113,14 +113,14 @@ Mono> get( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/codes/{name}") @ExpectedResponses({200, 201}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> createOrUpdate( + Mono> createOrUpdate( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("workspaceName") String workspaceName, @PathParam("name") String name, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") CodeContainerDataInner body, + @BodyParam("application/json") CodeContainerInner body, @HeaderParam("Accept") String accept, Context context); @@ -148,7 +148,7 @@ Mono> listNext( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String skip) { if (this.client.getEndpoint() == null) { return Mono @@ -183,7 +183,7 @@ private Mono> listSinglePageAsync( skip, accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -209,7 +209,7 @@ private Mono> listSinglePageAsync( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String skip, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -265,7 +265,7 @@ private Mono> listSinglePageAsync( * @return a paginated list of CodeContainer entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync(String resourceGroupName, String workspaceName, String skip) { + private PagedFlux listAsync(String resourceGroupName, String workspaceName, String skip) { return new PagedFlux<>( () -> listSinglePageAsync(resourceGroupName, workspaceName, skip), nextLink -> listNextSinglePageAsync(nextLink)); @@ -282,7 +282,7 @@ private PagedFlux listAsync(String resourceGroupName, St * @return a paginated list of CodeContainer entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync(String resourceGroupName, String workspaceName) { + private PagedFlux listAsync(String resourceGroupName, String workspaceName) { final String skip = null; return new PagedFlux<>( () -> listSinglePageAsync(resourceGroupName, workspaceName, skip), @@ -302,7 +302,7 @@ private PagedFlux listAsync(String resourceGroupName, St * @return a paginated list of CodeContainer entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String skip, Context context) { return new PagedFlux<>( () -> listSinglePageAsync(resourceGroupName, workspaceName, skip, context), @@ -320,7 +320,7 @@ private PagedFlux listAsync( * @return a paginated list of CodeContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list(String resourceGroupName, String workspaceName) { + public PagedIterable list(String resourceGroupName, String workspaceName) { final String skip = null; return new PagedIterable<>(listAsync(resourceGroupName, workspaceName, skip)); } @@ -338,7 +338,7 @@ public PagedIterable list(String resourceGroupName, Stri * @return a paginated list of CodeContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String skip, Context context) { return new PagedIterable<>(listAsync(resourceGroupName, workspaceName, skip, context)); } @@ -507,7 +507,7 @@ public Response deleteWithResponse( * @return container along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name) { if (this.client.getEndpoint() == null) { return Mono @@ -561,7 +561,7 @@ private Mono> getWithResponseAsync( * @return container along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -611,7 +611,7 @@ private Mono> getWithResponseAsync( * @return container on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getAsync(String resourceGroupName, String workspaceName, String name) { + private Mono getAsync(String resourceGroupName, String workspaceName, String name) { return getWithResponseAsync(resourceGroupName, workspaceName, name) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -628,7 +628,7 @@ private Mono getAsync(String resourceGroupName, String w * @return container. */ @ServiceMethod(returns = ReturnType.SINGLE) - public CodeContainerDataInner get(String resourceGroupName, String workspaceName, String name) { + public CodeContainerInner get(String resourceGroupName, String workspaceName, String name) { return getAsync(resourceGroupName, workspaceName, name).block(); } @@ -645,7 +645,7 @@ public CodeContainerDataInner get(String resourceGroupName, String workspaceName * @return container along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context) { return getWithResponseAsync(resourceGroupName, workspaceName, name, context).block(); } @@ -664,8 +664,8 @@ public Response getWithResponse( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( - String resourceGroupName, String workspaceName, String name, CodeContainerDataInner body) { + private Mono> createOrUpdateWithResponseAsync( + String resourceGroupName, String workspaceName, String name, CodeContainerInner body) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -726,8 +726,8 @@ private Mono> createOrUpdateWithResponseAsync( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( - String resourceGroupName, String workspaceName, String name, CodeContainerDataInner body, Context context) { + private Mono> createOrUpdateWithResponseAsync( + String resourceGroupName, String workspaceName, String name, CodeContainerInner body, Context context) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -783,8 +783,8 @@ private Mono> createOrUpdateWithResponseAsync( * @return azure Resource Manager resource envelope on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( - String resourceGroupName, String workspaceName, String name, CodeContainerDataInner body) { + private Mono createOrUpdateAsync( + String resourceGroupName, String workspaceName, String name, CodeContainerInner body) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, body) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -802,8 +802,8 @@ private Mono createOrUpdateAsync( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - public CodeContainerDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, CodeContainerDataInner body) { + public CodeContainerInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, CodeContainerInner body) { return createOrUpdateAsync(resourceGroupName, workspaceName, name, body).block(); } @@ -821,8 +821,8 @@ public CodeContainerDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response createOrUpdateWithResponse( - String resourceGroupName, String workspaceName, String name, CodeContainerDataInner body, Context context) { + public Response createOrUpdateWithResponse( + String resourceGroupName, String workspaceName, String name, CodeContainerInner body, Context context) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, body, context).block(); } @@ -837,7 +837,7 @@ public Response createOrUpdateWithResponse( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink) { + private Mono> listNextSinglePageAsync(String nextLink) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } @@ -850,7 +850,7 @@ private Mono> listNextSinglePageAsync(Stri final String accept = "application/json"; return FluxUtil .withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -874,7 +874,7 @@ private Mono> listNextSinglePageAsync(Stri * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink, Context context) { + private Mono> listNextSinglePageAsync(String nextLink, Context context) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeContainersImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeContainersImpl.java index efa1413b9df6..a51ea21126ee 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeContainersImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeContainersImpl.java @@ -10,8 +10,8 @@ import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.machinelearning.fluent.CodeContainersClient; -import com.azure.resourcemanager.machinelearning.fluent.models.CodeContainerDataInner; -import com.azure.resourcemanager.machinelearning.models.CodeContainerData; +import com.azure.resourcemanager.machinelearning.fluent.models.CodeContainerInner; +import com.azure.resourcemanager.machinelearning.models.CodeContainer; import com.azure.resourcemanager.machinelearning.models.CodeContainers; public final class CodeContainersImpl implements CodeContainers { @@ -28,16 +28,16 @@ public CodeContainersImpl( this.serviceManager = serviceManager; } - public PagedIterable list(String resourceGroupName, String workspaceName) { - PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName); - return Utils.mapPage(inner, inner1 -> new CodeContainerDataImpl(inner1, this.manager())); + public PagedIterable list(String resourceGroupName, String workspaceName) { + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName); + return Utils.mapPage(inner, inner1 -> new CodeContainerImpl(inner1, this.manager())); } - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String skip, Context context) { - PagedIterable inner = + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName, skip, context); - return Utils.mapPage(inner, inner1 -> new CodeContainerDataImpl(inner1, this.manager())); + return Utils.mapPage(inner, inner1 -> new CodeContainerImpl(inner1, this.manager())); } public void delete(String resourceGroupName, String workspaceName, String name) { @@ -49,31 +49,31 @@ public Response deleteWithResponse( return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, name, context); } - public CodeContainerData get(String resourceGroupName, String workspaceName, String name) { - CodeContainerDataInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name); + public CodeContainer get(String resourceGroupName, String workspaceName, String name) { + CodeContainerInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name); if (inner != null) { - return new CodeContainerDataImpl(inner, this.manager()); + return new CodeContainerImpl(inner, this.manager()); } else { return null; } } - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context) { - Response inner = + Response inner = this.serviceClient().getWithResponse(resourceGroupName, workspaceName, name, context); if (inner != null) { return new SimpleResponse<>( inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new CodeContainerDataImpl(inner.getValue(), this.manager())); + new CodeContainerImpl(inner.getValue(), this.manager())); } else { return null; } } - public CodeContainerData getById(String id) { + public CodeContainer getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -99,7 +99,7 @@ public CodeContainerData getById(String id) { return this.getWithResponse(resourceGroupName, workspaceName, name, Context.NONE).getValue(); } - public Response getByIdWithResponse(String id, Context context) { + public Response getByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -185,7 +185,7 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager return this.serviceManager; } - public CodeContainerDataImpl define(String name) { - return new CodeContainerDataImpl(name, this.manager()); + public CodeContainerImpl define(String name) { + return new CodeContainerImpl(name, this.manager()); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeVersionDataImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeVersionImpl.java similarity index 77% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeVersionDataImpl.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeVersionImpl.java index ab51389d986e..daab7505f3ff 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeVersionDataImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeVersionImpl.java @@ -6,12 +6,12 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.CodeVersionDataInner; -import com.azure.resourcemanager.machinelearning.models.CodeVersionData; -import com.azure.resourcemanager.machinelearning.models.CodeVersionDetails; +import com.azure.resourcemanager.machinelearning.fluent.models.CodeVersionInner; +import com.azure.resourcemanager.machinelearning.models.CodeVersion; +import com.azure.resourcemanager.machinelearning.models.CodeVersionProperties; -public final class CodeVersionDataImpl implements CodeVersionData, CodeVersionData.Definition, CodeVersionData.Update { - private CodeVersionDataInner innerObject; +public final class CodeVersionImpl implements CodeVersion, CodeVersion.Definition, CodeVersion.Update { + private CodeVersionInner innerObject; private final com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager; @@ -27,7 +27,7 @@ public String type() { return this.innerModel().type(); } - public CodeVersionDetails properties() { + public CodeVersionProperties properties() { return this.innerModel().properties(); } @@ -39,7 +39,7 @@ public String resourceGroupName() { return resourceGroupName; } - public CodeVersionDataInner innerModel() { + public CodeVersionInner innerModel() { return this.innerObject; } @@ -55,14 +55,14 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager private String version; - public CodeVersionDataImpl withExistingCode(String resourceGroupName, String workspaceName, String name) { + public CodeVersionImpl withExistingCode(String resourceGroupName, String workspaceName, String name) { this.resourceGroupName = resourceGroupName; this.workspaceName = workspaceName; this.name = name; return this; } - public CodeVersionData create() { + public CodeVersion create() { this.innerObject = serviceManager .serviceClient() @@ -73,7 +73,7 @@ public CodeVersionData create() { return this; } - public CodeVersionData create(Context context) { + public CodeVersion create(Context context) { this.innerObject = serviceManager .serviceClient() @@ -83,17 +83,17 @@ public CodeVersionData create(Context context) { return this; } - CodeVersionDataImpl(String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { - this.innerObject = new CodeVersionDataInner(); + CodeVersionImpl(String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { + this.innerObject = new CodeVersionInner(); this.serviceManager = serviceManager; this.version = name; } - public CodeVersionDataImpl update() { + public CodeVersionImpl update() { return this; } - public CodeVersionData apply() { + public CodeVersion apply() { this.innerObject = serviceManager .serviceClient() @@ -104,7 +104,7 @@ public CodeVersionData apply() { return this; } - public CodeVersionData apply(Context context) { + public CodeVersion apply(Context context) { this.innerObject = serviceManager .serviceClient() @@ -114,9 +114,8 @@ public CodeVersionData apply(Context context) { return this; } - CodeVersionDataImpl( - CodeVersionDataInner innerObject, - com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { + CodeVersionImpl( + CodeVersionInner innerObject, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { this.innerObject = innerObject; this.serviceManager = serviceManager; this.resourceGroupName = Utils.getValueFromIdByName(innerObject.id(), "resourceGroups"); @@ -125,7 +124,7 @@ public CodeVersionData apply(Context context) { this.version = Utils.getValueFromIdByName(innerObject.id(), "versions"); } - public CodeVersionData refresh() { + public CodeVersion refresh() { this.innerObject = serviceManager .serviceClient() @@ -135,7 +134,7 @@ public CodeVersionData refresh() { return this; } - public CodeVersionData refresh(Context context) { + public CodeVersion refresh(Context context) { this.innerObject = serviceManager .serviceClient() @@ -145,7 +144,7 @@ public CodeVersionData refresh(Context context) { return this; } - public CodeVersionDataImpl withProperties(CodeVersionDetails properties) { + public CodeVersionImpl withProperties(CodeVersionProperties properties) { this.innerModel().withProperties(properties); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeVersionsClientImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeVersionsClientImpl.java index c63458b8eaf4..12a8a001c5b3 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeVersionsClientImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeVersionsClientImpl.java @@ -29,7 +29,7 @@ import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.resourcemanager.machinelearning.fluent.CodeVersionsClient; -import com.azure.resourcemanager.machinelearning.fluent.models.CodeVersionDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.CodeVersionInner; import com.azure.resourcemanager.machinelearning.models.CodeVersionResourceArmPaginatedResult; import reactor.core.publisher.Mono; @@ -101,7 +101,7 @@ Mono> delete( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/codes/{name}/versions/{version}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( + Mono> get( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -118,7 +118,7 @@ Mono> get( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/codes/{name}/versions/{version}") @ExpectedResponses({200, 201}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> createOrUpdate( + Mono> createOrUpdate( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -126,7 +126,7 @@ Mono> createOrUpdate( @PathParam("name") String name, @PathParam("version") String version, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") CodeVersionDataInner body, + @BodyParam("application/json") CodeVersionInner body, @HeaderParam("Accept") String accept, Context context); @@ -157,7 +157,7 @@ Mono> listNext( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String name, String orderBy, Integer top, String skip) { if (this.client.getEndpoint() == null) { return Mono @@ -198,7 +198,7 @@ private Mono> listSinglePageAsync( skip, accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -227,7 +227,7 @@ private Mono> listSinglePageAsync( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String name, @@ -298,7 +298,7 @@ private Mono> listSinglePageAsync( * @return a paginated list of CodeVersion entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String name, String orderBy, Integer top, String skip) { return new PagedFlux<>( () -> listSinglePageAsync(resourceGroupName, workspaceName, name, orderBy, top, skip), @@ -317,7 +317,7 @@ private PagedFlux listAsync( * @return a paginated list of CodeVersion entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync(String resourceGroupName, String workspaceName, String name) { + private PagedFlux listAsync(String resourceGroupName, String workspaceName, String name) { final String orderBy = null; final Integer top = null; final String skip = null; @@ -342,7 +342,7 @@ private PagedFlux listAsync(String resourceGroupName, Stri * @return a paginated list of CodeVersion entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String name, @@ -367,7 +367,7 @@ private PagedFlux listAsync( * @return a paginated list of CodeVersion entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list(String resourceGroupName, String workspaceName, String name) { + public PagedIterable list(String resourceGroupName, String workspaceName, String name) { final String orderBy = null; final Integer top = null; final String skip = null; @@ -390,7 +390,7 @@ public PagedIterable list(String resourceGroupName, String * @return a paginated list of CodeVersion entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -581,7 +581,7 @@ public Response deleteWithResponse( * @return version along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name, String version) { if (this.client.getEndpoint() == null) { return Mono @@ -640,7 +640,7 @@ private Mono> getWithResponseAsync( * @return version along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name, String version, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -695,7 +695,7 @@ private Mono> getWithResponseAsync( * @return version on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getAsync( + private Mono getAsync( String resourceGroupName, String workspaceName, String name, String version) { return getWithResponseAsync(resourceGroupName, workspaceName, name, version) .flatMap(res -> Mono.justOrEmpty(res.getValue())); @@ -714,7 +714,7 @@ private Mono getAsync( * @return version. */ @ServiceMethod(returns = ReturnType.SINGLE) - public CodeVersionDataInner get(String resourceGroupName, String workspaceName, String name, String version) { + public CodeVersionInner get(String resourceGroupName, String workspaceName, String name, String version) { return getAsync(resourceGroupName, workspaceName, name, version).block(); } @@ -732,7 +732,7 @@ public CodeVersionDataInner get(String resourceGroupName, String workspaceName, * @return version along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context) { return getWithResponseAsync(resourceGroupName, workspaceName, name, version, context).block(); } @@ -752,8 +752,8 @@ public Response getWithResponse( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( - String resourceGroupName, String workspaceName, String name, String version, CodeVersionDataInner body) { + private Mono> createOrUpdateWithResponseAsync( + String resourceGroupName, String workspaceName, String name, String version, CodeVersionInner body) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -819,12 +819,12 @@ private Mono> createOrUpdateWithResponseAsync( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( + private Mono> createOrUpdateWithResponseAsync( String resourceGroupName, String workspaceName, String name, String version, - CodeVersionDataInner body, + CodeVersionInner body, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -886,8 +886,8 @@ private Mono> createOrUpdateWithResponseAsync( * @return azure Resource Manager resource envelope on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( - String resourceGroupName, String workspaceName, String name, String version, CodeVersionDataInner body) { + private Mono createOrUpdateAsync( + String resourceGroupName, String workspaceName, String name, String version, CodeVersionInner body) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, version, body) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -906,8 +906,8 @@ private Mono createOrUpdateAsync( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - public CodeVersionDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, String version, CodeVersionDataInner body) { + public CodeVersionInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, String version, CodeVersionInner body) { return createOrUpdateAsync(resourceGroupName, workspaceName, name, version, body).block(); } @@ -926,12 +926,12 @@ public CodeVersionDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response createOrUpdateWithResponse( + public Response createOrUpdateWithResponse( String resourceGroupName, String workspaceName, String name, String version, - CodeVersionDataInner body, + CodeVersionInner body, Context context) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, version, body, context).block(); } @@ -947,7 +947,7 @@ public Response createOrUpdateWithResponse( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink) { + private Mono> listNextSinglePageAsync(String nextLink) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } @@ -960,7 +960,7 @@ private Mono> listNextSinglePageAsync(String final String accept = "application/json"; return FluxUtil .withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -984,7 +984,7 @@ private Mono> listNextSinglePageAsync(String * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink, Context context) { + private Mono> listNextSinglePageAsync(String nextLink, Context context) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeVersionsImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeVersionsImpl.java index a3fb6e2470b4..4941ec69c104 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeVersionsImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/CodeVersionsImpl.java @@ -10,8 +10,8 @@ import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.machinelearning.fluent.CodeVersionsClient; -import com.azure.resourcemanager.machinelearning.fluent.models.CodeVersionDataInner; -import com.azure.resourcemanager.machinelearning.models.CodeVersionData; +import com.azure.resourcemanager.machinelearning.fluent.models.CodeVersionInner; +import com.azure.resourcemanager.machinelearning.models.CodeVersion; import com.azure.resourcemanager.machinelearning.models.CodeVersions; public final class CodeVersionsImpl implements CodeVersions { @@ -28,12 +28,12 @@ public CodeVersionsImpl( this.serviceManager = serviceManager; } - public PagedIterable list(String resourceGroupName, String workspaceName, String name) { - PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName, name); - return Utils.mapPage(inner, inner1 -> new CodeVersionDataImpl(inner1, this.manager())); + public PagedIterable list(String resourceGroupName, String workspaceName, String name) { + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName, name); + return Utils.mapPage(inner, inner1 -> new CodeVersionImpl(inner1, this.manager())); } - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -41,9 +41,9 @@ public PagedIterable list( Integer top, String skip, Context context) { - PagedIterable inner = + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName, name, orderBy, top, skip, context); - return Utils.mapPage(inner, inner1 -> new CodeVersionDataImpl(inner1, this.manager())); + return Utils.mapPage(inner, inner1 -> new CodeVersionImpl(inner1, this.manager())); } public void delete(String resourceGroupName, String workspaceName, String name, String version) { @@ -55,31 +55,31 @@ public Response deleteWithResponse( return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, name, version, context); } - public CodeVersionData get(String resourceGroupName, String workspaceName, String name, String version) { - CodeVersionDataInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name, version); + public CodeVersion get(String resourceGroupName, String workspaceName, String name, String version) { + CodeVersionInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name, version); if (inner != null) { - return new CodeVersionDataImpl(inner, this.manager()); + return new CodeVersionImpl(inner, this.manager()); } else { return null; } } - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context) { - Response inner = + Response inner = this.serviceClient().getWithResponse(resourceGroupName, workspaceName, name, version, context); if (inner != null) { return new SimpleResponse<>( inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new CodeVersionDataImpl(inner.getValue(), this.manager())); + new CodeVersionImpl(inner.getValue(), this.manager())); } else { return null; } } - public CodeVersionData getById(String id) { + public CodeVersion getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -112,7 +112,7 @@ public CodeVersionData getById(String id) { return this.getWithResponse(resourceGroupName, workspaceName, name, version, Context.NONE).getValue(); } - public Response getByIdWithResponse(String id, Context context) { + public Response getByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -219,7 +219,7 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager return this.serviceManager; } - public CodeVersionDataImpl define(String name) { - return new CodeVersionDataImpl(name, this.manager()); + public CodeVersionImpl define(String name) { + return new CodeVersionImpl(name, this.manager()); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentContainerDataImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentContainerImpl.java similarity index 77% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentContainerDataImpl.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentContainerImpl.java index 261dd297a33f..0208215c0403 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentContainerDataImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentContainerImpl.java @@ -6,13 +6,13 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.ComponentContainerDataInner; -import com.azure.resourcemanager.machinelearning.models.ComponentContainerData; -import com.azure.resourcemanager.machinelearning.models.ComponentContainerDetails; +import com.azure.resourcemanager.machinelearning.fluent.models.ComponentContainerInner; +import com.azure.resourcemanager.machinelearning.models.ComponentContainer; +import com.azure.resourcemanager.machinelearning.models.ComponentContainerProperties; -public final class ComponentContainerDataImpl - implements ComponentContainerData, ComponentContainerData.Definition, ComponentContainerData.Update { - private ComponentContainerDataInner innerObject; +public final class ComponentContainerImpl + implements ComponentContainer, ComponentContainer.Definition, ComponentContainer.Update { + private ComponentContainerInner innerObject; private final com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager; @@ -28,7 +28,7 @@ public String type() { return this.innerModel().type(); } - public ComponentContainerDetails properties() { + public ComponentContainerProperties properties() { return this.innerModel().properties(); } @@ -40,7 +40,7 @@ public String resourceGroupName() { return resourceGroupName; } - public ComponentContainerDataInner innerModel() { + public ComponentContainerInner innerModel() { return this.innerObject; } @@ -54,13 +54,13 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager private String name; - public ComponentContainerDataImpl withExistingWorkspace(String resourceGroupName, String workspaceName) { + public ComponentContainerImpl withExistingWorkspace(String resourceGroupName, String workspaceName) { this.resourceGroupName = resourceGroupName; this.workspaceName = workspaceName; return this; } - public ComponentContainerData create() { + public ComponentContainer create() { this.innerObject = serviceManager .serviceClient() @@ -70,7 +70,7 @@ public ComponentContainerData create() { return this; } - public ComponentContainerData create(Context context) { + public ComponentContainer create(Context context) { this.innerObject = serviceManager .serviceClient() @@ -80,18 +80,18 @@ public ComponentContainerData create(Context context) { return this; } - ComponentContainerDataImpl( + ComponentContainerImpl( String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { - this.innerObject = new ComponentContainerDataInner(); + this.innerObject = new ComponentContainerInner(); this.serviceManager = serviceManager; this.name = name; } - public ComponentContainerDataImpl update() { + public ComponentContainerImpl update() { return this; } - public ComponentContainerData apply() { + public ComponentContainer apply() { this.innerObject = serviceManager .serviceClient() @@ -101,7 +101,7 @@ public ComponentContainerData apply() { return this; } - public ComponentContainerData apply(Context context) { + public ComponentContainer apply(Context context) { this.innerObject = serviceManager .serviceClient() @@ -111,8 +111,8 @@ public ComponentContainerData apply(Context context) { return this; } - ComponentContainerDataImpl( - ComponentContainerDataInner innerObject, + ComponentContainerImpl( + ComponentContainerInner innerObject, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { this.innerObject = innerObject; this.serviceManager = serviceManager; @@ -121,7 +121,7 @@ public ComponentContainerData apply(Context context) { this.name = Utils.getValueFromIdByName(innerObject.id(), "components"); } - public ComponentContainerData refresh() { + public ComponentContainer refresh() { this.innerObject = serviceManager .serviceClient() @@ -131,7 +131,7 @@ public ComponentContainerData refresh() { return this; } - public ComponentContainerData refresh(Context context) { + public ComponentContainer refresh(Context context) { this.innerObject = serviceManager .serviceClient() @@ -141,7 +141,7 @@ public ComponentContainerData refresh(Context context) { return this; } - public ComponentContainerDataImpl withProperties(ComponentContainerDetails properties) { + public ComponentContainerImpl withProperties(ComponentContainerProperties properties) { this.innerModel().withProperties(properties); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentContainersClientImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentContainersClientImpl.java index 98f26e17277e..04e315075adf 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentContainersClientImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentContainersClientImpl.java @@ -29,7 +29,7 @@ import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.resourcemanager.machinelearning.fluent.ComponentContainersClient; -import com.azure.resourcemanager.machinelearning.fluent.models.ComponentContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.ComponentContainerInner; import com.azure.resourcemanager.machinelearning.models.ComponentContainerResourceArmPaginatedResult; import com.azure.resourcemanager.machinelearning.models.ListViewType; import reactor.core.publisher.Mono; @@ -99,7 +99,7 @@ Mono> delete( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/components/{name}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( + Mono> get( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -115,14 +115,14 @@ Mono> get( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/components/{name}") @ExpectedResponses({200, 201}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> createOrUpdate( + Mono> createOrUpdate( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("workspaceName") String workspaceName, @PathParam("name") String name, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") ComponentContainerDataInner body, + @BodyParam("application/json") ComponentContainerInner body, @HeaderParam("Accept") String accept, Context context); @@ -151,7 +151,7 @@ Mono> listNext( * of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType) { if (this.client.getEndpoint() == null) { return Mono @@ -187,7 +187,7 @@ private Mono> listSinglePageAsync( listViewType, accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -214,7 +214,7 @@ private Mono> listSinglePageAsync( * of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -272,7 +272,7 @@ private Mono> listSinglePageAsync( * @return a paginated list of ComponentContainer entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType) { return new PagedFlux<>( () -> listSinglePageAsync(resourceGroupName, workspaceName, skip, listViewType), @@ -290,7 +290,7 @@ private PagedFlux listAsync( * @return a paginated list of ComponentContainer entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync(String resourceGroupName, String workspaceName) { + private PagedFlux listAsync(String resourceGroupName, String workspaceName) { final String skip = null; final ListViewType listViewType = null; return new PagedFlux<>( @@ -312,7 +312,7 @@ private PagedFlux listAsync(String resourceGroupNam * @return a paginated list of ComponentContainer entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType, Context context) { return new PagedFlux<>( () -> listSinglePageAsync(resourceGroupName, workspaceName, skip, listViewType, context), @@ -330,7 +330,7 @@ private PagedFlux listAsync( * @return a paginated list of ComponentContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list(String resourceGroupName, String workspaceName) { + public PagedIterable list(String resourceGroupName, String workspaceName) { final String skip = null; final ListViewType listViewType = null; return new PagedIterable<>(listAsync(resourceGroupName, workspaceName, skip, listViewType)); @@ -350,7 +350,7 @@ public PagedIterable list(String resourceGroupName, * @return a paginated list of ComponentContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType, Context context) { return new PagedIterable<>(listAsync(resourceGroupName, workspaceName, skip, listViewType, context)); } @@ -519,7 +519,7 @@ public Response deleteWithResponse( * @return container along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name) { if (this.client.getEndpoint() == null) { return Mono @@ -573,7 +573,7 @@ private Mono> getWithResponseAsync( * @return container along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -623,7 +623,7 @@ private Mono> getWithResponseAsync( * @return container on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getAsync(String resourceGroupName, String workspaceName, String name) { + private Mono getAsync(String resourceGroupName, String workspaceName, String name) { return getWithResponseAsync(resourceGroupName, workspaceName, name) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -640,7 +640,7 @@ private Mono getAsync(String resourceGroupName, Str * @return container. */ @ServiceMethod(returns = ReturnType.SINGLE) - public ComponentContainerDataInner get(String resourceGroupName, String workspaceName, String name) { + public ComponentContainerInner get(String resourceGroupName, String workspaceName, String name) { return getAsync(resourceGroupName, workspaceName, name).block(); } @@ -657,7 +657,7 @@ public ComponentContainerDataInner get(String resourceGroupName, String workspac * @return container along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context) { return getWithResponseAsync(resourceGroupName, workspaceName, name, context).block(); } @@ -676,8 +676,8 @@ public Response getWithResponse( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( - String resourceGroupName, String workspaceName, String name, ComponentContainerDataInner body) { + private Mono> createOrUpdateWithResponseAsync( + String resourceGroupName, String workspaceName, String name, ComponentContainerInner body) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -738,12 +738,8 @@ private Mono> createOrUpdateWithResponseAs * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( - String resourceGroupName, - String workspaceName, - String name, - ComponentContainerDataInner body, - Context context) { + private Mono> createOrUpdateWithResponseAsync( + String resourceGroupName, String workspaceName, String name, ComponentContainerInner body, Context context) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -799,8 +795,8 @@ private Mono> createOrUpdateWithResponseAs * @return azure Resource Manager resource envelope on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( - String resourceGroupName, String workspaceName, String name, ComponentContainerDataInner body) { + private Mono createOrUpdateAsync( + String resourceGroupName, String workspaceName, String name, ComponentContainerInner body) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, body) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -818,8 +814,8 @@ private Mono createOrUpdateAsync( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - public ComponentContainerDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, ComponentContainerDataInner body) { + public ComponentContainerInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, ComponentContainerInner body) { return createOrUpdateAsync(resourceGroupName, workspaceName, name, body).block(); } @@ -837,12 +833,8 @@ public ComponentContainerDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response createOrUpdateWithResponse( - String resourceGroupName, - String workspaceName, - String name, - ComponentContainerDataInner body, - Context context) { + public Response createOrUpdateWithResponse( + String resourceGroupName, String workspaceName, String name, ComponentContainerInner body, Context context) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, body, context).block(); } @@ -857,7 +849,7 @@ public Response createOrUpdateWithResponse( * of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink) { + private Mono> listNextSinglePageAsync(String nextLink) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } @@ -870,7 +862,7 @@ private Mono> listNextSinglePageAsync final String accept = "application/json"; return FluxUtil .withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -894,7 +886,7 @@ private Mono> listNextSinglePageAsync * of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink, Context context) { + private Mono> listNextSinglePageAsync(String nextLink, Context context) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentContainersImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentContainersImpl.java index 932afbcbf09f..e32fe6d4064f 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentContainersImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentContainersImpl.java @@ -10,8 +10,8 @@ import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.machinelearning.fluent.ComponentContainersClient; -import com.azure.resourcemanager.machinelearning.fluent.models.ComponentContainerDataInner; -import com.azure.resourcemanager.machinelearning.models.ComponentContainerData; +import com.azure.resourcemanager.machinelearning.fluent.models.ComponentContainerInner; +import com.azure.resourcemanager.machinelearning.models.ComponentContainer; import com.azure.resourcemanager.machinelearning.models.ComponentContainers; import com.azure.resourcemanager.machinelearning.models.ListViewType; @@ -29,16 +29,16 @@ public ComponentContainersImpl( this.serviceManager = serviceManager; } - public PagedIterable list(String resourceGroupName, String workspaceName) { - PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName); - return Utils.mapPage(inner, inner1 -> new ComponentContainerDataImpl(inner1, this.manager())); + public PagedIterable list(String resourceGroupName, String workspaceName) { + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName); + return Utils.mapPage(inner, inner1 -> new ComponentContainerImpl(inner1, this.manager())); } - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType, Context context) { - PagedIterable inner = + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName, skip, listViewType, context); - return Utils.mapPage(inner, inner1 -> new ComponentContainerDataImpl(inner1, this.manager())); + return Utils.mapPage(inner, inner1 -> new ComponentContainerImpl(inner1, this.manager())); } public void delete(String resourceGroupName, String workspaceName, String name) { @@ -50,31 +50,31 @@ public Response deleteWithResponse( return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, name, context); } - public ComponentContainerData get(String resourceGroupName, String workspaceName, String name) { - ComponentContainerDataInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name); + public ComponentContainer get(String resourceGroupName, String workspaceName, String name) { + ComponentContainerInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name); if (inner != null) { - return new ComponentContainerDataImpl(inner, this.manager()); + return new ComponentContainerImpl(inner, this.manager()); } else { return null; } } - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context) { - Response inner = + Response inner = this.serviceClient().getWithResponse(resourceGroupName, workspaceName, name, context); if (inner != null) { return new SimpleResponse<>( inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ComponentContainerDataImpl(inner.getValue(), this.manager())); + new ComponentContainerImpl(inner.getValue(), this.manager())); } else { return null; } } - public ComponentContainerData getById(String id) { + public ComponentContainer getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -100,7 +100,7 @@ public ComponentContainerData getById(String id) { return this.getWithResponse(resourceGroupName, workspaceName, name, Context.NONE).getValue(); } - public Response getByIdWithResponse(String id, Context context) { + public Response getByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -186,7 +186,7 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager return this.serviceManager; } - public ComponentContainerDataImpl define(String name) { - return new ComponentContainerDataImpl(name, this.manager()); + public ComponentContainerImpl define(String name) { + return new ComponentContainerImpl(name, this.manager()); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentVersionDataImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentVersionImpl.java similarity index 77% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentVersionDataImpl.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentVersionImpl.java index b945042188db..2b90ee811ddb 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentVersionDataImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentVersionImpl.java @@ -6,13 +6,13 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.ComponentVersionDataInner; -import com.azure.resourcemanager.machinelearning.models.ComponentVersionData; -import com.azure.resourcemanager.machinelearning.models.ComponentVersionDetails; +import com.azure.resourcemanager.machinelearning.fluent.models.ComponentVersionInner; +import com.azure.resourcemanager.machinelearning.models.ComponentVersion; +import com.azure.resourcemanager.machinelearning.models.ComponentVersionProperties; -public final class ComponentVersionDataImpl - implements ComponentVersionData, ComponentVersionData.Definition, ComponentVersionData.Update { - private ComponentVersionDataInner innerObject; +public final class ComponentVersionImpl + implements ComponentVersion, ComponentVersion.Definition, ComponentVersion.Update { + private ComponentVersionInner innerObject; private final com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager; @@ -28,7 +28,7 @@ public String type() { return this.innerModel().type(); } - public ComponentVersionDetails properties() { + public ComponentVersionProperties properties() { return this.innerModel().properties(); } @@ -40,7 +40,7 @@ public String resourceGroupName() { return resourceGroupName; } - public ComponentVersionDataInner innerModel() { + public ComponentVersionInner innerModel() { return this.innerObject; } @@ -56,14 +56,14 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager private String version; - public ComponentVersionDataImpl withExistingComponent(String resourceGroupName, String workspaceName, String name) { + public ComponentVersionImpl withExistingComponent(String resourceGroupName, String workspaceName, String name) { this.resourceGroupName = resourceGroupName; this.workspaceName = workspaceName; this.name = name; return this; } - public ComponentVersionData create() { + public ComponentVersion create() { this.innerObject = serviceManager .serviceClient() @@ -74,7 +74,7 @@ public ComponentVersionData create() { return this; } - public ComponentVersionData create(Context context) { + public ComponentVersion create(Context context) { this.innerObject = serviceManager .serviceClient() @@ -84,18 +84,17 @@ public ComponentVersionData create(Context context) { return this; } - ComponentVersionDataImpl( - String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { - this.innerObject = new ComponentVersionDataInner(); + ComponentVersionImpl(String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { + this.innerObject = new ComponentVersionInner(); this.serviceManager = serviceManager; this.version = name; } - public ComponentVersionDataImpl update() { + public ComponentVersionImpl update() { return this; } - public ComponentVersionData apply() { + public ComponentVersion apply() { this.innerObject = serviceManager .serviceClient() @@ -106,7 +105,7 @@ public ComponentVersionData apply() { return this; } - public ComponentVersionData apply(Context context) { + public ComponentVersion apply(Context context) { this.innerObject = serviceManager .serviceClient() @@ -116,8 +115,8 @@ public ComponentVersionData apply(Context context) { return this; } - ComponentVersionDataImpl( - ComponentVersionDataInner innerObject, + ComponentVersionImpl( + ComponentVersionInner innerObject, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { this.innerObject = innerObject; this.serviceManager = serviceManager; @@ -127,7 +126,7 @@ public ComponentVersionData apply(Context context) { this.version = Utils.getValueFromIdByName(innerObject.id(), "versions"); } - public ComponentVersionData refresh() { + public ComponentVersion refresh() { this.innerObject = serviceManager .serviceClient() @@ -137,7 +136,7 @@ public ComponentVersionData refresh() { return this; } - public ComponentVersionData refresh(Context context) { + public ComponentVersion refresh(Context context) { this.innerObject = serviceManager .serviceClient() @@ -147,7 +146,7 @@ public ComponentVersionData refresh(Context context) { return this; } - public ComponentVersionDataImpl withProperties(ComponentVersionDetails properties) { + public ComponentVersionImpl withProperties(ComponentVersionProperties properties) { this.innerModel().withProperties(properties); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentVersionsClientImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentVersionsClientImpl.java index e0d37d18b8f1..cb677f03217a 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentVersionsClientImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentVersionsClientImpl.java @@ -29,7 +29,7 @@ import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.resourcemanager.machinelearning.fluent.ComponentVersionsClient; -import com.azure.resourcemanager.machinelearning.fluent.models.ComponentVersionDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.ComponentVersionInner; import com.azure.resourcemanager.machinelearning.models.ComponentVersionResourceArmPaginatedResult; import com.azure.resourcemanager.machinelearning.models.ListViewType; import reactor.core.publisher.Mono; @@ -103,7 +103,7 @@ Mono> delete( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/components/{name}/versions/{version}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( + Mono> get( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -120,7 +120,7 @@ Mono> get( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/components/{name}/versions/{version}") @ExpectedResponses({200, 201}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> createOrUpdate( + Mono> createOrUpdate( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -128,7 +128,7 @@ Mono> createOrUpdate( @PathParam("name") String name, @PathParam("version") String version, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") ComponentVersionDataInner body, + @BodyParam("application/json") ComponentVersionInner body, @HeaderParam("Accept") String accept, Context context); @@ -160,7 +160,7 @@ Mono> listNext( * of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String name, @@ -208,7 +208,7 @@ private Mono> listSinglePageAsync( listViewType, accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -238,7 +238,7 @@ private Mono> listSinglePageAsync( * of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String name, @@ -312,7 +312,7 @@ private Mono> listSinglePageAsync( * @return a paginated list of ComponentVersion entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String name, @@ -337,8 +337,7 @@ private PagedFlux listAsync( * @return a paginated list of ComponentVersion entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( - String resourceGroupName, String workspaceName, String name) { + private PagedFlux listAsync(String resourceGroupName, String workspaceName, String name) { final String orderBy = null; final Integer top = null; final String skip = null; @@ -365,7 +364,7 @@ private PagedFlux listAsync( * @return a paginated list of ComponentVersion entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String name, @@ -392,7 +391,7 @@ private PagedFlux listAsync( * @return a paginated list of ComponentVersion entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list(String resourceGroupName, String workspaceName, String name) { + public PagedIterable list(String resourceGroupName, String workspaceName, String name) { final String orderBy = null; final Integer top = null; final String skip = null; @@ -417,7 +416,7 @@ public PagedIterable list(String resourceGroupName, S * @return a paginated list of ComponentVersion entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -610,7 +609,7 @@ public Response deleteWithResponse( * @return version along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name, String version) { if (this.client.getEndpoint() == null) { return Mono @@ -669,7 +668,7 @@ private Mono> getWithResponseAsync( * @return version along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name, String version, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -724,7 +723,7 @@ private Mono> getWithResponseAsync( * @return version on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getAsync( + private Mono getAsync( String resourceGroupName, String workspaceName, String name, String version) { return getWithResponseAsync(resourceGroupName, workspaceName, name, version) .flatMap(res -> Mono.justOrEmpty(res.getValue())); @@ -743,7 +742,7 @@ private Mono getAsync( * @return version. */ @ServiceMethod(returns = ReturnType.SINGLE) - public ComponentVersionDataInner get(String resourceGroupName, String workspaceName, String name, String version) { + public ComponentVersionInner get(String resourceGroupName, String workspaceName, String name, String version) { return getAsync(resourceGroupName, workspaceName, name, version).block(); } @@ -761,7 +760,7 @@ public ComponentVersionDataInner get(String resourceGroupName, String workspaceN * @return version along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context) { return getWithResponseAsync(resourceGroupName, workspaceName, name, version, context).block(); } @@ -781,8 +780,8 @@ public Response getWithResponse( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( - String resourceGroupName, String workspaceName, String name, String version, ComponentVersionDataInner body) { + private Mono> createOrUpdateWithResponseAsync( + String resourceGroupName, String workspaceName, String name, String version, ComponentVersionInner body) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -848,12 +847,12 @@ private Mono> createOrUpdateWithResponseAsyn * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( + private Mono> createOrUpdateWithResponseAsync( String resourceGroupName, String workspaceName, String name, String version, - ComponentVersionDataInner body, + ComponentVersionInner body, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -915,8 +914,8 @@ private Mono> createOrUpdateWithResponseAsyn * @return azure Resource Manager resource envelope on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( - String resourceGroupName, String workspaceName, String name, String version, ComponentVersionDataInner body) { + private Mono createOrUpdateAsync( + String resourceGroupName, String workspaceName, String name, String version, ComponentVersionInner body) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, version, body) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -935,8 +934,8 @@ private Mono createOrUpdateAsync( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - public ComponentVersionDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, String version, ComponentVersionDataInner body) { + public ComponentVersionInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, String version, ComponentVersionInner body) { return createOrUpdateAsync(resourceGroupName, workspaceName, name, version, body).block(); } @@ -955,12 +954,12 @@ public ComponentVersionDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response createOrUpdateWithResponse( + public Response createOrUpdateWithResponse( String resourceGroupName, String workspaceName, String name, String version, - ComponentVersionDataInner body, + ComponentVersionInner body, Context context) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, version, body, context).block(); } @@ -976,7 +975,7 @@ public Response createOrUpdateWithResponse( * of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink) { + private Mono> listNextSinglePageAsync(String nextLink) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } @@ -989,7 +988,7 @@ private Mono> listNextSinglePageAsync(S final String accept = "application/json"; return FluxUtil .withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -1013,7 +1012,7 @@ private Mono> listNextSinglePageAsync(S * of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink, Context context) { + private Mono> listNextSinglePageAsync(String nextLink, Context context) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentVersionsImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentVersionsImpl.java index b72d5d00a956..28fc4ea02911 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentVersionsImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ComponentVersionsImpl.java @@ -10,8 +10,8 @@ import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.machinelearning.fluent.ComponentVersionsClient; -import com.azure.resourcemanager.machinelearning.fluent.models.ComponentVersionDataInner; -import com.azure.resourcemanager.machinelearning.models.ComponentVersionData; +import com.azure.resourcemanager.machinelearning.fluent.models.ComponentVersionInner; +import com.azure.resourcemanager.machinelearning.models.ComponentVersion; import com.azure.resourcemanager.machinelearning.models.ComponentVersions; import com.azure.resourcemanager.machinelearning.models.ListViewType; @@ -29,13 +29,12 @@ public ComponentVersionsImpl( this.serviceManager = serviceManager; } - public PagedIterable list(String resourceGroupName, String workspaceName, String name) { - PagedIterable inner = - this.serviceClient().list(resourceGroupName, workspaceName, name); - return Utils.mapPage(inner, inner1 -> new ComponentVersionDataImpl(inner1, this.manager())); + public PagedIterable list(String resourceGroupName, String workspaceName, String name) { + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName, name); + return Utils.mapPage(inner, inner1 -> new ComponentVersionImpl(inner1, this.manager())); } - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -44,11 +43,11 @@ public PagedIterable list( String skip, ListViewType listViewType, Context context) { - PagedIterable inner = + PagedIterable inner = this .serviceClient() .list(resourceGroupName, workspaceName, name, orderBy, top, skip, listViewType, context); - return Utils.mapPage(inner, inner1 -> new ComponentVersionDataImpl(inner1, this.manager())); + return Utils.mapPage(inner, inner1 -> new ComponentVersionImpl(inner1, this.manager())); } public void delete(String resourceGroupName, String workspaceName, String name, String version) { @@ -60,31 +59,31 @@ public Response deleteWithResponse( return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, name, version, context); } - public ComponentVersionData get(String resourceGroupName, String workspaceName, String name, String version) { - ComponentVersionDataInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name, version); + public ComponentVersion get(String resourceGroupName, String workspaceName, String name, String version) { + ComponentVersionInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name, version); if (inner != null) { - return new ComponentVersionDataImpl(inner, this.manager()); + return new ComponentVersionImpl(inner, this.manager()); } else { return null; } } - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context) { - Response inner = + Response inner = this.serviceClient().getWithResponse(resourceGroupName, workspaceName, name, version, context); if (inner != null) { return new SimpleResponse<>( inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ComponentVersionDataImpl(inner.getValue(), this.manager())); + new ComponentVersionImpl(inner.getValue(), this.manager())); } else { return null; } } - public ComponentVersionData getById(String id) { + public ComponentVersion getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -117,7 +116,7 @@ public ComponentVersionData getById(String id) { return this.getWithResponse(resourceGroupName, workspaceName, name, version, Context.NONE).getValue(); } - public Response getByIdWithResponse(String id, Context context) { + public Response getByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -224,7 +223,7 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager return this.serviceManager; } - public ComponentVersionDataImpl define(String name) { - return new ComponentVersionDataImpl(name, this.manager()); + public ComponentVersionImpl define(String name) { + return new ComponentVersionImpl(name, this.manager()); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataContainerDataImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataContainerImpl.java similarity index 77% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataContainerDataImpl.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataContainerImpl.java index 96583e6a09c9..226bd04ddbb2 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataContainerDataImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataContainerImpl.java @@ -6,13 +6,12 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.DataContainerDataInner; -import com.azure.resourcemanager.machinelearning.models.DataContainerData; -import com.azure.resourcemanager.machinelearning.models.DataContainerDetails; +import com.azure.resourcemanager.machinelearning.fluent.models.DataContainerInner; +import com.azure.resourcemanager.machinelearning.models.DataContainer; +import com.azure.resourcemanager.machinelearning.models.DataContainerProperties; -public final class DataContainerDataImpl - implements DataContainerData, DataContainerData.Definition, DataContainerData.Update { - private DataContainerDataInner innerObject; +public final class DataContainerImpl implements DataContainer, DataContainer.Definition, DataContainer.Update { + private DataContainerInner innerObject; private final com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager; @@ -28,7 +27,7 @@ public String type() { return this.innerModel().type(); } - public DataContainerDetails properties() { + public DataContainerProperties properties() { return this.innerModel().properties(); } @@ -40,7 +39,7 @@ public String resourceGroupName() { return resourceGroupName; } - public DataContainerDataInner innerModel() { + public DataContainerInner innerModel() { return this.innerObject; } @@ -54,13 +53,13 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager private String name; - public DataContainerDataImpl withExistingWorkspace(String resourceGroupName, String workspaceName) { + public DataContainerImpl withExistingWorkspace(String resourceGroupName, String workspaceName) { this.resourceGroupName = resourceGroupName; this.workspaceName = workspaceName; return this; } - public DataContainerData create() { + public DataContainer create() { this.innerObject = serviceManager .serviceClient() @@ -70,7 +69,7 @@ public DataContainerData create() { return this; } - public DataContainerData create(Context context) { + public DataContainer create(Context context) { this.innerObject = serviceManager .serviceClient() @@ -80,18 +79,17 @@ public DataContainerData create(Context context) { return this; } - DataContainerDataImpl( - String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { - this.innerObject = new DataContainerDataInner(); + DataContainerImpl(String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { + this.innerObject = new DataContainerInner(); this.serviceManager = serviceManager; this.name = name; } - public DataContainerDataImpl update() { + public DataContainerImpl update() { return this; } - public DataContainerData apply() { + public DataContainer apply() { this.innerObject = serviceManager .serviceClient() @@ -101,7 +99,7 @@ public DataContainerData apply() { return this; } - public DataContainerData apply(Context context) { + public DataContainer apply(Context context) { this.innerObject = serviceManager .serviceClient() @@ -111,8 +109,8 @@ public DataContainerData apply(Context context) { return this; } - DataContainerDataImpl( - DataContainerDataInner innerObject, + DataContainerImpl( + DataContainerInner innerObject, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { this.innerObject = innerObject; this.serviceManager = serviceManager; @@ -121,7 +119,7 @@ public DataContainerData apply(Context context) { this.name = Utils.getValueFromIdByName(innerObject.id(), "data"); } - public DataContainerData refresh() { + public DataContainer refresh() { this.innerObject = serviceManager .serviceClient() @@ -131,7 +129,7 @@ public DataContainerData refresh() { return this; } - public DataContainerData refresh(Context context) { + public DataContainer refresh(Context context) { this.innerObject = serviceManager .serviceClient() @@ -141,7 +139,7 @@ public DataContainerData refresh(Context context) { return this; } - public DataContainerDataImpl withProperties(DataContainerDetails properties) { + public DataContainerImpl withProperties(DataContainerProperties properties) { this.innerModel().withProperties(properties); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataContainersClientImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataContainersClientImpl.java index b2bdd57b5e67..c1edd6ccc0b2 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataContainersClientImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataContainersClientImpl.java @@ -29,7 +29,7 @@ import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.resourcemanager.machinelearning.fluent.DataContainersClient; -import com.azure.resourcemanager.machinelearning.fluent.models.DataContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.DataContainerInner; import com.azure.resourcemanager.machinelearning.models.DataContainerResourceArmPaginatedResult; import com.azure.resourcemanager.machinelearning.models.ListViewType; import reactor.core.publisher.Mono; @@ -99,7 +99,7 @@ Mono> delete( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/data/{name}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( + Mono> get( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -115,14 +115,14 @@ Mono> get( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/data/{name}") @ExpectedResponses({200, 201}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> createOrUpdate( + Mono> createOrUpdate( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("workspaceName") String workspaceName, @PathParam("name") String name, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") DataContainerDataInner body, + @BodyParam("application/json") DataContainerInner body, @HeaderParam("Accept") String accept, Context context); @@ -151,7 +151,7 @@ Mono> listNext( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType) { if (this.client.getEndpoint() == null) { return Mono @@ -187,7 +187,7 @@ private Mono> listSinglePageAsync( listViewType, accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -214,7 +214,7 @@ private Mono> listSinglePageAsync( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -272,7 +272,7 @@ private Mono> listSinglePageAsync( * @return a paginated list of DataContainer entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType) { return new PagedFlux<>( () -> listSinglePageAsync(resourceGroupName, workspaceName, skip, listViewType), @@ -290,7 +290,7 @@ private PagedFlux listAsync( * @return a paginated list of DataContainer entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync(String resourceGroupName, String workspaceName) { + private PagedFlux listAsync(String resourceGroupName, String workspaceName) { final String skip = null; final ListViewType listViewType = null; return new PagedFlux<>( @@ -312,7 +312,7 @@ private PagedFlux listAsync(String resourceGroupName, St * @return a paginated list of DataContainer entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType, Context context) { return new PagedFlux<>( () -> listSinglePageAsync(resourceGroupName, workspaceName, skip, listViewType, context), @@ -330,7 +330,7 @@ private PagedFlux listAsync( * @return a paginated list of DataContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list(String resourceGroupName, String workspaceName) { + public PagedIterable list(String resourceGroupName, String workspaceName) { final String skip = null; final ListViewType listViewType = null; return new PagedIterable<>(listAsync(resourceGroupName, workspaceName, skip, listViewType)); @@ -350,7 +350,7 @@ public PagedIterable list(String resourceGroupName, Stri * @return a paginated list of DataContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType, Context context) { return new PagedIterable<>(listAsync(resourceGroupName, workspaceName, skip, listViewType, context)); } @@ -519,7 +519,7 @@ public Response deleteWithResponse( * @return container along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name) { if (this.client.getEndpoint() == null) { return Mono @@ -573,7 +573,7 @@ private Mono> getWithResponseAsync( * @return container along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -623,7 +623,7 @@ private Mono> getWithResponseAsync( * @return container on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getAsync(String resourceGroupName, String workspaceName, String name) { + private Mono getAsync(String resourceGroupName, String workspaceName, String name) { return getWithResponseAsync(resourceGroupName, workspaceName, name) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -640,7 +640,7 @@ private Mono getAsync(String resourceGroupName, String w * @return container. */ @ServiceMethod(returns = ReturnType.SINGLE) - public DataContainerDataInner get(String resourceGroupName, String workspaceName, String name) { + public DataContainerInner get(String resourceGroupName, String workspaceName, String name) { return getAsync(resourceGroupName, workspaceName, name).block(); } @@ -657,7 +657,7 @@ public DataContainerDataInner get(String resourceGroupName, String workspaceName * @return container along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context) { return getWithResponseAsync(resourceGroupName, workspaceName, name, context).block(); } @@ -676,8 +676,8 @@ public Response getWithResponse( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( - String resourceGroupName, String workspaceName, String name, DataContainerDataInner body) { + private Mono> createOrUpdateWithResponseAsync( + String resourceGroupName, String workspaceName, String name, DataContainerInner body) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -738,8 +738,8 @@ private Mono> createOrUpdateWithResponseAsync( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( - String resourceGroupName, String workspaceName, String name, DataContainerDataInner body, Context context) { + private Mono> createOrUpdateWithResponseAsync( + String resourceGroupName, String workspaceName, String name, DataContainerInner body, Context context) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -795,8 +795,8 @@ private Mono> createOrUpdateWithResponseAsync( * @return azure Resource Manager resource envelope on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( - String resourceGroupName, String workspaceName, String name, DataContainerDataInner body) { + private Mono createOrUpdateAsync( + String resourceGroupName, String workspaceName, String name, DataContainerInner body) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, body) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -814,8 +814,8 @@ private Mono createOrUpdateAsync( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - public DataContainerDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, DataContainerDataInner body) { + public DataContainerInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, DataContainerInner body) { return createOrUpdateAsync(resourceGroupName, workspaceName, name, body).block(); } @@ -833,8 +833,8 @@ public DataContainerDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response createOrUpdateWithResponse( - String resourceGroupName, String workspaceName, String name, DataContainerDataInner body, Context context) { + public Response createOrUpdateWithResponse( + String resourceGroupName, String workspaceName, String name, DataContainerInner body, Context context) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, body, context).block(); } @@ -849,7 +849,7 @@ public Response createOrUpdateWithResponse( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink) { + private Mono> listNextSinglePageAsync(String nextLink) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } @@ -862,7 +862,7 @@ private Mono> listNextSinglePageAsync(Stri final String accept = "application/json"; return FluxUtil .withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -886,7 +886,7 @@ private Mono> listNextSinglePageAsync(Stri * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink, Context context) { + private Mono> listNextSinglePageAsync(String nextLink, Context context) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataContainersImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataContainersImpl.java index a06835365fe6..aede6e38b03d 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataContainersImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataContainersImpl.java @@ -10,8 +10,8 @@ import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.machinelearning.fluent.DataContainersClient; -import com.azure.resourcemanager.machinelearning.fluent.models.DataContainerDataInner; -import com.azure.resourcemanager.machinelearning.models.DataContainerData; +import com.azure.resourcemanager.machinelearning.fluent.models.DataContainerInner; +import com.azure.resourcemanager.machinelearning.models.DataContainer; import com.azure.resourcemanager.machinelearning.models.DataContainers; import com.azure.resourcemanager.machinelearning.models.ListViewType; @@ -29,16 +29,16 @@ public DataContainersImpl( this.serviceManager = serviceManager; } - public PagedIterable list(String resourceGroupName, String workspaceName) { - PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName); - return Utils.mapPage(inner, inner1 -> new DataContainerDataImpl(inner1, this.manager())); + public PagedIterable list(String resourceGroupName, String workspaceName) { + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName); + return Utils.mapPage(inner, inner1 -> new DataContainerImpl(inner1, this.manager())); } - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType, Context context) { - PagedIterable inner = + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName, skip, listViewType, context); - return Utils.mapPage(inner, inner1 -> new DataContainerDataImpl(inner1, this.manager())); + return Utils.mapPage(inner, inner1 -> new DataContainerImpl(inner1, this.manager())); } public void delete(String resourceGroupName, String workspaceName, String name) { @@ -50,31 +50,31 @@ public Response deleteWithResponse( return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, name, context); } - public DataContainerData get(String resourceGroupName, String workspaceName, String name) { - DataContainerDataInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name); + public DataContainer get(String resourceGroupName, String workspaceName, String name) { + DataContainerInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name); if (inner != null) { - return new DataContainerDataImpl(inner, this.manager()); + return new DataContainerImpl(inner, this.manager()); } else { return null; } } - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context) { - Response inner = + Response inner = this.serviceClient().getWithResponse(resourceGroupName, workspaceName, name, context); if (inner != null) { return new SimpleResponse<>( inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new DataContainerDataImpl(inner.getValue(), this.manager())); + new DataContainerImpl(inner.getValue(), this.manager())); } else { return null; } } - public DataContainerData getById(String id) { + public DataContainer getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -100,7 +100,7 @@ public DataContainerData getById(String id) { return this.getWithResponse(resourceGroupName, workspaceName, name, Context.NONE).getValue(); } - public Response getByIdWithResponse(String id, Context context) { + public Response getByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -186,7 +186,7 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager return this.serviceManager; } - public DataContainerDataImpl define(String name) { - return new DataContainerDataImpl(name, this.manager()); + public DataContainerImpl define(String name) { + return new DataContainerImpl(name, this.manager()); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataVersionBaseDataImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataVersionBaseImpl.java similarity index 77% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataVersionBaseDataImpl.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataVersionBaseImpl.java index eb44fdf76ced..00c2cd10b375 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataVersionBaseDataImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataVersionBaseImpl.java @@ -6,13 +6,12 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.DataVersionBaseDataInner; -import com.azure.resourcemanager.machinelearning.models.DataVersionBaseData; -import com.azure.resourcemanager.machinelearning.models.DataVersionBaseDetails; +import com.azure.resourcemanager.machinelearning.fluent.models.DataVersionBaseInner; +import com.azure.resourcemanager.machinelearning.models.DataVersionBase; +import com.azure.resourcemanager.machinelearning.models.DataVersionBaseProperties; -public final class DataVersionBaseDataImpl - implements DataVersionBaseData, DataVersionBaseData.Definition, DataVersionBaseData.Update { - private DataVersionBaseDataInner innerObject; +public final class DataVersionBaseImpl implements DataVersionBase, DataVersionBase.Definition, DataVersionBase.Update { + private DataVersionBaseInner innerObject; private final com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager; @@ -28,7 +27,7 @@ public String type() { return this.innerModel().type(); } - public DataVersionBaseDetails properties() { + public DataVersionBaseProperties properties() { return this.innerModel().properties(); } @@ -40,7 +39,7 @@ public String resourceGroupName() { return resourceGroupName; } - public DataVersionBaseDataInner innerModel() { + public DataVersionBaseInner innerModel() { return this.innerObject; } @@ -56,14 +55,14 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager private String version; - public DataVersionBaseDataImpl withExistingData(String resourceGroupName, String workspaceName, String name) { + public DataVersionBaseImpl withExistingData(String resourceGroupName, String workspaceName, String name) { this.resourceGroupName = resourceGroupName; this.workspaceName = workspaceName; this.name = name; return this; } - public DataVersionBaseData create() { + public DataVersionBase create() { this.innerObject = serviceManager .serviceClient() @@ -74,7 +73,7 @@ public DataVersionBaseData create() { return this; } - public DataVersionBaseData create(Context context) { + public DataVersionBase create(Context context) { this.innerObject = serviceManager .serviceClient() @@ -84,18 +83,17 @@ public DataVersionBaseData create(Context context) { return this; } - DataVersionBaseDataImpl( - String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { - this.innerObject = new DataVersionBaseDataInner(); + DataVersionBaseImpl(String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { + this.innerObject = new DataVersionBaseInner(); this.serviceManager = serviceManager; this.version = name; } - public DataVersionBaseDataImpl update() { + public DataVersionBaseImpl update() { return this; } - public DataVersionBaseData apply() { + public DataVersionBase apply() { this.innerObject = serviceManager .serviceClient() @@ -106,7 +104,7 @@ public DataVersionBaseData apply() { return this; } - public DataVersionBaseData apply(Context context) { + public DataVersionBase apply(Context context) { this.innerObject = serviceManager .serviceClient() @@ -116,8 +114,8 @@ public DataVersionBaseData apply(Context context) { return this; } - DataVersionBaseDataImpl( - DataVersionBaseDataInner innerObject, + DataVersionBaseImpl( + DataVersionBaseInner innerObject, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { this.innerObject = innerObject; this.serviceManager = serviceManager; @@ -127,7 +125,7 @@ public DataVersionBaseData apply(Context context) { this.version = Utils.getValueFromIdByName(innerObject.id(), "versions"); } - public DataVersionBaseData refresh() { + public DataVersionBase refresh() { this.innerObject = serviceManager .serviceClient() @@ -137,7 +135,7 @@ public DataVersionBaseData refresh() { return this; } - public DataVersionBaseData refresh(Context context) { + public DataVersionBase refresh(Context context) { this.innerObject = serviceManager .serviceClient() @@ -147,7 +145,7 @@ public DataVersionBaseData refresh(Context context) { return this; } - public DataVersionBaseDataImpl withProperties(DataVersionBaseDetails properties) { + public DataVersionBaseImpl withProperties(DataVersionBaseProperties properties) { this.innerModel().withProperties(properties); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataVersionsClientImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataVersionsClientImpl.java index 020934963bfa..33af672a7a7e 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataVersionsClientImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataVersionsClientImpl.java @@ -29,7 +29,7 @@ import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.resourcemanager.machinelearning.fluent.DataVersionsClient; -import com.azure.resourcemanager.machinelearning.fluent.models.DataVersionBaseDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.DataVersionBaseInner; import com.azure.resourcemanager.machinelearning.models.DataVersionBaseResourceArmPaginatedResult; import com.azure.resourcemanager.machinelearning.models.ListViewType; import reactor.core.publisher.Mono; @@ -104,7 +104,7 @@ Mono> delete( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/data/{name}/versions/{version}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( + Mono> get( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -121,7 +121,7 @@ Mono> get( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/data/{name}/versions/{version}") @ExpectedResponses({200, 201}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> createOrUpdate( + Mono> createOrUpdate( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -129,7 +129,7 @@ Mono> createOrUpdate( @PathParam("name") String name, @PathParam("version") String version, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") DataVersionBaseDataInner body, + @BodyParam("application/json") DataVersionBaseInner body, @HeaderParam("Accept") String accept, Context context); @@ -164,7 +164,7 @@ Mono> listNext( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String name, @@ -214,7 +214,7 @@ private Mono> listSinglePageAsync( listViewType, accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -247,7 +247,7 @@ private Mono> listSinglePageAsync( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String name, @@ -326,7 +326,7 @@ private Mono> listSinglePageAsync( * @return a paginated list of DataVersionBase entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String name, @@ -352,7 +352,7 @@ private PagedFlux listAsync( * @return a paginated list of DataVersionBase entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync(String resourceGroupName, String workspaceName, String name) { + private PagedFlux listAsync(String resourceGroupName, String workspaceName, String name) { final String orderBy = null; final Integer top = null; final String skip = null; @@ -383,7 +383,7 @@ private PagedFlux listAsync(String resourceGroupName, * @return a paginated list of DataVersionBase entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String name, @@ -412,7 +412,7 @@ private PagedFlux listAsync( * @return a paginated list of DataVersionBase entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list(String resourceGroupName, String workspaceName, String name) { + public PagedIterable list(String resourceGroupName, String workspaceName, String name) { final String orderBy = null; final Integer top = null; final String skip = null; @@ -442,7 +442,7 @@ public PagedIterable list(String resourceGroupName, St * @return a paginated list of DataVersionBase entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -636,7 +636,7 @@ public Response deleteWithResponse( * @return version along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name, String version) { if (this.client.getEndpoint() == null) { return Mono @@ -695,7 +695,7 @@ private Mono> getWithResponseAsync( * @return version along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name, String version, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -750,7 +750,7 @@ private Mono> getWithResponseAsync( * @return version on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getAsync( + private Mono getAsync( String resourceGroupName, String workspaceName, String name, String version) { return getWithResponseAsync(resourceGroupName, workspaceName, name, version) .flatMap(res -> Mono.justOrEmpty(res.getValue())); @@ -769,7 +769,7 @@ private Mono getAsync( * @return version. */ @ServiceMethod(returns = ReturnType.SINGLE) - public DataVersionBaseDataInner get(String resourceGroupName, String workspaceName, String name, String version) { + public DataVersionBaseInner get(String resourceGroupName, String workspaceName, String name, String version) { return getAsync(resourceGroupName, workspaceName, name, version).block(); } @@ -787,7 +787,7 @@ public DataVersionBaseDataInner get(String resourceGroupName, String workspaceNa * @return version along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context) { return getWithResponseAsync(resourceGroupName, workspaceName, name, version, context).block(); } @@ -807,8 +807,8 @@ public Response getWithResponse( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( - String resourceGroupName, String workspaceName, String name, String version, DataVersionBaseDataInner body) { + private Mono> createOrUpdateWithResponseAsync( + String resourceGroupName, String workspaceName, String name, String version, DataVersionBaseInner body) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -874,12 +874,12 @@ private Mono> createOrUpdateWithResponseAsync * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( + private Mono> createOrUpdateWithResponseAsync( String resourceGroupName, String workspaceName, String name, String version, - DataVersionBaseDataInner body, + DataVersionBaseInner body, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -941,8 +941,8 @@ private Mono> createOrUpdateWithResponseAsync * @return azure Resource Manager resource envelope on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( - String resourceGroupName, String workspaceName, String name, String version, DataVersionBaseDataInner body) { + private Mono createOrUpdateAsync( + String resourceGroupName, String workspaceName, String name, String version, DataVersionBaseInner body) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, version, body) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -961,8 +961,8 @@ private Mono createOrUpdateAsync( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - public DataVersionBaseDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, String version, DataVersionBaseDataInner body) { + public DataVersionBaseInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, String version, DataVersionBaseInner body) { return createOrUpdateAsync(resourceGroupName, workspaceName, name, version, body).block(); } @@ -981,12 +981,12 @@ public DataVersionBaseDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response createOrUpdateWithResponse( + public Response createOrUpdateWithResponse( String resourceGroupName, String workspaceName, String name, String version, - DataVersionBaseDataInner body, + DataVersionBaseInner body, Context context) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, version, body, context).block(); } @@ -1002,7 +1002,7 @@ public Response createOrUpdateWithResponse( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink) { + private Mono> listNextSinglePageAsync(String nextLink) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } @@ -1015,7 +1015,7 @@ private Mono> listNextSinglePageAsync(St final String accept = "application/json"; return FluxUtil .withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -1039,7 +1039,7 @@ private Mono> listNextSinglePageAsync(St * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink, Context context) { + private Mono> listNextSinglePageAsync(String nextLink, Context context) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataVersionsImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataVersionsImpl.java index 2b82c582e9d6..8787e321745a 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataVersionsImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DataVersionsImpl.java @@ -10,8 +10,8 @@ import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.machinelearning.fluent.DataVersionsClient; -import com.azure.resourcemanager.machinelearning.fluent.models.DataVersionBaseDataInner; -import com.azure.resourcemanager.machinelearning.models.DataVersionBaseData; +import com.azure.resourcemanager.machinelearning.fluent.models.DataVersionBaseInner; +import com.azure.resourcemanager.machinelearning.models.DataVersionBase; import com.azure.resourcemanager.machinelearning.models.DataVersions; import com.azure.resourcemanager.machinelearning.models.ListViewType; @@ -29,13 +29,12 @@ public DataVersionsImpl( this.serviceManager = serviceManager; } - public PagedIterable list(String resourceGroupName, String workspaceName, String name) { - PagedIterable inner = - this.serviceClient().list(resourceGroupName, workspaceName, name); - return Utils.mapPage(inner, inner1 -> new DataVersionBaseDataImpl(inner1, this.manager())); + public PagedIterable list(String resourceGroupName, String workspaceName, String name) { + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName, name); + return Utils.mapPage(inner, inner1 -> new DataVersionBaseImpl(inner1, this.manager())); } - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -45,11 +44,11 @@ public PagedIterable list( String tags, ListViewType listViewType, Context context) { - PagedIterable inner = + PagedIterable inner = this .serviceClient() .list(resourceGroupName, workspaceName, name, orderBy, top, skip, tags, listViewType, context); - return Utils.mapPage(inner, inner1 -> new DataVersionBaseDataImpl(inner1, this.manager())); + return Utils.mapPage(inner, inner1 -> new DataVersionBaseImpl(inner1, this.manager())); } public void delete(String resourceGroupName, String workspaceName, String name, String version) { @@ -61,31 +60,31 @@ public Response deleteWithResponse( return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, name, version, context); } - public DataVersionBaseData get(String resourceGroupName, String workspaceName, String name, String version) { - DataVersionBaseDataInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name, version); + public DataVersionBase get(String resourceGroupName, String workspaceName, String name, String version) { + DataVersionBaseInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name, version); if (inner != null) { - return new DataVersionBaseDataImpl(inner, this.manager()); + return new DataVersionBaseImpl(inner, this.manager()); } else { return null; } } - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context) { - Response inner = + Response inner = this.serviceClient().getWithResponse(resourceGroupName, workspaceName, name, version, context); if (inner != null) { return new SimpleResponse<>( inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new DataVersionBaseDataImpl(inner.getValue(), this.manager())); + new DataVersionBaseImpl(inner.getValue(), this.manager())); } else { return null; } } - public DataVersionBaseData getById(String id) { + public DataVersionBase getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -118,7 +117,7 @@ public DataVersionBaseData getById(String id) { return this.getWithResponse(resourceGroupName, workspaceName, name, version, Context.NONE).getValue(); } - public Response getByIdWithResponse(String id, Context context) { + public Response getByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -225,7 +224,7 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager return this.serviceManager; } - public DataVersionBaseDataImpl define(String name) { - return new DataVersionBaseDataImpl(name, this.manager()); + public DataVersionBaseImpl define(String name) { + return new DataVersionBaseImpl(name, this.manager()); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DatastoreDataImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DatastoreImpl.java similarity index 80% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DatastoreDataImpl.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DatastoreImpl.java index 21f1d2667452..7c6f46611bee 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DatastoreDataImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DatastoreImpl.java @@ -7,13 +7,13 @@ import com.azure.core.http.rest.Response; import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.DatastoreDataInner; -import com.azure.resourcemanager.machinelearning.models.DatastoreData; -import com.azure.resourcemanager.machinelearning.models.DatastoreDetails; +import com.azure.resourcemanager.machinelearning.fluent.models.DatastoreInner; +import com.azure.resourcemanager.machinelearning.models.Datastore; +import com.azure.resourcemanager.machinelearning.models.DatastoreProperties; import com.azure.resourcemanager.machinelearning.models.DatastoreSecrets; -public final class DatastoreDataImpl implements DatastoreData, DatastoreData.Definition, DatastoreData.Update { - private DatastoreDataInner innerObject; +public final class DatastoreImpl implements Datastore, Datastore.Definition, Datastore.Update { + private DatastoreInner innerObject; private final com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager; @@ -29,7 +29,7 @@ public String type() { return this.innerModel().type(); } - public DatastoreDetails properties() { + public DatastoreProperties properties() { return this.innerModel().properties(); } @@ -41,7 +41,7 @@ public String resourceGroupName() { return resourceGroupName; } - public DatastoreDataInner innerModel() { + public DatastoreInner innerModel() { return this.innerObject; } @@ -59,13 +59,13 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager private Boolean updateSkipValidation; - public DatastoreDataImpl withExistingWorkspace(String resourceGroupName, String workspaceName) { + public DatastoreImpl withExistingWorkspace(String resourceGroupName, String workspaceName) { this.resourceGroupName = resourceGroupName; this.workspaceName = workspaceName; return this; } - public DatastoreData create() { + public Datastore create() { this.innerObject = serviceManager .serviceClient() @@ -76,7 +76,7 @@ public DatastoreData create() { return this; } - public DatastoreData create(Context context) { + public Datastore create(Context context) { this.innerObject = serviceManager .serviceClient() @@ -87,19 +87,19 @@ public DatastoreData create(Context context) { return this; } - DatastoreDataImpl(String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { - this.innerObject = new DatastoreDataInner(); + DatastoreImpl(String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { + this.innerObject = new DatastoreInner(); this.serviceManager = serviceManager; this.name = name; this.createSkipValidation = null; } - public DatastoreDataImpl update() { + public DatastoreImpl update() { this.updateSkipValidation = null; return this; } - public DatastoreData apply() { + public Datastore apply() { this.innerObject = serviceManager .serviceClient() @@ -110,7 +110,7 @@ public DatastoreData apply() { return this; } - public DatastoreData apply(Context context) { + public Datastore apply(Context context) { this.innerObject = serviceManager .serviceClient() @@ -121,9 +121,8 @@ public DatastoreData apply(Context context) { return this; } - DatastoreDataImpl( - DatastoreDataInner innerObject, - com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { + DatastoreImpl( + DatastoreInner innerObject, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { this.innerObject = innerObject; this.serviceManager = serviceManager; this.resourceGroupName = Utils.getValueFromIdByName(innerObject.id(), "resourceGroups"); @@ -131,7 +130,7 @@ public DatastoreData apply(Context context) { this.name = Utils.getValueFromIdByName(innerObject.id(), "datastores"); } - public DatastoreData refresh() { + public Datastore refresh() { this.innerObject = serviceManager .serviceClient() @@ -141,7 +140,7 @@ public DatastoreData refresh() { return this; } - public DatastoreData refresh(Context context) { + public Datastore refresh(Context context) { this.innerObject = serviceManager .serviceClient() @@ -159,12 +158,12 @@ public Response listSecretsWithResponse(Context context) { return serviceManager.datastores().listSecretsWithResponse(resourceGroupName, workspaceName, name, context); } - public DatastoreDataImpl withProperties(DatastoreDetails properties) { + public DatastoreImpl withProperties(DatastoreProperties properties) { this.innerModel().withProperties(properties); return this; } - public DatastoreDataImpl withSkipValidation(Boolean skipValidation) { + public DatastoreImpl withSkipValidation(Boolean skipValidation) { if (isInCreateMode()) { this.createSkipValidation = skipValidation; return this; diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DatastoresClientImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DatastoresClientImpl.java index 8191aaa912b5..c525b6e3a1ac 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DatastoresClientImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DatastoresClientImpl.java @@ -32,7 +32,7 @@ import com.azure.core.util.serializer.CollectionFormat; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.resourcemanager.machinelearning.fluent.DatastoresClient; -import com.azure.resourcemanager.machinelearning.fluent.models.DatastoreDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.DatastoreInner; import com.azure.resourcemanager.machinelearning.fluent.models.DatastoreSecretsInner; import com.azure.resourcemanager.machinelearning.models.DatastoreResourceArmPaginatedResult; import java.util.List; @@ -108,7 +108,7 @@ Mono> delete( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/datastores/{name}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( + Mono> get( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -124,7 +124,7 @@ Mono> get( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/datastores/{name}") @ExpectedResponses({200, 201}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> createOrUpdate( + Mono> createOrUpdate( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -132,7 +132,7 @@ Mono> createOrUpdate( @PathParam("name") String name, @QueryParam("api-version") String apiVersion, @QueryParam("skipValidation") Boolean skipValidation, - @BodyParam("application/json") DatastoreDataInner body, + @BodyParam("application/json") DatastoreInner body, @HeaderParam("Accept") String accept, Context context); @@ -182,7 +182,7 @@ Mono> listNext( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String skip, @@ -233,7 +233,7 @@ private Mono> listSinglePageAsync( orderByAsc, accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -265,7 +265,7 @@ private Mono> listSinglePageAsync( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String skip, @@ -344,7 +344,7 @@ private Mono> listSinglePageAsync( * @return a paginated list of Datastore entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String skip, @@ -372,7 +372,7 @@ private PagedFlux listAsync( * @return a paginated list of Datastore entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync(String resourceGroupName, String workspaceName) { + private PagedFlux listAsync(String resourceGroupName, String workspaceName) { final String skip = null; final Integer count = null; final Boolean isDefault = null; @@ -406,7 +406,7 @@ private PagedFlux listAsync(String resourceGroupName, String * @return a paginated list of Datastore entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String skip, @@ -444,7 +444,7 @@ private PagedFlux listAsync( * @return a paginated list of Datastore entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list(String resourceGroupName, String workspaceName) { + public PagedIterable list(String resourceGroupName, String workspaceName) { final String skip = null; final Integer count = null; final Boolean isDefault = null; @@ -476,7 +476,7 @@ public PagedIterable list(String resourceGroupName, String w * @return a paginated list of Datastore entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String skip, @@ -665,7 +665,7 @@ public Response deleteWithResponse( * @return datastore along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name) { if (this.client.getEndpoint() == null) { return Mono @@ -719,7 +719,7 @@ private Mono> getWithResponseAsync( * @return datastore along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -769,7 +769,7 @@ private Mono> getWithResponseAsync( * @return datastore on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getAsync(String resourceGroupName, String workspaceName, String name) { + private Mono getAsync(String resourceGroupName, String workspaceName, String name) { return getWithResponseAsync(resourceGroupName, workspaceName, name) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -786,7 +786,7 @@ private Mono getAsync(String resourceGroupName, String works * @return datastore. */ @ServiceMethod(returns = ReturnType.SINGLE) - public DatastoreDataInner get(String resourceGroupName, String workspaceName, String name) { + public DatastoreInner get(String resourceGroupName, String workspaceName, String name) { return getAsync(resourceGroupName, workspaceName, name).block(); } @@ -803,7 +803,7 @@ public DatastoreDataInner get(String resourceGroupName, String workspaceName, St * @return datastore along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context) { return getWithResponseAsync(resourceGroupName, workspaceName, name, context).block(); } @@ -823,8 +823,8 @@ public Response getWithResponse( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( - String resourceGroupName, String workspaceName, String name, DatastoreDataInner body, Boolean skipValidation) { + private Mono> createOrUpdateWithResponseAsync( + String resourceGroupName, String workspaceName, String name, DatastoreInner body, Boolean skipValidation) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -887,11 +887,11 @@ private Mono> createOrUpdateWithResponseAsync( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( + private Mono> createOrUpdateWithResponseAsync( String resourceGroupName, String workspaceName, String name, - DatastoreDataInner body, + DatastoreInner body, Boolean skipValidation, Context context) { if (this.client.getEndpoint() == null) { @@ -951,8 +951,8 @@ private Mono> createOrUpdateWithResponseAsync( * @return azure Resource Manager resource envelope on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( - String resourceGroupName, String workspaceName, String name, DatastoreDataInner body, Boolean skipValidation) { + private Mono createOrUpdateAsync( + String resourceGroupName, String workspaceName, String name, DatastoreInner body, Boolean skipValidation) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, body, skipValidation) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -970,8 +970,8 @@ private Mono createOrUpdateAsync( * @return azure Resource Manager resource envelope on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( - String resourceGroupName, String workspaceName, String name, DatastoreDataInner body) { + private Mono createOrUpdateAsync( + String resourceGroupName, String workspaceName, String name, DatastoreInner body) { final Boolean skipValidation = null; return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, body, skipValidation) .flatMap(res -> Mono.justOrEmpty(res.getValue())); @@ -990,8 +990,8 @@ private Mono createOrUpdateAsync( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - public DatastoreDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, DatastoreDataInner body) { + public DatastoreInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, DatastoreInner body) { final Boolean skipValidation = null; return createOrUpdateAsync(resourceGroupName, workspaceName, name, body, skipValidation).block(); } @@ -1011,11 +1011,11 @@ public DatastoreDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response createOrUpdateWithResponse( + public Response createOrUpdateWithResponse( String resourceGroupName, String workspaceName, String name, - DatastoreDataInner body, + DatastoreInner body, Boolean skipValidation, Context context) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, body, skipValidation, context) @@ -1188,7 +1188,7 @@ public Response listSecretsWithResponse( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink) { + private Mono> listNextSinglePageAsync(String nextLink) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } @@ -1201,7 +1201,7 @@ private Mono> listNextSinglePageAsync(String n final String accept = "application/json"; return FluxUtil .withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -1225,7 +1225,7 @@ private Mono> listNextSinglePageAsync(String n * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink, Context context) { + private Mono> listNextSinglePageAsync(String nextLink, Context context) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DatastoresImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DatastoresImpl.java index 376f7c9a45ff..e6530a0d68d1 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DatastoresImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/DatastoresImpl.java @@ -10,9 +10,9 @@ import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.machinelearning.fluent.DatastoresClient; -import com.azure.resourcemanager.machinelearning.fluent.models.DatastoreDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.DatastoreInner; import com.azure.resourcemanager.machinelearning.fluent.models.DatastoreSecretsInner; -import com.azure.resourcemanager.machinelearning.models.DatastoreData; +import com.azure.resourcemanager.machinelearning.models.Datastore; import com.azure.resourcemanager.machinelearning.models.DatastoreSecrets; import com.azure.resourcemanager.machinelearning.models.Datastores; import java.util.List; @@ -30,12 +30,12 @@ public DatastoresImpl( this.serviceManager = serviceManager; } - public PagedIterable list(String resourceGroupName, String workspaceName) { - PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName); - return Utils.mapPage(inner, inner1 -> new DatastoreDataImpl(inner1, this.manager())); + public PagedIterable list(String resourceGroupName, String workspaceName) { + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName); + return Utils.mapPage(inner, inner1 -> new DatastoreImpl(inner1, this.manager())); } - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String skip, @@ -46,7 +46,7 @@ public PagedIterable list( String orderBy, Boolean orderByAsc, Context context) { - PagedIterable inner = + PagedIterable inner = this .serviceClient() .list( @@ -60,7 +60,7 @@ public PagedIterable list( orderBy, orderByAsc, context); - return Utils.mapPage(inner, inner1 -> new DatastoreDataImpl(inner1, this.manager())); + return Utils.mapPage(inner, inner1 -> new DatastoreImpl(inner1, this.manager())); } public void delete(String resourceGroupName, String workspaceName, String name) { @@ -72,25 +72,25 @@ public Response deleteWithResponse( return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, name, context); } - public DatastoreData get(String resourceGroupName, String workspaceName, String name) { - DatastoreDataInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name); + public Datastore get(String resourceGroupName, String workspaceName, String name) { + DatastoreInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name); if (inner != null) { - return new DatastoreDataImpl(inner, this.manager()); + return new DatastoreImpl(inner, this.manager()); } else { return null; } } - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context) { - Response inner = + Response inner = this.serviceClient().getWithResponse(resourceGroupName, workspaceName, name, context); if (inner != null) { return new SimpleResponse<>( inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new DatastoreDataImpl(inner.getValue(), this.manager())); + new DatastoreImpl(inner.getValue(), this.manager())); } else { return null; } @@ -120,7 +120,7 @@ public Response listSecretsWithResponse( } } - public DatastoreData getById(String id) { + public Datastore getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -146,7 +146,7 @@ public DatastoreData getById(String id) { return this.getWithResponse(resourceGroupName, workspaceName, name, Context.NONE).getValue(); } - public Response getByIdWithResponse(String id, Context context) { + public Response getByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -232,7 +232,7 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager return this.serviceManager; } - public DatastoreDataImpl define(String name) { - return new DatastoreDataImpl(name, this.manager()); + public DatastoreImpl define(String name) { + return new DatastoreImpl(name, this.manager()); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentContainerDataImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentContainerImpl.java similarity index 77% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentContainerDataImpl.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentContainerImpl.java index b634d9599daf..4ee12b6fd24e 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentContainerDataImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentContainerImpl.java @@ -6,13 +6,13 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentContainerDataInner; -import com.azure.resourcemanager.machinelearning.models.EnvironmentContainerData; -import com.azure.resourcemanager.machinelearning.models.EnvironmentContainerDetails; +import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentContainerInner; +import com.azure.resourcemanager.machinelearning.models.EnvironmentContainer; +import com.azure.resourcemanager.machinelearning.models.EnvironmentContainerProperties; -public final class EnvironmentContainerDataImpl - implements EnvironmentContainerData, EnvironmentContainerData.Definition, EnvironmentContainerData.Update { - private EnvironmentContainerDataInner innerObject; +public final class EnvironmentContainerImpl + implements EnvironmentContainer, EnvironmentContainer.Definition, EnvironmentContainer.Update { + private EnvironmentContainerInner innerObject; private final com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager; @@ -28,7 +28,7 @@ public String type() { return this.innerModel().type(); } - public EnvironmentContainerDetails properties() { + public EnvironmentContainerProperties properties() { return this.innerModel().properties(); } @@ -40,7 +40,7 @@ public String resourceGroupName() { return resourceGroupName; } - public EnvironmentContainerDataInner innerModel() { + public EnvironmentContainerInner innerModel() { return this.innerObject; } @@ -54,13 +54,13 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager private String name; - public EnvironmentContainerDataImpl withExistingWorkspace(String resourceGroupName, String workspaceName) { + public EnvironmentContainerImpl withExistingWorkspace(String resourceGroupName, String workspaceName) { this.resourceGroupName = resourceGroupName; this.workspaceName = workspaceName; return this; } - public EnvironmentContainerData create() { + public EnvironmentContainer create() { this.innerObject = serviceManager .serviceClient() @@ -70,7 +70,7 @@ public EnvironmentContainerData create() { return this; } - public EnvironmentContainerData create(Context context) { + public EnvironmentContainer create(Context context) { this.innerObject = serviceManager .serviceClient() @@ -80,18 +80,18 @@ public EnvironmentContainerData create(Context context) { return this; } - EnvironmentContainerDataImpl( + EnvironmentContainerImpl( String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { - this.innerObject = new EnvironmentContainerDataInner(); + this.innerObject = new EnvironmentContainerInner(); this.serviceManager = serviceManager; this.name = name; } - public EnvironmentContainerDataImpl update() { + public EnvironmentContainerImpl update() { return this; } - public EnvironmentContainerData apply() { + public EnvironmentContainer apply() { this.innerObject = serviceManager .serviceClient() @@ -101,7 +101,7 @@ public EnvironmentContainerData apply() { return this; } - public EnvironmentContainerData apply(Context context) { + public EnvironmentContainer apply(Context context) { this.innerObject = serviceManager .serviceClient() @@ -111,8 +111,8 @@ public EnvironmentContainerData apply(Context context) { return this; } - EnvironmentContainerDataImpl( - EnvironmentContainerDataInner innerObject, + EnvironmentContainerImpl( + EnvironmentContainerInner innerObject, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { this.innerObject = innerObject; this.serviceManager = serviceManager; @@ -121,7 +121,7 @@ public EnvironmentContainerData apply(Context context) { this.name = Utils.getValueFromIdByName(innerObject.id(), "environments"); } - public EnvironmentContainerData refresh() { + public EnvironmentContainer refresh() { this.innerObject = serviceManager .serviceClient() @@ -131,7 +131,7 @@ public EnvironmentContainerData refresh() { return this; } - public EnvironmentContainerData refresh(Context context) { + public EnvironmentContainer refresh(Context context) { this.innerObject = serviceManager .serviceClient() @@ -141,7 +141,7 @@ public EnvironmentContainerData refresh(Context context) { return this; } - public EnvironmentContainerDataImpl withProperties(EnvironmentContainerDetails properties) { + public EnvironmentContainerImpl withProperties(EnvironmentContainerProperties properties) { this.innerModel().withProperties(properties); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentContainersClientImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentContainersClientImpl.java index c2feb7dd5e19..b6bab63de640 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentContainersClientImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentContainersClientImpl.java @@ -29,7 +29,7 @@ import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.resourcemanager.machinelearning.fluent.EnvironmentContainersClient; -import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentContainerInner; import com.azure.resourcemanager.machinelearning.models.EnvironmentContainerResourceArmPaginatedResult; import com.azure.resourcemanager.machinelearning.models.ListViewType; import reactor.core.publisher.Mono; @@ -100,7 +100,7 @@ Mono> delete( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/environments/{name}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( + Mono> get( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -116,14 +116,14 @@ Mono> get( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/environments/{name}") @ExpectedResponses({200, 201}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> createOrUpdate( + Mono> createOrUpdate( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("workspaceName") String workspaceName, @PathParam("name") String name, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") EnvironmentContainerDataInner body, + @BodyParam("application/json") EnvironmentContainerInner body, @HeaderParam("Accept") String accept, Context context); @@ -152,7 +152,7 @@ Mono> listNext( * completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType) { if (this.client.getEndpoint() == null) { return Mono @@ -188,7 +188,7 @@ private Mono> listSinglePageAsync( listViewType, accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -215,7 +215,7 @@ private Mono> listSinglePageAsync( * completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -273,7 +273,7 @@ private Mono> listSinglePageAsync( * @return a paginated list of EnvironmentContainer entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType) { return new PagedFlux<>( () -> listSinglePageAsync(resourceGroupName, workspaceName, skip, listViewType), @@ -291,7 +291,7 @@ private PagedFlux listAsync( * @return a paginated list of EnvironmentContainer entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync(String resourceGroupName, String workspaceName) { + private PagedFlux listAsync(String resourceGroupName, String workspaceName) { final String skip = null; final ListViewType listViewType = null; return new PagedFlux<>( @@ -313,7 +313,7 @@ private PagedFlux listAsync(String resourceGroupN * @return a paginated list of EnvironmentContainer entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType, Context context) { return new PagedFlux<>( () -> listSinglePageAsync(resourceGroupName, workspaceName, skip, listViewType, context), @@ -331,7 +331,7 @@ private PagedFlux listAsync( * @return a paginated list of EnvironmentContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list(String resourceGroupName, String workspaceName) { + public PagedIterable list(String resourceGroupName, String workspaceName) { final String skip = null; final ListViewType listViewType = null; return new PagedIterable<>(listAsync(resourceGroupName, workspaceName, skip, listViewType)); @@ -351,7 +351,7 @@ public PagedIterable list(String resourceGroupNam * @return a paginated list of EnvironmentContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType, Context context) { return new PagedIterable<>(listAsync(resourceGroupName, workspaceName, skip, listViewType, context)); } @@ -520,7 +520,7 @@ public Response deleteWithResponse( * @return container along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name) { if (this.client.getEndpoint() == null) { return Mono @@ -574,7 +574,7 @@ private Mono> getWithResponseAsync( * @return container along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -624,7 +624,7 @@ private Mono> getWithResponseAsync( * @return container on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getAsync(String resourceGroupName, String workspaceName, String name) { + private Mono getAsync(String resourceGroupName, String workspaceName, String name) { return getWithResponseAsync(resourceGroupName, workspaceName, name) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -641,7 +641,7 @@ private Mono getAsync(String resourceGroupName, S * @return container. */ @ServiceMethod(returns = ReturnType.SINGLE) - public EnvironmentContainerDataInner get(String resourceGroupName, String workspaceName, String name) { + public EnvironmentContainerInner get(String resourceGroupName, String workspaceName, String name) { return getAsync(resourceGroupName, workspaceName, name).block(); } @@ -658,7 +658,7 @@ public EnvironmentContainerDataInner get(String resourceGroupName, String worksp * @return container along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context) { return getWithResponseAsync(resourceGroupName, workspaceName, name, context).block(); } @@ -677,8 +677,8 @@ public Response getWithResponse( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( - String resourceGroupName, String workspaceName, String name, EnvironmentContainerDataInner body) { + private Mono> createOrUpdateWithResponseAsync( + String resourceGroupName, String workspaceName, String name, EnvironmentContainerInner body) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -739,12 +739,8 @@ private Mono> createOrUpdateWithResponse * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( - String resourceGroupName, - String workspaceName, - String name, - EnvironmentContainerDataInner body, - Context context) { + private Mono> createOrUpdateWithResponseAsync( + String resourceGroupName, String workspaceName, String name, EnvironmentContainerInner body, Context context) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -800,8 +796,8 @@ private Mono> createOrUpdateWithResponse * @return azure Resource Manager resource envelope on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( - String resourceGroupName, String workspaceName, String name, EnvironmentContainerDataInner body) { + private Mono createOrUpdateAsync( + String resourceGroupName, String workspaceName, String name, EnvironmentContainerInner body) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, body) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -819,8 +815,8 @@ private Mono createOrUpdateAsync( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - public EnvironmentContainerDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, EnvironmentContainerDataInner body) { + public EnvironmentContainerInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, EnvironmentContainerInner body) { return createOrUpdateAsync(resourceGroupName, workspaceName, name, body).block(); } @@ -838,12 +834,8 @@ public EnvironmentContainerDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response createOrUpdateWithResponse( - String resourceGroupName, - String workspaceName, - String name, - EnvironmentContainerDataInner body, - Context context) { + public Response createOrUpdateWithResponse( + String resourceGroupName, String workspaceName, String name, EnvironmentContainerInner body, Context context) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, body, context).block(); } @@ -858,7 +850,7 @@ public Response createOrUpdateWithResponse( * completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink) { + private Mono> listNextSinglePageAsync(String nextLink) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } @@ -871,7 +863,7 @@ private Mono> listNextSinglePageAsy final String accept = "application/json"; return FluxUtil .withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -895,8 +887,7 @@ private Mono> listNextSinglePageAsy * completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync( - String nextLink, Context context) { + private Mono> listNextSinglePageAsync(String nextLink, Context context) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentContainersImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentContainersImpl.java index f562d3cb0a38..1021b5427554 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentContainersImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentContainersImpl.java @@ -10,8 +10,8 @@ import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.machinelearning.fluent.EnvironmentContainersClient; -import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentContainerDataInner; -import com.azure.resourcemanager.machinelearning.models.EnvironmentContainerData; +import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentContainerInner; +import com.azure.resourcemanager.machinelearning.models.EnvironmentContainer; import com.azure.resourcemanager.machinelearning.models.EnvironmentContainers; import com.azure.resourcemanager.machinelearning.models.ListViewType; @@ -29,17 +29,16 @@ public EnvironmentContainersImpl( this.serviceManager = serviceManager; } - public PagedIterable list(String resourceGroupName, String workspaceName) { - PagedIterable inner = - this.serviceClient().list(resourceGroupName, workspaceName); - return Utils.mapPage(inner, inner1 -> new EnvironmentContainerDataImpl(inner1, this.manager())); + public PagedIterable list(String resourceGroupName, String workspaceName) { + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName); + return Utils.mapPage(inner, inner1 -> new EnvironmentContainerImpl(inner1, this.manager())); } - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType, Context context) { - PagedIterable inner = + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName, skip, listViewType, context); - return Utils.mapPage(inner, inner1 -> new EnvironmentContainerDataImpl(inner1, this.manager())); + return Utils.mapPage(inner, inner1 -> new EnvironmentContainerImpl(inner1, this.manager())); } public void delete(String resourceGroupName, String workspaceName, String name) { @@ -51,31 +50,31 @@ public Response deleteWithResponse( return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, name, context); } - public EnvironmentContainerData get(String resourceGroupName, String workspaceName, String name) { - EnvironmentContainerDataInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name); + public EnvironmentContainer get(String resourceGroupName, String workspaceName, String name) { + EnvironmentContainerInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name); if (inner != null) { - return new EnvironmentContainerDataImpl(inner, this.manager()); + return new EnvironmentContainerImpl(inner, this.manager()); } else { return null; } } - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context) { - Response inner = + Response inner = this.serviceClient().getWithResponse(resourceGroupName, workspaceName, name, context); if (inner != null) { return new SimpleResponse<>( inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new EnvironmentContainerDataImpl(inner.getValue(), this.manager())); + new EnvironmentContainerImpl(inner.getValue(), this.manager())); } else { return null; } } - public EnvironmentContainerData getById(String id) { + public EnvironmentContainer getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -101,7 +100,7 @@ public EnvironmentContainerData getById(String id) { return this.getWithResponse(resourceGroupName, workspaceName, name, Context.NONE).getValue(); } - public Response getByIdWithResponse(String id, Context context) { + public Response getByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -187,7 +186,7 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager return this.serviceManager; } - public EnvironmentContainerDataImpl define(String name) { - return new EnvironmentContainerDataImpl(name, this.manager()); + public EnvironmentContainerImpl define(String name) { + return new EnvironmentContainerImpl(name, this.manager()); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentVersionDataImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentVersionImpl.java similarity index 78% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentVersionDataImpl.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentVersionImpl.java index 1636870e45e3..653ef01782d9 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentVersionDataImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentVersionImpl.java @@ -6,13 +6,13 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentVersionDataInner; -import com.azure.resourcemanager.machinelearning.models.EnvironmentVersionData; -import com.azure.resourcemanager.machinelearning.models.EnvironmentVersionDetails; +import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentVersionInner; +import com.azure.resourcemanager.machinelearning.models.EnvironmentVersion; +import com.azure.resourcemanager.machinelearning.models.EnvironmentVersionProperties; -public final class EnvironmentVersionDataImpl - implements EnvironmentVersionData, EnvironmentVersionData.Definition, EnvironmentVersionData.Update { - private EnvironmentVersionDataInner innerObject; +public final class EnvironmentVersionImpl + implements EnvironmentVersion, EnvironmentVersion.Definition, EnvironmentVersion.Update { + private EnvironmentVersionInner innerObject; private final com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager; @@ -28,7 +28,7 @@ public String type() { return this.innerModel().type(); } - public EnvironmentVersionDetails properties() { + public EnvironmentVersionProperties properties() { return this.innerModel().properties(); } @@ -40,7 +40,7 @@ public String resourceGroupName() { return resourceGroupName; } - public EnvironmentVersionDataInner innerModel() { + public EnvironmentVersionInner innerModel() { return this.innerObject; } @@ -56,15 +56,14 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager private String version; - public EnvironmentVersionDataImpl withExistingEnvironment( - String resourceGroupName, String workspaceName, String name) { + public EnvironmentVersionImpl withExistingEnvironment(String resourceGroupName, String workspaceName, String name) { this.resourceGroupName = resourceGroupName; this.workspaceName = workspaceName; this.name = name; return this; } - public EnvironmentVersionData create() { + public EnvironmentVersion create() { this.innerObject = serviceManager .serviceClient() @@ -75,7 +74,7 @@ public EnvironmentVersionData create() { return this; } - public EnvironmentVersionData create(Context context) { + public EnvironmentVersion create(Context context) { this.innerObject = serviceManager .serviceClient() @@ -85,18 +84,18 @@ public EnvironmentVersionData create(Context context) { return this; } - EnvironmentVersionDataImpl( + EnvironmentVersionImpl( String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { - this.innerObject = new EnvironmentVersionDataInner(); + this.innerObject = new EnvironmentVersionInner(); this.serviceManager = serviceManager; this.version = name; } - public EnvironmentVersionDataImpl update() { + public EnvironmentVersionImpl update() { return this; } - public EnvironmentVersionData apply() { + public EnvironmentVersion apply() { this.innerObject = serviceManager .serviceClient() @@ -107,7 +106,7 @@ public EnvironmentVersionData apply() { return this; } - public EnvironmentVersionData apply(Context context) { + public EnvironmentVersion apply(Context context) { this.innerObject = serviceManager .serviceClient() @@ -117,8 +116,8 @@ public EnvironmentVersionData apply(Context context) { return this; } - EnvironmentVersionDataImpl( - EnvironmentVersionDataInner innerObject, + EnvironmentVersionImpl( + EnvironmentVersionInner innerObject, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { this.innerObject = innerObject; this.serviceManager = serviceManager; @@ -128,7 +127,7 @@ public EnvironmentVersionData apply(Context context) { this.version = Utils.getValueFromIdByName(innerObject.id(), "versions"); } - public EnvironmentVersionData refresh() { + public EnvironmentVersion refresh() { this.innerObject = serviceManager .serviceClient() @@ -138,7 +137,7 @@ public EnvironmentVersionData refresh() { return this; } - public EnvironmentVersionData refresh(Context context) { + public EnvironmentVersion refresh(Context context) { this.innerObject = serviceManager .serviceClient() @@ -148,7 +147,7 @@ public EnvironmentVersionData refresh(Context context) { return this; } - public EnvironmentVersionDataImpl withProperties(EnvironmentVersionDetails properties) { + public EnvironmentVersionImpl withProperties(EnvironmentVersionProperties properties) { this.innerModel().withProperties(properties); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentVersionsClientImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentVersionsClientImpl.java index 224d59b216f2..9da1b0edb5f7 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentVersionsClientImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentVersionsClientImpl.java @@ -29,7 +29,7 @@ import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.resourcemanager.machinelearning.fluent.EnvironmentVersionsClient; -import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentVersionDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentVersionInner; import com.azure.resourcemanager.machinelearning.models.EnvironmentVersionResourceArmPaginatedResult; import com.azure.resourcemanager.machinelearning.models.ListViewType; import reactor.core.publisher.Mono; @@ -105,7 +105,7 @@ Mono> delete( + "/{version}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( + Mono> get( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -123,7 +123,7 @@ Mono> get( + "/{version}") @ExpectedResponses({200, 201}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> createOrUpdate( + Mono> createOrUpdate( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -131,7 +131,7 @@ Mono> createOrUpdate( @PathParam("name") String name, @PathParam("version") String version, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") EnvironmentVersionDataInner body, + @BodyParam("application/json") EnvironmentVersionInner body, @HeaderParam("Accept") String accept, Context context); @@ -163,7 +163,7 @@ Mono> listNext( * of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String name, @@ -211,7 +211,7 @@ private Mono> listSinglePageAsync( listViewType, accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -241,7 +241,7 @@ private Mono> listSinglePageAsync( * of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String name, @@ -315,7 +315,7 @@ private Mono> listSinglePageAsync( * @return a paginated list of EnvironmentVersion entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String name, @@ -340,8 +340,7 @@ private PagedFlux listAsync( * @return a paginated list of EnvironmentVersion entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( - String resourceGroupName, String workspaceName, String name) { + private PagedFlux listAsync(String resourceGroupName, String workspaceName, String name) { final String orderBy = null; final Integer top = null; final String skip = null; @@ -368,7 +367,7 @@ private PagedFlux listAsync( * @return a paginated list of EnvironmentVersion entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String name, @@ -395,8 +394,7 @@ private PagedFlux listAsync( * @return a paginated list of EnvironmentVersion entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( - String resourceGroupName, String workspaceName, String name) { + public PagedIterable list(String resourceGroupName, String workspaceName, String name) { final String orderBy = null; final Integer top = null; final String skip = null; @@ -421,7 +419,7 @@ public PagedIterable list( * @return a paginated list of EnvironmentVersion entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -614,7 +612,7 @@ public Response deleteWithResponse( * @return version along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name, String version) { if (this.client.getEndpoint() == null) { return Mono @@ -673,7 +671,7 @@ private Mono> getWithResponseAsync( * @return version along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name, String version, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -728,7 +726,7 @@ private Mono> getWithResponseAsync( * @return version on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getAsync( + private Mono getAsync( String resourceGroupName, String workspaceName, String name, String version) { return getWithResponseAsync(resourceGroupName, workspaceName, name, version) .flatMap(res -> Mono.justOrEmpty(res.getValue())); @@ -747,8 +745,7 @@ private Mono getAsync( * @return version. */ @ServiceMethod(returns = ReturnType.SINGLE) - public EnvironmentVersionDataInner get( - String resourceGroupName, String workspaceName, String name, String version) { + public EnvironmentVersionInner get(String resourceGroupName, String workspaceName, String name, String version) { return getAsync(resourceGroupName, workspaceName, name, version).block(); } @@ -766,7 +763,7 @@ public EnvironmentVersionDataInner get( * @return version along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context) { return getWithResponseAsync(resourceGroupName, workspaceName, name, version, context).block(); } @@ -786,8 +783,8 @@ public Response getWithResponse( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( - String resourceGroupName, String workspaceName, String name, String version, EnvironmentVersionDataInner body) { + private Mono> createOrUpdateWithResponseAsync( + String resourceGroupName, String workspaceName, String name, String version, EnvironmentVersionInner body) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -853,12 +850,12 @@ private Mono> createOrUpdateWithResponseAs * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( + private Mono> createOrUpdateWithResponseAsync( String resourceGroupName, String workspaceName, String name, String version, - EnvironmentVersionDataInner body, + EnvironmentVersionInner body, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -920,8 +917,8 @@ private Mono> createOrUpdateWithResponseAs * @return azure Resource Manager resource envelope on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( - String resourceGroupName, String workspaceName, String name, String version, EnvironmentVersionDataInner body) { + private Mono createOrUpdateAsync( + String resourceGroupName, String workspaceName, String name, String version, EnvironmentVersionInner body) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, version, body) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -940,8 +937,8 @@ private Mono createOrUpdateAsync( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - public EnvironmentVersionDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, String version, EnvironmentVersionDataInner body) { + public EnvironmentVersionInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, String version, EnvironmentVersionInner body) { return createOrUpdateAsync(resourceGroupName, workspaceName, name, version, body).block(); } @@ -960,12 +957,12 @@ public EnvironmentVersionDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response createOrUpdateWithResponse( + public Response createOrUpdateWithResponse( String resourceGroupName, String workspaceName, String name, String version, - EnvironmentVersionDataInner body, + EnvironmentVersionInner body, Context context) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, version, body, context).block(); } @@ -981,7 +978,7 @@ public Response createOrUpdateWithResponse( * of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink) { + private Mono> listNextSinglePageAsync(String nextLink) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } @@ -994,7 +991,7 @@ private Mono> listNextSinglePageAsync final String accept = "application/json"; return FluxUtil .withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -1018,7 +1015,7 @@ private Mono> listNextSinglePageAsync * of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink, Context context) { + private Mono> listNextSinglePageAsync(String nextLink, Context context) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentVersionsImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentVersionsImpl.java index a7a4c36384cb..82363a88cc2d 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentVersionsImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/EnvironmentVersionsImpl.java @@ -10,8 +10,8 @@ import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.machinelearning.fluent.EnvironmentVersionsClient; -import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentVersionDataInner; -import com.azure.resourcemanager.machinelearning.models.EnvironmentVersionData; +import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentVersionInner; +import com.azure.resourcemanager.machinelearning.models.EnvironmentVersion; import com.azure.resourcemanager.machinelearning.models.EnvironmentVersions; import com.azure.resourcemanager.machinelearning.models.ListViewType; @@ -29,13 +29,13 @@ public EnvironmentVersionsImpl( this.serviceManager = serviceManager; } - public PagedIterable list(String resourceGroupName, String workspaceName, String name) { - PagedIterable inner = + public PagedIterable list(String resourceGroupName, String workspaceName, String name) { + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName, name); - return Utils.mapPage(inner, inner1 -> new EnvironmentVersionDataImpl(inner1, this.manager())); + return Utils.mapPage(inner, inner1 -> new EnvironmentVersionImpl(inner1, this.manager())); } - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -44,11 +44,11 @@ public PagedIterable list( String skip, ListViewType listViewType, Context context) { - PagedIterable inner = + PagedIterable inner = this .serviceClient() .list(resourceGroupName, workspaceName, name, orderBy, top, skip, listViewType, context); - return Utils.mapPage(inner, inner1 -> new EnvironmentVersionDataImpl(inner1, this.manager())); + return Utils.mapPage(inner, inner1 -> new EnvironmentVersionImpl(inner1, this.manager())); } public void delete(String resourceGroupName, String workspaceName, String name, String version) { @@ -60,31 +60,31 @@ public Response deleteWithResponse( return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, name, version, context); } - public EnvironmentVersionData get(String resourceGroupName, String workspaceName, String name, String version) { - EnvironmentVersionDataInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name, version); + public EnvironmentVersion get(String resourceGroupName, String workspaceName, String name, String version) { + EnvironmentVersionInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name, version); if (inner != null) { - return new EnvironmentVersionDataImpl(inner, this.manager()); + return new EnvironmentVersionImpl(inner, this.manager()); } else { return null; } } - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context) { - Response inner = + Response inner = this.serviceClient().getWithResponse(resourceGroupName, workspaceName, name, version, context); if (inner != null) { return new SimpleResponse<>( inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new EnvironmentVersionDataImpl(inner.getValue(), this.manager())); + new EnvironmentVersionImpl(inner.getValue(), this.manager())); } else { return null; } } - public EnvironmentVersionData getById(String id) { + public EnvironmentVersion getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -117,7 +117,7 @@ public EnvironmentVersionData getById(String id) { return this.getWithResponse(resourceGroupName, workspaceName, name, version, Context.NONE).getValue(); } - public Response getByIdWithResponse(String id, Context context) { + public Response getByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -224,7 +224,7 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager return this.serviceManager; } - public EnvironmentVersionDataImpl define(String name) { - return new EnvironmentVersionDataImpl(name, this.manager()); + public EnvironmentVersionImpl define(String name) { + return new EnvironmentVersionImpl(name, this.manager()); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/JobBaseDataImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/JobBaseImpl.java similarity index 72% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/JobBaseDataImpl.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/JobBaseImpl.java index 640159cd0344..1b26fd5f42d4 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/JobBaseDataImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/JobBaseImpl.java @@ -4,15 +4,14 @@ package com.azure.resourcemanager.machinelearning.implementation; -import com.azure.core.http.rest.Response; import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.JobBaseDataInner; -import com.azure.resourcemanager.machinelearning.models.JobBaseData; -import com.azure.resourcemanager.machinelearning.models.JobBaseDetails; +import com.azure.resourcemanager.machinelearning.fluent.models.JobBaseInner; +import com.azure.resourcemanager.machinelearning.models.JobBase; +import com.azure.resourcemanager.machinelearning.models.JobBaseProperties; -public final class JobBaseDataImpl implements JobBaseData, JobBaseData.Definition, JobBaseData.Update { - private JobBaseDataInner innerObject; +public final class JobBaseImpl implements JobBase, JobBase.Definition, JobBase.Update { + private JobBaseInner innerObject; private final com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager; @@ -28,7 +27,7 @@ public String type() { return this.innerModel().type(); } - public JobBaseDetails properties() { + public JobBaseProperties properties() { return this.innerModel().properties(); } @@ -40,7 +39,7 @@ public String resourceGroupName() { return resourceGroupName; } - public JobBaseDataInner innerModel() { + public JobBaseInner innerModel() { return this.innerObject; } @@ -54,13 +53,13 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager private String id; - public JobBaseDataImpl withExistingWorkspace(String resourceGroupName, String workspaceName) { + public JobBaseImpl withExistingWorkspace(String resourceGroupName, String workspaceName) { this.resourceGroupName = resourceGroupName; this.workspaceName = workspaceName; return this; } - public JobBaseData create() { + public JobBase create() { this.innerObject = serviceManager .serviceClient() @@ -70,7 +69,7 @@ public JobBaseData create() { return this; } - public JobBaseData create(Context context) { + public JobBase create(Context context) { this.innerObject = serviceManager .serviceClient() @@ -80,17 +79,17 @@ public JobBaseData create(Context context) { return this; } - JobBaseDataImpl(String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { - this.innerObject = new JobBaseDataInner(); + JobBaseImpl(String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { + this.innerObject = new JobBaseInner(); this.serviceManager = serviceManager; this.id = name; } - public JobBaseDataImpl update() { + public JobBaseImpl update() { return this; } - public JobBaseData apply() { + public JobBase apply() { this.innerObject = serviceManager .serviceClient() @@ -100,7 +99,7 @@ public JobBaseData apply() { return this; } - public JobBaseData apply(Context context) { + public JobBase apply(Context context) { this.innerObject = serviceManager .serviceClient() @@ -110,8 +109,8 @@ public JobBaseData apply(Context context) { return this; } - JobBaseDataImpl( - JobBaseDataInner innerObject, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { + JobBaseImpl( + JobBaseInner innerObject, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { this.innerObject = innerObject; this.serviceManager = serviceManager; this.resourceGroupName = Utils.getValueFromIdByName(innerObject.id(), "resourceGroups"); @@ -119,7 +118,7 @@ public JobBaseData apply(Context context) { this.id = Utils.getValueFromIdByName(innerObject.id(), "jobs"); } - public JobBaseData refresh() { + public JobBase refresh() { this.innerObject = serviceManager .serviceClient() @@ -129,7 +128,7 @@ public JobBaseData refresh() { return this; } - public JobBaseData refresh(Context context) { + public JobBase refresh(Context context) { this.innerObject = serviceManager .serviceClient() @@ -143,11 +142,11 @@ public void cancel() { serviceManager.jobs().cancel(resourceGroupName, workspaceName, id); } - public Response cancelWithResponse(Context context) { - return serviceManager.jobs().cancelWithResponse(resourceGroupName, workspaceName, id, context); + public void cancel(Context context) { + serviceManager.jobs().cancel(resourceGroupName, workspaceName, id, context); } - public JobBaseDataImpl withProperties(JobBaseDetails properties) { + public JobBaseImpl withProperties(JobBaseProperties properties) { this.innerModel().withProperties(properties); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/JobsClientImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/JobsClientImpl.java index f2c11073c9e4..29e109fe543c 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/JobsClientImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/JobsClientImpl.java @@ -33,7 +33,7 @@ import com.azure.core.util.polling.PollerFlux; import com.azure.core.util.polling.SyncPoller; import com.azure.resourcemanager.machinelearning.fluent.JobsClient; -import com.azure.resourcemanager.machinelearning.fluent.models.JobBaseDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.JobBaseInner; import com.azure.resourcemanager.machinelearning.models.JobBaseResourceArmPaginatedResult; import com.azure.resourcemanager.machinelearning.models.ListViewType; import java.nio.ByteBuffer; @@ -81,8 +81,6 @@ Mono> list( @QueryParam("jobType") String jobType, @QueryParam("tag") String tag, @QueryParam("listViewType") ListViewType listViewType, - @QueryParam("scheduled") Boolean scheduled, - @QueryParam("scheduleId") String scheduleId, @HeaderParam("Accept") String accept, Context context); @@ -108,7 +106,7 @@ Mono>> delete( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/jobs/{id}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( + Mono> get( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -124,14 +122,14 @@ Mono> get( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/jobs/{id}") @ExpectedResponses({200, 201}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> createOrUpdate( + Mono> createOrUpdate( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("workspaceName") String workspaceName, @PathParam("id") String id, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") JobBaseDataInner body, + @BodyParam("application/json") JobBaseInner body, @HeaderParam("Accept") String accept, Context context); @@ -139,9 +137,9 @@ Mono> createOrUpdate( @Post( "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers" + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/jobs/{id}/cancel") - @ExpectedResponses({200}) + @ExpectedResponses({200, 202}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> cancel( + Mono>> cancel( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -171,8 +169,6 @@ Mono> listNext( * @param jobType Type of job to be returned. * @param tag Jobs returned will have this tag key. * @param listViewType View type for including/excluding (for example) archived entities. - * @param scheduled Indicator whether the job is scheduled job. - * @param scheduleId The scheduled id for listing the job triggered from. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. @@ -180,15 +176,13 @@ Mono> listNext( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String skip, String jobType, String tag, - ListViewType listViewType, - Boolean scheduled, - String scheduleId) { + ListViewType listViewType) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -223,11 +217,9 @@ private Mono> listSinglePageAsync( jobType, tag, listViewType, - scheduled, - scheduleId, accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -248,8 +240,6 @@ private Mono> listSinglePageAsync( * @param jobType Type of job to be returned. * @param tag Jobs returned will have this tag key. * @param listViewType View type for including/excluding (for example) archived entities. - * @param scheduled Indicator whether the job is scheduled job. - * @param scheduleId The scheduled id for listing the job triggered from. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. @@ -258,15 +248,13 @@ private Mono> listSinglePageAsync( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String skip, String jobType, String tag, ListViewType listViewType, - Boolean scheduled, - String scheduleId, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -300,8 +288,6 @@ private Mono> listSinglePageAsync( jobType, tag, listViewType, - scheduled, - scheduleId, accept, context) .map( @@ -324,27 +310,21 @@ private Mono> listSinglePageAsync( * @param jobType Type of job to be returned. * @param tag Jobs returned will have this tag key. * @param listViewType View type for including/excluding (for example) archived entities. - * @param scheduled Indicator whether the job is scheduled job. - * @param scheduleId The scheduled id for listing the job triggered from. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of JobBase entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String skip, String jobType, String tag, - ListViewType listViewType, - Boolean scheduled, - String scheduleId) { + ListViewType listViewType) { return new PagedFlux<>( - () -> - listSinglePageAsync( - resourceGroupName, workspaceName, skip, jobType, tag, listViewType, scheduled, scheduleId), + () -> listSinglePageAsync(resourceGroupName, workspaceName, skip, jobType, tag, listViewType), nextLink -> listNextSinglePageAsync(nextLink)); } @@ -359,17 +339,13 @@ private PagedFlux listAsync( * @return a paginated list of JobBase entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync(String resourceGroupName, String workspaceName) { + private PagedFlux listAsync(String resourceGroupName, String workspaceName) { final String skip = null; final String jobType = null; final String tag = null; final ListViewType listViewType = null; - final Boolean scheduled = null; - final String scheduleId = null; return new PagedFlux<>( - () -> - listSinglePageAsync( - resourceGroupName, workspaceName, skip, jobType, tag, listViewType, scheduled, scheduleId), + () -> listSinglePageAsync(resourceGroupName, workspaceName, skip, jobType, tag, listViewType), nextLink -> listNextSinglePageAsync(nextLink)); } @@ -382,8 +358,6 @@ private PagedFlux listAsync(String resourceGroupName, String w * @param jobType Type of job to be returned. * @param tag Jobs returned will have this tag key. * @param listViewType View type for including/excluding (for example) archived entities. - * @param scheduled Indicator whether the job is scheduled job. - * @param scheduleId The scheduled id for listing the job triggered from. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. @@ -391,20 +365,16 @@ private PagedFlux listAsync(String resourceGroupName, String w * @return a paginated list of JobBase entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String skip, String jobType, String tag, ListViewType listViewType, - Boolean scheduled, - String scheduleId, Context context) { return new PagedFlux<>( - () -> - listSinglePageAsync( - resourceGroupName, workspaceName, skip, jobType, tag, listViewType, scheduled, scheduleId, context), + () -> listSinglePageAsync(resourceGroupName, workspaceName, skip, jobType, tag, listViewType, context), nextLink -> listNextSinglePageAsync(nextLink, context)); } @@ -419,15 +389,12 @@ private PagedFlux listAsync( * @return a paginated list of JobBase entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list(String resourceGroupName, String workspaceName) { + public PagedIterable list(String resourceGroupName, String workspaceName) { final String skip = null; final String jobType = null; final String tag = null; final ListViewType listViewType = null; - final Boolean scheduled = null; - final String scheduleId = null; - return new PagedIterable<>( - listAsync(resourceGroupName, workspaceName, skip, jobType, tag, listViewType, scheduled, scheduleId)); + return new PagedIterable<>(listAsync(resourceGroupName, workspaceName, skip, jobType, tag, listViewType)); } /** @@ -439,8 +406,6 @@ public PagedIterable list(String resourceGroupName, String wor * @param jobType Type of job to be returned. * @param tag Jobs returned will have this tag key. * @param listViewType View type for including/excluding (for example) archived entities. - * @param scheduled Indicator whether the job is scheduled job. - * @param scheduleId The scheduled id for listing the job triggered from. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. @@ -448,19 +413,16 @@ public PagedIterable list(String resourceGroupName, String wor * @return a paginated list of JobBase entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String skip, String jobType, String tag, ListViewType listViewType, - Boolean scheduled, - String scheduleId, Context context) { return new PagedIterable<>( - listAsync( - resourceGroupName, workspaceName, skip, jobType, tag, listViewType, scheduled, scheduleId, context)); + listAsync(resourceGroupName, workspaceName, skip, jobType, tag, listViewType, context)); } /** @@ -724,7 +686,7 @@ public void delete(String resourceGroupName, String workspaceName, String id, Co * @return a Job by name/id along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String id) { if (this.client.getEndpoint() == null) { return Mono @@ -778,7 +740,7 @@ private Mono> getWithResponseAsync( * @return a Job by name/id along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String id, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -828,7 +790,7 @@ private Mono> getWithResponseAsync( * @return a Job by name/id on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getAsync(String resourceGroupName, String workspaceName, String id) { + private Mono getAsync(String resourceGroupName, String workspaceName, String id) { return getWithResponseAsync(resourceGroupName, workspaceName, id) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -845,7 +807,7 @@ private Mono getAsync(String resourceGroupName, String workspa * @return a Job by name/id. */ @ServiceMethod(returns = ReturnType.SINGLE) - public JobBaseDataInner get(String resourceGroupName, String workspaceName, String id) { + public JobBaseInner get(String resourceGroupName, String workspaceName, String id) { return getAsync(resourceGroupName, workspaceName, id).block(); } @@ -862,7 +824,7 @@ public JobBaseDataInner get(String resourceGroupName, String workspaceName, Stri * @return a Job by name/id along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String id, Context context) { return getWithResponseAsync(resourceGroupName, workspaceName, id, context).block(); } @@ -881,8 +843,8 @@ public Response getWithResponse( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( - String resourceGroupName, String workspaceName, String id, JobBaseDataInner body) { + private Mono> createOrUpdateWithResponseAsync( + String resourceGroupName, String workspaceName, String id, JobBaseInner body) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -943,8 +905,8 @@ private Mono> createOrUpdateWithResponseAsync( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( - String resourceGroupName, String workspaceName, String id, JobBaseDataInner body, Context context) { + private Mono> createOrUpdateWithResponseAsync( + String resourceGroupName, String workspaceName, String id, JobBaseInner body, Context context) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -1000,8 +962,8 @@ private Mono> createOrUpdateWithResponseAsync( * @return azure Resource Manager resource envelope on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( - String resourceGroupName, String workspaceName, String id, JobBaseDataInner body) { + private Mono createOrUpdateAsync( + String resourceGroupName, String workspaceName, String id, JobBaseInner body) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, id, body) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -1019,8 +981,7 @@ private Mono createOrUpdateAsync( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - public JobBaseDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String id, JobBaseDataInner body) { + public JobBaseInner createOrUpdate(String resourceGroupName, String workspaceName, String id, JobBaseInner body) { return createOrUpdateAsync(resourceGroupName, workspaceName, id, body).block(); } @@ -1038,13 +999,13 @@ public JobBaseDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response createOrUpdateWithResponse( - String resourceGroupName, String workspaceName, String id, JobBaseDataInner body, Context context) { + public Response createOrUpdateWithResponse( + String resourceGroupName, String workspaceName, String id, JobBaseInner body, Context context) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, id, body, context).block(); } /** - * Cancels a Job. + * Cancels a Job (asynchronous). * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. @@ -1055,7 +1016,8 @@ public Response createOrUpdateWithResponse( * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> cancelWithResponseAsync(String resourceGroupName, String workspaceName, String id) { + private Mono>> cancelWithResponseAsync( + String resourceGroupName, String workspaceName, String id) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -1096,7 +1058,7 @@ private Mono> cancelWithResponseAsync(String resourceGroupName, S } /** - * Cancels a Job. + * Cancels a Job (asynchronous). * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. @@ -1108,7 +1070,7 @@ private Mono> cancelWithResponseAsync(String resourceGroupName, S * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> cancelWithResponseAsync( + private Mono>> cancelWithResponseAsync( String resourceGroupName, String workspaceName, String id, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -1147,7 +1109,84 @@ private Mono> cancelWithResponseAsync( } /** - * Cancels a Job. + * Cancels a Job (asynchronous). + * + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param id The name and identifier for the Job. This is case-sensitive. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link PollerFlux} for polling of long-running operation. + */ + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) + private PollerFlux, Void> beginCancelAsync( + String resourceGroupName, String workspaceName, String id) { + Mono>> mono = cancelWithResponseAsync(resourceGroupName, workspaceName, id); + return this + .client + .getLroResult( + mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext()); + } + + /** + * Cancels a Job (asynchronous). + * + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param id The name and identifier for the Job. This is case-sensitive. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link PollerFlux} for polling of long-running operation. + */ + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) + private PollerFlux, Void> beginCancelAsync( + String resourceGroupName, String workspaceName, String id, Context context) { + context = this.client.mergeContext(context); + Mono>> mono = cancelWithResponseAsync(resourceGroupName, workspaceName, id, context); + return this + .client + .getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class, context); + } + + /** + * Cancels a Job (asynchronous). + * + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param id The name and identifier for the Job. This is case-sensitive. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link SyncPoller} for polling of long-running operation. + */ + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) + public SyncPoller, Void> beginCancel(String resourceGroupName, String workspaceName, String id) { + return beginCancelAsync(resourceGroupName, workspaceName, id).getSyncPoller(); + } + + /** + * Cancels a Job (asynchronous). + * + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param id The name and identifier for the Job. This is case-sensitive. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link SyncPoller} for polling of long-running operation. + */ + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) + public SyncPoller, Void> beginCancel( + String resourceGroupName, String workspaceName, String id, Context context) { + return beginCancelAsync(resourceGroupName, workspaceName, id, context).getSyncPoller(); + } + + /** + * Cancels a Job (asynchronous). * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. @@ -1159,11 +1198,32 @@ private Mono> cancelWithResponseAsync( */ @ServiceMethod(returns = ReturnType.SINGLE) private Mono cancelAsync(String resourceGroupName, String workspaceName, String id) { - return cancelWithResponseAsync(resourceGroupName, workspaceName, id).flatMap(ignored -> Mono.empty()); + return beginCancelAsync(resourceGroupName, workspaceName, id) + .last() + .flatMap(this.client::getLroFinalResultOrError); + } + + /** + * Cancels a Job (asynchronous). + * + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param id The name and identifier for the Job. This is case-sensitive. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono cancelAsync(String resourceGroupName, String workspaceName, String id, Context context) { + return beginCancelAsync(resourceGroupName, workspaceName, id, context) + .last() + .flatMap(this.client::getLroFinalResultOrError); } /** - * Cancels a Job. + * Cancels a Job (asynchronous). * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. @@ -1178,7 +1238,7 @@ public void cancel(String resourceGroupName, String workspaceName, String id) { } /** - * Cancels a Job. + * Cancels a Job (asynchronous). * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. @@ -1187,12 +1247,10 @@ public void cancel(String resourceGroupName, String workspaceName, String id) { * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response cancelWithResponse( - String resourceGroupName, String workspaceName, String id, Context context) { - return cancelWithResponseAsync(resourceGroupName, workspaceName, id, context).block(); + public void cancel(String resourceGroupName, String workspaceName, String id, Context context) { + cancelAsync(resourceGroupName, workspaceName, id, context).block(); } /** @@ -1206,7 +1264,7 @@ public Response cancelWithResponse( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink) { + private Mono> listNextSinglePageAsync(String nextLink) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } @@ -1219,7 +1277,7 @@ private Mono> listNextSinglePageAsync(String nex final String accept = "application/json"; return FluxUtil .withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -1243,7 +1301,7 @@ private Mono> listNextSinglePageAsync(String nex * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink, Context context) { + private Mono> listNextSinglePageAsync(String nextLink, Context context) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/JobsImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/JobsImpl.java index bbd2a142394e..5b2c97468cc6 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/JobsImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/JobsImpl.java @@ -10,8 +10,8 @@ import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.machinelearning.fluent.JobsClient; -import com.azure.resourcemanager.machinelearning.fluent.models.JobBaseDataInner; -import com.azure.resourcemanager.machinelearning.models.JobBaseData; +import com.azure.resourcemanager.machinelearning.fluent.models.JobBaseInner; +import com.azure.resourcemanager.machinelearning.models.JobBase; import com.azure.resourcemanager.machinelearning.models.Jobs; import com.azure.resourcemanager.machinelearning.models.ListViewType; @@ -28,27 +28,22 @@ public JobsImpl( this.serviceManager = serviceManager; } - public PagedIterable list(String resourceGroupName, String workspaceName) { - PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName); - return Utils.mapPage(inner, inner1 -> new JobBaseDataImpl(inner1, this.manager())); + public PagedIterable list(String resourceGroupName, String workspaceName) { + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName); + return Utils.mapPage(inner, inner1 -> new JobBaseImpl(inner1, this.manager())); } - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String skip, String jobType, String tag, ListViewType listViewType, - Boolean scheduled, - String scheduleId, Context context) { - PagedIterable inner = - this - .serviceClient() - .list( - resourceGroupName, workspaceName, skip, jobType, tag, listViewType, scheduled, scheduleId, context); - return Utils.mapPage(inner, inner1 -> new JobBaseDataImpl(inner1, this.manager())); + PagedIterable inner = + this.serviceClient().list(resourceGroupName, workspaceName, skip, jobType, tag, listViewType, context); + return Utils.mapPage(inner, inner1 -> new JobBaseImpl(inner1, this.manager())); } public void delete(String resourceGroupName, String workspaceName, String id) { @@ -59,25 +54,25 @@ public void delete(String resourceGroupName, String workspaceName, String id, Co this.serviceClient().delete(resourceGroupName, workspaceName, id, context); } - public JobBaseData get(String resourceGroupName, String workspaceName, String id) { - JobBaseDataInner inner = this.serviceClient().get(resourceGroupName, workspaceName, id); + public JobBase get(String resourceGroupName, String workspaceName, String id) { + JobBaseInner inner = this.serviceClient().get(resourceGroupName, workspaceName, id); if (inner != null) { - return new JobBaseDataImpl(inner, this.manager()); + return new JobBaseImpl(inner, this.manager()); } else { return null; } } - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String id, Context context) { - Response inner = + Response inner = this.serviceClient().getWithResponse(resourceGroupName, workspaceName, id, context); if (inner != null) { return new SimpleResponse<>( inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new JobBaseDataImpl(inner.getValue(), this.manager())); + new JobBaseImpl(inner.getValue(), this.manager())); } else { return null; } @@ -87,12 +82,11 @@ public void cancel(String resourceGroupName, String workspaceName, String id) { this.serviceClient().cancel(resourceGroupName, workspaceName, id); } - public Response cancelWithResponse( - String resourceGroupName, String workspaceName, String id, Context context) { - return this.serviceClient().cancelWithResponse(resourceGroupName, workspaceName, id, context); + public void cancel(String resourceGroupName, String workspaceName, String id, Context context) { + this.serviceClient().cancel(resourceGroupName, workspaceName, id, context); } - public JobBaseData getById(String id) { + public JobBase getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -118,7 +112,7 @@ public JobBaseData getById(String id) { return this.getWithResponse(resourceGroupName, workspaceName, varId, Context.NONE).getValue(); } - public Response getByIdWithResponse(String id, Context context) { + public Response getByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -204,7 +198,7 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager return this.serviceManager; } - public JobBaseDataImpl define(String name) { - return new JobBaseDataImpl(name, this.manager()); + public JobBaseImpl define(String name) { + return new JobBaseImpl(name, this.manager()); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelContainerDataImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelContainerImpl.java similarity index 77% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelContainerDataImpl.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelContainerImpl.java index 48ebb00f4f0d..dc2e9e476a07 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelContainerDataImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelContainerImpl.java @@ -6,13 +6,12 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.ModelContainerDataInner; -import com.azure.resourcemanager.machinelearning.models.ModelContainerData; -import com.azure.resourcemanager.machinelearning.models.ModelContainerDetails; +import com.azure.resourcemanager.machinelearning.fluent.models.ModelContainerInner; +import com.azure.resourcemanager.machinelearning.models.ModelContainer; +import com.azure.resourcemanager.machinelearning.models.ModelContainerProperties; -public final class ModelContainerDataImpl - implements ModelContainerData, ModelContainerData.Definition, ModelContainerData.Update { - private ModelContainerDataInner innerObject; +public final class ModelContainerImpl implements ModelContainer, ModelContainer.Definition, ModelContainer.Update { + private ModelContainerInner innerObject; private final com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager; @@ -28,7 +27,7 @@ public String type() { return this.innerModel().type(); } - public ModelContainerDetails properties() { + public ModelContainerProperties properties() { return this.innerModel().properties(); } @@ -40,7 +39,7 @@ public String resourceGroupName() { return resourceGroupName; } - public ModelContainerDataInner innerModel() { + public ModelContainerInner innerModel() { return this.innerObject; } @@ -54,13 +53,13 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager private String name; - public ModelContainerDataImpl withExistingWorkspace(String resourceGroupName, String workspaceName) { + public ModelContainerImpl withExistingWorkspace(String resourceGroupName, String workspaceName) { this.resourceGroupName = resourceGroupName; this.workspaceName = workspaceName; return this; } - public ModelContainerData create() { + public ModelContainer create() { this.innerObject = serviceManager .serviceClient() @@ -70,7 +69,7 @@ public ModelContainerData create() { return this; } - public ModelContainerData create(Context context) { + public ModelContainer create(Context context) { this.innerObject = serviceManager .serviceClient() @@ -80,18 +79,17 @@ public ModelContainerData create(Context context) { return this; } - ModelContainerDataImpl( - String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { - this.innerObject = new ModelContainerDataInner(); + ModelContainerImpl(String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { + this.innerObject = new ModelContainerInner(); this.serviceManager = serviceManager; this.name = name; } - public ModelContainerDataImpl update() { + public ModelContainerImpl update() { return this; } - public ModelContainerData apply() { + public ModelContainer apply() { this.innerObject = serviceManager .serviceClient() @@ -101,7 +99,7 @@ public ModelContainerData apply() { return this; } - public ModelContainerData apply(Context context) { + public ModelContainer apply(Context context) { this.innerObject = serviceManager .serviceClient() @@ -111,8 +109,8 @@ public ModelContainerData apply(Context context) { return this; } - ModelContainerDataImpl( - ModelContainerDataInner innerObject, + ModelContainerImpl( + ModelContainerInner innerObject, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { this.innerObject = innerObject; this.serviceManager = serviceManager; @@ -121,7 +119,7 @@ public ModelContainerData apply(Context context) { this.name = Utils.getValueFromIdByName(innerObject.id(), "models"); } - public ModelContainerData refresh() { + public ModelContainer refresh() { this.innerObject = serviceManager .serviceClient() @@ -131,7 +129,7 @@ public ModelContainerData refresh() { return this; } - public ModelContainerData refresh(Context context) { + public ModelContainer refresh(Context context) { this.innerObject = serviceManager .serviceClient() @@ -141,7 +139,7 @@ public ModelContainerData refresh(Context context) { return this; } - public ModelContainerDataImpl withProperties(ModelContainerDetails properties) { + public ModelContainerImpl withProperties(ModelContainerProperties properties) { this.innerModel().withProperties(properties); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelContainersClientImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelContainersClientImpl.java index 66d750218797..443b6a200ca1 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelContainersClientImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelContainersClientImpl.java @@ -29,7 +29,7 @@ import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.resourcemanager.machinelearning.fluent.ModelContainersClient; -import com.azure.resourcemanager.machinelearning.fluent.models.ModelContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.ModelContainerInner; import com.azure.resourcemanager.machinelearning.models.ListViewType; import com.azure.resourcemanager.machinelearning.models.ModelContainerResourceArmPaginatedResult; import reactor.core.publisher.Mono; @@ -100,7 +100,7 @@ Mono> delete( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/models/{name}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( + Mono> get( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -116,14 +116,14 @@ Mono> get( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/models/{name}") @ExpectedResponses({200, 201}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> createOrUpdate( + Mono> createOrUpdate( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("workspaceName") String workspaceName, @PathParam("name") String name, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") ModelContainerDataInner body, + @BodyParam("application/json") ModelContainerInner body, @HeaderParam("Accept") String accept, Context context); @@ -153,7 +153,7 @@ Mono> listNext( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String skip, Integer count, ListViewType listViewType) { if (this.client.getEndpoint() == null) { return Mono @@ -190,7 +190,7 @@ private Mono> listSinglePageAsync( listViewType, accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -218,7 +218,7 @@ private Mono> listSinglePageAsync( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String skip, @@ -283,7 +283,7 @@ private Mono> listSinglePageAsync( * @return a paginated list of ModelContainer entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String skip, Integer count, ListViewType listViewType) { return new PagedFlux<>( () -> listSinglePageAsync(resourceGroupName, workspaceName, skip, count, listViewType), @@ -301,7 +301,7 @@ private PagedFlux listAsync( * @return a paginated list of ModelContainer entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync(String resourceGroupName, String workspaceName) { + private PagedFlux listAsync(String resourceGroupName, String workspaceName) { final String skip = null; final Integer count = null; final ListViewType listViewType = null; @@ -325,7 +325,7 @@ private PagedFlux listAsync(String resourceGroupName, S * @return a paginated list of ModelContainer entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String skip, @@ -348,7 +348,7 @@ private PagedFlux listAsync( * @return a paginated list of ModelContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list(String resourceGroupName, String workspaceName) { + public PagedIterable list(String resourceGroupName, String workspaceName) { final String skip = null; final Integer count = null; final ListViewType listViewType = null; @@ -370,7 +370,7 @@ public PagedIterable list(String resourceGroupName, Str * @return a paginated list of ModelContainer entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String skip, @@ -544,7 +544,7 @@ public Response deleteWithResponse( * @return container along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name) { if (this.client.getEndpoint() == null) { return Mono @@ -598,7 +598,7 @@ private Mono> getWithResponseAsync( * @return container along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -648,7 +648,7 @@ private Mono> getWithResponseAsync( * @return container on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getAsync(String resourceGroupName, String workspaceName, String name) { + private Mono getAsync(String resourceGroupName, String workspaceName, String name) { return getWithResponseAsync(resourceGroupName, workspaceName, name) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -665,7 +665,7 @@ private Mono getAsync(String resourceGroupName, String * @return container. */ @ServiceMethod(returns = ReturnType.SINGLE) - public ModelContainerDataInner get(String resourceGroupName, String workspaceName, String name) { + public ModelContainerInner get(String resourceGroupName, String workspaceName, String name) { return getAsync(resourceGroupName, workspaceName, name).block(); } @@ -682,7 +682,7 @@ public ModelContainerDataInner get(String resourceGroupName, String workspaceNam * @return container along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context) { return getWithResponseAsync(resourceGroupName, workspaceName, name, context).block(); } @@ -701,8 +701,8 @@ public Response getWithResponse( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( - String resourceGroupName, String workspaceName, String name, ModelContainerDataInner body) { + private Mono> createOrUpdateWithResponseAsync( + String resourceGroupName, String workspaceName, String name, ModelContainerInner body) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -763,8 +763,8 @@ private Mono> createOrUpdateWithResponseAsync( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( - String resourceGroupName, String workspaceName, String name, ModelContainerDataInner body, Context context) { + private Mono> createOrUpdateWithResponseAsync( + String resourceGroupName, String workspaceName, String name, ModelContainerInner body, Context context) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -820,8 +820,8 @@ private Mono> createOrUpdateWithResponseAsync( * @return azure Resource Manager resource envelope on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( - String resourceGroupName, String workspaceName, String name, ModelContainerDataInner body) { + private Mono createOrUpdateAsync( + String resourceGroupName, String workspaceName, String name, ModelContainerInner body) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, body) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -839,8 +839,8 @@ private Mono createOrUpdateAsync( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - public ModelContainerDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, ModelContainerDataInner body) { + public ModelContainerInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, ModelContainerInner body) { return createOrUpdateAsync(resourceGroupName, workspaceName, name, body).block(); } @@ -858,8 +858,8 @@ public ModelContainerDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response createOrUpdateWithResponse( - String resourceGroupName, String workspaceName, String name, ModelContainerDataInner body, Context context) { + public Response createOrUpdateWithResponse( + String resourceGroupName, String workspaceName, String name, ModelContainerInner body, Context context) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, body, context).block(); } @@ -874,7 +874,7 @@ public Response createOrUpdateWithResponse( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink) { + private Mono> listNextSinglePageAsync(String nextLink) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } @@ -887,7 +887,7 @@ private Mono> listNextSinglePageAsync(Str final String accept = "application/json"; return FluxUtil .withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -911,7 +911,7 @@ private Mono> listNextSinglePageAsync(Str * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink, Context context) { + private Mono> listNextSinglePageAsync(String nextLink, Context context) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelContainersImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelContainersImpl.java index 2a7ed48e4af3..b3202f8386e7 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelContainersImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelContainersImpl.java @@ -10,9 +10,9 @@ import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.machinelearning.fluent.ModelContainersClient; -import com.azure.resourcemanager.machinelearning.fluent.models.ModelContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.ModelContainerInner; import com.azure.resourcemanager.machinelearning.models.ListViewType; -import com.azure.resourcemanager.machinelearning.models.ModelContainerData; +import com.azure.resourcemanager.machinelearning.models.ModelContainer; import com.azure.resourcemanager.machinelearning.models.ModelContainers; public final class ModelContainersImpl implements ModelContainers { @@ -29,21 +29,21 @@ public ModelContainersImpl( this.serviceManager = serviceManager; } - public PagedIterable list(String resourceGroupName, String workspaceName) { - PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName); - return Utils.mapPage(inner, inner1 -> new ModelContainerDataImpl(inner1, this.manager())); + public PagedIterable list(String resourceGroupName, String workspaceName) { + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName); + return Utils.mapPage(inner, inner1 -> new ModelContainerImpl(inner1, this.manager())); } - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String skip, Integer count, ListViewType listViewType, Context context) { - PagedIterable inner = + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName, skip, count, listViewType, context); - return Utils.mapPage(inner, inner1 -> new ModelContainerDataImpl(inner1, this.manager())); + return Utils.mapPage(inner, inner1 -> new ModelContainerImpl(inner1, this.manager())); } public void delete(String resourceGroupName, String workspaceName, String name) { @@ -55,31 +55,31 @@ public Response deleteWithResponse( return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, name, context); } - public ModelContainerData get(String resourceGroupName, String workspaceName, String name) { - ModelContainerDataInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name); + public ModelContainer get(String resourceGroupName, String workspaceName, String name) { + ModelContainerInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name); if (inner != null) { - return new ModelContainerDataImpl(inner, this.manager()); + return new ModelContainerImpl(inner, this.manager()); } else { return null; } } - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context) { - Response inner = + Response inner = this.serviceClient().getWithResponse(resourceGroupName, workspaceName, name, context); if (inner != null) { return new SimpleResponse<>( inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ModelContainerDataImpl(inner.getValue(), this.manager())); + new ModelContainerImpl(inner.getValue(), this.manager())); } else { return null; } } - public ModelContainerData getById(String id) { + public ModelContainer getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -105,7 +105,7 @@ public ModelContainerData getById(String id) { return this.getWithResponse(resourceGroupName, workspaceName, name, Context.NONE).getValue(); } - public Response getByIdWithResponse(String id, Context context) { + public Response getByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -191,7 +191,7 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager return this.serviceManager; } - public ModelContainerDataImpl define(String name) { - return new ModelContainerDataImpl(name, this.manager()); + public ModelContainerImpl define(String name) { + return new ModelContainerImpl(name, this.manager()); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelVersionDataImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelVersionImpl.java similarity index 78% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelVersionDataImpl.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelVersionImpl.java index 4fe87793e74e..8d4bf2161686 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelVersionDataImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelVersionImpl.java @@ -6,13 +6,12 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.ModelVersionDataInner; -import com.azure.resourcemanager.machinelearning.models.ModelVersionData; -import com.azure.resourcemanager.machinelearning.models.ModelVersionDetails; +import com.azure.resourcemanager.machinelearning.fluent.models.ModelVersionInner; +import com.azure.resourcemanager.machinelearning.models.ModelVersion; +import com.azure.resourcemanager.machinelearning.models.ModelVersionProperties; -public final class ModelVersionDataImpl - implements ModelVersionData, ModelVersionData.Definition, ModelVersionData.Update { - private ModelVersionDataInner innerObject; +public final class ModelVersionImpl implements ModelVersion, ModelVersion.Definition, ModelVersion.Update { + private ModelVersionInner innerObject; private final com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager; @@ -28,7 +27,7 @@ public String type() { return this.innerModel().type(); } - public ModelVersionDetails properties() { + public ModelVersionProperties properties() { return this.innerModel().properties(); } @@ -40,7 +39,7 @@ public String resourceGroupName() { return resourceGroupName; } - public ModelVersionDataInner innerModel() { + public ModelVersionInner innerModel() { return this.innerObject; } @@ -56,14 +55,14 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager private String version; - public ModelVersionDataImpl withExistingModel(String resourceGroupName, String workspaceName, String name) { + public ModelVersionImpl withExistingModel(String resourceGroupName, String workspaceName, String name) { this.resourceGroupName = resourceGroupName; this.workspaceName = workspaceName; this.name = name; return this; } - public ModelVersionData create() { + public ModelVersion create() { this.innerObject = serviceManager .serviceClient() @@ -74,7 +73,7 @@ public ModelVersionData create() { return this; } - public ModelVersionData create(Context context) { + public ModelVersion create(Context context) { this.innerObject = serviceManager .serviceClient() @@ -84,17 +83,17 @@ public ModelVersionData create(Context context) { return this; } - ModelVersionDataImpl(String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { - this.innerObject = new ModelVersionDataInner(); + ModelVersionImpl(String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { + this.innerObject = new ModelVersionInner(); this.serviceManager = serviceManager; this.version = name; } - public ModelVersionDataImpl update() { + public ModelVersionImpl update() { return this; } - public ModelVersionData apply() { + public ModelVersion apply() { this.innerObject = serviceManager .serviceClient() @@ -105,7 +104,7 @@ public ModelVersionData apply() { return this; } - public ModelVersionData apply(Context context) { + public ModelVersion apply(Context context) { this.innerObject = serviceManager .serviceClient() @@ -115,8 +114,8 @@ public ModelVersionData apply(Context context) { return this; } - ModelVersionDataImpl( - ModelVersionDataInner innerObject, + ModelVersionImpl( + ModelVersionInner innerObject, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { this.innerObject = innerObject; this.serviceManager = serviceManager; @@ -126,7 +125,7 @@ public ModelVersionData apply(Context context) { this.version = Utils.getValueFromIdByName(innerObject.id(), "versions"); } - public ModelVersionData refresh() { + public ModelVersion refresh() { this.innerObject = serviceManager .serviceClient() @@ -136,7 +135,7 @@ public ModelVersionData refresh() { return this; } - public ModelVersionData refresh(Context context) { + public ModelVersion refresh(Context context) { this.innerObject = serviceManager .serviceClient() @@ -146,7 +145,7 @@ public ModelVersionData refresh(Context context) { return this; } - public ModelVersionDataImpl withProperties(ModelVersionDetails properties) { + public ModelVersionImpl withProperties(ModelVersionProperties properties) { this.innerModel().withProperties(properties); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelVersionsClientImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelVersionsClientImpl.java index c22a87b4e845..10d871d4927a 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelVersionsClientImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelVersionsClientImpl.java @@ -29,7 +29,7 @@ import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.resourcemanager.machinelearning.fluent.ModelVersionsClient; -import com.azure.resourcemanager.machinelearning.fluent.models.ModelVersionDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.ModelVersionInner; import com.azure.resourcemanager.machinelearning.models.ListViewType; import com.azure.resourcemanager.machinelearning.models.ModelVersionResourceArmPaginatedResult; import reactor.core.publisher.Mono; @@ -109,7 +109,7 @@ Mono> delete( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/models/{name}/versions/{version}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( + Mono> get( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -126,7 +126,7 @@ Mono> get( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/models/{name}/versions/{version}") @ExpectedResponses({200, 201}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> createOrUpdate( + Mono> createOrUpdate( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -134,7 +134,7 @@ Mono> createOrUpdate( @PathParam("name") String name, @PathParam("version") String version, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") ModelVersionDataInner body, + @BodyParam("application/json") ModelVersionInner body, @HeaderParam("Accept") String accept, Context context); @@ -172,7 +172,7 @@ Mono> listNext( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String name, @@ -232,7 +232,7 @@ private Mono> listSinglePageAsync( listViewType, accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -268,7 +268,7 @@ private Mono> listSinglePageAsync( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String name, @@ -360,7 +360,7 @@ private Mono> listSinglePageAsync( * @return a paginated list of ModelVersion entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String name, @@ -405,7 +405,7 @@ private PagedFlux listAsync( * @return a paginated list of ModelVersion entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync(String resourceGroupName, String workspaceName, String name) { + private PagedFlux listAsync(String resourceGroupName, String workspaceName, String name) { final String skip = null; final String orderBy = null; final Integer top = null; @@ -458,7 +458,7 @@ private PagedFlux listAsync(String resourceGroupName, Str * @return a paginated list of ModelVersion entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String name, @@ -505,7 +505,7 @@ private PagedFlux listAsync( * @return a paginated list of ModelVersion entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list(String resourceGroupName, String workspaceName, String name) { + public PagedIterable list(String resourceGroupName, String workspaceName, String name) { final String skip = null; final String orderBy = null; final Integer top = null; @@ -556,7 +556,7 @@ public PagedIterable list(String resourceGroupName, Strin * @return a paginated list of ModelVersion entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -769,7 +769,7 @@ public Response deleteWithResponse( * @return version along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name, String version) { if (this.client.getEndpoint() == null) { return Mono @@ -828,7 +828,7 @@ private Mono> getWithResponseAsync( * @return version along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String name, String version, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -883,7 +883,7 @@ private Mono> getWithResponseAsync( * @return version on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getAsync( + private Mono getAsync( String resourceGroupName, String workspaceName, String name, String version) { return getWithResponseAsync(resourceGroupName, workspaceName, name, version) .flatMap(res -> Mono.justOrEmpty(res.getValue())); @@ -902,7 +902,7 @@ private Mono getAsync( * @return version. */ @ServiceMethod(returns = ReturnType.SINGLE) - public ModelVersionDataInner get(String resourceGroupName, String workspaceName, String name, String version) { + public ModelVersionInner get(String resourceGroupName, String workspaceName, String name, String version) { return getAsync(resourceGroupName, workspaceName, name, version).block(); } @@ -920,7 +920,7 @@ public ModelVersionDataInner get(String resourceGroupName, String workspaceName, * @return version along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context) { return getWithResponseAsync(resourceGroupName, workspaceName, name, version, context).block(); } @@ -940,8 +940,8 @@ public Response getWithResponse( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( - String resourceGroupName, String workspaceName, String name, String version, ModelVersionDataInner body) { + private Mono> createOrUpdateWithResponseAsync( + String resourceGroupName, String workspaceName, String name, String version, ModelVersionInner body) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -1007,12 +1007,12 @@ private Mono> createOrUpdateWithResponseAsync( * Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createOrUpdateWithResponseAsync( + private Mono> createOrUpdateWithResponseAsync( String resourceGroupName, String workspaceName, String name, String version, - ModelVersionDataInner body, + ModelVersionInner body, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -1074,8 +1074,8 @@ private Mono> createOrUpdateWithResponseAsync( * @return azure Resource Manager resource envelope on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( - String resourceGroupName, String workspaceName, String name, String version, ModelVersionDataInner body) { + private Mono createOrUpdateAsync( + String resourceGroupName, String workspaceName, String name, String version, ModelVersionInner body) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, version, body) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -1094,8 +1094,8 @@ private Mono createOrUpdateAsync( * @return azure Resource Manager resource envelope. */ @ServiceMethod(returns = ReturnType.SINGLE) - public ModelVersionDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String name, String version, ModelVersionDataInner body) { + public ModelVersionInner createOrUpdate( + String resourceGroupName, String workspaceName, String name, String version, ModelVersionInner body) { return createOrUpdateAsync(resourceGroupName, workspaceName, name, version, body).block(); } @@ -1114,12 +1114,12 @@ public ModelVersionDataInner createOrUpdate( * @return azure Resource Manager resource envelope along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response createOrUpdateWithResponse( + public Response createOrUpdateWithResponse( String resourceGroupName, String workspaceName, String name, String version, - ModelVersionDataInner body, + ModelVersionInner body, Context context) { return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, name, version, body, context).block(); } @@ -1135,7 +1135,7 @@ public Response createOrUpdateWithResponse( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink) { + private Mono> listNextSinglePageAsync(String nextLink) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } @@ -1148,7 +1148,7 @@ private Mono> listNextSinglePageAsync(Strin final String accept = "application/json"; return FluxUtil .withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -1172,7 +1172,7 @@ private Mono> listNextSinglePageAsync(Strin * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink, Context context) { + private Mono> listNextSinglePageAsync(String nextLink, Context context) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelVersionsImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelVersionsImpl.java index 5b030dde0a88..b7b7b453b389 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelVersionsImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/ModelVersionsImpl.java @@ -10,9 +10,9 @@ import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.machinelearning.fluent.ModelVersionsClient; -import com.azure.resourcemanager.machinelearning.fluent.models.ModelVersionDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.ModelVersionInner; import com.azure.resourcemanager.machinelearning.models.ListViewType; -import com.azure.resourcemanager.machinelearning.models.ModelVersionData; +import com.azure.resourcemanager.machinelearning.models.ModelVersion; import com.azure.resourcemanager.machinelearning.models.ModelVersions; public final class ModelVersionsImpl implements ModelVersions { @@ -29,12 +29,12 @@ public ModelVersionsImpl( this.serviceManager = serviceManager; } - public PagedIterable list(String resourceGroupName, String workspaceName, String name) { - PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName, name); - return Utils.mapPage(inner, inner1 -> new ModelVersionDataImpl(inner1, this.manager())); + public PagedIterable list(String resourceGroupName, String workspaceName, String name) { + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName, name); + return Utils.mapPage(inner, inner1 -> new ModelVersionImpl(inner1, this.manager())); } - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -49,7 +49,7 @@ public PagedIterable list( String feed, ListViewType listViewType, Context context) { - PagedIterable inner = + PagedIterable inner = this .serviceClient() .list( @@ -67,7 +67,7 @@ public PagedIterable list( feed, listViewType, context); - return Utils.mapPage(inner, inner1 -> new ModelVersionDataImpl(inner1, this.manager())); + return Utils.mapPage(inner, inner1 -> new ModelVersionImpl(inner1, this.manager())); } public void delete(String resourceGroupName, String workspaceName, String name, String version) { @@ -79,31 +79,31 @@ public Response deleteWithResponse( return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, name, version, context); } - public ModelVersionData get(String resourceGroupName, String workspaceName, String name, String version) { - ModelVersionDataInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name, version); + public ModelVersion get(String resourceGroupName, String workspaceName, String name, String version) { + ModelVersionInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name, version); if (inner != null) { - return new ModelVersionDataImpl(inner, this.manager()); + return new ModelVersionImpl(inner, this.manager()); } else { return null; } } - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context) { - Response inner = + Response inner = this.serviceClient().getWithResponse(resourceGroupName, workspaceName, name, version, context); if (inner != null) { return new SimpleResponse<>( inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new ModelVersionDataImpl(inner.getValue(), this.manager())); + new ModelVersionImpl(inner.getValue(), this.manager())); } else { return null; } } - public ModelVersionData getById(String id) { + public ModelVersion getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -136,7 +136,7 @@ public ModelVersionData getById(String id) { return this.getWithResponse(resourceGroupName, workspaceName, name, version, Context.NONE).getValue(); } - public Response getByIdWithResponse(String id, Context context) { + public Response getByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -243,7 +243,7 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager return this.serviceManager; } - public ModelVersionDataImpl define(String name) { - return new ModelVersionDataImpl(name, this.manager()); + public ModelVersionImpl define(String name) { + return new ModelVersionImpl(name, this.manager()); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineDeploymentDataImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineDeploymentImpl.java similarity index 72% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineDeploymentDataImpl.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineDeploymentImpl.java index 0327c0414990..2666a2239f6a 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineDeploymentDataImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineDeploymentImpl.java @@ -8,23 +8,21 @@ import com.azure.core.management.Region; import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.OnlineDeploymentDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.OnlineDeploymentInner; import com.azure.resourcemanager.machinelearning.models.DeploymentLogs; import com.azure.resourcemanager.machinelearning.models.DeploymentLogsRequest; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentity; -import com.azure.resourcemanager.machinelearning.models.OnlineDeploymentData; -import com.azure.resourcemanager.machinelearning.models.OnlineDeploymentDetails; -import com.azure.resourcemanager.machinelearning.models.PartialManagedServiceIdentity; -import com.azure.resourcemanager.machinelearning.models.PartialOnlineDeployment; -import com.azure.resourcemanager.machinelearning.models.PartialOnlineDeploymentPartialTrackedResource; +import com.azure.resourcemanager.machinelearning.models.OnlineDeployment; +import com.azure.resourcemanager.machinelearning.models.OnlineDeploymentProperties; +import com.azure.resourcemanager.machinelearning.models.PartialMinimalTrackedResourceWithSku; import com.azure.resourcemanager.machinelearning.models.PartialSku; import com.azure.resourcemanager.machinelearning.models.Sku; import java.util.Collections; import java.util.Map; -public final class OnlineDeploymentDataImpl - implements OnlineDeploymentData, OnlineDeploymentData.Definition, OnlineDeploymentData.Update { - private OnlineDeploymentDataInner innerObject; +public final class OnlineDeploymentImpl + implements OnlineDeployment, OnlineDeployment.Definition, OnlineDeployment.Update { + private OnlineDeploymentInner innerObject; private final com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager; @@ -61,7 +59,7 @@ public String kind() { return this.innerModel().kind(); } - public OnlineDeploymentDetails properties() { + public OnlineDeploymentProperties properties() { return this.innerModel().properties(); } @@ -85,7 +83,7 @@ public String resourceGroupName() { return resourceGroupName; } - public OnlineDeploymentDataInner innerModel() { + public OnlineDeploymentInner innerModel() { return this.innerObject; } @@ -101,9 +99,9 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager private String deploymentName; - private PartialOnlineDeploymentPartialTrackedResource updateBody; + private PartialMinimalTrackedResourceWithSku updateBody; - public OnlineDeploymentDataImpl withExistingOnlineEndpoint( + public OnlineDeploymentImpl withExistingOnlineEndpoint( String resourceGroupName, String workspaceName, String endpointName) { this.resourceGroupName = resourceGroupName; this.workspaceName = workspaceName; @@ -111,7 +109,7 @@ public OnlineDeploymentDataImpl withExistingOnlineEndpoint( return this; } - public OnlineDeploymentData create() { + public OnlineDeployment create() { this.innerObject = serviceManager .serviceClient() @@ -121,7 +119,7 @@ public OnlineDeploymentData create() { return this; } - public OnlineDeploymentData create(Context context) { + public OnlineDeployment create(Context context) { this.innerObject = serviceManager .serviceClient() @@ -131,19 +129,18 @@ public OnlineDeploymentData create(Context context) { return this; } - OnlineDeploymentDataImpl( - String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { - this.innerObject = new OnlineDeploymentDataInner(); + OnlineDeploymentImpl(String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { + this.innerObject = new OnlineDeploymentInner(); this.serviceManager = serviceManager; this.deploymentName = name; } - public OnlineDeploymentDataImpl update() { - this.updateBody = new PartialOnlineDeploymentPartialTrackedResource(); + public OnlineDeploymentImpl update() { + this.updateBody = new PartialMinimalTrackedResourceWithSku(); return this; } - public OnlineDeploymentData apply() { + public OnlineDeployment apply() { this.innerObject = serviceManager .serviceClient() @@ -152,7 +149,7 @@ public OnlineDeploymentData apply() { return this; } - public OnlineDeploymentData apply(Context context) { + public OnlineDeployment apply(Context context) { this.innerObject = serviceManager .serviceClient() @@ -161,8 +158,8 @@ public OnlineDeploymentData apply(Context context) { return this; } - OnlineDeploymentDataImpl( - OnlineDeploymentDataInner innerObject, + OnlineDeploymentImpl( + OnlineDeploymentInner innerObject, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { this.innerObject = innerObject; this.serviceManager = serviceManager; @@ -172,7 +169,7 @@ public OnlineDeploymentData apply(Context context) { this.deploymentName = Utils.getValueFromIdByName(innerObject.id(), "deployments"); } - public OnlineDeploymentData refresh() { + public OnlineDeployment refresh() { this.innerObject = serviceManager .serviceClient() @@ -182,7 +179,7 @@ public OnlineDeploymentData refresh() { return this; } - public OnlineDeploymentData refresh(Context context) { + public OnlineDeployment refresh(Context context) { this.innerObject = serviceManager .serviceClient() @@ -204,22 +201,22 @@ public Response getLogsWithResponse(DeploymentLogsRequest body, .getLogsWithResponse(resourceGroupName, workspaceName, endpointName, deploymentName, body, context); } - public OnlineDeploymentDataImpl withRegion(Region location) { + public OnlineDeploymentImpl withRegion(Region location) { this.innerModel().withLocation(location.toString()); return this; } - public OnlineDeploymentDataImpl withRegion(String location) { + public OnlineDeploymentImpl withRegion(String location) { this.innerModel().withLocation(location); return this; } - public OnlineDeploymentDataImpl withProperties(OnlineDeploymentDetails properties) { + public OnlineDeploymentImpl withProperties(OnlineDeploymentProperties properties) { this.innerModel().withProperties(properties); return this; } - public OnlineDeploymentDataImpl withTags(Map tags) { + public OnlineDeploymentImpl withTags(Map tags) { if (isInCreateMode()) { this.innerModel().withTags(tags); return this; @@ -229,37 +226,22 @@ public OnlineDeploymentDataImpl withTags(Map tags) { } } - public OnlineDeploymentDataImpl withIdentity(ManagedServiceIdentity identity) { + public OnlineDeploymentImpl withIdentity(ManagedServiceIdentity identity) { this.innerModel().withIdentity(identity); return this; } - public OnlineDeploymentDataImpl withKind(String kind) { - if (isInCreateMode()) { - this.innerModel().withKind(kind); - return this; - } else { - this.updateBody.withKind(kind); - return this; - } - } - - public OnlineDeploymentDataImpl withSku(Sku sku) { - this.innerModel().withSku(sku); - return this; - } - - public OnlineDeploymentDataImpl withIdentity(PartialManagedServiceIdentity identity) { - this.updateBody.withIdentity(identity); + public OnlineDeploymentImpl withKind(String kind) { + this.innerModel().withKind(kind); return this; } - public OnlineDeploymentDataImpl withProperties(PartialOnlineDeployment properties) { - this.updateBody.withProperties(properties); + public OnlineDeploymentImpl withSku(Sku sku) { + this.innerModel().withSku(sku); return this; } - public OnlineDeploymentDataImpl withSku(PartialSku sku) { + public OnlineDeploymentImpl withSku(PartialSku sku) { this.updateBody.withSku(sku); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineDeploymentsClientImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineDeploymentsClientImpl.java index 5f49d40201d0..2214d99f635d 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineDeploymentsClientImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineDeploymentsClientImpl.java @@ -35,11 +35,11 @@ import com.azure.core.util.polling.SyncPoller; import com.azure.resourcemanager.machinelearning.fluent.OnlineDeploymentsClient; import com.azure.resourcemanager.machinelearning.fluent.models.DeploymentLogsInner; -import com.azure.resourcemanager.machinelearning.fluent.models.OnlineDeploymentDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.OnlineDeploymentInner; import com.azure.resourcemanager.machinelearning.fluent.models.SkuResourceInner; import com.azure.resourcemanager.machinelearning.models.DeploymentLogsRequest; import com.azure.resourcemanager.machinelearning.models.OnlineDeploymentTrackedResourceArmPaginatedResult; -import com.azure.resourcemanager.machinelearning.models.PartialOnlineDeploymentPartialTrackedResource; +import com.azure.resourcemanager.machinelearning.models.PartialMinimalTrackedResourceWithSku; import com.azure.resourcemanager.machinelearning.models.SkuResourceArmPaginatedResult; import java.nio.ByteBuffer; import reactor.core.publisher.Flux; @@ -116,7 +116,7 @@ Mono>> delete( + "/deployments/{deploymentName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( + Mono> get( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -142,7 +142,7 @@ Mono>> update( @PathParam("endpointName") String endpointName, @PathParam("deploymentName") String deploymentName, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") PartialOnlineDeploymentPartialTrackedResource body, + @BodyParam("application/json") PartialMinimalTrackedResourceWithSku body, @HeaderParam("Accept") String accept, Context context); @@ -161,7 +161,7 @@ Mono>> createOrUpdate( @PathParam("endpointName") String endpointName, @PathParam("deploymentName") String deploymentName, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") OnlineDeploymentDataInner body, + @BodyParam("application/json") OnlineDeploymentInner body, @HeaderParam("Accept") String accept, Context context); @@ -241,7 +241,7 @@ Mono> listSkusNext( * of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String endpointName, String orderBy, Integer top, String skip) { if (this.client.getEndpoint() == null) { return Mono @@ -282,7 +282,7 @@ private Mono> listSinglePageAsync( skip, accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -311,7 +311,7 @@ private Mono> listSinglePageAsync( * of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String endpointName, @@ -382,7 +382,7 @@ private Mono> listSinglePageAsync( * @return a paginated list of OnlineDeployment entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String endpointName, String orderBy, Integer top, String skip) { return new PagedFlux<>( () -> listSinglePageAsync(resourceGroupName, workspaceName, endpointName, orderBy, top, skip), @@ -401,7 +401,7 @@ private PagedFlux listAsync( * @return a paginated list of OnlineDeployment entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String endpointName) { final String orderBy = null; final Integer top = null; @@ -427,7 +427,7 @@ private PagedFlux listAsync( * @return a paginated list of OnlineDeployment entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String endpointName, @@ -452,7 +452,7 @@ private PagedFlux listAsync( * @return a paginated list of OnlineDeployment entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String endpointName) { final String orderBy = null; final Integer top = null; @@ -476,7 +476,7 @@ public PagedIterable list( * @return a paginated list of OnlineDeployment entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String endpointName, @@ -775,7 +775,7 @@ public void delete( * @return inference Deployment Deployment along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName) { if (this.client.getEndpoint() == null) { return Mono @@ -834,7 +834,7 @@ private Mono> getWithResponseAsync( * @return inference Deployment Deployment along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -889,7 +889,7 @@ private Mono> getWithResponseAsync( * @return inference Deployment Deployment on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getAsync( + private Mono getAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName) { return getWithResponseAsync(resourceGroupName, workspaceName, endpointName, deploymentName) .flatMap(res -> Mono.justOrEmpty(res.getValue())); @@ -908,7 +908,7 @@ private Mono getAsync( * @return inference Deployment Deployment. */ @ServiceMethod(returns = ReturnType.SINGLE) - public OnlineDeploymentDataInner get( + public OnlineDeploymentInner get( String resourceGroupName, String workspaceName, String endpointName, String deploymentName) { return getAsync(resourceGroupName, workspaceName, endpointName, deploymentName).block(); } @@ -927,7 +927,7 @@ public OnlineDeploymentDataInner get( * @return inference Deployment Deployment along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, Context context) { return getWithResponseAsync(resourceGroupName, workspaceName, endpointName, deploymentName, context).block(); } @@ -951,7 +951,7 @@ private Mono>> updateWithResponseAsync( String workspaceName, String endpointName, String deploymentName, - PartialOnlineDeploymentPartialTrackedResource body) { + PartialMinimalTrackedResourceWithSku body) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -1021,7 +1021,7 @@ private Mono>> updateWithResponseAsync( String workspaceName, String endpointName, String deploymentName, - PartialOnlineDeploymentPartialTrackedResource body, + PartialMinimalTrackedResourceWithSku body, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -1083,21 +1083,21 @@ private Mono>> updateWithResponseAsync( * @return the {@link PollerFlux} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, OnlineDeploymentDataInner> beginUpdateAsync( + private PollerFlux, OnlineDeploymentInner> beginUpdateAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialOnlineDeploymentPartialTrackedResource body) { + PartialMinimalTrackedResourceWithSku body) { Mono>> mono = updateWithResponseAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body); return this .client - .getLroResult( + .getLroResult( mono, this.client.getHttpPipeline(), - OnlineDeploymentDataInner.class, - OnlineDeploymentDataInner.class, + OnlineDeploymentInner.class, + OnlineDeploymentInner.class, this.client.getContext()); } @@ -1116,24 +1116,20 @@ private PollerFlux, OnlineDeploymentDataIn * @return the {@link PollerFlux} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, OnlineDeploymentDataInner> beginUpdateAsync( + private PollerFlux, OnlineDeploymentInner> beginUpdateAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialOnlineDeploymentPartialTrackedResource body, + PartialMinimalTrackedResourceWithSku body, Context context) { context = this.client.mergeContext(context); Mono>> mono = updateWithResponseAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body, context); return this .client - .getLroResult( - mono, - this.client.getHttpPipeline(), - OnlineDeploymentDataInner.class, - OnlineDeploymentDataInner.class, - context); + .getLroResult( + mono, this.client.getHttpPipeline(), OnlineDeploymentInner.class, OnlineDeploymentInner.class, context); } /** @@ -1150,12 +1146,12 @@ private PollerFlux, OnlineDeploymentDataIn * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, OnlineDeploymentDataInner> beginUpdate( + public SyncPoller, OnlineDeploymentInner> beginUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialOnlineDeploymentPartialTrackedResource body) { + PartialMinimalTrackedResourceWithSku body) { return beginUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body).getSyncPoller(); } @@ -1174,12 +1170,12 @@ public SyncPoller, OnlineDeploymentDataInn * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, OnlineDeploymentDataInner> beginUpdate( + public SyncPoller, OnlineDeploymentInner> beginUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialOnlineDeploymentPartialTrackedResource body, + PartialMinimalTrackedResourceWithSku body, Context context) { return beginUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body, context) .getSyncPoller(); @@ -1199,12 +1195,12 @@ public SyncPoller, OnlineDeploymentDataInn * @return the response body on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono updateAsync( + private Mono updateAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialOnlineDeploymentPartialTrackedResource body) { + PartialMinimalTrackedResourceWithSku body) { return beginUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body) .last() .flatMap(this.client::getLroFinalResultOrError); @@ -1225,12 +1221,12 @@ private Mono updateAsync( * @return the response body on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono updateAsync( + private Mono updateAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialOnlineDeploymentPartialTrackedResource body, + PartialMinimalTrackedResourceWithSku body, Context context) { return beginUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body, context) .last() @@ -1251,12 +1247,12 @@ private Mono updateAsync( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public OnlineDeploymentDataInner update( + public OnlineDeploymentInner update( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialOnlineDeploymentPartialTrackedResource body) { + PartialMinimalTrackedResourceWithSku body) { return updateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body).block(); } @@ -1275,12 +1271,12 @@ public OnlineDeploymentDataInner update( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public OnlineDeploymentDataInner update( + public OnlineDeploymentInner update( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - PartialOnlineDeploymentPartialTrackedResource body, + PartialMinimalTrackedResourceWithSku body, Context context) { return updateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body, context).block(); } @@ -1304,7 +1300,7 @@ private Mono>> createOrUpdateWithResponseAsync( String workspaceName, String endpointName, String deploymentName, - OnlineDeploymentDataInner body) { + OnlineDeploymentInner body) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -1374,7 +1370,7 @@ private Mono>> createOrUpdateWithResponseAsync( String workspaceName, String endpointName, String deploymentName, - OnlineDeploymentDataInner body, + OnlineDeploymentInner body, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -1436,21 +1432,21 @@ private Mono>> createOrUpdateWithResponseAsync( * @return the {@link PollerFlux} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, OnlineDeploymentDataInner> beginCreateOrUpdateAsync( + private PollerFlux, OnlineDeploymentInner> beginCreateOrUpdateAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - OnlineDeploymentDataInner body) { + OnlineDeploymentInner body) { Mono>> mono = createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body); return this .client - .getLroResult( + .getLroResult( mono, this.client.getHttpPipeline(), - OnlineDeploymentDataInner.class, - OnlineDeploymentDataInner.class, + OnlineDeploymentInner.class, + OnlineDeploymentInner.class, this.client.getContext()); } @@ -1469,12 +1465,12 @@ private PollerFlux, OnlineDeploymentDataIn * @return the {@link PollerFlux} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, OnlineDeploymentDataInner> beginCreateOrUpdateAsync( + private PollerFlux, OnlineDeploymentInner> beginCreateOrUpdateAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - OnlineDeploymentDataInner body, + OnlineDeploymentInner body, Context context) { context = this.client.mergeContext(context); Mono>> mono = @@ -1482,12 +1478,8 @@ private PollerFlux, OnlineDeploymentDataIn resourceGroupName, workspaceName, endpointName, deploymentName, body, context); return this .client - .getLroResult( - mono, - this.client.getHttpPipeline(), - OnlineDeploymentDataInner.class, - OnlineDeploymentDataInner.class, - context); + .getLroResult( + mono, this.client.getHttpPipeline(), OnlineDeploymentInner.class, OnlineDeploymentInner.class, context); } /** @@ -1504,12 +1496,12 @@ private PollerFlux, OnlineDeploymentDataIn * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, OnlineDeploymentDataInner> beginCreateOrUpdate( + public SyncPoller, OnlineDeploymentInner> beginCreateOrUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - OnlineDeploymentDataInner body) { + OnlineDeploymentInner body) { return beginCreateOrUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body) .getSyncPoller(); } @@ -1529,12 +1521,12 @@ public SyncPoller, OnlineDeploymentDataInn * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, OnlineDeploymentDataInner> beginCreateOrUpdate( + public SyncPoller, OnlineDeploymentInner> beginCreateOrUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - OnlineDeploymentDataInner body, + OnlineDeploymentInner body, Context context) { return beginCreateOrUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body, context) .getSyncPoller(); @@ -1554,12 +1546,12 @@ public SyncPoller, OnlineDeploymentDataInn * @return the response body on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( + private Mono createOrUpdateAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - OnlineDeploymentDataInner body) { + OnlineDeploymentInner body) { return beginCreateOrUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body) .last() .flatMap(this.client::getLroFinalResultOrError); @@ -1580,12 +1572,12 @@ private Mono createOrUpdateAsync( * @return the response body on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( + private Mono createOrUpdateAsync( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - OnlineDeploymentDataInner body, + OnlineDeploymentInner body, Context context) { return beginCreateOrUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body, context) .last() @@ -1606,12 +1598,12 @@ private Mono createOrUpdateAsync( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public OnlineDeploymentDataInner createOrUpdate( + public OnlineDeploymentInner createOrUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - OnlineDeploymentDataInner body) { + OnlineDeploymentInner body) { return createOrUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body).block(); } @@ -1630,12 +1622,12 @@ public OnlineDeploymentDataInner createOrUpdate( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public OnlineDeploymentDataInner createOrUpdate( + public OnlineDeploymentInner createOrUpdate( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, - OnlineDeploymentDataInner body, + OnlineDeploymentInner body, Context context) { return createOrUpdateAsync(resourceGroupName, workspaceName, endpointName, deploymentName, body, context) .block(); @@ -2144,7 +2136,7 @@ public PagedIterable listSkus( * of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink) { + private Mono> listNextSinglePageAsync(String nextLink) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } @@ -2157,7 +2149,7 @@ private Mono> listNextSinglePageAsync(S final String accept = "application/json"; return FluxUtil .withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -2181,7 +2173,7 @@ private Mono> listNextSinglePageAsync(S * of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink, Context context) { + private Mono> listNextSinglePageAsync(String nextLink, Context context) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineDeploymentsImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineDeploymentsImpl.java index 85265edfcdeb..bd22d0ec5e69 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineDeploymentsImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineDeploymentsImpl.java @@ -11,11 +11,11 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.machinelearning.fluent.OnlineDeploymentsClient; import com.azure.resourcemanager.machinelearning.fluent.models.DeploymentLogsInner; -import com.azure.resourcemanager.machinelearning.fluent.models.OnlineDeploymentDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.OnlineDeploymentInner; import com.azure.resourcemanager.machinelearning.fluent.models.SkuResourceInner; import com.azure.resourcemanager.machinelearning.models.DeploymentLogs; import com.azure.resourcemanager.machinelearning.models.DeploymentLogsRequest; -import com.azure.resourcemanager.machinelearning.models.OnlineDeploymentData; +import com.azure.resourcemanager.machinelearning.models.OnlineDeployment; import com.azure.resourcemanager.machinelearning.models.OnlineDeployments; import com.azure.resourcemanager.machinelearning.models.SkuResource; @@ -33,14 +33,13 @@ public OnlineDeploymentsImpl( this.serviceManager = serviceManager; } - public PagedIterable list( - String resourceGroupName, String workspaceName, String endpointName) { - PagedIterable inner = + public PagedIterable list(String resourceGroupName, String workspaceName, String endpointName) { + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName, endpointName); - return Utils.mapPage(inner, inner1 -> new OnlineDeploymentDataImpl(inner1, this.manager())); + return Utils.mapPage(inner, inner1 -> new OnlineDeploymentImpl(inner1, this.manager())); } - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String endpointName, @@ -48,9 +47,9 @@ public PagedIterable list( Integer top, String skip, Context context) { - PagedIterable inner = + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName, endpointName, orderBy, top, skip, context); - return Utils.mapPage(inner, inner1 -> new OnlineDeploymentDataImpl(inner1, this.manager())); + return Utils.mapPage(inner, inner1 -> new OnlineDeploymentImpl(inner1, this.manager())); } public void delete(String resourceGroupName, String workspaceName, String endpointName, String deploymentName) { @@ -62,20 +61,20 @@ public void delete( this.serviceClient().delete(resourceGroupName, workspaceName, endpointName, deploymentName, context); } - public OnlineDeploymentData get( + public OnlineDeployment get( String resourceGroupName, String workspaceName, String endpointName, String deploymentName) { - OnlineDeploymentDataInner inner = + OnlineDeploymentInner inner = this.serviceClient().get(resourceGroupName, workspaceName, endpointName, deploymentName); if (inner != null) { - return new OnlineDeploymentDataImpl(inner, this.manager()); + return new OnlineDeploymentImpl(inner, this.manager()); } else { return null; } } - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, Context context) { - Response inner = + Response inner = this .serviceClient() .getWithResponse(resourceGroupName, workspaceName, endpointName, deploymentName, context); @@ -84,7 +83,7 @@ public Response getWithResponse( inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new OnlineDeploymentDataImpl(inner.getValue(), this.manager())); + new OnlineDeploymentImpl(inner.getValue(), this.manager())); } else { return null; } @@ -149,7 +148,7 @@ public PagedIterable listSkus( return Utils.mapPage(inner, inner1 -> new SkuResourceImpl(inner1, this.manager())); } - public OnlineDeploymentData getById(String id) { + public OnlineDeployment getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -185,7 +184,7 @@ public OnlineDeploymentData getById(String id) { .getValue(); } - public Response getByIdWithResponse(String id, Context context) { + public Response getByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -295,7 +294,7 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager return this.serviceManager; } - public OnlineDeploymentDataImpl define(String name) { - return new OnlineDeploymentDataImpl(name, this.manager()); + public OnlineDeploymentImpl define(String name) { + return new OnlineDeploymentImpl(name, this.manager()); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineEndpointDataImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineEndpointImpl.java similarity index 74% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineEndpointDataImpl.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineEndpointImpl.java index d224776249dd..7fdbb9ba754f 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineEndpointDataImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineEndpointImpl.java @@ -8,24 +8,21 @@ import com.azure.core.management.Region; import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.OnlineEndpointDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.OnlineEndpointInner; import com.azure.resourcemanager.machinelearning.models.EndpointAuthKeys; import com.azure.resourcemanager.machinelearning.models.EndpointAuthToken; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentity; -import com.azure.resourcemanager.machinelearning.models.OnlineEndpointData; -import com.azure.resourcemanager.machinelearning.models.OnlineEndpointDetails; +import com.azure.resourcemanager.machinelearning.models.OnlineEndpoint; +import com.azure.resourcemanager.machinelearning.models.OnlineEndpointProperties; import com.azure.resourcemanager.machinelearning.models.PartialManagedServiceIdentity; -import com.azure.resourcemanager.machinelearning.models.PartialOnlineEndpoint; -import com.azure.resourcemanager.machinelearning.models.PartialOnlineEndpointPartialTrackedResource; -import com.azure.resourcemanager.machinelearning.models.PartialSku; +import com.azure.resourcemanager.machinelearning.models.PartialMinimalTrackedResourceWithIdentity; import com.azure.resourcemanager.machinelearning.models.RegenerateEndpointKeysRequest; import com.azure.resourcemanager.machinelearning.models.Sku; import java.util.Collections; import java.util.Map; -public final class OnlineEndpointDataImpl - implements OnlineEndpointData, OnlineEndpointData.Definition, OnlineEndpointData.Update { - private OnlineEndpointDataInner innerObject; +public final class OnlineEndpointImpl implements OnlineEndpoint, OnlineEndpoint.Definition, OnlineEndpoint.Update { + private OnlineEndpointInner innerObject; private final com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager; @@ -62,7 +59,7 @@ public String kind() { return this.innerModel().kind(); } - public OnlineEndpointDetails properties() { + public OnlineEndpointProperties properties() { return this.innerModel().properties(); } @@ -86,7 +83,7 @@ public String resourceGroupName() { return resourceGroupName; } - public OnlineEndpointDataInner innerModel() { + public OnlineEndpointInner innerModel() { return this.innerObject; } @@ -100,15 +97,15 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager private String endpointName; - private PartialOnlineEndpointPartialTrackedResource updateBody; + private PartialMinimalTrackedResourceWithIdentity updateBody; - public OnlineEndpointDataImpl withExistingWorkspace(String resourceGroupName, String workspaceName) { + public OnlineEndpointImpl withExistingWorkspace(String resourceGroupName, String workspaceName) { this.resourceGroupName = resourceGroupName; this.workspaceName = workspaceName; return this; } - public OnlineEndpointData create() { + public OnlineEndpoint create() { this.innerObject = serviceManager .serviceClient() @@ -117,7 +114,7 @@ public OnlineEndpointData create() { return this; } - public OnlineEndpointData create(Context context) { + public OnlineEndpoint create(Context context) { this.innerObject = serviceManager .serviceClient() @@ -126,19 +123,18 @@ public OnlineEndpointData create(Context context) { return this; } - OnlineEndpointDataImpl( - String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { - this.innerObject = new OnlineEndpointDataInner(); + OnlineEndpointImpl(String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { + this.innerObject = new OnlineEndpointInner(); this.serviceManager = serviceManager; this.endpointName = name; } - public OnlineEndpointDataImpl update() { - this.updateBody = new PartialOnlineEndpointPartialTrackedResource(); + public OnlineEndpointImpl update() { + this.updateBody = new PartialMinimalTrackedResourceWithIdentity(); return this; } - public OnlineEndpointData apply() { + public OnlineEndpoint apply() { this.innerObject = serviceManager .serviceClient() @@ -147,7 +143,7 @@ public OnlineEndpointData apply() { return this; } - public OnlineEndpointData apply(Context context) { + public OnlineEndpoint apply(Context context) { this.innerObject = serviceManager .serviceClient() @@ -156,8 +152,8 @@ public OnlineEndpointData apply(Context context) { return this; } - OnlineEndpointDataImpl( - OnlineEndpointDataInner innerObject, + OnlineEndpointImpl( + OnlineEndpointInner innerObject, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { this.innerObject = innerObject; this.serviceManager = serviceManager; @@ -166,7 +162,7 @@ public OnlineEndpointData apply(Context context) { this.endpointName = Utils.getValueFromIdByName(innerObject.id(), "onlineEndpoints"); } - public OnlineEndpointData refresh() { + public OnlineEndpoint refresh() { this.innerObject = serviceManager .serviceClient() @@ -176,7 +172,7 @@ public OnlineEndpointData refresh() { return this; } - public OnlineEndpointData refresh(Context context) { + public OnlineEndpoint refresh(Context context) { this.innerObject = serviceManager .serviceClient() @@ -214,22 +210,22 @@ public Response getTokenWithResponse(Context context) { .getTokenWithResponse(resourceGroupName, workspaceName, endpointName, context); } - public OnlineEndpointDataImpl withRegion(Region location) { + public OnlineEndpointImpl withRegion(Region location) { this.innerModel().withLocation(location.toString()); return this; } - public OnlineEndpointDataImpl withRegion(String location) { + public OnlineEndpointImpl withRegion(String location) { this.innerModel().withLocation(location); return this; } - public OnlineEndpointDataImpl withProperties(OnlineEndpointDetails properties) { + public OnlineEndpointImpl withProperties(OnlineEndpointProperties properties) { this.innerModel().withProperties(properties); return this; } - public OnlineEndpointDataImpl withTags(Map tags) { + public OnlineEndpointImpl withTags(Map tags) { if (isInCreateMode()) { this.innerModel().withTags(tags); return this; @@ -239,41 +235,26 @@ public OnlineEndpointDataImpl withTags(Map tags) { } } - public OnlineEndpointDataImpl withIdentity(ManagedServiceIdentity identity) { + public OnlineEndpointImpl withIdentity(ManagedServiceIdentity identity) { this.innerModel().withIdentity(identity); return this; } - public OnlineEndpointDataImpl withKind(String kind) { - if (isInCreateMode()) { - this.innerModel().withKind(kind); - return this; - } else { - this.updateBody.withKind(kind); - return this; - } + public OnlineEndpointImpl withKind(String kind) { + this.innerModel().withKind(kind); + return this; } - public OnlineEndpointDataImpl withSku(Sku sku) { + public OnlineEndpointImpl withSku(Sku sku) { this.innerModel().withSku(sku); return this; } - public OnlineEndpointDataImpl withIdentity(PartialManagedServiceIdentity identity) { + public OnlineEndpointImpl withIdentity(PartialManagedServiceIdentity identity) { this.updateBody.withIdentity(identity); return this; } - public OnlineEndpointDataImpl withProperties(PartialOnlineEndpoint properties) { - this.updateBody.withProperties(properties); - return this; - } - - public OnlineEndpointDataImpl withSku(PartialSku sku) { - this.updateBody.withSku(sku); - return this; - } - private boolean isInCreateMode() { return this.innerModel().id() == null; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineEndpointsClientImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineEndpointsClientImpl.java index 7f3222df5d62..00fb8acee584 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineEndpointsClientImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineEndpointsClientImpl.java @@ -36,11 +36,11 @@ import com.azure.resourcemanager.machinelearning.fluent.OnlineEndpointsClient; import com.azure.resourcemanager.machinelearning.fluent.models.EndpointAuthKeysInner; import com.azure.resourcemanager.machinelearning.fluent.models.EndpointAuthTokenInner; -import com.azure.resourcemanager.machinelearning.fluent.models.OnlineEndpointDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.OnlineEndpointInner; import com.azure.resourcemanager.machinelearning.models.EndpointComputeType; import com.azure.resourcemanager.machinelearning.models.OnlineEndpointTrackedResourceArmPaginatedResult; import com.azure.resourcemanager.machinelearning.models.OrderString; -import com.azure.resourcemanager.machinelearning.models.PartialOnlineEndpointPartialTrackedResource; +import com.azure.resourcemanager.machinelearning.models.PartialMinimalTrackedResourceWithIdentity; import com.azure.resourcemanager.machinelearning.models.RegenerateEndpointKeysRequest; import java.nio.ByteBuffer; import reactor.core.publisher.Flux; @@ -116,7 +116,7 @@ Mono>> delete( + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/onlineEndpoints/{endpointName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( + Mono> get( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -139,7 +139,7 @@ Mono>> update( @PathParam("workspaceName") String workspaceName, @PathParam("endpointName") String endpointName, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") PartialOnlineEndpointPartialTrackedResource body, + @BodyParam("application/json") PartialMinimalTrackedResourceWithIdentity body, @HeaderParam("Accept") String accept, Context context); @@ -156,7 +156,7 @@ Mono>> createOrUpdate( @PathParam("workspaceName") String workspaceName, @PathParam("endpointName") String endpointName, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") OnlineEndpointDataInner body, + @BodyParam("application/json") OnlineEndpointInner body, @HeaderParam("Accept") String accept, Context context); @@ -243,7 +243,7 @@ Mono> listNext( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String name, @@ -292,7 +292,7 @@ private Mono> listSinglePageAsync( orderBy, accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -326,7 +326,7 @@ private Mono> listSinglePageAsync( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( + private Mono> listSinglePageAsync( String resourceGroupName, String workspaceName, String name, @@ -405,7 +405,7 @@ private Mono> listSinglePageAsync( * @return a paginated list of OnlineEndpoint entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String name, @@ -433,7 +433,7 @@ private PagedFlux listAsync( * @return a paginated list of OnlineEndpoint entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync(String resourceGroupName, String workspaceName) { + private PagedFlux listAsync(String resourceGroupName, String workspaceName) { final String name = null; final Integer count = null; final EndpointComputeType computeType = null; @@ -469,7 +469,7 @@ private PagedFlux listAsync(String resourceGroupName, S * @return a paginated list of OnlineEndpoint entities as paginated response with {@link PagedFlux}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( + private PagedFlux listAsync( String resourceGroupName, String workspaceName, String name, @@ -507,7 +507,7 @@ private PagedFlux listAsync( * @return a paginated list of OnlineEndpoint entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list(String resourceGroupName, String workspaceName) { + public PagedIterable list(String resourceGroupName, String workspaceName) { final String name = null; final Integer count = null; final EndpointComputeType computeType = null; @@ -540,7 +540,7 @@ public PagedIterable list(String resourceGroupName, Str * @return a paginated list of OnlineEndpoint entities as paginated response with {@link PagedIterable}. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -820,7 +820,7 @@ public void delete(String resourceGroupName, String workspaceName, String endpoi * @return online Endpoint along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String endpointName) { if (this.client.getEndpoint() == null) { return Mono @@ -874,7 +874,7 @@ private Mono> getWithResponseAsync( * @return online Endpoint along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> getWithResponseAsync( String resourceGroupName, String workspaceName, String endpointName, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -924,8 +924,7 @@ private Mono> getWithResponseAsync( * @return online Endpoint on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getAsync( - String resourceGroupName, String workspaceName, String endpointName) { + private Mono getAsync(String resourceGroupName, String workspaceName, String endpointName) { return getWithResponseAsync(resourceGroupName, workspaceName, endpointName) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } @@ -942,7 +941,7 @@ private Mono getAsync( * @return online Endpoint. */ @ServiceMethod(returns = ReturnType.SINGLE) - public OnlineEndpointDataInner get(String resourceGroupName, String workspaceName, String endpointName) { + public OnlineEndpointInner get(String resourceGroupName, String workspaceName, String endpointName) { return getAsync(resourceGroupName, workspaceName, endpointName).block(); } @@ -959,7 +958,7 @@ public OnlineEndpointDataInner get(String resourceGroupName, String workspaceNam * @return online Endpoint along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String endpointName, Context context) { return getWithResponseAsync(resourceGroupName, workspaceName, endpointName, context).block(); } @@ -981,7 +980,7 @@ private Mono>> updateWithResponseAsync( String resourceGroupName, String workspaceName, String endpointName, - PartialOnlineEndpointPartialTrackedResource body) { + PartialMinimalTrackedResourceWithIdentity body) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -1045,7 +1044,7 @@ private Mono>> updateWithResponseAsync( String resourceGroupName, String workspaceName, String endpointName, - PartialOnlineEndpointPartialTrackedResource body, + PartialMinimalTrackedResourceWithIdentity body, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -1102,20 +1101,20 @@ private Mono>> updateWithResponseAsync( * @return the {@link PollerFlux} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, OnlineEndpointDataInner> beginUpdateAsync( + private PollerFlux, OnlineEndpointInner> beginUpdateAsync( String resourceGroupName, String workspaceName, String endpointName, - PartialOnlineEndpointPartialTrackedResource body) { + PartialMinimalTrackedResourceWithIdentity body) { Mono>> mono = updateWithResponseAsync(resourceGroupName, workspaceName, endpointName, body); return this .client - .getLroResult( + .getLroResult( mono, this.client.getHttpPipeline(), - OnlineEndpointDataInner.class, - OnlineEndpointDataInner.class, + OnlineEndpointInner.class, + OnlineEndpointInner.class, this.client.getContext()); } @@ -1133,23 +1132,19 @@ private PollerFlux, OnlineEndpointDataInner> * @return the {@link PollerFlux} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, OnlineEndpointDataInner> beginUpdateAsync( + private PollerFlux, OnlineEndpointInner> beginUpdateAsync( String resourceGroupName, String workspaceName, String endpointName, - PartialOnlineEndpointPartialTrackedResource body, + PartialMinimalTrackedResourceWithIdentity body, Context context) { context = this.client.mergeContext(context); Mono>> mono = updateWithResponseAsync(resourceGroupName, workspaceName, endpointName, body, context); return this .client - .getLroResult( - mono, - this.client.getHttpPipeline(), - OnlineEndpointDataInner.class, - OnlineEndpointDataInner.class, - context); + .getLroResult( + mono, this.client.getHttpPipeline(), OnlineEndpointInner.class, OnlineEndpointInner.class, context); } /** @@ -1165,11 +1160,11 @@ private PollerFlux, OnlineEndpointDataInner> * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, OnlineEndpointDataInner> beginUpdate( + public SyncPoller, OnlineEndpointInner> beginUpdate( String resourceGroupName, String workspaceName, String endpointName, - PartialOnlineEndpointPartialTrackedResource body) { + PartialMinimalTrackedResourceWithIdentity body) { return beginUpdateAsync(resourceGroupName, workspaceName, endpointName, body).getSyncPoller(); } @@ -1187,11 +1182,11 @@ public SyncPoller, OnlineEndpointDataInner> * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, OnlineEndpointDataInner> beginUpdate( + public SyncPoller, OnlineEndpointInner> beginUpdate( String resourceGroupName, String workspaceName, String endpointName, - PartialOnlineEndpointPartialTrackedResource body, + PartialMinimalTrackedResourceWithIdentity body, Context context) { return beginUpdateAsync(resourceGroupName, workspaceName, endpointName, body, context).getSyncPoller(); } @@ -1209,11 +1204,11 @@ public SyncPoller, OnlineEndpointDataInner> * @return the response body on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono updateAsync( + private Mono updateAsync( String resourceGroupName, String workspaceName, String endpointName, - PartialOnlineEndpointPartialTrackedResource body) { + PartialMinimalTrackedResourceWithIdentity body) { return beginUpdateAsync(resourceGroupName, workspaceName, endpointName, body) .last() .flatMap(this.client::getLroFinalResultOrError); @@ -1233,11 +1228,11 @@ private Mono updateAsync( * @return the response body on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono updateAsync( + private Mono updateAsync( String resourceGroupName, String workspaceName, String endpointName, - PartialOnlineEndpointPartialTrackedResource body, + PartialMinimalTrackedResourceWithIdentity body, Context context) { return beginUpdateAsync(resourceGroupName, workspaceName, endpointName, body, context) .last() @@ -1257,11 +1252,11 @@ private Mono updateAsync( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public OnlineEndpointDataInner update( + public OnlineEndpointInner update( String resourceGroupName, String workspaceName, String endpointName, - PartialOnlineEndpointPartialTrackedResource body) { + PartialMinimalTrackedResourceWithIdentity body) { return updateAsync(resourceGroupName, workspaceName, endpointName, body).block(); } @@ -1279,11 +1274,11 @@ public OnlineEndpointDataInner update( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public OnlineEndpointDataInner update( + public OnlineEndpointInner update( String resourceGroupName, String workspaceName, String endpointName, - PartialOnlineEndpointPartialTrackedResource body, + PartialMinimalTrackedResourceWithIdentity body, Context context) { return updateAsync(resourceGroupName, workspaceName, endpointName, body, context).block(); } @@ -1302,7 +1297,7 @@ public OnlineEndpointDataInner update( */ @ServiceMethod(returns = ReturnType.SINGLE) private Mono>> createOrUpdateWithResponseAsync( - String resourceGroupName, String workspaceName, String endpointName, OnlineEndpointDataInner body) { + String resourceGroupName, String workspaceName, String endpointName, OnlineEndpointInner body) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -1366,7 +1361,7 @@ private Mono>> createOrUpdateWithResponseAsync( String resourceGroupName, String workspaceName, String endpointName, - OnlineEndpointDataInner body, + OnlineEndpointInner body, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -1423,17 +1418,17 @@ private Mono>> createOrUpdateWithResponseAsync( * @return the {@link PollerFlux} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, OnlineEndpointDataInner> beginCreateOrUpdateAsync( - String resourceGroupName, String workspaceName, String endpointName, OnlineEndpointDataInner body) { + private PollerFlux, OnlineEndpointInner> beginCreateOrUpdateAsync( + String resourceGroupName, String workspaceName, String endpointName, OnlineEndpointInner body) { Mono>> mono = createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, endpointName, body); return this .client - .getLroResult( + .getLroResult( mono, this.client.getHttpPipeline(), - OnlineEndpointDataInner.class, - OnlineEndpointDataInner.class, + OnlineEndpointInner.class, + OnlineEndpointInner.class, this.client.getContext()); } @@ -1451,23 +1446,19 @@ private PollerFlux, OnlineEndpointDataInner> * @return the {@link PollerFlux} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, OnlineEndpointDataInner> beginCreateOrUpdateAsync( + private PollerFlux, OnlineEndpointInner> beginCreateOrUpdateAsync( String resourceGroupName, String workspaceName, String endpointName, - OnlineEndpointDataInner body, + OnlineEndpointInner body, Context context) { context = this.client.mergeContext(context); Mono>> mono = createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, endpointName, body, context); return this .client - .getLroResult( - mono, - this.client.getHttpPipeline(), - OnlineEndpointDataInner.class, - OnlineEndpointDataInner.class, - context); + .getLroResult( + mono, this.client.getHttpPipeline(), OnlineEndpointInner.class, OnlineEndpointInner.class, context); } /** @@ -1483,8 +1474,8 @@ private PollerFlux, OnlineEndpointDataInner> * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, OnlineEndpointDataInner> beginCreateOrUpdate( - String resourceGroupName, String workspaceName, String endpointName, OnlineEndpointDataInner body) { + public SyncPoller, OnlineEndpointInner> beginCreateOrUpdate( + String resourceGroupName, String workspaceName, String endpointName, OnlineEndpointInner body) { return beginCreateOrUpdateAsync(resourceGroupName, workspaceName, endpointName, body).getSyncPoller(); } @@ -1502,11 +1493,11 @@ public SyncPoller, OnlineEndpointDataInner> * @return the {@link SyncPoller} for polling of long-running operation. */ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, OnlineEndpointDataInner> beginCreateOrUpdate( + public SyncPoller, OnlineEndpointInner> beginCreateOrUpdate( String resourceGroupName, String workspaceName, String endpointName, - OnlineEndpointDataInner body, + OnlineEndpointInner body, Context context) { return beginCreateOrUpdateAsync(resourceGroupName, workspaceName, endpointName, body, context).getSyncPoller(); } @@ -1524,8 +1515,8 @@ public SyncPoller, OnlineEndpointDataInner> * @return the response body on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( - String resourceGroupName, String workspaceName, String endpointName, OnlineEndpointDataInner body) { + private Mono createOrUpdateAsync( + String resourceGroupName, String workspaceName, String endpointName, OnlineEndpointInner body) { return beginCreateOrUpdateAsync(resourceGroupName, workspaceName, endpointName, body) .last() .flatMap(this.client::getLroFinalResultOrError); @@ -1545,11 +1536,11 @@ private Mono createOrUpdateAsync( * @return the response body on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync( + private Mono createOrUpdateAsync( String resourceGroupName, String workspaceName, String endpointName, - OnlineEndpointDataInner body, + OnlineEndpointInner body, Context context) { return beginCreateOrUpdateAsync(resourceGroupName, workspaceName, endpointName, body, context) .last() @@ -1569,8 +1560,8 @@ private Mono createOrUpdateAsync( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public OnlineEndpointDataInner createOrUpdate( - String resourceGroupName, String workspaceName, String endpointName, OnlineEndpointDataInner body) { + public OnlineEndpointInner createOrUpdate( + String resourceGroupName, String workspaceName, String endpointName, OnlineEndpointInner body) { return createOrUpdateAsync(resourceGroupName, workspaceName, endpointName, body).block(); } @@ -1588,11 +1579,11 @@ public OnlineEndpointDataInner createOrUpdate( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public OnlineEndpointDataInner createOrUpdate( + public OnlineEndpointInner createOrUpdate( String resourceGroupName, String workspaceName, String endpointName, - OnlineEndpointDataInner body, + OnlineEndpointInner body, Context context) { return createOrUpdateAsync(resourceGroupName, workspaceName, endpointName, body, context).block(); } @@ -2218,7 +2209,7 @@ public Response getTokenWithResponse( * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink) { + private Mono> listNextSinglePageAsync(String nextLink) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } @@ -2231,7 +2222,7 @@ private Mono> listNextSinglePageAsync(Str final String accept = "application/json"; return FluxUtil .withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context)) - .>map( + .>map( res -> new PagedResponseBase<>( res.getRequest(), @@ -2255,7 +2246,7 @@ private Mono> listNextSinglePageAsync(Str * {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listNextSinglePageAsync(String nextLink, Context context) { + private Mono> listNextSinglePageAsync(String nextLink, Context context) { if (nextLink == null) { return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineEndpointsImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineEndpointsImpl.java index d5c61a521bcf..d07c310deef3 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineEndpointsImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/OnlineEndpointsImpl.java @@ -12,11 +12,11 @@ import com.azure.resourcemanager.machinelearning.fluent.OnlineEndpointsClient; import com.azure.resourcemanager.machinelearning.fluent.models.EndpointAuthKeysInner; import com.azure.resourcemanager.machinelearning.fluent.models.EndpointAuthTokenInner; -import com.azure.resourcemanager.machinelearning.fluent.models.OnlineEndpointDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.OnlineEndpointInner; import com.azure.resourcemanager.machinelearning.models.EndpointAuthKeys; import com.azure.resourcemanager.machinelearning.models.EndpointAuthToken; import com.azure.resourcemanager.machinelearning.models.EndpointComputeType; -import com.azure.resourcemanager.machinelearning.models.OnlineEndpointData; +import com.azure.resourcemanager.machinelearning.models.OnlineEndpoint; import com.azure.resourcemanager.machinelearning.models.OnlineEndpoints; import com.azure.resourcemanager.machinelearning.models.OrderString; import com.azure.resourcemanager.machinelearning.models.RegenerateEndpointKeysRequest; @@ -35,12 +35,12 @@ public OnlineEndpointsImpl( this.serviceManager = serviceManager; } - public PagedIterable list(String resourceGroupName, String workspaceName) { - PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName); - return Utils.mapPage(inner, inner1 -> new OnlineEndpointDataImpl(inner1, this.manager())); + public PagedIterable list(String resourceGroupName, String workspaceName) { + PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName); + return Utils.mapPage(inner, inner1 -> new OnlineEndpointImpl(inner1, this.manager())); } - public PagedIterable list( + public PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -51,7 +51,7 @@ public PagedIterable list( String properties, OrderString orderBy, Context context) { - PagedIterable inner = + PagedIterable inner = this .serviceClient() .list( @@ -65,7 +65,7 @@ public PagedIterable list( properties, orderBy, context); - return Utils.mapPage(inner, inner1 -> new OnlineEndpointDataImpl(inner1, this.manager())); + return Utils.mapPage(inner, inner1 -> new OnlineEndpointImpl(inner1, this.manager())); } public void delete(String resourceGroupName, String workspaceName, String endpointName) { @@ -76,25 +76,25 @@ public void delete(String resourceGroupName, String workspaceName, String endpoi this.serviceClient().delete(resourceGroupName, workspaceName, endpointName, context); } - public OnlineEndpointData get(String resourceGroupName, String workspaceName, String endpointName) { - OnlineEndpointDataInner inner = this.serviceClient().get(resourceGroupName, workspaceName, endpointName); + public OnlineEndpoint get(String resourceGroupName, String workspaceName, String endpointName) { + OnlineEndpointInner inner = this.serviceClient().get(resourceGroupName, workspaceName, endpointName); if (inner != null) { - return new OnlineEndpointDataImpl(inner, this.manager()); + return new OnlineEndpointImpl(inner, this.manager()); } else { return null; } } - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String endpointName, Context context) { - Response inner = + Response inner = this.serviceClient().getWithResponse(resourceGroupName, workspaceName, endpointName, context); if (inner != null) { return new SimpleResponse<>( inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new OnlineEndpointDataImpl(inner.getValue(), this.manager())); + new OnlineEndpointImpl(inner.getValue(), this.manager())); } else { return null; } @@ -162,7 +162,7 @@ public Response getTokenWithResponse( } } - public OnlineEndpointData getById(String id) { + public OnlineEndpoint getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -189,7 +189,7 @@ public OnlineEndpointData getById(String id) { return this.getWithResponse(resourceGroupName, workspaceName, endpointName, Context.NONE).getValue(); } - public Response getByIdWithResponse(String id, Context context) { + public Response getByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -278,7 +278,7 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager return this.serviceManager; } - public OnlineEndpointDataImpl define(String name) { - return new OnlineEndpointDataImpl(name, this.manager()); + public OnlineEndpointImpl define(String name) { + return new OnlineEndpointImpl(name, this.manager()); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspaceConnectionImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspaceConnectionPropertiesV2BasicResourceImpl.java similarity index 60% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspaceConnectionImpl.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspaceConnectionPropertiesV2BasicResourceImpl.java index 168d77946ab1..9ff113b0e7ac 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspaceConnectionImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspaceConnectionPropertiesV2BasicResourceImpl.java @@ -6,17 +6,18 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.WorkspaceConnectionInner; -import com.azure.resourcemanager.machinelearning.models.ValueFormat; -import com.azure.resourcemanager.machinelearning.models.WorkspaceConnection; +import com.azure.resourcemanager.machinelearning.fluent.models.WorkspaceConnectionPropertiesV2BasicResourceInner; +import com.azure.resourcemanager.machinelearning.models.WorkspaceConnectionPropertiesV2; +import com.azure.resourcemanager.machinelearning.models.WorkspaceConnectionPropertiesV2BasicResource; -public final class WorkspaceConnectionImpl implements WorkspaceConnection, WorkspaceConnection.Definition { - private WorkspaceConnectionInner innerObject; +public final class WorkspaceConnectionPropertiesV2BasicResourceImpl + implements WorkspaceConnectionPropertiesV2BasicResource, WorkspaceConnectionPropertiesV2BasicResource.Definition { + private WorkspaceConnectionPropertiesV2BasicResourceInner innerObject; private final com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager; - WorkspaceConnectionImpl( - WorkspaceConnectionInner innerObject, + WorkspaceConnectionPropertiesV2BasicResourceImpl( + WorkspaceConnectionPropertiesV2BasicResourceInner innerObject, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { this.innerObject = innerObject; this.serviceManager = serviceManager; @@ -34,31 +35,15 @@ public String type() { return this.innerModel().type(); } - public SystemData systemData() { - return this.innerModel().systemData(); - } - - public String category() { - return this.innerModel().category(); - } - - public String target() { - return this.innerModel().target(); + public WorkspaceConnectionPropertiesV2 properties() { + return this.innerModel().properties(); } - public String authType() { - return this.innerModel().authType(); - } - - public String value() { - return this.innerModel().value(); - } - - public ValueFormat valueFormat() { - return this.innerModel().valueFormat(); + public SystemData systemData() { + return this.innerModel().systemData(); } - public WorkspaceConnectionInner innerModel() { + public WorkspaceConnectionPropertiesV2BasicResourceInner innerModel() { return this.innerObject; } @@ -72,13 +57,14 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager private String connectionName; - public WorkspaceConnectionImpl withExistingWorkspace(String resourceGroupName, String workspaceName) { + public WorkspaceConnectionPropertiesV2BasicResourceImpl withExistingWorkspace( + String resourceGroupName, String workspaceName) { this.resourceGroupName = resourceGroupName; this.workspaceName = workspaceName; return this; } - public WorkspaceConnection create() { + public WorkspaceConnectionPropertiesV2BasicResource create() { this.innerObject = serviceManager .serviceClient() @@ -88,7 +74,7 @@ public WorkspaceConnection create() { return this; } - public WorkspaceConnection create(Context context) { + public WorkspaceConnectionPropertiesV2BasicResource create(Context context) { this.innerObject = serviceManager .serviceClient() @@ -98,14 +84,14 @@ public WorkspaceConnection create(Context context) { return this; } - WorkspaceConnectionImpl( + WorkspaceConnectionPropertiesV2BasicResourceImpl( String name, com.azure.resourcemanager.machinelearning.MachineLearningManager serviceManager) { - this.innerObject = new WorkspaceConnectionInner(); + this.innerObject = new WorkspaceConnectionPropertiesV2BasicResourceInner(); this.serviceManager = serviceManager; this.connectionName = name; } - public WorkspaceConnection refresh() { + public WorkspaceConnectionPropertiesV2BasicResource refresh() { this.innerObject = serviceManager .serviceClient() @@ -115,7 +101,7 @@ public WorkspaceConnection refresh() { return this; } - public WorkspaceConnection refresh(Context context) { + public WorkspaceConnectionPropertiesV2BasicResource refresh(Context context) { this.innerObject = serviceManager .serviceClient() @@ -125,28 +111,8 @@ public WorkspaceConnection refresh(Context context) { return this; } - public WorkspaceConnectionImpl withCategory(String category) { - this.innerModel().withCategory(category); - return this; - } - - public WorkspaceConnectionImpl withTarget(String target) { - this.innerModel().withTarget(target); - return this; - } - - public WorkspaceConnectionImpl withAuthType(String authType) { - this.innerModel().withAuthType(authType); - return this; - } - - public WorkspaceConnectionImpl withValue(String value) { - this.innerModel().withValue(value); - return this; - } - - public WorkspaceConnectionImpl withValueFormat(ValueFormat valueFormat) { - this.innerModel().withValueFormat(valueFormat); + public WorkspaceConnectionPropertiesV2BasicResourceImpl withProperties(WorkspaceConnectionPropertiesV2 properties) { + this.innerModel().withProperties(properties); return this; } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspaceConnectionsClientImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspaceConnectionsClientImpl.java index 3f1740d50c1e..d0f0106616cb 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspaceConnectionsClientImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspaceConnectionsClientImpl.java @@ -29,8 +29,8 @@ import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.resourcemanager.machinelearning.fluent.WorkspaceConnectionsClient; -import com.azure.resourcemanager.machinelearning.fluent.models.WorkspaceConnectionInner; -import com.azure.resourcemanager.machinelearning.models.PaginatedWorkspaceConnectionsList; +import com.azure.resourcemanager.machinelearning.fluent.models.WorkspaceConnectionPropertiesV2BasicResourceInner; +import com.azure.resourcemanager.machinelearning.models.WorkspaceConnectionPropertiesV2BasicResourceArmPaginatedResult; import reactor.core.publisher.Mono; /** An instance of this class provides access to all the operations defined in WorkspaceConnectionsClient. */ @@ -61,46 +61,45 @@ public final class WorkspaceConnectionsClientImpl implements WorkspaceConnection @ServiceInterface(name = "AzureMachineLearning") private interface WorkspaceConnectionsService { @Headers({"Content-Type: application/json"}) - @Get( + @Put( "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers" - + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/connections") + + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/connections/{connectionName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> list( + Mono> create( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("workspaceName") String workspaceName, + @PathParam("connectionName") String connectionName, @QueryParam("api-version") String apiVersion, - @QueryParam("target") String target, - @QueryParam("category") String category, + @BodyParam("application/json") WorkspaceConnectionPropertiesV2BasicResourceInner parameters, @HeaderParam("Accept") String accept, Context context); @Headers({"Content-Type: application/json"}) - @Put( + @Get( "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers" + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/connections/{connectionName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> create( + Mono> get( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("workspaceName") String workspaceName, @PathParam("connectionName") String connectionName, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") WorkspaceConnectionInner parameters, @HeaderParam("Accept") String accept, Context context); @Headers({"Content-Type: application/json"}) - @Get( + @Delete( "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers" + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/connections/{connectionName}") - @ExpectedResponses({200}) + @ExpectedResponses({200, 204}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( + Mono> delete( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @@ -111,38 +110,49 @@ Mono> get( Context context); @Headers({"Content-Type: application/json"}) - @Delete( + @Get( "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers" - + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/connections/{connectionName}") - @ExpectedResponses({200, 204}) + + "/Microsoft.MachineLearningServices/workspaces/{workspaceName}/connections") + @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> delete( + Mono> list( @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("workspaceName") String workspaceName, - @PathParam("connectionName") String connectionName, + @QueryParam("target") String target, + @QueryParam("category") String category, @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context); + + @Headers({"Content-Type: application/json"}) + @Get("{nextLink}") + @ExpectedResponses({200}) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> listNext( + @PathParam(value = "nextLink", encoded = true) String nextLink, + @HostParam("$host") String endpoint, + @HeaderParam("Accept") String accept, + Context context); } /** - * List all connections under a AML workspace. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. - * @param target Target of the workspace connection. - * @param category Category of the workspace connection. + * @param connectionName Friendly name of the workspace connection. + * @param parameters The object for creating or updating a new workspace connection. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return paginated list of Workspace connection objects along with {@link PagedResponse} on successful completion - * of {@link Mono}. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( - String resourceGroupName, String workspaceName, String target, String category) { + private Mono> createWithResponseAsync( + String resourceGroupName, + String workspaceName, + String connectionName, + WorkspaceConnectionPropertiesV2BasicResourceInner parameters) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -162,45 +172,50 @@ private Mono> listSinglePageAsync( if (workspaceName == null) { return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null.")); } + if (connectionName == null) { + return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null.")); + } + if (parameters == null) { + return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null.")); + } else { + parameters.validate(); + } final String accept = "application/json"; return FluxUtil .withContext( context -> service - .list( + .create( this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, workspaceName, + connectionName, this.client.getApiVersion(), - target, - category, + parameters, accept, context)) - .>map( - res -> - new PagedResponseBase<>( - res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(), null, null)) .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); } /** - * List all connections under a AML workspace. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. - * @param target Target of the workspace connection. - * @param category Category of the workspace connection. + * @param connectionName Friendly name of the workspace connection. + * @param parameters The object for creating or updating a new workspace connection. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return paginated list of Workspace connection objects along with {@link PagedResponse} on successful completion - * of {@link Mono}. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> listSinglePageAsync( - String resourceGroupName, String workspaceName, String target, String category, Context context) { + private Mono> createWithResponseAsync( + String resourceGroupName, + String workspaceName, + String connectionName, + WorkspaceConnectionPropertiesV2BasicResourceInner parameters, + Context context) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -220,130 +235,101 @@ private Mono> listSinglePageAsync( if (workspaceName == null) { return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null.")); } + if (connectionName == null) { + return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null.")); + } + if (parameters == null) { + return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null.")); + } else { + parameters.validate(); + } final String accept = "application/json"; context = this.client.mergeContext(context); return service - .list( + .create( this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, workspaceName, + connectionName, this.client.getApiVersion(), - target, - category, + parameters, accept, - context) - .map( - res -> - new PagedResponseBase<>( - res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(), null, null)); - } - - /** - * List all connections under a AML workspace. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param workspaceName Name of Azure Machine Learning workspace. - * @param target Target of the workspace connection. - * @param category Category of the workspace connection. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return paginated list of Workspace connection objects as paginated response with {@link PagedFlux}. - */ - @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( - String resourceGroupName, String workspaceName, String target, String category) { - return new PagedFlux<>(() -> listSinglePageAsync(resourceGroupName, workspaceName, target, category)); - } - - /** - * List all connections under a AML workspace. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param workspaceName Name of Azure Machine Learning workspace. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return paginated list of Workspace connection objects as paginated response with {@link PagedFlux}. - */ - @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync(String resourceGroupName, String workspaceName) { - final String target = null; - final String category = null; - return new PagedFlux<>(() -> listSinglePageAsync(resourceGroupName, workspaceName, target, category)); + context); } /** - * List all connections under a AML workspace. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. - * @param target Target of the workspace connection. - * @param category Category of the workspace connection. - * @param context The context to associate with this operation. + * @param connectionName Friendly name of the workspace connection. + * @param parameters The object for creating or updating a new workspace connection. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return paginated list of Workspace connection objects as paginated response with {@link PagedFlux}. + * @return the response body on successful completion of {@link Mono}. */ - @ServiceMethod(returns = ReturnType.COLLECTION) - private PagedFlux listAsync( - String resourceGroupName, String workspaceName, String target, String category, Context context) { - return new PagedFlux<>(() -> listSinglePageAsync(resourceGroupName, workspaceName, target, category, context)); + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono createAsync( + String resourceGroupName, + String workspaceName, + String connectionName, + WorkspaceConnectionPropertiesV2BasicResourceInner parameters) { + return createWithResponseAsync(resourceGroupName, workspaceName, connectionName, parameters) + .flatMap(res -> Mono.justOrEmpty(res.getValue())); } /** - * List all connections under a AML workspace. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. + * @param connectionName Friendly name of the workspace connection. + * @param parameters The object for creating or updating a new workspace connection. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return paginated list of Workspace connection objects as paginated response with {@link PagedIterable}. + * @return the response. */ - @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list(String resourceGroupName, String workspaceName) { - final String target = null; - final String category = null; - return new PagedIterable<>(listAsync(resourceGroupName, workspaceName, target, category)); + @ServiceMethod(returns = ReturnType.SINGLE) + public WorkspaceConnectionPropertiesV2BasicResourceInner create( + String resourceGroupName, + String workspaceName, + String connectionName, + WorkspaceConnectionPropertiesV2BasicResourceInner parameters) { + return createAsync(resourceGroupName, workspaceName, connectionName, parameters).block(); } /** - * List all connections under a AML workspace. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. - * @param target Target of the workspace connection. - * @param category Category of the workspace connection. + * @param connectionName Friendly name of the workspace connection. + * @param parameters The object for creating or updating a new workspace connection. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return paginated list of Workspace connection objects as paginated response with {@link PagedIterable}. + * @return the response body along with {@link Response}. */ - @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable list( - String resourceGroupName, String workspaceName, String target, String category, Context context) { - return new PagedIterable<>(listAsync(resourceGroupName, workspaceName, target, category, context)); + @ServiceMethod(returns = ReturnType.SINGLE) + public Response createWithResponse( + String resourceGroupName, + String workspaceName, + String connectionName, + WorkspaceConnectionPropertiesV2BasicResourceInner parameters, + Context context) { + return createWithResponseAsync(resourceGroupName, workspaceName, connectionName, parameters, context).block(); } /** - * Add a new workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection. - * @param parameters The object for creating or updating a new workspace connection. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return workspace connection along with {@link Response} on successful completion of {@link Mono}. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createWithResponseAsync( - String resourceGroupName, String workspaceName, String connectionName, WorkspaceConnectionInner parameters) { + private Mono> getWithResponseAsync( + String resourceGroupName, String workspaceName, String connectionName) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -366,49 +352,36 @@ private Mono> createWithResponseAsync( if (connectionName == null) { return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null.")); } - if (parameters == null) { - return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null.")); - } else { - parameters.validate(); - } final String accept = "application/json"; return FluxUtil .withContext( context -> service - .create( + .get( this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, workspaceName, connectionName, this.client.getApiVersion(), - parameters, accept, context)) .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); } /** - * Add a new workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection. - * @param parameters The object for creating or updating a new workspace connection. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return workspace connection along with {@link Response} on successful completion of {@link Mono}. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> createWithResponseAsync( - String resourceGroupName, - String workspaceName, - String connectionName, - WorkspaceConnectionInner parameters, - Context context) { + private Mono> getWithResponseAsync( + String resourceGroupName, String workspaceName, String connectionName, Context context) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -431,100 +404,78 @@ private Mono> createWithResponseAsync( if (connectionName == null) { return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null.")); } - if (parameters == null) { - return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null.")); - } else { - parameters.validate(); - } final String accept = "application/json"; context = this.client.mergeContext(context); return service - .create( + .get( this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, workspaceName, connectionName, this.client.getApiVersion(), - parameters, accept, context); } /** - * Add a new workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection. - * @param parameters The object for creating or updating a new workspace connection. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return workspace connection on successful completion of {@link Mono}. + * @return the response body on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createAsync( - String resourceGroupName, String workspaceName, String connectionName, WorkspaceConnectionInner parameters) { - return createWithResponseAsync(resourceGroupName, workspaceName, connectionName, parameters) + private Mono getAsync( + String resourceGroupName, String workspaceName, String connectionName) { + return getWithResponseAsync(resourceGroupName, workspaceName, connectionName) .flatMap(res -> Mono.justOrEmpty(res.getValue())); } /** - * Add a new workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection. - * @param parameters The object for creating or updating a new workspace connection. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return workspace connection. + * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public WorkspaceConnectionInner create( - String resourceGroupName, String workspaceName, String connectionName, WorkspaceConnectionInner parameters) { - return createAsync(resourceGroupName, workspaceName, connectionName, parameters).block(); + public WorkspaceConnectionPropertiesV2BasicResourceInner get( + String resourceGroupName, String workspaceName, String connectionName) { + return getAsync(resourceGroupName, workspaceName, connectionName).block(); } /** - * Add a new workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection. - * @param parameters The object for creating or updating a new workspace connection. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return workspace connection along with {@link Response}. + * @return the response body along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response createWithResponse( - String resourceGroupName, - String workspaceName, - String connectionName, - WorkspaceConnectionInner parameters, - Context context) { - return createWithResponseAsync(resourceGroupName, workspaceName, connectionName, parameters, context).block(); + public Response getWithResponse( + String resourceGroupName, String workspaceName, String connectionName, Context context) { + return getWithResponseAsync(resourceGroupName, workspaceName, connectionName, context).block(); } /** - * Get the detail of a workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the detail of a workspace connection along with {@link Response} on successful completion of {@link - * Mono}. + * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> deleteWithResponseAsync( String resourceGroupName, String workspaceName, String connectionName) { if (this.client.getEndpoint() == null) { return Mono @@ -553,7 +504,7 @@ private Mono> getWithResponseAsync( .withContext( context -> service - .get( + .delete( this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, @@ -566,8 +517,6 @@ private Mono> getWithResponseAsync( } /** - * Get the detail of a workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection. @@ -575,11 +524,10 @@ private Mono> getWithResponseAsync( * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the detail of a workspace connection along with {@link Response} on successful completion of {@link - * Mono}. + * @return the {@link Response} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getWithResponseAsync( + private Mono> deleteWithResponseAsync( String resourceGroupName, String workspaceName, String connectionName, Context context) { if (this.client.getEndpoint() == null) { return Mono @@ -606,7 +554,7 @@ private Mono> getWithResponseAsync( final String accept = "application/json"; context = this.client.mergeContext(context); return service - .get( + .delete( this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, @@ -618,42 +566,34 @@ private Mono> getWithResponseAsync( } /** - * Get the detail of a workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the detail of a workspace connection on successful completion of {@link Mono}. + * @return A {@link Mono} that completes when a successful response is received. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getAsync( - String resourceGroupName, String workspaceName, String connectionName) { - return getWithResponseAsync(resourceGroupName, workspaceName, connectionName) - .flatMap(res -> Mono.justOrEmpty(res.getValue())); + private Mono deleteAsync(String resourceGroupName, String workspaceName, String connectionName) { + return deleteWithResponseAsync(resourceGroupName, workspaceName, connectionName) + .flatMap(ignored -> Mono.empty()); } /** - * Get the detail of a workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the detail of a workspace connection. */ @ServiceMethod(returns = ReturnType.SINGLE) - public WorkspaceConnectionInner get(String resourceGroupName, String workspaceName, String connectionName) { - return getAsync(resourceGroupName, workspaceName, connectionName).block(); + public void delete(String resourceGroupName, String workspaceName, String connectionName) { + deleteAsync(resourceGroupName, workspaceName, connectionName).block(); } /** - * Get the detail of a workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection. @@ -661,28 +601,27 @@ public WorkspaceConnectionInner get(String resourceGroupName, String workspaceNa * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the detail of a workspace connection along with {@link Response}. + * @return the {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse( + public Response deleteWithResponse( String resourceGroupName, String workspaceName, String connectionName, Context context) { - return getWithResponseAsync(resourceGroupName, workspaceName, connectionName, context).block(); + return deleteWithResponseAsync(resourceGroupName, workspaceName, connectionName, context).block(); } /** - * Delete a workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. - * @param connectionName Friendly name of the workspace connection. + * @param target Target of the workspace connection. + * @param category Category of the workspace connection. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link Response} on successful completion of {@link Mono}. + * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> deleteWithResponseAsync( - String resourceGroupName, String workspaceName, String connectionName) { + private Mono> listSinglePageAsync( + String resourceGroupName, String workspaceName, String target, String category) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -702,41 +641,47 @@ private Mono> deleteWithResponseAsync( if (workspaceName == null) { return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null.")); } - if (connectionName == null) { - return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null.")); - } final String accept = "application/json"; return FluxUtil .withContext( context -> service - .delete( + .list( this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, workspaceName, - connectionName, + target, + category, this.client.getApiVersion(), accept, context)) + .>map( + res -> + new PagedResponseBase<>( + res.getRequest(), + res.getStatusCode(), + res.getHeaders(), + res.getValue().value(), + res.getValue().nextLink(), + null)) .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); } /** - * Delete a workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. - * @param connectionName Friendly name of the workspace connection. + * @param target Target of the workspace connection. + * @param category Category of the workspace connection. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link Response} on successful completion of {@link Mono}. + * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> deleteWithResponseAsync( - String resourceGroupName, String workspaceName, String connectionName, Context context) { + private Mono> listSinglePageAsync( + String resourceGroupName, String workspaceName, String target, String category, Context context) { if (this.client.getEndpoint() == null) { return Mono .error( @@ -756,70 +701,188 @@ private Mono> deleteWithResponseAsync( if (workspaceName == null) { return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null.")); } - if (connectionName == null) { - return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null.")); - } final String accept = "application/json"; context = this.client.mergeContext(context); return service - .delete( + .list( this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, workspaceName, - connectionName, + target, + category, this.client.getApiVersion(), accept, - context); + context) + .map( + res -> + new PagedResponseBase<>( + res.getRequest(), + res.getStatusCode(), + res.getHeaders(), + res.getValue().value(), + res.getValue().nextLink(), + null)); } /** - * Delete a workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. - * @param connectionName Friendly name of the workspace connection. + * @param target Target of the workspace connection. + * @param category Category of the workspace connection. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return A {@link Mono} that completes when a successful response is received. + * @return the paginated response with {@link PagedFlux}. */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono deleteAsync(String resourceGroupName, String workspaceName, String connectionName) { - return deleteWithResponseAsync(resourceGroupName, workspaceName, connectionName) - .flatMap(ignored -> Mono.empty()); + @ServiceMethod(returns = ReturnType.COLLECTION) + private PagedFlux listAsync( + String resourceGroupName, String workspaceName, String target, String category) { + return new PagedFlux<>( + () -> listSinglePageAsync(resourceGroupName, workspaceName, target, category), + nextLink -> listNextSinglePageAsync(nextLink)); } /** - * Delete a workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. - * @param connectionName Friendly name of the workspace connection. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedFlux}. */ - @ServiceMethod(returns = ReturnType.SINGLE) - public void delete(String resourceGroupName, String workspaceName, String connectionName) { - deleteAsync(resourceGroupName, workspaceName, connectionName).block(); + @ServiceMethod(returns = ReturnType.COLLECTION) + private PagedFlux listAsync( + String resourceGroupName, String workspaceName) { + final String target = null; + final String category = null; + return new PagedFlux<>( + () -> listSinglePageAsync(resourceGroupName, workspaceName, target, category), + nextLink -> listNextSinglePageAsync(nextLink)); } /** - * Delete a workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. - * @param connectionName Friendly name of the workspace connection. + * @param target Target of the workspace connection. + * @param category Category of the workspace connection. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link Response}. + * @return the paginated response with {@link PagedFlux}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + private PagedFlux listAsync( + String resourceGroupName, String workspaceName, String target, String category, Context context) { + return new PagedFlux<>( + () -> listSinglePageAsync(resourceGroupName, workspaceName, target, category, context), + nextLink -> listNextSinglePageAsync(nextLink, context)); + } + + /** + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list( + String resourceGroupName, String workspaceName) { + final String target = null; + final String category = null; + return new PagedIterable<>(listAsync(resourceGroupName, workspaceName, target, category)); + } + + /** + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param target Target of the workspace connection. + * @param category Category of the workspace connection. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list( + String resourceGroupName, String workspaceName, String target, String category, Context context) { + return new PagedIterable<>(listAsync(resourceGroupName, workspaceName, target, category, context)); + } + + /** + * Get the next page of items. + * + * @param nextLink The nextLink parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response deleteWithResponse( - String resourceGroupName, String workspaceName, String connectionName, Context context) { - return deleteWithResponseAsync(resourceGroupName, workspaceName, connectionName, context).block(); + private Mono> listNextSinglePageAsync( + String nextLink) { + if (nextLink == null) { + return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + return Mono + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + return FluxUtil + .withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context)) + .>map( + res -> + new PagedResponseBase<>( + res.getRequest(), + res.getStatusCode(), + res.getHeaders(), + res.getValue().value(), + res.getValue().nextLink(), + null)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * Get the next page of items. + * + * @param nextLink The nextLink parameter. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> listNextSinglePageAsync( + String nextLink, Context context) { + if (nextLink == null) { + return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + return Mono + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + context = this.client.mergeContext(context); + return service + .listNext(nextLink, this.client.getEndpoint(), accept, context) + .map( + res -> + new PagedResponseBase<>( + res.getRequest(), + res.getStatusCode(), + res.getHeaders(), + res.getValue().value(), + res.getValue().nextLink(), + null)); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspaceConnectionsImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspaceConnectionsImpl.java index 323c6294b790..369777b1f7c0 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspaceConnectionsImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspaceConnectionsImpl.java @@ -10,8 +10,8 @@ import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.machinelearning.fluent.WorkspaceConnectionsClient; -import com.azure.resourcemanager.machinelearning.fluent.models.WorkspaceConnectionInner; -import com.azure.resourcemanager.machinelearning.models.WorkspaceConnection; +import com.azure.resourcemanager.machinelearning.fluent.models.WorkspaceConnectionPropertiesV2BasicResourceInner; +import com.azure.resourcemanager.machinelearning.models.WorkspaceConnectionPropertiesV2BasicResource; import com.azure.resourcemanager.machinelearning.models.WorkspaceConnections; public final class WorkspaceConnectionsImpl implements WorkspaceConnections { @@ -28,37 +28,27 @@ public WorkspaceConnectionsImpl( this.serviceManager = serviceManager; } - public PagedIterable list(String resourceGroupName, String workspaceName) { - PagedIterable inner = this.serviceClient().list(resourceGroupName, workspaceName); - return Utils.mapPage(inner, inner1 -> new WorkspaceConnectionImpl(inner1, this.manager())); - } - - public PagedIterable list( - String resourceGroupName, String workspaceName, String target, String category, Context context) { - PagedIterable inner = - this.serviceClient().list(resourceGroupName, workspaceName, target, category, context); - return Utils.mapPage(inner, inner1 -> new WorkspaceConnectionImpl(inner1, this.manager())); - } - - public WorkspaceConnection get(String resourceGroupName, String workspaceName, String connectionName) { - WorkspaceConnectionInner inner = this.serviceClient().get(resourceGroupName, workspaceName, connectionName); + public WorkspaceConnectionPropertiesV2BasicResource get( + String resourceGroupName, String workspaceName, String connectionName) { + WorkspaceConnectionPropertiesV2BasicResourceInner inner = + this.serviceClient().get(resourceGroupName, workspaceName, connectionName); if (inner != null) { - return new WorkspaceConnectionImpl(inner, this.manager()); + return new WorkspaceConnectionPropertiesV2BasicResourceImpl(inner, this.manager()); } else { return null; } } - public Response getWithResponse( + public Response getWithResponse( String resourceGroupName, String workspaceName, String connectionName, Context context) { - Response inner = + Response inner = this.serviceClient().getWithResponse(resourceGroupName, workspaceName, connectionName, context); if (inner != null) { return new SimpleResponse<>( inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new WorkspaceConnectionImpl(inner.getValue(), this.manager())); + new WorkspaceConnectionPropertiesV2BasicResourceImpl(inner.getValue(), this.manager())); } else { return null; } @@ -73,7 +63,23 @@ public Response deleteWithResponse( return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, connectionName, context); } - public WorkspaceConnection getById(String id) { + public PagedIterable list( + String resourceGroupName, String workspaceName) { + PagedIterable inner = + this.serviceClient().list(resourceGroupName, workspaceName); + return Utils + .mapPage(inner, inner1 -> new WorkspaceConnectionPropertiesV2BasicResourceImpl(inner1, this.manager())); + } + + public PagedIterable list( + String resourceGroupName, String workspaceName, String target, String category, Context context) { + PagedIterable inner = + this.serviceClient().list(resourceGroupName, workspaceName, target, category, context); + return Utils + .mapPage(inner, inner1 -> new WorkspaceConnectionPropertiesV2BasicResourceImpl(inner1, this.manager())); + } + + public WorkspaceConnectionPropertiesV2BasicResource getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -99,7 +105,7 @@ public WorkspaceConnection getById(String id) { return this.getWithResponse(resourceGroupName, workspaceName, connectionName, Context.NONE).getValue(); } - public Response getByIdWithResponse(String id, Context context) { + public Response getByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { throw LOGGER @@ -185,7 +191,7 @@ private com.azure.resourcemanager.machinelearning.MachineLearningManager manager return this.serviceManager; } - public WorkspaceConnectionImpl define(String name) { - return new WorkspaceConnectionImpl(name, this.manager()); + public WorkspaceConnectionPropertiesV2BasicResourceImpl define(String name) { + return new WorkspaceConnectionPropertiesV2BasicResourceImpl(name, this.manager()); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspaceImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspaceImpl.java index c9a699fc48b0..fbe6697c7116 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspaceImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspaceImpl.java @@ -191,6 +191,10 @@ public String mlFlowTrackingUri() { return this.innerModel().mlFlowTrackingUri(); } + public Boolean v1LegacyMode() { + return this.innerModel().v1LegacyMode(); + } + public Region region() { return Region.fromName(this.regionName()); } @@ -517,6 +521,11 @@ public WorkspaceImpl withPrimaryUserAssignedIdentity(String primaryUserAssignedI } } + public WorkspaceImpl withV1LegacyMode(Boolean v1LegacyMode) { + this.innerModel().withV1LegacyMode(v1LegacyMode); + return this; + } + private boolean isInCreateMode() { return this.innerModel().id() == null; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspacePropertiesImpl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspacePropertiesImpl.java index 047fce75bcc7..e097ac2af75b 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspacePropertiesImpl.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/implementation/WorkspacePropertiesImpl.java @@ -147,6 +147,10 @@ public String mlFlowTrackingUri() { return this.innerModel().mlFlowTrackingUri(); } + public Boolean v1LegacyMode() { + return this.innerModel().v1LegacyMode(); + } + public WorkspacePropertiesInner innerModel() { return this.innerObject; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AmlComputeProperties.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AmlComputeProperties.java index ae9c7b6f2014..93361b876c15 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AmlComputeProperties.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AmlComputeProperties.java @@ -6,11 +6,9 @@ import com.azure.core.annotation.Fluent; import com.azure.core.management.exception.ManagementError; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import java.time.OffsetDateTime; import java.util.List; -import java.util.Map; /** AML Compute properties. */ @Fluent @@ -140,8 +138,7 @@ public final class AmlComputeProperties { * A property bag containing additional properties. */ @JsonProperty(value = "propertyBag") - @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) - private Map propertyBag; + private Object propertyBag; /** * Get the osType property: Compute OS Type. @@ -425,7 +422,7 @@ public AmlComputeProperties withEnableNodePublicIp(Boolean enableNodePublicIp) { * * @return the propertyBag value. */ - public Map propertyBag() { + public Object propertyBag() { return this.propertyBag; } @@ -435,7 +432,7 @@ public Map propertyBag() { * @param propertyBag the propertyBag value to set. * @return the AmlComputeProperties object itself. */ - public AmlComputeProperties withPropertyBag(Map propertyBag) { + public AmlComputeProperties withPropertyBag(Object propertyBag) { this.propertyBag = propertyBag; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoForecastHorizon.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoForecastHorizon.java deleted file mode 100644 index 6eb5a7464053..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoForecastHorizon.java +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Immutable; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** Forecast horizon determined automatically by system. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "mode") -@JsonTypeName("Auto") -@Immutable -public final class AutoForecastHorizon extends ForecastHorizon { - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoMLJob.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoMLJob.java deleted file mode 100644 index f4f8de510ede..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoMLJob.java +++ /dev/null @@ -1,263 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.util.Map; - -/** - * AutoMLJob class. Use this class for executing AutoML tasks like Classification/Regression etc. See TaskType enum for - * all the tasks supported. - */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "jobType") -@JsonTypeName("AutoML") -@Fluent -public final class AutoMLJob extends JobBaseDetails { - /* - * The ARM resource ID of the Environment specification for the job. - * This is optional value to provide, if not provided, AutoML will default - * this to Production AutoML curated environment version when running the - * job. - */ - @JsonProperty(value = "environmentId") - private String environmentId; - - /* - * Environment variables included in the job. - */ - @JsonProperty(value = "environmentVariables") - @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) - private Map environmentVariables; - - /* - * Mapping of output data bindings used in the job. - */ - @JsonProperty(value = "outputs") - @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) - private Map outputs; - - /* - * Compute Resource configuration for the job. - */ - @JsonProperty(value = "resources") - private ResourceConfiguration resources; - - /* - * [Required] This represents scenario which can be one of Tables/NLP/Image - */ - @JsonProperty(value = "taskDetails", required = true) - private AutoMLVertical taskDetails; - - /** - * Get the environmentId property: The ARM resource ID of the Environment specification for the job. This is - * optional value to provide, if not provided, AutoML will default this to Production AutoML curated environment - * version when running the job. - * - * @return the environmentId value. - */ - public String environmentId() { - return this.environmentId; - } - - /** - * Set the environmentId property: The ARM resource ID of the Environment specification for the job. This is - * optional value to provide, if not provided, AutoML will default this to Production AutoML curated environment - * version when running the job. - * - * @param environmentId the environmentId value to set. - * @return the AutoMLJob object itself. - */ - public AutoMLJob withEnvironmentId(String environmentId) { - this.environmentId = environmentId; - return this; - } - - /** - * Get the environmentVariables property: Environment variables included in the job. - * - * @return the environmentVariables value. - */ - public Map environmentVariables() { - return this.environmentVariables; - } - - /** - * Set the environmentVariables property: Environment variables included in the job. - * - * @param environmentVariables the environmentVariables value to set. - * @return the AutoMLJob object itself. - */ - public AutoMLJob withEnvironmentVariables(Map environmentVariables) { - this.environmentVariables = environmentVariables; - return this; - } - - /** - * Get the outputs property: Mapping of output data bindings used in the job. - * - * @return the outputs value. - */ - public Map outputs() { - return this.outputs; - } - - /** - * Set the outputs property: Mapping of output data bindings used in the job. - * - * @param outputs the outputs value to set. - * @return the AutoMLJob object itself. - */ - public AutoMLJob withOutputs(Map outputs) { - this.outputs = outputs; - return this; - } - - /** - * Get the resources property: Compute Resource configuration for the job. - * - * @return the resources value. - */ - public ResourceConfiguration resources() { - return this.resources; - } - - /** - * Set the resources property: Compute Resource configuration for the job. - * - * @param resources the resources value to set. - * @return the AutoMLJob object itself. - */ - public AutoMLJob withResources(ResourceConfiguration resources) { - this.resources = resources; - return this; - } - - /** - * Get the taskDetails property: [Required] This represents scenario which can be one of Tables/NLP/Image. - * - * @return the taskDetails value. - */ - public AutoMLVertical taskDetails() { - return this.taskDetails; - } - - /** - * Set the taskDetails property: [Required] This represents scenario which can be one of Tables/NLP/Image. - * - * @param taskDetails the taskDetails value to set. - * @return the AutoMLJob object itself. - */ - public AutoMLJob withTaskDetails(AutoMLVertical taskDetails) { - this.taskDetails = taskDetails; - return this; - } - - /** {@inheritDoc} */ - @Override - public AutoMLJob withComputeId(String computeId) { - super.withComputeId(computeId); - return this; - } - - /** {@inheritDoc} */ - @Override - public AutoMLJob withDisplayName(String displayName) { - super.withDisplayName(displayName); - return this; - } - - /** {@inheritDoc} */ - @Override - public AutoMLJob withExperimentName(String experimentName) { - super.withExperimentName(experimentName); - return this; - } - - /** {@inheritDoc} */ - @Override - public AutoMLJob withIdentity(IdentityConfiguration identity) { - super.withIdentity(identity); - return this; - } - - /** {@inheritDoc} */ - @Override - public AutoMLJob withIsArchived(Boolean isArchived) { - super.withIsArchived(isArchived); - return this; - } - - /** {@inheritDoc} */ - @Override - public AutoMLJob withSchedule(ScheduleBase schedule) { - super.withSchedule(schedule); - return this; - } - - /** {@inheritDoc} */ - @Override - public AutoMLJob withServices(Map services) { - super.withServices(services); - return this; - } - - /** {@inheritDoc} */ - @Override - public AutoMLJob withDescription(String description) { - super.withDescription(description); - return this; - } - - /** {@inheritDoc} */ - @Override - public AutoMLJob withProperties(Map properties) { - super.withProperties(properties); - return this; - } - - /** {@inheritDoc} */ - @Override - public AutoMLJob withTags(Map tags) { - super.withTags(tags); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (outputs() != null) { - outputs() - .values() - .forEach( - e -> { - if (e != null) { - e.validate(); - } - }); - } - if (resources() != null) { - resources().validate(); - } - if (taskDetails() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException("Missing required property taskDetails in model AutoMLJob")); - } else { - taskDetails().validate(); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(AutoMLJob.class); -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoMLVertical.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoMLVertical.java deleted file mode 100644 index 816c0b483a09..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoMLVertical.java +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** AutoML vertical class. Base class for AutoML verticals - TableVertical/ImageVertical/NLPVertical. */ -@JsonTypeInfo( - use = JsonTypeInfo.Id.NAME, - include = JsonTypeInfo.As.PROPERTY, - property = "taskType", - defaultImpl = AutoMLVertical.class) -@JsonTypeName("AutoMLVertical") -@JsonSubTypes({ - @JsonSubTypes.Type(name = "Classification", value = Classification.class), - @JsonSubTypes.Type(name = "Forecasting", value = Forecasting.class), - @JsonSubTypes.Type(name = "ImageClassification", value = ImageClassification.class), - @JsonSubTypes.Type(name = "ImageClassificationMultilabel", value = ImageClassificationMultilabel.class), - @JsonSubTypes.Type(name = "ImageInstanceSegmentation", value = ImageInstanceSegmentation.class), - @JsonSubTypes.Type(name = "ImageObjectDetection", value = ImageObjectDetection.class), - @JsonSubTypes.Type(name = "Regression", value = Regression.class), - @JsonSubTypes.Type(name = "TextClassification", value = TextClassification.class), - @JsonSubTypes.Type(name = "TextClassificationMultilabel", value = TextClassificationMultilabel.class), - @JsonSubTypes.Type(name = "TextNER", value = TextNer.class) -}) -@Fluent -public class AutoMLVertical { - /* - * Log verbosity for the job. - */ - @JsonProperty(value = "logVerbosity") - private LogVerbosity logVerbosity; - - /** - * Get the logVerbosity property: Log verbosity for the job. - * - * @return the logVerbosity value. - */ - public LogVerbosity logVerbosity() { - return this.logVerbosity; - } - - /** - * Set the logVerbosity property: Log verbosity for the job. - * - * @param logVerbosity the logVerbosity value to set. - * @return the AutoMLVertical object itself. - */ - public AutoMLVertical withLogVerbosity(LogVerbosity logVerbosity) { - this.logVerbosity = logVerbosity; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoNCrossValidations.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoNCrossValidations.java deleted file mode 100644 index 177a96d92716..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoNCrossValidations.java +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Immutable; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** N-Cross validations determined automatically. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "mode") -@JsonTypeName("Auto") -@Immutable -public final class AutoNCrossValidations extends NCrossValidations { - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoSeasonality.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoSeasonality.java deleted file mode 100644 index 451241be1f69..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoSeasonality.java +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Immutable; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** The AutoSeasonality model. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "mode") -@JsonTypeName("Auto") -@Immutable -public final class AutoSeasonality extends Seasonality { - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoTargetLags.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoTargetLags.java deleted file mode 100644 index d8781e9bca1d..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoTargetLags.java +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Immutable; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** The AutoTargetLags model. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "mode") -@JsonTypeName("Auto") -@Immutable -public final class AutoTargetLags extends TargetLags { - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoTargetRollingWindowSize.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoTargetRollingWindowSize.java deleted file mode 100644 index 33f8abca5554..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AutoTargetRollingWindowSize.java +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Immutable; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** Target lags rolling window determined automatically. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "mode") -@JsonTypeName("Auto") -@Immutable -public final class AutoTargetRollingWindowSize extends TargetRollingWindowSize { - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AzureBlobDatastore.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AzureBlobDatastore.java index 3b33d6574d4e..d0afedc988fd 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AzureBlobDatastore.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AzureBlobDatastore.java @@ -14,7 +14,7 @@ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "datastoreType") @JsonTypeName("AzureBlob") @Fluent -public final class AzureBlobDatastore extends DatastoreDetails { +public final class AzureBlobDatastore extends DatastoreProperties { /* * Storage account name. */ diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AzureDataLakeGen1Datastore.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AzureDataLakeGen1Datastore.java index a22c78a502e9..83817d8c2bc0 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AzureDataLakeGen1Datastore.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AzureDataLakeGen1Datastore.java @@ -15,7 +15,7 @@ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "datastoreType") @JsonTypeName("AzureDataLakeGen1") @Fluent -public final class AzureDataLakeGen1Datastore extends DatastoreDetails { +public final class AzureDataLakeGen1Datastore extends DatastoreProperties { /* * Indicates which identity to use to authenticate service data access to * customer's storage. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AzureDataLakeGen2Datastore.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AzureDataLakeGen2Datastore.java index c1952e55d9b1..1e9feb504f87 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AzureDataLakeGen2Datastore.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AzureDataLakeGen2Datastore.java @@ -15,7 +15,7 @@ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "datastoreType") @JsonTypeName("AzureDataLakeGen2") @Fluent -public final class AzureDataLakeGen2Datastore extends DatastoreDetails { +public final class AzureDataLakeGen2Datastore extends DatastoreProperties { /* * [Required] Storage account name. */ diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AzureFileDatastore.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AzureFileDatastore.java index 2c7d422adc32..ba5dbc42b5be 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AzureFileDatastore.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/AzureFileDatastore.java @@ -15,7 +15,7 @@ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "datastoreType") @JsonTypeName("AzureFile") @Fluent -public final class AzureFileDatastore extends DatastoreDetails { +public final class AzureFileDatastore extends DatastoreProperties { /* * [Required] Storage account name. */ diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeploymentData.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeployment.java similarity index 69% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeploymentData.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeployment.java index 71c6cb57ca7a..ff78009e7cdf 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeploymentData.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeployment.java @@ -7,11 +7,11 @@ import com.azure.core.management.Region; import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.BatchDeploymentDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.BatchDeploymentInner; import java.util.Map; -/** An immutable client-side representation of BatchDeploymentData. */ -public interface BatchDeploymentData { +/** An immutable client-side representation of BatchDeployment. */ +public interface BatchDeployment { /** * Gets the id property: Fully qualified resource Id for the resource. * @@ -67,7 +67,7 @@ public interface BatchDeploymentData { * * @return the properties value. */ - BatchDeploymentDetails properties(); + BatchDeploymentProperties properties(); /** * Gets the sku property: Sku details required for ARM contract for Autoscaling. @@ -105,13 +105,13 @@ public interface BatchDeploymentData { String resourceGroupName(); /** - * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.BatchDeploymentDataInner object. + * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.BatchDeploymentInner object. * * @return the inner object. */ - BatchDeploymentDataInner innerModel(); + BatchDeploymentInner innerModel(); - /** The entirety of the BatchDeploymentData definition. */ + /** The entirety of the BatchDeployment definition. */ interface Definition extends DefinitionStages.Blank, DefinitionStages.WithLocation, @@ -119,12 +119,12 @@ interface Definition DefinitionStages.WithProperties, DefinitionStages.WithCreate { } - /** The BatchDeploymentData definition stages. */ + /** The BatchDeployment definition stages. */ interface DefinitionStages { - /** The first stage of the BatchDeploymentData definition. */ + /** The first stage of the BatchDeployment definition. */ interface Blank extends WithLocation { } - /** The stage of the BatchDeploymentData definition allowing to specify location. */ + /** The stage of the BatchDeployment definition allowing to specify location. */ interface WithLocation { /** * Specifies the region for the resource. @@ -142,7 +142,7 @@ interface WithLocation { */ WithParentResource withRegion(String location); } - /** The stage of the BatchDeploymentData definition allowing to specify parent resource. */ + /** The stage of the BatchDeployment definition allowing to specify parent resource. */ interface WithParentResource { /** * Specifies resourceGroupName, workspaceName, endpointName. @@ -155,7 +155,7 @@ interface WithParentResource { WithProperties withExistingBatchEndpoint( String resourceGroupName, String workspaceName, String endpointName); } - /** The stage of the BatchDeploymentData definition allowing to specify properties. */ + /** The stage of the BatchDeployment definition allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -163,10 +163,10 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - WithCreate withProperties(BatchDeploymentDetails properties); + WithCreate withProperties(BatchDeploymentProperties properties); } /** - * The stage of the BatchDeploymentData definition which contains all the minimum required properties for the + * The stage of the BatchDeployment definition which contains all the minimum required properties for the * resource to be created, but also allows for any other optional properties to be specified. */ interface WithCreate @@ -179,7 +179,7 @@ interface WithCreate * * @return the created resource. */ - BatchDeploymentData create(); + BatchDeployment create(); /** * Executes the create request. @@ -187,9 +187,9 @@ interface WithCreate * @param context The context to associate with this operation. * @return the created resource. */ - BatchDeploymentData create(Context context); + BatchDeployment create(Context context); } - /** The stage of the BatchDeploymentData definition allowing to specify tags. */ + /** The stage of the BatchDeployment definition allowing to specify tags. */ interface WithTags { /** * Specifies the tags property: Resource tags.. @@ -199,7 +199,7 @@ interface WithTags { */ WithCreate withTags(Map tags); } - /** The stage of the BatchDeploymentData definition allowing to specify identity. */ + /** The stage of the BatchDeployment definition allowing to specify identity. */ interface WithIdentity { /** * Specifies the identity property: Managed service identity (system assigned and/or user assigned @@ -210,7 +210,7 @@ interface WithIdentity { */ WithCreate withIdentity(ManagedServiceIdentity identity); } - /** The stage of the BatchDeploymentData definition allowing to specify kind. */ + /** The stage of the BatchDeployment definition allowing to specify kind. */ interface WithKind { /** * Specifies the kind property: Metadata used by portal/tooling/etc to render different UX experiences for @@ -222,7 +222,7 @@ interface WithKind { */ WithCreate withKind(String kind); } - /** The stage of the BatchDeploymentData definition allowing to specify sku. */ + /** The stage of the BatchDeployment definition allowing to specify sku. */ interface WithSku { /** * Specifies the sku property: Sku details required for ARM contract for Autoscaling.. @@ -234,25 +234,20 @@ interface WithSku { } } /** - * Begins update for the BatchDeploymentData resource. + * Begins update for the BatchDeployment resource. * * @return the stage of resource update. */ - BatchDeploymentData.Update update(); + BatchDeployment.Update update(); - /** The template for BatchDeploymentData update. */ - interface Update - extends UpdateStages.WithTags, - UpdateStages.WithIdentity, - UpdateStages.WithKind, - UpdateStages.WithProperties, - UpdateStages.WithSku { + /** The template for BatchDeployment update. */ + interface Update extends UpdateStages.WithTags, UpdateStages.WithProperties { /** * Executes the update request. * * @return the updated resource. */ - BatchDeploymentData apply(); + BatchDeployment apply(); /** * Executes the update request. @@ -260,11 +255,11 @@ interface Update * @param context The context to associate with this operation. * @return the updated resource. */ - BatchDeploymentData apply(Context context); + BatchDeployment apply(Context context); } - /** The BatchDeploymentData update stages. */ + /** The BatchDeployment update stages. */ interface UpdateStages { - /** The stage of the BatchDeploymentData update allowing to specify tags. */ + /** The stage of the BatchDeployment update allowing to specify tags. */ interface WithTags { /** * Specifies the tags property: Resource tags.. @@ -274,30 +269,7 @@ interface WithTags { */ Update withTags(Map tags); } - /** The stage of the BatchDeploymentData update allowing to specify identity. */ - interface WithIdentity { - /** - * Specifies the identity property: Managed service identity (system assigned and/or user assigned - * identities). - * - * @param identity Managed service identity (system assigned and/or user assigned identities). - * @return the next definition stage. - */ - Update withIdentity(PartialManagedServiceIdentity identity); - } - /** The stage of the BatchDeploymentData update allowing to specify kind. */ - interface WithKind { - /** - * Specifies the kind property: Metadata used by portal/tooling/etc to render different UX experiences for - * resources of the same type.. - * - * @param kind Metadata used by portal/tooling/etc to render different UX experiences for resources of the - * same type. - * @return the next definition stage. - */ - Update withKind(String kind); - } - /** The stage of the BatchDeploymentData update allowing to specify properties. */ + /** The stage of the BatchDeployment update allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: Additional attributes of the entity.. @@ -307,23 +279,13 @@ interface WithProperties { */ Update withProperties(PartialBatchDeployment properties); } - /** The stage of the BatchDeploymentData update allowing to specify sku. */ - interface WithSku { - /** - * Specifies the sku property: Sku details required for ARM contract for Autoscaling.. - * - * @param sku Sku details required for ARM contract for Autoscaling. - * @return the next definition stage. - */ - Update withSku(PartialSku sku); - } } /** * Refreshes the resource to sync with Azure. * * @return the refreshed resource. */ - BatchDeploymentData refresh(); + BatchDeployment refresh(); /** * Refreshes the resource to sync with Azure. @@ -331,5 +293,5 @@ interface WithSku { * @param context The context to associate with this operation. * @return the refreshed resource. */ - BatchDeploymentData refresh(Context context); + BatchDeployment refresh(Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeploymentDetails.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeploymentProperties.java similarity index 83% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeploymentDetails.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeploymentProperties.java index 210a7bc11f9d..8aa20ba31322 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeploymentDetails.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeploymentProperties.java @@ -10,7 +10,7 @@ /** Batch inference settings per deployment. */ @Fluent -public final class BatchDeploymentDetails extends EndpointDeploymentPropertiesBase { +public final class BatchDeploymentProperties extends EndpointDeploymentPropertiesBase { /* * Compute target for batch inference operation. */ @@ -103,9 +103,9 @@ public String compute() { * Set the compute property: Compute target for batch inference operation. * * @param compute the compute value to set. - * @return the BatchDeploymentDetails object itself. + * @return the BatchDeploymentProperties object itself. */ - public BatchDeploymentDetails withCompute(String compute) { + public BatchDeploymentProperties withCompute(String compute) { this.compute = compute; return this; } @@ -129,9 +129,9 @@ public Integer errorThreshold() { * all failures during batch inference will be ignored. * * @param errorThreshold the errorThreshold value to set. - * @return the BatchDeploymentDetails object itself. + * @return the BatchDeploymentProperties object itself. */ - public BatchDeploymentDetails withErrorThreshold(Integer errorThreshold) { + public BatchDeploymentProperties withErrorThreshold(Integer errorThreshold) { this.errorThreshold = errorThreshold; return this; } @@ -149,9 +149,9 @@ public BatchLoggingLevel loggingLevel() { * Set the loggingLevel property: Logging level for batch inference operation. * * @param loggingLevel the loggingLevel value to set. - * @return the BatchDeploymentDetails object itself. + * @return the BatchDeploymentProperties object itself. */ - public BatchDeploymentDetails withLoggingLevel(BatchLoggingLevel loggingLevel) { + public BatchDeploymentProperties withLoggingLevel(BatchLoggingLevel loggingLevel) { this.loggingLevel = loggingLevel; return this; } @@ -169,9 +169,9 @@ public Integer maxConcurrencyPerInstance() { * Set the maxConcurrencyPerInstance property: Indicates maximum number of parallelism per instance. * * @param maxConcurrencyPerInstance the maxConcurrencyPerInstance value to set. - * @return the BatchDeploymentDetails object itself. + * @return the BatchDeploymentProperties object itself. */ - public BatchDeploymentDetails withMaxConcurrencyPerInstance(Integer maxConcurrencyPerInstance) { + public BatchDeploymentProperties withMaxConcurrencyPerInstance(Integer maxConcurrencyPerInstance) { this.maxConcurrencyPerInstance = maxConcurrencyPerInstance; return this; } @@ -191,9 +191,9 @@ public Long miniBatchSize() { * the number of files per mini-batch. For TabularDataset, this is the size of the records in bytes, per mini-batch. * * @param miniBatchSize the miniBatchSize value to set. - * @return the BatchDeploymentDetails object itself. + * @return the BatchDeploymentProperties object itself. */ - public BatchDeploymentDetails withMiniBatchSize(Long miniBatchSize) { + public BatchDeploymentProperties withMiniBatchSize(Long miniBatchSize) { this.miniBatchSize = miniBatchSize; return this; } @@ -211,9 +211,9 @@ public AssetReferenceBase model() { * Set the model property: Reference to the model asset for the endpoint deployment. * * @param model the model value to set. - * @return the BatchDeploymentDetails object itself. + * @return the BatchDeploymentProperties object itself. */ - public BatchDeploymentDetails withModel(AssetReferenceBase model) { + public BatchDeploymentProperties withModel(AssetReferenceBase model) { this.model = model; return this; } @@ -231,9 +231,9 @@ public BatchOutputAction outputAction() { * Set the outputAction property: Indicates how the output will be organized. * * @param outputAction the outputAction value to set. - * @return the BatchDeploymentDetails object itself. + * @return the BatchDeploymentProperties object itself. */ - public BatchDeploymentDetails withOutputAction(BatchOutputAction outputAction) { + public BatchDeploymentProperties withOutputAction(BatchOutputAction outputAction) { this.outputAction = outputAction; return this; } @@ -251,9 +251,9 @@ public String outputFileName() { * Set the outputFileName property: Customized output file name for append_row output action. * * @param outputFileName the outputFileName value to set. - * @return the BatchDeploymentDetails object itself. + * @return the BatchDeploymentProperties object itself. */ - public BatchDeploymentDetails withOutputFileName(String outputFileName) { + public BatchDeploymentProperties withOutputFileName(String outputFileName) { this.outputFileName = outputFileName; return this; } @@ -282,9 +282,9 @@ public ResourceConfiguration resources() { * defaults defined in ResourceConfiguration. * * @param resources the resources value to set. - * @return the BatchDeploymentDetails object itself. + * @return the BatchDeploymentProperties object itself. */ - public BatchDeploymentDetails withResources(ResourceConfiguration resources) { + public BatchDeploymentProperties withResources(ResourceConfiguration resources) { this.resources = resources; return this; } @@ -304,44 +304,44 @@ public BatchRetrySettings retrySettings() { * to the defaults defined in BatchRetrySettings. * * @param retrySettings the retrySettings value to set. - * @return the BatchDeploymentDetails object itself. + * @return the BatchDeploymentProperties object itself. */ - public BatchDeploymentDetails withRetrySettings(BatchRetrySettings retrySettings) { + public BatchDeploymentProperties withRetrySettings(BatchRetrySettings retrySettings) { this.retrySettings = retrySettings; return this; } /** {@inheritDoc} */ @Override - public BatchDeploymentDetails withCodeConfiguration(CodeConfiguration codeConfiguration) { + public BatchDeploymentProperties withCodeConfiguration(CodeConfiguration codeConfiguration) { super.withCodeConfiguration(codeConfiguration); return this; } /** {@inheritDoc} */ @Override - public BatchDeploymentDetails withDescription(String description) { + public BatchDeploymentProperties withDescription(String description) { super.withDescription(description); return this; } /** {@inheritDoc} */ @Override - public BatchDeploymentDetails withEnvironmentId(String environmentId) { + public BatchDeploymentProperties withEnvironmentId(String environmentId) { super.withEnvironmentId(environmentId); return this; } /** {@inheritDoc} */ @Override - public BatchDeploymentDetails withEnvironmentVariables(Map environmentVariables) { + public BatchDeploymentProperties withEnvironmentVariables(Map environmentVariables) { super.withEnvironmentVariables(environmentVariables); return this; } /** {@inheritDoc} */ @Override - public BatchDeploymentDetails withProperties(Map properties) { + public BatchDeploymentProperties withProperties(Map properties) { super.withProperties(properties); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeploymentTrackedResourceArmPaginatedResult.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeploymentTrackedResourceArmPaginatedResult.java index 9f22d39168a3..58043a7f6f19 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeploymentTrackedResourceArmPaginatedResult.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeploymentTrackedResourceArmPaginatedResult.java @@ -5,7 +5,7 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.fluent.models.BatchDeploymentDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.BatchDeploymentInner; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -23,7 +23,7 @@ public final class BatchDeploymentTrackedResourceArmPaginatedResult { * An array of objects of type BatchDeployment. */ @JsonProperty(value = "value") - private List value; + private List value; /** * Get the nextLink property: The link to the next page of BatchDeployment objects. If null, there are no additional @@ -52,7 +52,7 @@ public BatchDeploymentTrackedResourceArmPaginatedResult withNextLink(String next * * @return the value value. */ - public List value() { + public List value() { return this.value; } @@ -62,7 +62,7 @@ public List value() { * @param value the value value to set. * @return the BatchDeploymentTrackedResourceArmPaginatedResult object itself. */ - public BatchDeploymentTrackedResourceArmPaginatedResult withValue(List value) { + public BatchDeploymentTrackedResourceArmPaginatedResult withValue(List value) { this.value = value; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeployments.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeployments.java index be41a5214429..3002176d89c2 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeployments.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchDeployments.java @@ -21,7 +21,7 @@ public interface BatchDeployments { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of BatchDeployment entities as paginated response with {@link PagedIterable}. */ - PagedIterable list(String resourceGroupName, String workspaceName, String endpointName); + PagedIterable list(String resourceGroupName, String workspaceName, String endpointName); /** * Lists Batch inference deployments in the workspace. @@ -38,7 +38,7 @@ public interface BatchDeployments { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of BatchDeployment entities as paginated response with {@link PagedIterable}. */ - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String endpointName, @@ -87,7 +87,7 @@ void delete( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a batch inference deployment by id. */ - BatchDeploymentData get(String resourceGroupName, String workspaceName, String endpointName, String deploymentName); + BatchDeployment get(String resourceGroupName, String workspaceName, String endpointName, String deploymentName); /** * Gets a batch inference deployment by id. @@ -102,7 +102,7 @@ void delete( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a batch inference deployment by id along with {@link Response}. */ - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, Context context); /** @@ -114,7 +114,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a batch inference deployment by id along with {@link Response}. */ - BatchDeploymentData getById(String id); + BatchDeployment getById(String id); /** * Gets a batch inference deployment by id. @@ -126,7 +126,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a batch inference deployment by id along with {@link Response}. */ - Response getByIdWithResponse(String id, Context context); + Response getByIdWithResponse(String id, Context context); /** * Delete Batch Inference deployment (asynchronous). @@ -150,10 +150,10 @@ Response getWithResponse( void deleteByIdWithResponse(String id, Context context); /** - * Begins definition for a new BatchDeploymentData resource. + * Begins definition for a new BatchDeployment resource. * * @param name resource name. - * @return the first stage of the new BatchDeploymentData definition. + * @return the first stage of the new BatchDeployment definition. */ - BatchDeploymentData.DefinitionStages.Blank define(String name); + BatchDeployment.DefinitionStages.Blank define(String name); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpointData.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpoint.java similarity index 71% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpointData.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpoint.java index 08a9d25e3095..e7d017d86e8b 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpointData.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpoint.java @@ -7,11 +7,11 @@ import com.azure.core.http.rest.Response; import com.azure.core.management.Region; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.BatchEndpointDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.BatchEndpointInner; import java.util.Map; -/** An immutable client-side representation of BatchEndpointData. */ -public interface BatchEndpointData { +/** An immutable client-side representation of BatchEndpoint. */ +public interface BatchEndpoint { /** * Gets the id property: Fully qualified resource Id for the resource. * @@ -67,7 +67,7 @@ public interface BatchEndpointData { * * @return the properties value. */ - BatchEndpointDetails properties(); + BatchEndpointProperties properties(); /** * Gets the sku property: Sku details required for ARM contract for Autoscaling. @@ -98,13 +98,13 @@ public interface BatchEndpointData { String resourceGroupName(); /** - * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.BatchEndpointDataInner object. + * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.BatchEndpointInner object. * * @return the inner object. */ - BatchEndpointDataInner innerModel(); + BatchEndpointInner innerModel(); - /** The entirety of the BatchEndpointData definition. */ + /** The entirety of the BatchEndpoint definition. */ interface Definition extends DefinitionStages.Blank, DefinitionStages.WithLocation, @@ -112,12 +112,12 @@ interface Definition DefinitionStages.WithProperties, DefinitionStages.WithCreate { } - /** The BatchEndpointData definition stages. */ + /** The BatchEndpoint definition stages. */ interface DefinitionStages { - /** The first stage of the BatchEndpointData definition. */ + /** The first stage of the BatchEndpoint definition. */ interface Blank extends WithLocation { } - /** The stage of the BatchEndpointData definition allowing to specify location. */ + /** The stage of the BatchEndpoint definition allowing to specify location. */ interface WithLocation { /** * Specifies the region for the resource. @@ -135,7 +135,7 @@ interface WithLocation { */ WithParentResource withRegion(String location); } - /** The stage of the BatchEndpointData definition allowing to specify parent resource. */ + /** The stage of the BatchEndpoint definition allowing to specify parent resource. */ interface WithParentResource { /** * Specifies resourceGroupName, workspaceName. @@ -146,7 +146,7 @@ interface WithParentResource { */ WithProperties withExistingWorkspace(String resourceGroupName, String workspaceName); } - /** The stage of the BatchEndpointData definition allowing to specify properties. */ + /** The stage of the BatchEndpoint definition allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -154,11 +154,11 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - WithCreate withProperties(BatchEndpointDetails properties); + WithCreate withProperties(BatchEndpointProperties properties); } /** - * The stage of the BatchEndpointData definition which contains all the minimum required properties for the - * resource to be created, but also allows for any other optional properties to be specified. + * The stage of the BatchEndpoint definition which contains all the minimum required properties for the resource + * to be created, but also allows for any other optional properties to be specified. */ interface WithCreate extends DefinitionStages.WithTags, @@ -170,7 +170,7 @@ interface WithCreate * * @return the created resource. */ - BatchEndpointData create(); + BatchEndpoint create(); /** * Executes the create request. @@ -178,9 +178,9 @@ interface WithCreate * @param context The context to associate with this operation. * @return the created resource. */ - BatchEndpointData create(Context context); + BatchEndpoint create(Context context); } - /** The stage of the BatchEndpointData definition allowing to specify tags. */ + /** The stage of the BatchEndpoint definition allowing to specify tags. */ interface WithTags { /** * Specifies the tags property: Resource tags.. @@ -190,7 +190,7 @@ interface WithTags { */ WithCreate withTags(Map tags); } - /** The stage of the BatchEndpointData definition allowing to specify identity. */ + /** The stage of the BatchEndpoint definition allowing to specify identity. */ interface WithIdentity { /** * Specifies the identity property: Managed service identity (system assigned and/or user assigned @@ -201,7 +201,7 @@ interface WithIdentity { */ WithCreate withIdentity(ManagedServiceIdentity identity); } - /** The stage of the BatchEndpointData definition allowing to specify kind. */ + /** The stage of the BatchEndpoint definition allowing to specify kind. */ interface WithKind { /** * Specifies the kind property: Metadata used by portal/tooling/etc to render different UX experiences for @@ -213,7 +213,7 @@ interface WithKind { */ WithCreate withKind(String kind); } - /** The stage of the BatchEndpointData definition allowing to specify sku. */ + /** The stage of the BatchEndpoint definition allowing to specify sku. */ interface WithSku { /** * Specifies the sku property: Sku details required for ARM contract for Autoscaling.. @@ -225,25 +225,20 @@ interface WithSku { } } /** - * Begins update for the BatchEndpointData resource. + * Begins update for the BatchEndpoint resource. * * @return the stage of resource update. */ - BatchEndpointData.Update update(); + BatchEndpoint.Update update(); - /** The template for BatchEndpointData update. */ - interface Update - extends UpdateStages.WithTags, - UpdateStages.WithIdentity, - UpdateStages.WithKind, - UpdateStages.WithProperties, - UpdateStages.WithSku { + /** The template for BatchEndpoint update. */ + interface Update extends UpdateStages.WithTags, UpdateStages.WithIdentity { /** * Executes the update request. * * @return the updated resource. */ - BatchEndpointData apply(); + BatchEndpoint apply(); /** * Executes the update request. @@ -251,11 +246,11 @@ interface Update * @param context The context to associate with this operation. * @return the updated resource. */ - BatchEndpointData apply(Context context); + BatchEndpoint apply(Context context); } - /** The BatchEndpointData update stages. */ + /** The BatchEndpoint update stages. */ interface UpdateStages { - /** The stage of the BatchEndpointData update allowing to specify tags. */ + /** The stage of the BatchEndpoint update allowing to specify tags. */ interface WithTags { /** * Specifies the tags property: Resource tags.. @@ -265,7 +260,7 @@ interface WithTags { */ Update withTags(Map tags); } - /** The stage of the BatchEndpointData update allowing to specify identity. */ + /** The stage of the BatchEndpoint update allowing to specify identity. */ interface WithIdentity { /** * Specifies the identity property: Managed service identity (system assigned and/or user assigned @@ -276,45 +271,13 @@ interface WithIdentity { */ Update withIdentity(PartialManagedServiceIdentity identity); } - /** The stage of the BatchEndpointData update allowing to specify kind. */ - interface WithKind { - /** - * Specifies the kind property: Metadata used by portal/tooling/etc to render different UX experiences for - * resources of the same type.. - * - * @param kind Metadata used by portal/tooling/etc to render different UX experiences for resources of the - * same type. - * @return the next definition stage. - */ - Update withKind(String kind); - } - /** The stage of the BatchEndpointData update allowing to specify properties. */ - interface WithProperties { - /** - * Specifies the properties property: Additional attributes of the entity.. - * - * @param properties Additional attributes of the entity. - * @return the next definition stage. - */ - Update withProperties(PartialBatchEndpoint properties); - } - /** The stage of the BatchEndpointData update allowing to specify sku. */ - interface WithSku { - /** - * Specifies the sku property: Sku details required for ARM contract for Autoscaling.. - * - * @param sku Sku details required for ARM contract for Autoscaling. - * @return the next definition stage. - */ - Update withSku(PartialSku sku); - } } /** * Refreshes the resource to sync with Azure. * * @return the refreshed resource. */ - BatchEndpointData refresh(); + BatchEndpoint refresh(); /** * Refreshes the resource to sync with Azure. @@ -322,7 +285,7 @@ interface WithSku { * @param context The context to associate with this operation. * @return the refreshed resource. */ - BatchEndpointData refresh(Context context); + BatchEndpoint refresh(Context context); /** * Lists batch Inference Endpoint keys. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpointDetails.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpointProperties.java similarity index 81% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpointDetails.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpointProperties.java index f92ee169cc38..c94526368b7a 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpointDetails.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpointProperties.java @@ -12,7 +12,7 @@ /** Batch endpoint configuration. */ @Fluent -public final class BatchEndpointDetails extends EndpointPropertiesBaseInner { +public final class BatchEndpointProperties extends EndpointPropertiesBaseInner { /* * Default values for Batch Endpoint */ @@ -38,9 +38,9 @@ public BatchEndpointDefaults defaults() { * Set the defaults property: Default values for Batch Endpoint. * * @param defaults the defaults value to set. - * @return the BatchEndpointDetails object itself. + * @return the BatchEndpointProperties object itself. */ - public BatchEndpointDetails withDefaults(BatchEndpointDefaults defaults) { + public BatchEndpointProperties withDefaults(BatchEndpointDefaults defaults) { this.defaults = defaults; return this; } @@ -56,28 +56,28 @@ public EndpointProvisioningState provisioningState() { /** {@inheritDoc} */ @Override - public BatchEndpointDetails withAuthMode(EndpointAuthMode authMode) { + public BatchEndpointProperties withAuthMode(EndpointAuthMode authMode) { super.withAuthMode(authMode); return this; } /** {@inheritDoc} */ @Override - public BatchEndpointDetails withDescription(String description) { + public BatchEndpointProperties withDescription(String description) { super.withDescription(description); return this; } /** {@inheritDoc} */ @Override - public BatchEndpointDetails withKeys(EndpointAuthKeysInner keys) { + public BatchEndpointProperties withKeys(EndpointAuthKeysInner keys) { super.withKeys(keys); return this; } /** {@inheritDoc} */ @Override - public BatchEndpointDetails withProperties(Map properties) { + public BatchEndpointProperties withProperties(Map properties) { super.withProperties(properties); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpointTrackedResourceArmPaginatedResult.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpointTrackedResourceArmPaginatedResult.java index 17a0ff64a08a..b3a8867e1841 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpointTrackedResourceArmPaginatedResult.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpointTrackedResourceArmPaginatedResult.java @@ -5,7 +5,7 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.fluent.models.BatchEndpointDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.BatchEndpointInner; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -23,7 +23,7 @@ public final class BatchEndpointTrackedResourceArmPaginatedResult { * An array of objects of type BatchEndpoint. */ @JsonProperty(value = "value") - private List value; + private List value; /** * Get the nextLink property: The link to the next page of BatchEndpoint objects. If null, there are no additional @@ -52,7 +52,7 @@ public BatchEndpointTrackedResourceArmPaginatedResult withNextLink(String nextLi * * @return the value value. */ - public List value() { + public List value() { return this.value; } @@ -62,7 +62,7 @@ public List value() { * @param value the value value to set. * @return the BatchEndpointTrackedResourceArmPaginatedResult object itself. */ - public BatchEndpointTrackedResourceArmPaginatedResult withValue(List value) { + public BatchEndpointTrackedResourceArmPaginatedResult withValue(List value) { this.value = value; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpoints.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpoints.java index 8e4c962dbe78..3c1729b22a47 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpoints.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/BatchEndpoints.java @@ -20,7 +20,7 @@ public interface BatchEndpoints { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of BatchEndpoint entities as paginated response with {@link PagedIterable}. */ - PagedIterable list(String resourceGroupName, String workspaceName); + PagedIterable list(String resourceGroupName, String workspaceName); /** * Lists Batch inference endpoint in the workspace. @@ -35,7 +35,7 @@ public interface BatchEndpoints { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of BatchEndpoint entities as paginated response with {@link PagedIterable}. */ - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, Integer count, String skip, Context context); /** @@ -74,7 +74,7 @@ PagedIterable list( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a batch inference endpoint by name. */ - BatchEndpointData get(String resourceGroupName, String workspaceName, String endpointName); + BatchEndpoint get(String resourceGroupName, String workspaceName, String endpointName); /** * Gets a batch inference endpoint by name. @@ -88,7 +88,7 @@ PagedIterable list( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a batch inference endpoint by name along with {@link Response}. */ - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String endpointName, Context context); /** @@ -128,7 +128,7 @@ Response listKeysWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a batch inference endpoint by name along with {@link Response}. */ - BatchEndpointData getById(String id); + BatchEndpoint getById(String id); /** * Gets a batch inference endpoint by name. @@ -140,7 +140,7 @@ Response listKeysWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a batch inference endpoint by name along with {@link Response}. */ - Response getByIdWithResponse(String id, Context context); + Response getByIdWithResponse(String id, Context context); /** * Delete Batch Inference Endpoint (asynchronous). @@ -164,10 +164,10 @@ Response listKeysWithResponse( void deleteByIdWithResponse(String id, Context context); /** - * Begins definition for a new BatchEndpointData resource. + * Begins definition for a new BatchEndpoint resource. * * @param name resource name. - * @return the first stage of the new BatchEndpointData definition. + * @return the first stage of the new BatchEndpoint definition. */ - BatchEndpointData.DefinitionStages.Blank define(String name); + BatchEndpoint.DefinitionStages.Blank define(String name); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Classification.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Classification.java deleted file mode 100644 index 444af27aa8ca..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Classification.java +++ /dev/null @@ -1,228 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.util.List; - -/** Classification task in AutoML Table vertical. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType") -@JsonTypeName("Classification") -@Fluent -public final class Classification extends AutoMLVertical { - /* - * Allowed models for classification task. - */ - @JsonProperty(value = "allowedModels") - private List allowedModels; - - /* - * Blocked models for classification task. - */ - @JsonProperty(value = "blockedModels") - private List blockedModels; - - /* - * Primary metric for the task. - */ - @JsonProperty(value = "primaryMetric") - private ClassificationPrimaryMetrics primaryMetric; - - /* - * Data inputs for AutoMLJob. - */ - @JsonProperty(value = "dataSettings") - private TableVerticalDataSettings dataSettings; - - /* - * Featurization inputs needed for AutoML job. - */ - @JsonProperty(value = "featurizationSettings") - private TableVerticalFeaturizationSettings featurizationSettings; - - /* - * Execution constraints for AutoMLJob. - */ - @JsonProperty(value = "limitSettings") - private TableVerticalLimitSettings limitSettings; - - /* - * Inputs for training phase for an AutoML Job. - */ - @JsonProperty(value = "trainingSettings") - private TrainingSettings trainingSettings; - - /** - * Get the allowedModels property: Allowed models for classification task. - * - * @return the allowedModels value. - */ - public List allowedModels() { - return this.allowedModels; - } - - /** - * Set the allowedModels property: Allowed models for classification task. - * - * @param allowedModels the allowedModels value to set. - * @return the Classification object itself. - */ - public Classification withAllowedModels(List allowedModels) { - this.allowedModels = allowedModels; - return this; - } - - /** - * Get the blockedModels property: Blocked models for classification task. - * - * @return the blockedModels value. - */ - public List blockedModels() { - return this.blockedModels; - } - - /** - * Set the blockedModels property: Blocked models for classification task. - * - * @param blockedModels the blockedModels value to set. - * @return the Classification object itself. - */ - public Classification withBlockedModels(List blockedModels) { - this.blockedModels = blockedModels; - return this; - } - - /** - * Get the primaryMetric property: Primary metric for the task. - * - * @return the primaryMetric value. - */ - public ClassificationPrimaryMetrics primaryMetric() { - return this.primaryMetric; - } - - /** - * Set the primaryMetric property: Primary metric for the task. - * - * @param primaryMetric the primaryMetric value to set. - * @return the Classification object itself. - */ - public Classification withPrimaryMetric(ClassificationPrimaryMetrics primaryMetric) { - this.primaryMetric = primaryMetric; - return this; - } - - /** - * Get the dataSettings property: Data inputs for AutoMLJob. - * - * @return the dataSettings value. - */ - public TableVerticalDataSettings dataSettings() { - return this.dataSettings; - } - - /** - * Set the dataSettings property: Data inputs for AutoMLJob. - * - * @param dataSettings the dataSettings value to set. - * @return the Classification object itself. - */ - public Classification withDataSettings(TableVerticalDataSettings dataSettings) { - this.dataSettings = dataSettings; - return this; - } - - /** - * Get the featurizationSettings property: Featurization inputs needed for AutoML job. - * - * @return the featurizationSettings value. - */ - public TableVerticalFeaturizationSettings featurizationSettings() { - return this.featurizationSettings; - } - - /** - * Set the featurizationSettings property: Featurization inputs needed for AutoML job. - * - * @param featurizationSettings the featurizationSettings value to set. - * @return the Classification object itself. - */ - public Classification withFeaturizationSettings(TableVerticalFeaturizationSettings featurizationSettings) { - this.featurizationSettings = featurizationSettings; - return this; - } - - /** - * Get the limitSettings property: Execution constraints for AutoMLJob. - * - * @return the limitSettings value. - */ - public TableVerticalLimitSettings limitSettings() { - return this.limitSettings; - } - - /** - * Set the limitSettings property: Execution constraints for AutoMLJob. - * - * @param limitSettings the limitSettings value to set. - * @return the Classification object itself. - */ - public Classification withLimitSettings(TableVerticalLimitSettings limitSettings) { - this.limitSettings = limitSettings; - return this; - } - - /** - * Get the trainingSettings property: Inputs for training phase for an AutoML Job. - * - * @return the trainingSettings value. - */ - public TrainingSettings trainingSettings() { - return this.trainingSettings; - } - - /** - * Set the trainingSettings property: Inputs for training phase for an AutoML Job. - * - * @param trainingSettings the trainingSettings value to set. - * @return the Classification object itself. - */ - public Classification withTrainingSettings(TrainingSettings trainingSettings) { - this.trainingSettings = trainingSettings; - return this; - } - - /** {@inheritDoc} */ - @Override - public Classification withLogVerbosity(LogVerbosity logVerbosity) { - super.withLogVerbosity(logVerbosity); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (dataSettings() != null) { - dataSettings().validate(); - } - if (featurizationSettings() != null) { - featurizationSettings().validate(); - } - if (limitSettings() != null) { - limitSettings().validate(); - } - if (trainingSettings() != null) { - trainingSettings().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ClassificationModels.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ClassificationModels.java deleted file mode 100644 index ae45624e07f8..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ClassificationModels.java +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for ClassificationModels. */ -public final class ClassificationModels extends ExpandableStringEnum { - /** Static value LogisticRegression for ClassificationModels. */ - public static final ClassificationModels LOGISTIC_REGRESSION = fromString("LogisticRegression"); - - /** Static value SGD for ClassificationModels. */ - public static final ClassificationModels SGD = fromString("SGD"); - - /** Static value MultinomialNaiveBayes for ClassificationModels. */ - public static final ClassificationModels MULTINOMIAL_NAIVE_BAYES = fromString("MultinomialNaiveBayes"); - - /** Static value BernoulliNaiveBayes for ClassificationModels. */ - public static final ClassificationModels BERNOULLI_NAIVE_BAYES = fromString("BernoulliNaiveBayes"); - - /** Static value SVM for ClassificationModels. */ - public static final ClassificationModels SVM = fromString("SVM"); - - /** Static value LinearSVM for ClassificationModels. */ - public static final ClassificationModels LINEAR_SVM = fromString("LinearSVM"); - - /** Static value KNN for ClassificationModels. */ - public static final ClassificationModels KNN = fromString("KNN"); - - /** Static value DecisionTree for ClassificationModels. */ - public static final ClassificationModels DECISION_TREE = fromString("DecisionTree"); - - /** Static value RandomForest for ClassificationModels. */ - public static final ClassificationModels RANDOM_FOREST = fromString("RandomForest"); - - /** Static value ExtremeRandomTrees for ClassificationModels. */ - public static final ClassificationModels EXTREME_RANDOM_TREES = fromString("ExtremeRandomTrees"); - - /** Static value LightGBM for ClassificationModels. */ - public static final ClassificationModels LIGHT_GBM = fromString("LightGBM"); - - /** Static value GradientBoosting for ClassificationModels. */ - public static final ClassificationModels GRADIENT_BOOSTING = fromString("GradientBoosting"); - - /** Static value XGBoostClassifier for ClassificationModels. */ - public static final ClassificationModels XGBOOST_CLASSIFIER = fromString("XGBoostClassifier"); - - /** - * Creates or finds a ClassificationModels from its string representation. - * - * @param name a name to look for. - * @return the corresponding ClassificationModels. - */ - @JsonCreator - public static ClassificationModels fromString(String name) { - return fromString(name, ClassificationModels.class); - } - - /** - * Gets known ClassificationModels values. - * - * @return known ClassificationModels values. - */ - public static Collection values() { - return values(ClassificationModels.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ClassificationMultilabelPrimaryMetrics.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ClassificationMultilabelPrimaryMetrics.java deleted file mode 100644 index 32fe7a12c056..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ClassificationMultilabelPrimaryMetrics.java +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for ClassificationMultilabelPrimaryMetrics. */ -public final class ClassificationMultilabelPrimaryMetrics - extends ExpandableStringEnum { - /** Static value AUCWeighted for ClassificationMultilabelPrimaryMetrics. */ - public static final ClassificationMultilabelPrimaryMetrics AUCWEIGHTED = fromString("AUCWeighted"); - - /** Static value Accuracy for ClassificationMultilabelPrimaryMetrics. */ - public static final ClassificationMultilabelPrimaryMetrics ACCURACY = fromString("Accuracy"); - - /** Static value NormMacroRecall for ClassificationMultilabelPrimaryMetrics. */ - public static final ClassificationMultilabelPrimaryMetrics NORM_MACRO_RECALL = fromString("NormMacroRecall"); - - /** Static value AveragePrecisionScoreWeighted for ClassificationMultilabelPrimaryMetrics. */ - public static final ClassificationMultilabelPrimaryMetrics AVERAGE_PRECISION_SCORE_WEIGHTED = - fromString("AveragePrecisionScoreWeighted"); - - /** Static value PrecisionScoreWeighted for ClassificationMultilabelPrimaryMetrics. */ - public static final ClassificationMultilabelPrimaryMetrics PRECISION_SCORE_WEIGHTED = - fromString("PrecisionScoreWeighted"); - - /** Static value IOU for ClassificationMultilabelPrimaryMetrics. */ - public static final ClassificationMultilabelPrimaryMetrics IOU = fromString("IOU"); - - /** - * Creates or finds a ClassificationMultilabelPrimaryMetrics from its string representation. - * - * @param name a name to look for. - * @return the corresponding ClassificationMultilabelPrimaryMetrics. - */ - @JsonCreator - public static ClassificationMultilabelPrimaryMetrics fromString(String name) { - return fromString(name, ClassificationMultilabelPrimaryMetrics.class); - } - - /** - * Gets known ClassificationMultilabelPrimaryMetrics values. - * - * @return known ClassificationMultilabelPrimaryMetrics values. - */ - public static Collection values() { - return values(ClassificationMultilabelPrimaryMetrics.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ClassificationPrimaryMetrics.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ClassificationPrimaryMetrics.java deleted file mode 100644 index 1e20e6e6853a..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ClassificationPrimaryMetrics.java +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for ClassificationPrimaryMetrics. */ -public final class ClassificationPrimaryMetrics extends ExpandableStringEnum { - /** Static value AUCWeighted for ClassificationPrimaryMetrics. */ - public static final ClassificationPrimaryMetrics AUCWEIGHTED = fromString("AUCWeighted"); - - /** Static value Accuracy for ClassificationPrimaryMetrics. */ - public static final ClassificationPrimaryMetrics ACCURACY = fromString("Accuracy"); - - /** Static value NormMacroRecall for ClassificationPrimaryMetrics. */ - public static final ClassificationPrimaryMetrics NORM_MACRO_RECALL = fromString("NormMacroRecall"); - - /** Static value AveragePrecisionScoreWeighted for ClassificationPrimaryMetrics. */ - public static final ClassificationPrimaryMetrics AVERAGE_PRECISION_SCORE_WEIGHTED = - fromString("AveragePrecisionScoreWeighted"); - - /** Static value PrecisionScoreWeighted for ClassificationPrimaryMetrics. */ - public static final ClassificationPrimaryMetrics PRECISION_SCORE_WEIGHTED = fromString("PrecisionScoreWeighted"); - - /** - * Creates or finds a ClassificationPrimaryMetrics from its string representation. - * - * @param name a name to look for. - * @return the corresponding ClassificationPrimaryMetrics. - */ - @JsonCreator - public static ClassificationPrimaryMetrics fromString(String name) { - return fromString(name, ClassificationPrimaryMetrics.class); - } - - /** - * Gets known ClassificationPrimaryMetrics values. - * - * @return known ClassificationPrimaryMetrics values. - */ - public static Collection values() { - return values(ClassificationPrimaryMetrics.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainerData.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainer.java similarity index 70% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainerData.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainer.java index 348d61274d19..3d41404e0fc4 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainerData.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainer.java @@ -6,10 +6,10 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.ComponentContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.CodeContainerInner; -/** An immutable client-side representation of ComponentContainerData. */ -public interface ComponentContainerData { +/** An immutable client-side representation of CodeContainer. */ +public interface CodeContainer { /** * Gets the id property: Fully qualified resource Id for the resource. * @@ -36,7 +36,7 @@ public interface ComponentContainerData { * * @return the properties value. */ - ComponentContainerDetails properties(); + CodeContainerProperties properties(); /** * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. @@ -53,25 +53,25 @@ public interface ComponentContainerData { String resourceGroupName(); /** - * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.ComponentContainerDataInner object. + * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.CodeContainerInner object. * * @return the inner object. */ - ComponentContainerDataInner innerModel(); + CodeContainerInner innerModel(); - /** The entirety of the ComponentContainerData definition. */ + /** The entirety of the CodeContainer definition. */ interface Definition extends DefinitionStages.Blank, DefinitionStages.WithParentResource, DefinitionStages.WithProperties, DefinitionStages.WithCreate { } - /** The ComponentContainerData definition stages. */ + /** The CodeContainer definition stages. */ interface DefinitionStages { - /** The first stage of the ComponentContainerData definition. */ + /** The first stage of the CodeContainer definition. */ interface Blank extends WithParentResource { } - /** The stage of the ComponentContainerData definition allowing to specify parent resource. */ + /** The stage of the CodeContainer definition allowing to specify parent resource. */ interface WithParentResource { /** * Specifies resourceGroupName, workspaceName. @@ -82,7 +82,7 @@ interface WithParentResource { */ WithProperties withExistingWorkspace(String resourceGroupName, String workspaceName); } - /** The stage of the ComponentContainerData definition allowing to specify properties. */ + /** The stage of the CodeContainer definition allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -90,11 +90,11 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - WithCreate withProperties(ComponentContainerDetails properties); + WithCreate withProperties(CodeContainerProperties properties); } /** - * The stage of the ComponentContainerData definition which contains all the minimum required properties for the - * resource to be created, but also allows for any other optional properties to be specified. + * The stage of the CodeContainer definition which contains all the minimum required properties for the resource + * to be created, but also allows for any other optional properties to be specified. */ interface WithCreate { /** @@ -102,7 +102,7 @@ interface WithCreate { * * @return the created resource. */ - ComponentContainerData create(); + CodeContainer create(); /** * Executes the create request. @@ -110,24 +110,24 @@ interface WithCreate { * @param context The context to associate with this operation. * @return the created resource. */ - ComponentContainerData create(Context context); + CodeContainer create(Context context); } } /** - * Begins update for the ComponentContainerData resource. + * Begins update for the CodeContainer resource. * * @return the stage of resource update. */ - ComponentContainerData.Update update(); + CodeContainer.Update update(); - /** The template for ComponentContainerData update. */ + /** The template for CodeContainer update. */ interface Update extends UpdateStages.WithProperties { /** * Executes the update request. * * @return the updated resource. */ - ComponentContainerData apply(); + CodeContainer apply(); /** * Executes the update request. @@ -135,11 +135,11 @@ interface Update extends UpdateStages.WithProperties { * @param context The context to associate with this operation. * @return the updated resource. */ - ComponentContainerData apply(Context context); + CodeContainer apply(Context context); } - /** The ComponentContainerData update stages. */ + /** The CodeContainer update stages. */ interface UpdateStages { - /** The stage of the ComponentContainerData update allowing to specify properties. */ + /** The stage of the CodeContainer update allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -147,7 +147,7 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - Update withProperties(ComponentContainerDetails properties); + Update withProperties(CodeContainerProperties properties); } } /** @@ -155,7 +155,7 @@ interface WithProperties { * * @return the refreshed resource. */ - ComponentContainerData refresh(); + CodeContainer refresh(); /** * Refreshes the resource to sync with Azure. @@ -163,5 +163,5 @@ interface WithProperties { * @param context The context to associate with this operation. * @return the refreshed resource. */ - ComponentContainerData refresh(Context context); + CodeContainer refresh(Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainerDetails.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainerProperties.java similarity index 72% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainerDetails.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainerProperties.java index 76f0d72d1f46..1a58656d01d0 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainerDetails.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainerProperties.java @@ -9,31 +9,31 @@ /** Container for code asset versions. */ @Fluent -public final class CodeContainerDetails extends AssetContainer { +public final class CodeContainerProperties extends AssetContainer { /** {@inheritDoc} */ @Override - public CodeContainerDetails withIsArchived(Boolean isArchived) { + public CodeContainerProperties withIsArchived(Boolean isArchived) { super.withIsArchived(isArchived); return this; } /** {@inheritDoc} */ @Override - public CodeContainerDetails withDescription(String description) { + public CodeContainerProperties withDescription(String description) { super.withDescription(description); return this; } /** {@inheritDoc} */ @Override - public CodeContainerDetails withProperties(Map properties) { + public CodeContainerProperties withProperties(Map properties) { super.withProperties(properties); return this; } /** {@inheritDoc} */ @Override - public CodeContainerDetails withTags(Map tags) { + public CodeContainerProperties withTags(Map tags) { super.withTags(tags); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainerResourceArmPaginatedResult.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainerResourceArmPaginatedResult.java index 083dc6e2162d..88c881b434cb 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainerResourceArmPaginatedResult.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainerResourceArmPaginatedResult.java @@ -5,7 +5,7 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.fluent.models.CodeContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.CodeContainerInner; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -23,7 +23,7 @@ public final class CodeContainerResourceArmPaginatedResult { * An array of objects of type CodeContainer. */ @JsonProperty(value = "value") - private List value; + private List value; /** * Get the nextLink property: The link to the next page of CodeContainer objects. If null, there are no additional @@ -52,7 +52,7 @@ public CodeContainerResourceArmPaginatedResult withNextLink(String nextLink) { * * @return the value value. */ - public List value() { + public List value() { return this.value; } @@ -62,7 +62,7 @@ public List value() { * @param value the value value to set. * @return the CodeContainerResourceArmPaginatedResult object itself. */ - public CodeContainerResourceArmPaginatedResult withValue(List value) { + public CodeContainerResourceArmPaginatedResult withValue(List value) { this.value = value; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainers.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainers.java index 28853ffc3b5f..ada2acb29bc3 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainers.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainers.java @@ -20,7 +20,7 @@ public interface CodeContainers { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of CodeContainer entities as paginated response with {@link PagedIterable}. */ - PagedIterable list(String resourceGroupName, String workspaceName); + PagedIterable list(String resourceGroupName, String workspaceName); /** * List containers. @@ -34,7 +34,7 @@ public interface CodeContainers { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of CodeContainer entities as paginated response with {@link PagedIterable}. */ - PagedIterable list(String resourceGroupName, String workspaceName, String skip, Context context); + PagedIterable list(String resourceGroupName, String workspaceName, String skip, Context context); /** * Delete container. @@ -73,7 +73,7 @@ public interface CodeContainers { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container. */ - CodeContainerData get(String resourceGroupName, String workspaceName, String name); + CodeContainer get(String resourceGroupName, String workspaceName, String name); /** * Get container. @@ -87,7 +87,7 @@ public interface CodeContainers { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container along with {@link Response}. */ - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context); /** @@ -99,7 +99,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container along with {@link Response}. */ - CodeContainerData getById(String id); + CodeContainer getById(String id); /** * Get container. @@ -111,7 +111,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container along with {@link Response}. */ - Response getByIdWithResponse(String id, Context context); + Response getByIdWithResponse(String id, Context context); /** * Delete container. @@ -136,10 +136,10 @@ Response getWithResponse( Response deleteByIdWithResponse(String id, Context context); /** - * Begins definition for a new CodeContainerData resource. + * Begins definition for a new CodeContainer resource. * * @param name resource name. - * @return the first stage of the new CodeContainerData definition. + * @return the first stage of the new CodeContainer definition. */ - CodeContainerData.DefinitionStages.Blank define(String name); + CodeContainer.DefinitionStages.Blank define(String name); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersionData.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersion.java similarity index 73% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersionData.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersion.java index b58a35225546..74b92c620c7c 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersionData.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersion.java @@ -6,10 +6,10 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.CodeVersionDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.CodeVersionInner; -/** An immutable client-side representation of CodeVersionData. */ -public interface CodeVersionData { +/** An immutable client-side representation of CodeVersion. */ +public interface CodeVersion { /** * Gets the id property: Fully qualified resource Id for the resource. * @@ -36,7 +36,7 @@ public interface CodeVersionData { * * @return the properties value. */ - CodeVersionDetails properties(); + CodeVersionProperties properties(); /** * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. @@ -53,25 +53,25 @@ public interface CodeVersionData { String resourceGroupName(); /** - * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.CodeVersionDataInner object. + * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.CodeVersionInner object. * * @return the inner object. */ - CodeVersionDataInner innerModel(); + CodeVersionInner innerModel(); - /** The entirety of the CodeVersionData definition. */ + /** The entirety of the CodeVersion definition. */ interface Definition extends DefinitionStages.Blank, DefinitionStages.WithParentResource, DefinitionStages.WithProperties, DefinitionStages.WithCreate { } - /** The CodeVersionData definition stages. */ + /** The CodeVersion definition stages. */ interface DefinitionStages { - /** The first stage of the CodeVersionData definition. */ + /** The first stage of the CodeVersion definition. */ interface Blank extends WithParentResource { } - /** The stage of the CodeVersionData definition allowing to specify parent resource. */ + /** The stage of the CodeVersion definition allowing to specify parent resource. */ interface WithParentResource { /** * Specifies resourceGroupName, workspaceName, name. @@ -83,7 +83,7 @@ interface WithParentResource { */ WithProperties withExistingCode(String resourceGroupName, String workspaceName, String name); } - /** The stage of the CodeVersionData definition allowing to specify properties. */ + /** The stage of the CodeVersion definition allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -91,11 +91,11 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - WithCreate withProperties(CodeVersionDetails properties); + WithCreate withProperties(CodeVersionProperties properties); } /** - * The stage of the CodeVersionData definition which contains all the minimum required properties for the - * resource to be created, but also allows for any other optional properties to be specified. + * The stage of the CodeVersion definition which contains all the minimum required properties for the resource + * to be created, but also allows for any other optional properties to be specified. */ interface WithCreate { /** @@ -103,7 +103,7 @@ interface WithCreate { * * @return the created resource. */ - CodeVersionData create(); + CodeVersion create(); /** * Executes the create request. @@ -111,24 +111,24 @@ interface WithCreate { * @param context The context to associate with this operation. * @return the created resource. */ - CodeVersionData create(Context context); + CodeVersion create(Context context); } } /** - * Begins update for the CodeVersionData resource. + * Begins update for the CodeVersion resource. * * @return the stage of resource update. */ - CodeVersionData.Update update(); + CodeVersion.Update update(); - /** The template for CodeVersionData update. */ + /** The template for CodeVersion update. */ interface Update extends UpdateStages.WithProperties { /** * Executes the update request. * * @return the updated resource. */ - CodeVersionData apply(); + CodeVersion apply(); /** * Executes the update request. @@ -136,11 +136,11 @@ interface Update extends UpdateStages.WithProperties { * @param context The context to associate with this operation. * @return the updated resource. */ - CodeVersionData apply(Context context); + CodeVersion apply(Context context); } - /** The CodeVersionData update stages. */ + /** The CodeVersion update stages. */ interface UpdateStages { - /** The stage of the CodeVersionData update allowing to specify properties. */ + /** The stage of the CodeVersion update allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -148,7 +148,7 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - Update withProperties(CodeVersionDetails properties); + Update withProperties(CodeVersionProperties properties); } } /** @@ -156,7 +156,7 @@ interface WithProperties { * * @return the refreshed resource. */ - CodeVersionData refresh(); + CodeVersion refresh(); /** * Refreshes the resource to sync with Azure. @@ -164,5 +164,5 @@ interface WithProperties { * @param context The context to associate with this operation. * @return the refreshed resource. */ - CodeVersionData refresh(Context context); + CodeVersion refresh(Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersionDetails.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersionProperties.java similarity index 74% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersionDetails.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersionProperties.java index fe0770db7dee..e6398fd6244e 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersionDetails.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersionProperties.java @@ -10,7 +10,7 @@ /** Code asset version details. */ @Fluent -public final class CodeVersionDetails extends AssetBase { +public final class CodeVersionProperties extends AssetBase { /* * Uri where code is located */ @@ -30,44 +30,44 @@ public String codeUri() { * Set the codeUri property: Uri where code is located. * * @param codeUri the codeUri value to set. - * @return the CodeVersionDetails object itself. + * @return the CodeVersionProperties object itself. */ - public CodeVersionDetails withCodeUri(String codeUri) { + public CodeVersionProperties withCodeUri(String codeUri) { this.codeUri = codeUri; return this; } /** {@inheritDoc} */ @Override - public CodeVersionDetails withIsAnonymous(Boolean isAnonymous) { + public CodeVersionProperties withIsAnonymous(Boolean isAnonymous) { super.withIsAnonymous(isAnonymous); return this; } /** {@inheritDoc} */ @Override - public CodeVersionDetails withIsArchived(Boolean isArchived) { + public CodeVersionProperties withIsArchived(Boolean isArchived) { super.withIsArchived(isArchived); return this; } /** {@inheritDoc} */ @Override - public CodeVersionDetails withDescription(String description) { + public CodeVersionProperties withDescription(String description) { super.withDescription(description); return this; } /** {@inheritDoc} */ @Override - public CodeVersionDetails withProperties(Map properties) { + public CodeVersionProperties withProperties(Map properties) { super.withProperties(properties); return this; } /** {@inheritDoc} */ @Override - public CodeVersionDetails withTags(Map tags) { + public CodeVersionProperties withTags(Map tags) { super.withTags(tags); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersionResourceArmPaginatedResult.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersionResourceArmPaginatedResult.java index 9b0d2f605dd2..0979dc2972d7 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersionResourceArmPaginatedResult.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersionResourceArmPaginatedResult.java @@ -5,7 +5,7 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.fluent.models.CodeVersionDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.CodeVersionInner; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -23,7 +23,7 @@ public final class CodeVersionResourceArmPaginatedResult { * An array of objects of type CodeVersion. */ @JsonProperty(value = "value") - private List value; + private List value; /** * Get the nextLink property: The link to the next page of CodeVersion objects. If null, there are no additional @@ -52,7 +52,7 @@ public CodeVersionResourceArmPaginatedResult withNextLink(String nextLink) { * * @return the value value. */ - public List value() { + public List value() { return this.value; } @@ -62,7 +62,7 @@ public List value() { * @param value the value value to set. * @return the CodeVersionResourceArmPaginatedResult object itself. */ - public CodeVersionResourceArmPaginatedResult withValue(List value) { + public CodeVersionResourceArmPaginatedResult withValue(List value) { this.value = value; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersions.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersions.java index 355560505801..834a2419f111 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersions.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeVersions.java @@ -21,7 +21,7 @@ public interface CodeVersions { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of CodeVersion entities as paginated response with {@link PagedIterable}. */ - PagedIterable list(String resourceGroupName, String workspaceName, String name); + PagedIterable list(String resourceGroupName, String workspaceName, String name); /** * List versions. @@ -38,7 +38,7 @@ public interface CodeVersions { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of CodeVersion entities as paginated response with {@link PagedIterable}. */ - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -88,7 +88,7 @@ Response deleteWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version. */ - CodeVersionData get(String resourceGroupName, String workspaceName, String name, String version); + CodeVersion get(String resourceGroupName, String workspaceName, String name, String version); /** * Get version. @@ -103,7 +103,7 @@ Response deleteWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version along with {@link Response}. */ - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context); /** @@ -115,7 +115,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version along with {@link Response}. */ - CodeVersionData getById(String id); + CodeVersion getById(String id); /** * Get version. @@ -127,7 +127,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version along with {@link Response}. */ - Response getByIdWithResponse(String id, Context context); + Response getByIdWithResponse(String id, Context context); /** * Delete version. @@ -152,10 +152,10 @@ Response getWithResponse( Response deleteByIdWithResponse(String id, Context context); /** - * Begins definition for a new CodeVersionData resource. + * Begins definition for a new CodeVersion resource. * * @param name resource name. - * @return the first stage of the new CodeVersionData definition. + * @return the first stage of the new CodeVersion definition. */ - CodeVersionData.DefinitionStages.Blank define(String name); + CodeVersion.DefinitionStages.Blank define(String name); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ColumnTransformer.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ColumnTransformer.java deleted file mode 100644 index 510e41ac10ba..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ColumnTransformer.java +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - -/** Column transformer parameters. */ -@Fluent -public final class ColumnTransformer { - /* - * Fields to apply transformer logic on. - */ - @JsonProperty(value = "fields") - private List fields; - - /* - * Different properties to be passed to transformer. - * Input expected is dictionary of key,value pairs in JSON format. - */ - @JsonProperty(value = "parameters") - private Object parameters; - - /** - * Get the fields property: Fields to apply transformer logic on. - * - * @return the fields value. - */ - public List fields() { - return this.fields; - } - - /** - * Set the fields property: Fields to apply transformer logic on. - * - * @param fields the fields value to set. - * @return the ColumnTransformer object itself. - */ - public ColumnTransformer withFields(List fields) { - this.fields = fields; - return this; - } - - /** - * Get the parameters property: Different properties to be passed to transformer. Input expected is dictionary of - * key,value pairs in JSON format. - * - * @return the parameters value. - */ - public Object parameters() { - return this.parameters; - } - - /** - * Set the parameters property: Different properties to be passed to transformer. Input expected is dictionary of - * key,value pairs in JSON format. - * - * @param parameters the parameters value to set. - * @return the ColumnTransformer object itself. - */ - public ColumnTransformer withParameters(Object parameters) { - this.parameters = parameters; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CommandJob.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CommandJob.java index 5c42daaa81e7..1bed5fbbb99d 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CommandJob.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CommandJob.java @@ -16,7 +16,7 @@ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "jobType") @JsonTypeName("Command") @Fluent -public final class CommandJob extends JobBaseDetails { +public final class CommandJob extends JobBaseProperties { /* * ARM resource ID of the code asset. */ @@ -309,13 +309,6 @@ public CommandJob withIsArchived(Boolean isArchived) { return this; } - /** {@inheritDoc} */ - @Override - public CommandJob withSchedule(ScheduleBase schedule) { - super.withSchedule(schedule); - return this; - } - /** {@inheritDoc} */ @Override public CommandJob withServices(Map services) { diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainerData.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainer.java similarity index 75% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainerData.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainer.java index abc45b75dc2c..2db458e03fb1 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainerData.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainer.java @@ -6,10 +6,10 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.ModelContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.ComponentContainerInner; -/** An immutable client-side representation of ModelContainerData. */ -public interface ModelContainerData { +/** An immutable client-side representation of ComponentContainer. */ +public interface ComponentContainer { /** * Gets the id property: Fully qualified resource Id for the resource. * @@ -36,7 +36,7 @@ public interface ModelContainerData { * * @return the properties value. */ - ModelContainerDetails properties(); + ComponentContainerProperties properties(); /** * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. @@ -53,25 +53,25 @@ public interface ModelContainerData { String resourceGroupName(); /** - * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.ModelContainerDataInner object. + * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.ComponentContainerInner object. * * @return the inner object. */ - ModelContainerDataInner innerModel(); + ComponentContainerInner innerModel(); - /** The entirety of the ModelContainerData definition. */ + /** The entirety of the ComponentContainer definition. */ interface Definition extends DefinitionStages.Blank, DefinitionStages.WithParentResource, DefinitionStages.WithProperties, DefinitionStages.WithCreate { } - /** The ModelContainerData definition stages. */ + /** The ComponentContainer definition stages. */ interface DefinitionStages { - /** The first stage of the ModelContainerData definition. */ + /** The first stage of the ComponentContainer definition. */ interface Blank extends WithParentResource { } - /** The stage of the ModelContainerData definition allowing to specify parent resource. */ + /** The stage of the ComponentContainer definition allowing to specify parent resource. */ interface WithParentResource { /** * Specifies resourceGroupName, workspaceName. @@ -82,7 +82,7 @@ interface WithParentResource { */ WithProperties withExistingWorkspace(String resourceGroupName, String workspaceName); } - /** The stage of the ModelContainerData definition allowing to specify properties. */ + /** The stage of the ComponentContainer definition allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -90,10 +90,10 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - WithCreate withProperties(ModelContainerDetails properties); + WithCreate withProperties(ComponentContainerProperties properties); } /** - * The stage of the ModelContainerData definition which contains all the minimum required properties for the + * The stage of the ComponentContainer definition which contains all the minimum required properties for the * resource to be created, but also allows for any other optional properties to be specified. */ interface WithCreate { @@ -102,7 +102,7 @@ interface WithCreate { * * @return the created resource. */ - ModelContainerData create(); + ComponentContainer create(); /** * Executes the create request. @@ -110,24 +110,24 @@ interface WithCreate { * @param context The context to associate with this operation. * @return the created resource. */ - ModelContainerData create(Context context); + ComponentContainer create(Context context); } } /** - * Begins update for the ModelContainerData resource. + * Begins update for the ComponentContainer resource. * * @return the stage of resource update. */ - ModelContainerData.Update update(); + ComponentContainer.Update update(); - /** The template for ModelContainerData update. */ + /** The template for ComponentContainer update. */ interface Update extends UpdateStages.WithProperties { /** * Executes the update request. * * @return the updated resource. */ - ModelContainerData apply(); + ComponentContainer apply(); /** * Executes the update request. @@ -135,11 +135,11 @@ interface Update extends UpdateStages.WithProperties { * @param context The context to associate with this operation. * @return the updated resource. */ - ModelContainerData apply(Context context); + ComponentContainer apply(Context context); } - /** The ModelContainerData update stages. */ + /** The ComponentContainer update stages. */ interface UpdateStages { - /** The stage of the ModelContainerData update allowing to specify properties. */ + /** The stage of the ComponentContainer update allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -147,7 +147,7 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - Update withProperties(ModelContainerDetails properties); + Update withProperties(ComponentContainerProperties properties); } } /** @@ -155,7 +155,7 @@ interface WithProperties { * * @return the refreshed resource. */ - ModelContainerData refresh(); + ComponentContainer refresh(); /** * Refreshes the resource to sync with Azure. @@ -163,5 +163,5 @@ interface WithProperties { * @param context The context to associate with this operation. * @return the refreshed resource. */ - ModelContainerData refresh(Context context); + ComponentContainer refresh(Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainerDetails.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainerProperties.java similarity index 73% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainerDetails.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainerProperties.java index 194613dc4553..c1c169d3a894 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainerDetails.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainerProperties.java @@ -12,31 +12,31 @@ * href="https://docs.microsoft.com/en-us/azure/machine-learning/reference-yaml-component-command" />. */ @Fluent -public final class ComponentContainerDetails extends AssetContainer { +public final class ComponentContainerProperties extends AssetContainer { /** {@inheritDoc} */ @Override - public ComponentContainerDetails withIsArchived(Boolean isArchived) { + public ComponentContainerProperties withIsArchived(Boolean isArchived) { super.withIsArchived(isArchived); return this; } /** {@inheritDoc} */ @Override - public ComponentContainerDetails withDescription(String description) { + public ComponentContainerProperties withDescription(String description) { super.withDescription(description); return this; } /** {@inheritDoc} */ @Override - public ComponentContainerDetails withProperties(Map properties) { + public ComponentContainerProperties withProperties(Map properties) { super.withProperties(properties); return this; } /** {@inheritDoc} */ @Override - public ComponentContainerDetails withTags(Map tags) { + public ComponentContainerProperties withTags(Map tags) { super.withTags(tags); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainerResourceArmPaginatedResult.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainerResourceArmPaginatedResult.java index 728f0888c6d4..8714454248f3 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainerResourceArmPaginatedResult.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainerResourceArmPaginatedResult.java @@ -5,7 +5,7 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.fluent.models.ComponentContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.ComponentContainerInner; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -23,7 +23,7 @@ public final class ComponentContainerResourceArmPaginatedResult { * An array of objects of type ComponentContainer. */ @JsonProperty(value = "value") - private List value; + private List value; /** * Get the nextLink property: The link to the next page of ComponentContainer objects. If null, there are no @@ -52,7 +52,7 @@ public ComponentContainerResourceArmPaginatedResult withNextLink(String nextLink * * @return the value value. */ - public List value() { + public List value() { return this.value; } @@ -62,7 +62,7 @@ public List value() { * @param value the value value to set. * @return the ComponentContainerResourceArmPaginatedResult object itself. */ - public ComponentContainerResourceArmPaginatedResult withValue(List value) { + public ComponentContainerResourceArmPaginatedResult withValue(List value) { this.value = value; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainers.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainers.java index a282817936b5..83d4d1468bc3 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainers.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentContainers.java @@ -20,7 +20,7 @@ public interface ComponentContainers { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of ComponentContainer entities as paginated response with {@link PagedIterable}. */ - PagedIterable list(String resourceGroupName, String workspaceName); + PagedIterable list(String resourceGroupName, String workspaceName); /** * List component containers. @@ -35,7 +35,7 @@ public interface ComponentContainers { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of ComponentContainer entities as paginated response with {@link PagedIterable}. */ - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType, Context context); /** @@ -75,7 +75,7 @@ PagedIterable list( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container. */ - ComponentContainerData get(String resourceGroupName, String workspaceName, String name); + ComponentContainer get(String resourceGroupName, String workspaceName, String name); /** * Get container. @@ -89,7 +89,7 @@ PagedIterable list( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container along with {@link Response}. */ - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context); /** @@ -101,7 +101,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container along with {@link Response}. */ - ComponentContainerData getById(String id); + ComponentContainer getById(String id); /** * Get container. @@ -113,7 +113,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container along with {@link Response}. */ - Response getByIdWithResponse(String id, Context context); + Response getByIdWithResponse(String id, Context context); /** * Delete container. @@ -138,10 +138,10 @@ Response getWithResponse( Response deleteByIdWithResponse(String id, Context context); /** - * Begins definition for a new ComponentContainerData resource. + * Begins definition for a new ComponentContainer resource. * * @param name resource name. - * @return the first stage of the new ComponentContainerData definition. + * @return the first stage of the new ComponentContainer definition. */ - ComponentContainerData.DefinitionStages.Blank define(String name); + ComponentContainer.DefinitionStages.Blank define(String name); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersionData.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersion.java similarity index 73% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersionData.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersion.java index f10b5ef1c021..3b45a1f1eb5e 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersionData.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersion.java @@ -6,10 +6,10 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.ComponentVersionDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.ComponentVersionInner; -/** An immutable client-side representation of ComponentVersionData. */ -public interface ComponentVersionData { +/** An immutable client-side representation of ComponentVersion. */ +public interface ComponentVersion { /** * Gets the id property: Fully qualified resource Id for the resource. * @@ -36,7 +36,7 @@ public interface ComponentVersionData { * * @return the properties value. */ - ComponentVersionDetails properties(); + ComponentVersionProperties properties(); /** * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. @@ -53,25 +53,25 @@ public interface ComponentVersionData { String resourceGroupName(); /** - * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.ComponentVersionDataInner object. + * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.ComponentVersionInner object. * * @return the inner object. */ - ComponentVersionDataInner innerModel(); + ComponentVersionInner innerModel(); - /** The entirety of the ComponentVersionData definition. */ + /** The entirety of the ComponentVersion definition. */ interface Definition extends DefinitionStages.Blank, DefinitionStages.WithParentResource, DefinitionStages.WithProperties, DefinitionStages.WithCreate { } - /** The ComponentVersionData definition stages. */ + /** The ComponentVersion definition stages. */ interface DefinitionStages { - /** The first stage of the ComponentVersionData definition. */ + /** The first stage of the ComponentVersion definition. */ interface Blank extends WithParentResource { } - /** The stage of the ComponentVersionData definition allowing to specify parent resource. */ + /** The stage of the ComponentVersion definition allowing to specify parent resource. */ interface WithParentResource { /** * Specifies resourceGroupName, workspaceName, name. @@ -83,7 +83,7 @@ interface WithParentResource { */ WithProperties withExistingComponent(String resourceGroupName, String workspaceName, String name); } - /** The stage of the ComponentVersionData definition allowing to specify properties. */ + /** The stage of the ComponentVersion definition allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -91,10 +91,10 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - WithCreate withProperties(ComponentVersionDetails properties); + WithCreate withProperties(ComponentVersionProperties properties); } /** - * The stage of the ComponentVersionData definition which contains all the minimum required properties for the + * The stage of the ComponentVersion definition which contains all the minimum required properties for the * resource to be created, but also allows for any other optional properties to be specified. */ interface WithCreate { @@ -103,7 +103,7 @@ interface WithCreate { * * @return the created resource. */ - ComponentVersionData create(); + ComponentVersion create(); /** * Executes the create request. @@ -111,24 +111,24 @@ interface WithCreate { * @param context The context to associate with this operation. * @return the created resource. */ - ComponentVersionData create(Context context); + ComponentVersion create(Context context); } } /** - * Begins update for the ComponentVersionData resource. + * Begins update for the ComponentVersion resource. * * @return the stage of resource update. */ - ComponentVersionData.Update update(); + ComponentVersion.Update update(); - /** The template for ComponentVersionData update. */ + /** The template for ComponentVersion update. */ interface Update extends UpdateStages.WithProperties { /** * Executes the update request. * * @return the updated resource. */ - ComponentVersionData apply(); + ComponentVersion apply(); /** * Executes the update request. @@ -136,11 +136,11 @@ interface Update extends UpdateStages.WithProperties { * @param context The context to associate with this operation. * @return the updated resource. */ - ComponentVersionData apply(Context context); + ComponentVersion apply(Context context); } - /** The ComponentVersionData update stages. */ + /** The ComponentVersion update stages. */ interface UpdateStages { - /** The stage of the ComponentVersionData update allowing to specify properties. */ + /** The stage of the ComponentVersion update allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -148,7 +148,7 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - Update withProperties(ComponentVersionDetails properties); + Update withProperties(ComponentVersionProperties properties); } } /** @@ -156,7 +156,7 @@ interface WithProperties { * * @return the refreshed resource. */ - ComponentVersionData refresh(); + ComponentVersion refresh(); /** * Refreshes the resource to sync with Azure. @@ -164,5 +164,5 @@ interface WithProperties { * @param context The context to associate with this operation. * @return the refreshed resource. */ - ComponentVersionData refresh(Context context); + ComponentVersion refresh(Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersionDetails.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersionProperties.java similarity index 78% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersionDetails.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersionProperties.java index 83c949438018..498560c17afc 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersionDetails.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersionProperties.java @@ -10,7 +10,7 @@ /** Definition of a component version: defines resources that span component types. */ @Fluent -public final class ComponentVersionDetails extends AssetBase { +public final class ComponentVersionProperties extends AssetBase { /* * Defines Component definition details. * properties) { + public ComponentVersionProperties withProperties(Map properties) { super.withProperties(properties); return this; } /** {@inheritDoc} */ @Override - public ComponentVersionDetails withTags(Map tags) { + public ComponentVersionProperties withTags(Map tags) { super.withTags(tags); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersionResourceArmPaginatedResult.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersionResourceArmPaginatedResult.java index 58cc3eb90ab4..1a4c97d1a89b 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersionResourceArmPaginatedResult.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersionResourceArmPaginatedResult.java @@ -5,7 +5,7 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.fluent.models.ComponentVersionDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.ComponentVersionInner; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -23,7 +23,7 @@ public final class ComponentVersionResourceArmPaginatedResult { * An array of objects of type ComponentVersion. */ @JsonProperty(value = "value") - private List value; + private List value; /** * Get the nextLink property: The link to the next page of ComponentVersion objects. If null, there are no @@ -52,7 +52,7 @@ public ComponentVersionResourceArmPaginatedResult withNextLink(String nextLink) * * @return the value value. */ - public List value() { + public List value() { return this.value; } @@ -62,7 +62,7 @@ public List value() { * @param value the value value to set. * @return the ComponentVersionResourceArmPaginatedResult object itself. */ - public ComponentVersionResourceArmPaginatedResult withValue(List value) { + public ComponentVersionResourceArmPaginatedResult withValue(List value) { this.value = value; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersions.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersions.java index 0778a179a33b..0af9347ab9a2 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersions.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComponentVersions.java @@ -21,7 +21,7 @@ public interface ComponentVersions { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of ComponentVersion entities as paginated response with {@link PagedIterable}. */ - PagedIterable list(String resourceGroupName, String workspaceName, String name); + PagedIterable list(String resourceGroupName, String workspaceName, String name); /** * List component versions. @@ -39,7 +39,7 @@ public interface ComponentVersions { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of ComponentVersion entities as paginated response with {@link PagedIterable}. */ - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -90,7 +90,7 @@ Response deleteWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version. */ - ComponentVersionData get(String resourceGroupName, String workspaceName, String name, String version); + ComponentVersion get(String resourceGroupName, String workspaceName, String name, String version); /** * Get version. @@ -105,7 +105,7 @@ Response deleteWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version along with {@link Response}. */ - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context); /** @@ -117,7 +117,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version along with {@link Response}. */ - ComponentVersionData getById(String id); + ComponentVersion getById(String id); /** * Get version. @@ -129,7 +129,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version along with {@link Response}. */ - Response getByIdWithResponse(String id, Context context); + Response getByIdWithResponse(String id, Context context); /** * Delete version. @@ -154,10 +154,10 @@ Response getWithResponse( Response deleteByIdWithResponse(String id, Context context); /** - * Begins definition for a new ComponentVersionData resource. + * Begins definition for a new ComponentVersion resource. * * @param name resource name. - * @return the first stage of the new ComponentVersionData definition. + * @return the first stage of the new ComponentVersion definition. */ - ComponentVersionData.DefinitionStages.Blank define(String name); + ComponentVersion.DefinitionStages.Blank define(String name); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComputeStartStopSchedule.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComputeStartStopSchedule.java index a0e3d4b8ecec..be411c7f6159 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComputeStartStopSchedule.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComputeStartStopSchedule.java @@ -29,7 +29,7 @@ public final class ComputeStartStopSchedule { private ComputePowerAction action; /* - * Base definition of a schedule + * The schedule property. */ @JsonProperty(value = "schedule") private ScheduleBase schedule; @@ -73,7 +73,7 @@ public ComputeStartStopSchedule withAction(ComputePowerAction action) { } /** - * Get the schedule property: Base definition of a schedule. + * Get the schedule property: The schedule property. * * @return the schedule value. */ @@ -82,7 +82,7 @@ public ScheduleBase schedule() { } /** - * Set the schedule property: Base definition of a schedule. + * Set the schedule property: The schedule property. * * @param schedule the schedule value to set. * @return the ComputeStartStopSchedule object itself. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ConnectionAuthType.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ConnectionAuthType.java new file mode 100644 index 000000000000..7046508ae068 --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ConnectionAuthType.java @@ -0,0 +1,47 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.models; + +import com.azure.core.util.ExpandableStringEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.util.Collection; + +/** Defines values for ConnectionAuthType. */ +public final class ConnectionAuthType extends ExpandableStringEnum { + /** Static value PAT for ConnectionAuthType. */ + public static final ConnectionAuthType PAT = fromString("PAT"); + + /** Static value ManagedIdentity for ConnectionAuthType. */ + public static final ConnectionAuthType MANAGED_IDENTITY = fromString("ManagedIdentity"); + + /** Static value UsernamePassword for ConnectionAuthType. */ + public static final ConnectionAuthType USERNAME_PASSWORD = fromString("UsernamePassword"); + + /** Static value None for ConnectionAuthType. */ + public static final ConnectionAuthType NONE = fromString("None"); + + /** Static value SAS for ConnectionAuthType. */ + public static final ConnectionAuthType SAS = fromString("SAS"); + + /** + * Creates or finds a ConnectionAuthType from its string representation. + * + * @param name a name to look for. + * @return the corresponding ConnectionAuthType. + */ + @JsonCreator + public static ConnectionAuthType fromString(String name) { + return fromString(name, ConnectionAuthType.class); + } + + /** + * Gets known ConnectionAuthType values. + * + * @return known ConnectionAuthType values. + */ + public static Collection values() { + return values(ConnectionAuthType.class); + } +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ConnectionCategory.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ConnectionCategory.java new file mode 100644 index 000000000000..70ad58062a09 --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ConnectionCategory.java @@ -0,0 +1,41 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.models; + +import com.azure.core.util.ExpandableStringEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.util.Collection; + +/** Defines values for ConnectionCategory. */ +public final class ConnectionCategory extends ExpandableStringEnum { + /** Static value PythonFeed for ConnectionCategory. */ + public static final ConnectionCategory PYTHON_FEED = fromString("PythonFeed"); + + /** Static value ContainerRegistry for ConnectionCategory. */ + public static final ConnectionCategory CONTAINER_REGISTRY = fromString("ContainerRegistry"); + + /** Static value Git for ConnectionCategory. */ + public static final ConnectionCategory GIT = fromString("Git"); + + /** + * Creates or finds a ConnectionCategory from its string representation. + * + * @param name a name to look for. + * @return the corresponding ConnectionCategory. + */ + @JsonCreator + public static ConnectionCategory fromString(String name) { + return fromString(name, ConnectionCategory.class); + } + + /** + * Gets known ConnectionCategory values. + * + * @return known ConnectionCategory values. + */ + public static Collection values() { + return values(ConnectionCategory.class); + } +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CredentialsType.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CredentialsType.java index ce6c8889b3fd..0a9e311519cd 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CredentialsType.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CredentialsType.java @@ -25,12 +25,6 @@ public final class CredentialsType extends ExpandableStringEnum /** Static value ServicePrincipal for CredentialsType. */ public static final CredentialsType SERVICE_PRINCIPAL = fromString("ServicePrincipal"); - /** Static value KerberosKeytab for CredentialsType. */ - public static final CredentialsType KERBEROS_KEYTAB = fromString("KerberosKeytab"); - - /** Static value KerberosPassword for CredentialsType. */ - public static final CredentialsType KERBEROS_PASSWORD = fromString("KerberosPassword"); - /** * Creates or finds a CredentialsType from its string representation. * diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CronSchedule.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CronSchedule.java deleted file mode 100644 index 71922cf32584..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CronSchedule.java +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.time.OffsetDateTime; - -/** Cron schedule definition. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "scheduleType") -@JsonTypeName("Cron") -@Fluent -public final class CronSchedule extends ScheduleBase { - /* - * [Required] Specifies cron expression of schedule. - * The expression should follow NCronTab format. - */ - @JsonProperty(value = "expression", required = true) - private String expression; - - /** - * Get the expression property: [Required] Specifies cron expression of schedule. The expression should follow - * NCronTab format. - * - * @return the expression value. - */ - public String expression() { - return this.expression; - } - - /** - * Set the expression property: [Required] Specifies cron expression of schedule. The expression should follow - * NCronTab format. - * - * @param expression the expression value to set. - * @return the CronSchedule object itself. - */ - public CronSchedule withExpression(String expression) { - this.expression = expression; - return this; - } - - /** {@inheritDoc} */ - @Override - public CronSchedule withEndTime(OffsetDateTime endTime) { - super.withEndTime(endTime); - return this; - } - - /** {@inheritDoc} */ - @Override - public CronSchedule withScheduleStatus(ScheduleStatus scheduleStatus) { - super.withScheduleStatus(scheduleStatus); - return this; - } - - /** {@inheritDoc} */ - @Override - public CronSchedule withStartTime(OffsetDateTime startTime) { - super.withStartTime(startTime); - return this; - } - - /** {@inheritDoc} */ - @Override - public CronSchedule withTimeZone(String timeZone) { - super.withTimeZone(timeZone); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (expression() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException("Missing required property expression in model CronSchedule")); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(CronSchedule.class); -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomForecastHorizon.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomForecastHorizon.java deleted file mode 100644 index 9ce0dc4eed47..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomForecastHorizon.java +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** The desired maximum forecast horizon in units of time-series frequency. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "mode") -@JsonTypeName("Custom") -@Fluent -public final class CustomForecastHorizon extends ForecastHorizon { - /* - * [Required] Forecast horizon value. - */ - @JsonProperty(value = "value", required = true) - private int value; - - /** - * Get the value property: [Required] Forecast horizon value. - * - * @return the value value. - */ - public int value() { - return this.value; - } - - /** - * Set the value property: [Required] Forecast horizon value. - * - * @param value the value value to set. - * @return the CustomForecastHorizon object itself. - */ - public CustomForecastHorizon withValue(int value) { - this.value = value; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomModelJobInput.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomModelJobInput.java index d943e4959724..cd4802d8d858 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomModelJobInput.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomModelJobInput.java @@ -5,72 +5,52 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; /** The CustomModelJobInput model. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "jobInputType") -@JsonTypeName("CustomModel") +@JsonTypeName("custom_model") @Fluent -public final class CustomModelJobInput extends JobInput { +public final class CustomModelJobInput extends AssetJobInput { /* - * Input Asset Delivery Mode. + * Description for the input. */ - @JsonProperty(value = "mode") - private InputDeliveryMode mode; - - /* - * [Required] Input Asset URI. - */ - @JsonProperty(value = "uri", required = true) - private String uri; + @JsonProperty(value = "description") + private String description; /** - * Get the mode property: Input Asset Delivery Mode. + * Get the description property: Description for the input. * - * @return the mode value. + * @return the description value. */ - public InputDeliveryMode mode() { - return this.mode; + public String description() { + return this.description; } /** - * Set the mode property: Input Asset Delivery Mode. + * Set the description property: Description for the input. * - * @param mode the mode value to set. + * @param description the description value to set. * @return the CustomModelJobInput object itself. */ - public CustomModelJobInput withMode(InputDeliveryMode mode) { - this.mode = mode; + public CustomModelJobInput withDescription(String description) { + this.description = description; return this; } - /** - * Get the uri property: [Required] Input Asset URI. - * - * @return the uri value. - */ - public String uri() { - return this.uri; - } - - /** - * Set the uri property: [Required] Input Asset URI. - * - * @param uri the uri value to set. - * @return the CustomModelJobInput object itself. - */ - public CustomModelJobInput withUri(String uri) { - this.uri = uri; + /** {@inheritDoc} */ + @Override + public CustomModelJobInput withMode(InputDeliveryMode mode) { + super.withMode(mode); return this; } /** {@inheritDoc} */ @Override - public CustomModelJobInput withDescription(String description) { - super.withDescription(description); + public CustomModelJobInput withUri(String uri) { + super.withUri(uri); return this; } @@ -82,12 +62,5 @@ public CustomModelJobInput withDescription(String description) { @Override public void validate() { super.validate(); - if (uri() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException("Missing required property uri in model CustomModelJobInput")); - } } - - private static final ClientLogger LOGGER = new ClientLogger(CustomModelJobInput.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomModelJobOutput.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomModelJobOutput.java index 5e595b21bd15..99f3c6153071 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomModelJobOutput.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomModelJobOutput.java @@ -11,65 +11,46 @@ /** The CustomModelJobOutput model. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "jobOutputType") -@JsonTypeName("CustomModel") +@JsonTypeName("custom_model") @Fluent -public final class CustomModelJobOutput extends JobOutput { +public final class CustomModelJobOutput extends AssetJobOutput { /* - * Output Asset Delivery Mode. + * Description for the output. */ - @JsonProperty(value = "mode") - private OutputDeliveryMode mode; - - /* - * Output Asset URI. - */ - @JsonProperty(value = "uri") - private String uri; + @JsonProperty(value = "description") + private String description; /** - * Get the mode property: Output Asset Delivery Mode. + * Get the description property: Description for the output. * - * @return the mode value. + * @return the description value. */ - public OutputDeliveryMode mode() { - return this.mode; + public String description() { + return this.description; } /** - * Set the mode property: Output Asset Delivery Mode. + * Set the description property: Description for the output. * - * @param mode the mode value to set. + * @param description the description value to set. * @return the CustomModelJobOutput object itself. */ - public CustomModelJobOutput withMode(OutputDeliveryMode mode) { - this.mode = mode; + public CustomModelJobOutput withDescription(String description) { + this.description = description; return this; } - /** - * Get the uri property: Output Asset URI. - * - * @return the uri value. - */ - public String uri() { - return this.uri; - } - - /** - * Set the uri property: Output Asset URI. - * - * @param uri the uri value to set. - * @return the CustomModelJobOutput object itself. - */ - public CustomModelJobOutput withUri(String uri) { - this.uri = uri; + /** {@inheritDoc} */ + @Override + public CustomModelJobOutput withMode(OutputDeliveryMode mode) { + super.withMode(mode); return this; } /** {@inheritDoc} */ @Override - public CustomModelJobOutput withDescription(String description) { - super.withDescription(description); + public CustomModelJobOutput withUri(String uri) { + super.withUri(uri); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomNCrossValidations.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomNCrossValidations.java deleted file mode 100644 index 047df7e240d0..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomNCrossValidations.java +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** N-Cross validations are specified by user. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "mode") -@JsonTypeName("Custom") -@Fluent -public final class CustomNCrossValidations extends NCrossValidations { - /* - * [Required] N-Cross validations value. - */ - @JsonProperty(value = "value", required = true) - private int value; - - /** - * Get the value property: [Required] N-Cross validations value. - * - * @return the value value. - */ - public int value() { - return this.value; - } - - /** - * Set the value property: [Required] N-Cross validations value. - * - * @param value the value value to set. - * @return the CustomNCrossValidations object itself. - */ - public CustomNCrossValidations withValue(int value) { - this.value = value; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomSeasonality.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomSeasonality.java deleted file mode 100644 index 821cad528057..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomSeasonality.java +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** The CustomSeasonality model. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "mode") -@JsonTypeName("Custom") -@Fluent -public final class CustomSeasonality extends Seasonality { - /* - * [Required] Seasonality value. - */ - @JsonProperty(value = "value", required = true) - private int value; - - /** - * Get the value property: [Required] Seasonality value. - * - * @return the value value. - */ - public int value() { - return this.value; - } - - /** - * Set the value property: [Required] Seasonality value. - * - * @param value the value value to set. - * @return the CustomSeasonality object itself. - */ - public CustomSeasonality withValue(int value) { - this.value = value; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomTargetLags.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomTargetLags.java deleted file mode 100644 index 91639619b4d5..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomTargetLags.java +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.util.List; - -/** The CustomTargetLags model. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "mode") -@JsonTypeName("Custom") -@Fluent -public final class CustomTargetLags extends TargetLags { - /* - * [Required] Set target lags values. - */ - @JsonProperty(value = "values", required = true) - private List values; - - /** - * Get the values property: [Required] Set target lags values. - * - * @return the values value. - */ - public List values() { - return this.values; - } - - /** - * Set the values property: [Required] Set target lags values. - * - * @param values the values value to set. - * @return the CustomTargetLags object itself. - */ - public CustomTargetLags withValues(List values) { - this.values = values; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (values() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException("Missing required property values in model CustomTargetLags")); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(CustomTargetLags.class); -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomTargetRollingWindowSize.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomTargetRollingWindowSize.java deleted file mode 100644 index d2b709e271c7..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CustomTargetRollingWindowSize.java +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** The CustomTargetRollingWindowSize model. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "mode") -@JsonTypeName("Custom") -@Fluent -public final class CustomTargetRollingWindowSize extends TargetRollingWindowSize { - /* - * [Required] TargetRollingWindowSize value. - */ - @JsonProperty(value = "value", required = true) - private int value; - - /** - * Get the value property: [Required] TargetRollingWindowSize value. - * - * @return the value value. - */ - public int value() { - return this.value; - } - - /** - * Set the value property: [Required] TargetRollingWindowSize value. - * - * @param value the value value to set. - * @return the CustomTargetRollingWindowSize object itself. - */ - public CustomTargetRollingWindowSize withValue(int value) { - this.value = value; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainerData.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainer.java similarity index 72% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainerData.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainer.java index cccbc3bab2b9..59ae115c87e8 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainerData.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainer.java @@ -6,10 +6,10 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.DataContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.DataContainerInner; -/** An immutable client-side representation of DataContainerData. */ -public interface DataContainerData { +/** An immutable client-side representation of DataContainer. */ +public interface DataContainer { /** * Gets the id property: Fully qualified resource Id for the resource. * @@ -36,7 +36,7 @@ public interface DataContainerData { * * @return the properties value. */ - DataContainerDetails properties(); + DataContainerProperties properties(); /** * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. @@ -53,25 +53,25 @@ public interface DataContainerData { String resourceGroupName(); /** - * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.DataContainerDataInner object. + * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.DataContainerInner object. * * @return the inner object. */ - DataContainerDataInner innerModel(); + DataContainerInner innerModel(); - /** The entirety of the DataContainerData definition. */ + /** The entirety of the DataContainer definition. */ interface Definition extends DefinitionStages.Blank, DefinitionStages.WithParentResource, DefinitionStages.WithProperties, DefinitionStages.WithCreate { } - /** The DataContainerData definition stages. */ + /** The DataContainer definition stages. */ interface DefinitionStages { - /** The first stage of the DataContainerData definition. */ + /** The first stage of the DataContainer definition. */ interface Blank extends WithParentResource { } - /** The stage of the DataContainerData definition allowing to specify parent resource. */ + /** The stage of the DataContainer definition allowing to specify parent resource. */ interface WithParentResource { /** * Specifies resourceGroupName, workspaceName. @@ -82,7 +82,7 @@ interface WithParentResource { */ WithProperties withExistingWorkspace(String resourceGroupName, String workspaceName); } - /** The stage of the DataContainerData definition allowing to specify properties. */ + /** The stage of the DataContainer definition allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -90,11 +90,11 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - WithCreate withProperties(DataContainerDetails properties); + WithCreate withProperties(DataContainerProperties properties); } /** - * The stage of the DataContainerData definition which contains all the minimum required properties for the - * resource to be created, but also allows for any other optional properties to be specified. + * The stage of the DataContainer definition which contains all the minimum required properties for the resource + * to be created, but also allows for any other optional properties to be specified. */ interface WithCreate { /** @@ -102,7 +102,7 @@ interface WithCreate { * * @return the created resource. */ - DataContainerData create(); + DataContainer create(); /** * Executes the create request. @@ -110,24 +110,24 @@ interface WithCreate { * @param context The context to associate with this operation. * @return the created resource. */ - DataContainerData create(Context context); + DataContainer create(Context context); } } /** - * Begins update for the DataContainerData resource. + * Begins update for the DataContainer resource. * * @return the stage of resource update. */ - DataContainerData.Update update(); + DataContainer.Update update(); - /** The template for DataContainerData update. */ + /** The template for DataContainer update. */ interface Update extends UpdateStages.WithProperties { /** * Executes the update request. * * @return the updated resource. */ - DataContainerData apply(); + DataContainer apply(); /** * Executes the update request. @@ -135,11 +135,11 @@ interface Update extends UpdateStages.WithProperties { * @param context The context to associate with this operation. * @return the updated resource. */ - DataContainerData apply(Context context); + DataContainer apply(Context context); } - /** The DataContainerData update stages. */ + /** The DataContainer update stages. */ interface UpdateStages { - /** The stage of the DataContainerData update allowing to specify properties. */ + /** The stage of the DataContainer update allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -147,7 +147,7 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - Update withProperties(DataContainerDetails properties); + Update withProperties(DataContainerProperties properties); } } /** @@ -155,7 +155,7 @@ interface WithProperties { * * @return the refreshed resource. */ - DataContainerData refresh(); + DataContainer refresh(); /** * Refreshes the resource to sync with Azure. @@ -163,5 +163,5 @@ interface WithProperties { * @param context The context to associate with this operation. * @return the refreshed resource. */ - DataContainerData refresh(Context context); + DataContainer refresh(Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainerDetails.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainerProperties.java similarity index 72% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainerDetails.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainerProperties.java index ec67bda20e92..f69c3a4d6cb5 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainerDetails.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainerProperties.java @@ -11,7 +11,7 @@ /** Container for data asset versions. */ @Fluent -public final class DataContainerDetails extends AssetContainer { +public final class DataContainerProperties extends AssetContainer { /* * [Required] Specifies the type of data. */ @@ -31,37 +31,37 @@ public DataType dataType() { * Set the dataType property: [Required] Specifies the type of data. * * @param dataType the dataType value to set. - * @return the DataContainerDetails object itself. + * @return the DataContainerProperties object itself. */ - public DataContainerDetails withDataType(DataType dataType) { + public DataContainerProperties withDataType(DataType dataType) { this.dataType = dataType; return this; } /** {@inheritDoc} */ @Override - public DataContainerDetails withIsArchived(Boolean isArchived) { + public DataContainerProperties withIsArchived(Boolean isArchived) { super.withIsArchived(isArchived); return this; } /** {@inheritDoc} */ @Override - public DataContainerDetails withDescription(String description) { + public DataContainerProperties withDescription(String description) { super.withDescription(description); return this; } /** {@inheritDoc} */ @Override - public DataContainerDetails withProperties(Map properties) { + public DataContainerProperties withProperties(Map properties) { super.withProperties(properties); return this; } /** {@inheritDoc} */ @Override - public DataContainerDetails withTags(Map tags) { + public DataContainerProperties withTags(Map tags) { super.withTags(tags); return this; } @@ -77,9 +77,10 @@ public void validate() { if (dataType() == null) { throw LOGGER .logExceptionAsError( - new IllegalArgumentException("Missing required property dataType in model DataContainerDetails")); + new IllegalArgumentException( + "Missing required property dataType in model DataContainerProperties")); } } - private static final ClientLogger LOGGER = new ClientLogger(DataContainerDetails.class); + private static final ClientLogger LOGGER = new ClientLogger(DataContainerProperties.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainerResourceArmPaginatedResult.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainerResourceArmPaginatedResult.java index f61ab9b1c020..f2679606316d 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainerResourceArmPaginatedResult.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainerResourceArmPaginatedResult.java @@ -5,7 +5,7 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.fluent.models.DataContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.DataContainerInner; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -23,7 +23,7 @@ public final class DataContainerResourceArmPaginatedResult { * An array of objects of type DataContainer. */ @JsonProperty(value = "value") - private List value; + private List value; /** * Get the nextLink property: The link to the next page of DataContainer objects. If null, there are no additional @@ -52,7 +52,7 @@ public DataContainerResourceArmPaginatedResult withNextLink(String nextLink) { * * @return the value value. */ - public List value() { + public List value() { return this.value; } @@ -62,7 +62,7 @@ public List value() { * @param value the value value to set. * @return the DataContainerResourceArmPaginatedResult object itself. */ - public DataContainerResourceArmPaginatedResult withValue(List value) { + public DataContainerResourceArmPaginatedResult withValue(List value) { this.value = value; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainers.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainers.java index 78b930a34228..782367112fca 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainers.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataContainers.java @@ -20,7 +20,7 @@ public interface DataContainers { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of DataContainer entities as paginated response with {@link PagedIterable}. */ - PagedIterable list(String resourceGroupName, String workspaceName); + PagedIterable list(String resourceGroupName, String workspaceName); /** * List data containers. @@ -35,7 +35,7 @@ public interface DataContainers { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of DataContainer entities as paginated response with {@link PagedIterable}. */ - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType, Context context); /** @@ -75,7 +75,7 @@ PagedIterable list( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container. */ - DataContainerData get(String resourceGroupName, String workspaceName, String name); + DataContainer get(String resourceGroupName, String workspaceName, String name); /** * Get container. @@ -89,7 +89,7 @@ PagedIterable list( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container along with {@link Response}. */ - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context); /** @@ -101,7 +101,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container along with {@link Response}. */ - DataContainerData getById(String id); + DataContainer getById(String id); /** * Get container. @@ -113,7 +113,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container along with {@link Response}. */ - Response getByIdWithResponse(String id, Context context); + Response getByIdWithResponse(String id, Context context); /** * Delete container. @@ -138,10 +138,10 @@ Response getWithResponse( Response deleteByIdWithResponse(String id, Context context); /** - * Begins definition for a new DataContainerData resource. + * Begins definition for a new DataContainer resource. * * @param name resource name. - * @return the first stage of the new DataContainerData definition. + * @return the first stage of the new DataContainer definition. */ - DataContainerData.DefinitionStages.Blank define(String name); + DataContainer.DefinitionStages.Blank define(String name); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataSettings.java deleted file mode 100644 index b22637a92e9f..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataSettings.java +++ /dev/null @@ -1,119 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** Collection of registered Tabular Dataset Ids and other data settings required for training and validating models. */ -@Fluent -public class DataSettings { - /* - * [Required] Target column name: This is prediction values column. - * Also known as label column name in context of classification tasks. - */ - @JsonProperty(value = "targetColumnName", required = true) - private String targetColumnName; - - /* - * Test data input. - */ - @JsonProperty(value = "testData") - private TestDataSettings testData; - - /* - * [Required] Training data input. - */ - @JsonProperty(value = "trainingData", required = true) - private TrainingDataSettings trainingData; - - /** - * Get the targetColumnName property: [Required] Target column name: This is prediction values column. Also known as - * label column name in context of classification tasks. - * - * @return the targetColumnName value. - */ - public String targetColumnName() { - return this.targetColumnName; - } - - /** - * Set the targetColumnName property: [Required] Target column name: This is prediction values column. Also known as - * label column name in context of classification tasks. - * - * @param targetColumnName the targetColumnName value to set. - * @return the DataSettings object itself. - */ - public DataSettings withTargetColumnName(String targetColumnName) { - this.targetColumnName = targetColumnName; - return this; - } - - /** - * Get the testData property: Test data input. - * - * @return the testData value. - */ - public TestDataSettings testData() { - return this.testData; - } - - /** - * Set the testData property: Test data input. - * - * @param testData the testData value to set. - * @return the DataSettings object itself. - */ - public DataSettings withTestData(TestDataSettings testData) { - this.testData = testData; - return this; - } - - /** - * Get the trainingData property: [Required] Training data input. - * - * @return the trainingData value. - */ - public TrainingDataSettings trainingData() { - return this.trainingData; - } - - /** - * Set the trainingData property: [Required] Training data input. - * - * @param trainingData the trainingData value to set. - * @return the DataSettings object itself. - */ - public DataSettings withTrainingData(TrainingDataSettings trainingData) { - this.trainingData = trainingData; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (targetColumnName() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException("Missing required property targetColumnName in model DataSettings")); - } - if (testData() != null) { - testData().validate(); - } - if (trainingData() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException("Missing required property trainingData in model DataSettings")); - } else { - trainingData().validate(); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(DataSettings.class); -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataType.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataType.java index cfa71f5d7777..0b2025866320 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataType.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataType.java @@ -10,14 +10,14 @@ /** Defines values for DataType. */ public final class DataType extends ExpandableStringEnum { - /** Static value UriFile for DataType. */ - public static final DataType URI_FILE = fromString("UriFile"); + /** Static value uri_file for DataType. */ + public static final DataType URI_FILE = fromString("uri_file"); - /** Static value UriFolder for DataType. */ - public static final DataType URI_FOLDER = fromString("UriFolder"); + /** Static value uri_folder for DataType. */ + public static final DataType URI_FOLDER = fromString("uri_folder"); - /** Static value MLTable for DataType. */ - public static final DataType MLTABLE = fromString("MLTable"); + /** Static value mltable for DataType. */ + public static final DataType MLTABLE = fromString("mltable"); /** * Creates or finds a DataType from its string representation. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersionBaseData.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersionBase.java similarity index 74% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersionBaseData.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersionBase.java index a3b595ae33fe..ad254ac4664f 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersionBaseData.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersionBase.java @@ -6,10 +6,10 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.DataVersionBaseDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.DataVersionBaseInner; -/** An immutable client-side representation of DataVersionBaseData. */ -public interface DataVersionBaseData { +/** An immutable client-side representation of DataVersionBase. */ +public interface DataVersionBase { /** * Gets the id property: Fully qualified resource Id for the resource. * @@ -36,7 +36,7 @@ public interface DataVersionBaseData { * * @return the properties value. */ - DataVersionBaseDetails properties(); + DataVersionBaseProperties properties(); /** * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. @@ -53,25 +53,25 @@ public interface DataVersionBaseData { String resourceGroupName(); /** - * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.DataVersionBaseDataInner object. + * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.DataVersionBaseInner object. * * @return the inner object. */ - DataVersionBaseDataInner innerModel(); + DataVersionBaseInner innerModel(); - /** The entirety of the DataVersionBaseData definition. */ + /** The entirety of the DataVersionBase definition. */ interface Definition extends DefinitionStages.Blank, DefinitionStages.WithParentResource, DefinitionStages.WithProperties, DefinitionStages.WithCreate { } - /** The DataVersionBaseData definition stages. */ + /** The DataVersionBase definition stages. */ interface DefinitionStages { - /** The first stage of the DataVersionBaseData definition. */ + /** The first stage of the DataVersionBase definition. */ interface Blank extends WithParentResource { } - /** The stage of the DataVersionBaseData definition allowing to specify parent resource. */ + /** The stage of the DataVersionBase definition allowing to specify parent resource. */ interface WithParentResource { /** * Specifies resourceGroupName, workspaceName, name. @@ -83,7 +83,7 @@ interface WithParentResource { */ WithProperties withExistingData(String resourceGroupName, String workspaceName, String name); } - /** The stage of the DataVersionBaseData definition allowing to specify properties. */ + /** The stage of the DataVersionBase definition allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -91,10 +91,10 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - WithCreate withProperties(DataVersionBaseDetails properties); + WithCreate withProperties(DataVersionBaseProperties properties); } /** - * The stage of the DataVersionBaseData definition which contains all the minimum required properties for the + * The stage of the DataVersionBase definition which contains all the minimum required properties for the * resource to be created, but also allows for any other optional properties to be specified. */ interface WithCreate { @@ -103,7 +103,7 @@ interface WithCreate { * * @return the created resource. */ - DataVersionBaseData create(); + DataVersionBase create(); /** * Executes the create request. @@ -111,24 +111,24 @@ interface WithCreate { * @param context The context to associate with this operation. * @return the created resource. */ - DataVersionBaseData create(Context context); + DataVersionBase create(Context context); } } /** - * Begins update for the DataVersionBaseData resource. + * Begins update for the DataVersionBase resource. * * @return the stage of resource update. */ - DataVersionBaseData.Update update(); + DataVersionBase.Update update(); - /** The template for DataVersionBaseData update. */ + /** The template for DataVersionBase update. */ interface Update extends UpdateStages.WithProperties { /** * Executes the update request. * * @return the updated resource. */ - DataVersionBaseData apply(); + DataVersionBase apply(); /** * Executes the update request. @@ -136,11 +136,11 @@ interface Update extends UpdateStages.WithProperties { * @param context The context to associate with this operation. * @return the updated resource. */ - DataVersionBaseData apply(Context context); + DataVersionBase apply(Context context); } - /** The DataVersionBaseData update stages. */ + /** The DataVersionBase update stages. */ interface UpdateStages { - /** The stage of the DataVersionBaseData update allowing to specify properties. */ + /** The stage of the DataVersionBase update allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -148,7 +148,7 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - Update withProperties(DataVersionBaseDetails properties); + Update withProperties(DataVersionBaseProperties properties); } } /** @@ -156,7 +156,7 @@ interface WithProperties { * * @return the refreshed resource. */ - DataVersionBaseData refresh(); + DataVersionBase refresh(); /** * Refreshes the resource to sync with Azure. @@ -164,5 +164,5 @@ interface WithProperties { * @param context The context to associate with this operation. * @return the refreshed resource. */ - DataVersionBaseData refresh(Context context); + DataVersionBase refresh(Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersionBaseDetails.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersionBaseProperties.java similarity index 67% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersionBaseDetails.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersionBaseProperties.java index ecf45ae7a65d..4c438122df85 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersionBaseDetails.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersionBaseProperties.java @@ -17,25 +17,25 @@ use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "dataType", - defaultImpl = DataVersionBaseDetails.class) -@JsonTypeName("DataVersionBaseDetails") + defaultImpl = DataVersionBaseProperties.class) +@JsonTypeName("DataVersionBaseProperties") @JsonSubTypes({ - @JsonSubTypes.Type(name = "MLTable", value = MLTableData.class), - @JsonSubTypes.Type(name = "UriFile", value = UriFileDataVersion.class), - @JsonSubTypes.Type(name = "UriFolder", value = UriFolderDataVersion.class) + @JsonSubTypes.Type(name = "mltable", value = MLTableData.class), + @JsonSubTypes.Type(name = "uri_file", value = UriFileDataVersion.class), + @JsonSubTypes.Type(name = "uri_folder", value = UriFolderDataVersion.class) }) @Fluent -public class DataVersionBaseDetails extends AssetBase { +public class DataVersionBaseProperties extends AssetBase { /* * [Required] Uri of the data. Usage/meaning depends on - * Microsoft.MachineLearning.ManagementFrontEnd.Contracts.V20220201Preview.Assets.DataVersionBase.DataType + * Microsoft.MachineLearning.ManagementFrontEnd.Contracts.V20220501.Assets.DataVersionBase.DataType */ @JsonProperty(value = "dataUri", required = true) private String dataUri; /** * Get the dataUri property: [Required] Uri of the data. Usage/meaning depends on - * Microsoft.MachineLearning.ManagementFrontEnd.Contracts.V20220201Preview.Assets.DataVersionBase.DataType. + * Microsoft.MachineLearning.ManagementFrontEnd.Contracts.V20220501.Assets.DataVersionBase.DataType. * * @return the dataUri value. */ @@ -45,47 +45,47 @@ public String dataUri() { /** * Set the dataUri property: [Required] Uri of the data. Usage/meaning depends on - * Microsoft.MachineLearning.ManagementFrontEnd.Contracts.V20220201Preview.Assets.DataVersionBase.DataType. + * Microsoft.MachineLearning.ManagementFrontEnd.Contracts.V20220501.Assets.DataVersionBase.DataType. * * @param dataUri the dataUri value to set. - * @return the DataVersionBaseDetails object itself. + * @return the DataVersionBaseProperties object itself. */ - public DataVersionBaseDetails withDataUri(String dataUri) { + public DataVersionBaseProperties withDataUri(String dataUri) { this.dataUri = dataUri; return this; } /** {@inheritDoc} */ @Override - public DataVersionBaseDetails withIsAnonymous(Boolean isAnonymous) { + public DataVersionBaseProperties withIsAnonymous(Boolean isAnonymous) { super.withIsAnonymous(isAnonymous); return this; } /** {@inheritDoc} */ @Override - public DataVersionBaseDetails withIsArchived(Boolean isArchived) { + public DataVersionBaseProperties withIsArchived(Boolean isArchived) { super.withIsArchived(isArchived); return this; } /** {@inheritDoc} */ @Override - public DataVersionBaseDetails withDescription(String description) { + public DataVersionBaseProperties withDescription(String description) { super.withDescription(description); return this; } /** {@inheritDoc} */ @Override - public DataVersionBaseDetails withProperties(Map properties) { + public DataVersionBaseProperties withProperties(Map properties) { super.withProperties(properties); return this; } /** {@inheritDoc} */ @Override - public DataVersionBaseDetails withTags(Map tags) { + public DataVersionBaseProperties withTags(Map tags) { super.withTags(tags); return this; } @@ -101,9 +101,10 @@ public void validate() { if (dataUri() == null) { throw LOGGER .logExceptionAsError( - new IllegalArgumentException("Missing required property dataUri in model DataVersionBaseDetails")); + new IllegalArgumentException( + "Missing required property dataUri in model DataVersionBaseProperties")); } } - private static final ClientLogger LOGGER = new ClientLogger(DataVersionBaseDetails.class); + private static final ClientLogger LOGGER = new ClientLogger(DataVersionBaseProperties.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersionBaseResourceArmPaginatedResult.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersionBaseResourceArmPaginatedResult.java index ad68313cd571..147c169a9c82 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersionBaseResourceArmPaginatedResult.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersionBaseResourceArmPaginatedResult.java @@ -5,7 +5,7 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.fluent.models.DataVersionBaseDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.DataVersionBaseInner; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -23,7 +23,7 @@ public final class DataVersionBaseResourceArmPaginatedResult { * An array of objects of type DataVersionBase. */ @JsonProperty(value = "value") - private List value; + private List value; /** * Get the nextLink property: The link to the next page of DataVersionBase objects. If null, there are no additional @@ -52,7 +52,7 @@ public DataVersionBaseResourceArmPaginatedResult withNextLink(String nextLink) { * * @return the value value. */ - public List value() { + public List value() { return this.value; } @@ -62,7 +62,7 @@ public List value() { * @param value the value value to set. * @return the DataVersionBaseResourceArmPaginatedResult object itself. */ - public DataVersionBaseResourceArmPaginatedResult withValue(List value) { + public DataVersionBaseResourceArmPaginatedResult withValue(List value) { this.value = value; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersions.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersions.java index 11e5787a3ee0..75f80829a31e 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersions.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DataVersions.java @@ -21,7 +21,7 @@ public interface DataVersions { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of DataVersionBase entities as paginated response with {@link PagedIterable}. */ - PagedIterable list(String resourceGroupName, String workspaceName, String name); + PagedIterable list(String resourceGroupName, String workspaceName, String name); /** * List data versions in the data container. @@ -42,7 +42,7 @@ public interface DataVersions { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of DataVersionBase entities as paginated response with {@link PagedIterable}. */ - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -94,7 +94,7 @@ Response deleteWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version. */ - DataVersionBaseData get(String resourceGroupName, String workspaceName, String name, String version); + DataVersionBase get(String resourceGroupName, String workspaceName, String name, String version); /** * Get version. @@ -109,7 +109,7 @@ Response deleteWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version along with {@link Response}. */ - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context); /** @@ -121,7 +121,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version along with {@link Response}. */ - DataVersionBaseData getById(String id); + DataVersionBase getById(String id); /** * Get version. @@ -133,7 +133,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version along with {@link Response}. */ - Response getByIdWithResponse(String id, Context context); + Response getByIdWithResponse(String id, Context context); /** * Delete version. @@ -158,10 +158,10 @@ Response getWithResponse( Response deleteByIdWithResponse(String id, Context context); /** - * Begins definition for a new DataVersionBaseData resource. + * Begins definition for a new DataVersionBase resource. * * @param name resource name. - * @return the first stage of the new DataVersionBaseData definition. + * @return the first stage of the new DataVersionBase definition. */ - DataVersionBaseData.DefinitionStages.Blank define(String name); + DataVersionBase.DefinitionStages.Blank define(String name); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreData.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Datastore.java similarity index 78% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreData.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Datastore.java index 9fe35264387e..92a0908a5641 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreData.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Datastore.java @@ -7,10 +7,10 @@ import com.azure.core.http.rest.Response; import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.DatastoreDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.DatastoreInner; -/** An immutable client-side representation of DatastoreData. */ -public interface DatastoreData { +/** An immutable client-side representation of Datastore. */ +public interface Datastore { /** * Gets the id property: Fully qualified resource Id for the resource. * @@ -37,7 +37,7 @@ public interface DatastoreData { * * @return the properties value. */ - DatastoreDetails properties(); + DatastoreProperties properties(); /** * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. @@ -54,25 +54,25 @@ public interface DatastoreData { String resourceGroupName(); /** - * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.DatastoreDataInner object. + * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.DatastoreInner object. * * @return the inner object. */ - DatastoreDataInner innerModel(); + DatastoreInner innerModel(); - /** The entirety of the DatastoreData definition. */ + /** The entirety of the Datastore definition. */ interface Definition extends DefinitionStages.Blank, DefinitionStages.WithParentResource, DefinitionStages.WithProperties, DefinitionStages.WithCreate { } - /** The DatastoreData definition stages. */ + /** The Datastore definition stages. */ interface DefinitionStages { - /** The first stage of the DatastoreData definition. */ + /** The first stage of the Datastore definition. */ interface Blank extends WithParentResource { } - /** The stage of the DatastoreData definition allowing to specify parent resource. */ + /** The stage of the Datastore definition allowing to specify parent resource. */ interface WithParentResource { /** * Specifies resourceGroupName, workspaceName. @@ -83,7 +83,7 @@ interface WithParentResource { */ WithProperties withExistingWorkspace(String resourceGroupName, String workspaceName); } - /** The stage of the DatastoreData definition allowing to specify properties. */ + /** The stage of the Datastore definition allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -91,11 +91,11 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - WithCreate withProperties(DatastoreDetails properties); + WithCreate withProperties(DatastoreProperties properties); } /** - * The stage of the DatastoreData definition which contains all the minimum required properties for the resource - * to be created, but also allows for any other optional properties to be specified. + * The stage of the Datastore definition which contains all the minimum required properties for the resource to + * be created, but also allows for any other optional properties to be specified. */ interface WithCreate extends DefinitionStages.WithSkipValidation { /** @@ -103,7 +103,7 @@ interface WithCreate extends DefinitionStages.WithSkipValidation { * * @return the created resource. */ - DatastoreData create(); + Datastore create(); /** * Executes the create request. @@ -111,9 +111,9 @@ interface WithCreate extends DefinitionStages.WithSkipValidation { * @param context The context to associate with this operation. * @return the created resource. */ - DatastoreData create(Context context); + Datastore create(Context context); } - /** The stage of the DatastoreData definition allowing to specify skipValidation. */ + /** The stage of the Datastore definition allowing to specify skipValidation. */ interface WithSkipValidation { /** * Specifies the skipValidation property: Flag to skip validation.. @@ -125,20 +125,20 @@ interface WithSkipValidation { } } /** - * Begins update for the DatastoreData resource. + * Begins update for the Datastore resource. * * @return the stage of resource update. */ - DatastoreData.Update update(); + Datastore.Update update(); - /** The template for DatastoreData update. */ + /** The template for Datastore update. */ interface Update extends UpdateStages.WithProperties, UpdateStages.WithSkipValidation { /** * Executes the update request. * * @return the updated resource. */ - DatastoreData apply(); + Datastore apply(); /** * Executes the update request. @@ -146,11 +146,11 @@ interface Update extends UpdateStages.WithProperties, UpdateStages.WithSkipValid * @param context The context to associate with this operation. * @return the updated resource. */ - DatastoreData apply(Context context); + Datastore apply(Context context); } - /** The DatastoreData update stages. */ + /** The Datastore update stages. */ interface UpdateStages { - /** The stage of the DatastoreData update allowing to specify properties. */ + /** The stage of the Datastore update allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -158,9 +158,9 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - Update withProperties(DatastoreDetails properties); + Update withProperties(DatastoreProperties properties); } - /** The stage of the DatastoreData update allowing to specify skipValidation. */ + /** The stage of the Datastore update allowing to specify skipValidation. */ interface WithSkipValidation { /** * Specifies the skipValidation property: Flag to skip validation.. @@ -176,7 +176,7 @@ interface WithSkipValidation { * * @return the refreshed resource. */ - DatastoreData refresh(); + Datastore refresh(); /** * Refreshes the resource to sync with Azure. @@ -184,7 +184,7 @@ interface WithSkipValidation { * @param context The context to associate with this operation. * @return the refreshed resource. */ - DatastoreData refresh(Context context); + Datastore refresh(Context context); /** * Get datastore secrets. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreCredentials.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreCredentials.java index 98423ce9668d..984f1b4d1e25 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreCredentials.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreCredentials.java @@ -19,8 +19,6 @@ @JsonSubTypes({ @JsonSubTypes.Type(name = "AccountKey", value = AccountKeyDatastoreCredentials.class), @JsonSubTypes.Type(name = "Certificate", value = CertificateDatastoreCredentials.class), - @JsonSubTypes.Type(name = "KerberosKeytab", value = KerberosKeytabCredentials.class), - @JsonSubTypes.Type(name = "KerberosPassword", value = KerberosPasswordCredentials.class), @JsonSubTypes.Type(name = "None", value = NoneDatastoreCredentials.class), @JsonSubTypes.Type(name = "Sas", value = SasDatastoreCredentials.class), @JsonSubTypes.Type(name = "ServicePrincipal", value = ServicePrincipalDatastoreCredentials.class) diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreDetails.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreProperties.java similarity index 82% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreDetails.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreProperties.java index efe01d39f09e..3d6895b89ac8 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreDetails.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreProperties.java @@ -17,17 +17,16 @@ use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "datastoreType", - defaultImpl = DatastoreDetails.class) -@JsonTypeName("DatastoreDetails") + defaultImpl = DatastoreProperties.class) +@JsonTypeName("DatastoreProperties") @JsonSubTypes({ @JsonSubTypes.Type(name = "AzureBlob", value = AzureBlobDatastore.class), @JsonSubTypes.Type(name = "AzureDataLakeGen1", value = AzureDataLakeGen1Datastore.class), @JsonSubTypes.Type(name = "AzureDataLakeGen2", value = AzureDataLakeGen2Datastore.class), - @JsonSubTypes.Type(name = "AzureFile", value = AzureFileDatastore.class), - @JsonSubTypes.Type(name = "Hdfs", value = HdfsDatastore.class) + @JsonSubTypes.Type(name = "AzureFile", value = AzureFileDatastore.class) }) @Fluent -public class DatastoreDetails extends ResourceBase { +public class DatastoreProperties extends ResourceBase { /* * [Required] Account credentials. */ @@ -54,9 +53,9 @@ public DatastoreCredentials credentials() { * Set the credentials property: [Required] Account credentials. * * @param credentials the credentials value to set. - * @return the DatastoreDetails object itself. + * @return the DatastoreProperties object itself. */ - public DatastoreDetails withCredentials(DatastoreCredentials credentials) { + public DatastoreProperties withCredentials(DatastoreCredentials credentials) { this.credentials = credentials; return this; } @@ -72,21 +71,21 @@ public Boolean isDefault() { /** {@inheritDoc} */ @Override - public DatastoreDetails withDescription(String description) { + public DatastoreProperties withDescription(String description) { super.withDescription(description); return this; } /** {@inheritDoc} */ @Override - public DatastoreDetails withProperties(Map properties) { + public DatastoreProperties withProperties(Map properties) { super.withProperties(properties); return this; } /** {@inheritDoc} */ @Override - public DatastoreDetails withTags(Map tags) { + public DatastoreProperties withTags(Map tags) { super.withTags(tags); return this; } @@ -102,11 +101,11 @@ public void validate() { if (credentials() == null) { throw LOGGER .logExceptionAsError( - new IllegalArgumentException("Missing required property credentials in model DatastoreDetails")); + new IllegalArgumentException("Missing required property credentials in model DatastoreProperties")); } else { credentials().validate(); } } - private static final ClientLogger LOGGER = new ClientLogger(DatastoreDetails.class); + private static final ClientLogger LOGGER = new ClientLogger(DatastoreProperties.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreResourceArmPaginatedResult.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreResourceArmPaginatedResult.java index b65e174ffbc8..8af34be3333f 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreResourceArmPaginatedResult.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreResourceArmPaginatedResult.java @@ -5,7 +5,7 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.fluent.models.DatastoreDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.DatastoreInner; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -23,7 +23,7 @@ public final class DatastoreResourceArmPaginatedResult { * An array of objects of type Datastore. */ @JsonProperty(value = "value") - private List value; + private List value; /** * Get the nextLink property: The link to the next page of Datastore objects. If null, there are no additional @@ -52,7 +52,7 @@ public DatastoreResourceArmPaginatedResult withNextLink(String nextLink) { * * @return the value value. */ - public List value() { + public List value() { return this.value; } @@ -62,7 +62,7 @@ public List value() { * @param value the value value to set. * @return the DatastoreResourceArmPaginatedResult object itself. */ - public DatastoreResourceArmPaginatedResult withValue(List value) { + public DatastoreResourceArmPaginatedResult withValue(List value) { this.value = value; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreType.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreType.java index 305447f2d065..a07dd93dbc5b 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreType.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/DatastoreType.java @@ -22,9 +22,6 @@ public final class DatastoreType extends ExpandableStringEnum { /** Static value AzureFile for DatastoreType. */ public static final DatastoreType AZURE_FILE = fromString("AzureFile"); - /** Static value Hdfs for DatastoreType. */ - public static final DatastoreType HDFS = fromString("Hdfs"); - /** * Creates or finds a DatastoreType from its string representation. * diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Datastores.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Datastores.java index 807e16e260f9..fda61299d18e 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Datastores.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Datastores.java @@ -21,7 +21,7 @@ public interface Datastores { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of Datastore entities as paginated response with {@link PagedIterable}. */ - PagedIterable list(String resourceGroupName, String workspaceName); + PagedIterable list(String resourceGroupName, String workspaceName); /** * List datastores. @@ -41,7 +41,7 @@ public interface Datastores { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of Datastore entities as paginated response with {@link PagedIterable}. */ - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String skip, @@ -90,7 +90,7 @@ PagedIterable list( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return datastore. */ - DatastoreData get(String resourceGroupName, String workspaceName, String name); + Datastore get(String resourceGroupName, String workspaceName, String name); /** * Get datastore. @@ -104,8 +104,7 @@ PagedIterable list( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return datastore along with {@link Response}. */ - Response getWithResponse( - String resourceGroupName, String workspaceName, String name, Context context); + Response getWithResponse(String resourceGroupName, String workspaceName, String name, Context context); /** * Get datastore secrets. @@ -144,7 +143,7 @@ Response listSecretsWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return datastore along with {@link Response}. */ - DatastoreData getById(String id); + Datastore getById(String id); /** * Get datastore. @@ -156,7 +155,7 @@ Response listSecretsWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return datastore along with {@link Response}. */ - Response getByIdWithResponse(String id, Context context); + Response getByIdWithResponse(String id, Context context); /** * Delete datastore. @@ -181,10 +180,10 @@ Response listSecretsWithResponse( Response deleteByIdWithResponse(String id, Context context); /** - * Begins definition for a new DatastoreData resource. + * Begins definition for a new Datastore resource. * * @param name resource name. - * @return the first stage of the new DatastoreData definition. + * @return the first stage of the new Datastore definition. */ - DatastoreData.DefinitionStages.Blank define(String name); + Datastore.DefinitionStages.Blank define(String name); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EgressPublicNetworkAccessType.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EgressPublicNetworkAccessType.java deleted file mode 100644 index 981312781c62..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EgressPublicNetworkAccessType.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for EgressPublicNetworkAccessType. */ -public final class EgressPublicNetworkAccessType extends ExpandableStringEnum { - /** Static value Enabled for EgressPublicNetworkAccessType. */ - public static final EgressPublicNetworkAccessType ENABLED = fromString("Enabled"); - - /** Static value Disabled for EgressPublicNetworkAccessType. */ - public static final EgressPublicNetworkAccessType DISABLED = fromString("Disabled"); - - /** - * Creates or finds a EgressPublicNetworkAccessType from its string representation. - * - * @param name a name to look for. - * @return the corresponding EgressPublicNetworkAccessType. - */ - @JsonCreator - public static EgressPublicNetworkAccessType fromString(String name) { - return fromString(name, EgressPublicNetworkAccessType.class); - } - - /** - * Gets known EgressPublicNetworkAccessType values. - * - * @return known EgressPublicNetworkAccessType values. - */ - public static Collection values() { - return values(EgressPublicNetworkAccessType.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EndpointDeploymentPropertiesBase.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EndpointDeploymentPropertiesBase.java index f547c746ef2b..77407f8c9ebb 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EndpointDeploymentPropertiesBase.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EndpointDeploymentPropertiesBase.java @@ -25,8 +25,8 @@ public class EndpointDeploymentPropertiesBase { private String description; /* - * ARM resource ID of the environment specification for the endpoint - * deployment. + * ARM resource ID or AssetId of the environment specification for the + * endpoint deployment. */ @JsonProperty(value = "environmentId") private String environmentId; @@ -87,7 +87,8 @@ public EndpointDeploymentPropertiesBase withDescription(String description) { } /** - * Get the environmentId property: ARM resource ID of the environment specification for the endpoint deployment. + * Get the environmentId property: ARM resource ID or AssetId of the environment specification for the endpoint + * deployment. * * @return the environmentId value. */ @@ -96,7 +97,8 @@ public String environmentId() { } /** - * Set the environmentId property: ARM resource ID of the environment specification for the endpoint deployment. + * Set the environmentId property: ARM resource ID or AssetId of the environment specification for the endpoint + * deployment. * * @param environmentId the environmentId value to set. * @return the EndpointDeploymentPropertiesBase object itself. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainerData.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainer.java similarity index 71% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainerData.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainer.java index a197e16654b8..0256e791b224 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainerData.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainer.java @@ -6,10 +6,10 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentContainerInner; -/** An immutable client-side representation of EnvironmentContainerData. */ -public interface EnvironmentContainerData { +/** An immutable client-side representation of EnvironmentContainer. */ +public interface EnvironmentContainer { /** * Gets the id property: Fully qualified resource Id for the resource. * @@ -36,7 +36,7 @@ public interface EnvironmentContainerData { * * @return the properties value. */ - EnvironmentContainerDetails properties(); + EnvironmentContainerProperties properties(); /** * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. @@ -53,25 +53,25 @@ public interface EnvironmentContainerData { String resourceGroupName(); /** - * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentContainerDataInner object. + * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentContainerInner object. * * @return the inner object. */ - EnvironmentContainerDataInner innerModel(); + EnvironmentContainerInner innerModel(); - /** The entirety of the EnvironmentContainerData definition. */ + /** The entirety of the EnvironmentContainer definition. */ interface Definition extends DefinitionStages.Blank, DefinitionStages.WithParentResource, DefinitionStages.WithProperties, DefinitionStages.WithCreate { } - /** The EnvironmentContainerData definition stages. */ + /** The EnvironmentContainer definition stages. */ interface DefinitionStages { - /** The first stage of the EnvironmentContainerData definition. */ + /** The first stage of the EnvironmentContainer definition. */ interface Blank extends WithParentResource { } - /** The stage of the EnvironmentContainerData definition allowing to specify parent resource. */ + /** The stage of the EnvironmentContainer definition allowing to specify parent resource. */ interface WithParentResource { /** * Specifies resourceGroupName, workspaceName. @@ -82,7 +82,7 @@ interface WithParentResource { */ WithProperties withExistingWorkspace(String resourceGroupName, String workspaceName); } - /** The stage of the EnvironmentContainerData definition allowing to specify properties. */ + /** The stage of the EnvironmentContainer definition allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -90,11 +90,11 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - WithCreate withProperties(EnvironmentContainerDetails properties); + WithCreate withProperties(EnvironmentContainerProperties properties); } /** - * The stage of the EnvironmentContainerData definition which contains all the minimum required properties for - * the resource to be created, but also allows for any other optional properties to be specified. + * The stage of the EnvironmentContainer definition which contains all the minimum required properties for the + * resource to be created, but also allows for any other optional properties to be specified. */ interface WithCreate { /** @@ -102,7 +102,7 @@ interface WithCreate { * * @return the created resource. */ - EnvironmentContainerData create(); + EnvironmentContainer create(); /** * Executes the create request. @@ -110,24 +110,24 @@ interface WithCreate { * @param context The context to associate with this operation. * @return the created resource. */ - EnvironmentContainerData create(Context context); + EnvironmentContainer create(Context context); } } /** - * Begins update for the EnvironmentContainerData resource. + * Begins update for the EnvironmentContainer resource. * * @return the stage of resource update. */ - EnvironmentContainerData.Update update(); + EnvironmentContainer.Update update(); - /** The template for EnvironmentContainerData update. */ + /** The template for EnvironmentContainer update. */ interface Update extends UpdateStages.WithProperties { /** * Executes the update request. * * @return the updated resource. */ - EnvironmentContainerData apply(); + EnvironmentContainer apply(); /** * Executes the update request. @@ -135,11 +135,11 @@ interface Update extends UpdateStages.WithProperties { * @param context The context to associate with this operation. * @return the updated resource. */ - EnvironmentContainerData apply(Context context); + EnvironmentContainer apply(Context context); } - /** The EnvironmentContainerData update stages. */ + /** The EnvironmentContainer update stages. */ interface UpdateStages { - /** The stage of the EnvironmentContainerData update allowing to specify properties. */ + /** The stage of the EnvironmentContainer update allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -147,7 +147,7 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - Update withProperties(EnvironmentContainerDetails properties); + Update withProperties(EnvironmentContainerProperties properties); } } /** @@ -155,7 +155,7 @@ interface WithProperties { * * @return the refreshed resource. */ - EnvironmentContainerData refresh(); + EnvironmentContainer refresh(); /** * Refreshes the resource to sync with Azure. @@ -163,5 +163,5 @@ interface WithProperties { * @param context The context to associate with this operation. * @return the refreshed resource. */ - EnvironmentContainerData refresh(Context context); + EnvironmentContainer refresh(Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainerDetails.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainerProperties.java similarity index 70% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainerDetails.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainerProperties.java index fe093805a4b8..372a5807a1af 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainerDetails.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainerProperties.java @@ -9,31 +9,31 @@ /** Container for environment specification versions. */ @Fluent -public final class EnvironmentContainerDetails extends AssetContainer { +public final class EnvironmentContainerProperties extends AssetContainer { /** {@inheritDoc} */ @Override - public EnvironmentContainerDetails withIsArchived(Boolean isArchived) { + public EnvironmentContainerProperties withIsArchived(Boolean isArchived) { super.withIsArchived(isArchived); return this; } /** {@inheritDoc} */ @Override - public EnvironmentContainerDetails withDescription(String description) { + public EnvironmentContainerProperties withDescription(String description) { super.withDescription(description); return this; } /** {@inheritDoc} */ @Override - public EnvironmentContainerDetails withProperties(Map properties) { + public EnvironmentContainerProperties withProperties(Map properties) { super.withProperties(properties); return this; } /** {@inheritDoc} */ @Override - public EnvironmentContainerDetails withTags(Map tags) { + public EnvironmentContainerProperties withTags(Map tags) { super.withTags(tags); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainerResourceArmPaginatedResult.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainerResourceArmPaginatedResult.java index e092db27c6b0..ffe8a4836bca 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainerResourceArmPaginatedResult.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainerResourceArmPaginatedResult.java @@ -5,7 +5,7 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentContainerInner; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -23,7 +23,7 @@ public final class EnvironmentContainerResourceArmPaginatedResult { * An array of objects of type EnvironmentContainer. */ @JsonProperty(value = "value") - private List value; + private List value; /** * Get the nextLink property: The link to the next page of EnvironmentContainer objects. If null, there are no @@ -52,7 +52,7 @@ public EnvironmentContainerResourceArmPaginatedResult withNextLink(String nextLi * * @return the value value. */ - public List value() { + public List value() { return this.value; } @@ -62,7 +62,7 @@ public List value() { * @param value the value value to set. * @return the EnvironmentContainerResourceArmPaginatedResult object itself. */ - public EnvironmentContainerResourceArmPaginatedResult withValue(List value) { + public EnvironmentContainerResourceArmPaginatedResult withValue(List value) { this.value = value; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainers.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainers.java index 1ff0f06b34e2..f7c072c0009a 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainers.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentContainers.java @@ -20,7 +20,7 @@ public interface EnvironmentContainers { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of EnvironmentContainer entities as paginated response with {@link PagedIterable}. */ - PagedIterable list(String resourceGroupName, String workspaceName); + PagedIterable list(String resourceGroupName, String workspaceName); /** * List environment containers. @@ -35,7 +35,7 @@ public interface EnvironmentContainers { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of EnvironmentContainer entities as paginated response with {@link PagedIterable}. */ - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String skip, ListViewType listViewType, Context context); /** @@ -75,7 +75,7 @@ PagedIterable list( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container. */ - EnvironmentContainerData get(String resourceGroupName, String workspaceName, String name); + EnvironmentContainer get(String resourceGroupName, String workspaceName, String name); /** * Get container. @@ -89,7 +89,7 @@ PagedIterable list( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container along with {@link Response}. */ - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context); /** @@ -101,7 +101,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container along with {@link Response}. */ - EnvironmentContainerData getById(String id); + EnvironmentContainer getById(String id); /** * Get container. @@ -113,7 +113,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container along with {@link Response}. */ - Response getByIdWithResponse(String id, Context context); + Response getByIdWithResponse(String id, Context context); /** * Delete container. @@ -138,10 +138,10 @@ Response getWithResponse( Response deleteByIdWithResponse(String id, Context context); /** - * Begins definition for a new EnvironmentContainerData resource. + * Begins definition for a new EnvironmentContainer resource. * * @param name resource name. - * @return the first stage of the new EnvironmentContainerData definition. + * @return the first stage of the new EnvironmentContainer definition. */ - EnvironmentContainerData.DefinitionStages.Blank define(String name); + EnvironmentContainer.DefinitionStages.Blank define(String name); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersionData.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersion.java similarity index 74% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersionData.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersion.java index 088be7f710ef..8c72da86c8b0 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersionData.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersion.java @@ -6,10 +6,10 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentVersionDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentVersionInner; -/** An immutable client-side representation of EnvironmentVersionData. */ -public interface EnvironmentVersionData { +/** An immutable client-side representation of EnvironmentVersion. */ +public interface EnvironmentVersion { /** * Gets the id property: Fully qualified resource Id for the resource. * @@ -36,7 +36,7 @@ public interface EnvironmentVersionData { * * @return the properties value. */ - EnvironmentVersionDetails properties(); + EnvironmentVersionProperties properties(); /** * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. @@ -53,25 +53,25 @@ public interface EnvironmentVersionData { String resourceGroupName(); /** - * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentVersionDataInner object. + * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentVersionInner object. * * @return the inner object. */ - EnvironmentVersionDataInner innerModel(); + EnvironmentVersionInner innerModel(); - /** The entirety of the EnvironmentVersionData definition. */ + /** The entirety of the EnvironmentVersion definition. */ interface Definition extends DefinitionStages.Blank, DefinitionStages.WithParentResource, DefinitionStages.WithProperties, DefinitionStages.WithCreate { } - /** The EnvironmentVersionData definition stages. */ + /** The EnvironmentVersion definition stages. */ interface DefinitionStages { - /** The first stage of the EnvironmentVersionData definition. */ + /** The first stage of the EnvironmentVersion definition. */ interface Blank extends WithParentResource { } - /** The stage of the EnvironmentVersionData definition allowing to specify parent resource. */ + /** The stage of the EnvironmentVersion definition allowing to specify parent resource. */ interface WithParentResource { /** * Specifies resourceGroupName, workspaceName, name. @@ -83,7 +83,7 @@ interface WithParentResource { */ WithProperties withExistingEnvironment(String resourceGroupName, String workspaceName, String name); } - /** The stage of the EnvironmentVersionData definition allowing to specify properties. */ + /** The stage of the EnvironmentVersion definition allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -91,10 +91,10 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - WithCreate withProperties(EnvironmentVersionDetails properties); + WithCreate withProperties(EnvironmentVersionProperties properties); } /** - * The stage of the EnvironmentVersionData definition which contains all the minimum required properties for the + * The stage of the EnvironmentVersion definition which contains all the minimum required properties for the * resource to be created, but also allows for any other optional properties to be specified. */ interface WithCreate { @@ -103,7 +103,7 @@ interface WithCreate { * * @return the created resource. */ - EnvironmentVersionData create(); + EnvironmentVersion create(); /** * Executes the create request. @@ -111,24 +111,24 @@ interface WithCreate { * @param context The context to associate with this operation. * @return the created resource. */ - EnvironmentVersionData create(Context context); + EnvironmentVersion create(Context context); } } /** - * Begins update for the EnvironmentVersionData resource. + * Begins update for the EnvironmentVersion resource. * * @return the stage of resource update. */ - EnvironmentVersionData.Update update(); + EnvironmentVersion.Update update(); - /** The template for EnvironmentVersionData update. */ + /** The template for EnvironmentVersion update. */ interface Update extends UpdateStages.WithProperties { /** * Executes the update request. * * @return the updated resource. */ - EnvironmentVersionData apply(); + EnvironmentVersion apply(); /** * Executes the update request. @@ -136,11 +136,11 @@ interface Update extends UpdateStages.WithProperties { * @param context The context to associate with this operation. * @return the updated resource. */ - EnvironmentVersionData apply(Context context); + EnvironmentVersion apply(Context context); } - /** The EnvironmentVersionData update stages. */ + /** The EnvironmentVersion update stages. */ interface UpdateStages { - /** The stage of the EnvironmentVersionData update allowing to specify properties. */ + /** The stage of the EnvironmentVersion update allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -148,7 +148,7 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - Update withProperties(EnvironmentVersionDetails properties); + Update withProperties(EnvironmentVersionProperties properties); } } /** @@ -156,7 +156,7 @@ interface WithProperties { * * @return the refreshed resource. */ - EnvironmentVersionData refresh(); + EnvironmentVersion refresh(); /** * Refreshes the resource to sync with Azure. @@ -164,5 +164,5 @@ interface WithProperties { * @param context The context to associate with this operation. * @return the refreshed resource. */ - EnvironmentVersionData refresh(Context context); + EnvironmentVersion refresh(Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersionDetails.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersionProperties.java similarity index 83% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersionDetails.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersionProperties.java index 3609c2a64576..e5fda3635bbf 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersionDetails.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersionProperties.java @@ -10,7 +10,7 @@ /** Environment version details. */ @Fluent -public final class EnvironmentVersionDetails extends AssetBase { +public final class EnvironmentVersionProperties extends AssetBase { /* * Configuration settings for Docker build context. */ @@ -72,9 +72,9 @@ public BuildContext build() { * Set the build property: Configuration settings for Docker build context. * * @param build the build value to set. - * @return the EnvironmentVersionDetails object itself. + * @return the EnvironmentVersionProperties object itself. */ - public EnvironmentVersionDetails withBuild(BuildContext build) { + public EnvironmentVersionProperties withBuild(BuildContext build) { this.build = build; return this; } @@ -98,9 +98,9 @@ public String condaFile() { * />. * * @param condaFile the condaFile value to set. - * @return the EnvironmentVersionDetails object itself. + * @return the EnvironmentVersionProperties object itself. */ - public EnvironmentVersionDetails withCondaFile(String condaFile) { + public EnvironmentVersionProperties withCondaFile(String condaFile) { this.condaFile = condaFile; return this; } @@ -134,9 +134,9 @@ public String image() { * />. * * @param image the image value to set. - * @return the EnvironmentVersionDetails object itself. + * @return the EnvironmentVersionProperties object itself. */ - public EnvironmentVersionDetails withImage(String image) { + public EnvironmentVersionProperties withImage(String image) { this.image = image; return this; } @@ -154,9 +154,9 @@ public InferenceContainerProperties inferenceConfig() { * Set the inferenceConfig property: Defines configuration specific to inference. * * @param inferenceConfig the inferenceConfig value to set. - * @return the EnvironmentVersionDetails object itself. + * @return the EnvironmentVersionProperties object itself. */ - public EnvironmentVersionDetails withInferenceConfig(InferenceContainerProperties inferenceConfig) { + public EnvironmentVersionProperties withInferenceConfig(InferenceContainerProperties inferenceConfig) { this.inferenceConfig = inferenceConfig; return this; } @@ -174,44 +174,44 @@ public OperatingSystemType osType() { * Set the osType property: The OS type of the environment. * * @param osType the osType value to set. - * @return the EnvironmentVersionDetails object itself. + * @return the EnvironmentVersionProperties object itself. */ - public EnvironmentVersionDetails withOsType(OperatingSystemType osType) { + public EnvironmentVersionProperties withOsType(OperatingSystemType osType) { this.osType = osType; return this; } /** {@inheritDoc} */ @Override - public EnvironmentVersionDetails withIsAnonymous(Boolean isAnonymous) { + public EnvironmentVersionProperties withIsAnonymous(Boolean isAnonymous) { super.withIsAnonymous(isAnonymous); return this; } /** {@inheritDoc} */ @Override - public EnvironmentVersionDetails withIsArchived(Boolean isArchived) { + public EnvironmentVersionProperties withIsArchived(Boolean isArchived) { super.withIsArchived(isArchived); return this; } /** {@inheritDoc} */ @Override - public EnvironmentVersionDetails withDescription(String description) { + public EnvironmentVersionProperties withDescription(String description) { super.withDescription(description); return this; } /** {@inheritDoc} */ @Override - public EnvironmentVersionDetails withProperties(Map properties) { + public EnvironmentVersionProperties withProperties(Map properties) { super.withProperties(properties); return this; } /** {@inheritDoc} */ @Override - public EnvironmentVersionDetails withTags(Map tags) { + public EnvironmentVersionProperties withTags(Map tags) { super.withTags(tags); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersionResourceArmPaginatedResult.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersionResourceArmPaginatedResult.java index 1423e6bfe747..49b57d2d324c 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersionResourceArmPaginatedResult.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersionResourceArmPaginatedResult.java @@ -5,7 +5,7 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentVersionDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.EnvironmentVersionInner; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -23,7 +23,7 @@ public final class EnvironmentVersionResourceArmPaginatedResult { * An array of objects of type EnvironmentVersion. */ @JsonProperty(value = "value") - private List value; + private List value; /** * Get the nextLink property: The link to the next page of EnvironmentVersion objects. If null, there are no @@ -52,7 +52,7 @@ public EnvironmentVersionResourceArmPaginatedResult withNextLink(String nextLink * * @return the value value. */ - public List value() { + public List value() { return this.value; } @@ -62,7 +62,7 @@ public List value() { * @param value the value value to set. * @return the EnvironmentVersionResourceArmPaginatedResult object itself. */ - public EnvironmentVersionResourceArmPaginatedResult withValue(List value) { + public EnvironmentVersionResourceArmPaginatedResult withValue(List value) { this.value = value; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersions.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersions.java index e35c0d05eb3a..fbcca9fcb979 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersions.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/EnvironmentVersions.java @@ -21,7 +21,7 @@ public interface EnvironmentVersions { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of EnvironmentVersion entities as paginated response with {@link PagedIterable}. */ - PagedIterable list(String resourceGroupName, String workspaceName, String name); + PagedIterable list(String resourceGroupName, String workspaceName, String name); /** * List versions. @@ -39,7 +39,7 @@ public interface EnvironmentVersions { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of EnvironmentVersion entities as paginated response with {@link PagedIterable}. */ - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -90,7 +90,7 @@ Response deleteWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version. */ - EnvironmentVersionData get(String resourceGroupName, String workspaceName, String name, String version); + EnvironmentVersion get(String resourceGroupName, String workspaceName, String name, String version); /** * Get version. @@ -105,7 +105,7 @@ Response deleteWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version along with {@link Response}. */ - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context); /** @@ -117,7 +117,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version along with {@link Response}. */ - EnvironmentVersionData getById(String id); + EnvironmentVersion getById(String id); /** * Get version. @@ -129,7 +129,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version along with {@link Response}. */ - Response getByIdWithResponse(String id, Context context); + Response getByIdWithResponse(String id, Context context); /** * Delete version. @@ -154,10 +154,10 @@ Response getWithResponse( Response deleteByIdWithResponse(String id, Context context); /** - * Begins definition for a new EnvironmentVersionData resource. + * Begins definition for a new EnvironmentVersion resource. * * @param name resource name. - * @return the first stage of the new EnvironmentVersionData definition. + * @return the first stage of the new EnvironmentVersion definition. */ - EnvironmentVersionData.DefinitionStages.Blank define(String name); + EnvironmentVersion.DefinitionStages.Blank define(String name); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/FeatureLags.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/FeatureLags.java deleted file mode 100644 index e8ef06a0db5c..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/FeatureLags.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for FeatureLags. */ -public final class FeatureLags extends ExpandableStringEnum { - /** Static value None for FeatureLags. */ - public static final FeatureLags NONE = fromString("None"); - - /** Static value Auto for FeatureLags. */ - public static final FeatureLags AUTO = fromString("Auto"); - - /** - * Creates or finds a FeatureLags from its string representation. - * - * @param name a name to look for. - * @return the corresponding FeatureLags. - */ - @JsonCreator - public static FeatureLags fromString(String name) { - return fromString(name, FeatureLags.class); - } - - /** - * Gets known FeatureLags values. - * - * @return known FeatureLags values. - */ - public static Collection values() { - return values(FeatureLags.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/FeaturizationMode.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/FeaturizationMode.java deleted file mode 100644 index d59613475859..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/FeaturizationMode.java +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for FeaturizationMode. */ -public final class FeaturizationMode extends ExpandableStringEnum { - /** Static value Auto for FeaturizationMode. */ - public static final FeaturizationMode AUTO = fromString("Auto"); - - /** Static value Custom for FeaturizationMode. */ - public static final FeaturizationMode CUSTOM = fromString("Custom"); - - /** Static value Off for FeaturizationMode. */ - public static final FeaturizationMode OFF = fromString("Off"); - - /** - * Creates or finds a FeaturizationMode from its string representation. - * - * @param name a name to look for. - * @return the corresponding FeaturizationMode. - */ - @JsonCreator - public static FeaturizationMode fromString(String name) { - return fromString(name, FeaturizationMode.class); - } - - /** - * Gets known FeaturizationMode values. - * - * @return known FeaturizationMode values. - */ - public static Collection values() { - return values(FeaturizationMode.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/FeaturizationSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/FeaturizationSettings.java deleted file mode 100644 index d56b97221980..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/FeaturizationSettings.java +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** Featurization Configuration. */ -@Fluent -public class FeaturizationSettings { - /* - * Dataset language, useful for the text data. - */ - @JsonProperty(value = "datasetLanguage") - private String datasetLanguage; - - /** - * Get the datasetLanguage property: Dataset language, useful for the text data. - * - * @return the datasetLanguage value. - */ - public String datasetLanguage() { - return this.datasetLanguage; - } - - /** - * Set the datasetLanguage property: Dataset language, useful for the text data. - * - * @param datasetLanguage the datasetLanguage value to set. - * @return the FeaturizationSettings object itself. - */ - public FeaturizationSettings withDatasetLanguage(String datasetLanguage) { - this.datasetLanguage = datasetLanguage; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastHorizon.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastHorizon.java deleted file mode 100644 index c9b79c3e310b..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastHorizon.java +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Immutable; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** The desired maximum forecast horizon in units of time-series frequency. */ -@JsonTypeInfo( - use = JsonTypeInfo.Id.NAME, - include = JsonTypeInfo.As.PROPERTY, - property = "mode", - defaultImpl = ForecastHorizon.class) -@JsonTypeName("ForecastHorizon") -@JsonSubTypes({ - @JsonSubTypes.Type(name = "Auto", value = AutoForecastHorizon.class), - @JsonSubTypes.Type(name = "Custom", value = CustomForecastHorizon.class) -}) -@Immutable -public class ForecastHorizon { - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastHorizonMode.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastHorizonMode.java deleted file mode 100644 index 79a78c145fd5..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastHorizonMode.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for ForecastHorizonMode. */ -public final class ForecastHorizonMode extends ExpandableStringEnum { - /** Static value Auto for ForecastHorizonMode. */ - public static final ForecastHorizonMode AUTO = fromString("Auto"); - - /** Static value Custom for ForecastHorizonMode. */ - public static final ForecastHorizonMode CUSTOM = fromString("Custom"); - - /** - * Creates or finds a ForecastHorizonMode from its string representation. - * - * @param name a name to look for. - * @return the corresponding ForecastHorizonMode. - */ - @JsonCreator - public static ForecastHorizonMode fromString(String name) { - return fromString(name, ForecastHorizonMode.class); - } - - /** - * Gets known ForecastHorizonMode values. - * - * @return known ForecastHorizonMode values. - */ - public static Collection values() { - return values(ForecastHorizonMode.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Forecasting.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Forecasting.java deleted file mode 100644 index 6fb8de9dc3cd..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Forecasting.java +++ /dev/null @@ -1,257 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.util.List; - -/** Forecasting task in AutoML Table vertical. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType") -@JsonTypeName("Forecasting") -@Fluent -public final class Forecasting extends AutoMLVertical { - /* - * Allowed models for forecasting task. - */ - @JsonProperty(value = "allowedModels") - private List allowedModels; - - /* - * Blocked models for forecasting task. - */ - @JsonProperty(value = "blockedModels") - private List blockedModels; - - /* - * Forecasting task specific inputs. - */ - @JsonProperty(value = "forecastingSettings") - private ForecastingSettings forecastingSettings; - - /* - * Primary metric for forecasting task. - */ - @JsonProperty(value = "primaryMetric") - private ForecastingPrimaryMetrics primaryMetric; - - /* - * Data inputs for AutoMLJob. - */ - @JsonProperty(value = "dataSettings") - private TableVerticalDataSettings dataSettings; - - /* - * Featurization inputs needed for AutoML job. - */ - @JsonProperty(value = "featurizationSettings") - private TableVerticalFeaturizationSettings featurizationSettings; - - /* - * Execution constraints for AutoMLJob. - */ - @JsonProperty(value = "limitSettings") - private TableVerticalLimitSettings limitSettings; - - /* - * Inputs for training phase for an AutoML Job. - */ - @JsonProperty(value = "trainingSettings") - private TrainingSettings trainingSettings; - - /** - * Get the allowedModels property: Allowed models for forecasting task. - * - * @return the allowedModels value. - */ - public List allowedModels() { - return this.allowedModels; - } - - /** - * Set the allowedModels property: Allowed models for forecasting task. - * - * @param allowedModels the allowedModels value to set. - * @return the Forecasting object itself. - */ - public Forecasting withAllowedModels(List allowedModels) { - this.allowedModels = allowedModels; - return this; - } - - /** - * Get the blockedModels property: Blocked models for forecasting task. - * - * @return the blockedModels value. - */ - public List blockedModels() { - return this.blockedModels; - } - - /** - * Set the blockedModels property: Blocked models for forecasting task. - * - * @param blockedModels the blockedModels value to set. - * @return the Forecasting object itself. - */ - public Forecasting withBlockedModels(List blockedModels) { - this.blockedModels = blockedModels; - return this; - } - - /** - * Get the forecastingSettings property: Forecasting task specific inputs. - * - * @return the forecastingSettings value. - */ - public ForecastingSettings forecastingSettings() { - return this.forecastingSettings; - } - - /** - * Set the forecastingSettings property: Forecasting task specific inputs. - * - * @param forecastingSettings the forecastingSettings value to set. - * @return the Forecasting object itself. - */ - public Forecasting withForecastingSettings(ForecastingSettings forecastingSettings) { - this.forecastingSettings = forecastingSettings; - return this; - } - - /** - * Get the primaryMetric property: Primary metric for forecasting task. - * - * @return the primaryMetric value. - */ - public ForecastingPrimaryMetrics primaryMetric() { - return this.primaryMetric; - } - - /** - * Set the primaryMetric property: Primary metric for forecasting task. - * - * @param primaryMetric the primaryMetric value to set. - * @return the Forecasting object itself. - */ - public Forecasting withPrimaryMetric(ForecastingPrimaryMetrics primaryMetric) { - this.primaryMetric = primaryMetric; - return this; - } - - /** - * Get the dataSettings property: Data inputs for AutoMLJob. - * - * @return the dataSettings value. - */ - public TableVerticalDataSettings dataSettings() { - return this.dataSettings; - } - - /** - * Set the dataSettings property: Data inputs for AutoMLJob. - * - * @param dataSettings the dataSettings value to set. - * @return the Forecasting object itself. - */ - public Forecasting withDataSettings(TableVerticalDataSettings dataSettings) { - this.dataSettings = dataSettings; - return this; - } - - /** - * Get the featurizationSettings property: Featurization inputs needed for AutoML job. - * - * @return the featurizationSettings value. - */ - public TableVerticalFeaturizationSettings featurizationSettings() { - return this.featurizationSettings; - } - - /** - * Set the featurizationSettings property: Featurization inputs needed for AutoML job. - * - * @param featurizationSettings the featurizationSettings value to set. - * @return the Forecasting object itself. - */ - public Forecasting withFeaturizationSettings(TableVerticalFeaturizationSettings featurizationSettings) { - this.featurizationSettings = featurizationSettings; - return this; - } - - /** - * Get the limitSettings property: Execution constraints for AutoMLJob. - * - * @return the limitSettings value. - */ - public TableVerticalLimitSettings limitSettings() { - return this.limitSettings; - } - - /** - * Set the limitSettings property: Execution constraints for AutoMLJob. - * - * @param limitSettings the limitSettings value to set. - * @return the Forecasting object itself. - */ - public Forecasting withLimitSettings(TableVerticalLimitSettings limitSettings) { - this.limitSettings = limitSettings; - return this; - } - - /** - * Get the trainingSettings property: Inputs for training phase for an AutoML Job. - * - * @return the trainingSettings value. - */ - public TrainingSettings trainingSettings() { - return this.trainingSettings; - } - - /** - * Set the trainingSettings property: Inputs for training phase for an AutoML Job. - * - * @param trainingSettings the trainingSettings value to set. - * @return the Forecasting object itself. - */ - public Forecasting withTrainingSettings(TrainingSettings trainingSettings) { - this.trainingSettings = trainingSettings; - return this; - } - - /** {@inheritDoc} */ - @Override - public Forecasting withLogVerbosity(LogVerbosity logVerbosity) { - super.withLogVerbosity(logVerbosity); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (forecastingSettings() != null) { - forecastingSettings().validate(); - } - if (dataSettings() != null) { - dataSettings().validate(); - } - if (featurizationSettings() != null) { - featurizationSettings().validate(); - } - if (limitSettings() != null) { - limitSettings().validate(); - } - if (trainingSettings() != null) { - trainingSettings().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastingModels.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastingModels.java deleted file mode 100644 index 6af7db8b880b..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastingModels.java +++ /dev/null @@ -1,89 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for ForecastingModels. */ -public final class ForecastingModels extends ExpandableStringEnum { - /** Static value AutoArima for ForecastingModels. */ - public static final ForecastingModels AUTO_ARIMA = fromString("AutoArima"); - - /** Static value Prophet for ForecastingModels. */ - public static final ForecastingModels PROPHET = fromString("Prophet"); - - /** Static value Naive for ForecastingModels. */ - public static final ForecastingModels NAIVE = fromString("Naive"); - - /** Static value SeasonalNaive for ForecastingModels. */ - public static final ForecastingModels SEASONAL_NAIVE = fromString("SeasonalNaive"); - - /** Static value Average for ForecastingModels. */ - public static final ForecastingModels AVERAGE = fromString("Average"); - - /** Static value SeasonalAverage for ForecastingModels. */ - public static final ForecastingModels SEASONAL_AVERAGE = fromString("SeasonalAverage"); - - /** Static value ExponentialSmoothing for ForecastingModels. */ - public static final ForecastingModels EXPONENTIAL_SMOOTHING = fromString("ExponentialSmoothing"); - - /** Static value Arimax for ForecastingModels. */ - public static final ForecastingModels ARIMAX = fromString("Arimax"); - - /** Static value TCNForecaster for ForecastingModels. */ - public static final ForecastingModels TCNFORECASTER = fromString("TCNForecaster"); - - /** Static value ElasticNet for ForecastingModels. */ - public static final ForecastingModels ELASTIC_NET = fromString("ElasticNet"); - - /** Static value GradientBoosting for ForecastingModels. */ - public static final ForecastingModels GRADIENT_BOOSTING = fromString("GradientBoosting"); - - /** Static value DecisionTree for ForecastingModels. */ - public static final ForecastingModels DECISION_TREE = fromString("DecisionTree"); - - /** Static value KNN for ForecastingModels. */ - public static final ForecastingModels KNN = fromString("KNN"); - - /** Static value LassoLars for ForecastingModels. */ - public static final ForecastingModels LASSO_LARS = fromString("LassoLars"); - - /** Static value SGD for ForecastingModels. */ - public static final ForecastingModels SGD = fromString("SGD"); - - /** Static value RandomForest for ForecastingModels. */ - public static final ForecastingModels RANDOM_FOREST = fromString("RandomForest"); - - /** Static value ExtremeRandomTrees for ForecastingModels. */ - public static final ForecastingModels EXTREME_RANDOM_TREES = fromString("ExtremeRandomTrees"); - - /** Static value LightGBM for ForecastingModels. */ - public static final ForecastingModels LIGHT_GBM = fromString("LightGBM"); - - /** Static value XGBoostRegressor for ForecastingModels. */ - public static final ForecastingModels XGBOOST_REGRESSOR = fromString("XGBoostRegressor"); - - /** - * Creates or finds a ForecastingModels from its string representation. - * - * @param name a name to look for. - * @return the corresponding ForecastingModels. - */ - @JsonCreator - public static ForecastingModels fromString(String name) { - return fromString(name, ForecastingModels.class); - } - - /** - * Gets known ForecastingModels values. - * - * @return known ForecastingModels values. - */ - public static Collection values() { - return values(ForecastingModels.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastingPrimaryMetrics.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastingPrimaryMetrics.java deleted file mode 100644 index d9e5cdc97ea5..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastingPrimaryMetrics.java +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for ForecastingPrimaryMetrics. */ -public final class ForecastingPrimaryMetrics extends ExpandableStringEnum { - /** Static value SpearmanCorrelation for ForecastingPrimaryMetrics. */ - public static final ForecastingPrimaryMetrics SPEARMAN_CORRELATION = fromString("SpearmanCorrelation"); - - /** Static value NormalizedRootMeanSquaredError for ForecastingPrimaryMetrics. */ - public static final ForecastingPrimaryMetrics NORMALIZED_ROOT_MEAN_SQUARED_ERROR = - fromString("NormalizedRootMeanSquaredError"); - - /** Static value R2Score for ForecastingPrimaryMetrics. */ - public static final ForecastingPrimaryMetrics R2SCORE = fromString("R2Score"); - - /** Static value NormalizedMeanAbsoluteError for ForecastingPrimaryMetrics. */ - public static final ForecastingPrimaryMetrics NORMALIZED_MEAN_ABSOLUTE_ERROR = - fromString("NormalizedMeanAbsoluteError"); - - /** - * Creates or finds a ForecastingPrimaryMetrics from its string representation. - * - * @param name a name to look for. - * @return the corresponding ForecastingPrimaryMetrics. - */ - @JsonCreator - public static ForecastingPrimaryMetrics fromString(String name) { - return fromString(name, ForecastingPrimaryMetrics.class); - } - - /** - * Gets known ForecastingPrimaryMetrics values. - * - * @return known ForecastingPrimaryMetrics values. - */ - public static Collection values() { - return values(ForecastingPrimaryMetrics.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastingSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastingSettings.java deleted file mode 100644 index 69b4eac61902..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ForecastingSettings.java +++ /dev/null @@ -1,414 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - -/** Forecasting specific parameters. */ -@Fluent -public final class ForecastingSettings { - /* - * Country or region for holidays for forecasting tasks. - * These should be ISO 3166 two-letter country/region codes, for example - * 'US' or 'GB'. - */ - @JsonProperty(value = "countryOrRegionForHolidays") - private String countryOrRegionForHolidays; - - /* - * Number of periods between the origin time of one CV fold and the next - * fold. For - * example, if `CVStepSize` = 3 for daily data, the origin time for each - * fold will be - * three days apart. - */ - @JsonProperty(value = "cvStepSize") - private Integer cvStepSize; - - /* - * Flag for generating lags for the numeric features with 'auto' or null. - */ - @JsonProperty(value = "featureLags") - private FeatureLags featureLags; - - /* - * The desired maximum forecast horizon in units of time-series frequency. - */ - @JsonProperty(value = "forecastHorizon") - private ForecastHorizon forecastHorizon; - - /* - * When forecasting, this parameter represents the period with which the - * forecast is desired, for example daily, weekly, yearly, etc. The - * forecast frequency is dataset frequency by default. - */ - @JsonProperty(value = "frequency") - private String frequency; - - /* - * Set time series seasonality as an integer multiple of the series - * frequency. - * If seasonality is set to 'auto', it will be inferred. - */ - @JsonProperty(value = "seasonality") - private Seasonality seasonality; - - /* - * The parameter defining how if AutoML should handle short time series. - */ - @JsonProperty(value = "shortSeriesHandlingConfig") - private ShortSeriesHandlingConfiguration shortSeriesHandlingConfig; - - /* - * The function to be used to aggregate the time series target column to - * conform to a user specified frequency. - * If the TargetAggregateFunction is set i.e. not 'None', but the freq - * parameter is not set, the error is raised. The possible target - * aggregation functions are: "sum", "max", "min" and "mean". - */ - @JsonProperty(value = "targetAggregateFunction") - private TargetAggregationFunction targetAggregateFunction; - - /* - * The number of past periods to lag from the target column. - */ - @JsonProperty(value = "targetLags") - private TargetLags targetLags; - - /* - * The number of past periods used to create a rolling window average of - * the target column. - */ - @JsonProperty(value = "targetRollingWindowSize") - private TargetRollingWindowSize targetRollingWindowSize; - - /* - * The name of the time column. This parameter is required when forecasting - * to specify the datetime column in the input data used for building the - * time series and inferring its frequency. - */ - @JsonProperty(value = "timeColumnName") - private String timeColumnName; - - /* - * The names of columns used to group a timeseries. It can be used to - * create multiple series. - * If grain is not defined, the data set is assumed to be one time-series. - * This parameter is used with task type forecasting. - */ - @JsonProperty(value = "timeSeriesIdColumnNames") - private List timeSeriesIdColumnNames; - - /* - * Configure STL Decomposition of the time-series target column. - */ - @JsonProperty(value = "useStl") - private UseStl useStl; - - /** - * Get the countryOrRegionForHolidays property: Country or region for holidays for forecasting tasks. These should - * be ISO 3166 two-letter country/region codes, for example 'US' or 'GB'. - * - * @return the countryOrRegionForHolidays value. - */ - public String countryOrRegionForHolidays() { - return this.countryOrRegionForHolidays; - } - - /** - * Set the countryOrRegionForHolidays property: Country or region for holidays for forecasting tasks. These should - * be ISO 3166 two-letter country/region codes, for example 'US' or 'GB'. - * - * @param countryOrRegionForHolidays the countryOrRegionForHolidays value to set. - * @return the ForecastingSettings object itself. - */ - public ForecastingSettings withCountryOrRegionForHolidays(String countryOrRegionForHolidays) { - this.countryOrRegionForHolidays = countryOrRegionForHolidays; - return this; - } - - /** - * Get the cvStepSize property: Number of periods between the origin time of one CV fold and the next fold. For - * example, if `CVStepSize` = 3 for daily data, the origin time for each fold will be three days apart. - * - * @return the cvStepSize value. - */ - public Integer cvStepSize() { - return this.cvStepSize; - } - - /** - * Set the cvStepSize property: Number of periods between the origin time of one CV fold and the next fold. For - * example, if `CVStepSize` = 3 for daily data, the origin time for each fold will be three days apart. - * - * @param cvStepSize the cvStepSize value to set. - * @return the ForecastingSettings object itself. - */ - public ForecastingSettings withCvStepSize(Integer cvStepSize) { - this.cvStepSize = cvStepSize; - return this; - } - - /** - * Get the featureLags property: Flag for generating lags for the numeric features with 'auto' or null. - * - * @return the featureLags value. - */ - public FeatureLags featureLags() { - return this.featureLags; - } - - /** - * Set the featureLags property: Flag for generating lags for the numeric features with 'auto' or null. - * - * @param featureLags the featureLags value to set. - * @return the ForecastingSettings object itself. - */ - public ForecastingSettings withFeatureLags(FeatureLags featureLags) { - this.featureLags = featureLags; - return this; - } - - /** - * Get the forecastHorizon property: The desired maximum forecast horizon in units of time-series frequency. - * - * @return the forecastHorizon value. - */ - public ForecastHorizon forecastHorizon() { - return this.forecastHorizon; - } - - /** - * Set the forecastHorizon property: The desired maximum forecast horizon in units of time-series frequency. - * - * @param forecastHorizon the forecastHorizon value to set. - * @return the ForecastingSettings object itself. - */ - public ForecastingSettings withForecastHorizon(ForecastHorizon forecastHorizon) { - this.forecastHorizon = forecastHorizon; - return this; - } - - /** - * Get the frequency property: When forecasting, this parameter represents the period with which the forecast is - * desired, for example daily, weekly, yearly, etc. The forecast frequency is dataset frequency by default. - * - * @return the frequency value. - */ - public String frequency() { - return this.frequency; - } - - /** - * Set the frequency property: When forecasting, this parameter represents the period with which the forecast is - * desired, for example daily, weekly, yearly, etc. The forecast frequency is dataset frequency by default. - * - * @param frequency the frequency value to set. - * @return the ForecastingSettings object itself. - */ - public ForecastingSettings withFrequency(String frequency) { - this.frequency = frequency; - return this; - } - - /** - * Get the seasonality property: Set time series seasonality as an integer multiple of the series frequency. If - * seasonality is set to 'auto', it will be inferred. - * - * @return the seasonality value. - */ - public Seasonality seasonality() { - return this.seasonality; - } - - /** - * Set the seasonality property: Set time series seasonality as an integer multiple of the series frequency. If - * seasonality is set to 'auto', it will be inferred. - * - * @param seasonality the seasonality value to set. - * @return the ForecastingSettings object itself. - */ - public ForecastingSettings withSeasonality(Seasonality seasonality) { - this.seasonality = seasonality; - return this; - } - - /** - * Get the shortSeriesHandlingConfig property: The parameter defining how if AutoML should handle short time series. - * - * @return the shortSeriesHandlingConfig value. - */ - public ShortSeriesHandlingConfiguration shortSeriesHandlingConfig() { - return this.shortSeriesHandlingConfig; - } - - /** - * Set the shortSeriesHandlingConfig property: The parameter defining how if AutoML should handle short time series. - * - * @param shortSeriesHandlingConfig the shortSeriesHandlingConfig value to set. - * @return the ForecastingSettings object itself. - */ - public ForecastingSettings withShortSeriesHandlingConfig( - ShortSeriesHandlingConfiguration shortSeriesHandlingConfig) { - this.shortSeriesHandlingConfig = shortSeriesHandlingConfig; - return this; - } - - /** - * Get the targetAggregateFunction property: The function to be used to aggregate the time series target column to - * conform to a user specified frequency. If the TargetAggregateFunction is set i.e. not 'None', but the freq - * parameter is not set, the error is raised. The possible target aggregation functions are: "sum", "max", "min" and - * "mean". - * - * @return the targetAggregateFunction value. - */ - public TargetAggregationFunction targetAggregateFunction() { - return this.targetAggregateFunction; - } - - /** - * Set the targetAggregateFunction property: The function to be used to aggregate the time series target column to - * conform to a user specified frequency. If the TargetAggregateFunction is set i.e. not 'None', but the freq - * parameter is not set, the error is raised. The possible target aggregation functions are: "sum", "max", "min" and - * "mean". - * - * @param targetAggregateFunction the targetAggregateFunction value to set. - * @return the ForecastingSettings object itself. - */ - public ForecastingSettings withTargetAggregateFunction(TargetAggregationFunction targetAggregateFunction) { - this.targetAggregateFunction = targetAggregateFunction; - return this; - } - - /** - * Get the targetLags property: The number of past periods to lag from the target column. - * - * @return the targetLags value. - */ - public TargetLags targetLags() { - return this.targetLags; - } - - /** - * Set the targetLags property: The number of past periods to lag from the target column. - * - * @param targetLags the targetLags value to set. - * @return the ForecastingSettings object itself. - */ - public ForecastingSettings withTargetLags(TargetLags targetLags) { - this.targetLags = targetLags; - return this; - } - - /** - * Get the targetRollingWindowSize property: The number of past periods used to create a rolling window average of - * the target column. - * - * @return the targetRollingWindowSize value. - */ - public TargetRollingWindowSize targetRollingWindowSize() { - return this.targetRollingWindowSize; - } - - /** - * Set the targetRollingWindowSize property: The number of past periods used to create a rolling window average of - * the target column. - * - * @param targetRollingWindowSize the targetRollingWindowSize value to set. - * @return the ForecastingSettings object itself. - */ - public ForecastingSettings withTargetRollingWindowSize(TargetRollingWindowSize targetRollingWindowSize) { - this.targetRollingWindowSize = targetRollingWindowSize; - return this; - } - - /** - * Get the timeColumnName property: The name of the time column. This parameter is required when forecasting to - * specify the datetime column in the input data used for building the time series and inferring its frequency. - * - * @return the timeColumnName value. - */ - public String timeColumnName() { - return this.timeColumnName; - } - - /** - * Set the timeColumnName property: The name of the time column. This parameter is required when forecasting to - * specify the datetime column in the input data used for building the time series and inferring its frequency. - * - * @param timeColumnName the timeColumnName value to set. - * @return the ForecastingSettings object itself. - */ - public ForecastingSettings withTimeColumnName(String timeColumnName) { - this.timeColumnName = timeColumnName; - return this; - } - - /** - * Get the timeSeriesIdColumnNames property: The names of columns used to group a timeseries. It can be used to - * create multiple series. If grain is not defined, the data set is assumed to be one time-series. This parameter is - * used with task type forecasting. - * - * @return the timeSeriesIdColumnNames value. - */ - public List timeSeriesIdColumnNames() { - return this.timeSeriesIdColumnNames; - } - - /** - * Set the timeSeriesIdColumnNames property: The names of columns used to group a timeseries. It can be used to - * create multiple series. If grain is not defined, the data set is assumed to be one time-series. This parameter is - * used with task type forecasting. - * - * @param timeSeriesIdColumnNames the timeSeriesIdColumnNames value to set. - * @return the ForecastingSettings object itself. - */ - public ForecastingSettings withTimeSeriesIdColumnNames(List timeSeriesIdColumnNames) { - this.timeSeriesIdColumnNames = timeSeriesIdColumnNames; - return this; - } - - /** - * Get the useStl property: Configure STL Decomposition of the time-series target column. - * - * @return the useStl value. - */ - public UseStl useStl() { - return this.useStl; - } - - /** - * Set the useStl property: Configure STL Decomposition of the time-series target column. - * - * @param useStl the useStl value to set. - * @return the ForecastingSettings object itself. - */ - public ForecastingSettings withUseStl(UseStl useStl) { - this.useStl = useStl; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (forecastHorizon() != null) { - forecastHorizon().validate(); - } - if (seasonality() != null) { - seasonality().validate(); - } - if (targetLags() != null) { - targetLags().validate(); - } - if (targetRollingWindowSize() != null) { - targetRollingWindowSize().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/HdfsDatastore.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/HdfsDatastore.java deleted file mode 100644 index 78657ac863ea..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/HdfsDatastore.java +++ /dev/null @@ -1,144 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.util.Map; - -/** The HdfsDatastore model. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "datastoreType") -@JsonTypeName("Hdfs") -@Fluent -public final class HdfsDatastore extends DatastoreDetails { - /* - * The TLS cert of the HDFS server. Needs to be a base64 encoded string. - * Required if "Https" protocol is selected. - */ - @JsonProperty(value = "hdfsServerCertificate") - private String hdfsServerCertificate; - - /* - * [Required] IP Address or DNS HostName. - */ - @JsonProperty(value = "nameNodeAddress", required = true) - private String nameNodeAddress; - - /* - * Protocol used to communicate with the storage account (Https/Http). - */ - @JsonProperty(value = "protocol") - private String protocol; - - /** - * Get the hdfsServerCertificate property: The TLS cert of the HDFS server. Needs to be a base64 encoded string. - * Required if "Https" protocol is selected. - * - * @return the hdfsServerCertificate value. - */ - public String hdfsServerCertificate() { - return this.hdfsServerCertificate; - } - - /** - * Set the hdfsServerCertificate property: The TLS cert of the HDFS server. Needs to be a base64 encoded string. - * Required if "Https" protocol is selected. - * - * @param hdfsServerCertificate the hdfsServerCertificate value to set. - * @return the HdfsDatastore object itself. - */ - public HdfsDatastore withHdfsServerCertificate(String hdfsServerCertificate) { - this.hdfsServerCertificate = hdfsServerCertificate; - return this; - } - - /** - * Get the nameNodeAddress property: [Required] IP Address or DNS HostName. - * - * @return the nameNodeAddress value. - */ - public String nameNodeAddress() { - return this.nameNodeAddress; - } - - /** - * Set the nameNodeAddress property: [Required] IP Address or DNS HostName. - * - * @param nameNodeAddress the nameNodeAddress value to set. - * @return the HdfsDatastore object itself. - */ - public HdfsDatastore withNameNodeAddress(String nameNodeAddress) { - this.nameNodeAddress = nameNodeAddress; - return this; - } - - /** - * Get the protocol property: Protocol used to communicate with the storage account (Https/Http). - * - * @return the protocol value. - */ - public String protocol() { - return this.protocol; - } - - /** - * Set the protocol property: Protocol used to communicate with the storage account (Https/Http). - * - * @param protocol the protocol value to set. - * @return the HdfsDatastore object itself. - */ - public HdfsDatastore withProtocol(String protocol) { - this.protocol = protocol; - return this; - } - - /** {@inheritDoc} */ - @Override - public HdfsDatastore withCredentials(DatastoreCredentials credentials) { - super.withCredentials(credentials); - return this; - } - - /** {@inheritDoc} */ - @Override - public HdfsDatastore withDescription(String description) { - super.withDescription(description); - return this; - } - - /** {@inheritDoc} */ - @Override - public HdfsDatastore withProperties(Map properties) { - super.withProperties(properties); - return this; - } - - /** {@inheritDoc} */ - @Override - public HdfsDatastore withTags(Map tags) { - super.withTags(tags); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (nameNodeAddress() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException("Missing required property nameNodeAddress in model HdfsDatastore")); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(HdfsDatastore.class); -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageClassification.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageClassification.java deleted file mode 100644 index 752eb27aa901..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageClassification.java +++ /dev/null @@ -1,227 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.util.List; - -/** - * Image Classification. Multi-class image classification is used when an image is classified with only a single label - * from a set of classes - e.g. each image is classified as either an image of a 'cat' or a 'dog' or a 'duck'. - */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType") -@JsonTypeName("ImageClassification") -@Fluent -public final class ImageClassification extends AutoMLVertical { - /* - * Primary metric to optimize for this task. - */ - @JsonProperty(value = "primaryMetric") - private ClassificationPrimaryMetrics primaryMetric; - - /* - * Settings used for training the model. - */ - @JsonProperty(value = "modelSettings") - private ImageModelSettingsClassification modelSettings; - - /* - * Search space for sampling different combinations of models and their - * hyperparameters. - */ - @JsonProperty(value = "searchSpace") - private List searchSpace; - - /* - * [Required] Collection of registered Tabular Dataset Ids and other data - * settings required for training and validating models. - */ - @JsonProperty(value = "dataSettings", required = true) - private ImageVerticalDataSettings dataSettings; - - /* - * [Required] Limit settings for the AutoML job. - */ - @JsonProperty(value = "limitSettings", required = true) - private ImageLimitSettings limitSettings; - - /* - * Model sweeping and hyperparameter sweeping related settings. - */ - @JsonProperty(value = "sweepSettings") - private ImageSweepSettings sweepSettings; - - /** - * Get the primaryMetric property: Primary metric to optimize for this task. - * - * @return the primaryMetric value. - */ - public ClassificationPrimaryMetrics primaryMetric() { - return this.primaryMetric; - } - - /** - * Set the primaryMetric property: Primary metric to optimize for this task. - * - * @param primaryMetric the primaryMetric value to set. - * @return the ImageClassification object itself. - */ - public ImageClassification withPrimaryMetric(ClassificationPrimaryMetrics primaryMetric) { - this.primaryMetric = primaryMetric; - return this; - } - - /** - * Get the modelSettings property: Settings used for training the model. - * - * @return the modelSettings value. - */ - public ImageModelSettingsClassification modelSettings() { - return this.modelSettings; - } - - /** - * Set the modelSettings property: Settings used for training the model. - * - * @param modelSettings the modelSettings value to set. - * @return the ImageClassification object itself. - */ - public ImageClassification withModelSettings(ImageModelSettingsClassification modelSettings) { - this.modelSettings = modelSettings; - return this; - } - - /** - * Get the searchSpace property: Search space for sampling different combinations of models and their - * hyperparameters. - * - * @return the searchSpace value. - */ - public List searchSpace() { - return this.searchSpace; - } - - /** - * Set the searchSpace property: Search space for sampling different combinations of models and their - * hyperparameters. - * - * @param searchSpace the searchSpace value to set. - * @return the ImageClassification object itself. - */ - public ImageClassification withSearchSpace(List searchSpace) { - this.searchSpace = searchSpace; - return this; - } - - /** - * Get the dataSettings property: [Required] Collection of registered Tabular Dataset Ids and other data settings - * required for training and validating models. - * - * @return the dataSettings value. - */ - public ImageVerticalDataSettings dataSettings() { - return this.dataSettings; - } - - /** - * Set the dataSettings property: [Required] Collection of registered Tabular Dataset Ids and other data settings - * required for training and validating models. - * - * @param dataSettings the dataSettings value to set. - * @return the ImageClassification object itself. - */ - public ImageClassification withDataSettings(ImageVerticalDataSettings dataSettings) { - this.dataSettings = dataSettings; - return this; - } - - /** - * Get the limitSettings property: [Required] Limit settings for the AutoML job. - * - * @return the limitSettings value. - */ - public ImageLimitSettings limitSettings() { - return this.limitSettings; - } - - /** - * Set the limitSettings property: [Required] Limit settings for the AutoML job. - * - * @param limitSettings the limitSettings value to set. - * @return the ImageClassification object itself. - */ - public ImageClassification withLimitSettings(ImageLimitSettings limitSettings) { - this.limitSettings = limitSettings; - return this; - } - - /** - * Get the sweepSettings property: Model sweeping and hyperparameter sweeping related settings. - * - * @return the sweepSettings value. - */ - public ImageSweepSettings sweepSettings() { - return this.sweepSettings; - } - - /** - * Set the sweepSettings property: Model sweeping and hyperparameter sweeping related settings. - * - * @param sweepSettings the sweepSettings value to set. - * @return the ImageClassification object itself. - */ - public ImageClassification withSweepSettings(ImageSweepSettings sweepSettings) { - this.sweepSettings = sweepSettings; - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageClassification withLogVerbosity(LogVerbosity logVerbosity) { - super.withLogVerbosity(logVerbosity); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (modelSettings() != null) { - modelSettings().validate(); - } - if (searchSpace() != null) { - searchSpace().forEach(e -> e.validate()); - } - if (dataSettings() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property dataSettings in model ImageClassification")); - } else { - dataSettings().validate(); - } - if (limitSettings() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property limitSettings in model ImageClassification")); - } else { - limitSettings().validate(); - } - if (sweepSettings() != null) { - sweepSettings().validate(); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(ImageClassification.class); -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageClassificationBase.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageClassificationBase.java deleted file mode 100644 index 2c7c7d78b678..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageClassificationBase.java +++ /dev/null @@ -1,105 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - -/** The ImageClassificationBase model. */ -@Fluent -public class ImageClassificationBase extends ImageVertical { - /* - * Settings used for training the model. - */ - @JsonProperty(value = "modelSettings") - private ImageModelSettingsClassification modelSettings; - - /* - * Search space for sampling different combinations of models and their - * hyperparameters. - */ - @JsonProperty(value = "searchSpace") - private List searchSpace; - - /** - * Get the modelSettings property: Settings used for training the model. - * - * @return the modelSettings value. - */ - public ImageModelSettingsClassification modelSettings() { - return this.modelSettings; - } - - /** - * Set the modelSettings property: Settings used for training the model. - * - * @param modelSettings the modelSettings value to set. - * @return the ImageClassificationBase object itself. - */ - public ImageClassificationBase withModelSettings(ImageModelSettingsClassification modelSettings) { - this.modelSettings = modelSettings; - return this; - } - - /** - * Get the searchSpace property: Search space for sampling different combinations of models and their - * hyperparameters. - * - * @return the searchSpace value. - */ - public List searchSpace() { - return this.searchSpace; - } - - /** - * Set the searchSpace property: Search space for sampling different combinations of models and their - * hyperparameters. - * - * @param searchSpace the searchSpace value to set. - * @return the ImageClassificationBase object itself. - */ - public ImageClassificationBase withSearchSpace(List searchSpace) { - this.searchSpace = searchSpace; - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageClassificationBase withDataSettings(ImageVerticalDataSettings dataSettings) { - super.withDataSettings(dataSettings); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageClassificationBase withLimitSettings(ImageLimitSettings limitSettings) { - super.withLimitSettings(limitSettings); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageClassificationBase withSweepSettings(ImageSweepSettings sweepSettings) { - super.withSweepSettings(sweepSettings); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (modelSettings() != null) { - modelSettings().validate(); - } - if (searchSpace() != null) { - searchSpace().forEach(e -> e.validate()); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageClassificationMultilabel.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageClassificationMultilabel.java deleted file mode 100644 index fe1a688746df..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageClassificationMultilabel.java +++ /dev/null @@ -1,228 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.util.List; - -/** - * Image Classification Multilabel. Multi-label image classification is used when an image could have one or more labels - * from a set of labels - e.g. an image could be labeled with both 'cat' and 'dog'. - */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType") -@JsonTypeName("ImageClassificationMultilabel") -@Fluent -public final class ImageClassificationMultilabel extends AutoMLVertical { - /* - * Primary metric to optimize for this task. - */ - @JsonProperty(value = "primaryMetric") - private ClassificationMultilabelPrimaryMetrics primaryMetric; - - /* - * Settings used for training the model. - */ - @JsonProperty(value = "modelSettings") - private ImageModelSettingsClassification modelSettings; - - /* - * Search space for sampling different combinations of models and their - * hyperparameters. - */ - @JsonProperty(value = "searchSpace") - private List searchSpace; - - /* - * [Required] Collection of registered Tabular Dataset Ids and other data - * settings required for training and validating models. - */ - @JsonProperty(value = "dataSettings", required = true) - private ImageVerticalDataSettings dataSettings; - - /* - * [Required] Limit settings for the AutoML job. - */ - @JsonProperty(value = "limitSettings", required = true) - private ImageLimitSettings limitSettings; - - /* - * Model sweeping and hyperparameter sweeping related settings. - */ - @JsonProperty(value = "sweepSettings") - private ImageSweepSettings sweepSettings; - - /** - * Get the primaryMetric property: Primary metric to optimize for this task. - * - * @return the primaryMetric value. - */ - public ClassificationMultilabelPrimaryMetrics primaryMetric() { - return this.primaryMetric; - } - - /** - * Set the primaryMetric property: Primary metric to optimize for this task. - * - * @param primaryMetric the primaryMetric value to set. - * @return the ImageClassificationMultilabel object itself. - */ - public ImageClassificationMultilabel withPrimaryMetric(ClassificationMultilabelPrimaryMetrics primaryMetric) { - this.primaryMetric = primaryMetric; - return this; - } - - /** - * Get the modelSettings property: Settings used for training the model. - * - * @return the modelSettings value. - */ - public ImageModelSettingsClassification modelSettings() { - return this.modelSettings; - } - - /** - * Set the modelSettings property: Settings used for training the model. - * - * @param modelSettings the modelSettings value to set. - * @return the ImageClassificationMultilabel object itself. - */ - public ImageClassificationMultilabel withModelSettings(ImageModelSettingsClassification modelSettings) { - this.modelSettings = modelSettings; - return this; - } - - /** - * Get the searchSpace property: Search space for sampling different combinations of models and their - * hyperparameters. - * - * @return the searchSpace value. - */ - public List searchSpace() { - return this.searchSpace; - } - - /** - * Set the searchSpace property: Search space for sampling different combinations of models and their - * hyperparameters. - * - * @param searchSpace the searchSpace value to set. - * @return the ImageClassificationMultilabel object itself. - */ - public ImageClassificationMultilabel withSearchSpace( - List searchSpace) { - this.searchSpace = searchSpace; - return this; - } - - /** - * Get the dataSettings property: [Required] Collection of registered Tabular Dataset Ids and other data settings - * required for training and validating models. - * - * @return the dataSettings value. - */ - public ImageVerticalDataSettings dataSettings() { - return this.dataSettings; - } - - /** - * Set the dataSettings property: [Required] Collection of registered Tabular Dataset Ids and other data settings - * required for training and validating models. - * - * @param dataSettings the dataSettings value to set. - * @return the ImageClassificationMultilabel object itself. - */ - public ImageClassificationMultilabel withDataSettings(ImageVerticalDataSettings dataSettings) { - this.dataSettings = dataSettings; - return this; - } - - /** - * Get the limitSettings property: [Required] Limit settings for the AutoML job. - * - * @return the limitSettings value. - */ - public ImageLimitSettings limitSettings() { - return this.limitSettings; - } - - /** - * Set the limitSettings property: [Required] Limit settings for the AutoML job. - * - * @param limitSettings the limitSettings value to set. - * @return the ImageClassificationMultilabel object itself. - */ - public ImageClassificationMultilabel withLimitSettings(ImageLimitSettings limitSettings) { - this.limitSettings = limitSettings; - return this; - } - - /** - * Get the sweepSettings property: Model sweeping and hyperparameter sweeping related settings. - * - * @return the sweepSettings value. - */ - public ImageSweepSettings sweepSettings() { - return this.sweepSettings; - } - - /** - * Set the sweepSettings property: Model sweeping and hyperparameter sweeping related settings. - * - * @param sweepSettings the sweepSettings value to set. - * @return the ImageClassificationMultilabel object itself. - */ - public ImageClassificationMultilabel withSweepSettings(ImageSweepSettings sweepSettings) { - this.sweepSettings = sweepSettings; - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageClassificationMultilabel withLogVerbosity(LogVerbosity logVerbosity) { - super.withLogVerbosity(logVerbosity); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (modelSettings() != null) { - modelSettings().validate(); - } - if (searchSpace() != null) { - searchSpace().forEach(e -> e.validate()); - } - if (dataSettings() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property dataSettings in model ImageClassificationMultilabel")); - } else { - dataSettings().validate(); - } - if (limitSettings() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property limitSettings in model ImageClassificationMultilabel")); - } else { - limitSettings().validate(); - } - if (sweepSettings() != null) { - sweepSettings().validate(); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(ImageClassificationMultilabel.class); -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageInstanceSegmentation.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageInstanceSegmentation.java deleted file mode 100644 index c0ba2ca2140b..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageInstanceSegmentation.java +++ /dev/null @@ -1,227 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.util.List; - -/** - * Image Instance Segmentation. Instance segmentation is used to identify objects in an image at the pixel level, - * drawing a polygon around each object in the image. - */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType") -@JsonTypeName("ImageInstanceSegmentation") -@Fluent -public final class ImageInstanceSegmentation extends AutoMLVertical { - /* - * Primary metric to optimize for this task. - */ - @JsonProperty(value = "primaryMetric") - private InstanceSegmentationPrimaryMetrics primaryMetric; - - /* - * Settings used for training the model. - */ - @JsonProperty(value = "modelSettings") - private ImageModelSettingsObjectDetection modelSettings; - - /* - * Search space for sampling different combinations of models and their - * hyperparameters. - */ - @JsonProperty(value = "searchSpace") - private List searchSpace; - - /* - * [Required] Collection of registered Tabular Dataset Ids and other data - * settings required for training and validating models. - */ - @JsonProperty(value = "dataSettings", required = true) - private ImageVerticalDataSettings dataSettings; - - /* - * [Required] Limit settings for the AutoML job. - */ - @JsonProperty(value = "limitSettings", required = true) - private ImageLimitSettings limitSettings; - - /* - * Model sweeping and hyperparameter sweeping related settings. - */ - @JsonProperty(value = "sweepSettings") - private ImageSweepSettings sweepSettings; - - /** - * Get the primaryMetric property: Primary metric to optimize for this task. - * - * @return the primaryMetric value. - */ - public InstanceSegmentationPrimaryMetrics primaryMetric() { - return this.primaryMetric; - } - - /** - * Set the primaryMetric property: Primary metric to optimize for this task. - * - * @param primaryMetric the primaryMetric value to set. - * @return the ImageInstanceSegmentation object itself. - */ - public ImageInstanceSegmentation withPrimaryMetric(InstanceSegmentationPrimaryMetrics primaryMetric) { - this.primaryMetric = primaryMetric; - return this; - } - - /** - * Get the modelSettings property: Settings used for training the model. - * - * @return the modelSettings value. - */ - public ImageModelSettingsObjectDetection modelSettings() { - return this.modelSettings; - } - - /** - * Set the modelSettings property: Settings used for training the model. - * - * @param modelSettings the modelSettings value to set. - * @return the ImageInstanceSegmentation object itself. - */ - public ImageInstanceSegmentation withModelSettings(ImageModelSettingsObjectDetection modelSettings) { - this.modelSettings = modelSettings; - return this; - } - - /** - * Get the searchSpace property: Search space for sampling different combinations of models and their - * hyperparameters. - * - * @return the searchSpace value. - */ - public List searchSpace() { - return this.searchSpace; - } - - /** - * Set the searchSpace property: Search space for sampling different combinations of models and their - * hyperparameters. - * - * @param searchSpace the searchSpace value to set. - * @return the ImageInstanceSegmentation object itself. - */ - public ImageInstanceSegmentation withSearchSpace(List searchSpace) { - this.searchSpace = searchSpace; - return this; - } - - /** - * Get the dataSettings property: [Required] Collection of registered Tabular Dataset Ids and other data settings - * required for training and validating models. - * - * @return the dataSettings value. - */ - public ImageVerticalDataSettings dataSettings() { - return this.dataSettings; - } - - /** - * Set the dataSettings property: [Required] Collection of registered Tabular Dataset Ids and other data settings - * required for training and validating models. - * - * @param dataSettings the dataSettings value to set. - * @return the ImageInstanceSegmentation object itself. - */ - public ImageInstanceSegmentation withDataSettings(ImageVerticalDataSettings dataSettings) { - this.dataSettings = dataSettings; - return this; - } - - /** - * Get the limitSettings property: [Required] Limit settings for the AutoML job. - * - * @return the limitSettings value. - */ - public ImageLimitSettings limitSettings() { - return this.limitSettings; - } - - /** - * Set the limitSettings property: [Required] Limit settings for the AutoML job. - * - * @param limitSettings the limitSettings value to set. - * @return the ImageInstanceSegmentation object itself. - */ - public ImageInstanceSegmentation withLimitSettings(ImageLimitSettings limitSettings) { - this.limitSettings = limitSettings; - return this; - } - - /** - * Get the sweepSettings property: Model sweeping and hyperparameter sweeping related settings. - * - * @return the sweepSettings value. - */ - public ImageSweepSettings sweepSettings() { - return this.sweepSettings; - } - - /** - * Set the sweepSettings property: Model sweeping and hyperparameter sweeping related settings. - * - * @param sweepSettings the sweepSettings value to set. - * @return the ImageInstanceSegmentation object itself. - */ - public ImageInstanceSegmentation withSweepSettings(ImageSweepSettings sweepSettings) { - this.sweepSettings = sweepSettings; - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageInstanceSegmentation withLogVerbosity(LogVerbosity logVerbosity) { - super.withLogVerbosity(logVerbosity); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (modelSettings() != null) { - modelSettings().validate(); - } - if (searchSpace() != null) { - searchSpace().forEach(e -> e.validate()); - } - if (dataSettings() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property dataSettings in model ImageInstanceSegmentation")); - } else { - dataSettings().validate(); - } - if (limitSettings() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property limitSettings in model ImageInstanceSegmentation")); - } else { - limitSettings().validate(); - } - if (sweepSettings() != null) { - sweepSettings().validate(); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(ImageInstanceSegmentation.class); -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageLimitSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageLimitSettings.java deleted file mode 100644 index 470ee3ddfa6e..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageLimitSettings.java +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.time.Duration; - -/** Limit settings for the AutoML job. */ -@Fluent -public final class ImageLimitSettings { - /* - * Maximum number of concurrent AutoML iterations. - */ - @JsonProperty(value = "maxConcurrentTrials") - private Integer maxConcurrentTrials; - - /* - * Maximum number of AutoML iterations. - */ - @JsonProperty(value = "maxTrials") - private Integer maxTrials; - - /* - * AutoML job timeout. - */ - @JsonProperty(value = "timeout") - private Duration timeout; - - /** - * Get the maxConcurrentTrials property: Maximum number of concurrent AutoML iterations. - * - * @return the maxConcurrentTrials value. - */ - public Integer maxConcurrentTrials() { - return this.maxConcurrentTrials; - } - - /** - * Set the maxConcurrentTrials property: Maximum number of concurrent AutoML iterations. - * - * @param maxConcurrentTrials the maxConcurrentTrials value to set. - * @return the ImageLimitSettings object itself. - */ - public ImageLimitSettings withMaxConcurrentTrials(Integer maxConcurrentTrials) { - this.maxConcurrentTrials = maxConcurrentTrials; - return this; - } - - /** - * Get the maxTrials property: Maximum number of AutoML iterations. - * - * @return the maxTrials value. - */ - public Integer maxTrials() { - return this.maxTrials; - } - - /** - * Set the maxTrials property: Maximum number of AutoML iterations. - * - * @param maxTrials the maxTrials value to set. - * @return the ImageLimitSettings object itself. - */ - public ImageLimitSettings withMaxTrials(Integer maxTrials) { - this.maxTrials = maxTrials; - return this; - } - - /** - * Get the timeout property: AutoML job timeout. - * - * @return the timeout value. - */ - public Duration timeout() { - return this.timeout; - } - - /** - * Set the timeout property: AutoML job timeout. - * - * @param timeout the timeout value to set. - * @return the ImageLimitSettings object itself. - */ - public ImageLimitSettings withTimeout(Duration timeout) { - this.timeout = timeout; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelDistributionSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelDistributionSettings.java deleted file mode 100644 index 7632a871cbdc..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelDistributionSettings.java +++ /dev/null @@ -1,848 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Distribution expressions to sweep over values of model settings. <example> Some examples are: <code> - * ModelName = "choice('seresnext', 'resnest50')"; LearningRate = "uniform(0.001, 0.01)"; LayersToFreeze = "choice(0, - * 2)"; </code></example> All distributions can be specified as distribution_name(min, max) or choice(val1, - * val2, ..., valn) where distribution name can be: uniform, quniform, loguniform, etc For more details on how to - * compose distribution expressions please check the documentation: - * https://docs.microsoft.com/en-us/azure/machine-learning/how-to-tune-hyperparameters For more information on the - * available settings please visit the official documentation: - * https://docs.microsoft.com/en-us/azure/machine-learning/how-to-auto-train-image-models. - */ -@Fluent -public class ImageModelDistributionSettings { - /* - * Enable AMSGrad when optimizer is 'adam' or 'adamw'. - */ - @JsonProperty(value = "amsGradient") - private String amsGradient; - - /* - * Settings for using Augmentations. - */ - @JsonProperty(value = "augmentations") - private String augmentations; - - /* - * Value of 'beta1' when optimizer is 'adam' or 'adamw'. Must be a float in - * the range [0, 1]. - */ - @JsonProperty(value = "beta1") - private String beta1; - - /* - * Value of 'beta2' when optimizer is 'adam' or 'adamw'. Must be a float in - * the range [0, 1]. - */ - @JsonProperty(value = "beta2") - private String beta2; - - /* - * Whether to use distributer training. - */ - @JsonProperty(value = "distributed") - private String distributed; - - /* - * Enable early stopping logic during training. - */ - @JsonProperty(value = "earlyStopping") - private String earlyStopping; - - /* - * Minimum number of epochs or validation evaluations to wait before - * primary metric improvement - * is tracked for early stopping. Must be a positive integer. - */ - @JsonProperty(value = "earlyStoppingDelay") - private String earlyStoppingDelay; - - /* - * Minimum number of epochs or validation evaluations with no primary - * metric improvement before - * the run is stopped. Must be a positive integer. - */ - @JsonProperty(value = "earlyStoppingPatience") - private String earlyStoppingPatience; - - /* - * Enable normalization when exporting ONNX model. - */ - @JsonProperty(value = "enableOnnxNormalization") - private String enableOnnxNormalization; - - /* - * Frequency to evaluate validation dataset to get metric scores. Must be a - * positive integer. - */ - @JsonProperty(value = "evaluationFrequency") - private String evaluationFrequency; - - /* - * Gradient accumulation means running a configured number of - * "GradAccumulationStep"\ steps without - * updating the model weights while accumulating the gradients of those - * steps, and then using - * the accumulated gradients to compute the weight updates. Must be a - * positive integer. - */ - @JsonProperty(value = "gradientAccumulationStep") - private String gradientAccumulationStep; - - /* - * Number of layers to freeze for the model. Must be a positive integer. - * For instance, passing 2 as value for 'seresnext' means - * freezing layer0 and layer1. For a full list of models supported and - * details on layer freeze, please - * see: - * https://docs.microsoft.com/en-us/azure/machine-learning/how-to-auto-train-image-models. - */ - @JsonProperty(value = "layersToFreeze") - private String layersToFreeze; - - /* - * Initial learning rate. Must be a float in the range [0, 1]. - */ - @JsonProperty(value = "learningRate") - private String learningRate; - - /* - * Type of learning rate scheduler. Must be 'warmup_cosine' or 'step'. - */ - @JsonProperty(value = "learningRateScheduler") - private String learningRateScheduler; - - /* - * Name of the model to use for training. - * For more information on the available models please visit the official - * documentation: - * https://docs.microsoft.com/en-us/azure/machine-learning/how-to-auto-train-image-models. - */ - @JsonProperty(value = "modelName") - private String modelName; - - /* - * Value of momentum when optimizer is 'sgd'. Must be a float in the range - * [0, 1]. - */ - @JsonProperty(value = "momentum") - private String momentum; - - /* - * Enable nesterov when optimizer is 'sgd'. - */ - @JsonProperty(value = "nesterov") - private String nesterov; - - /* - * Number of training epochs. Must be a positive integer. - */ - @JsonProperty(value = "numberOfEpochs") - private String numberOfEpochs; - - /* - * Number of data loader workers. Must be a non-negative integer. - */ - @JsonProperty(value = "numberOfWorkers") - private String numberOfWorkers; - - /* - * Type of optimizer. Must be either 'sgd', 'adam', or 'adamw'. - */ - @JsonProperty(value = "optimizer") - private String optimizer; - - /* - * Random seed to be used when using deterministic training. - */ - @JsonProperty(value = "randomSeed") - private String randomSeed; - - /* - * If validation data is not defined, this specifies the split ratio for - * splitting - * train data into random train and validation subsets. Must be a float in - * the range [0, 1]. - */ - @JsonProperty(value = "splitRatio") - private String splitRatio; - - /* - * Value of gamma when learning rate scheduler is 'step'. Must be a float - * in the range [0, 1]. - */ - @JsonProperty(value = "stepLRGamma") - private String stepLRGamma; - - /* - * Value of step size when learning rate scheduler is 'step'. Must be a - * positive integer. - */ - @JsonProperty(value = "stepLRStepSize") - private String stepLRStepSize; - - /* - * Training batch size. Must be a positive integer. - */ - @JsonProperty(value = "trainingBatchSize") - private String trainingBatchSize; - - /* - * Validation batch size. Must be a positive integer. - */ - @JsonProperty(value = "validationBatchSize") - private String validationBatchSize; - - /* - * Value of cosine cycle when learning rate scheduler is 'warmup_cosine'. - * Must be a float in the range [0, 1]. - */ - @JsonProperty(value = "warmupCosineLRCycles") - private String warmupCosineLRCycles; - - /* - * Value of warmup epochs when learning rate scheduler is 'warmup_cosine'. - * Must be a positive integer. - */ - @JsonProperty(value = "warmupCosineLRWarmupEpochs") - private String warmupCosineLRWarmupEpochs; - - /* - * Value of weight decay when optimizer is 'sgd', 'adam', or 'adamw'. Must - * be a float in the range[0, 1]. - */ - @JsonProperty(value = "weightDecay") - private String weightDecay; - - /** - * Get the amsGradient property: Enable AMSGrad when optimizer is 'adam' or 'adamw'. - * - * @return the amsGradient value. - */ - public String amsGradient() { - return this.amsGradient; - } - - /** - * Set the amsGradient property: Enable AMSGrad when optimizer is 'adam' or 'adamw'. - * - * @param amsGradient the amsGradient value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withAmsGradient(String amsGradient) { - this.amsGradient = amsGradient; - return this; - } - - /** - * Get the augmentations property: Settings for using Augmentations. - * - * @return the augmentations value. - */ - public String augmentations() { - return this.augmentations; - } - - /** - * Set the augmentations property: Settings for using Augmentations. - * - * @param augmentations the augmentations value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withAugmentations(String augmentations) { - this.augmentations = augmentations; - return this; - } - - /** - * Get the beta1 property: Value of 'beta1' when optimizer is 'adam' or 'adamw'. Must be a float in the range [0, - * 1]. - * - * @return the beta1 value. - */ - public String beta1() { - return this.beta1; - } - - /** - * Set the beta1 property: Value of 'beta1' when optimizer is 'adam' or 'adamw'. Must be a float in the range [0, - * 1]. - * - * @param beta1 the beta1 value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withBeta1(String beta1) { - this.beta1 = beta1; - return this; - } - - /** - * Get the beta2 property: Value of 'beta2' when optimizer is 'adam' or 'adamw'. Must be a float in the range [0, - * 1]. - * - * @return the beta2 value. - */ - public String beta2() { - return this.beta2; - } - - /** - * Set the beta2 property: Value of 'beta2' when optimizer is 'adam' or 'adamw'. Must be a float in the range [0, - * 1]. - * - * @param beta2 the beta2 value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withBeta2(String beta2) { - this.beta2 = beta2; - return this; - } - - /** - * Get the distributed property: Whether to use distributer training. - * - * @return the distributed value. - */ - public String distributed() { - return this.distributed; - } - - /** - * Set the distributed property: Whether to use distributer training. - * - * @param distributed the distributed value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withDistributed(String distributed) { - this.distributed = distributed; - return this; - } - - /** - * Get the earlyStopping property: Enable early stopping logic during training. - * - * @return the earlyStopping value. - */ - public String earlyStopping() { - return this.earlyStopping; - } - - /** - * Set the earlyStopping property: Enable early stopping logic during training. - * - * @param earlyStopping the earlyStopping value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withEarlyStopping(String earlyStopping) { - this.earlyStopping = earlyStopping; - return this; - } - - /** - * Get the earlyStoppingDelay property: Minimum number of epochs or validation evaluations to wait before primary - * metric improvement is tracked for early stopping. Must be a positive integer. - * - * @return the earlyStoppingDelay value. - */ - public String earlyStoppingDelay() { - return this.earlyStoppingDelay; - } - - /** - * Set the earlyStoppingDelay property: Minimum number of epochs or validation evaluations to wait before primary - * metric improvement is tracked for early stopping. Must be a positive integer. - * - * @param earlyStoppingDelay the earlyStoppingDelay value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withEarlyStoppingDelay(String earlyStoppingDelay) { - this.earlyStoppingDelay = earlyStoppingDelay; - return this; - } - - /** - * Get the earlyStoppingPatience property: Minimum number of epochs or validation evaluations with no primary metric - * improvement before the run is stopped. Must be a positive integer. - * - * @return the earlyStoppingPatience value. - */ - public String earlyStoppingPatience() { - return this.earlyStoppingPatience; - } - - /** - * Set the earlyStoppingPatience property: Minimum number of epochs or validation evaluations with no primary metric - * improvement before the run is stopped. Must be a positive integer. - * - * @param earlyStoppingPatience the earlyStoppingPatience value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withEarlyStoppingPatience(String earlyStoppingPatience) { - this.earlyStoppingPatience = earlyStoppingPatience; - return this; - } - - /** - * Get the enableOnnxNormalization property: Enable normalization when exporting ONNX model. - * - * @return the enableOnnxNormalization value. - */ - public String enableOnnxNormalization() { - return this.enableOnnxNormalization; - } - - /** - * Set the enableOnnxNormalization property: Enable normalization when exporting ONNX model. - * - * @param enableOnnxNormalization the enableOnnxNormalization value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withEnableOnnxNormalization(String enableOnnxNormalization) { - this.enableOnnxNormalization = enableOnnxNormalization; - return this; - } - - /** - * Get the evaluationFrequency property: Frequency to evaluate validation dataset to get metric scores. Must be a - * positive integer. - * - * @return the evaluationFrequency value. - */ - public String evaluationFrequency() { - return this.evaluationFrequency; - } - - /** - * Set the evaluationFrequency property: Frequency to evaluate validation dataset to get metric scores. Must be a - * positive integer. - * - * @param evaluationFrequency the evaluationFrequency value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withEvaluationFrequency(String evaluationFrequency) { - this.evaluationFrequency = evaluationFrequency; - return this; - } - - /** - * Get the gradientAccumulationStep property: Gradient accumulation means running a configured number of - * "GradAccumulationStep"\ steps without updating the model weights while accumulating the gradients of those steps, - * and then using the accumulated gradients to compute the weight updates. Must be a positive integer. - * - * @return the gradientAccumulationStep value. - */ - public String gradientAccumulationStep() { - return this.gradientAccumulationStep; - } - - /** - * Set the gradientAccumulationStep property: Gradient accumulation means running a configured number of - * "GradAccumulationStep"\ steps without updating the model weights while accumulating the gradients of those steps, - * and then using the accumulated gradients to compute the weight updates. Must be a positive integer. - * - * @param gradientAccumulationStep the gradientAccumulationStep value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withGradientAccumulationStep(String gradientAccumulationStep) { - this.gradientAccumulationStep = gradientAccumulationStep; - return this; - } - - /** - * Get the layersToFreeze property: Number of layers to freeze for the model. Must be a positive integer. For - * instance, passing 2 as value for 'seresnext' means freezing layer0 and layer1. For a full list of models - * supported and details on layer freeze, please see: - * https://docs.microsoft.com/en-us/azure/machine-learning/how-to-auto-train-image-models. - * - * @return the layersToFreeze value. - */ - public String layersToFreeze() { - return this.layersToFreeze; - } - - /** - * Set the layersToFreeze property: Number of layers to freeze for the model. Must be a positive integer. For - * instance, passing 2 as value for 'seresnext' means freezing layer0 and layer1. For a full list of models - * supported and details on layer freeze, please see: - * https://docs.microsoft.com/en-us/azure/machine-learning/how-to-auto-train-image-models. - * - * @param layersToFreeze the layersToFreeze value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withLayersToFreeze(String layersToFreeze) { - this.layersToFreeze = layersToFreeze; - return this; - } - - /** - * Get the learningRate property: Initial learning rate. Must be a float in the range [0, 1]. - * - * @return the learningRate value. - */ - public String learningRate() { - return this.learningRate; - } - - /** - * Set the learningRate property: Initial learning rate. Must be a float in the range [0, 1]. - * - * @param learningRate the learningRate value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withLearningRate(String learningRate) { - this.learningRate = learningRate; - return this; - } - - /** - * Get the learningRateScheduler property: Type of learning rate scheduler. Must be 'warmup_cosine' or 'step'. - * - * @return the learningRateScheduler value. - */ - public String learningRateScheduler() { - return this.learningRateScheduler; - } - - /** - * Set the learningRateScheduler property: Type of learning rate scheduler. Must be 'warmup_cosine' or 'step'. - * - * @param learningRateScheduler the learningRateScheduler value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withLearningRateScheduler(String learningRateScheduler) { - this.learningRateScheduler = learningRateScheduler; - return this; - } - - /** - * Get the modelName property: Name of the model to use for training. For more information on the available models - * please visit the official documentation: - * https://docs.microsoft.com/en-us/azure/machine-learning/how-to-auto-train-image-models. - * - * @return the modelName value. - */ - public String modelName() { - return this.modelName; - } - - /** - * Set the modelName property: Name of the model to use for training. For more information on the available models - * please visit the official documentation: - * https://docs.microsoft.com/en-us/azure/machine-learning/how-to-auto-train-image-models. - * - * @param modelName the modelName value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withModelName(String modelName) { - this.modelName = modelName; - return this; - } - - /** - * Get the momentum property: Value of momentum when optimizer is 'sgd'. Must be a float in the range [0, 1]. - * - * @return the momentum value. - */ - public String momentum() { - return this.momentum; - } - - /** - * Set the momentum property: Value of momentum when optimizer is 'sgd'. Must be a float in the range [0, 1]. - * - * @param momentum the momentum value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withMomentum(String momentum) { - this.momentum = momentum; - return this; - } - - /** - * Get the nesterov property: Enable nesterov when optimizer is 'sgd'. - * - * @return the nesterov value. - */ - public String nesterov() { - return this.nesterov; - } - - /** - * Set the nesterov property: Enable nesterov when optimizer is 'sgd'. - * - * @param nesterov the nesterov value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withNesterov(String nesterov) { - this.nesterov = nesterov; - return this; - } - - /** - * Get the numberOfEpochs property: Number of training epochs. Must be a positive integer. - * - * @return the numberOfEpochs value. - */ - public String numberOfEpochs() { - return this.numberOfEpochs; - } - - /** - * Set the numberOfEpochs property: Number of training epochs. Must be a positive integer. - * - * @param numberOfEpochs the numberOfEpochs value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withNumberOfEpochs(String numberOfEpochs) { - this.numberOfEpochs = numberOfEpochs; - return this; - } - - /** - * Get the numberOfWorkers property: Number of data loader workers. Must be a non-negative integer. - * - * @return the numberOfWorkers value. - */ - public String numberOfWorkers() { - return this.numberOfWorkers; - } - - /** - * Set the numberOfWorkers property: Number of data loader workers. Must be a non-negative integer. - * - * @param numberOfWorkers the numberOfWorkers value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withNumberOfWorkers(String numberOfWorkers) { - this.numberOfWorkers = numberOfWorkers; - return this; - } - - /** - * Get the optimizer property: Type of optimizer. Must be either 'sgd', 'adam', or 'adamw'. - * - * @return the optimizer value. - */ - public String optimizer() { - return this.optimizer; - } - - /** - * Set the optimizer property: Type of optimizer. Must be either 'sgd', 'adam', or 'adamw'. - * - * @param optimizer the optimizer value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withOptimizer(String optimizer) { - this.optimizer = optimizer; - return this; - } - - /** - * Get the randomSeed property: Random seed to be used when using deterministic training. - * - * @return the randomSeed value. - */ - public String randomSeed() { - return this.randomSeed; - } - - /** - * Set the randomSeed property: Random seed to be used when using deterministic training. - * - * @param randomSeed the randomSeed value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withRandomSeed(String randomSeed) { - this.randomSeed = randomSeed; - return this; - } - - /** - * Get the splitRatio property: If validation data is not defined, this specifies the split ratio for splitting - * train data into random train and validation subsets. Must be a float in the range [0, 1]. - * - * @return the splitRatio value. - */ - public String splitRatio() { - return this.splitRatio; - } - - /** - * Set the splitRatio property: If validation data is not defined, this specifies the split ratio for splitting - * train data into random train and validation subsets. Must be a float in the range [0, 1]. - * - * @param splitRatio the splitRatio value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withSplitRatio(String splitRatio) { - this.splitRatio = splitRatio; - return this; - } - - /** - * Get the stepLRGamma property: Value of gamma when learning rate scheduler is 'step'. Must be a float in the range - * [0, 1]. - * - * @return the stepLRGamma value. - */ - public String stepLRGamma() { - return this.stepLRGamma; - } - - /** - * Set the stepLRGamma property: Value of gamma when learning rate scheduler is 'step'. Must be a float in the range - * [0, 1]. - * - * @param stepLRGamma the stepLRGamma value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withStepLRGamma(String stepLRGamma) { - this.stepLRGamma = stepLRGamma; - return this; - } - - /** - * Get the stepLRStepSize property: Value of step size when learning rate scheduler is 'step'. Must be a positive - * integer. - * - * @return the stepLRStepSize value. - */ - public String stepLRStepSize() { - return this.stepLRStepSize; - } - - /** - * Set the stepLRStepSize property: Value of step size when learning rate scheduler is 'step'. Must be a positive - * integer. - * - * @param stepLRStepSize the stepLRStepSize value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withStepLRStepSize(String stepLRStepSize) { - this.stepLRStepSize = stepLRStepSize; - return this; - } - - /** - * Get the trainingBatchSize property: Training batch size. Must be a positive integer. - * - * @return the trainingBatchSize value. - */ - public String trainingBatchSize() { - return this.trainingBatchSize; - } - - /** - * Set the trainingBatchSize property: Training batch size. Must be a positive integer. - * - * @param trainingBatchSize the trainingBatchSize value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withTrainingBatchSize(String trainingBatchSize) { - this.trainingBatchSize = trainingBatchSize; - return this; - } - - /** - * Get the validationBatchSize property: Validation batch size. Must be a positive integer. - * - * @return the validationBatchSize value. - */ - public String validationBatchSize() { - return this.validationBatchSize; - } - - /** - * Set the validationBatchSize property: Validation batch size. Must be a positive integer. - * - * @param validationBatchSize the validationBatchSize value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withValidationBatchSize(String validationBatchSize) { - this.validationBatchSize = validationBatchSize; - return this; - } - - /** - * Get the warmupCosineLRCycles property: Value of cosine cycle when learning rate scheduler is 'warmup_cosine'. - * Must be a float in the range [0, 1]. - * - * @return the warmupCosineLRCycles value. - */ - public String warmupCosineLRCycles() { - return this.warmupCosineLRCycles; - } - - /** - * Set the warmupCosineLRCycles property: Value of cosine cycle when learning rate scheduler is 'warmup_cosine'. - * Must be a float in the range [0, 1]. - * - * @param warmupCosineLRCycles the warmupCosineLRCycles value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withWarmupCosineLRCycles(String warmupCosineLRCycles) { - this.warmupCosineLRCycles = warmupCosineLRCycles; - return this; - } - - /** - * Get the warmupCosineLRWarmupEpochs property: Value of warmup epochs when learning rate scheduler is - * 'warmup_cosine'. Must be a positive integer. - * - * @return the warmupCosineLRWarmupEpochs value. - */ - public String warmupCosineLRWarmupEpochs() { - return this.warmupCosineLRWarmupEpochs; - } - - /** - * Set the warmupCosineLRWarmupEpochs property: Value of warmup epochs when learning rate scheduler is - * 'warmup_cosine'. Must be a positive integer. - * - * @param warmupCosineLRWarmupEpochs the warmupCosineLRWarmupEpochs value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withWarmupCosineLRWarmupEpochs(String warmupCosineLRWarmupEpochs) { - this.warmupCosineLRWarmupEpochs = warmupCosineLRWarmupEpochs; - return this; - } - - /** - * Get the weightDecay property: Value of weight decay when optimizer is 'sgd', 'adam', or 'adamw'. Must be a float - * in the range[0, 1]. - * - * @return the weightDecay value. - */ - public String weightDecay() { - return this.weightDecay; - } - - /** - * Set the weightDecay property: Value of weight decay when optimizer is 'sgd', 'adam', or 'adamw'. Must be a float - * in the range[0, 1]. - * - * @param weightDecay the weightDecay value to set. - * @return the ImageModelDistributionSettings object itself. - */ - public ImageModelDistributionSettings withWeightDecay(String weightDecay) { - this.weightDecay = weightDecay; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelDistributionSettingsClassification.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelDistributionSettingsClassification.java deleted file mode 100644 index 0bbfd9392f0f..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelDistributionSettingsClassification.java +++ /dev/null @@ -1,350 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Distribution expressions to sweep over values of model settings. <example> Some examples are: <code> - * ModelName = "choice('seresnext', 'resnest50')"; LearningRate = "uniform(0.001, 0.01)"; LayersToFreeze = "choice(0, - * 2)"; </code></example> For more details on how to compose distribution expressions please check the - * documentation: https://docs.microsoft.com/en-us/azure/machine-learning/how-to-tune-hyperparameters For more - * information on the available settings please visit the official documentation: - * https://docs.microsoft.com/en-us/azure/machine-learning/how-to-auto-train-image-models. - */ -@Fluent -public final class ImageModelDistributionSettingsClassification extends ImageModelDistributionSettings { - /* - * Image crop size that is input to the neural network for the training - * dataset. Must be a positive integer. - */ - @JsonProperty(value = "trainingCropSize") - private String trainingCropSize; - - /* - * Image crop size that is input to the neural network for the validation - * dataset. Must be a positive integer. - */ - @JsonProperty(value = "validationCropSize") - private String validationCropSize; - - /* - * Image size to which to resize before cropping for validation dataset. - * Must be a positive integer. - */ - @JsonProperty(value = "validationResizeSize") - private String validationResizeSize; - - /* - * Weighted loss. The accepted values are 0 for no weighted loss. - * 1 for weighted loss with sqrt.(class_weights). 2 for weighted loss with - * class_weights. Must be 0 or 1 or 2. - */ - @JsonProperty(value = "weightedLoss") - private String weightedLoss; - - /** - * Get the trainingCropSize property: Image crop size that is input to the neural network for the training dataset. - * Must be a positive integer. - * - * @return the trainingCropSize value. - */ - public String trainingCropSize() { - return this.trainingCropSize; - } - - /** - * Set the trainingCropSize property: Image crop size that is input to the neural network for the training dataset. - * Must be a positive integer. - * - * @param trainingCropSize the trainingCropSize value to set. - * @return the ImageModelDistributionSettingsClassification object itself. - */ - public ImageModelDistributionSettingsClassification withTrainingCropSize(String trainingCropSize) { - this.trainingCropSize = trainingCropSize; - return this; - } - - /** - * Get the validationCropSize property: Image crop size that is input to the neural network for the validation - * dataset. Must be a positive integer. - * - * @return the validationCropSize value. - */ - public String validationCropSize() { - return this.validationCropSize; - } - - /** - * Set the validationCropSize property: Image crop size that is input to the neural network for the validation - * dataset. Must be a positive integer. - * - * @param validationCropSize the validationCropSize value to set. - * @return the ImageModelDistributionSettingsClassification object itself. - */ - public ImageModelDistributionSettingsClassification withValidationCropSize(String validationCropSize) { - this.validationCropSize = validationCropSize; - return this; - } - - /** - * Get the validationResizeSize property: Image size to which to resize before cropping for validation dataset. Must - * be a positive integer. - * - * @return the validationResizeSize value. - */ - public String validationResizeSize() { - return this.validationResizeSize; - } - - /** - * Set the validationResizeSize property: Image size to which to resize before cropping for validation dataset. Must - * be a positive integer. - * - * @param validationResizeSize the validationResizeSize value to set. - * @return the ImageModelDistributionSettingsClassification object itself. - */ - public ImageModelDistributionSettingsClassification withValidationResizeSize(String validationResizeSize) { - this.validationResizeSize = validationResizeSize; - return this; - } - - /** - * Get the weightedLoss property: Weighted loss. The accepted values are 0 for no weighted loss. 1 for weighted loss - * with sqrt.(class_weights). 2 for weighted loss with class_weights. Must be 0 or 1 or 2. - * - * @return the weightedLoss value. - */ - public String weightedLoss() { - return this.weightedLoss; - } - - /** - * Set the weightedLoss property: Weighted loss. The accepted values are 0 for no weighted loss. 1 for weighted loss - * with sqrt.(class_weights). 2 for weighted loss with class_weights. Must be 0 or 1 or 2. - * - * @param weightedLoss the weightedLoss value to set. - * @return the ImageModelDistributionSettingsClassification object itself. - */ - public ImageModelDistributionSettingsClassification withWeightedLoss(String weightedLoss) { - this.weightedLoss = weightedLoss; - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withAmsGradient(String amsGradient) { - super.withAmsGradient(amsGradient); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withAugmentations(String augmentations) { - super.withAugmentations(augmentations); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withBeta1(String beta1) { - super.withBeta1(beta1); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withBeta2(String beta2) { - super.withBeta2(beta2); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withDistributed(String distributed) { - super.withDistributed(distributed); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withEarlyStopping(String earlyStopping) { - super.withEarlyStopping(earlyStopping); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withEarlyStoppingDelay(String earlyStoppingDelay) { - super.withEarlyStoppingDelay(earlyStoppingDelay); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withEarlyStoppingPatience(String earlyStoppingPatience) { - super.withEarlyStoppingPatience(earlyStoppingPatience); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withEnableOnnxNormalization(String enableOnnxNormalization) { - super.withEnableOnnxNormalization(enableOnnxNormalization); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withEvaluationFrequency(String evaluationFrequency) { - super.withEvaluationFrequency(evaluationFrequency); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withGradientAccumulationStep(String gradientAccumulationStep) { - super.withGradientAccumulationStep(gradientAccumulationStep); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withLayersToFreeze(String layersToFreeze) { - super.withLayersToFreeze(layersToFreeze); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withLearningRate(String learningRate) { - super.withLearningRate(learningRate); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withLearningRateScheduler(String learningRateScheduler) { - super.withLearningRateScheduler(learningRateScheduler); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withModelName(String modelName) { - super.withModelName(modelName); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withMomentum(String momentum) { - super.withMomentum(momentum); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withNesterov(String nesterov) { - super.withNesterov(nesterov); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withNumberOfEpochs(String numberOfEpochs) { - super.withNumberOfEpochs(numberOfEpochs); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withNumberOfWorkers(String numberOfWorkers) { - super.withNumberOfWorkers(numberOfWorkers); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withOptimizer(String optimizer) { - super.withOptimizer(optimizer); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withRandomSeed(String randomSeed) { - super.withRandomSeed(randomSeed); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withSplitRatio(String splitRatio) { - super.withSplitRatio(splitRatio); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withStepLRGamma(String stepLRGamma) { - super.withStepLRGamma(stepLRGamma); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withStepLRStepSize(String stepLRStepSize) { - super.withStepLRStepSize(stepLRStepSize); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withTrainingBatchSize(String trainingBatchSize) { - super.withTrainingBatchSize(trainingBatchSize); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withValidationBatchSize(String validationBatchSize) { - super.withValidationBatchSize(validationBatchSize); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withWarmupCosineLRCycles(String warmupCosineLRCycles) { - super.withWarmupCosineLRCycles(warmupCosineLRCycles); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withWarmupCosineLRWarmupEpochs( - String warmupCosineLRWarmupEpochs) { - super.withWarmupCosineLRWarmupEpochs(warmupCosineLRWarmupEpochs); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsClassification withWeightDecay(String weightDecay) { - super.withWeightDecay(weightDecay); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelDistributionSettingsObjectDetection.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelDistributionSettingsObjectDetection.java deleted file mode 100644 index 4a1d8df91b97..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelDistributionSettingsObjectDetection.java +++ /dev/null @@ -1,639 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Distribution expressions to sweep over values of model settings. <example> Some examples are: <code> - * ModelName = "choice('seresnext', 'resnest50')"; LearningRate = "uniform(0.001, 0.01)"; LayersToFreeze = "choice(0, - * 2)"; </code></example> For more details on how to compose distribution expressions please check the - * documentation: https://docs.microsoft.com/en-us/azure/machine-learning/how-to-tune-hyperparameters For more - * information on the available settings please visit the official documentation: - * https://docs.microsoft.com/en-us/azure/machine-learning/how-to-auto-train-image-models. - */ -@Fluent -public final class ImageModelDistributionSettingsObjectDetection extends ImageModelDistributionSettings { - /* - * Maximum number of detections per image, for all classes. Must be a - * positive integer. - * Note: This settings is not supported for the 'yolov5' algorithm. - */ - @JsonProperty(value = "boxDetectionsPerImage") - private String boxDetectionsPerImage; - - /* - * During inference, only return proposals with a classification score - * greater than - * BoxScoreThreshold. Must be a float in the range[0, 1]. - */ - @JsonProperty(value = "boxScoreThreshold") - private String boxScoreThreshold; - - /* - * Image size for train and validation. Must be a positive integer. - * Note: The training run may get into CUDA OOM if the size is too big. - * Note: This settings is only supported for the 'yolov5' algorithm. - */ - @JsonProperty(value = "imageSize") - private String imageSize; - - /* - * Maximum size of the image to be rescaled before feeding it to the - * backbone. - * Must be a positive integer. Note: training run may get into CUDA OOM if - * the size is too big. - * Note: This settings is not supported for the 'yolov5' algorithm. - */ - @JsonProperty(value = "maxSize") - private String maxSize; - - /* - * Minimum size of the image to be rescaled before feeding it to the - * backbone. - * Must be a positive integer. Note: training run may get into CUDA OOM if - * the size is too big. - * Note: This settings is not supported for the 'yolov5' algorithm. - */ - @JsonProperty(value = "minSize") - private String minSize; - - /* - * Model size. Must be 'small', 'medium', 'large', or 'xlarge'. - * Note: training run may get into CUDA OOM if the model size is too big. - * Note: This settings is only supported for the 'yolov5' algorithm. - */ - @JsonProperty(value = "modelSize") - private String modelSize; - - /* - * Enable multi-scale image by varying image size by +/- 50%. - * Note: training run may get into CUDA OOM if no sufficient GPU memory. - * Note: This settings is only supported for the 'yolov5' algorithm. - */ - @JsonProperty(value = "multiScale") - private String multiScale; - - /* - * IOU threshold used during inference in NMS post processing. Must be - * float in the range [0, 1]. - */ - @JsonProperty(value = "nmsIouThreshold") - private String nmsIouThreshold; - - /* - * The grid size to use for tiling each image. Note: TileGridSize must not - * be - * None to enable small object detection logic. A string containing two - * integers in mxn format. - * Note: This settings is not supported for the 'yolov5' algorithm. - */ - @JsonProperty(value = "tileGridSize") - private String tileGridSize; - - /* - * Overlap ratio between adjacent tiles in each dimension. Must be float in - * the range [0, 1). - * Note: This settings is not supported for the 'yolov5' algorithm. - */ - @JsonProperty(value = "tileOverlapRatio") - private String tileOverlapRatio; - - /* - * The IOU threshold to use to perform NMS while merging predictions from - * tiles and image. - * Used in validation/ inference. Must be float in the range [0, 1]. - * Note: This settings is not supported for the 'yolov5' algorithm. - * NMS: Non-maximum suppression - */ - @JsonProperty(value = "tilePredictionsNmsThreshold") - private String tilePredictionsNmsThreshold; - - /* - * IOU threshold to use when computing validation metric. Must be float in - * the range [0, 1]. - */ - @JsonProperty(value = "validationIouThreshold") - private String validationIouThreshold; - - /* - * Metric computation method to use for validation metrics. Must be 'none', - * 'coco', 'voc', or 'coco_voc'. - */ - @JsonProperty(value = "validationMetricType") - private String validationMetricType; - - /** - * Get the boxDetectionsPerImage property: Maximum number of detections per image, for all classes. Must be a - * positive integer. Note: This settings is not supported for the 'yolov5' algorithm. - * - * @return the boxDetectionsPerImage value. - */ - public String boxDetectionsPerImage() { - return this.boxDetectionsPerImage; - } - - /** - * Set the boxDetectionsPerImage property: Maximum number of detections per image, for all classes. Must be a - * positive integer. Note: This settings is not supported for the 'yolov5' algorithm. - * - * @param boxDetectionsPerImage the boxDetectionsPerImage value to set. - * @return the ImageModelDistributionSettingsObjectDetection object itself. - */ - public ImageModelDistributionSettingsObjectDetection withBoxDetectionsPerImage(String boxDetectionsPerImage) { - this.boxDetectionsPerImage = boxDetectionsPerImage; - return this; - } - - /** - * Get the boxScoreThreshold property: During inference, only return proposals with a classification score greater - * than BoxScoreThreshold. Must be a float in the range[0, 1]. - * - * @return the boxScoreThreshold value. - */ - public String boxScoreThreshold() { - return this.boxScoreThreshold; - } - - /** - * Set the boxScoreThreshold property: During inference, only return proposals with a classification score greater - * than BoxScoreThreshold. Must be a float in the range[0, 1]. - * - * @param boxScoreThreshold the boxScoreThreshold value to set. - * @return the ImageModelDistributionSettingsObjectDetection object itself. - */ - public ImageModelDistributionSettingsObjectDetection withBoxScoreThreshold(String boxScoreThreshold) { - this.boxScoreThreshold = boxScoreThreshold; - return this; - } - - /** - * Get the imageSize property: Image size for train and validation. Must be a positive integer. Note: The training - * run may get into CUDA OOM if the size is too big. Note: This settings is only supported for the 'yolov5' - * algorithm. - * - * @return the imageSize value. - */ - public String imageSize() { - return this.imageSize; - } - - /** - * Set the imageSize property: Image size for train and validation. Must be a positive integer. Note: The training - * run may get into CUDA OOM if the size is too big. Note: This settings is only supported for the 'yolov5' - * algorithm. - * - * @param imageSize the imageSize value to set. - * @return the ImageModelDistributionSettingsObjectDetection object itself. - */ - public ImageModelDistributionSettingsObjectDetection withImageSize(String imageSize) { - this.imageSize = imageSize; - return this; - } - - /** - * Get the maxSize property: Maximum size of the image to be rescaled before feeding it to the backbone. Must be a - * positive integer. Note: training run may get into CUDA OOM if the size is too big. Note: This settings is not - * supported for the 'yolov5' algorithm. - * - * @return the maxSize value. - */ - public String maxSize() { - return this.maxSize; - } - - /** - * Set the maxSize property: Maximum size of the image to be rescaled before feeding it to the backbone. Must be a - * positive integer. Note: training run may get into CUDA OOM if the size is too big. Note: This settings is not - * supported for the 'yolov5' algorithm. - * - * @param maxSize the maxSize value to set. - * @return the ImageModelDistributionSettingsObjectDetection object itself. - */ - public ImageModelDistributionSettingsObjectDetection withMaxSize(String maxSize) { - this.maxSize = maxSize; - return this; - } - - /** - * Get the minSize property: Minimum size of the image to be rescaled before feeding it to the backbone. Must be a - * positive integer. Note: training run may get into CUDA OOM if the size is too big. Note: This settings is not - * supported for the 'yolov5' algorithm. - * - * @return the minSize value. - */ - public String minSize() { - return this.minSize; - } - - /** - * Set the minSize property: Minimum size of the image to be rescaled before feeding it to the backbone. Must be a - * positive integer. Note: training run may get into CUDA OOM if the size is too big. Note: This settings is not - * supported for the 'yolov5' algorithm. - * - * @param minSize the minSize value to set. - * @return the ImageModelDistributionSettingsObjectDetection object itself. - */ - public ImageModelDistributionSettingsObjectDetection withMinSize(String minSize) { - this.minSize = minSize; - return this; - } - - /** - * Get the modelSize property: Model size. Must be 'small', 'medium', 'large', or 'xlarge'. Note: training run may - * get into CUDA OOM if the model size is too big. Note: This settings is only supported for the 'yolov5' algorithm. - * - * @return the modelSize value. - */ - public String modelSize() { - return this.modelSize; - } - - /** - * Set the modelSize property: Model size. Must be 'small', 'medium', 'large', or 'xlarge'. Note: training run may - * get into CUDA OOM if the model size is too big. Note: This settings is only supported for the 'yolov5' algorithm. - * - * @param modelSize the modelSize value to set. - * @return the ImageModelDistributionSettingsObjectDetection object itself. - */ - public ImageModelDistributionSettingsObjectDetection withModelSize(String modelSize) { - this.modelSize = modelSize; - return this; - } - - /** - * Get the multiScale property: Enable multi-scale image by varying image size by +/- 50%. Note: training run may - * get into CUDA OOM if no sufficient GPU memory. Note: This settings is only supported for the 'yolov5' algorithm. - * - * @return the multiScale value. - */ - public String multiScale() { - return this.multiScale; - } - - /** - * Set the multiScale property: Enable multi-scale image by varying image size by +/- 50%. Note: training run may - * get into CUDA OOM if no sufficient GPU memory. Note: This settings is only supported for the 'yolov5' algorithm. - * - * @param multiScale the multiScale value to set. - * @return the ImageModelDistributionSettingsObjectDetection object itself. - */ - public ImageModelDistributionSettingsObjectDetection withMultiScale(String multiScale) { - this.multiScale = multiScale; - return this; - } - - /** - * Get the nmsIouThreshold property: IOU threshold used during inference in NMS post processing. Must be float in - * the range [0, 1]. - * - * @return the nmsIouThreshold value. - */ - public String nmsIouThreshold() { - return this.nmsIouThreshold; - } - - /** - * Set the nmsIouThreshold property: IOU threshold used during inference in NMS post processing. Must be float in - * the range [0, 1]. - * - * @param nmsIouThreshold the nmsIouThreshold value to set. - * @return the ImageModelDistributionSettingsObjectDetection object itself. - */ - public ImageModelDistributionSettingsObjectDetection withNmsIouThreshold(String nmsIouThreshold) { - this.nmsIouThreshold = nmsIouThreshold; - return this; - } - - /** - * Get the tileGridSize property: The grid size to use for tiling each image. Note: TileGridSize must not be None to - * enable small object detection logic. A string containing two integers in mxn format. Note: This settings is not - * supported for the 'yolov5' algorithm. - * - * @return the tileGridSize value. - */ - public String tileGridSize() { - return this.tileGridSize; - } - - /** - * Set the tileGridSize property: The grid size to use for tiling each image. Note: TileGridSize must not be None to - * enable small object detection logic. A string containing two integers in mxn format. Note: This settings is not - * supported for the 'yolov5' algorithm. - * - * @param tileGridSize the tileGridSize value to set. - * @return the ImageModelDistributionSettingsObjectDetection object itself. - */ - public ImageModelDistributionSettingsObjectDetection withTileGridSize(String tileGridSize) { - this.tileGridSize = tileGridSize; - return this; - } - - /** - * Get the tileOverlapRatio property: Overlap ratio between adjacent tiles in each dimension. Must be float in the - * range [0, 1). Note: This settings is not supported for the 'yolov5' algorithm. - * - * @return the tileOverlapRatio value. - */ - public String tileOverlapRatio() { - return this.tileOverlapRatio; - } - - /** - * Set the tileOverlapRatio property: Overlap ratio between adjacent tiles in each dimension. Must be float in the - * range [0, 1). Note: This settings is not supported for the 'yolov5' algorithm. - * - * @param tileOverlapRatio the tileOverlapRatio value to set. - * @return the ImageModelDistributionSettingsObjectDetection object itself. - */ - public ImageModelDistributionSettingsObjectDetection withTileOverlapRatio(String tileOverlapRatio) { - this.tileOverlapRatio = tileOverlapRatio; - return this; - } - - /** - * Get the tilePredictionsNmsThreshold property: The IOU threshold to use to perform NMS while merging predictions - * from tiles and image. Used in validation/ inference. Must be float in the range [0, 1]. Note: This settings is - * not supported for the 'yolov5' algorithm. NMS: Non-maximum suppression. - * - * @return the tilePredictionsNmsThreshold value. - */ - public String tilePredictionsNmsThreshold() { - return this.tilePredictionsNmsThreshold; - } - - /** - * Set the tilePredictionsNmsThreshold property: The IOU threshold to use to perform NMS while merging predictions - * from tiles and image. Used in validation/ inference. Must be float in the range [0, 1]. Note: This settings is - * not supported for the 'yolov5' algorithm. NMS: Non-maximum suppression. - * - * @param tilePredictionsNmsThreshold the tilePredictionsNmsThreshold value to set. - * @return the ImageModelDistributionSettingsObjectDetection object itself. - */ - public ImageModelDistributionSettingsObjectDetection withTilePredictionsNmsThreshold( - String tilePredictionsNmsThreshold) { - this.tilePredictionsNmsThreshold = tilePredictionsNmsThreshold; - return this; - } - - /** - * Get the validationIouThreshold property: IOU threshold to use when computing validation metric. Must be float in - * the range [0, 1]. - * - * @return the validationIouThreshold value. - */ - public String validationIouThreshold() { - return this.validationIouThreshold; - } - - /** - * Set the validationIouThreshold property: IOU threshold to use when computing validation metric. Must be float in - * the range [0, 1]. - * - * @param validationIouThreshold the validationIouThreshold value to set. - * @return the ImageModelDistributionSettingsObjectDetection object itself. - */ - public ImageModelDistributionSettingsObjectDetection withValidationIouThreshold(String validationIouThreshold) { - this.validationIouThreshold = validationIouThreshold; - return this; - } - - /** - * Get the validationMetricType property: Metric computation method to use for validation metrics. Must be 'none', - * 'coco', 'voc', or 'coco_voc'. - * - * @return the validationMetricType value. - */ - public String validationMetricType() { - return this.validationMetricType; - } - - /** - * Set the validationMetricType property: Metric computation method to use for validation metrics. Must be 'none', - * 'coco', 'voc', or 'coco_voc'. - * - * @param validationMetricType the validationMetricType value to set. - * @return the ImageModelDistributionSettingsObjectDetection object itself. - */ - public ImageModelDistributionSettingsObjectDetection withValidationMetricType(String validationMetricType) { - this.validationMetricType = validationMetricType; - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withAmsGradient(String amsGradient) { - super.withAmsGradient(amsGradient); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withAugmentations(String augmentations) { - super.withAugmentations(augmentations); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withBeta1(String beta1) { - super.withBeta1(beta1); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withBeta2(String beta2) { - super.withBeta2(beta2); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withDistributed(String distributed) { - super.withDistributed(distributed); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withEarlyStopping(String earlyStopping) { - super.withEarlyStopping(earlyStopping); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withEarlyStoppingDelay(String earlyStoppingDelay) { - super.withEarlyStoppingDelay(earlyStoppingDelay); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withEarlyStoppingPatience(String earlyStoppingPatience) { - super.withEarlyStoppingPatience(earlyStoppingPatience); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withEnableOnnxNormalization(String enableOnnxNormalization) { - super.withEnableOnnxNormalization(enableOnnxNormalization); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withEvaluationFrequency(String evaluationFrequency) { - super.withEvaluationFrequency(evaluationFrequency); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withGradientAccumulationStep(String gradientAccumulationStep) { - super.withGradientAccumulationStep(gradientAccumulationStep); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withLayersToFreeze(String layersToFreeze) { - super.withLayersToFreeze(layersToFreeze); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withLearningRate(String learningRate) { - super.withLearningRate(learningRate); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withLearningRateScheduler(String learningRateScheduler) { - super.withLearningRateScheduler(learningRateScheduler); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withModelName(String modelName) { - super.withModelName(modelName); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withMomentum(String momentum) { - super.withMomentum(momentum); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withNesterov(String nesterov) { - super.withNesterov(nesterov); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withNumberOfEpochs(String numberOfEpochs) { - super.withNumberOfEpochs(numberOfEpochs); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withNumberOfWorkers(String numberOfWorkers) { - super.withNumberOfWorkers(numberOfWorkers); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withOptimizer(String optimizer) { - super.withOptimizer(optimizer); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withRandomSeed(String randomSeed) { - super.withRandomSeed(randomSeed); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withSplitRatio(String splitRatio) { - super.withSplitRatio(splitRatio); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withStepLRGamma(String stepLRGamma) { - super.withStepLRGamma(stepLRGamma); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withStepLRStepSize(String stepLRStepSize) { - super.withStepLRStepSize(stepLRStepSize); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withTrainingBatchSize(String trainingBatchSize) { - super.withTrainingBatchSize(trainingBatchSize); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withValidationBatchSize(String validationBatchSize) { - super.withValidationBatchSize(validationBatchSize); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withWarmupCosineLRCycles(String warmupCosineLRCycles) { - super.withWarmupCosineLRCycles(warmupCosineLRCycles); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withWarmupCosineLRWarmupEpochs( - String warmupCosineLRWarmupEpochs) { - super.withWarmupCosineLRWarmupEpochs(warmupCosineLRWarmupEpochs); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelDistributionSettingsObjectDetection withWeightDecay(String weightDecay) { - super.withWeightDecay(weightDecay); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelSettings.java deleted file mode 100644 index 29c1d42ca455..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelSettings.java +++ /dev/null @@ -1,982 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Settings used for training the model. For more information on the available settings please visit the official - * documentation: https://docs.microsoft.com/en-us/azure/machine-learning/how-to-auto-train-image-models. - */ -@Fluent -public class ImageModelSettings { - /* - * Settings for advanced scenarios. - */ - @JsonProperty(value = "advancedSettings") - private String advancedSettings; - - /* - * Enable AMSGrad when optimizer is 'adam' or 'adamw'. - */ - @JsonProperty(value = "amsGradient") - private Boolean amsGradient; - - /* - * Settings for using Augmentations. - */ - @JsonProperty(value = "augmentations") - private String augmentations; - - /* - * Value of 'beta1' when optimizer is 'adam' or 'adamw'. Must be a float in - * the range [0, 1]. - */ - @JsonProperty(value = "beta1") - private Float beta1; - - /* - * Value of 'beta2' when optimizer is 'adam' or 'adamw'. Must be a float in - * the range [0, 1]. - */ - @JsonProperty(value = "beta2") - private Float beta2; - - /* - * FileDataset id for pretrained checkpoint(s) for incremental training. - * Make sure to pass CheckpointFilename along with CheckpointDatasetId. - */ - @JsonProperty(value = "checkpointDatasetId") - private String checkpointDatasetId; - - /* - * The pretrained checkpoint filename in FileDataset for incremental - * training. - * Make sure to pass CheckpointDatasetId along with CheckpointFilename. - */ - @JsonProperty(value = "checkpointFilename") - private String checkpointFilename; - - /* - * Frequency to store model checkpoints. Must be a positive integer. - */ - @JsonProperty(value = "checkpointFrequency") - private Integer checkpointFrequency; - - /* - * The id of a previous run that has a pretrained checkpoint for - * incremental training. - */ - @JsonProperty(value = "checkpointRunId") - private String checkpointRunId; - - /* - * Whether to use distributed training. - */ - @JsonProperty(value = "distributed") - private Boolean distributed; - - /* - * Enable early stopping logic during training. - */ - @JsonProperty(value = "earlyStopping") - private Boolean earlyStopping; - - /* - * Minimum number of epochs or validation evaluations to wait before - * primary metric improvement - * is tracked for early stopping. Must be a positive integer. - */ - @JsonProperty(value = "earlyStoppingDelay") - private Integer earlyStoppingDelay; - - /* - * Minimum number of epochs or validation evaluations with no primary - * metric improvement before - * the run is stopped. Must be a positive integer. - */ - @JsonProperty(value = "earlyStoppingPatience") - private Integer earlyStoppingPatience; - - /* - * Enable normalization when exporting ONNX model. - */ - @JsonProperty(value = "enableOnnxNormalization") - private Boolean enableOnnxNormalization; - - /* - * Frequency to evaluate validation dataset to get metric scores. Must be a - * positive integer. - */ - @JsonProperty(value = "evaluationFrequency") - private Integer evaluationFrequency; - - /* - * Gradient accumulation means running a configured number of - * "GradAccumulationStep"\ steps without - * updating the model weights while accumulating the gradients of those - * steps, and then using - * the accumulated gradients to compute the weight updates. Must be a - * positive integer. - */ - @JsonProperty(value = "gradientAccumulationStep") - private Integer gradientAccumulationStep; - - /* - * Number of layers to freeze for the model. Must be a positive integer. - * For instance, passing 2 as value for 'seresnext' means - * freezing layer0 and layer1. For a full list of models supported and - * details on layer freeze, please - * see: - * https://docs.microsoft.com/en-us/azure/machine-learning/how-to-auto-train-image-models. - */ - @JsonProperty(value = "layersToFreeze") - private Integer layersToFreeze; - - /* - * Initial learning rate. Must be a float in the range [0, 1]. - */ - @JsonProperty(value = "learningRate") - private Float learningRate; - - /* - * Type of learning rate scheduler. Must be 'warmup_cosine' or 'step'. - */ - @JsonProperty(value = "learningRateScheduler") - private LearningRateScheduler learningRateScheduler; - - /* - * Name of the model to use for training. - * For more information on the available models please visit the official - * documentation: - * https://docs.microsoft.com/en-us/azure/machine-learning/how-to-auto-train-image-models. - */ - @JsonProperty(value = "modelName") - private String modelName; - - /* - * Value of momentum when optimizer is 'sgd'. Must be a float in the range - * [0, 1]. - */ - @JsonProperty(value = "momentum") - private Float momentum; - - /* - * Enable nesterov when optimizer is 'sgd'. - */ - @JsonProperty(value = "nesterov") - private Boolean nesterov; - - /* - * Number of training epochs. Must be a positive integer. - */ - @JsonProperty(value = "numberOfEpochs") - private Integer numberOfEpochs; - - /* - * Number of data loader workers. Must be a non-negative integer. - */ - @JsonProperty(value = "numberOfWorkers") - private Integer numberOfWorkers; - - /* - * Type of optimizer. - */ - @JsonProperty(value = "optimizer") - private StochasticOptimizer optimizer; - - /* - * Random seed to be used when using deterministic training. - */ - @JsonProperty(value = "randomSeed") - private Integer randomSeed; - - /* - * If validation data is not defined, this specifies the split ratio for - * splitting - * train data into random train and validation subsets. Must be a float in - * the range [0, 1]. - */ - @JsonProperty(value = "splitRatio") - private Float splitRatio; - - /* - * Value of gamma when learning rate scheduler is 'step'. Must be a float - * in the range [0, 1]. - */ - @JsonProperty(value = "stepLRGamma") - private Float stepLRGamma; - - /* - * Value of step size when learning rate scheduler is 'step'. Must be a - * positive integer. - */ - @JsonProperty(value = "stepLRStepSize") - private Integer stepLRStepSize; - - /* - * Training batch size. Must be a positive integer. - */ - @JsonProperty(value = "trainingBatchSize") - private Integer trainingBatchSize; - - /* - * Validation batch size. Must be a positive integer. - */ - @JsonProperty(value = "validationBatchSize") - private Integer validationBatchSize; - - /* - * Value of cosine cycle when learning rate scheduler is 'warmup_cosine'. - * Must be a float in the range [0, 1]. - */ - @JsonProperty(value = "warmupCosineLRCycles") - private Float warmupCosineLRCycles; - - /* - * Value of warmup epochs when learning rate scheduler is 'warmup_cosine'. - * Must be a positive integer. - */ - @JsonProperty(value = "warmupCosineLRWarmupEpochs") - private Integer warmupCosineLRWarmupEpochs; - - /* - * Value of weight decay when optimizer is 'sgd', 'adam', or 'adamw'. Must - * be a float in the range[0, 1]. - */ - @JsonProperty(value = "weightDecay") - private Float weightDecay; - - /** - * Get the advancedSettings property: Settings for advanced scenarios. - * - * @return the advancedSettings value. - */ - public String advancedSettings() { - return this.advancedSettings; - } - - /** - * Set the advancedSettings property: Settings for advanced scenarios. - * - * @param advancedSettings the advancedSettings value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withAdvancedSettings(String advancedSettings) { - this.advancedSettings = advancedSettings; - return this; - } - - /** - * Get the amsGradient property: Enable AMSGrad when optimizer is 'adam' or 'adamw'. - * - * @return the amsGradient value. - */ - public Boolean amsGradient() { - return this.amsGradient; - } - - /** - * Set the amsGradient property: Enable AMSGrad when optimizer is 'adam' or 'adamw'. - * - * @param amsGradient the amsGradient value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withAmsGradient(Boolean amsGradient) { - this.amsGradient = amsGradient; - return this; - } - - /** - * Get the augmentations property: Settings for using Augmentations. - * - * @return the augmentations value. - */ - public String augmentations() { - return this.augmentations; - } - - /** - * Set the augmentations property: Settings for using Augmentations. - * - * @param augmentations the augmentations value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withAugmentations(String augmentations) { - this.augmentations = augmentations; - return this; - } - - /** - * Get the beta1 property: Value of 'beta1' when optimizer is 'adam' or 'adamw'. Must be a float in the range [0, - * 1]. - * - * @return the beta1 value. - */ - public Float beta1() { - return this.beta1; - } - - /** - * Set the beta1 property: Value of 'beta1' when optimizer is 'adam' or 'adamw'. Must be a float in the range [0, - * 1]. - * - * @param beta1 the beta1 value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withBeta1(Float beta1) { - this.beta1 = beta1; - return this; - } - - /** - * Get the beta2 property: Value of 'beta2' when optimizer is 'adam' or 'adamw'. Must be a float in the range [0, - * 1]. - * - * @return the beta2 value. - */ - public Float beta2() { - return this.beta2; - } - - /** - * Set the beta2 property: Value of 'beta2' when optimizer is 'adam' or 'adamw'. Must be a float in the range [0, - * 1]. - * - * @param beta2 the beta2 value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withBeta2(Float beta2) { - this.beta2 = beta2; - return this; - } - - /** - * Get the checkpointDatasetId property: FileDataset id for pretrained checkpoint(s) for incremental training. Make - * sure to pass CheckpointFilename along with CheckpointDatasetId. - * - * @return the checkpointDatasetId value. - */ - public String checkpointDatasetId() { - return this.checkpointDatasetId; - } - - /** - * Set the checkpointDatasetId property: FileDataset id for pretrained checkpoint(s) for incremental training. Make - * sure to pass CheckpointFilename along with CheckpointDatasetId. - * - * @param checkpointDatasetId the checkpointDatasetId value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withCheckpointDatasetId(String checkpointDatasetId) { - this.checkpointDatasetId = checkpointDatasetId; - return this; - } - - /** - * Get the checkpointFilename property: The pretrained checkpoint filename in FileDataset for incremental training. - * Make sure to pass CheckpointDatasetId along with CheckpointFilename. - * - * @return the checkpointFilename value. - */ - public String checkpointFilename() { - return this.checkpointFilename; - } - - /** - * Set the checkpointFilename property: The pretrained checkpoint filename in FileDataset for incremental training. - * Make sure to pass CheckpointDatasetId along with CheckpointFilename. - * - * @param checkpointFilename the checkpointFilename value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withCheckpointFilename(String checkpointFilename) { - this.checkpointFilename = checkpointFilename; - return this; - } - - /** - * Get the checkpointFrequency property: Frequency to store model checkpoints. Must be a positive integer. - * - * @return the checkpointFrequency value. - */ - public Integer checkpointFrequency() { - return this.checkpointFrequency; - } - - /** - * Set the checkpointFrequency property: Frequency to store model checkpoints. Must be a positive integer. - * - * @param checkpointFrequency the checkpointFrequency value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withCheckpointFrequency(Integer checkpointFrequency) { - this.checkpointFrequency = checkpointFrequency; - return this; - } - - /** - * Get the checkpointRunId property: The id of a previous run that has a pretrained checkpoint for incremental - * training. - * - * @return the checkpointRunId value. - */ - public String checkpointRunId() { - return this.checkpointRunId; - } - - /** - * Set the checkpointRunId property: The id of a previous run that has a pretrained checkpoint for incremental - * training. - * - * @param checkpointRunId the checkpointRunId value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withCheckpointRunId(String checkpointRunId) { - this.checkpointRunId = checkpointRunId; - return this; - } - - /** - * Get the distributed property: Whether to use distributed training. - * - * @return the distributed value. - */ - public Boolean distributed() { - return this.distributed; - } - - /** - * Set the distributed property: Whether to use distributed training. - * - * @param distributed the distributed value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withDistributed(Boolean distributed) { - this.distributed = distributed; - return this; - } - - /** - * Get the earlyStopping property: Enable early stopping logic during training. - * - * @return the earlyStopping value. - */ - public Boolean earlyStopping() { - return this.earlyStopping; - } - - /** - * Set the earlyStopping property: Enable early stopping logic during training. - * - * @param earlyStopping the earlyStopping value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withEarlyStopping(Boolean earlyStopping) { - this.earlyStopping = earlyStopping; - return this; - } - - /** - * Get the earlyStoppingDelay property: Minimum number of epochs or validation evaluations to wait before primary - * metric improvement is tracked for early stopping. Must be a positive integer. - * - * @return the earlyStoppingDelay value. - */ - public Integer earlyStoppingDelay() { - return this.earlyStoppingDelay; - } - - /** - * Set the earlyStoppingDelay property: Minimum number of epochs or validation evaluations to wait before primary - * metric improvement is tracked for early stopping. Must be a positive integer. - * - * @param earlyStoppingDelay the earlyStoppingDelay value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withEarlyStoppingDelay(Integer earlyStoppingDelay) { - this.earlyStoppingDelay = earlyStoppingDelay; - return this; - } - - /** - * Get the earlyStoppingPatience property: Minimum number of epochs or validation evaluations with no primary metric - * improvement before the run is stopped. Must be a positive integer. - * - * @return the earlyStoppingPatience value. - */ - public Integer earlyStoppingPatience() { - return this.earlyStoppingPatience; - } - - /** - * Set the earlyStoppingPatience property: Minimum number of epochs or validation evaluations with no primary metric - * improvement before the run is stopped. Must be a positive integer. - * - * @param earlyStoppingPatience the earlyStoppingPatience value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withEarlyStoppingPatience(Integer earlyStoppingPatience) { - this.earlyStoppingPatience = earlyStoppingPatience; - return this; - } - - /** - * Get the enableOnnxNormalization property: Enable normalization when exporting ONNX model. - * - * @return the enableOnnxNormalization value. - */ - public Boolean enableOnnxNormalization() { - return this.enableOnnxNormalization; - } - - /** - * Set the enableOnnxNormalization property: Enable normalization when exporting ONNX model. - * - * @param enableOnnxNormalization the enableOnnxNormalization value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withEnableOnnxNormalization(Boolean enableOnnxNormalization) { - this.enableOnnxNormalization = enableOnnxNormalization; - return this; - } - - /** - * Get the evaluationFrequency property: Frequency to evaluate validation dataset to get metric scores. Must be a - * positive integer. - * - * @return the evaluationFrequency value. - */ - public Integer evaluationFrequency() { - return this.evaluationFrequency; - } - - /** - * Set the evaluationFrequency property: Frequency to evaluate validation dataset to get metric scores. Must be a - * positive integer. - * - * @param evaluationFrequency the evaluationFrequency value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withEvaluationFrequency(Integer evaluationFrequency) { - this.evaluationFrequency = evaluationFrequency; - return this; - } - - /** - * Get the gradientAccumulationStep property: Gradient accumulation means running a configured number of - * "GradAccumulationStep"\ steps without updating the model weights while accumulating the gradients of those steps, - * and then using the accumulated gradients to compute the weight updates. Must be a positive integer. - * - * @return the gradientAccumulationStep value. - */ - public Integer gradientAccumulationStep() { - return this.gradientAccumulationStep; - } - - /** - * Set the gradientAccumulationStep property: Gradient accumulation means running a configured number of - * "GradAccumulationStep"\ steps without updating the model weights while accumulating the gradients of those steps, - * and then using the accumulated gradients to compute the weight updates. Must be a positive integer. - * - * @param gradientAccumulationStep the gradientAccumulationStep value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withGradientAccumulationStep(Integer gradientAccumulationStep) { - this.gradientAccumulationStep = gradientAccumulationStep; - return this; - } - - /** - * Get the layersToFreeze property: Number of layers to freeze for the model. Must be a positive integer. For - * instance, passing 2 as value for 'seresnext' means freezing layer0 and layer1. For a full list of models - * supported and details on layer freeze, please see: - * https://docs.microsoft.com/en-us/azure/machine-learning/how-to-auto-train-image-models. - * - * @return the layersToFreeze value. - */ - public Integer layersToFreeze() { - return this.layersToFreeze; - } - - /** - * Set the layersToFreeze property: Number of layers to freeze for the model. Must be a positive integer. For - * instance, passing 2 as value for 'seresnext' means freezing layer0 and layer1. For a full list of models - * supported and details on layer freeze, please see: - * https://docs.microsoft.com/en-us/azure/machine-learning/how-to-auto-train-image-models. - * - * @param layersToFreeze the layersToFreeze value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withLayersToFreeze(Integer layersToFreeze) { - this.layersToFreeze = layersToFreeze; - return this; - } - - /** - * Get the learningRate property: Initial learning rate. Must be a float in the range [0, 1]. - * - * @return the learningRate value. - */ - public Float learningRate() { - return this.learningRate; - } - - /** - * Set the learningRate property: Initial learning rate. Must be a float in the range [0, 1]. - * - * @param learningRate the learningRate value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withLearningRate(Float learningRate) { - this.learningRate = learningRate; - return this; - } - - /** - * Get the learningRateScheduler property: Type of learning rate scheduler. Must be 'warmup_cosine' or 'step'. - * - * @return the learningRateScheduler value. - */ - public LearningRateScheduler learningRateScheduler() { - return this.learningRateScheduler; - } - - /** - * Set the learningRateScheduler property: Type of learning rate scheduler. Must be 'warmup_cosine' or 'step'. - * - * @param learningRateScheduler the learningRateScheduler value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withLearningRateScheduler(LearningRateScheduler learningRateScheduler) { - this.learningRateScheduler = learningRateScheduler; - return this; - } - - /** - * Get the modelName property: Name of the model to use for training. For more information on the available models - * please visit the official documentation: - * https://docs.microsoft.com/en-us/azure/machine-learning/how-to-auto-train-image-models. - * - * @return the modelName value. - */ - public String modelName() { - return this.modelName; - } - - /** - * Set the modelName property: Name of the model to use for training. For more information on the available models - * please visit the official documentation: - * https://docs.microsoft.com/en-us/azure/machine-learning/how-to-auto-train-image-models. - * - * @param modelName the modelName value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withModelName(String modelName) { - this.modelName = modelName; - return this; - } - - /** - * Get the momentum property: Value of momentum when optimizer is 'sgd'. Must be a float in the range [0, 1]. - * - * @return the momentum value. - */ - public Float momentum() { - return this.momentum; - } - - /** - * Set the momentum property: Value of momentum when optimizer is 'sgd'. Must be a float in the range [0, 1]. - * - * @param momentum the momentum value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withMomentum(Float momentum) { - this.momentum = momentum; - return this; - } - - /** - * Get the nesterov property: Enable nesterov when optimizer is 'sgd'. - * - * @return the nesterov value. - */ - public Boolean nesterov() { - return this.nesterov; - } - - /** - * Set the nesterov property: Enable nesterov when optimizer is 'sgd'. - * - * @param nesterov the nesterov value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withNesterov(Boolean nesterov) { - this.nesterov = nesterov; - return this; - } - - /** - * Get the numberOfEpochs property: Number of training epochs. Must be a positive integer. - * - * @return the numberOfEpochs value. - */ - public Integer numberOfEpochs() { - return this.numberOfEpochs; - } - - /** - * Set the numberOfEpochs property: Number of training epochs. Must be a positive integer. - * - * @param numberOfEpochs the numberOfEpochs value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withNumberOfEpochs(Integer numberOfEpochs) { - this.numberOfEpochs = numberOfEpochs; - return this; - } - - /** - * Get the numberOfWorkers property: Number of data loader workers. Must be a non-negative integer. - * - * @return the numberOfWorkers value. - */ - public Integer numberOfWorkers() { - return this.numberOfWorkers; - } - - /** - * Set the numberOfWorkers property: Number of data loader workers. Must be a non-negative integer. - * - * @param numberOfWorkers the numberOfWorkers value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withNumberOfWorkers(Integer numberOfWorkers) { - this.numberOfWorkers = numberOfWorkers; - return this; - } - - /** - * Get the optimizer property: Type of optimizer. - * - * @return the optimizer value. - */ - public StochasticOptimizer optimizer() { - return this.optimizer; - } - - /** - * Set the optimizer property: Type of optimizer. - * - * @param optimizer the optimizer value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withOptimizer(StochasticOptimizer optimizer) { - this.optimizer = optimizer; - return this; - } - - /** - * Get the randomSeed property: Random seed to be used when using deterministic training. - * - * @return the randomSeed value. - */ - public Integer randomSeed() { - return this.randomSeed; - } - - /** - * Set the randomSeed property: Random seed to be used when using deterministic training. - * - * @param randomSeed the randomSeed value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withRandomSeed(Integer randomSeed) { - this.randomSeed = randomSeed; - return this; - } - - /** - * Get the splitRatio property: If validation data is not defined, this specifies the split ratio for splitting - * train data into random train and validation subsets. Must be a float in the range [0, 1]. - * - * @return the splitRatio value. - */ - public Float splitRatio() { - return this.splitRatio; - } - - /** - * Set the splitRatio property: If validation data is not defined, this specifies the split ratio for splitting - * train data into random train and validation subsets. Must be a float in the range [0, 1]. - * - * @param splitRatio the splitRatio value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withSplitRatio(Float splitRatio) { - this.splitRatio = splitRatio; - return this; - } - - /** - * Get the stepLRGamma property: Value of gamma when learning rate scheduler is 'step'. Must be a float in the range - * [0, 1]. - * - * @return the stepLRGamma value. - */ - public Float stepLRGamma() { - return this.stepLRGamma; - } - - /** - * Set the stepLRGamma property: Value of gamma when learning rate scheduler is 'step'. Must be a float in the range - * [0, 1]. - * - * @param stepLRGamma the stepLRGamma value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withStepLRGamma(Float stepLRGamma) { - this.stepLRGamma = stepLRGamma; - return this; - } - - /** - * Get the stepLRStepSize property: Value of step size when learning rate scheduler is 'step'. Must be a positive - * integer. - * - * @return the stepLRStepSize value. - */ - public Integer stepLRStepSize() { - return this.stepLRStepSize; - } - - /** - * Set the stepLRStepSize property: Value of step size when learning rate scheduler is 'step'. Must be a positive - * integer. - * - * @param stepLRStepSize the stepLRStepSize value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withStepLRStepSize(Integer stepLRStepSize) { - this.stepLRStepSize = stepLRStepSize; - return this; - } - - /** - * Get the trainingBatchSize property: Training batch size. Must be a positive integer. - * - * @return the trainingBatchSize value. - */ - public Integer trainingBatchSize() { - return this.trainingBatchSize; - } - - /** - * Set the trainingBatchSize property: Training batch size. Must be a positive integer. - * - * @param trainingBatchSize the trainingBatchSize value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withTrainingBatchSize(Integer trainingBatchSize) { - this.trainingBatchSize = trainingBatchSize; - return this; - } - - /** - * Get the validationBatchSize property: Validation batch size. Must be a positive integer. - * - * @return the validationBatchSize value. - */ - public Integer validationBatchSize() { - return this.validationBatchSize; - } - - /** - * Set the validationBatchSize property: Validation batch size. Must be a positive integer. - * - * @param validationBatchSize the validationBatchSize value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withValidationBatchSize(Integer validationBatchSize) { - this.validationBatchSize = validationBatchSize; - return this; - } - - /** - * Get the warmupCosineLRCycles property: Value of cosine cycle when learning rate scheduler is 'warmup_cosine'. - * Must be a float in the range [0, 1]. - * - * @return the warmupCosineLRCycles value. - */ - public Float warmupCosineLRCycles() { - return this.warmupCosineLRCycles; - } - - /** - * Set the warmupCosineLRCycles property: Value of cosine cycle when learning rate scheduler is 'warmup_cosine'. - * Must be a float in the range [0, 1]. - * - * @param warmupCosineLRCycles the warmupCosineLRCycles value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withWarmupCosineLRCycles(Float warmupCosineLRCycles) { - this.warmupCosineLRCycles = warmupCosineLRCycles; - return this; - } - - /** - * Get the warmupCosineLRWarmupEpochs property: Value of warmup epochs when learning rate scheduler is - * 'warmup_cosine'. Must be a positive integer. - * - * @return the warmupCosineLRWarmupEpochs value. - */ - public Integer warmupCosineLRWarmupEpochs() { - return this.warmupCosineLRWarmupEpochs; - } - - /** - * Set the warmupCosineLRWarmupEpochs property: Value of warmup epochs when learning rate scheduler is - * 'warmup_cosine'. Must be a positive integer. - * - * @param warmupCosineLRWarmupEpochs the warmupCosineLRWarmupEpochs value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withWarmupCosineLRWarmupEpochs(Integer warmupCosineLRWarmupEpochs) { - this.warmupCosineLRWarmupEpochs = warmupCosineLRWarmupEpochs; - return this; - } - - /** - * Get the weightDecay property: Value of weight decay when optimizer is 'sgd', 'adam', or 'adamw'. Must be a float - * in the range[0, 1]. - * - * @return the weightDecay value. - */ - public Float weightDecay() { - return this.weightDecay; - } - - /** - * Set the weightDecay property: Value of weight decay when optimizer is 'sgd', 'adam', or 'adamw'. Must be a float - * in the range[0, 1]. - * - * @param weightDecay the weightDecay value to set. - * @return the ImageModelSettings object itself. - */ - public ImageModelSettings withWeightDecay(Float weightDecay) { - this.weightDecay = weightDecay; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelSettingsClassification.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelSettingsClassification.java deleted file mode 100644 index 38153e69f12d..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelSettingsClassification.java +++ /dev/null @@ -1,380 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Settings used for training the model. For more information on the available settings please visit the official - * documentation: https://docs.microsoft.com/en-us/azure/machine-learning/how-to-auto-train-image-models. - */ -@Fluent -public final class ImageModelSettingsClassification extends ImageModelSettings { - /* - * Image crop size that is input to the neural network for the training - * dataset. Must be a positive integer. - */ - @JsonProperty(value = "trainingCropSize") - private Integer trainingCropSize; - - /* - * Image crop size that is input to the neural network for the validation - * dataset. Must be a positive integer. - */ - @JsonProperty(value = "validationCropSize") - private Integer validationCropSize; - - /* - * Image size to which to resize before cropping for validation dataset. - * Must be a positive integer. - */ - @JsonProperty(value = "validationResizeSize") - private Integer validationResizeSize; - - /* - * Weighted loss. The accepted values are 0 for no weighted loss. - * 1 for weighted loss with sqrt.(class_weights). 2 for weighted loss with - * class_weights. Must be 0 or 1 or 2. - */ - @JsonProperty(value = "weightedLoss") - private Integer weightedLoss; - - /** - * Get the trainingCropSize property: Image crop size that is input to the neural network for the training dataset. - * Must be a positive integer. - * - * @return the trainingCropSize value. - */ - public Integer trainingCropSize() { - return this.trainingCropSize; - } - - /** - * Set the trainingCropSize property: Image crop size that is input to the neural network for the training dataset. - * Must be a positive integer. - * - * @param trainingCropSize the trainingCropSize value to set. - * @return the ImageModelSettingsClassification object itself. - */ - public ImageModelSettingsClassification withTrainingCropSize(Integer trainingCropSize) { - this.trainingCropSize = trainingCropSize; - return this; - } - - /** - * Get the validationCropSize property: Image crop size that is input to the neural network for the validation - * dataset. Must be a positive integer. - * - * @return the validationCropSize value. - */ - public Integer validationCropSize() { - return this.validationCropSize; - } - - /** - * Set the validationCropSize property: Image crop size that is input to the neural network for the validation - * dataset. Must be a positive integer. - * - * @param validationCropSize the validationCropSize value to set. - * @return the ImageModelSettingsClassification object itself. - */ - public ImageModelSettingsClassification withValidationCropSize(Integer validationCropSize) { - this.validationCropSize = validationCropSize; - return this; - } - - /** - * Get the validationResizeSize property: Image size to which to resize before cropping for validation dataset. Must - * be a positive integer. - * - * @return the validationResizeSize value. - */ - public Integer validationResizeSize() { - return this.validationResizeSize; - } - - /** - * Set the validationResizeSize property: Image size to which to resize before cropping for validation dataset. Must - * be a positive integer. - * - * @param validationResizeSize the validationResizeSize value to set. - * @return the ImageModelSettingsClassification object itself. - */ - public ImageModelSettingsClassification withValidationResizeSize(Integer validationResizeSize) { - this.validationResizeSize = validationResizeSize; - return this; - } - - /** - * Get the weightedLoss property: Weighted loss. The accepted values are 0 for no weighted loss. 1 for weighted loss - * with sqrt.(class_weights). 2 for weighted loss with class_weights. Must be 0 or 1 or 2. - * - * @return the weightedLoss value. - */ - public Integer weightedLoss() { - return this.weightedLoss; - } - - /** - * Set the weightedLoss property: Weighted loss. The accepted values are 0 for no weighted loss. 1 for weighted loss - * with sqrt.(class_weights). 2 for weighted loss with class_weights. Must be 0 or 1 or 2. - * - * @param weightedLoss the weightedLoss value to set. - * @return the ImageModelSettingsClassification object itself. - */ - public ImageModelSettingsClassification withWeightedLoss(Integer weightedLoss) { - this.weightedLoss = weightedLoss; - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withAdvancedSettings(String advancedSettings) { - super.withAdvancedSettings(advancedSettings); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withAmsGradient(Boolean amsGradient) { - super.withAmsGradient(amsGradient); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withAugmentations(String augmentations) { - super.withAugmentations(augmentations); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withBeta1(Float beta1) { - super.withBeta1(beta1); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withBeta2(Float beta2) { - super.withBeta2(beta2); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withCheckpointDatasetId(String checkpointDatasetId) { - super.withCheckpointDatasetId(checkpointDatasetId); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withCheckpointFilename(String checkpointFilename) { - super.withCheckpointFilename(checkpointFilename); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withCheckpointFrequency(Integer checkpointFrequency) { - super.withCheckpointFrequency(checkpointFrequency); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withCheckpointRunId(String checkpointRunId) { - super.withCheckpointRunId(checkpointRunId); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withDistributed(Boolean distributed) { - super.withDistributed(distributed); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withEarlyStopping(Boolean earlyStopping) { - super.withEarlyStopping(earlyStopping); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withEarlyStoppingDelay(Integer earlyStoppingDelay) { - super.withEarlyStoppingDelay(earlyStoppingDelay); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withEarlyStoppingPatience(Integer earlyStoppingPatience) { - super.withEarlyStoppingPatience(earlyStoppingPatience); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withEnableOnnxNormalization(Boolean enableOnnxNormalization) { - super.withEnableOnnxNormalization(enableOnnxNormalization); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withEvaluationFrequency(Integer evaluationFrequency) { - super.withEvaluationFrequency(evaluationFrequency); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withGradientAccumulationStep(Integer gradientAccumulationStep) { - super.withGradientAccumulationStep(gradientAccumulationStep); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withLayersToFreeze(Integer layersToFreeze) { - super.withLayersToFreeze(layersToFreeze); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withLearningRate(Float learningRate) { - super.withLearningRate(learningRate); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withLearningRateScheduler(LearningRateScheduler learningRateScheduler) { - super.withLearningRateScheduler(learningRateScheduler); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withModelName(String modelName) { - super.withModelName(modelName); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withMomentum(Float momentum) { - super.withMomentum(momentum); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withNesterov(Boolean nesterov) { - super.withNesterov(nesterov); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withNumberOfEpochs(Integer numberOfEpochs) { - super.withNumberOfEpochs(numberOfEpochs); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withNumberOfWorkers(Integer numberOfWorkers) { - super.withNumberOfWorkers(numberOfWorkers); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withOptimizer(StochasticOptimizer optimizer) { - super.withOptimizer(optimizer); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withRandomSeed(Integer randomSeed) { - super.withRandomSeed(randomSeed); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withSplitRatio(Float splitRatio) { - super.withSplitRatio(splitRatio); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withStepLRGamma(Float stepLRGamma) { - super.withStepLRGamma(stepLRGamma); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withStepLRStepSize(Integer stepLRStepSize) { - super.withStepLRStepSize(stepLRStepSize); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withTrainingBatchSize(Integer trainingBatchSize) { - super.withTrainingBatchSize(trainingBatchSize); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withValidationBatchSize(Integer validationBatchSize) { - super.withValidationBatchSize(validationBatchSize); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withWarmupCosineLRCycles(Float warmupCosineLRCycles) { - super.withWarmupCosineLRCycles(warmupCosineLRCycles); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withWarmupCosineLRWarmupEpochs(Integer warmupCosineLRWarmupEpochs) { - super.withWarmupCosineLRWarmupEpochs(warmupCosineLRWarmupEpochs); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsClassification withWeightDecay(Float weightDecay) { - super.withWeightDecay(weightDecay); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelSettingsObjectDetection.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelSettingsObjectDetection.java deleted file mode 100644 index 9d79afb1992a..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageModelSettingsObjectDetection.java +++ /dev/null @@ -1,664 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Settings used for training the model. For more information on the available settings please visit the official - * documentation: https://docs.microsoft.com/en-us/azure/machine-learning/how-to-auto-train-image-models. - */ -@Fluent -public final class ImageModelSettingsObjectDetection extends ImageModelSettings { - /* - * Maximum number of detections per image, for all classes. Must be a - * positive integer. - * Note: This settings is not supported for the 'yolov5' algorithm. - */ - @JsonProperty(value = "boxDetectionsPerImage") - private Integer boxDetectionsPerImage; - - /* - * During inference, only return proposals with a classification score - * greater than - * BoxScoreThreshold. Must be a float in the range[0, 1]. - */ - @JsonProperty(value = "boxScoreThreshold") - private Float boxScoreThreshold; - - /* - * Image size for train and validation. Must be a positive integer. - * Note: The training run may get into CUDA OOM if the size is too big. - * Note: This settings is only supported for the 'yolov5' algorithm. - */ - @JsonProperty(value = "imageSize") - private Integer imageSize; - - /* - * Maximum size of the image to be rescaled before feeding it to the - * backbone. - * Must be a positive integer. Note: training run may get into CUDA OOM if - * the size is too big. - * Note: This settings is not supported for the 'yolov5' algorithm. - */ - @JsonProperty(value = "maxSize") - private Integer maxSize; - - /* - * Minimum size of the image to be rescaled before feeding it to the - * backbone. - * Must be a positive integer. Note: training run may get into CUDA OOM if - * the size is too big. - * Note: This settings is not supported for the 'yolov5' algorithm. - */ - @JsonProperty(value = "minSize") - private Integer minSize; - - /* - * Model size. Must be 'small', 'medium', 'large', or 'xlarge'. - * Note: training run may get into CUDA OOM if the model size is too big. - * Note: This settings is only supported for the 'yolov5' algorithm. - */ - @JsonProperty(value = "modelSize") - private ModelSize modelSize; - - /* - * Enable multi-scale image by varying image size by +/- 50%. - * Note: training run may get into CUDA OOM if no sufficient GPU memory. - * Note: This settings is only supported for the 'yolov5' algorithm. - */ - @JsonProperty(value = "multiScale") - private Boolean multiScale; - - /* - * IOU threshold used during inference in NMS post processing. Must be a - * float in the range [0, 1]. - */ - @JsonProperty(value = "nmsIouThreshold") - private Float nmsIouThreshold; - - /* - * The grid size to use for tiling each image. Note: TileGridSize must not - * be - * None to enable small object detection logic. A string containing two - * integers in mxn format. - * Note: This settings is not supported for the 'yolov5' algorithm. - */ - @JsonProperty(value = "tileGridSize") - private String tileGridSize; - - /* - * Overlap ratio between adjacent tiles in each dimension. Must be float in - * the range [0, 1). - * Note: This settings is not supported for the 'yolov5' algorithm. - */ - @JsonProperty(value = "tileOverlapRatio") - private Float tileOverlapRatio; - - /* - * The IOU threshold to use to perform NMS while merging predictions from - * tiles and image. - * Used in validation/ inference. Must be float in the range [0, 1]. - * Note: This settings is not supported for the 'yolov5' algorithm. - */ - @JsonProperty(value = "tilePredictionsNmsThreshold") - private Float tilePredictionsNmsThreshold; - - /* - * IOU threshold to use when computing validation metric. Must be float in - * the range [0, 1]. - */ - @JsonProperty(value = "validationIouThreshold") - private Float validationIouThreshold; - - /* - * Metric computation method to use for validation metrics. - */ - @JsonProperty(value = "validationMetricType") - private ValidationMetricType validationMetricType; - - /** - * Get the boxDetectionsPerImage property: Maximum number of detections per image, for all classes. Must be a - * positive integer. Note: This settings is not supported for the 'yolov5' algorithm. - * - * @return the boxDetectionsPerImage value. - */ - public Integer boxDetectionsPerImage() { - return this.boxDetectionsPerImage; - } - - /** - * Set the boxDetectionsPerImage property: Maximum number of detections per image, for all classes. Must be a - * positive integer. Note: This settings is not supported for the 'yolov5' algorithm. - * - * @param boxDetectionsPerImage the boxDetectionsPerImage value to set. - * @return the ImageModelSettingsObjectDetection object itself. - */ - public ImageModelSettingsObjectDetection withBoxDetectionsPerImage(Integer boxDetectionsPerImage) { - this.boxDetectionsPerImage = boxDetectionsPerImage; - return this; - } - - /** - * Get the boxScoreThreshold property: During inference, only return proposals with a classification score greater - * than BoxScoreThreshold. Must be a float in the range[0, 1]. - * - * @return the boxScoreThreshold value. - */ - public Float boxScoreThreshold() { - return this.boxScoreThreshold; - } - - /** - * Set the boxScoreThreshold property: During inference, only return proposals with a classification score greater - * than BoxScoreThreshold. Must be a float in the range[0, 1]. - * - * @param boxScoreThreshold the boxScoreThreshold value to set. - * @return the ImageModelSettingsObjectDetection object itself. - */ - public ImageModelSettingsObjectDetection withBoxScoreThreshold(Float boxScoreThreshold) { - this.boxScoreThreshold = boxScoreThreshold; - return this; - } - - /** - * Get the imageSize property: Image size for train and validation. Must be a positive integer. Note: The training - * run may get into CUDA OOM if the size is too big. Note: This settings is only supported for the 'yolov5' - * algorithm. - * - * @return the imageSize value. - */ - public Integer imageSize() { - return this.imageSize; - } - - /** - * Set the imageSize property: Image size for train and validation. Must be a positive integer. Note: The training - * run may get into CUDA OOM if the size is too big. Note: This settings is only supported for the 'yolov5' - * algorithm. - * - * @param imageSize the imageSize value to set. - * @return the ImageModelSettingsObjectDetection object itself. - */ - public ImageModelSettingsObjectDetection withImageSize(Integer imageSize) { - this.imageSize = imageSize; - return this; - } - - /** - * Get the maxSize property: Maximum size of the image to be rescaled before feeding it to the backbone. Must be a - * positive integer. Note: training run may get into CUDA OOM if the size is too big. Note: This settings is not - * supported for the 'yolov5' algorithm. - * - * @return the maxSize value. - */ - public Integer maxSize() { - return this.maxSize; - } - - /** - * Set the maxSize property: Maximum size of the image to be rescaled before feeding it to the backbone. Must be a - * positive integer. Note: training run may get into CUDA OOM if the size is too big. Note: This settings is not - * supported for the 'yolov5' algorithm. - * - * @param maxSize the maxSize value to set. - * @return the ImageModelSettingsObjectDetection object itself. - */ - public ImageModelSettingsObjectDetection withMaxSize(Integer maxSize) { - this.maxSize = maxSize; - return this; - } - - /** - * Get the minSize property: Minimum size of the image to be rescaled before feeding it to the backbone. Must be a - * positive integer. Note: training run may get into CUDA OOM if the size is too big. Note: This settings is not - * supported for the 'yolov5' algorithm. - * - * @return the minSize value. - */ - public Integer minSize() { - return this.minSize; - } - - /** - * Set the minSize property: Minimum size of the image to be rescaled before feeding it to the backbone. Must be a - * positive integer. Note: training run may get into CUDA OOM if the size is too big. Note: This settings is not - * supported for the 'yolov5' algorithm. - * - * @param minSize the minSize value to set. - * @return the ImageModelSettingsObjectDetection object itself. - */ - public ImageModelSettingsObjectDetection withMinSize(Integer minSize) { - this.minSize = minSize; - return this; - } - - /** - * Get the modelSize property: Model size. Must be 'small', 'medium', 'large', or 'xlarge'. Note: training run may - * get into CUDA OOM if the model size is too big. Note: This settings is only supported for the 'yolov5' algorithm. - * - * @return the modelSize value. - */ - public ModelSize modelSize() { - return this.modelSize; - } - - /** - * Set the modelSize property: Model size. Must be 'small', 'medium', 'large', or 'xlarge'. Note: training run may - * get into CUDA OOM if the model size is too big. Note: This settings is only supported for the 'yolov5' algorithm. - * - * @param modelSize the modelSize value to set. - * @return the ImageModelSettingsObjectDetection object itself. - */ - public ImageModelSettingsObjectDetection withModelSize(ModelSize modelSize) { - this.modelSize = modelSize; - return this; - } - - /** - * Get the multiScale property: Enable multi-scale image by varying image size by +/- 50%. Note: training run may - * get into CUDA OOM if no sufficient GPU memory. Note: This settings is only supported for the 'yolov5' algorithm. - * - * @return the multiScale value. - */ - public Boolean multiScale() { - return this.multiScale; - } - - /** - * Set the multiScale property: Enable multi-scale image by varying image size by +/- 50%. Note: training run may - * get into CUDA OOM if no sufficient GPU memory. Note: This settings is only supported for the 'yolov5' algorithm. - * - * @param multiScale the multiScale value to set. - * @return the ImageModelSettingsObjectDetection object itself. - */ - public ImageModelSettingsObjectDetection withMultiScale(Boolean multiScale) { - this.multiScale = multiScale; - return this; - } - - /** - * Get the nmsIouThreshold property: IOU threshold used during inference in NMS post processing. Must be a float in - * the range [0, 1]. - * - * @return the nmsIouThreshold value. - */ - public Float nmsIouThreshold() { - return this.nmsIouThreshold; - } - - /** - * Set the nmsIouThreshold property: IOU threshold used during inference in NMS post processing. Must be a float in - * the range [0, 1]. - * - * @param nmsIouThreshold the nmsIouThreshold value to set. - * @return the ImageModelSettingsObjectDetection object itself. - */ - public ImageModelSettingsObjectDetection withNmsIouThreshold(Float nmsIouThreshold) { - this.nmsIouThreshold = nmsIouThreshold; - return this; - } - - /** - * Get the tileGridSize property: The grid size to use for tiling each image. Note: TileGridSize must not be None to - * enable small object detection logic. A string containing two integers in mxn format. Note: This settings is not - * supported for the 'yolov5' algorithm. - * - * @return the tileGridSize value. - */ - public String tileGridSize() { - return this.tileGridSize; - } - - /** - * Set the tileGridSize property: The grid size to use for tiling each image. Note: TileGridSize must not be None to - * enable small object detection logic. A string containing two integers in mxn format. Note: This settings is not - * supported for the 'yolov5' algorithm. - * - * @param tileGridSize the tileGridSize value to set. - * @return the ImageModelSettingsObjectDetection object itself. - */ - public ImageModelSettingsObjectDetection withTileGridSize(String tileGridSize) { - this.tileGridSize = tileGridSize; - return this; - } - - /** - * Get the tileOverlapRatio property: Overlap ratio between adjacent tiles in each dimension. Must be float in the - * range [0, 1). Note: This settings is not supported for the 'yolov5' algorithm. - * - * @return the tileOverlapRatio value. - */ - public Float tileOverlapRatio() { - return this.tileOverlapRatio; - } - - /** - * Set the tileOverlapRatio property: Overlap ratio between adjacent tiles in each dimension. Must be float in the - * range [0, 1). Note: This settings is not supported for the 'yolov5' algorithm. - * - * @param tileOverlapRatio the tileOverlapRatio value to set. - * @return the ImageModelSettingsObjectDetection object itself. - */ - public ImageModelSettingsObjectDetection withTileOverlapRatio(Float tileOverlapRatio) { - this.tileOverlapRatio = tileOverlapRatio; - return this; - } - - /** - * Get the tilePredictionsNmsThreshold property: The IOU threshold to use to perform NMS while merging predictions - * from tiles and image. Used in validation/ inference. Must be float in the range [0, 1]. Note: This settings is - * not supported for the 'yolov5' algorithm. - * - * @return the tilePredictionsNmsThreshold value. - */ - public Float tilePredictionsNmsThreshold() { - return this.tilePredictionsNmsThreshold; - } - - /** - * Set the tilePredictionsNmsThreshold property: The IOU threshold to use to perform NMS while merging predictions - * from tiles and image. Used in validation/ inference. Must be float in the range [0, 1]. Note: This settings is - * not supported for the 'yolov5' algorithm. - * - * @param tilePredictionsNmsThreshold the tilePredictionsNmsThreshold value to set. - * @return the ImageModelSettingsObjectDetection object itself. - */ - public ImageModelSettingsObjectDetection withTilePredictionsNmsThreshold(Float tilePredictionsNmsThreshold) { - this.tilePredictionsNmsThreshold = tilePredictionsNmsThreshold; - return this; - } - - /** - * Get the validationIouThreshold property: IOU threshold to use when computing validation metric. Must be float in - * the range [0, 1]. - * - * @return the validationIouThreshold value. - */ - public Float validationIouThreshold() { - return this.validationIouThreshold; - } - - /** - * Set the validationIouThreshold property: IOU threshold to use when computing validation metric. Must be float in - * the range [0, 1]. - * - * @param validationIouThreshold the validationIouThreshold value to set. - * @return the ImageModelSettingsObjectDetection object itself. - */ - public ImageModelSettingsObjectDetection withValidationIouThreshold(Float validationIouThreshold) { - this.validationIouThreshold = validationIouThreshold; - return this; - } - - /** - * Get the validationMetricType property: Metric computation method to use for validation metrics. - * - * @return the validationMetricType value. - */ - public ValidationMetricType validationMetricType() { - return this.validationMetricType; - } - - /** - * Set the validationMetricType property: Metric computation method to use for validation metrics. - * - * @param validationMetricType the validationMetricType value to set. - * @return the ImageModelSettingsObjectDetection object itself. - */ - public ImageModelSettingsObjectDetection withValidationMetricType(ValidationMetricType validationMetricType) { - this.validationMetricType = validationMetricType; - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withAdvancedSettings(String advancedSettings) { - super.withAdvancedSettings(advancedSettings); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withAmsGradient(Boolean amsGradient) { - super.withAmsGradient(amsGradient); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withAugmentations(String augmentations) { - super.withAugmentations(augmentations); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withBeta1(Float beta1) { - super.withBeta1(beta1); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withBeta2(Float beta2) { - super.withBeta2(beta2); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withCheckpointDatasetId(String checkpointDatasetId) { - super.withCheckpointDatasetId(checkpointDatasetId); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withCheckpointFilename(String checkpointFilename) { - super.withCheckpointFilename(checkpointFilename); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withCheckpointFrequency(Integer checkpointFrequency) { - super.withCheckpointFrequency(checkpointFrequency); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withCheckpointRunId(String checkpointRunId) { - super.withCheckpointRunId(checkpointRunId); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withDistributed(Boolean distributed) { - super.withDistributed(distributed); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withEarlyStopping(Boolean earlyStopping) { - super.withEarlyStopping(earlyStopping); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withEarlyStoppingDelay(Integer earlyStoppingDelay) { - super.withEarlyStoppingDelay(earlyStoppingDelay); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withEarlyStoppingPatience(Integer earlyStoppingPatience) { - super.withEarlyStoppingPatience(earlyStoppingPatience); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withEnableOnnxNormalization(Boolean enableOnnxNormalization) { - super.withEnableOnnxNormalization(enableOnnxNormalization); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withEvaluationFrequency(Integer evaluationFrequency) { - super.withEvaluationFrequency(evaluationFrequency); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withGradientAccumulationStep(Integer gradientAccumulationStep) { - super.withGradientAccumulationStep(gradientAccumulationStep); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withLayersToFreeze(Integer layersToFreeze) { - super.withLayersToFreeze(layersToFreeze); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withLearningRate(Float learningRate) { - super.withLearningRate(learningRate); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withLearningRateScheduler(LearningRateScheduler learningRateScheduler) { - super.withLearningRateScheduler(learningRateScheduler); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withModelName(String modelName) { - super.withModelName(modelName); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withMomentum(Float momentum) { - super.withMomentum(momentum); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withNesterov(Boolean nesterov) { - super.withNesterov(nesterov); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withNumberOfEpochs(Integer numberOfEpochs) { - super.withNumberOfEpochs(numberOfEpochs); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withNumberOfWorkers(Integer numberOfWorkers) { - super.withNumberOfWorkers(numberOfWorkers); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withOptimizer(StochasticOptimizer optimizer) { - super.withOptimizer(optimizer); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withRandomSeed(Integer randomSeed) { - super.withRandomSeed(randomSeed); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withSplitRatio(Float splitRatio) { - super.withSplitRatio(splitRatio); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withStepLRGamma(Float stepLRGamma) { - super.withStepLRGamma(stepLRGamma); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withStepLRStepSize(Integer stepLRStepSize) { - super.withStepLRStepSize(stepLRStepSize); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withTrainingBatchSize(Integer trainingBatchSize) { - super.withTrainingBatchSize(trainingBatchSize); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withValidationBatchSize(Integer validationBatchSize) { - super.withValidationBatchSize(validationBatchSize); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withWarmupCosineLRCycles(Float warmupCosineLRCycles) { - super.withWarmupCosineLRCycles(warmupCosineLRCycles); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withWarmupCosineLRWarmupEpochs(Integer warmupCosineLRWarmupEpochs) { - super.withWarmupCosineLRWarmupEpochs(warmupCosineLRWarmupEpochs); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageModelSettingsObjectDetection withWeightDecay(Float weightDecay) { - super.withWeightDecay(weightDecay); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageObjectDetection.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageObjectDetection.java deleted file mode 100644 index 7bbc8629bbc8..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageObjectDetection.java +++ /dev/null @@ -1,227 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.util.List; - -/** - * Image Object Detection. Object detection is used to identify objects in an image and locate each object with a - * bounding box e.g. locate all dogs and cats in an image and draw a bounding box around each. - */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType") -@JsonTypeName("ImageObjectDetection") -@Fluent -public final class ImageObjectDetection extends AutoMLVertical { - /* - * Primary metric to optimize for this task. - */ - @JsonProperty(value = "primaryMetric") - private ObjectDetectionPrimaryMetrics primaryMetric; - - /* - * Settings used for training the model. - */ - @JsonProperty(value = "modelSettings") - private ImageModelSettingsObjectDetection modelSettings; - - /* - * Search space for sampling different combinations of models and their - * hyperparameters. - */ - @JsonProperty(value = "searchSpace") - private List searchSpace; - - /* - * [Required] Collection of registered Tabular Dataset Ids and other data - * settings required for training and validating models. - */ - @JsonProperty(value = "dataSettings", required = true) - private ImageVerticalDataSettings dataSettings; - - /* - * [Required] Limit settings for the AutoML job. - */ - @JsonProperty(value = "limitSettings", required = true) - private ImageLimitSettings limitSettings; - - /* - * Model sweeping and hyperparameter sweeping related settings. - */ - @JsonProperty(value = "sweepSettings") - private ImageSweepSettings sweepSettings; - - /** - * Get the primaryMetric property: Primary metric to optimize for this task. - * - * @return the primaryMetric value. - */ - public ObjectDetectionPrimaryMetrics primaryMetric() { - return this.primaryMetric; - } - - /** - * Set the primaryMetric property: Primary metric to optimize for this task. - * - * @param primaryMetric the primaryMetric value to set. - * @return the ImageObjectDetection object itself. - */ - public ImageObjectDetection withPrimaryMetric(ObjectDetectionPrimaryMetrics primaryMetric) { - this.primaryMetric = primaryMetric; - return this; - } - - /** - * Get the modelSettings property: Settings used for training the model. - * - * @return the modelSettings value. - */ - public ImageModelSettingsObjectDetection modelSettings() { - return this.modelSettings; - } - - /** - * Set the modelSettings property: Settings used for training the model. - * - * @param modelSettings the modelSettings value to set. - * @return the ImageObjectDetection object itself. - */ - public ImageObjectDetection withModelSettings(ImageModelSettingsObjectDetection modelSettings) { - this.modelSettings = modelSettings; - return this; - } - - /** - * Get the searchSpace property: Search space for sampling different combinations of models and their - * hyperparameters. - * - * @return the searchSpace value. - */ - public List searchSpace() { - return this.searchSpace; - } - - /** - * Set the searchSpace property: Search space for sampling different combinations of models and their - * hyperparameters. - * - * @param searchSpace the searchSpace value to set. - * @return the ImageObjectDetection object itself. - */ - public ImageObjectDetection withSearchSpace(List searchSpace) { - this.searchSpace = searchSpace; - return this; - } - - /** - * Get the dataSettings property: [Required] Collection of registered Tabular Dataset Ids and other data settings - * required for training and validating models. - * - * @return the dataSettings value. - */ - public ImageVerticalDataSettings dataSettings() { - return this.dataSettings; - } - - /** - * Set the dataSettings property: [Required] Collection of registered Tabular Dataset Ids and other data settings - * required for training and validating models. - * - * @param dataSettings the dataSettings value to set. - * @return the ImageObjectDetection object itself. - */ - public ImageObjectDetection withDataSettings(ImageVerticalDataSettings dataSettings) { - this.dataSettings = dataSettings; - return this; - } - - /** - * Get the limitSettings property: [Required] Limit settings for the AutoML job. - * - * @return the limitSettings value. - */ - public ImageLimitSettings limitSettings() { - return this.limitSettings; - } - - /** - * Set the limitSettings property: [Required] Limit settings for the AutoML job. - * - * @param limitSettings the limitSettings value to set. - * @return the ImageObjectDetection object itself. - */ - public ImageObjectDetection withLimitSettings(ImageLimitSettings limitSettings) { - this.limitSettings = limitSettings; - return this; - } - - /** - * Get the sweepSettings property: Model sweeping and hyperparameter sweeping related settings. - * - * @return the sweepSettings value. - */ - public ImageSweepSettings sweepSettings() { - return this.sweepSettings; - } - - /** - * Set the sweepSettings property: Model sweeping and hyperparameter sweeping related settings. - * - * @param sweepSettings the sweepSettings value to set. - * @return the ImageObjectDetection object itself. - */ - public ImageObjectDetection withSweepSettings(ImageSweepSettings sweepSettings) { - this.sweepSettings = sweepSettings; - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageObjectDetection withLogVerbosity(LogVerbosity logVerbosity) { - super.withLogVerbosity(logVerbosity); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (modelSettings() != null) { - modelSettings().validate(); - } - if (searchSpace() != null) { - searchSpace().forEach(e -> e.validate()); - } - if (dataSettings() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property dataSettings in model ImageObjectDetection")); - } else { - dataSettings().validate(); - } - if (limitSettings() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property limitSettings in model ImageObjectDetection")); - } else { - limitSettings().validate(); - } - if (sweepSettings() != null) { - sweepSettings().validate(); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(ImageObjectDetection.class); -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageObjectDetectionBase.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageObjectDetectionBase.java deleted file mode 100644 index c07185d60cff..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageObjectDetectionBase.java +++ /dev/null @@ -1,105 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - -/** The ImageObjectDetectionBase model. */ -@Fluent -public class ImageObjectDetectionBase extends ImageVertical { - /* - * Settings used for training the model. - */ - @JsonProperty(value = "modelSettings") - private ImageModelSettingsObjectDetection modelSettings; - - /* - * Search space for sampling different combinations of models and their - * hyperparameters. - */ - @JsonProperty(value = "searchSpace") - private List searchSpace; - - /** - * Get the modelSettings property: Settings used for training the model. - * - * @return the modelSettings value. - */ - public ImageModelSettingsObjectDetection modelSettings() { - return this.modelSettings; - } - - /** - * Set the modelSettings property: Settings used for training the model. - * - * @param modelSettings the modelSettings value to set. - * @return the ImageObjectDetectionBase object itself. - */ - public ImageObjectDetectionBase withModelSettings(ImageModelSettingsObjectDetection modelSettings) { - this.modelSettings = modelSettings; - return this; - } - - /** - * Get the searchSpace property: Search space for sampling different combinations of models and their - * hyperparameters. - * - * @return the searchSpace value. - */ - public List searchSpace() { - return this.searchSpace; - } - - /** - * Set the searchSpace property: Search space for sampling different combinations of models and their - * hyperparameters. - * - * @param searchSpace the searchSpace value to set. - * @return the ImageObjectDetectionBase object itself. - */ - public ImageObjectDetectionBase withSearchSpace(List searchSpace) { - this.searchSpace = searchSpace; - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageObjectDetectionBase withDataSettings(ImageVerticalDataSettings dataSettings) { - super.withDataSettings(dataSettings); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageObjectDetectionBase withLimitSettings(ImageLimitSettings limitSettings) { - super.withLimitSettings(limitSettings); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageObjectDetectionBase withSweepSettings(ImageSweepSettings sweepSettings) { - super.withSweepSettings(sweepSettings); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (modelSettings() != null) { - modelSettings().validate(); - } - if (searchSpace() != null) { - searchSpace().forEach(e -> e.validate()); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageSweepLimitSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageSweepLimitSettings.java deleted file mode 100644 index 217204f228a6..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageSweepLimitSettings.java +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** Limit settings for model sweeping and hyperparameter sweeping. */ -@Fluent -public final class ImageSweepLimitSettings { - /* - * Maximum number of concurrent iterations for the underlying Sweep job. - */ - @JsonProperty(value = "maxConcurrentTrials") - private Integer maxConcurrentTrials; - - /* - * Maximum number of iterations for the underlying Sweep job. - */ - @JsonProperty(value = "maxTrials") - private Integer maxTrials; - - /** - * Get the maxConcurrentTrials property: Maximum number of concurrent iterations for the underlying Sweep job. - * - * @return the maxConcurrentTrials value. - */ - public Integer maxConcurrentTrials() { - return this.maxConcurrentTrials; - } - - /** - * Set the maxConcurrentTrials property: Maximum number of concurrent iterations for the underlying Sweep job. - * - * @param maxConcurrentTrials the maxConcurrentTrials value to set. - * @return the ImageSweepLimitSettings object itself. - */ - public ImageSweepLimitSettings withMaxConcurrentTrials(Integer maxConcurrentTrials) { - this.maxConcurrentTrials = maxConcurrentTrials; - return this; - } - - /** - * Get the maxTrials property: Maximum number of iterations for the underlying Sweep job. - * - * @return the maxTrials value. - */ - public Integer maxTrials() { - return this.maxTrials; - } - - /** - * Set the maxTrials property: Maximum number of iterations for the underlying Sweep job. - * - * @param maxTrials the maxTrials value to set. - * @return the ImageSweepLimitSettings object itself. - */ - public ImageSweepLimitSettings withMaxTrials(Integer maxTrials) { - this.maxTrials = maxTrials; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageSweepSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageSweepSettings.java deleted file mode 100644 index d16c5b2cd5e5..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageSweepSettings.java +++ /dev/null @@ -1,118 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** Model sweeping and hyperparameter sweeping related settings. */ -@Fluent -public final class ImageSweepSettings { - /* - * Type of early termination policy. - */ - @JsonProperty(value = "earlyTermination") - private EarlyTerminationPolicy earlyTermination; - - /* - * [Required] Limit settings for model sweeping and hyperparameter - * sweeping. - */ - @JsonProperty(value = "limits", required = true) - private ImageSweepLimitSettings limits; - - /* - * [Required] Type of the hyperparameter sampling algorithms. - */ - @JsonProperty(value = "samplingAlgorithm", required = true) - private SamplingAlgorithmType samplingAlgorithm; - - /** - * Get the earlyTermination property: Type of early termination policy. - * - * @return the earlyTermination value. - */ - public EarlyTerminationPolicy earlyTermination() { - return this.earlyTermination; - } - - /** - * Set the earlyTermination property: Type of early termination policy. - * - * @param earlyTermination the earlyTermination value to set. - * @return the ImageSweepSettings object itself. - */ - public ImageSweepSettings withEarlyTermination(EarlyTerminationPolicy earlyTermination) { - this.earlyTermination = earlyTermination; - return this; - } - - /** - * Get the limits property: [Required] Limit settings for model sweeping and hyperparameter sweeping. - * - * @return the limits value. - */ - public ImageSweepLimitSettings limits() { - return this.limits; - } - - /** - * Set the limits property: [Required] Limit settings for model sweeping and hyperparameter sweeping. - * - * @param limits the limits value to set. - * @return the ImageSweepSettings object itself. - */ - public ImageSweepSettings withLimits(ImageSweepLimitSettings limits) { - this.limits = limits; - return this; - } - - /** - * Get the samplingAlgorithm property: [Required] Type of the hyperparameter sampling algorithms. - * - * @return the samplingAlgorithm value. - */ - public SamplingAlgorithmType samplingAlgorithm() { - return this.samplingAlgorithm; - } - - /** - * Set the samplingAlgorithm property: [Required] Type of the hyperparameter sampling algorithms. - * - * @param samplingAlgorithm the samplingAlgorithm value to set. - * @return the ImageSweepSettings object itself. - */ - public ImageSweepSettings withSamplingAlgorithm(SamplingAlgorithmType samplingAlgorithm) { - this.samplingAlgorithm = samplingAlgorithm; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (earlyTermination() != null) { - earlyTermination().validate(); - } - if (limits() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException("Missing required property limits in model ImageSweepSettings")); - } else { - limits().validate(); - } - if (samplingAlgorithm() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property samplingAlgorithm in model ImageSweepSettings")); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(ImageSweepSettings.class); -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageVertical.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageVertical.java deleted file mode 100644 index ec807a1c2c4a..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageVertical.java +++ /dev/null @@ -1,124 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Abstract class for AutoML tasks that train image (computer vision) models - such as Image Classification / Image - * Classification Multilabel / Image Object Detection / Image Instance Segmentation. - */ -@Fluent -public class ImageVertical { - /* - * [Required] Collection of registered Tabular Dataset Ids and other data - * settings required for training and validating models. - */ - @JsonProperty(value = "dataSettings", required = true) - private ImageVerticalDataSettings dataSettings; - - /* - * [Required] Limit settings for the AutoML job. - */ - @JsonProperty(value = "limitSettings", required = true) - private ImageLimitSettings limitSettings; - - /* - * Model sweeping and hyperparameter sweeping related settings. - */ - @JsonProperty(value = "sweepSettings") - private ImageSweepSettings sweepSettings; - - /** - * Get the dataSettings property: [Required] Collection of registered Tabular Dataset Ids and other data settings - * required for training and validating models. - * - * @return the dataSettings value. - */ - public ImageVerticalDataSettings dataSettings() { - return this.dataSettings; - } - - /** - * Set the dataSettings property: [Required] Collection of registered Tabular Dataset Ids and other data settings - * required for training and validating models. - * - * @param dataSettings the dataSettings value to set. - * @return the ImageVertical object itself. - */ - public ImageVertical withDataSettings(ImageVerticalDataSettings dataSettings) { - this.dataSettings = dataSettings; - return this; - } - - /** - * Get the limitSettings property: [Required] Limit settings for the AutoML job. - * - * @return the limitSettings value. - */ - public ImageLimitSettings limitSettings() { - return this.limitSettings; - } - - /** - * Set the limitSettings property: [Required] Limit settings for the AutoML job. - * - * @param limitSettings the limitSettings value to set. - * @return the ImageVertical object itself. - */ - public ImageVertical withLimitSettings(ImageLimitSettings limitSettings) { - this.limitSettings = limitSettings; - return this; - } - - /** - * Get the sweepSettings property: Model sweeping and hyperparameter sweeping related settings. - * - * @return the sweepSettings value. - */ - public ImageSweepSettings sweepSettings() { - return this.sweepSettings; - } - - /** - * Set the sweepSettings property: Model sweeping and hyperparameter sweeping related settings. - * - * @param sweepSettings the sweepSettings value to set. - * @return the ImageVertical object itself. - */ - public ImageVertical withSweepSettings(ImageSweepSettings sweepSettings) { - this.sweepSettings = sweepSettings; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (dataSettings() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException("Missing required property dataSettings in model ImageVertical")); - } else { - dataSettings().validate(); - } - if (limitSettings() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException("Missing required property limitSettings in model ImageVertical")); - } else { - limitSettings().validate(); - } - if (sweepSettings() != null) { - sweepSettings().validate(); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(ImageVertical.class); -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageVerticalDataSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageVerticalDataSettings.java deleted file mode 100644 index d2ea7cb6a60c..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageVerticalDataSettings.java +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** Collection of registered Tabular Dataset Ids and other data settings required for training and validating models. */ -@Fluent -public final class ImageVerticalDataSettings extends DataSettings { - /* - * Settings for the validation dataset. - */ - @JsonProperty(value = "validationData") - private ImageVerticalValidationDataSettings validationData; - - /** - * Get the validationData property: Settings for the validation dataset. - * - * @return the validationData value. - */ - public ImageVerticalValidationDataSettings validationData() { - return this.validationData; - } - - /** - * Set the validationData property: Settings for the validation dataset. - * - * @param validationData the validationData value to set. - * @return the ImageVerticalDataSettings object itself. - */ - public ImageVerticalDataSettings withValidationData(ImageVerticalValidationDataSettings validationData) { - this.validationData = validationData; - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageVerticalDataSettings withTargetColumnName(String targetColumnName) { - super.withTargetColumnName(targetColumnName); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageVerticalDataSettings withTestData(TestDataSettings testData) { - super.withTestData(testData); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageVerticalDataSettings withTrainingData(TrainingDataSettings trainingData) { - super.withTrainingData(trainingData); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (validationData() != null) { - validationData().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageVerticalValidationDataSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageVerticalValidationDataSettings.java deleted file mode 100644 index 379528c0c12f..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ImageVerticalValidationDataSettings.java +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; - -/** The ImageVerticalValidationDataSettings model. */ -@Fluent -public final class ImageVerticalValidationDataSettings extends ValidationDataSettings { - /** {@inheritDoc} */ - @Override - public ImageVerticalValidationDataSettings withData(MLTableJobInput data) { - super.withData(data); - return this; - } - - /** {@inheritDoc} */ - @Override - public ImageVerticalValidationDataSettings withValidationDataSize(Double validationDataSize) { - super.withValidationDataSize(validationDataSize); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/InstanceSegmentationPrimaryMetrics.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/InstanceSegmentationPrimaryMetrics.java deleted file mode 100644 index 1b9e942cbe37..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/InstanceSegmentationPrimaryMetrics.java +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for InstanceSegmentationPrimaryMetrics. */ -public final class InstanceSegmentationPrimaryMetrics extends ExpandableStringEnum { - /** Static value MeanAveragePrecision for InstanceSegmentationPrimaryMetrics. */ - public static final InstanceSegmentationPrimaryMetrics MEAN_AVERAGE_PRECISION = fromString("MeanAveragePrecision"); - - /** - * Creates or finds a InstanceSegmentationPrimaryMetrics from its string representation. - * - * @param name a name to look for. - * @return the corresponding InstanceSegmentationPrimaryMetrics. - */ - @JsonCreator - public static InstanceSegmentationPrimaryMetrics fromString(String name) { - return fromString(name, InstanceSegmentationPrimaryMetrics.class); - } - - /** - * Gets known InstanceSegmentationPrimaryMetrics values. - * - * @return known InstanceSegmentationPrimaryMetrics values. - */ - public static Collection values() { - return values(InstanceSegmentationPrimaryMetrics.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobBaseData.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobBase.java similarity index 75% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobBaseData.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobBase.java index 8ab96f963cf3..3e18abd293bd 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobBaseData.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobBase.java @@ -4,13 +4,12 @@ package com.azure.resourcemanager.machinelearning.models; -import com.azure.core.http.rest.Response; import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.JobBaseDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.JobBaseInner; -/** An immutable client-side representation of JobBaseData. */ -public interface JobBaseData { +/** An immutable client-side representation of JobBase. */ +public interface JobBase { /** * Gets the id property: Fully qualified resource Id for the resource. * @@ -37,7 +36,7 @@ public interface JobBaseData { * * @return the properties value. */ - JobBaseDetails properties(); + JobBaseProperties properties(); /** * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. @@ -54,25 +53,25 @@ public interface JobBaseData { String resourceGroupName(); /** - * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.JobBaseDataInner object. + * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.JobBaseInner object. * * @return the inner object. */ - JobBaseDataInner innerModel(); + JobBaseInner innerModel(); - /** The entirety of the JobBaseData definition. */ + /** The entirety of the JobBase definition. */ interface Definition extends DefinitionStages.Blank, DefinitionStages.WithParentResource, DefinitionStages.WithProperties, DefinitionStages.WithCreate { } - /** The JobBaseData definition stages. */ + /** The JobBase definition stages. */ interface DefinitionStages { - /** The first stage of the JobBaseData definition. */ + /** The first stage of the JobBase definition. */ interface Blank extends WithParentResource { } - /** The stage of the JobBaseData definition allowing to specify parent resource. */ + /** The stage of the JobBase definition allowing to specify parent resource. */ interface WithParentResource { /** * Specifies resourceGroupName, workspaceName. @@ -83,7 +82,7 @@ interface WithParentResource { */ WithProperties withExistingWorkspace(String resourceGroupName, String workspaceName); } - /** The stage of the JobBaseData definition allowing to specify properties. */ + /** The stage of the JobBase definition allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -91,11 +90,11 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - WithCreate withProperties(JobBaseDetails properties); + WithCreate withProperties(JobBaseProperties properties); } /** - * The stage of the JobBaseData definition which contains all the minimum required properties for the resource - * to be created, but also allows for any other optional properties to be specified. + * The stage of the JobBase definition which contains all the minimum required properties for the resource to be + * created, but also allows for any other optional properties to be specified. */ interface WithCreate { /** @@ -103,7 +102,7 @@ interface WithCreate { * * @return the created resource. */ - JobBaseData create(); + JobBase create(); /** * Executes the create request. @@ -111,24 +110,24 @@ interface WithCreate { * @param context The context to associate with this operation. * @return the created resource. */ - JobBaseData create(Context context); + JobBase create(Context context); } } /** - * Begins update for the JobBaseData resource. + * Begins update for the JobBase resource. * * @return the stage of resource update. */ - JobBaseData.Update update(); + JobBase.Update update(); - /** The template for JobBaseData update. */ + /** The template for JobBase update. */ interface Update extends UpdateStages.WithProperties { /** * Executes the update request. * * @return the updated resource. */ - JobBaseData apply(); + JobBase apply(); /** * Executes the update request. @@ -136,11 +135,11 @@ interface Update extends UpdateStages.WithProperties { * @param context The context to associate with this operation. * @return the updated resource. */ - JobBaseData apply(Context context); + JobBase apply(Context context); } - /** The JobBaseData update stages. */ + /** The JobBase update stages. */ interface UpdateStages { - /** The stage of the JobBaseData update allowing to specify properties. */ + /** The stage of the JobBase update allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -148,7 +147,7 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - Update withProperties(JobBaseDetails properties); + Update withProperties(JobBaseProperties properties); } } /** @@ -156,7 +155,7 @@ interface WithProperties { * * @return the refreshed resource. */ - JobBaseData refresh(); + JobBase refresh(); /** * Refreshes the resource to sync with Azure. @@ -164,10 +163,10 @@ interface WithProperties { * @param context The context to associate with this operation. * @return the refreshed resource. */ - JobBaseData refresh(Context context); + JobBase refresh(Context context); /** - * Cancels a Job. + * Cancels a Job (asynchronous). * * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. @@ -175,13 +174,12 @@ interface WithProperties { void cancel(); /** - * Cancels a Job. + * Cancels a Job (asynchronous). * * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link Response}. */ - Response cancelWithResponse(Context context); + void cancel(Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobBaseDetails.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobBaseProperties.java similarity index 75% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobBaseDetails.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobBaseProperties.java index a710530ab7f1..cba461475016 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobBaseDetails.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobBaseProperties.java @@ -17,16 +17,15 @@ use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "jobType", - defaultImpl = JobBaseDetails.class) -@JsonTypeName("JobBaseDetails") + defaultImpl = JobBaseProperties.class) +@JsonTypeName("JobBaseProperties") @JsonSubTypes({ - @JsonSubTypes.Type(name = "AutoML", value = AutoMLJob.class), @JsonSubTypes.Type(name = "Command", value = CommandJob.class), @JsonSubTypes.Type(name = "Pipeline", value = PipelineJob.class), @JsonSubTypes.Type(name = "Sweep", value = SweepJob.class) }) @Fluent -public class JobBaseDetails extends ResourceBase { +public class JobBaseProperties extends ResourceBase { /* * ARM resource ID of the compute resource. */ @@ -60,14 +59,6 @@ public class JobBaseDetails extends ResourceBase { @JsonProperty(value = "isArchived") private Boolean isArchived; - /* - * Schedule definition of job. - * If no schedule is provided, the job is run once and immediately after - * submission. - */ - @JsonProperty(value = "schedule") - private ScheduleBase schedule; - /* * List of JobEndpoints. * For local jobs, a job endpoint will have an endpoint value of @@ -96,9 +87,9 @@ public String computeId() { * Set the computeId property: ARM resource ID of the compute resource. * * @param computeId the computeId value to set. - * @return the JobBaseDetails object itself. + * @return the JobBaseProperties object itself. */ - public JobBaseDetails withComputeId(String computeId) { + public JobBaseProperties withComputeId(String computeId) { this.computeId = computeId; return this; } @@ -116,9 +107,9 @@ public String displayName() { * Set the displayName property: Display name of job. * * @param displayName the displayName value to set. - * @return the JobBaseDetails object itself. + * @return the JobBaseProperties object itself. */ - public JobBaseDetails withDisplayName(String displayName) { + public JobBaseProperties withDisplayName(String displayName) { this.displayName = displayName; return this; } @@ -138,9 +129,9 @@ public String experimentName() { * the "Default" experiment. * * @param experimentName the experimentName value to set. - * @return the JobBaseDetails object itself. + * @return the JobBaseProperties object itself. */ - public JobBaseDetails withExperimentName(String experimentName) { + public JobBaseProperties withExperimentName(String experimentName) { this.experimentName = experimentName; return this; } @@ -160,9 +151,9 @@ public IdentityConfiguration identity() { * UserIdentity or null. Defaults to AmlToken if null. * * @param identity the identity value to set. - * @return the JobBaseDetails object itself. + * @return the JobBaseProperties object itself. */ - public JobBaseDetails withIdentity(IdentityConfiguration identity) { + public JobBaseProperties withIdentity(IdentityConfiguration identity) { this.identity = identity; return this; } @@ -180,35 +171,13 @@ public Boolean isArchived() { * Set the isArchived property: Is the asset archived?. * * @param isArchived the isArchived value to set. - * @return the JobBaseDetails object itself. + * @return the JobBaseProperties object itself. */ - public JobBaseDetails withIsArchived(Boolean isArchived) { + public JobBaseProperties withIsArchived(Boolean isArchived) { this.isArchived = isArchived; return this; } - /** - * Get the schedule property: Schedule definition of job. If no schedule is provided, the job is run once and - * immediately after submission. - * - * @return the schedule value. - */ - public ScheduleBase schedule() { - return this.schedule; - } - - /** - * Set the schedule property: Schedule definition of job. If no schedule is provided, the job is run once and - * immediately after submission. - * - * @param schedule the schedule value to set. - * @return the JobBaseDetails object itself. - */ - public JobBaseDetails withSchedule(ScheduleBase schedule) { - this.schedule = schedule; - return this; - } - /** * Get the services property: List of JobEndpoints. For local jobs, a job endpoint will have an endpoint value of * FileStreamObject. @@ -224,9 +193,9 @@ public Map services() { * FileStreamObject. * * @param services the services value to set. - * @return the JobBaseDetails object itself. + * @return the JobBaseProperties object itself. */ - public JobBaseDetails withServices(Map services) { + public JobBaseProperties withServices(Map services) { this.services = services; return this; } @@ -242,21 +211,21 @@ public JobStatus status() { /** {@inheritDoc} */ @Override - public JobBaseDetails withDescription(String description) { + public JobBaseProperties withDescription(String description) { super.withDescription(description); return this; } /** {@inheritDoc} */ @Override - public JobBaseDetails withProperties(Map properties) { + public JobBaseProperties withProperties(Map properties) { super.withProperties(properties); return this; } /** {@inheritDoc} */ @Override - public JobBaseDetails withTags(Map tags) { + public JobBaseProperties withTags(Map tags) { super.withTags(tags); return this; } @@ -272,9 +241,6 @@ public void validate() { if (identity() != null) { identity().validate(); } - if (schedule() != null) { - schedule().validate(); - } if (services() != null) { services() .values() diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobBaseResourceArmPaginatedResult.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobBaseResourceArmPaginatedResult.java index fd407407a447..a912bd5bcba0 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobBaseResourceArmPaginatedResult.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobBaseResourceArmPaginatedResult.java @@ -5,7 +5,7 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.fluent.models.JobBaseDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.JobBaseInner; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -23,7 +23,7 @@ public final class JobBaseResourceArmPaginatedResult { * An array of objects of type JobBase. */ @JsonProperty(value = "value") - private List value; + private List value; /** * Get the nextLink property: The link to the next page of JobBase objects. If null, there are no additional pages. @@ -50,7 +50,7 @@ public JobBaseResourceArmPaginatedResult withNextLink(String nextLink) { * * @return the value value. */ - public List value() { + public List value() { return this.value; } @@ -60,7 +60,7 @@ public List value() { * @param value the value value to set. * @return the JobBaseResourceArmPaginatedResult object itself. */ - public JobBaseResourceArmPaginatedResult withValue(List value) { + public JobBaseResourceArmPaginatedResult withValue(List value) { this.value = value; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobInput.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobInput.java index f199a9b1d510..a0a71a582323 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobInput.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobInput.java @@ -18,13 +18,13 @@ defaultImpl = JobInput.class) @JsonTypeName("JobInput") @JsonSubTypes({ - @JsonSubTypes.Type(name = "MLTable", value = MLTableJobInput.class), - @JsonSubTypes.Type(name = "CustomModel", value = CustomModelJobInput.class), - @JsonSubTypes.Type(name = "Literal", value = LiteralJobInput.class), - @JsonSubTypes.Type(name = "MLFlowModel", value = MLFlowModelJobInput.class), - @JsonSubTypes.Type(name = "TritonModel", value = TritonModelJobInput.class), - @JsonSubTypes.Type(name = "UriFile", value = UriFileJobInput.class), - @JsonSubTypes.Type(name = "UriFolder", value = UriFolderJobInput.class) + @JsonSubTypes.Type(name = "custom_model", value = CustomModelJobInput.class), + @JsonSubTypes.Type(name = "literal", value = LiteralJobInput.class), + @JsonSubTypes.Type(name = "mlflow_model", value = MLFlowModelJobInput.class), + @JsonSubTypes.Type(name = "mltable", value = MLTableJobInput.class), + @JsonSubTypes.Type(name = "triton_model", value = TritonModelJobInput.class), + @JsonSubTypes.Type(name = "uri_file", value = UriFileJobInput.class), + @JsonSubTypes.Type(name = "uri_folder", value = UriFolderJobInput.class) }) @Fluent public class JobInput { diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobInputType.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobInputType.java index a6bf86251e04..91d6a97ad2e0 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobInputType.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobInputType.java @@ -10,26 +10,26 @@ /** Defines values for JobInputType. */ public final class JobInputType extends ExpandableStringEnum { - /** Static value Literal for JobInputType. */ - public static final JobInputType LITERAL = fromString("Literal"); + /** Static value literal for JobInputType. */ + public static final JobInputType LITERAL = fromString("literal"); - /** Static value UriFile for JobInputType. */ - public static final JobInputType URI_FILE = fromString("UriFile"); + /** Static value uri_file for JobInputType. */ + public static final JobInputType URI_FILE = fromString("uri_file"); - /** Static value UriFolder for JobInputType. */ - public static final JobInputType URI_FOLDER = fromString("UriFolder"); + /** Static value uri_folder for JobInputType. */ + public static final JobInputType URI_FOLDER = fromString("uri_folder"); - /** Static value MLTable for JobInputType. */ - public static final JobInputType MLTABLE = fromString("MLTable"); + /** Static value mltable for JobInputType. */ + public static final JobInputType MLTABLE = fromString("mltable"); - /** Static value CustomModel for JobInputType. */ - public static final JobInputType CUSTOM_MODEL = fromString("CustomModel"); + /** Static value custom_model for JobInputType. */ + public static final JobInputType CUSTOM_MODEL = fromString("custom_model"); - /** Static value MLFlowModel for JobInputType. */ - public static final JobInputType MLFLOW_MODEL = fromString("MLFlowModel"); + /** Static value mlflow_model for JobInputType. */ + public static final JobInputType MLFLOW_MODEL = fromString("mlflow_model"); - /** Static value TritonModel for JobInputType. */ - public static final JobInputType TRITON_MODEL = fromString("TritonModel"); + /** Static value triton_model for JobInputType. */ + public static final JobInputType TRITON_MODEL = fromString("triton_model"); /** * Creates or finds a JobInputType from its string representation. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobOutput.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobOutput.java index 6204ce4d27cf..66ad70ab29d2 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobOutput.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobOutput.java @@ -18,12 +18,12 @@ defaultImpl = JobOutput.class) @JsonTypeName("JobOutput") @JsonSubTypes({ - @JsonSubTypes.Type(name = "CustomModel", value = CustomModelJobOutput.class), - @JsonSubTypes.Type(name = "MLFlowModel", value = MLFlowModelJobOutput.class), - @JsonSubTypes.Type(name = "MLTable", value = MLTableJobOutput.class), - @JsonSubTypes.Type(name = "TritonModel", value = TritonModelJobOutput.class), - @JsonSubTypes.Type(name = "UriFile", value = UriFileJobOutput.class), - @JsonSubTypes.Type(name = "UriFolder", value = UriFolderJobOutput.class) + @JsonSubTypes.Type(name = "custom_model", value = CustomModelJobOutput.class), + @JsonSubTypes.Type(name = "mlflow_model", value = MLFlowModelJobOutput.class), + @JsonSubTypes.Type(name = "mltable", value = MLTableJobOutput.class), + @JsonSubTypes.Type(name = "triton_model", value = TritonModelJobOutput.class), + @JsonSubTypes.Type(name = "uri_file", value = UriFileJobOutput.class), + @JsonSubTypes.Type(name = "uri_folder", value = UriFolderJobOutput.class) }) @Fluent public class JobOutput { diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobOutputType.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobOutputType.java index 23f9d16fd47c..854b95af160d 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobOutputType.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobOutputType.java @@ -10,23 +10,23 @@ /** Defines values for JobOutputType. */ public final class JobOutputType extends ExpandableStringEnum { - /** Static value UriFile for JobOutputType. */ - public static final JobOutputType URI_FILE = fromString("UriFile"); + /** Static value uri_file for JobOutputType. */ + public static final JobOutputType URI_FILE = fromString("uri_file"); - /** Static value UriFolder for JobOutputType. */ - public static final JobOutputType URI_FOLDER = fromString("UriFolder"); + /** Static value uri_folder for JobOutputType. */ + public static final JobOutputType URI_FOLDER = fromString("uri_folder"); - /** Static value MLTable for JobOutputType. */ - public static final JobOutputType MLTABLE = fromString("MLTable"); + /** Static value mltable for JobOutputType. */ + public static final JobOutputType MLTABLE = fromString("mltable"); - /** Static value CustomModel for JobOutputType. */ - public static final JobOutputType CUSTOM_MODEL = fromString("CustomModel"); + /** Static value custom_model for JobOutputType. */ + public static final JobOutputType CUSTOM_MODEL = fromString("custom_model"); - /** Static value MLFlowModel for JobOutputType. */ - public static final JobOutputType MLFLOW_MODEL = fromString("MLFlowModel"); + /** Static value mlflow_model for JobOutputType. */ + public static final JobOutputType MLFLOW_MODEL = fromString("mlflow_model"); - /** Static value TritonModel for JobOutputType. */ - public static final JobOutputType TRITON_MODEL = fromString("TritonModel"); + /** Static value triton_model for JobOutputType. */ + public static final JobOutputType TRITON_MODEL = fromString("triton_model"); /** * Creates or finds a JobOutputType from its string representation. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobStatus.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobStatus.java index 68313ffb2ca6..e4c1d54d0584 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobStatus.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobStatus.java @@ -52,9 +52,6 @@ public final class JobStatus extends ExpandableStringEnum { /** Static value Unknown for JobStatus. */ public static final JobStatus UNKNOWN = fromString("Unknown"); - /** Static value Scheduled for JobStatus. */ - public static final JobStatus SCHEDULED = fromString("Scheduled"); - /** * Creates or finds a JobStatus from its string representation. * diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobType.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobType.java index 04f1769d5774..1c6f986befec 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobType.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/JobType.java @@ -10,9 +10,6 @@ /** Defines values for JobType. */ public final class JobType extends ExpandableStringEnum { - /** Static value AutoML for JobType. */ - public static final JobType AUTO_ML = fromString("AutoML"); - /** Static value Command for JobType. */ public static final JobType COMMAND = fromString("Command"); diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Jobs.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Jobs.java index 7663da5b1b7b..c7c38bd510b6 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Jobs.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Jobs.java @@ -20,7 +20,7 @@ public interface Jobs { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of JobBase entities as paginated response with {@link PagedIterable}. */ - PagedIterable list(String resourceGroupName, String workspaceName); + PagedIterable list(String resourceGroupName, String workspaceName); /** * Lists Jobs in the workspace. @@ -31,23 +31,19 @@ public interface Jobs { * @param jobType Type of job to be returned. * @param tag Jobs returned will have this tag key. * @param listViewType View type for including/excluding (for example) archived entities. - * @param scheduled Indicator whether the job is scheduled job. - * @param scheduleId The scheduled id for listing the job triggered from. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of JobBase entities as paginated response with {@link PagedIterable}. */ - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String skip, String jobType, String tag, ListViewType listViewType, - Boolean scheduled, - String scheduleId, Context context); /** @@ -86,7 +82,7 @@ PagedIterable list( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a Job by name/id. */ - JobBaseData get(String resourceGroupName, String workspaceName, String id); + JobBase get(String resourceGroupName, String workspaceName, String id); /** * Gets a Job by name/id. @@ -100,10 +96,10 @@ PagedIterable list( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a Job by name/id along with {@link Response}. */ - Response getWithResponse(String resourceGroupName, String workspaceName, String id, Context context); + Response getWithResponse(String resourceGroupName, String workspaceName, String id, Context context); /** - * Cancels a Job. + * Cancels a Job (asynchronous). * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. @@ -115,7 +111,7 @@ PagedIterable list( void cancel(String resourceGroupName, String workspaceName, String id); /** - * Cancels a Job. + * Cancels a Job (asynchronous). * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. @@ -124,9 +120,8 @@ PagedIterable list( * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link Response}. */ - Response cancelWithResponse(String resourceGroupName, String workspaceName, String id, Context context); + void cancel(String resourceGroupName, String workspaceName, String id, Context context); /** * Gets a Job by name/id. @@ -137,7 +132,7 @@ PagedIterable list( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a Job by name/id along with {@link Response}. */ - JobBaseData getById(String id); + JobBase getById(String id); /** * Gets a Job by name/id. @@ -149,7 +144,7 @@ PagedIterable list( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a Job by name/id along with {@link Response}. */ - Response getByIdWithResponse(String id, Context context); + Response getByIdWithResponse(String id, Context context); /** * Deletes a Job (asynchronous). @@ -173,10 +168,10 @@ PagedIterable list( void deleteByIdWithResponse(String id, Context context); /** - * Begins definition for a new JobBaseData resource. + * Begins definition for a new JobBase resource. * * @param name resource name. - * @return the first stage of the new JobBaseData definition. + * @return the first stage of the new JobBase definition. */ - JobBaseData.DefinitionStages.Blank define(String name); + JobBase.DefinitionStages.Blank define(String name); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosCredentials.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosCredentials.java deleted file mode 100644 index d885160183b6..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosCredentials.java +++ /dev/null @@ -1,122 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** The KerberosCredentials model. */ -@Fluent -public class KerberosCredentials { - /* - * [Required] IP Address or DNS HostName. - */ - @JsonProperty(value = "kerberosKdcAddress", required = true) - private String kerberosKdcAddress; - - /* - * [Required] Kerberos Username - */ - @JsonProperty(value = "kerberosPrincipal", required = true) - private String kerberosPrincipal; - - /* - * [Required] Domain over which a Kerberos authentication server has the - * authority to authenticate a user, host or service. - */ - @JsonProperty(value = "kerberosRealm", required = true) - private String kerberosRealm; - - /** - * Get the kerberosKdcAddress property: [Required] IP Address or DNS HostName. - * - * @return the kerberosKdcAddress value. - */ - public String kerberosKdcAddress() { - return this.kerberosKdcAddress; - } - - /** - * Set the kerberosKdcAddress property: [Required] IP Address or DNS HostName. - * - * @param kerberosKdcAddress the kerberosKdcAddress value to set. - * @return the KerberosCredentials object itself. - */ - public KerberosCredentials withKerberosKdcAddress(String kerberosKdcAddress) { - this.kerberosKdcAddress = kerberosKdcAddress; - return this; - } - - /** - * Get the kerberosPrincipal property: [Required] Kerberos Username. - * - * @return the kerberosPrincipal value. - */ - public String kerberosPrincipal() { - return this.kerberosPrincipal; - } - - /** - * Set the kerberosPrincipal property: [Required] Kerberos Username. - * - * @param kerberosPrincipal the kerberosPrincipal value to set. - * @return the KerberosCredentials object itself. - */ - public KerberosCredentials withKerberosPrincipal(String kerberosPrincipal) { - this.kerberosPrincipal = kerberosPrincipal; - return this; - } - - /** - * Get the kerberosRealm property: [Required] Domain over which a Kerberos authentication server has the authority - * to authenticate a user, host or service. - * - * @return the kerberosRealm value. - */ - public String kerberosRealm() { - return this.kerberosRealm; - } - - /** - * Set the kerberosRealm property: [Required] Domain over which a Kerberos authentication server has the authority - * to authenticate a user, host or service. - * - * @param kerberosRealm the kerberosRealm value to set. - * @return the KerberosCredentials object itself. - */ - public KerberosCredentials withKerberosRealm(String kerberosRealm) { - this.kerberosRealm = kerberosRealm; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (kerberosKdcAddress() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property kerberosKdcAddress in model KerberosCredentials")); - } - if (kerberosPrincipal() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property kerberosPrincipal in model KerberosCredentials")); - } - if (kerberosRealm() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property kerberosRealm in model KerberosCredentials")); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(KerberosCredentials.class); -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosKeytabCredentials.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosKeytabCredentials.java deleted file mode 100644 index d080800ab04e..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosKeytabCredentials.java +++ /dev/null @@ -1,162 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** The KerberosKeytabCredentials model. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "credentialsType") -@JsonTypeName("KerberosKeytab") -@Fluent -public final class KerberosKeytabCredentials extends DatastoreCredentials { - /* - * [Required] Keytab secrets. - */ - @JsonProperty(value = "secrets", required = true) - private KerberosKeytabSecrets secrets; - - /* - * [Required] IP Address or DNS HostName. - */ - @JsonProperty(value = "kerberosKdcAddress", required = true) - private String kerberosKdcAddress; - - /* - * [Required] Kerberos Username - */ - @JsonProperty(value = "kerberosPrincipal", required = true) - private String kerberosPrincipal; - - /* - * [Required] Domain over which a Kerberos authentication server has the - * authority to authenticate a user, host or service. - */ - @JsonProperty(value = "kerberosRealm", required = true) - private String kerberosRealm; - - /** - * Get the secrets property: [Required] Keytab secrets. - * - * @return the secrets value. - */ - public KerberosKeytabSecrets secrets() { - return this.secrets; - } - - /** - * Set the secrets property: [Required] Keytab secrets. - * - * @param secrets the secrets value to set. - * @return the KerberosKeytabCredentials object itself. - */ - public KerberosKeytabCredentials withSecrets(KerberosKeytabSecrets secrets) { - this.secrets = secrets; - return this; - } - - /** - * Get the kerberosKdcAddress property: [Required] IP Address or DNS HostName. - * - * @return the kerberosKdcAddress value. - */ - public String kerberosKdcAddress() { - return this.kerberosKdcAddress; - } - - /** - * Set the kerberosKdcAddress property: [Required] IP Address or DNS HostName. - * - * @param kerberosKdcAddress the kerberosKdcAddress value to set. - * @return the KerberosKeytabCredentials object itself. - */ - public KerberosKeytabCredentials withKerberosKdcAddress(String kerberosKdcAddress) { - this.kerberosKdcAddress = kerberosKdcAddress; - return this; - } - - /** - * Get the kerberosPrincipal property: [Required] Kerberos Username. - * - * @return the kerberosPrincipal value. - */ - public String kerberosPrincipal() { - return this.kerberosPrincipal; - } - - /** - * Set the kerberosPrincipal property: [Required] Kerberos Username. - * - * @param kerberosPrincipal the kerberosPrincipal value to set. - * @return the KerberosKeytabCredentials object itself. - */ - public KerberosKeytabCredentials withKerberosPrincipal(String kerberosPrincipal) { - this.kerberosPrincipal = kerberosPrincipal; - return this; - } - - /** - * Get the kerberosRealm property: [Required] Domain over which a Kerberos authentication server has the authority - * to authenticate a user, host or service. - * - * @return the kerberosRealm value. - */ - public String kerberosRealm() { - return this.kerberosRealm; - } - - /** - * Set the kerberosRealm property: [Required] Domain over which a Kerberos authentication server has the authority - * to authenticate a user, host or service. - * - * @param kerberosRealm the kerberosRealm value to set. - * @return the KerberosKeytabCredentials object itself. - */ - public KerberosKeytabCredentials withKerberosRealm(String kerberosRealm) { - this.kerberosRealm = kerberosRealm; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (secrets() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property secrets in model KerberosKeytabCredentials")); - } else { - secrets().validate(); - } - if (kerberosKdcAddress() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property kerberosKdcAddress in model KerberosKeytabCredentials")); - } - if (kerberosPrincipal() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property kerberosPrincipal in model KerberosKeytabCredentials")); - } - if (kerberosRealm() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property kerberosRealm in model KerberosKeytabCredentials")); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(KerberosKeytabCredentials.class); -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosKeytabSecrets.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosKeytabSecrets.java deleted file mode 100644 index 9176bce6dd06..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosKeytabSecrets.java +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.fluent.models.DatastoreSecretsInner; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** The KerberosKeytabSecrets model. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "secretsType") -@JsonTypeName("KerberosKeytab") -@Fluent -public final class KerberosKeytabSecrets extends DatastoreSecretsInner { - /* - * Kerberos keytab secret. - */ - @JsonProperty(value = "kerberosKeytab") - private String kerberosKeytab; - - /** - * Get the kerberosKeytab property: Kerberos keytab secret. - * - * @return the kerberosKeytab value. - */ - public String kerberosKeytab() { - return this.kerberosKeytab; - } - - /** - * Set the kerberosKeytab property: Kerberos keytab secret. - * - * @param kerberosKeytab the kerberosKeytab value to set. - * @return the KerberosKeytabSecrets object itself. - */ - public KerberosKeytabSecrets withKerberosKeytab(String kerberosKeytab) { - this.kerberosKeytab = kerberosKeytab; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosPasswordCredentials.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosPasswordCredentials.java deleted file mode 100644 index 2210056b5f4d..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosPasswordCredentials.java +++ /dev/null @@ -1,162 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** The KerberosPasswordCredentials model. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "credentialsType") -@JsonTypeName("KerberosPassword") -@Fluent -public final class KerberosPasswordCredentials extends DatastoreCredentials { - /* - * [Required] Kerberos password secrets. - */ - @JsonProperty(value = "secrets", required = true) - private KerberosPasswordSecrets secrets; - - /* - * [Required] IP Address or DNS HostName. - */ - @JsonProperty(value = "kerberosKdcAddress", required = true) - private String kerberosKdcAddress; - - /* - * [Required] Kerberos Username - */ - @JsonProperty(value = "kerberosPrincipal", required = true) - private String kerberosPrincipal; - - /* - * [Required] Domain over which a Kerberos authentication server has the - * authority to authenticate a user, host or service. - */ - @JsonProperty(value = "kerberosRealm", required = true) - private String kerberosRealm; - - /** - * Get the secrets property: [Required] Kerberos password secrets. - * - * @return the secrets value. - */ - public KerberosPasswordSecrets secrets() { - return this.secrets; - } - - /** - * Set the secrets property: [Required] Kerberos password secrets. - * - * @param secrets the secrets value to set. - * @return the KerberosPasswordCredentials object itself. - */ - public KerberosPasswordCredentials withSecrets(KerberosPasswordSecrets secrets) { - this.secrets = secrets; - return this; - } - - /** - * Get the kerberosKdcAddress property: [Required] IP Address or DNS HostName. - * - * @return the kerberosKdcAddress value. - */ - public String kerberosKdcAddress() { - return this.kerberosKdcAddress; - } - - /** - * Set the kerberosKdcAddress property: [Required] IP Address or DNS HostName. - * - * @param kerberosKdcAddress the kerberosKdcAddress value to set. - * @return the KerberosPasswordCredentials object itself. - */ - public KerberosPasswordCredentials withKerberosKdcAddress(String kerberosKdcAddress) { - this.kerberosKdcAddress = kerberosKdcAddress; - return this; - } - - /** - * Get the kerberosPrincipal property: [Required] Kerberos Username. - * - * @return the kerberosPrincipal value. - */ - public String kerberosPrincipal() { - return this.kerberosPrincipal; - } - - /** - * Set the kerberosPrincipal property: [Required] Kerberos Username. - * - * @param kerberosPrincipal the kerberosPrincipal value to set. - * @return the KerberosPasswordCredentials object itself. - */ - public KerberosPasswordCredentials withKerberosPrincipal(String kerberosPrincipal) { - this.kerberosPrincipal = kerberosPrincipal; - return this; - } - - /** - * Get the kerberosRealm property: [Required] Domain over which a Kerberos authentication server has the authority - * to authenticate a user, host or service. - * - * @return the kerberosRealm value. - */ - public String kerberosRealm() { - return this.kerberosRealm; - } - - /** - * Set the kerberosRealm property: [Required] Domain over which a Kerberos authentication server has the authority - * to authenticate a user, host or service. - * - * @param kerberosRealm the kerberosRealm value to set. - * @return the KerberosPasswordCredentials object itself. - */ - public KerberosPasswordCredentials withKerberosRealm(String kerberosRealm) { - this.kerberosRealm = kerberosRealm; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (secrets() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property secrets in model KerberosPasswordCredentials")); - } else { - secrets().validate(); - } - if (kerberosKdcAddress() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property kerberosKdcAddress in model KerberosPasswordCredentials")); - } - if (kerberosPrincipal() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property kerberosPrincipal in model KerberosPasswordCredentials")); - } - if (kerberosRealm() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException( - "Missing required property kerberosRealm in model KerberosPasswordCredentials")); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(KerberosPasswordCredentials.class); -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosPasswordSecrets.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosPasswordSecrets.java deleted file mode 100644 index 487d41bb7965..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KerberosPasswordSecrets.java +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.fluent.models.DatastoreSecretsInner; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** The KerberosPasswordSecrets model. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "secretsType") -@JsonTypeName("KerberosPassword") -@Fluent -public final class KerberosPasswordSecrets extends DatastoreSecretsInner { - /* - * Kerberos password secret. - */ - @JsonProperty(value = "kerberosPassword") - private String kerberosPassword; - - /** - * Get the kerberosPassword property: Kerberos password secret. - * - * @return the kerberosPassword value. - */ - public String kerberosPassword() { - return this.kerberosPassword; - } - - /** - * Set the kerberosPassword property: Kerberos password secret. - * - * @param kerberosPassword the kerberosPassword value to set. - * @return the KerberosPasswordSecrets object itself. - */ - public KerberosPasswordSecrets withKerberosPassword(String kerberosPassword) { - this.kerberosPassword = kerberosPassword; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KubernetesOnlineDeployment.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KubernetesOnlineDeployment.java index 01e573a78520..53bc41c72e10 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KubernetesOnlineDeployment.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/KubernetesOnlineDeployment.java @@ -14,7 +14,7 @@ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointComputeType") @JsonTypeName("Kubernetes") @Fluent -public final class KubernetesOnlineDeployment extends OnlineDeploymentDetails { +public final class KubernetesOnlineDeployment extends OnlineDeploymentProperties { /* * The resource requirements for the container (cpu and memory). */ @@ -49,14 +49,6 @@ public KubernetesOnlineDeployment withAppInsightsEnabled(Boolean appInsightsEnab return this; } - /** {@inheritDoc} */ - @Override - public KubernetesOnlineDeployment withEgressPublicNetworkAccess( - EgressPublicNetworkAccessType egressPublicNetworkAccess) { - super.withEgressPublicNetworkAccess(egressPublicNetworkAccess); - return this; - } - /** {@inheritDoc} */ @Override public KubernetesOnlineDeployment withInstanceType(String instanceType) { @@ -85,13 +77,6 @@ public KubernetesOnlineDeployment withModelMountPath(String modelMountPath) { return this; } - /** {@inheritDoc} */ - @Override - public KubernetesOnlineDeployment withPrivateNetworkConnection(Boolean privateNetworkConnection) { - super.withPrivateNetworkConnection(privateNetworkConnection); - return this; - } - /** {@inheritDoc} */ @Override public KubernetesOnlineDeployment withReadinessProbe(ProbeSettings readinessProbe) { diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/LearningRateScheduler.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/LearningRateScheduler.java deleted file mode 100644 index 7c23f49432ff..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/LearningRateScheduler.java +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for LearningRateScheduler. */ -public final class LearningRateScheduler extends ExpandableStringEnum { - /** Static value None for LearningRateScheduler. */ - public static final LearningRateScheduler NONE = fromString("None"); - - /** Static value WarmupCosine for LearningRateScheduler. */ - public static final LearningRateScheduler WARMUP_COSINE = fromString("WarmupCosine"); - - /** Static value Step for LearningRateScheduler. */ - public static final LearningRateScheduler STEP = fromString("Step"); - - /** - * Creates or finds a LearningRateScheduler from its string representation. - * - * @param name a name to look for. - * @return the corresponding LearningRateScheduler. - */ - @JsonCreator - public static LearningRateScheduler fromString(String name) { - return fromString(name, LearningRateScheduler.class); - } - - /** - * Gets known LearningRateScheduler values. - * - * @return known LearningRateScheduler values. - */ - public static Collection values() { - return values(LearningRateScheduler.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/LiteralJobInput.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/LiteralJobInput.java index 1a6ba7478d16..daac4d2172e0 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/LiteralJobInput.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/LiteralJobInput.java @@ -12,7 +12,7 @@ /** Literal input type. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "jobInputType") -@JsonTypeName("Literal") +@JsonTypeName("literal") @Fluent public final class LiteralJobInput extends JobInput { /* diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/LogVerbosity.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/LogVerbosity.java deleted file mode 100644 index 31deaf258b80..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/LogVerbosity.java +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for LogVerbosity. */ -public final class LogVerbosity extends ExpandableStringEnum { - /** Static value NotSet for LogVerbosity. */ - public static final LogVerbosity NOT_SET = fromString("NotSet"); - - /** Static value Debug for LogVerbosity. */ - public static final LogVerbosity DEBUG = fromString("Debug"); - - /** Static value Info for LogVerbosity. */ - public static final LogVerbosity INFO = fromString("Info"); - - /** Static value Warning for LogVerbosity. */ - public static final LogVerbosity WARNING = fromString("Warning"); - - /** Static value Error for LogVerbosity. */ - public static final LogVerbosity ERROR = fromString("Error"); - - /** Static value Critical for LogVerbosity. */ - public static final LogVerbosity CRITICAL = fromString("Critical"); - - /** - * Creates or finds a LogVerbosity from its string representation. - * - * @param name a name to look for. - * @return the corresponding LogVerbosity. - */ - @JsonCreator - public static LogVerbosity fromString(String name) { - return fromString(name, LogVerbosity.class); - } - - /** - * Gets known LogVerbosity values. - * - * @return known LogVerbosity values. - */ - public static Collection values() { - return values(LogVerbosity.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLFlowModelJobInput.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLFlowModelJobInput.java index c7348c7fb755..fe441d159082 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLFlowModelJobInput.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLFlowModelJobInput.java @@ -5,72 +5,52 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; /** The MLFlowModelJobInput model. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "jobInputType") -@JsonTypeName("MLFlowModel") +@JsonTypeName("mlflow_model") @Fluent -public final class MLFlowModelJobInput extends JobInput { +public final class MLFlowModelJobInput extends AssetJobInput { /* - * Input Asset Delivery Mode. + * Description for the input. */ - @JsonProperty(value = "mode") - private InputDeliveryMode mode; - - /* - * [Required] Input Asset URI. - */ - @JsonProperty(value = "uri", required = true) - private String uri; + @JsonProperty(value = "description") + private String description; /** - * Get the mode property: Input Asset Delivery Mode. + * Get the description property: Description for the input. * - * @return the mode value. + * @return the description value. */ - public InputDeliveryMode mode() { - return this.mode; + public String description() { + return this.description; } /** - * Set the mode property: Input Asset Delivery Mode. + * Set the description property: Description for the input. * - * @param mode the mode value to set. + * @param description the description value to set. * @return the MLFlowModelJobInput object itself. */ - public MLFlowModelJobInput withMode(InputDeliveryMode mode) { - this.mode = mode; + public MLFlowModelJobInput withDescription(String description) { + this.description = description; return this; } - /** - * Get the uri property: [Required] Input Asset URI. - * - * @return the uri value. - */ - public String uri() { - return this.uri; - } - - /** - * Set the uri property: [Required] Input Asset URI. - * - * @param uri the uri value to set. - * @return the MLFlowModelJobInput object itself. - */ - public MLFlowModelJobInput withUri(String uri) { - this.uri = uri; + /** {@inheritDoc} */ + @Override + public MLFlowModelJobInput withMode(InputDeliveryMode mode) { + super.withMode(mode); return this; } /** {@inheritDoc} */ @Override - public MLFlowModelJobInput withDescription(String description) { - super.withDescription(description); + public MLFlowModelJobInput withUri(String uri) { + super.withUri(uri); return this; } @@ -82,12 +62,5 @@ public MLFlowModelJobInput withDescription(String description) { @Override public void validate() { super.validate(); - if (uri() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException("Missing required property uri in model MLFlowModelJobInput")); - } } - - private static final ClientLogger LOGGER = new ClientLogger(MLFlowModelJobInput.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLFlowModelJobOutput.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLFlowModelJobOutput.java index 826b8d43d63a..bdbebd0961f7 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLFlowModelJobOutput.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLFlowModelJobOutput.java @@ -11,65 +11,46 @@ /** The MLFlowModelJobOutput model. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "jobOutputType") -@JsonTypeName("MLFlowModel") +@JsonTypeName("mlflow_model") @Fluent -public final class MLFlowModelJobOutput extends JobOutput { +public final class MLFlowModelJobOutput extends AssetJobOutput { /* - * Output Asset Delivery Mode. + * Description for the output. */ - @JsonProperty(value = "mode") - private OutputDeliveryMode mode; - - /* - * Output Asset URI. - */ - @JsonProperty(value = "uri") - private String uri; + @JsonProperty(value = "description") + private String description; /** - * Get the mode property: Output Asset Delivery Mode. + * Get the description property: Description for the output. * - * @return the mode value. + * @return the description value. */ - public OutputDeliveryMode mode() { - return this.mode; + public String description() { + return this.description; } /** - * Set the mode property: Output Asset Delivery Mode. + * Set the description property: Description for the output. * - * @param mode the mode value to set. + * @param description the description value to set. * @return the MLFlowModelJobOutput object itself. */ - public MLFlowModelJobOutput withMode(OutputDeliveryMode mode) { - this.mode = mode; + public MLFlowModelJobOutput withDescription(String description) { + this.description = description; return this; } - /** - * Get the uri property: Output Asset URI. - * - * @return the uri value. - */ - public String uri() { - return this.uri; - } - - /** - * Set the uri property: Output Asset URI. - * - * @param uri the uri value to set. - * @return the MLFlowModelJobOutput object itself. - */ - public MLFlowModelJobOutput withUri(String uri) { - this.uri = uri; + /** {@inheritDoc} */ + @Override + public MLFlowModelJobOutput withMode(OutputDeliveryMode mode) { + super.withMode(mode); return this; } /** {@inheritDoc} */ @Override - public MLFlowModelJobOutput withDescription(String description) { - super.withDescription(description); + public MLFlowModelJobOutput withUri(String uri) { + super.withUri(uri); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLTableData.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLTableData.java index 6b0f9ed108f8..0aabd81bf11e 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLTableData.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLTableData.java @@ -13,9 +13,9 @@ /** MLTable data definition. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "dataType") -@JsonTypeName("MLTable") +@JsonTypeName("mltable") @Fluent -public final class MLTableData extends DataVersionBaseDetails { +public final class MLTableData extends DataVersionBaseProperties { /* * Uris referenced in the MLTable definition (required for lineage) */ diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLTableJobInput.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLTableJobInput.java index fc727a6412a7..31e0dc798546 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLTableJobInput.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLTableJobInput.java @@ -5,72 +5,52 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; /** The MLTableJobInput model. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "jobInputType") -@JsonTypeName("MLTable") +@JsonTypeName("mltable") @Fluent -public final class MLTableJobInput extends JobInput { +public final class MLTableJobInput extends AssetJobInput { /* - * Input Asset Delivery Mode. + * Description for the input. */ - @JsonProperty(value = "mode") - private InputDeliveryMode mode; - - /* - * [Required] Input Asset URI. - */ - @JsonProperty(value = "uri", required = true) - private String uri; + @JsonProperty(value = "description") + private String description; /** - * Get the mode property: Input Asset Delivery Mode. + * Get the description property: Description for the input. * - * @return the mode value. + * @return the description value. */ - public InputDeliveryMode mode() { - return this.mode; + public String description() { + return this.description; } /** - * Set the mode property: Input Asset Delivery Mode. + * Set the description property: Description for the input. * - * @param mode the mode value to set. + * @param description the description value to set. * @return the MLTableJobInput object itself. */ - public MLTableJobInput withMode(InputDeliveryMode mode) { - this.mode = mode; + public MLTableJobInput withDescription(String description) { + this.description = description; return this; } - /** - * Get the uri property: [Required] Input Asset URI. - * - * @return the uri value. - */ - public String uri() { - return this.uri; - } - - /** - * Set the uri property: [Required] Input Asset URI. - * - * @param uri the uri value to set. - * @return the MLTableJobInput object itself. - */ - public MLTableJobInput withUri(String uri) { - this.uri = uri; + /** {@inheritDoc} */ + @Override + public MLTableJobInput withMode(InputDeliveryMode mode) { + super.withMode(mode); return this; } /** {@inheritDoc} */ @Override - public MLTableJobInput withDescription(String description) { - super.withDescription(description); + public MLTableJobInput withUri(String uri) { + super.withUri(uri); return this; } @@ -82,12 +62,5 @@ public MLTableJobInput withDescription(String description) { @Override public void validate() { super.validate(); - if (uri() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException("Missing required property uri in model MLTableJobInput")); - } } - - private static final ClientLogger LOGGER = new ClientLogger(MLTableJobInput.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLTableJobOutput.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLTableJobOutput.java index d3e0e4016825..ce8fb188bc51 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLTableJobOutput.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/MLTableJobOutput.java @@ -11,65 +11,46 @@ /** The MLTableJobOutput model. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "jobOutputType") -@JsonTypeName("MLTable") +@JsonTypeName("mltable") @Fluent -public final class MLTableJobOutput extends JobOutput { +public final class MLTableJobOutput extends AssetJobOutput { /* - * Output Asset Delivery Mode. + * Description for the output. */ - @JsonProperty(value = "mode") - private OutputDeliveryMode mode; - - /* - * Output Asset URI. - */ - @JsonProperty(value = "uri") - private String uri; + @JsonProperty(value = "description") + private String description; /** - * Get the mode property: Output Asset Delivery Mode. + * Get the description property: Description for the output. * - * @return the mode value. + * @return the description value. */ - public OutputDeliveryMode mode() { - return this.mode; + public String description() { + return this.description; } /** - * Set the mode property: Output Asset Delivery Mode. + * Set the description property: Description for the output. * - * @param mode the mode value to set. + * @param description the description value to set. * @return the MLTableJobOutput object itself. */ - public MLTableJobOutput withMode(OutputDeliveryMode mode) { - this.mode = mode; + public MLTableJobOutput withDescription(String description) { + this.description = description; return this; } - /** - * Get the uri property: Output Asset URI. - * - * @return the uri value. - */ - public String uri() { - return this.uri; - } - - /** - * Set the uri property: Output Asset URI. - * - * @param uri the uri value to set. - * @return the MLTableJobOutput object itself. - */ - public MLTableJobOutput withUri(String uri) { - this.uri = uri; + /** {@inheritDoc} */ + @Override + public MLTableJobOutput withMode(OutputDeliveryMode mode) { + super.withMode(mode); return this; } /** {@inheritDoc} */ @Override - public MLTableJobOutput withDescription(String description) { - super.withDescription(description); + public MLTableJobOutput withUri(String uri) { + super.withUri(uri); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ManagedIdentityAuthTypeWorkspaceConnectionProperties.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ManagedIdentityAuthTypeWorkspaceConnectionProperties.java new file mode 100644 index 000000000000..19ab36080052 --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ManagedIdentityAuthTypeWorkspaceConnectionProperties.java @@ -0,0 +1,84 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.models; + +import com.azure.core.annotation.Fluent; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** The ManagedIdentityAuthTypeWorkspaceConnectionProperties model. */ +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "authType") +@JsonTypeName("ManagedIdentity") +@Fluent +public final class ManagedIdentityAuthTypeWorkspaceConnectionProperties extends WorkspaceConnectionPropertiesV2 { + /* + * The credentials property. + */ + @JsonProperty(value = "credentials") + private WorkspaceConnectionManagedIdentity credentials; + + /** + * Get the credentials property: The credentials property. + * + * @return the credentials value. + */ + public WorkspaceConnectionManagedIdentity credentials() { + return this.credentials; + } + + /** + * Set the credentials property: The credentials property. + * + * @param credentials the credentials value to set. + * @return the ManagedIdentityAuthTypeWorkspaceConnectionProperties object itself. + */ + public ManagedIdentityAuthTypeWorkspaceConnectionProperties withCredentials( + WorkspaceConnectionManagedIdentity credentials) { + this.credentials = credentials; + return this; + } + + /** {@inheritDoc} */ + @Override + public ManagedIdentityAuthTypeWorkspaceConnectionProperties withCategory(ConnectionCategory category) { + super.withCategory(category); + return this; + } + + /** {@inheritDoc} */ + @Override + public ManagedIdentityAuthTypeWorkspaceConnectionProperties withTarget(String target) { + super.withTarget(target); + return this; + } + + /** {@inheritDoc} */ + @Override + public ManagedIdentityAuthTypeWorkspaceConnectionProperties withValue(String value) { + super.withValue(value); + return this; + } + + /** {@inheritDoc} */ + @Override + public ManagedIdentityAuthTypeWorkspaceConnectionProperties withValueFormat(ValueFormat valueFormat) { + super.withValueFormat(valueFormat); + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + @Override + public void validate() { + super.validate(); + if (credentials() != null) { + credentials().validate(); + } + } +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ManagedOnlineDeployment.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ManagedOnlineDeployment.java index 369fafc05b95..e295d0c9bc5f 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ManagedOnlineDeployment.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ManagedOnlineDeployment.java @@ -13,7 +13,7 @@ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointComputeType") @JsonTypeName("Managed") @Fluent -public final class ManagedOnlineDeployment extends OnlineDeploymentDetails { +public final class ManagedOnlineDeployment extends OnlineDeploymentProperties { /** {@inheritDoc} */ @Override public ManagedOnlineDeployment withAppInsightsEnabled(Boolean appInsightsEnabled) { @@ -21,14 +21,6 @@ public ManagedOnlineDeployment withAppInsightsEnabled(Boolean appInsightsEnabled return this; } - /** {@inheritDoc} */ - @Override - public ManagedOnlineDeployment withEgressPublicNetworkAccess( - EgressPublicNetworkAccessType egressPublicNetworkAccess) { - super.withEgressPublicNetworkAccess(egressPublicNetworkAccess); - return this; - } - /** {@inheritDoc} */ @Override public ManagedOnlineDeployment withInstanceType(String instanceType) { @@ -57,13 +49,6 @@ public ManagedOnlineDeployment withModelMountPath(String modelMountPath) { return this; } - /** {@inheritDoc} */ - @Override - public ManagedOnlineDeployment withPrivateNetworkConnection(Boolean privateNetworkConnection) { - super.withPrivateNetworkConnection(privateNetworkConnection); - return this; - } - /** {@inheritDoc} */ @Override public ManagedOnlineDeployment withReadinessProbe(ProbeSettings readinessProbe) { diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainerData.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainer.java similarity index 73% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainerData.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainer.java index 9573580903bb..0841f457eef9 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/CodeContainerData.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainer.java @@ -6,10 +6,10 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.CodeContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.ModelContainerInner; -/** An immutable client-side representation of CodeContainerData. */ -public interface CodeContainerData { +/** An immutable client-side representation of ModelContainer. */ +public interface ModelContainer { /** * Gets the id property: Fully qualified resource Id for the resource. * @@ -36,7 +36,7 @@ public interface CodeContainerData { * * @return the properties value. */ - CodeContainerDetails properties(); + ModelContainerProperties properties(); /** * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. @@ -53,25 +53,25 @@ public interface CodeContainerData { String resourceGroupName(); /** - * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.CodeContainerDataInner object. + * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.ModelContainerInner object. * * @return the inner object. */ - CodeContainerDataInner innerModel(); + ModelContainerInner innerModel(); - /** The entirety of the CodeContainerData definition. */ + /** The entirety of the ModelContainer definition. */ interface Definition extends DefinitionStages.Blank, DefinitionStages.WithParentResource, DefinitionStages.WithProperties, DefinitionStages.WithCreate { } - /** The CodeContainerData definition stages. */ + /** The ModelContainer definition stages. */ interface DefinitionStages { - /** The first stage of the CodeContainerData definition. */ + /** The first stage of the ModelContainer definition. */ interface Blank extends WithParentResource { } - /** The stage of the CodeContainerData definition allowing to specify parent resource. */ + /** The stage of the ModelContainer definition allowing to specify parent resource. */ interface WithParentResource { /** * Specifies resourceGroupName, workspaceName. @@ -82,7 +82,7 @@ interface WithParentResource { */ WithProperties withExistingWorkspace(String resourceGroupName, String workspaceName); } - /** The stage of the CodeContainerData definition allowing to specify properties. */ + /** The stage of the ModelContainer definition allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -90,10 +90,10 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - WithCreate withProperties(CodeContainerDetails properties); + WithCreate withProperties(ModelContainerProperties properties); } /** - * The stage of the CodeContainerData definition which contains all the minimum required properties for the + * The stage of the ModelContainer definition which contains all the minimum required properties for the * resource to be created, but also allows for any other optional properties to be specified. */ interface WithCreate { @@ -102,7 +102,7 @@ interface WithCreate { * * @return the created resource. */ - CodeContainerData create(); + ModelContainer create(); /** * Executes the create request. @@ -110,24 +110,24 @@ interface WithCreate { * @param context The context to associate with this operation. * @return the created resource. */ - CodeContainerData create(Context context); + ModelContainer create(Context context); } } /** - * Begins update for the CodeContainerData resource. + * Begins update for the ModelContainer resource. * * @return the stage of resource update. */ - CodeContainerData.Update update(); + ModelContainer.Update update(); - /** The template for CodeContainerData update. */ + /** The template for ModelContainer update. */ interface Update extends UpdateStages.WithProperties { /** * Executes the update request. * * @return the updated resource. */ - CodeContainerData apply(); + ModelContainer apply(); /** * Executes the update request. @@ -135,11 +135,11 @@ interface Update extends UpdateStages.WithProperties { * @param context The context to associate with this operation. * @return the updated resource. */ - CodeContainerData apply(Context context); + ModelContainer apply(Context context); } - /** The CodeContainerData update stages. */ + /** The ModelContainer update stages. */ interface UpdateStages { - /** The stage of the CodeContainerData update allowing to specify properties. */ + /** The stage of the ModelContainer update allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -147,7 +147,7 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - Update withProperties(CodeContainerDetails properties); + Update withProperties(ModelContainerProperties properties); } } /** @@ -155,7 +155,7 @@ interface WithProperties { * * @return the refreshed resource. */ - CodeContainerData refresh(); + ModelContainer refresh(); /** * Refreshes the resource to sync with Azure. @@ -163,5 +163,5 @@ interface WithProperties { * @param context The context to associate with this operation. * @return the refreshed resource. */ - CodeContainerData refresh(Context context); + ModelContainer refresh(Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainerDetails.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainerProperties.java similarity index 68% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainerDetails.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainerProperties.java index 20fcd6820c0f..a3d0f06cde85 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainerDetails.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainerProperties.java @@ -7,33 +7,33 @@ import com.azure.core.annotation.Fluent; import java.util.Map; -/** The ModelContainerDetails model. */ +/** The ModelContainerProperties model. */ @Fluent -public final class ModelContainerDetails extends AssetContainer { +public final class ModelContainerProperties extends AssetContainer { /** {@inheritDoc} */ @Override - public ModelContainerDetails withIsArchived(Boolean isArchived) { + public ModelContainerProperties withIsArchived(Boolean isArchived) { super.withIsArchived(isArchived); return this; } /** {@inheritDoc} */ @Override - public ModelContainerDetails withDescription(String description) { + public ModelContainerProperties withDescription(String description) { super.withDescription(description); return this; } /** {@inheritDoc} */ @Override - public ModelContainerDetails withProperties(Map properties) { + public ModelContainerProperties withProperties(Map properties) { super.withProperties(properties); return this; } /** {@inheritDoc} */ @Override - public ModelContainerDetails withTags(Map tags) { + public ModelContainerProperties withTags(Map tags) { super.withTags(tags); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainerResourceArmPaginatedResult.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainerResourceArmPaginatedResult.java index adf8b64de64a..c9acda889b28 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainerResourceArmPaginatedResult.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainerResourceArmPaginatedResult.java @@ -5,7 +5,7 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.fluent.models.ModelContainerDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.ModelContainerInner; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -23,7 +23,7 @@ public final class ModelContainerResourceArmPaginatedResult { * An array of objects of type ModelContainer. */ @JsonProperty(value = "value") - private List value; + private List value; /** * Get the nextLink property: The link to the next page of ModelContainer objects. If null, there are no additional @@ -52,7 +52,7 @@ public ModelContainerResourceArmPaginatedResult withNextLink(String nextLink) { * * @return the value value. */ - public List value() { + public List value() { return this.value; } @@ -62,7 +62,7 @@ public List value() { * @param value the value value to set. * @return the ModelContainerResourceArmPaginatedResult object itself. */ - public ModelContainerResourceArmPaginatedResult withValue(List value) { + public ModelContainerResourceArmPaginatedResult withValue(List value) { this.value = value; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainers.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainers.java index c629ea65fcae..29868c8ee362 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainers.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelContainers.java @@ -20,7 +20,7 @@ public interface ModelContainers { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of ModelContainer entities as paginated response with {@link PagedIterable}. */ - PagedIterable list(String resourceGroupName, String workspaceName); + PagedIterable list(String resourceGroupName, String workspaceName); /** * List model containers. @@ -36,7 +36,7 @@ public interface ModelContainers { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of ModelContainer entities as paginated response with {@link PagedIterable}. */ - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String skip, @@ -81,7 +81,7 @@ PagedIterable list( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container. */ - ModelContainerData get(String resourceGroupName, String workspaceName, String name); + ModelContainer get(String resourceGroupName, String workspaceName, String name); /** * Get container. @@ -95,7 +95,7 @@ PagedIterable list( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container along with {@link Response}. */ - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, Context context); /** @@ -107,7 +107,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container along with {@link Response}. */ - ModelContainerData getById(String id); + ModelContainer getById(String id); /** * Get container. @@ -119,7 +119,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return container along with {@link Response}. */ - Response getByIdWithResponse(String id, Context context); + Response getByIdWithResponse(String id, Context context); /** * Delete container. @@ -144,10 +144,10 @@ Response getWithResponse( Response deleteByIdWithResponse(String id, Context context); /** - * Begins definition for a new ModelContainerData resource. + * Begins definition for a new ModelContainer resource. * * @param name resource name. - * @return the first stage of the new ModelContainerData definition. + * @return the first stage of the new ModelContainer definition. */ - ModelContainerData.DefinitionStages.Blank define(String name); + ModelContainer.DefinitionStages.Blank define(String name); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelSize.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelSize.java deleted file mode 100644 index 957999f455e6..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelSize.java +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for ModelSize. */ -public final class ModelSize extends ExpandableStringEnum { - /** Static value None for ModelSize. */ - public static final ModelSize NONE = fromString("None"); - - /** Static value Small for ModelSize. */ - public static final ModelSize SMALL = fromString("Small"); - - /** Static value Medium for ModelSize. */ - public static final ModelSize MEDIUM = fromString("Medium"); - - /** Static value Large for ModelSize. */ - public static final ModelSize LARGE = fromString("Large"); - - /** Static value ExtraLarge for ModelSize. */ - public static final ModelSize EXTRA_LARGE = fromString("ExtraLarge"); - - /** - * Creates or finds a ModelSize from its string representation. - * - * @param name a name to look for. - * @return the corresponding ModelSize. - */ - @JsonCreator - public static ModelSize fromString(String name) { - return fromString(name, ModelSize.class); - } - - /** - * Gets known ModelSize values. - * - * @return known ModelSize values. - */ - public static Collection values() { - return values(ModelSize.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelType.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelType.java deleted file mode 100644 index 457991e34222..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelType.java +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for ModelType. */ -public final class ModelType extends ExpandableStringEnum { - /** Static value CustomModel for ModelType. */ - public static final ModelType CUSTOM_MODEL = fromString("CustomModel"); - - /** Static value MLFlowModel for ModelType. */ - public static final ModelType MLFLOW_MODEL = fromString("MLFlowModel"); - - /** Static value TritonModel for ModelType. */ - public static final ModelType TRITON_MODEL = fromString("TritonModel"); - - /** - * Creates or finds a ModelType from its string representation. - * - * @param name a name to look for. - * @return the corresponding ModelType. - */ - @JsonCreator - public static ModelType fromString(String name) { - return fromString(name, ModelType.class); - } - - /** - * Gets known ModelType values. - * - * @return known ModelType values. - */ - public static Collection values() { - return values(ModelType.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersionData.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersion.java similarity index 73% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersionData.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersion.java index 8b3a0b2871a1..6d8d49f16984 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersionData.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersion.java @@ -6,10 +6,10 @@ import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.ModelVersionDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.ModelVersionInner; -/** An immutable client-side representation of ModelVersionData. */ -public interface ModelVersionData { +/** An immutable client-side representation of ModelVersion. */ +public interface ModelVersion { /** * Gets the id property: Fully qualified resource Id for the resource. * @@ -36,7 +36,7 @@ public interface ModelVersionData { * * @return the properties value. */ - ModelVersionDetails properties(); + ModelVersionProperties properties(); /** * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. @@ -53,25 +53,25 @@ public interface ModelVersionData { String resourceGroupName(); /** - * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.ModelVersionDataInner object. + * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.ModelVersionInner object. * * @return the inner object. */ - ModelVersionDataInner innerModel(); + ModelVersionInner innerModel(); - /** The entirety of the ModelVersionData definition. */ + /** The entirety of the ModelVersion definition. */ interface Definition extends DefinitionStages.Blank, DefinitionStages.WithParentResource, DefinitionStages.WithProperties, DefinitionStages.WithCreate { } - /** The ModelVersionData definition stages. */ + /** The ModelVersion definition stages. */ interface DefinitionStages { - /** The first stage of the ModelVersionData definition. */ + /** The first stage of the ModelVersion definition. */ interface Blank extends WithParentResource { } - /** The stage of the ModelVersionData definition allowing to specify parent resource. */ + /** The stage of the ModelVersion definition allowing to specify parent resource. */ interface WithParentResource { /** * Specifies resourceGroupName, workspaceName, name. @@ -83,7 +83,7 @@ interface WithParentResource { */ WithProperties withExistingModel(String resourceGroupName, String workspaceName, String name); } - /** The stage of the ModelVersionData definition allowing to specify properties. */ + /** The stage of the ModelVersion definition allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -91,11 +91,11 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - WithCreate withProperties(ModelVersionDetails properties); + WithCreate withProperties(ModelVersionProperties properties); } /** - * The stage of the ModelVersionData definition which contains all the minimum required properties for the - * resource to be created, but also allows for any other optional properties to be specified. + * The stage of the ModelVersion definition which contains all the minimum required properties for the resource + * to be created, but also allows for any other optional properties to be specified. */ interface WithCreate { /** @@ -103,7 +103,7 @@ interface WithCreate { * * @return the created resource. */ - ModelVersionData create(); + ModelVersion create(); /** * Executes the create request. @@ -111,24 +111,24 @@ interface WithCreate { * @param context The context to associate with this operation. * @return the created resource. */ - ModelVersionData create(Context context); + ModelVersion create(Context context); } } /** - * Begins update for the ModelVersionData resource. + * Begins update for the ModelVersion resource. * * @return the stage of resource update. */ - ModelVersionData.Update update(); + ModelVersion.Update update(); - /** The template for ModelVersionData update. */ + /** The template for ModelVersion update. */ interface Update extends UpdateStages.WithProperties { /** * Executes the update request. * * @return the updated resource. */ - ModelVersionData apply(); + ModelVersion apply(); /** * Executes the update request. @@ -136,11 +136,11 @@ interface Update extends UpdateStages.WithProperties { * @param context The context to associate with this operation. * @return the updated resource. */ - ModelVersionData apply(Context context); + ModelVersion apply(Context context); } - /** The ModelVersionData update stages. */ + /** The ModelVersion update stages. */ interface UpdateStages { - /** The stage of the ModelVersionData update allowing to specify properties. */ + /** The stage of the ModelVersion update allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -148,7 +148,7 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - Update withProperties(ModelVersionDetails properties); + Update withProperties(ModelVersionProperties properties); } } /** @@ -156,7 +156,7 @@ interface WithProperties { * * @return the refreshed resource. */ - ModelVersionData refresh(); + ModelVersion refresh(); /** * Refreshes the resource to sync with Azure. @@ -164,5 +164,5 @@ interface WithProperties { * @param context The context to associate with this operation. * @return the refreshed resource. */ - ModelVersionData refresh(Context context); + ModelVersion refresh(Context context); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersionDetails.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersionProperties.java similarity index 78% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersionDetails.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersionProperties.java index 9da6e6feee08..f57878b19cf0 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersionDetails.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersionProperties.java @@ -11,7 +11,7 @@ /** Model asset version details. */ @Fluent -public final class ModelVersionDetails extends AssetBase { +public final class ModelVersionProperties extends AssetBase { /* * Mapping of model flavors to their properties. */ @@ -29,7 +29,7 @@ public final class ModelVersionDetails extends AssetBase { * The storage format for this entity. Used for NCD. */ @JsonProperty(value = "modelType") - private ModelType modelType; + private String modelType; /* * The URI path to the model contents. @@ -50,9 +50,9 @@ public Map flavors() { * Set the flavors property: Mapping of model flavors to their properties. * * @param flavors the flavors value to set. - * @return the ModelVersionDetails object itself. + * @return the ModelVersionProperties object itself. */ - public ModelVersionDetails withFlavors(Map flavors) { + public ModelVersionProperties withFlavors(Map flavors) { this.flavors = flavors; return this; } @@ -70,9 +70,9 @@ public String jobName() { * Set the jobName property: Name of the training job which produced this model. * * @param jobName the jobName value to set. - * @return the ModelVersionDetails object itself. + * @return the ModelVersionProperties object itself. */ - public ModelVersionDetails withJobName(String jobName) { + public ModelVersionProperties withJobName(String jobName) { this.jobName = jobName; return this; } @@ -82,7 +82,7 @@ public ModelVersionDetails withJobName(String jobName) { * * @return the modelType value. */ - public ModelType modelType() { + public String modelType() { return this.modelType; } @@ -90,9 +90,9 @@ public ModelType modelType() { * Set the modelType property: The storage format for this entity. Used for NCD. * * @param modelType the modelType value to set. - * @return the ModelVersionDetails object itself. + * @return the ModelVersionProperties object itself. */ - public ModelVersionDetails withModelType(ModelType modelType) { + public ModelVersionProperties withModelType(String modelType) { this.modelType = modelType; return this; } @@ -110,44 +110,44 @@ public String modelUri() { * Set the modelUri property: The URI path to the model contents. * * @param modelUri the modelUri value to set. - * @return the ModelVersionDetails object itself. + * @return the ModelVersionProperties object itself. */ - public ModelVersionDetails withModelUri(String modelUri) { + public ModelVersionProperties withModelUri(String modelUri) { this.modelUri = modelUri; return this; } /** {@inheritDoc} */ @Override - public ModelVersionDetails withIsAnonymous(Boolean isAnonymous) { + public ModelVersionProperties withIsAnonymous(Boolean isAnonymous) { super.withIsAnonymous(isAnonymous); return this; } /** {@inheritDoc} */ @Override - public ModelVersionDetails withIsArchived(Boolean isArchived) { + public ModelVersionProperties withIsArchived(Boolean isArchived) { super.withIsArchived(isArchived); return this; } /** {@inheritDoc} */ @Override - public ModelVersionDetails withDescription(String description) { + public ModelVersionProperties withDescription(String description) { super.withDescription(description); return this; } /** {@inheritDoc} */ @Override - public ModelVersionDetails withProperties(Map properties) { + public ModelVersionProperties withProperties(Map properties) { super.withProperties(properties); return this; } /** {@inheritDoc} */ @Override - public ModelVersionDetails withTags(Map tags) { + public ModelVersionProperties withTags(Map tags) { super.withTags(tags); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersionResourceArmPaginatedResult.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersionResourceArmPaginatedResult.java index eeefe6c1d55e..5859954c387b 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersionResourceArmPaginatedResult.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersionResourceArmPaginatedResult.java @@ -5,7 +5,7 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.fluent.models.ModelVersionDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.ModelVersionInner; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -23,7 +23,7 @@ public final class ModelVersionResourceArmPaginatedResult { * An array of objects of type ModelVersion. */ @JsonProperty(value = "value") - private List value; + private List value; /** * Get the nextLink property: The link to the next page of ModelVersion objects. If null, there are no additional @@ -52,7 +52,7 @@ public ModelVersionResourceArmPaginatedResult withNextLink(String nextLink) { * * @return the value value. */ - public List value() { + public List value() { return this.value; } @@ -62,7 +62,7 @@ public List value() { * @param value the value value to set. * @return the ModelVersionResourceArmPaginatedResult object itself. */ - public ModelVersionResourceArmPaginatedResult withValue(List value) { + public ModelVersionResourceArmPaginatedResult withValue(List value) { this.value = value; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersions.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersions.java index 01f803ff7734..cc195b373f07 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersions.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ModelVersions.java @@ -21,7 +21,7 @@ public interface ModelVersions { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of ModelVersion entities as paginated response with {@link PagedIterable}. */ - PagedIterable list(String resourceGroupName, String workspaceName, String name); + PagedIterable list(String resourceGroupName, String workspaceName, String name); /** * List model versions. @@ -45,7 +45,7 @@ public interface ModelVersions { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of ModelVersion entities as paginated response with {@link PagedIterable}. */ - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -102,7 +102,7 @@ Response deleteWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version. */ - ModelVersionData get(String resourceGroupName, String workspaceName, String name, String version); + ModelVersion get(String resourceGroupName, String workspaceName, String name, String version); /** * Get version. @@ -117,7 +117,7 @@ Response deleteWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version along with {@link Response}. */ - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String name, String version, Context context); /** @@ -129,7 +129,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version along with {@link Response}. */ - ModelVersionData getById(String id); + ModelVersion getById(String id); /** * Get version. @@ -141,7 +141,7 @@ Response getWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return version along with {@link Response}. */ - Response getByIdWithResponse(String id, Context context); + Response getByIdWithResponse(String id, Context context); /** * Delete version. @@ -166,10 +166,10 @@ Response getWithResponse( Response deleteByIdWithResponse(String id, Context context); /** - * Begins definition for a new ModelVersionData resource. + * Begins definition for a new ModelVersion resource. * * @param name resource name. - * @return the first stage of the new ModelVersionData definition. + * @return the first stage of the new ModelVersion definition. */ - ModelVersionData.DefinitionStages.Blank define(String name); + ModelVersion.DefinitionStages.Blank define(String name); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NCrossValidations.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NCrossValidations.java deleted file mode 100644 index 5aa4f443b667..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NCrossValidations.java +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Immutable; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** N-Cross validations value. */ -@JsonTypeInfo( - use = JsonTypeInfo.Id.NAME, - include = JsonTypeInfo.As.PROPERTY, - property = "mode", - defaultImpl = NCrossValidations.class) -@JsonTypeName("NCrossValidations") -@JsonSubTypes({ - @JsonSubTypes.Type(name = "Auto", value = AutoNCrossValidations.class), - @JsonSubTypes.Type(name = "Custom", value = CustomNCrossValidations.class) -}) -@Immutable -public class NCrossValidations { - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NCrossValidationsMode.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NCrossValidationsMode.java deleted file mode 100644 index 74d8949c003f..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NCrossValidationsMode.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for NCrossValidationsMode. */ -public final class NCrossValidationsMode extends ExpandableStringEnum { - /** Static value Auto for NCrossValidationsMode. */ - public static final NCrossValidationsMode AUTO = fromString("Auto"); - - /** Static value Custom for NCrossValidationsMode. */ - public static final NCrossValidationsMode CUSTOM = fromString("Custom"); - - /** - * Creates or finds a NCrossValidationsMode from its string representation. - * - * @param name a name to look for. - * @return the corresponding NCrossValidationsMode. - */ - @JsonCreator - public static NCrossValidationsMode fromString(String name) { - return fromString(name, NCrossValidationsMode.class); - } - - /** - * Gets known NCrossValidationsMode values. - * - * @return known NCrossValidationsMode values. - */ - public static Collection values() { - return values(NCrossValidationsMode.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVertical.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVertical.java deleted file mode 100644 index 06d7e7163e89..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVertical.java +++ /dev/null @@ -1,107 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** Abstract class for NLP related AutoML tasks. NLP - Natural Language Processing. */ -@Fluent -public class NlpVertical { - /* - * Data inputs for AutoMLJob. - */ - @JsonProperty(value = "dataSettings") - private NlpVerticalDataSettings dataSettings; - - /* - * Featurization inputs needed for AutoML job. - */ - @JsonProperty(value = "featurizationSettings") - private NlpVerticalFeaturizationSettings featurizationSettings; - - /* - * Execution constraints for AutoMLJob. - */ - @JsonProperty(value = "limitSettings") - private NlpVerticalLimitSettings limitSettings; - - /** - * Get the dataSettings property: Data inputs for AutoMLJob. - * - * @return the dataSettings value. - */ - public NlpVerticalDataSettings dataSettings() { - return this.dataSettings; - } - - /** - * Set the dataSettings property: Data inputs for AutoMLJob. - * - * @param dataSettings the dataSettings value to set. - * @return the NlpVertical object itself. - */ - public NlpVertical withDataSettings(NlpVerticalDataSettings dataSettings) { - this.dataSettings = dataSettings; - return this; - } - - /** - * Get the featurizationSettings property: Featurization inputs needed for AutoML job. - * - * @return the featurizationSettings value. - */ - public NlpVerticalFeaturizationSettings featurizationSettings() { - return this.featurizationSettings; - } - - /** - * Set the featurizationSettings property: Featurization inputs needed for AutoML job. - * - * @param featurizationSettings the featurizationSettings value to set. - * @return the NlpVertical object itself. - */ - public NlpVertical withFeaturizationSettings(NlpVerticalFeaturizationSettings featurizationSettings) { - this.featurizationSettings = featurizationSettings; - return this; - } - - /** - * Get the limitSettings property: Execution constraints for AutoMLJob. - * - * @return the limitSettings value. - */ - public NlpVerticalLimitSettings limitSettings() { - return this.limitSettings; - } - - /** - * Set the limitSettings property: Execution constraints for AutoMLJob. - * - * @param limitSettings the limitSettings value to set. - * @return the NlpVertical object itself. - */ - public NlpVertical withLimitSettings(NlpVerticalLimitSettings limitSettings) { - this.limitSettings = limitSettings; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (dataSettings() != null) { - dataSettings().validate(); - } - if (featurizationSettings() != null) { - featurizationSettings().validate(); - } - if (limitSettings() != null) { - limitSettings().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVerticalDataSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVerticalDataSettings.java deleted file mode 100644 index a8541602826c..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVerticalDataSettings.java +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** Class for data inputs. NLP - Natural Language Processing. */ -@Fluent -public final class NlpVerticalDataSettings extends DataSettings { - /* - * Validation data inputs. - */ - @JsonProperty(value = "validationData") - private NlpVerticalValidationDataSettings validationData; - - /** - * Get the validationData property: Validation data inputs. - * - * @return the validationData value. - */ - public NlpVerticalValidationDataSettings validationData() { - return this.validationData; - } - - /** - * Set the validationData property: Validation data inputs. - * - * @param validationData the validationData value to set. - * @return the NlpVerticalDataSettings object itself. - */ - public NlpVerticalDataSettings withValidationData(NlpVerticalValidationDataSettings validationData) { - this.validationData = validationData; - return this; - } - - /** {@inheritDoc} */ - @Override - public NlpVerticalDataSettings withTargetColumnName(String targetColumnName) { - super.withTargetColumnName(targetColumnName); - return this; - } - - /** {@inheritDoc} */ - @Override - public NlpVerticalDataSettings withTestData(TestDataSettings testData) { - super.withTestData(testData); - return this; - } - - /** {@inheritDoc} */ - @Override - public NlpVerticalDataSettings withTrainingData(TrainingDataSettings trainingData) { - super.withTrainingData(trainingData); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (validationData() != null) { - validationData().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVerticalFeaturizationSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVerticalFeaturizationSettings.java deleted file mode 100644 index 077a1060349a..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVerticalFeaturizationSettings.java +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; - -/** The NlpVerticalFeaturizationSettings model. */ -@Fluent -public final class NlpVerticalFeaturizationSettings extends FeaturizationSettings { - /** {@inheritDoc} */ - @Override - public NlpVerticalFeaturizationSettings withDatasetLanguage(String datasetLanguage) { - super.withDatasetLanguage(datasetLanguage); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVerticalLimitSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVerticalLimitSettings.java deleted file mode 100644 index 9f7214537ae0..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVerticalLimitSettings.java +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.time.Duration; - -/** Job execution constraints. */ -@Fluent -public final class NlpVerticalLimitSettings { - /* - * Maximum Concurrent AutoML iterations. - */ - @JsonProperty(value = "maxConcurrentTrials") - private Integer maxConcurrentTrials; - - /* - * Number of AutoML iterations. - */ - @JsonProperty(value = "maxTrials") - private Integer maxTrials; - - /* - * AutoML job timeout. - */ - @JsonProperty(value = "timeout") - private Duration timeout; - - /** - * Get the maxConcurrentTrials property: Maximum Concurrent AutoML iterations. - * - * @return the maxConcurrentTrials value. - */ - public Integer maxConcurrentTrials() { - return this.maxConcurrentTrials; - } - - /** - * Set the maxConcurrentTrials property: Maximum Concurrent AutoML iterations. - * - * @param maxConcurrentTrials the maxConcurrentTrials value to set. - * @return the NlpVerticalLimitSettings object itself. - */ - public NlpVerticalLimitSettings withMaxConcurrentTrials(Integer maxConcurrentTrials) { - this.maxConcurrentTrials = maxConcurrentTrials; - return this; - } - - /** - * Get the maxTrials property: Number of AutoML iterations. - * - * @return the maxTrials value. - */ - public Integer maxTrials() { - return this.maxTrials; - } - - /** - * Set the maxTrials property: Number of AutoML iterations. - * - * @param maxTrials the maxTrials value to set. - * @return the NlpVerticalLimitSettings object itself. - */ - public NlpVerticalLimitSettings withMaxTrials(Integer maxTrials) { - this.maxTrials = maxTrials; - return this; - } - - /** - * Get the timeout property: AutoML job timeout. - * - * @return the timeout value. - */ - public Duration timeout() { - return this.timeout; - } - - /** - * Set the timeout property: AutoML job timeout. - * - * @param timeout the timeout value to set. - * @return the NlpVerticalLimitSettings object itself. - */ - public NlpVerticalLimitSettings withTimeout(Duration timeout) { - this.timeout = timeout; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVerticalValidationDataSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVerticalValidationDataSettings.java deleted file mode 100644 index 83a16977dc67..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NlpVerticalValidationDataSettings.java +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; - -/** The NlpVerticalValidationDataSettings model. */ -@Fluent -public final class NlpVerticalValidationDataSettings extends ValidationDataSettings { - /** {@inheritDoc} */ - @Override - public NlpVerticalValidationDataSettings withData(MLTableJobInput data) { - super.withData(data); - return this; - } - - /** {@inheritDoc} */ - @Override - public NlpVerticalValidationDataSettings withValidationDataSize(Double validationDataSize) { - super.withValidationDataSize(validationDataSize); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NoneAuthTypeWorkspaceConnectionProperties.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NoneAuthTypeWorkspaceConnectionProperties.java new file mode 100644 index 000000000000..114b42c6294b --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/NoneAuthTypeWorkspaceConnectionProperties.java @@ -0,0 +1,53 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.models; + +import com.azure.core.annotation.Fluent; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** The NoneAuthTypeWorkspaceConnectionProperties model. */ +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "authType") +@JsonTypeName("None") +@Fluent +public final class NoneAuthTypeWorkspaceConnectionProperties extends WorkspaceConnectionPropertiesV2 { + /** {@inheritDoc} */ + @Override + public NoneAuthTypeWorkspaceConnectionProperties withCategory(ConnectionCategory category) { + super.withCategory(category); + return this; + } + + /** {@inheritDoc} */ + @Override + public NoneAuthTypeWorkspaceConnectionProperties withTarget(String target) { + super.withTarget(target); + return this; + } + + /** {@inheritDoc} */ + @Override + public NoneAuthTypeWorkspaceConnectionProperties withValue(String value) { + super.withValue(value); + return this; + } + + /** {@inheritDoc} */ + @Override + public NoneAuthTypeWorkspaceConnectionProperties withValueFormat(ValueFormat valueFormat) { + super.withValueFormat(valueFormat); + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + @Override + public void validate() { + super.validate(); + } +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ObjectDetectionPrimaryMetrics.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ObjectDetectionPrimaryMetrics.java deleted file mode 100644 index 6f03bf08a710..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ObjectDetectionPrimaryMetrics.java +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for ObjectDetectionPrimaryMetrics. */ -public final class ObjectDetectionPrimaryMetrics extends ExpandableStringEnum { - /** Static value MeanAveragePrecision for ObjectDetectionPrimaryMetrics. */ - public static final ObjectDetectionPrimaryMetrics MEAN_AVERAGE_PRECISION = fromString("MeanAveragePrecision"); - - /** - * Creates or finds a ObjectDetectionPrimaryMetrics from its string representation. - * - * @param name a name to look for. - * @return the corresponding ObjectDetectionPrimaryMetrics. - */ - @JsonCreator - public static ObjectDetectionPrimaryMetrics fromString(String name) { - return fromString(name, ObjectDetectionPrimaryMetrics.class); - } - - /** - * Gets known ObjectDetectionPrimaryMetrics values. - * - * @return known ObjectDetectionPrimaryMetrics values. - */ - public static Collection values() { - return values(ObjectDetectionPrimaryMetrics.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeploymentData.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeployment.java similarity index 72% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeploymentData.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeployment.java index d8007d460272..fa2f7df17b37 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeploymentData.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeployment.java @@ -8,11 +8,11 @@ import com.azure.core.management.Region; import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.OnlineDeploymentDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.OnlineDeploymentInner; import java.util.Map; -/** An immutable client-side representation of OnlineDeploymentData. */ -public interface OnlineDeploymentData { +/** An immutable client-side representation of OnlineDeployment. */ +public interface OnlineDeployment { /** * Gets the id property: Fully qualified resource Id for the resource. * @@ -68,7 +68,7 @@ public interface OnlineDeploymentData { * * @return the properties value. */ - OnlineDeploymentDetails properties(); + OnlineDeploymentProperties properties(); /** * Gets the sku property: Sku details required for ARM contract for Autoscaling. @@ -106,13 +106,13 @@ public interface OnlineDeploymentData { String resourceGroupName(); /** - * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.OnlineDeploymentDataInner object. + * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.OnlineDeploymentInner object. * * @return the inner object. */ - OnlineDeploymentDataInner innerModel(); + OnlineDeploymentInner innerModel(); - /** The entirety of the OnlineDeploymentData definition. */ + /** The entirety of the OnlineDeployment definition. */ interface Definition extends DefinitionStages.Blank, DefinitionStages.WithLocation, @@ -120,12 +120,12 @@ interface Definition DefinitionStages.WithProperties, DefinitionStages.WithCreate { } - /** The OnlineDeploymentData definition stages. */ + /** The OnlineDeployment definition stages. */ interface DefinitionStages { - /** The first stage of the OnlineDeploymentData definition. */ + /** The first stage of the OnlineDeployment definition. */ interface Blank extends WithLocation { } - /** The stage of the OnlineDeploymentData definition allowing to specify location. */ + /** The stage of the OnlineDeployment definition allowing to specify location. */ interface WithLocation { /** * Specifies the region for the resource. @@ -143,7 +143,7 @@ interface WithLocation { */ WithParentResource withRegion(String location); } - /** The stage of the OnlineDeploymentData definition allowing to specify parent resource. */ + /** The stage of the OnlineDeployment definition allowing to specify parent resource. */ interface WithParentResource { /** * Specifies resourceGroupName, workspaceName, endpointName. @@ -156,7 +156,7 @@ interface WithParentResource { WithProperties withExistingOnlineEndpoint( String resourceGroupName, String workspaceName, String endpointName); } - /** The stage of the OnlineDeploymentData definition allowing to specify properties. */ + /** The stage of the OnlineDeployment definition allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -164,10 +164,10 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - WithCreate withProperties(OnlineDeploymentDetails properties); + WithCreate withProperties(OnlineDeploymentProperties properties); } /** - * The stage of the OnlineDeploymentData definition which contains all the minimum required properties for the + * The stage of the OnlineDeployment definition which contains all the minimum required properties for the * resource to be created, but also allows for any other optional properties to be specified. */ interface WithCreate @@ -180,7 +180,7 @@ interface WithCreate * * @return the created resource. */ - OnlineDeploymentData create(); + OnlineDeployment create(); /** * Executes the create request. @@ -188,9 +188,9 @@ interface WithCreate * @param context The context to associate with this operation. * @return the created resource. */ - OnlineDeploymentData create(Context context); + OnlineDeployment create(Context context); } - /** The stage of the OnlineDeploymentData definition allowing to specify tags. */ + /** The stage of the OnlineDeployment definition allowing to specify tags. */ interface WithTags { /** * Specifies the tags property: Resource tags.. @@ -200,7 +200,7 @@ interface WithTags { */ WithCreate withTags(Map tags); } - /** The stage of the OnlineDeploymentData definition allowing to specify identity. */ + /** The stage of the OnlineDeployment definition allowing to specify identity. */ interface WithIdentity { /** * Specifies the identity property: Managed service identity (system assigned and/or user assigned @@ -211,7 +211,7 @@ interface WithIdentity { */ WithCreate withIdentity(ManagedServiceIdentity identity); } - /** The stage of the OnlineDeploymentData definition allowing to specify kind. */ + /** The stage of the OnlineDeployment definition allowing to specify kind. */ interface WithKind { /** * Specifies the kind property: Metadata used by portal/tooling/etc to render different UX experiences for @@ -223,7 +223,7 @@ interface WithKind { */ WithCreate withKind(String kind); } - /** The stage of the OnlineDeploymentData definition allowing to specify sku. */ + /** The stage of the OnlineDeployment definition allowing to specify sku. */ interface WithSku { /** * Specifies the sku property: Sku details required for ARM contract for Autoscaling.. @@ -235,25 +235,20 @@ interface WithSku { } } /** - * Begins update for the OnlineDeploymentData resource. + * Begins update for the OnlineDeployment resource. * * @return the stage of resource update. */ - OnlineDeploymentData.Update update(); + OnlineDeployment.Update update(); - /** The template for OnlineDeploymentData update. */ - interface Update - extends UpdateStages.WithTags, - UpdateStages.WithIdentity, - UpdateStages.WithKind, - UpdateStages.WithProperties, - UpdateStages.WithSku { + /** The template for OnlineDeployment update. */ + interface Update extends UpdateStages.WithTags, UpdateStages.WithSku { /** * Executes the update request. * * @return the updated resource. */ - OnlineDeploymentData apply(); + OnlineDeployment apply(); /** * Executes the update request. @@ -261,11 +256,11 @@ interface Update * @param context The context to associate with this operation. * @return the updated resource. */ - OnlineDeploymentData apply(Context context); + OnlineDeployment apply(Context context); } - /** The OnlineDeploymentData update stages. */ + /** The OnlineDeployment update stages. */ interface UpdateStages { - /** The stage of the OnlineDeploymentData update allowing to specify tags. */ + /** The stage of the OnlineDeployment update allowing to specify tags. */ interface WithTags { /** * Specifies the tags property: Resource tags.. @@ -275,40 +270,7 @@ interface WithTags { */ Update withTags(Map tags); } - /** The stage of the OnlineDeploymentData update allowing to specify identity. */ - interface WithIdentity { - /** - * Specifies the identity property: Managed service identity (system assigned and/or user assigned - * identities). - * - * @param identity Managed service identity (system assigned and/or user assigned identities). - * @return the next definition stage. - */ - Update withIdentity(PartialManagedServiceIdentity identity); - } - /** The stage of the OnlineDeploymentData update allowing to specify kind. */ - interface WithKind { - /** - * Specifies the kind property: Metadata used by portal/tooling/etc to render different UX experiences for - * resources of the same type.. - * - * @param kind Metadata used by portal/tooling/etc to render different UX experiences for resources of the - * same type. - * @return the next definition stage. - */ - Update withKind(String kind); - } - /** The stage of the OnlineDeploymentData update allowing to specify properties. */ - interface WithProperties { - /** - * Specifies the properties property: Additional attributes of the entity.. - * - * @param properties Additional attributes of the entity. - * @return the next definition stage. - */ - Update withProperties(PartialOnlineDeployment properties); - } - /** The stage of the OnlineDeploymentData update allowing to specify sku. */ + /** The stage of the OnlineDeployment update allowing to specify sku. */ interface WithSku { /** * Specifies the sku property: Sku details required for ARM contract for Autoscaling.. @@ -324,7 +286,7 @@ interface WithSku { * * @return the refreshed resource. */ - OnlineDeploymentData refresh(); + OnlineDeployment refresh(); /** * Refreshes the resource to sync with Azure. @@ -332,7 +294,7 @@ interface WithSku { * @param context The context to associate with this operation. * @return the refreshed resource. */ - OnlineDeploymentData refresh(Context context); + OnlineDeployment refresh(Context context); /** * Polls an Endpoint operation. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeploymentDetails.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeploymentProperties.java similarity index 66% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeploymentDetails.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeploymentProperties.java index d8bf089ea113..5dc571f6d2dc 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeploymentDetails.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeploymentProperties.java @@ -11,32 +11,25 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import java.util.Map; -/** The OnlineDeploymentDetails model. */ +/** The OnlineDeploymentProperties model. */ @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointComputeType", - defaultImpl = OnlineDeploymentDetails.class) -@JsonTypeName("OnlineDeploymentDetails") + defaultImpl = OnlineDeploymentProperties.class) +@JsonTypeName("OnlineDeploymentProperties") @JsonSubTypes({ @JsonSubTypes.Type(name = "Kubernetes", value = KubernetesOnlineDeployment.class), @JsonSubTypes.Type(name = "Managed", value = ManagedOnlineDeployment.class) }) @Fluent -public class OnlineDeploymentDetails extends EndpointDeploymentPropertiesBase { +public class OnlineDeploymentProperties extends EndpointDeploymentPropertiesBase { /* * If true, enables Application Insights logging. */ @JsonProperty(value = "appInsightsEnabled") private Boolean appInsightsEnabled; - /* - * If Enabled, allow egress public network access. If Disabled, this will - * create secure egress. Default: Enabled. - */ - @JsonProperty(value = "egressPublicNetworkAccess") - private EgressPublicNetworkAccessType egressPublicNetworkAccess; - /* * Compute instance type. */ @@ -61,13 +54,6 @@ public class OnlineDeploymentDetails extends EndpointDeploymentPropertiesBase { @JsonProperty(value = "modelMountPath") private String modelMountPath; - /* - * If true, enable private network connection. - * DEPRECATED for future API versions. Use EgressPublicNetworkAccess. - */ - @JsonProperty(value = "privateNetworkConnection") - private Boolean privateNetworkConnection; - /* * Provisioning state for the endpoint deployment. */ @@ -110,36 +96,13 @@ public Boolean appInsightsEnabled() { * Set the appInsightsEnabled property: If true, enables Application Insights logging. * * @param appInsightsEnabled the appInsightsEnabled value to set. - * @return the OnlineDeploymentDetails object itself. + * @return the OnlineDeploymentProperties object itself. */ - public OnlineDeploymentDetails withAppInsightsEnabled(Boolean appInsightsEnabled) { + public OnlineDeploymentProperties withAppInsightsEnabled(Boolean appInsightsEnabled) { this.appInsightsEnabled = appInsightsEnabled; return this; } - /** - * Get the egressPublicNetworkAccess property: If Enabled, allow egress public network access. If Disabled, this - * will create secure egress. Default: Enabled. - * - * @return the egressPublicNetworkAccess value. - */ - public EgressPublicNetworkAccessType egressPublicNetworkAccess() { - return this.egressPublicNetworkAccess; - } - - /** - * Set the egressPublicNetworkAccess property: If Enabled, allow egress public network access. If Disabled, this - * will create secure egress. Default: Enabled. - * - * @param egressPublicNetworkAccess the egressPublicNetworkAccess value to set. - * @return the OnlineDeploymentDetails object itself. - */ - public OnlineDeploymentDetails withEgressPublicNetworkAccess( - EgressPublicNetworkAccessType egressPublicNetworkAccess) { - this.egressPublicNetworkAccess = egressPublicNetworkAccess; - return this; - } - /** * Get the instanceType property: Compute instance type. * @@ -153,9 +116,9 @@ public String instanceType() { * Set the instanceType property: Compute instance type. * * @param instanceType the instanceType value to set. - * @return the OnlineDeploymentDetails object itself. + * @return the OnlineDeploymentProperties object itself. */ - public OnlineDeploymentDetails withInstanceType(String instanceType) { + public OnlineDeploymentProperties withInstanceType(String instanceType) { this.instanceType = instanceType; return this; } @@ -173,9 +136,9 @@ public ProbeSettings livenessProbe() { * Set the livenessProbe property: Liveness probe monitors the health of the container regularly. * * @param livenessProbe the livenessProbe value to set. - * @return the OnlineDeploymentDetails object itself. + * @return the OnlineDeploymentProperties object itself. */ - public OnlineDeploymentDetails withLivenessProbe(ProbeSettings livenessProbe) { + public OnlineDeploymentProperties withLivenessProbe(ProbeSettings livenessProbe) { this.livenessProbe = livenessProbe; return this; } @@ -193,9 +156,9 @@ public String model() { * Set the model property: The URI path to the model. * * @param model the model value to set. - * @return the OnlineDeploymentDetails object itself. + * @return the OnlineDeploymentProperties object itself. */ - public OnlineDeploymentDetails withModel(String model) { + public OnlineDeploymentProperties withModel(String model) { this.model = model; return this; } @@ -213,35 +176,13 @@ public String modelMountPath() { * Set the modelMountPath property: The path to mount the model in custom container. * * @param modelMountPath the modelMountPath value to set. - * @return the OnlineDeploymentDetails object itself. + * @return the OnlineDeploymentProperties object itself. */ - public OnlineDeploymentDetails withModelMountPath(String modelMountPath) { + public OnlineDeploymentProperties withModelMountPath(String modelMountPath) { this.modelMountPath = modelMountPath; return this; } - /** - * Get the privateNetworkConnection property: If true, enable private network connection. DEPRECATED for future API - * versions. Use EgressPublicNetworkAccess. - * - * @return the privateNetworkConnection value. - */ - public Boolean privateNetworkConnection() { - return this.privateNetworkConnection; - } - - /** - * Set the privateNetworkConnection property: If true, enable private network connection. DEPRECATED for future API - * versions. Use EgressPublicNetworkAccess. - * - * @param privateNetworkConnection the privateNetworkConnection value to set. - * @return the OnlineDeploymentDetails object itself. - */ - public OnlineDeploymentDetails withPrivateNetworkConnection(Boolean privateNetworkConnection) { - this.privateNetworkConnection = privateNetworkConnection; - return this; - } - /** * Get the provisioningState property: Provisioning state for the endpoint deployment. * @@ -266,9 +207,9 @@ public ProbeSettings readinessProbe() { * properties and defaults are the same as liveness probe. * * @param readinessProbe the readinessProbe value to set. - * @return the OnlineDeploymentDetails object itself. + * @return the OnlineDeploymentProperties object itself. */ - public OnlineDeploymentDetails withReadinessProbe(ProbeSettings readinessProbe) { + public OnlineDeploymentProperties withReadinessProbe(ProbeSettings readinessProbe) { this.readinessProbe = readinessProbe; return this; } @@ -286,9 +227,9 @@ public OnlineRequestSettings requestSettings() { * Set the requestSettings property: Request settings for the deployment. * * @param requestSettings the requestSettings value to set. - * @return the OnlineDeploymentDetails object itself. + * @return the OnlineDeploymentProperties object itself. */ - public OnlineDeploymentDetails withRequestSettings(OnlineRequestSettings requestSettings) { + public OnlineDeploymentProperties withRequestSettings(OnlineRequestSettings requestSettings) { this.requestSettings = requestSettings; return this; } @@ -310,44 +251,44 @@ public OnlineScaleSettings scaleSettings() { * ManagedOnlineDeployment. * * @param scaleSettings the scaleSettings value to set. - * @return the OnlineDeploymentDetails object itself. + * @return the OnlineDeploymentProperties object itself. */ - public OnlineDeploymentDetails withScaleSettings(OnlineScaleSettings scaleSettings) { + public OnlineDeploymentProperties withScaleSettings(OnlineScaleSettings scaleSettings) { this.scaleSettings = scaleSettings; return this; } /** {@inheritDoc} */ @Override - public OnlineDeploymentDetails withCodeConfiguration(CodeConfiguration codeConfiguration) { + public OnlineDeploymentProperties withCodeConfiguration(CodeConfiguration codeConfiguration) { super.withCodeConfiguration(codeConfiguration); return this; } /** {@inheritDoc} */ @Override - public OnlineDeploymentDetails withDescription(String description) { + public OnlineDeploymentProperties withDescription(String description) { super.withDescription(description); return this; } /** {@inheritDoc} */ @Override - public OnlineDeploymentDetails withEnvironmentId(String environmentId) { + public OnlineDeploymentProperties withEnvironmentId(String environmentId) { super.withEnvironmentId(environmentId); return this; } /** {@inheritDoc} */ @Override - public OnlineDeploymentDetails withEnvironmentVariables(Map environmentVariables) { + public OnlineDeploymentProperties withEnvironmentVariables(Map environmentVariables) { super.withEnvironmentVariables(environmentVariables); return this; } /** {@inheritDoc} */ @Override - public OnlineDeploymentDetails withProperties(Map properties) { + public OnlineDeploymentProperties withProperties(Map properties) { super.withProperties(properties); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeploymentTrackedResourceArmPaginatedResult.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeploymentTrackedResourceArmPaginatedResult.java index 7f21e01700a7..bbddeef81a3f 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeploymentTrackedResourceArmPaginatedResult.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeploymentTrackedResourceArmPaginatedResult.java @@ -5,7 +5,7 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.fluent.models.OnlineDeploymentDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.OnlineDeploymentInner; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -23,7 +23,7 @@ public final class OnlineDeploymentTrackedResourceArmPaginatedResult { * An array of objects of type OnlineDeployment. */ @JsonProperty(value = "value") - private List value; + private List value; /** * Get the nextLink property: The link to the next page of OnlineDeployment objects. If null, there are no @@ -52,7 +52,7 @@ public OnlineDeploymentTrackedResourceArmPaginatedResult withNextLink(String nex * * @return the value value. */ - public List value() { + public List value() { return this.value; } @@ -62,7 +62,7 @@ public List value() { * @param value the value value to set. * @return the OnlineDeploymentTrackedResourceArmPaginatedResult object itself. */ - public OnlineDeploymentTrackedResourceArmPaginatedResult withValue(List value) { + public OnlineDeploymentTrackedResourceArmPaginatedResult withValue(List value) { this.value = value; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeployments.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeployments.java index 375af4784d66..aa430cec1592 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeployments.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineDeployments.java @@ -21,7 +21,7 @@ public interface OnlineDeployments { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of OnlineDeployment entities as paginated response with {@link PagedIterable}. */ - PagedIterable list(String resourceGroupName, String workspaceName, String endpointName); + PagedIterable list(String resourceGroupName, String workspaceName, String endpointName); /** * List Inference Endpoint Deployments. @@ -38,7 +38,7 @@ public interface OnlineDeployments { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of OnlineDeployment entities as paginated response with {@link PagedIterable}. */ - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String endpointName, @@ -87,8 +87,7 @@ void delete( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return inference Deployment Deployment. */ - OnlineDeploymentData get( - String resourceGroupName, String workspaceName, String endpointName, String deploymentName); + OnlineDeployment get(String resourceGroupName, String workspaceName, String endpointName, String deploymentName); /** * Get Inference Deployment Deployment. @@ -103,7 +102,7 @@ OnlineDeploymentData get( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return inference Deployment Deployment along with {@link Response}. */ - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String endpointName, String deploymentName, Context context); /** @@ -196,7 +195,7 @@ PagedIterable listSkus( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return inference Deployment Deployment along with {@link Response}. */ - OnlineDeploymentData getById(String id); + OnlineDeployment getById(String id); /** * Get Inference Deployment Deployment. @@ -208,7 +207,7 @@ PagedIterable listSkus( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return inference Deployment Deployment along with {@link Response}. */ - Response getByIdWithResponse(String id, Context context); + Response getByIdWithResponse(String id, Context context); /** * Delete Inference Endpoint Deployment (asynchronous). @@ -232,10 +231,10 @@ PagedIterable listSkus( void deleteByIdWithResponse(String id, Context context); /** - * Begins definition for a new OnlineDeploymentData resource. + * Begins definition for a new OnlineDeployment resource. * * @param name resource name. - * @return the first stage of the new OnlineDeploymentData definition. + * @return the first stage of the new OnlineDeployment definition. */ - OnlineDeploymentData.DefinitionStages.Blank define(String name); + OnlineDeployment.DefinitionStages.Blank define(String name); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpointData.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpoint.java similarity index 76% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpointData.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpoint.java index 5cb8231f3265..b109d3d534c8 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpointData.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpoint.java @@ -8,11 +8,11 @@ import com.azure.core.management.Region; import com.azure.core.management.SystemData; import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.OnlineEndpointDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.OnlineEndpointInner; import java.util.Map; -/** An immutable client-side representation of OnlineEndpointData. */ -public interface OnlineEndpointData { +/** An immutable client-side representation of OnlineEndpoint. */ +public interface OnlineEndpoint { /** * Gets the id property: Fully qualified resource Id for the resource. * @@ -68,7 +68,7 @@ public interface OnlineEndpointData { * * @return the properties value. */ - OnlineEndpointDetails properties(); + OnlineEndpointProperties properties(); /** * Gets the sku property: Sku details required for ARM contract for Autoscaling. @@ -106,13 +106,13 @@ public interface OnlineEndpointData { String resourceGroupName(); /** - * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.OnlineEndpointDataInner object. + * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.OnlineEndpointInner object. * * @return the inner object. */ - OnlineEndpointDataInner innerModel(); + OnlineEndpointInner innerModel(); - /** The entirety of the OnlineEndpointData definition. */ + /** The entirety of the OnlineEndpoint definition. */ interface Definition extends DefinitionStages.Blank, DefinitionStages.WithLocation, @@ -120,12 +120,12 @@ interface Definition DefinitionStages.WithProperties, DefinitionStages.WithCreate { } - /** The OnlineEndpointData definition stages. */ + /** The OnlineEndpoint definition stages. */ interface DefinitionStages { - /** The first stage of the OnlineEndpointData definition. */ + /** The first stage of the OnlineEndpoint definition. */ interface Blank extends WithLocation { } - /** The stage of the OnlineEndpointData definition allowing to specify location. */ + /** The stage of the OnlineEndpoint definition allowing to specify location. */ interface WithLocation { /** * Specifies the region for the resource. @@ -143,7 +143,7 @@ interface WithLocation { */ WithParentResource withRegion(String location); } - /** The stage of the OnlineEndpointData definition allowing to specify parent resource. */ + /** The stage of the OnlineEndpoint definition allowing to specify parent resource. */ interface WithParentResource { /** * Specifies resourceGroupName, workspaceName. @@ -154,7 +154,7 @@ interface WithParentResource { */ WithProperties withExistingWorkspace(String resourceGroupName, String workspaceName); } - /** The stage of the OnlineEndpointData definition allowing to specify properties. */ + /** The stage of the OnlineEndpoint definition allowing to specify properties. */ interface WithProperties { /** * Specifies the properties property: [Required] Additional attributes of the entity.. @@ -162,10 +162,10 @@ interface WithProperties { * @param properties [Required] Additional attributes of the entity. * @return the next definition stage. */ - WithCreate withProperties(OnlineEndpointDetails properties); + WithCreate withProperties(OnlineEndpointProperties properties); } /** - * The stage of the OnlineEndpointData definition which contains all the minimum required properties for the + * The stage of the OnlineEndpoint definition which contains all the minimum required properties for the * resource to be created, but also allows for any other optional properties to be specified. */ interface WithCreate @@ -178,7 +178,7 @@ interface WithCreate * * @return the created resource. */ - OnlineEndpointData create(); + OnlineEndpoint create(); /** * Executes the create request. @@ -186,9 +186,9 @@ interface WithCreate * @param context The context to associate with this operation. * @return the created resource. */ - OnlineEndpointData create(Context context); + OnlineEndpoint create(Context context); } - /** The stage of the OnlineEndpointData definition allowing to specify tags. */ + /** The stage of the OnlineEndpoint definition allowing to specify tags. */ interface WithTags { /** * Specifies the tags property: Resource tags.. @@ -198,7 +198,7 @@ interface WithTags { */ WithCreate withTags(Map tags); } - /** The stage of the OnlineEndpointData definition allowing to specify identity. */ + /** The stage of the OnlineEndpoint definition allowing to specify identity. */ interface WithIdentity { /** * Specifies the identity property: Managed service identity (system assigned and/or user assigned @@ -209,7 +209,7 @@ interface WithIdentity { */ WithCreate withIdentity(ManagedServiceIdentity identity); } - /** The stage of the OnlineEndpointData definition allowing to specify kind. */ + /** The stage of the OnlineEndpoint definition allowing to specify kind. */ interface WithKind { /** * Specifies the kind property: Metadata used by portal/tooling/etc to render different UX experiences for @@ -221,7 +221,7 @@ interface WithKind { */ WithCreate withKind(String kind); } - /** The stage of the OnlineEndpointData definition allowing to specify sku. */ + /** The stage of the OnlineEndpoint definition allowing to specify sku. */ interface WithSku { /** * Specifies the sku property: Sku details required for ARM contract for Autoscaling.. @@ -233,25 +233,20 @@ interface WithSku { } } /** - * Begins update for the OnlineEndpointData resource. + * Begins update for the OnlineEndpoint resource. * * @return the stage of resource update. */ - OnlineEndpointData.Update update(); + OnlineEndpoint.Update update(); - /** The template for OnlineEndpointData update. */ - interface Update - extends UpdateStages.WithTags, - UpdateStages.WithIdentity, - UpdateStages.WithKind, - UpdateStages.WithProperties, - UpdateStages.WithSku { + /** The template for OnlineEndpoint update. */ + interface Update extends UpdateStages.WithTags, UpdateStages.WithIdentity { /** * Executes the update request. * * @return the updated resource. */ - OnlineEndpointData apply(); + OnlineEndpoint apply(); /** * Executes the update request. @@ -259,11 +254,11 @@ interface Update * @param context The context to associate with this operation. * @return the updated resource. */ - OnlineEndpointData apply(Context context); + OnlineEndpoint apply(Context context); } - /** The OnlineEndpointData update stages. */ + /** The OnlineEndpoint update stages. */ interface UpdateStages { - /** The stage of the OnlineEndpointData update allowing to specify tags. */ + /** The stage of the OnlineEndpoint update allowing to specify tags. */ interface WithTags { /** * Specifies the tags property: Resource tags.. @@ -273,7 +268,7 @@ interface WithTags { */ Update withTags(Map tags); } - /** The stage of the OnlineEndpointData update allowing to specify identity. */ + /** The stage of the OnlineEndpoint update allowing to specify identity. */ interface WithIdentity { /** * Specifies the identity property: Managed service identity (system assigned and/or user assigned @@ -284,45 +279,13 @@ interface WithIdentity { */ Update withIdentity(PartialManagedServiceIdentity identity); } - /** The stage of the OnlineEndpointData update allowing to specify kind. */ - interface WithKind { - /** - * Specifies the kind property: Metadata used by portal/tooling/etc to render different UX experiences for - * resources of the same type.. - * - * @param kind Metadata used by portal/tooling/etc to render different UX experiences for resources of the - * same type. - * @return the next definition stage. - */ - Update withKind(String kind); - } - /** The stage of the OnlineEndpointData update allowing to specify properties. */ - interface WithProperties { - /** - * Specifies the properties property: Additional attributes of the entity.. - * - * @param properties Additional attributes of the entity. - * @return the next definition stage. - */ - Update withProperties(PartialOnlineEndpoint properties); - } - /** The stage of the OnlineEndpointData update allowing to specify sku. */ - interface WithSku { - /** - * Specifies the sku property: Sku details required for ARM contract for Autoscaling.. - * - * @param sku Sku details required for ARM contract for Autoscaling. - * @return the next definition stage. - */ - Update withSku(PartialSku sku); - } } /** * Refreshes the resource to sync with Azure. * * @return the refreshed resource. */ - OnlineEndpointData refresh(); + OnlineEndpoint refresh(); /** * Refreshes the resource to sync with Azure. @@ -330,7 +293,7 @@ interface WithSku { * @param context The context to associate with this operation. * @return the refreshed resource. */ - OnlineEndpointData refresh(Context context); + OnlineEndpoint refresh(Context context); /** * List EndpointAuthKeys for an Endpoint using Key-based authentication. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpointDetails.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpointProperties.java similarity index 52% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpointDetails.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpointProperties.java index 0a1fe192ca99..b5dc7befec98 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpointDetails.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpointProperties.java @@ -13,7 +13,7 @@ /** Online endpoint configuration. */ @Fluent -public final class OnlineEndpointDetails extends EndpointPropertiesBaseInner { +public final class OnlineEndpointProperties extends EndpointPropertiesBaseInner { /* * ARM resource ID of the compute if it exists. * optional @@ -21,27 +21,12 @@ public final class OnlineEndpointDetails extends EndpointPropertiesBaseInner { @JsonProperty(value = "compute") private String compute; - /* - * Percentage of traffic to be mirrored to each deployment without using - * returned scoring. Traffic values need to sum to utmost 50. - */ - @JsonProperty(value = "mirrorTraffic") - @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) - private Map mirrorTraffic; - /* * Provisioning state for the endpoint. */ @JsonProperty(value = "provisioningState", access = JsonProperty.Access.WRITE_ONLY) private EndpointProvisioningState provisioningState; - /* - * Set to "Enabled" for endpoints that should allow public access when - * Private Link is enabled. - */ - @JsonProperty(value = "publicNetworkAccess") - private PublicNetworkAccessType publicNetworkAccess; - /* * Percentage of traffic from endpoint to divert to each deployment. * Traffic values need to sum to 100. @@ -63,35 +48,13 @@ public String compute() { * Set the compute property: ARM resource ID of the compute if it exists. optional. * * @param compute the compute value to set. - * @return the OnlineEndpointDetails object itself. + * @return the OnlineEndpointProperties object itself. */ - public OnlineEndpointDetails withCompute(String compute) { + public OnlineEndpointProperties withCompute(String compute) { this.compute = compute; return this; } - /** - * Get the mirrorTraffic property: Percentage of traffic to be mirrored to each deployment without using returned - * scoring. Traffic values need to sum to utmost 50. - * - * @return the mirrorTraffic value. - */ - public Map mirrorTraffic() { - return this.mirrorTraffic; - } - - /** - * Set the mirrorTraffic property: Percentage of traffic to be mirrored to each deployment without using returned - * scoring. Traffic values need to sum to utmost 50. - * - * @param mirrorTraffic the mirrorTraffic value to set. - * @return the OnlineEndpointDetails object itself. - */ - public OnlineEndpointDetails withMirrorTraffic(Map mirrorTraffic) { - this.mirrorTraffic = mirrorTraffic; - return this; - } - /** * Get the provisioningState property: Provisioning state for the endpoint. * @@ -101,28 +64,6 @@ public EndpointProvisioningState provisioningState() { return this.provisioningState; } - /** - * Get the publicNetworkAccess property: Set to "Enabled" for endpoints that should allow public access when Private - * Link is enabled. - * - * @return the publicNetworkAccess value. - */ - public PublicNetworkAccessType publicNetworkAccess() { - return this.publicNetworkAccess; - } - - /** - * Set the publicNetworkAccess property: Set to "Enabled" for endpoints that should allow public access when Private - * Link is enabled. - * - * @param publicNetworkAccess the publicNetworkAccess value to set. - * @return the OnlineEndpointDetails object itself. - */ - public OnlineEndpointDetails withPublicNetworkAccess(PublicNetworkAccessType publicNetworkAccess) { - this.publicNetworkAccess = publicNetworkAccess; - return this; - } - /** * Get the traffic property: Percentage of traffic from endpoint to divert to each deployment. Traffic values need * to sum to 100. @@ -138,37 +79,37 @@ public Map traffic() { * to sum to 100. * * @param traffic the traffic value to set. - * @return the OnlineEndpointDetails object itself. + * @return the OnlineEndpointProperties object itself. */ - public OnlineEndpointDetails withTraffic(Map traffic) { + public OnlineEndpointProperties withTraffic(Map traffic) { this.traffic = traffic; return this; } /** {@inheritDoc} */ @Override - public OnlineEndpointDetails withAuthMode(EndpointAuthMode authMode) { + public OnlineEndpointProperties withAuthMode(EndpointAuthMode authMode) { super.withAuthMode(authMode); return this; } /** {@inheritDoc} */ @Override - public OnlineEndpointDetails withDescription(String description) { + public OnlineEndpointProperties withDescription(String description) { super.withDescription(description); return this; } /** {@inheritDoc} */ @Override - public OnlineEndpointDetails withKeys(EndpointAuthKeysInner keys) { + public OnlineEndpointProperties withKeys(EndpointAuthKeysInner keys) { super.withKeys(keys); return this; } /** {@inheritDoc} */ @Override - public OnlineEndpointDetails withProperties(Map properties) { + public OnlineEndpointProperties withProperties(Map properties) { super.withProperties(properties); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpointTrackedResourceArmPaginatedResult.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpointTrackedResourceArmPaginatedResult.java index 25853197fcef..3989e5453c7d 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpointTrackedResourceArmPaginatedResult.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpointTrackedResourceArmPaginatedResult.java @@ -5,7 +5,7 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.fluent.models.OnlineEndpointDataInner; +import com.azure.resourcemanager.machinelearning.fluent.models.OnlineEndpointInner; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -23,7 +23,7 @@ public final class OnlineEndpointTrackedResourceArmPaginatedResult { * An array of objects of type OnlineEndpoint. */ @JsonProperty(value = "value") - private List value; + private List value; /** * Get the nextLink property: The link to the next page of OnlineEndpoint objects. If null, there are no additional @@ -52,7 +52,7 @@ public OnlineEndpointTrackedResourceArmPaginatedResult withNextLink(String nextL * * @return the value value. */ - public List value() { + public List value() { return this.value; } @@ -62,7 +62,7 @@ public List value() { * @param value the value value to set. * @return the OnlineEndpointTrackedResourceArmPaginatedResult object itself. */ - public OnlineEndpointTrackedResourceArmPaginatedResult withValue(List value) { + public OnlineEndpointTrackedResourceArmPaginatedResult withValue(List value) { this.value = value; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpoints.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpoints.java index 0ee0b7d4d564..2e3cebaf1fb0 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpoints.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/OnlineEndpoints.java @@ -20,7 +20,7 @@ public interface OnlineEndpoints { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of OnlineEndpoint entities as paginated response with {@link PagedIterable}. */ - PagedIterable list(String resourceGroupName, String workspaceName); + PagedIterable list(String resourceGroupName, String workspaceName); /** * List Online Endpoints. @@ -42,7 +42,7 @@ public interface OnlineEndpoints { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return a paginated list of OnlineEndpoint entities as paginated response with {@link PagedIterable}. */ - PagedIterable list( + PagedIterable list( String resourceGroupName, String workspaceName, String name, @@ -90,7 +90,7 @@ PagedIterable list( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return online Endpoint. */ - OnlineEndpointData get(String resourceGroupName, String workspaceName, String endpointName); + OnlineEndpoint get(String resourceGroupName, String workspaceName, String endpointName); /** * Get Online Endpoint. @@ -104,7 +104,7 @@ PagedIterable list( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return online Endpoint along with {@link Response}. */ - Response getWithResponse( + Response getWithResponse( String resourceGroupName, String workspaceName, String endpointName, Context context); /** @@ -205,7 +205,7 @@ Response getTokenWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return online Endpoint along with {@link Response}. */ - OnlineEndpointData getById(String id); + OnlineEndpoint getById(String id); /** * Get Online Endpoint. @@ -217,7 +217,7 @@ Response getTokenWithResponse( * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return online Endpoint along with {@link Response}. */ - Response getByIdWithResponse(String id, Context context); + Response getByIdWithResponse(String id, Context context); /** * Delete Online Endpoint (asynchronous). @@ -241,10 +241,10 @@ Response getTokenWithResponse( void deleteByIdWithResponse(String id, Context context); /** - * Begins definition for a new OnlineEndpointData resource. + * Begins definition for a new OnlineEndpoint resource. * * @param name resource name. - * @return the first stage of the new OnlineEndpointData definition. + * @return the first stage of the new OnlineEndpoint definition. */ - OnlineEndpointData.DefinitionStages.Blank define(String name); + OnlineEndpoint.DefinitionStages.Blank define(String name); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PaginatedWorkspaceConnectionsList.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PaginatedWorkspaceConnectionsList.java deleted file mode 100644 index 91bcd2c2cfd8..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PaginatedWorkspaceConnectionsList.java +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.fluent.models.WorkspaceConnectionInner; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - -/** Paginated list of Workspace connection objects. */ -@Fluent -public final class PaginatedWorkspaceConnectionsList { - /* - * An array of Workspace connection objects. - */ - @JsonProperty(value = "value") - private List value; - - /* - * A continuation link (absolute URI) to the next page of results in the - * list. - */ - @JsonProperty(value = "nextLink") - private String nextLink; - - /** - * Get the value property: An array of Workspace connection objects. - * - * @return the value value. - */ - public List value() { - return this.value; - } - - /** - * Set the value property: An array of Workspace connection objects. - * - * @param value the value value to set. - * @return the PaginatedWorkspaceConnectionsList object itself. - */ - public PaginatedWorkspaceConnectionsList withValue(List value) { - this.value = value; - return this; - } - - /** - * Get the nextLink property: A continuation link (absolute URI) to the next page of results in the list. - * - * @return the nextLink value. - */ - public String nextLink() { - return this.nextLink; - } - - /** - * Set the nextLink property: A continuation link (absolute URI) to the next page of results in the list. - * - * @param nextLink the nextLink value to set. - * @return the PaginatedWorkspaceConnectionsList object itself. - */ - public PaginatedWorkspaceConnectionsList withNextLink(String nextLink) { - this.nextLink = nextLink; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (value() != null) { - value().forEach(e -> e.validate()); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialAssetReferenceBase.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialAssetReferenceBase.java deleted file mode 100644 index 030c087c98c9..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialAssetReferenceBase.java +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Immutable; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** Base definition for asset references. */ -@JsonTypeInfo( - use = JsonTypeInfo.Id.NAME, - include = JsonTypeInfo.As.PROPERTY, - property = "referenceType", - defaultImpl = PartialAssetReferenceBase.class) -@JsonTypeName("PartialAssetReferenceBase") -@JsonSubTypes({ - @JsonSubTypes.Type(name = "DataPath", value = PartialDataPathAssetReference.class), - @JsonSubTypes.Type(name = "Id", value = PartialIdAssetReference.class), - @JsonSubTypes.Type(name = "OutputPath", value = PartialOutputPathAssetReference.class) -}) -@Immutable -public class PartialAssetReferenceBase { - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchDeployment.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchDeployment.java index 7f3588eac7d4..dfe6076253e1 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchDeployment.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchDeployment.java @@ -5,150 +5,17 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.Map; /** Mutable batch inference settings per deployment. */ @Fluent public final class PartialBatchDeployment { - /* - * Code configuration for the endpoint deployment. - */ - @JsonProperty(value = "codeConfiguration") - private PartialCodeConfiguration codeConfiguration; - - /* - * Compute binding definition. - */ - @JsonProperty(value = "compute") - private String compute; - /* * Description of the endpoint deployment. */ @JsonProperty(value = "description") private String description; - /* - * ARM resource ID of the environment specification for the endpoint - * deployment. - */ - @JsonProperty(value = "environmentId") - private String environmentId; - - /* - * Environment variables configuration for the deployment. - */ - @JsonProperty(value = "environmentVariables") - @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) - private Map environmentVariables; - - /* - * Error threshold, if the error count for the entire input goes above this - * value, - * the batch inference will be aborted. Range is [-1, int.MaxValue]. - * For FileDataset, this value is the count of file failures. - * For TabularDataset, this value is the count of record failures. - * If set to -1 (the lower bound), all failures during batch inference will - * be ignored. - */ - @JsonProperty(value = "errorThreshold") - private Integer errorThreshold; - - /* - * Logging level for batch inference operation. - */ - @JsonProperty(value = "loggingLevel") - private BatchLoggingLevel loggingLevel; - - /* - * Indicates number of processes per instance - */ - @JsonProperty(value = "maxConcurrencyPerInstance") - private Integer maxConcurrencyPerInstance; - - /* - * Size of the mini-batch passed to each batch invocation. - * For FileDataset, this is the number of files per mini-batch. - * For TabularDataset, this is the size of the records in bytes, per - * mini-batch. - */ - @JsonProperty(value = "miniBatchSize") - private Long miniBatchSize; - - /* - * Reference to the model asset for the endpoint deployment. - */ - @JsonProperty(value = "model") - private PartialAssetReferenceBase model; - - /* - * Indicates how the output will be organized. - */ - @JsonProperty(value = "outputAction") - private BatchOutputAction outputAction; - - /* - * Customized output file name for append_row output action. - */ - @JsonProperty(value = "outputFileName") - private String outputFileName; - - /* - * Property dictionary. Properties can be added, but not removed or - * altered. - */ - @JsonProperty(value = "properties") - @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) - private Map properties; - - /* - * Retry Settings for the batch inference operation. - */ - @JsonProperty(value = "retrySettings") - private PartialBatchRetrySettings retrySettings; - - /** - * Get the codeConfiguration property: Code configuration for the endpoint deployment. - * - * @return the codeConfiguration value. - */ - public PartialCodeConfiguration codeConfiguration() { - return this.codeConfiguration; - } - - /** - * Set the codeConfiguration property: Code configuration for the endpoint deployment. - * - * @param codeConfiguration the codeConfiguration value to set. - * @return the PartialBatchDeployment object itself. - */ - public PartialBatchDeployment withCodeConfiguration(PartialCodeConfiguration codeConfiguration) { - this.codeConfiguration = codeConfiguration; - return this; - } - - /** - * Get the compute property: Compute binding definition. - * - * @return the compute value. - */ - public String compute() { - return this.compute; - } - - /** - * Set the compute property: Compute binding definition. - * - * @param compute the compute value to set. - * @return the PartialBatchDeployment object itself. - */ - public PartialBatchDeployment withCompute(String compute) { - this.compute = compute; - return this; - } - /** * Get the description property: Description of the endpoint deployment. * @@ -169,248 +36,11 @@ public PartialBatchDeployment withDescription(String description) { return this; } - /** - * Get the environmentId property: ARM resource ID of the environment specification for the endpoint deployment. - * - * @return the environmentId value. - */ - public String environmentId() { - return this.environmentId; - } - - /** - * Set the environmentId property: ARM resource ID of the environment specification for the endpoint deployment. - * - * @param environmentId the environmentId value to set. - * @return the PartialBatchDeployment object itself. - */ - public PartialBatchDeployment withEnvironmentId(String environmentId) { - this.environmentId = environmentId; - return this; - } - - /** - * Get the environmentVariables property: Environment variables configuration for the deployment. - * - * @return the environmentVariables value. - */ - public Map environmentVariables() { - return this.environmentVariables; - } - - /** - * Set the environmentVariables property: Environment variables configuration for the deployment. - * - * @param environmentVariables the environmentVariables value to set. - * @return the PartialBatchDeployment object itself. - */ - public PartialBatchDeployment withEnvironmentVariables(Map environmentVariables) { - this.environmentVariables = environmentVariables; - return this; - } - - /** - * Get the errorThreshold property: Error threshold, if the error count for the entire input goes above this value, - * the batch inference will be aborted. Range is [-1, int.MaxValue]. For FileDataset, this value is the count of - * file failures. For TabularDataset, this value is the count of record failures. If set to -1 (the lower bound), - * all failures during batch inference will be ignored. - * - * @return the errorThreshold value. - */ - public Integer errorThreshold() { - return this.errorThreshold; - } - - /** - * Set the errorThreshold property: Error threshold, if the error count for the entire input goes above this value, - * the batch inference will be aborted. Range is [-1, int.MaxValue]. For FileDataset, this value is the count of - * file failures. For TabularDataset, this value is the count of record failures. If set to -1 (the lower bound), - * all failures during batch inference will be ignored. - * - * @param errorThreshold the errorThreshold value to set. - * @return the PartialBatchDeployment object itself. - */ - public PartialBatchDeployment withErrorThreshold(Integer errorThreshold) { - this.errorThreshold = errorThreshold; - return this; - } - - /** - * Get the loggingLevel property: Logging level for batch inference operation. - * - * @return the loggingLevel value. - */ - public BatchLoggingLevel loggingLevel() { - return this.loggingLevel; - } - - /** - * Set the loggingLevel property: Logging level for batch inference operation. - * - * @param loggingLevel the loggingLevel value to set. - * @return the PartialBatchDeployment object itself. - */ - public PartialBatchDeployment withLoggingLevel(BatchLoggingLevel loggingLevel) { - this.loggingLevel = loggingLevel; - return this; - } - - /** - * Get the maxConcurrencyPerInstance property: Indicates number of processes per instance. - * - * @return the maxConcurrencyPerInstance value. - */ - public Integer maxConcurrencyPerInstance() { - return this.maxConcurrencyPerInstance; - } - - /** - * Set the maxConcurrencyPerInstance property: Indicates number of processes per instance. - * - * @param maxConcurrencyPerInstance the maxConcurrencyPerInstance value to set. - * @return the PartialBatchDeployment object itself. - */ - public PartialBatchDeployment withMaxConcurrencyPerInstance(Integer maxConcurrencyPerInstance) { - this.maxConcurrencyPerInstance = maxConcurrencyPerInstance; - return this; - } - - /** - * Get the miniBatchSize property: Size of the mini-batch passed to each batch invocation. For FileDataset, this is - * the number of files per mini-batch. For TabularDataset, this is the size of the records in bytes, per mini-batch. - * - * @return the miniBatchSize value. - */ - public Long miniBatchSize() { - return this.miniBatchSize; - } - - /** - * Set the miniBatchSize property: Size of the mini-batch passed to each batch invocation. For FileDataset, this is - * the number of files per mini-batch. For TabularDataset, this is the size of the records in bytes, per mini-batch. - * - * @param miniBatchSize the miniBatchSize value to set. - * @return the PartialBatchDeployment object itself. - */ - public PartialBatchDeployment withMiniBatchSize(Long miniBatchSize) { - this.miniBatchSize = miniBatchSize; - return this; - } - - /** - * Get the model property: Reference to the model asset for the endpoint deployment. - * - * @return the model value. - */ - public PartialAssetReferenceBase model() { - return this.model; - } - - /** - * Set the model property: Reference to the model asset for the endpoint deployment. - * - * @param model the model value to set. - * @return the PartialBatchDeployment object itself. - */ - public PartialBatchDeployment withModel(PartialAssetReferenceBase model) { - this.model = model; - return this; - } - - /** - * Get the outputAction property: Indicates how the output will be organized. - * - * @return the outputAction value. - */ - public BatchOutputAction outputAction() { - return this.outputAction; - } - - /** - * Set the outputAction property: Indicates how the output will be organized. - * - * @param outputAction the outputAction value to set. - * @return the PartialBatchDeployment object itself. - */ - public PartialBatchDeployment withOutputAction(BatchOutputAction outputAction) { - this.outputAction = outputAction; - return this; - } - - /** - * Get the outputFileName property: Customized output file name for append_row output action. - * - * @return the outputFileName value. - */ - public String outputFileName() { - return this.outputFileName; - } - - /** - * Set the outputFileName property: Customized output file name for append_row output action. - * - * @param outputFileName the outputFileName value to set. - * @return the PartialBatchDeployment object itself. - */ - public PartialBatchDeployment withOutputFileName(String outputFileName) { - this.outputFileName = outputFileName; - return this; - } - - /** - * Get the properties property: Property dictionary. Properties can be added, but not removed or altered. - * - * @return the properties value. - */ - public Map properties() { - return this.properties; - } - - /** - * Set the properties property: Property dictionary. Properties can be added, but not removed or altered. - * - * @param properties the properties value to set. - * @return the PartialBatchDeployment object itself. - */ - public PartialBatchDeployment withProperties(Map properties) { - this.properties = properties; - return this; - } - - /** - * Get the retrySettings property: Retry Settings for the batch inference operation. - * - * @return the retrySettings value. - */ - public PartialBatchRetrySettings retrySettings() { - return this.retrySettings; - } - - /** - * Set the retrySettings property: Retry Settings for the batch inference operation. - * - * @param retrySettings the retrySettings value to set. - * @return the PartialBatchDeployment object itself. - */ - public PartialBatchDeployment withRetrySettings(PartialBatchRetrySettings retrySettings) { - this.retrySettings = retrySettings; - return this; - } - /** * Validates the instance. * * @throws IllegalArgumentException thrown if the instance is not valid. */ public void validate() { - if (codeConfiguration() != null) { - codeConfiguration().validate(); - } - if (model() != null) { - model().validate(); - } - if (retrySettings() != null) { - retrySettings().validate(); - } } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties.java new file mode 100644 index 000000000000..ad45c0752690 --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties.java @@ -0,0 +1,79 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.models; + +import com.azure.core.annotation.Fluent; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.Map; + +/** Strictly used in update requests. */ +@Fluent +public final class PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties { + /* + * Additional attributes of the entity. + */ + @JsonProperty(value = "properties") + private PartialBatchDeployment properties; + + /* + * Resource tags. + */ + @JsonProperty(value = "tags") + @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) + private Map tags; + + /** + * Get the properties property: Additional attributes of the entity. + * + * @return the properties value. + */ + public PartialBatchDeployment properties() { + return this.properties; + } + + /** + * Set the properties property: Additional attributes of the entity. + * + * @param properties the properties value to set. + * @return the PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties object itself. + */ + public PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties withProperties( + PartialBatchDeployment properties) { + this.properties = properties; + return this; + } + + /** + * Get the tags property: Resource tags. + * + * @return the tags value. + */ + public Map tags() { + return this.tags; + } + + /** + * Set the tags property: Resource tags. + * + * @param tags the tags value to set. + * @return the PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties object itself. + */ + public PartialBatchDeploymentPartialMinimalTrackedResourceWithProperties withTags(Map tags) { + this.tags = tags; + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + public void validate() { + if (properties() != null) { + properties().validate(); + } + } +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchDeploymentPartialTrackedResource.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchDeploymentPartialTrackedResource.java deleted file mode 100644 index 3dfbe96a2c64..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchDeploymentPartialTrackedResource.java +++ /dev/null @@ -1,192 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.Map; - -/** Strictly used in update requests. */ -@Fluent -public final class PartialBatchDeploymentPartialTrackedResource { - /* - * Managed service identity (system assigned and/or user assigned - * identities) - */ - @JsonProperty(value = "identity") - private PartialManagedServiceIdentity identity; - - /* - * Metadata used by portal/tooling/etc to render different UX experiences - * for resources of the same type. - */ - @JsonProperty(value = "kind") - private String kind; - - /* - * The geo-location where the resource lives. - */ - @JsonProperty(value = "location") - private String location; - - /* - * Additional attributes of the entity. - */ - @JsonProperty(value = "properties") - private PartialBatchDeployment properties; - - /* - * Sku details required for ARM contract for Autoscaling. - */ - @JsonProperty(value = "sku") - private PartialSku sku; - - /* - * Resource tags. - */ - @JsonProperty(value = "tags") - @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) - private Map tags; - - /** - * Get the identity property: Managed service identity (system assigned and/or user assigned identities). - * - * @return the identity value. - */ - public PartialManagedServiceIdentity identity() { - return this.identity; - } - - /** - * Set the identity property: Managed service identity (system assigned and/or user assigned identities). - * - * @param identity the identity value to set. - * @return the PartialBatchDeploymentPartialTrackedResource object itself. - */ - public PartialBatchDeploymentPartialTrackedResource withIdentity(PartialManagedServiceIdentity identity) { - this.identity = identity; - return this; - } - - /** - * Get the kind property: Metadata used by portal/tooling/etc to render different UX experiences for resources of - * the same type. - * - * @return the kind value. - */ - public String kind() { - return this.kind; - } - - /** - * Set the kind property: Metadata used by portal/tooling/etc to render different UX experiences for resources of - * the same type. - * - * @param kind the kind value to set. - * @return the PartialBatchDeploymentPartialTrackedResource object itself. - */ - public PartialBatchDeploymentPartialTrackedResource withKind(String kind) { - this.kind = kind; - return this; - } - - /** - * Get the location property: The geo-location where the resource lives. - * - * @return the location value. - */ - public String location() { - return this.location; - } - - /** - * Set the location property: The geo-location where the resource lives. - * - * @param location the location value to set. - * @return the PartialBatchDeploymentPartialTrackedResource object itself. - */ - public PartialBatchDeploymentPartialTrackedResource withLocation(String location) { - this.location = location; - return this; - } - - /** - * Get the properties property: Additional attributes of the entity. - * - * @return the properties value. - */ - public PartialBatchDeployment properties() { - return this.properties; - } - - /** - * Set the properties property: Additional attributes of the entity. - * - * @param properties the properties value to set. - * @return the PartialBatchDeploymentPartialTrackedResource object itself. - */ - public PartialBatchDeploymentPartialTrackedResource withProperties(PartialBatchDeployment properties) { - this.properties = properties; - return this; - } - - /** - * Get the sku property: Sku details required for ARM contract for Autoscaling. - * - * @return the sku value. - */ - public PartialSku sku() { - return this.sku; - } - - /** - * Set the sku property: Sku details required for ARM contract for Autoscaling. - * - * @param sku the sku value to set. - * @return the PartialBatchDeploymentPartialTrackedResource object itself. - */ - public PartialBatchDeploymentPartialTrackedResource withSku(PartialSku sku) { - this.sku = sku; - return this; - } - - /** - * Get the tags property: Resource tags. - * - * @return the tags value. - */ - public Map tags() { - return this.tags; - } - - /** - * Set the tags property: Resource tags. - * - * @param tags the tags value to set. - * @return the PartialBatchDeploymentPartialTrackedResource object itself. - */ - public PartialBatchDeploymentPartialTrackedResource withTags(Map tags) { - this.tags = tags; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (identity() != null) { - identity().validate(); - } - if (properties() != null) { - properties().validate(); - } - if (sku() != null) { - sku().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchEndpoint.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchEndpoint.java deleted file mode 100644 index 5fbe738f6cb2..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchEndpoint.java +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** Mutable Batch endpoint configuration. */ -@Fluent -public final class PartialBatchEndpoint { - /* - * Default values for Batch Endpoint - */ - @JsonProperty(value = "defaults") - private BatchEndpointDefaults defaults; - - /** - * Get the defaults property: Default values for Batch Endpoint. - * - * @return the defaults value. - */ - public BatchEndpointDefaults defaults() { - return this.defaults; - } - - /** - * Set the defaults property: Default values for Batch Endpoint. - * - * @param defaults the defaults value to set. - * @return the PartialBatchEndpoint object itself. - */ - public PartialBatchEndpoint withDefaults(BatchEndpointDefaults defaults) { - this.defaults = defaults; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (defaults() != null) { - defaults().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchEndpointPartialTrackedResource.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchEndpointPartialTrackedResource.java deleted file mode 100644 index be8529d9ae5b..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchEndpointPartialTrackedResource.java +++ /dev/null @@ -1,192 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.Map; - -/** Strictly used in update requests. */ -@Fluent -public final class PartialBatchEndpointPartialTrackedResource { - /* - * Managed service identity (system assigned and/or user assigned - * identities) - */ - @JsonProperty(value = "identity") - private PartialManagedServiceIdentity identity; - - /* - * Metadata used by portal/tooling/etc to render different UX experiences - * for resources of the same type. - */ - @JsonProperty(value = "kind") - private String kind; - - /* - * The geo-location where the resource lives. - */ - @JsonProperty(value = "location") - private String location; - - /* - * Additional attributes of the entity. - */ - @JsonProperty(value = "properties") - private PartialBatchEndpoint properties; - - /* - * Sku details required for ARM contract for Autoscaling. - */ - @JsonProperty(value = "sku") - private PartialSku sku; - - /* - * Resource tags. - */ - @JsonProperty(value = "tags") - @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) - private Map tags; - - /** - * Get the identity property: Managed service identity (system assigned and/or user assigned identities). - * - * @return the identity value. - */ - public PartialManagedServiceIdentity identity() { - return this.identity; - } - - /** - * Set the identity property: Managed service identity (system assigned and/or user assigned identities). - * - * @param identity the identity value to set. - * @return the PartialBatchEndpointPartialTrackedResource object itself. - */ - public PartialBatchEndpointPartialTrackedResource withIdentity(PartialManagedServiceIdentity identity) { - this.identity = identity; - return this; - } - - /** - * Get the kind property: Metadata used by portal/tooling/etc to render different UX experiences for resources of - * the same type. - * - * @return the kind value. - */ - public String kind() { - return this.kind; - } - - /** - * Set the kind property: Metadata used by portal/tooling/etc to render different UX experiences for resources of - * the same type. - * - * @param kind the kind value to set. - * @return the PartialBatchEndpointPartialTrackedResource object itself. - */ - public PartialBatchEndpointPartialTrackedResource withKind(String kind) { - this.kind = kind; - return this; - } - - /** - * Get the location property: The geo-location where the resource lives. - * - * @return the location value. - */ - public String location() { - return this.location; - } - - /** - * Set the location property: The geo-location where the resource lives. - * - * @param location the location value to set. - * @return the PartialBatchEndpointPartialTrackedResource object itself. - */ - public PartialBatchEndpointPartialTrackedResource withLocation(String location) { - this.location = location; - return this; - } - - /** - * Get the properties property: Additional attributes of the entity. - * - * @return the properties value. - */ - public PartialBatchEndpoint properties() { - return this.properties; - } - - /** - * Set the properties property: Additional attributes of the entity. - * - * @param properties the properties value to set. - * @return the PartialBatchEndpointPartialTrackedResource object itself. - */ - public PartialBatchEndpointPartialTrackedResource withProperties(PartialBatchEndpoint properties) { - this.properties = properties; - return this; - } - - /** - * Get the sku property: Sku details required for ARM contract for Autoscaling. - * - * @return the sku value. - */ - public PartialSku sku() { - return this.sku; - } - - /** - * Set the sku property: Sku details required for ARM contract for Autoscaling. - * - * @param sku the sku value to set. - * @return the PartialBatchEndpointPartialTrackedResource object itself. - */ - public PartialBatchEndpointPartialTrackedResource withSku(PartialSku sku) { - this.sku = sku; - return this; - } - - /** - * Get the tags property: Resource tags. - * - * @return the tags value. - */ - public Map tags() { - return this.tags; - } - - /** - * Set the tags property: Resource tags. - * - * @param tags the tags value to set. - * @return the PartialBatchEndpointPartialTrackedResource object itself. - */ - public PartialBatchEndpointPartialTrackedResource withTags(Map tags) { - this.tags = tags; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (identity() != null) { - identity().validate(); - } - if (properties() != null) { - properties().validate(); - } - if (sku() != null) { - sku().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchRetrySettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchRetrySettings.java deleted file mode 100644 index f61f00edfae6..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialBatchRetrySettings.java +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.time.Duration; - -/** Retry settings for a batch inference operation. */ -@Fluent -public final class PartialBatchRetrySettings { - /* - * Maximum retry count for a mini-batch - */ - @JsonProperty(value = "maxRetries") - private Integer maxRetries; - - /* - * Invocation timeout for a mini-batch, in ISO 8601 format. - */ - @JsonProperty(value = "timeout") - private Duration timeout; - - /** - * Get the maxRetries property: Maximum retry count for a mini-batch. - * - * @return the maxRetries value. - */ - public Integer maxRetries() { - return this.maxRetries; - } - - /** - * Set the maxRetries property: Maximum retry count for a mini-batch. - * - * @param maxRetries the maxRetries value to set. - * @return the PartialBatchRetrySettings object itself. - */ - public PartialBatchRetrySettings withMaxRetries(Integer maxRetries) { - this.maxRetries = maxRetries; - return this; - } - - /** - * Get the timeout property: Invocation timeout for a mini-batch, in ISO 8601 format. - * - * @return the timeout value. - */ - public Duration timeout() { - return this.timeout; - } - - /** - * Set the timeout property: Invocation timeout for a mini-batch, in ISO 8601 format. - * - * @param timeout the timeout value to set. - * @return the PartialBatchRetrySettings object itself. - */ - public PartialBatchRetrySettings withTimeout(Duration timeout) { - this.timeout = timeout; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialCodeConfiguration.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialCodeConfiguration.java deleted file mode 100644 index 26cc403e2ee0..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialCodeConfiguration.java +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** Configuration for a scoring code asset. */ -@Fluent -public final class PartialCodeConfiguration { - /* - * ARM resource ID of the code asset. - */ - @JsonProperty(value = "codeId") - private String codeId; - - /* - * The script to execute on startup. eg. "score.py" - */ - @JsonProperty(value = "scoringScript") - private String scoringScript; - - /** - * Get the codeId property: ARM resource ID of the code asset. - * - * @return the codeId value. - */ - public String codeId() { - return this.codeId; - } - - /** - * Set the codeId property: ARM resource ID of the code asset. - * - * @param codeId the codeId value to set. - * @return the PartialCodeConfiguration object itself. - */ - public PartialCodeConfiguration withCodeId(String codeId) { - this.codeId = codeId; - return this; - } - - /** - * Get the scoringScript property: The script to execute on startup. eg. "score.py". - * - * @return the scoringScript value. - */ - public String scoringScript() { - return this.scoringScript; - } - - /** - * Set the scoringScript property: The script to execute on startup. eg. "score.py". - * - * @param scoringScript the scoringScript value to set. - * @return the PartialCodeConfiguration object itself. - */ - public PartialCodeConfiguration withScoringScript(String scoringScript) { - this.scoringScript = scoringScript; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialDataPathAssetReference.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialDataPathAssetReference.java deleted file mode 100644 index 7e09d678dd30..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialDataPathAssetReference.java +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** Reference to an asset via its path in a datastore. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "referenceType") -@JsonTypeName("DataPath") -@Fluent -public final class PartialDataPathAssetReference extends PartialAssetReferenceBase { - /* - * ARM resource ID of the datastore where the asset is located. - */ - @JsonProperty(value = "datastoreId") - private String datastoreId; - - /* - * The path of the file/directory in the datastore. - */ - @JsonProperty(value = "path") - private String path; - - /** - * Get the datastoreId property: ARM resource ID of the datastore where the asset is located. - * - * @return the datastoreId value. - */ - public String datastoreId() { - return this.datastoreId; - } - - /** - * Set the datastoreId property: ARM resource ID of the datastore where the asset is located. - * - * @param datastoreId the datastoreId value to set. - * @return the PartialDataPathAssetReference object itself. - */ - public PartialDataPathAssetReference withDatastoreId(String datastoreId) { - this.datastoreId = datastoreId; - return this; - } - - /** - * Get the path property: The path of the file/directory in the datastore. - * - * @return the path value. - */ - public String path() { - return this.path; - } - - /** - * Set the path property: The path of the file/directory in the datastore. - * - * @param path the path value to set. - * @return the PartialDataPathAssetReference object itself. - */ - public PartialDataPathAssetReference withPath(String path) { - this.path = path; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialIdAssetReference.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialIdAssetReference.java deleted file mode 100644 index 5803b53593f5..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialIdAssetReference.java +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** Reference to an asset via its ARM resource ID. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "referenceType") -@JsonTypeName("Id") -@Fluent -public final class PartialIdAssetReference extends PartialAssetReferenceBase { - /* - * ARM resource ID of the asset. - */ - @JsonProperty(value = "assetId") - private String assetId; - - /** - * Get the assetId property: ARM resource ID of the asset. - * - * @return the assetId value. - */ - public String assetId() { - return this.assetId; - } - - /** - * Set the assetId property: ARM resource ID of the asset. - * - * @param assetId the assetId value to set. - * @return the PartialIdAssetReference object itself. - */ - public PartialIdAssetReference withAssetId(String assetId) { - this.assetId = assetId; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialKubernetesOnlineDeployment.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialKubernetesOnlineDeployment.java deleted file mode 100644 index 31d7dc680c47..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialKubernetesOnlineDeployment.java +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Immutable; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** Properties specific to a KubernetesOnlineDeployment. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointComputeType") -@JsonTypeName("Kubernetes") -@Immutable -public final class PartialKubernetesOnlineDeployment extends PartialOnlineDeployment { - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialManagedOnlineDeployment.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialManagedOnlineDeployment.java deleted file mode 100644 index a44f5303a123..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialManagedOnlineDeployment.java +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Immutable; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** Properties specific to a ManagedOnlineDeployment. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointComputeType") -@JsonTypeName("Managed") -@Immutable -public final class PartialManagedOnlineDeployment extends PartialOnlineDeployment { - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialMinimalTrackedResource.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialMinimalTrackedResource.java new file mode 100644 index 000000000000..9a7ad6bdd8c2 --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialMinimalTrackedResource.java @@ -0,0 +1,49 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.models; + +import com.azure.core.annotation.Fluent; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.Map; + +/** Strictly used in update requests. */ +@Fluent +public class PartialMinimalTrackedResource { + /* + * Resource tags. + */ + @JsonProperty(value = "tags") + @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) + private Map tags; + + /** + * Get the tags property: Resource tags. + * + * @return the tags value. + */ + public Map tags() { + return this.tags; + } + + /** + * Set the tags property: Resource tags. + * + * @param tags the tags value to set. + * @return the PartialMinimalTrackedResource object itself. + */ + public PartialMinimalTrackedResource withTags(Map tags) { + this.tags = tags; + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + public void validate() { + } +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialMinimalTrackedResourceWithIdentity.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialMinimalTrackedResourceWithIdentity.java new file mode 100644 index 000000000000..11f7b4290f48 --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialMinimalTrackedResourceWithIdentity.java @@ -0,0 +1,60 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.models; + +import com.azure.core.annotation.Fluent; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.Map; + +/** Strictly used in update requests. */ +@Fluent +public class PartialMinimalTrackedResourceWithIdentity extends PartialMinimalTrackedResource { + /* + * Managed service identity (system assigned and/or user assigned + * identities) + */ + @JsonProperty(value = "identity") + private PartialManagedServiceIdentity identity; + + /** + * Get the identity property: Managed service identity (system assigned and/or user assigned identities). + * + * @return the identity value. + */ + public PartialManagedServiceIdentity identity() { + return this.identity; + } + + /** + * Set the identity property: Managed service identity (system assigned and/or user assigned identities). + * + * @param identity the identity value to set. + * @return the PartialMinimalTrackedResourceWithIdentity object itself. + */ + public PartialMinimalTrackedResourceWithIdentity withIdentity(PartialManagedServiceIdentity identity) { + this.identity = identity; + return this; + } + + /** {@inheritDoc} */ + @Override + public PartialMinimalTrackedResourceWithIdentity withTags(Map tags) { + super.withTags(tags); + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + @Override + public void validate() { + super.validate(); + if (identity() != null) { + identity().validate(); + } + } +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialMinimalTrackedResourceWithSku.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialMinimalTrackedResourceWithSku.java new file mode 100644 index 000000000000..19a448c89715 --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialMinimalTrackedResourceWithSku.java @@ -0,0 +1,59 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.models; + +import com.azure.core.annotation.Fluent; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.Map; + +/** Strictly used in update requests. */ +@Fluent +public final class PartialMinimalTrackedResourceWithSku extends PartialMinimalTrackedResource { + /* + * Sku details required for ARM contract for Autoscaling. + */ + @JsonProperty(value = "sku") + private PartialSku sku; + + /** + * Get the sku property: Sku details required for ARM contract for Autoscaling. + * + * @return the sku value. + */ + public PartialSku sku() { + return this.sku; + } + + /** + * Set the sku property: Sku details required for ARM contract for Autoscaling. + * + * @param sku the sku value to set. + * @return the PartialMinimalTrackedResourceWithSku object itself. + */ + public PartialMinimalTrackedResourceWithSku withSku(PartialSku sku) { + this.sku = sku; + return this; + } + + /** {@inheritDoc} */ + @Override + public PartialMinimalTrackedResourceWithSku withTags(Map tags) { + super.withTags(tags); + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + @Override + public void validate() { + super.validate(); + if (sku() != null) { + sku().validate(); + } + } +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOnlineDeployment.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOnlineDeployment.java deleted file mode 100644 index 0843c1eacbca..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOnlineDeployment.java +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Immutable; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** Mutable online deployment configuration. */ -@JsonTypeInfo( - use = JsonTypeInfo.Id.NAME, - include = JsonTypeInfo.As.PROPERTY, - property = "endpointComputeType", - defaultImpl = PartialOnlineDeployment.class) -@JsonTypeName("PartialOnlineDeployment") -@JsonSubTypes({ - @JsonSubTypes.Type(name = "Kubernetes", value = PartialKubernetesOnlineDeployment.class), - @JsonSubTypes.Type(name = "Managed", value = PartialManagedOnlineDeployment.class) -}) -@Immutable -public class PartialOnlineDeployment { - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOnlineDeploymentPartialTrackedResource.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOnlineDeploymentPartialTrackedResource.java deleted file mode 100644 index 59b0439ec0fd..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOnlineDeploymentPartialTrackedResource.java +++ /dev/null @@ -1,192 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.Map; - -/** Strictly used in update requests. */ -@Fluent -public final class PartialOnlineDeploymentPartialTrackedResource { - /* - * Managed service identity (system assigned and/or user assigned - * identities) - */ - @JsonProperty(value = "identity") - private PartialManagedServiceIdentity identity; - - /* - * Metadata used by portal/tooling/etc to render different UX experiences - * for resources of the same type. - */ - @JsonProperty(value = "kind") - private String kind; - - /* - * The geo-location where the resource lives. - */ - @JsonProperty(value = "location") - private String location; - - /* - * Additional attributes of the entity. - */ - @JsonProperty(value = "properties") - private PartialOnlineDeployment properties; - - /* - * Sku details required for ARM contract for Autoscaling. - */ - @JsonProperty(value = "sku") - private PartialSku sku; - - /* - * Resource tags. - */ - @JsonProperty(value = "tags") - @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) - private Map tags; - - /** - * Get the identity property: Managed service identity (system assigned and/or user assigned identities). - * - * @return the identity value. - */ - public PartialManagedServiceIdentity identity() { - return this.identity; - } - - /** - * Set the identity property: Managed service identity (system assigned and/or user assigned identities). - * - * @param identity the identity value to set. - * @return the PartialOnlineDeploymentPartialTrackedResource object itself. - */ - public PartialOnlineDeploymentPartialTrackedResource withIdentity(PartialManagedServiceIdentity identity) { - this.identity = identity; - return this; - } - - /** - * Get the kind property: Metadata used by portal/tooling/etc to render different UX experiences for resources of - * the same type. - * - * @return the kind value. - */ - public String kind() { - return this.kind; - } - - /** - * Set the kind property: Metadata used by portal/tooling/etc to render different UX experiences for resources of - * the same type. - * - * @param kind the kind value to set. - * @return the PartialOnlineDeploymentPartialTrackedResource object itself. - */ - public PartialOnlineDeploymentPartialTrackedResource withKind(String kind) { - this.kind = kind; - return this; - } - - /** - * Get the location property: The geo-location where the resource lives. - * - * @return the location value. - */ - public String location() { - return this.location; - } - - /** - * Set the location property: The geo-location where the resource lives. - * - * @param location the location value to set. - * @return the PartialOnlineDeploymentPartialTrackedResource object itself. - */ - public PartialOnlineDeploymentPartialTrackedResource withLocation(String location) { - this.location = location; - return this; - } - - /** - * Get the properties property: Additional attributes of the entity. - * - * @return the properties value. - */ - public PartialOnlineDeployment properties() { - return this.properties; - } - - /** - * Set the properties property: Additional attributes of the entity. - * - * @param properties the properties value to set. - * @return the PartialOnlineDeploymentPartialTrackedResource object itself. - */ - public PartialOnlineDeploymentPartialTrackedResource withProperties(PartialOnlineDeployment properties) { - this.properties = properties; - return this; - } - - /** - * Get the sku property: Sku details required for ARM contract for Autoscaling. - * - * @return the sku value. - */ - public PartialSku sku() { - return this.sku; - } - - /** - * Set the sku property: Sku details required for ARM contract for Autoscaling. - * - * @param sku the sku value to set. - * @return the PartialOnlineDeploymentPartialTrackedResource object itself. - */ - public PartialOnlineDeploymentPartialTrackedResource withSku(PartialSku sku) { - this.sku = sku; - return this; - } - - /** - * Get the tags property: Resource tags. - * - * @return the tags value. - */ - public Map tags() { - return this.tags; - } - - /** - * Set the tags property: Resource tags. - * - * @param tags the tags value to set. - * @return the PartialOnlineDeploymentPartialTrackedResource object itself. - */ - public PartialOnlineDeploymentPartialTrackedResource withTags(Map tags) { - this.tags = tags; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (identity() != null) { - identity().validate(); - } - if (properties() != null) { - properties().validate(); - } - if (sku() != null) { - sku().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOnlineEndpoint.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOnlineEndpoint.java deleted file mode 100644 index ef3e28340fa1..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOnlineEndpoint.java +++ /dev/null @@ -1,111 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.Map; - -/** Mutable online endpoint configuration. */ -@Fluent -public final class PartialOnlineEndpoint { - /* - * Percentage of traffic to be mirrored to each deployment without using - * returned scoring. Traffic values need to sum to utmost 50. - */ - @JsonProperty(value = "mirrorTraffic") - @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) - private Map mirrorTraffic; - - /* - * Set to "Enabled" for endpoints that should allow public access when - * Private Link is enabled. - */ - @JsonProperty(value = "publicNetworkAccess") - private PublicNetworkAccessType publicNetworkAccess; - - /* - * Percentage of traffic from endpoint to divert to each deployment. - * Traffic values need to sum to 100. - */ - @JsonProperty(value = "traffic") - @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) - private Map traffic; - - /** - * Get the mirrorTraffic property: Percentage of traffic to be mirrored to each deployment without using returned - * scoring. Traffic values need to sum to utmost 50. - * - * @return the mirrorTraffic value. - */ - public Map mirrorTraffic() { - return this.mirrorTraffic; - } - - /** - * Set the mirrorTraffic property: Percentage of traffic to be mirrored to each deployment without using returned - * scoring. Traffic values need to sum to utmost 50. - * - * @param mirrorTraffic the mirrorTraffic value to set. - * @return the PartialOnlineEndpoint object itself. - */ - public PartialOnlineEndpoint withMirrorTraffic(Map mirrorTraffic) { - this.mirrorTraffic = mirrorTraffic; - return this; - } - - /** - * Get the publicNetworkAccess property: Set to "Enabled" for endpoints that should allow public access when Private - * Link is enabled. - * - * @return the publicNetworkAccess value. - */ - public PublicNetworkAccessType publicNetworkAccess() { - return this.publicNetworkAccess; - } - - /** - * Set the publicNetworkAccess property: Set to "Enabled" for endpoints that should allow public access when Private - * Link is enabled. - * - * @param publicNetworkAccess the publicNetworkAccess value to set. - * @return the PartialOnlineEndpoint object itself. - */ - public PartialOnlineEndpoint withPublicNetworkAccess(PublicNetworkAccessType publicNetworkAccess) { - this.publicNetworkAccess = publicNetworkAccess; - return this; - } - - /** - * Get the traffic property: Percentage of traffic from endpoint to divert to each deployment. Traffic values need - * to sum to 100. - * - * @return the traffic value. - */ - public Map traffic() { - return this.traffic; - } - - /** - * Set the traffic property: Percentage of traffic from endpoint to divert to each deployment. Traffic values need - * to sum to 100. - * - * @param traffic the traffic value to set. - * @return the PartialOnlineEndpoint object itself. - */ - public PartialOnlineEndpoint withTraffic(Map traffic) { - this.traffic = traffic; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOnlineEndpointPartialTrackedResource.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOnlineEndpointPartialTrackedResource.java deleted file mode 100644 index 48295e01bb07..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOnlineEndpointPartialTrackedResource.java +++ /dev/null @@ -1,192 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.Map; - -/** Strictly used in update requests. */ -@Fluent -public final class PartialOnlineEndpointPartialTrackedResource { - /* - * Managed service identity (system assigned and/or user assigned - * identities) - */ - @JsonProperty(value = "identity") - private PartialManagedServiceIdentity identity; - - /* - * Metadata used by portal/tooling/etc to render different UX experiences - * for resources of the same type. - */ - @JsonProperty(value = "kind") - private String kind; - - /* - * The geo-location where the resource lives. - */ - @JsonProperty(value = "location") - private String location; - - /* - * Additional attributes of the entity. - */ - @JsonProperty(value = "properties") - private PartialOnlineEndpoint properties; - - /* - * Sku details required for ARM contract for Autoscaling. - */ - @JsonProperty(value = "sku") - private PartialSku sku; - - /* - * Resource tags. - */ - @JsonProperty(value = "tags") - @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) - private Map tags; - - /** - * Get the identity property: Managed service identity (system assigned and/or user assigned identities). - * - * @return the identity value. - */ - public PartialManagedServiceIdentity identity() { - return this.identity; - } - - /** - * Set the identity property: Managed service identity (system assigned and/or user assigned identities). - * - * @param identity the identity value to set. - * @return the PartialOnlineEndpointPartialTrackedResource object itself. - */ - public PartialOnlineEndpointPartialTrackedResource withIdentity(PartialManagedServiceIdentity identity) { - this.identity = identity; - return this; - } - - /** - * Get the kind property: Metadata used by portal/tooling/etc to render different UX experiences for resources of - * the same type. - * - * @return the kind value. - */ - public String kind() { - return this.kind; - } - - /** - * Set the kind property: Metadata used by portal/tooling/etc to render different UX experiences for resources of - * the same type. - * - * @param kind the kind value to set. - * @return the PartialOnlineEndpointPartialTrackedResource object itself. - */ - public PartialOnlineEndpointPartialTrackedResource withKind(String kind) { - this.kind = kind; - return this; - } - - /** - * Get the location property: The geo-location where the resource lives. - * - * @return the location value. - */ - public String location() { - return this.location; - } - - /** - * Set the location property: The geo-location where the resource lives. - * - * @param location the location value to set. - * @return the PartialOnlineEndpointPartialTrackedResource object itself. - */ - public PartialOnlineEndpointPartialTrackedResource withLocation(String location) { - this.location = location; - return this; - } - - /** - * Get the properties property: Additional attributes of the entity. - * - * @return the properties value. - */ - public PartialOnlineEndpoint properties() { - return this.properties; - } - - /** - * Set the properties property: Additional attributes of the entity. - * - * @param properties the properties value to set. - * @return the PartialOnlineEndpointPartialTrackedResource object itself. - */ - public PartialOnlineEndpointPartialTrackedResource withProperties(PartialOnlineEndpoint properties) { - this.properties = properties; - return this; - } - - /** - * Get the sku property: Sku details required for ARM contract for Autoscaling. - * - * @return the sku value. - */ - public PartialSku sku() { - return this.sku; - } - - /** - * Set the sku property: Sku details required for ARM contract for Autoscaling. - * - * @param sku the sku value to set. - * @return the PartialOnlineEndpointPartialTrackedResource object itself. - */ - public PartialOnlineEndpointPartialTrackedResource withSku(PartialSku sku) { - this.sku = sku; - return this; - } - - /** - * Get the tags property: Resource tags. - * - * @return the tags value. - */ - public Map tags() { - return this.tags; - } - - /** - * Set the tags property: Resource tags. - * - * @param tags the tags value to set. - * @return the PartialOnlineEndpointPartialTrackedResource object itself. - */ - public PartialOnlineEndpointPartialTrackedResource withTags(Map tags) { - this.tags = tags; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (identity() != null) { - identity().validate(); - } - if (properties() != null) { - properties().validate(); - } - if (sku() != null) { - sku().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOutputPathAssetReference.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOutputPathAssetReference.java deleted file mode 100644 index 4490ec8d69e1..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PartialOutputPathAssetReference.java +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** Reference to an asset via its path in a job output. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "referenceType") -@JsonTypeName("OutputPath") -@Fluent -public final class PartialOutputPathAssetReference extends PartialAssetReferenceBase { - /* - * ARM resource ID of the job. - */ - @JsonProperty(value = "jobId") - private String jobId; - - /* - * The path of the file/directory in the job output. - */ - @JsonProperty(value = "path") - private String path; - - /** - * Get the jobId property: ARM resource ID of the job. - * - * @return the jobId value. - */ - public String jobId() { - return this.jobId; - } - - /** - * Set the jobId property: ARM resource ID of the job. - * - * @param jobId the jobId value to set. - * @return the PartialOutputPathAssetReference object itself. - */ - public PartialOutputPathAssetReference withJobId(String jobId) { - this.jobId = jobId; - return this; - } - - /** - * Get the path property: The path of the file/directory in the job output. - * - * @return the path value. - */ - public String path() { - return this.path; - } - - /** - * Set the path property: The path of the file/directory in the job output. - * - * @param path the path value to set. - * @return the PartialOutputPathAssetReference object itself. - */ - public PartialOutputPathAssetReference withPath(String path) { - this.path = path; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PatAuthTypeWorkspaceConnectionProperties.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PatAuthTypeWorkspaceConnectionProperties.java new file mode 100644 index 000000000000..039103faee88 --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PatAuthTypeWorkspaceConnectionProperties.java @@ -0,0 +1,84 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.models; + +import com.azure.core.annotation.Fluent; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** The PatAuthTypeWorkspaceConnectionProperties model. */ +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "authType") +@JsonTypeName("PAT") +@Fluent +public final class PatAuthTypeWorkspaceConnectionProperties extends WorkspaceConnectionPropertiesV2 { + /* + * The credentials property. + */ + @JsonProperty(value = "credentials") + private WorkspaceConnectionPersonalAccessToken credentials; + + /** + * Get the credentials property: The credentials property. + * + * @return the credentials value. + */ + public WorkspaceConnectionPersonalAccessToken credentials() { + return this.credentials; + } + + /** + * Set the credentials property: The credentials property. + * + * @param credentials the credentials value to set. + * @return the PatAuthTypeWorkspaceConnectionProperties object itself. + */ + public PatAuthTypeWorkspaceConnectionProperties withCredentials( + WorkspaceConnectionPersonalAccessToken credentials) { + this.credentials = credentials; + return this; + } + + /** {@inheritDoc} */ + @Override + public PatAuthTypeWorkspaceConnectionProperties withCategory(ConnectionCategory category) { + super.withCategory(category); + return this; + } + + /** {@inheritDoc} */ + @Override + public PatAuthTypeWorkspaceConnectionProperties withTarget(String target) { + super.withTarget(target); + return this; + } + + /** {@inheritDoc} */ + @Override + public PatAuthTypeWorkspaceConnectionProperties withValue(String value) { + super.withValue(value); + return this; + } + + /** {@inheritDoc} */ + @Override + public PatAuthTypeWorkspaceConnectionProperties withValueFormat(ValueFormat valueFormat) { + super.withValueFormat(valueFormat); + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + @Override + public void validate() { + super.validate(); + if (credentials() != null) { + credentials().validate(); + } + } +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PipelineJob.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PipelineJob.java index 9ac31138c113..7253084beb88 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PipelineJob.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PipelineJob.java @@ -15,7 +15,7 @@ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "jobType") @JsonTypeName("Pipeline") @Fluent -public final class PipelineJob extends JobBaseDetails { +public final class PipelineJob extends JobBaseProperties { /* * Inputs for the pipeline job. */ @@ -158,13 +158,6 @@ public PipelineJob withIsArchived(Boolean isArchived) { return this; } - /** {@inheritDoc} */ - @Override - public PipelineJob withSchedule(ScheduleBase schedule) { - super.withSchedule(schedule); - return this; - } - /** {@inheritDoc} */ @Override public PipelineJob withServices(Map services) { diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PublicNetworkAccessType.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PublicNetworkAccessType.java deleted file mode 100644 index 80a26f8ee788..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/PublicNetworkAccessType.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for PublicNetworkAccessType. */ -public final class PublicNetworkAccessType extends ExpandableStringEnum { - /** Static value Enabled for PublicNetworkAccessType. */ - public static final PublicNetworkAccessType ENABLED = fromString("Enabled"); - - /** Static value Disabled for PublicNetworkAccessType. */ - public static final PublicNetworkAccessType DISABLED = fromString("Disabled"); - - /** - * Creates or finds a PublicNetworkAccessType from its string representation. - * - * @param name a name to look for. - * @return the corresponding PublicNetworkAccessType. - */ - @JsonCreator - public static PublicNetworkAccessType fromString(String name) { - return fromString(name, PublicNetworkAccessType.class); - } - - /** - * Gets known PublicNetworkAccessType values. - * - * @return known PublicNetworkAccessType values. - */ - public static Collection values() { - return values(PublicNetworkAccessType.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RecurrenceFrequency.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RecurrenceFrequency.java deleted file mode 100644 index 21ae5bf2d756..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RecurrenceFrequency.java +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for RecurrenceFrequency. */ -public final class RecurrenceFrequency extends ExpandableStringEnum { - /** Static value Minute for RecurrenceFrequency. */ - public static final RecurrenceFrequency MINUTE = fromString("Minute"); - - /** Static value Hour for RecurrenceFrequency. */ - public static final RecurrenceFrequency HOUR = fromString("Hour"); - - /** Static value Day for RecurrenceFrequency. */ - public static final RecurrenceFrequency DAY = fromString("Day"); - - /** Static value Week for RecurrenceFrequency. */ - public static final RecurrenceFrequency WEEK = fromString("Week"); - - /** Static value Month for RecurrenceFrequency. */ - public static final RecurrenceFrequency MONTH = fromString("Month"); - - /** - * Creates or finds a RecurrenceFrequency from its string representation. - * - * @param name a name to look for. - * @return the corresponding RecurrenceFrequency. - */ - @JsonCreator - public static RecurrenceFrequency fromString(String name) { - return fromString(name, RecurrenceFrequency.class); - } - - /** - * Gets known RecurrenceFrequency values. - * - * @return known RecurrenceFrequency values. - */ - public static Collection values() { - return values(RecurrenceFrequency.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RecurrencePattern.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RecurrencePattern.java deleted file mode 100644 index 68c3a5db6688..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RecurrencePattern.java +++ /dev/null @@ -1,112 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - -/** Recurrence schedule pattern definition. */ -@Fluent -public final class RecurrencePattern { - /* - * [Required] List of hours for recurrence schedule pattern - */ - @JsonProperty(value = "hours", required = true) - private List hours; - - /* - * [Required] List of minutes for recurrence schedule pattern - */ - @JsonProperty(value = "minutes", required = true) - private List minutes; - - /* - * List of weekdays for recurrence schedule pattern - */ - @JsonProperty(value = "weekdays") - private List weekdays; - - /** - * Get the hours property: [Required] List of hours for recurrence schedule pattern. - * - * @return the hours value. - */ - public List hours() { - return this.hours; - } - - /** - * Set the hours property: [Required] List of hours for recurrence schedule pattern. - * - * @param hours the hours value to set. - * @return the RecurrencePattern object itself. - */ - public RecurrencePattern withHours(List hours) { - this.hours = hours; - return this; - } - - /** - * Get the minutes property: [Required] List of minutes for recurrence schedule pattern. - * - * @return the minutes value. - */ - public List minutes() { - return this.minutes; - } - - /** - * Set the minutes property: [Required] List of minutes for recurrence schedule pattern. - * - * @param minutes the minutes value to set. - * @return the RecurrencePattern object itself. - */ - public RecurrencePattern withMinutes(List minutes) { - this.minutes = minutes; - return this; - } - - /** - * Get the weekdays property: List of weekdays for recurrence schedule pattern. - * - * @return the weekdays value. - */ - public List weekdays() { - return this.weekdays; - } - - /** - * Set the weekdays property: List of weekdays for recurrence schedule pattern. - * - * @param weekdays the weekdays value to set. - * @return the RecurrencePattern object itself. - */ - public RecurrencePattern withWeekdays(List weekdays) { - this.weekdays = weekdays; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (hours() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException("Missing required property hours in model RecurrencePattern")); - } - if (minutes() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException("Missing required property minutes in model RecurrencePattern")); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(RecurrencePattern.class); -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RecurrenceSchedule.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RecurrenceSchedule.java deleted file mode 100644 index 791c35fc149d..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RecurrenceSchedule.java +++ /dev/null @@ -1,144 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.time.OffsetDateTime; - -/** Recurrence schedule definition. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "scheduleType") -@JsonTypeName("Recurrence") -@Fluent -public final class RecurrenceSchedule extends ScheduleBase { - /* - * [Required] Specifies frequency with with which to trigger schedule - */ - @JsonProperty(value = "frequency", required = true) - private RecurrenceFrequency frequency; - - /* - * [Required] Specifies schedule interval in conjunction with frequency - */ - @JsonProperty(value = "interval", required = true) - private int interval; - - /* - * Specifies the recurrence schedule pattern - */ - @JsonProperty(value = "pattern") - private RecurrencePattern pattern; - - /** - * Get the frequency property: [Required] Specifies frequency with with which to trigger schedule. - * - * @return the frequency value. - */ - public RecurrenceFrequency frequency() { - return this.frequency; - } - - /** - * Set the frequency property: [Required] Specifies frequency with with which to trigger schedule. - * - * @param frequency the frequency value to set. - * @return the RecurrenceSchedule object itself. - */ - public RecurrenceSchedule withFrequency(RecurrenceFrequency frequency) { - this.frequency = frequency; - return this; - } - - /** - * Get the interval property: [Required] Specifies schedule interval in conjunction with frequency. - * - * @return the interval value. - */ - public int interval() { - return this.interval; - } - - /** - * Set the interval property: [Required] Specifies schedule interval in conjunction with frequency. - * - * @param interval the interval value to set. - * @return the RecurrenceSchedule object itself. - */ - public RecurrenceSchedule withInterval(int interval) { - this.interval = interval; - return this; - } - - /** - * Get the pattern property: Specifies the recurrence schedule pattern. - * - * @return the pattern value. - */ - public RecurrencePattern pattern() { - return this.pattern; - } - - /** - * Set the pattern property: Specifies the recurrence schedule pattern. - * - * @param pattern the pattern value to set. - * @return the RecurrenceSchedule object itself. - */ - public RecurrenceSchedule withPattern(RecurrencePattern pattern) { - this.pattern = pattern; - return this; - } - - /** {@inheritDoc} */ - @Override - public RecurrenceSchedule withEndTime(OffsetDateTime endTime) { - super.withEndTime(endTime); - return this; - } - - /** {@inheritDoc} */ - @Override - public RecurrenceSchedule withScheduleStatus(ScheduleStatus scheduleStatus) { - super.withScheduleStatus(scheduleStatus); - return this; - } - - /** {@inheritDoc} */ - @Override - public RecurrenceSchedule withStartTime(OffsetDateTime startTime) { - super.withStartTime(startTime); - return this; - } - - /** {@inheritDoc} */ - @Override - public RecurrenceSchedule withTimeZone(String timeZone) { - super.withTimeZone(timeZone); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (frequency() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException("Missing required property frequency in model RecurrenceSchedule")); - } - if (pattern() != null) { - pattern().validate(); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(RecurrenceSchedule.class); -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Regression.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Regression.java deleted file mode 100644 index c74055ad93d8..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Regression.java +++ /dev/null @@ -1,228 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.util.List; - -/** Regression task in AutoML Table vertical. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType") -@JsonTypeName("Regression") -@Fluent -public final class Regression extends AutoMLVertical { - /* - * Allowed models for regression task. - */ - @JsonProperty(value = "allowedModels") - private List allowedModels; - - /* - * Blocked models for regression task. - */ - @JsonProperty(value = "blockedModels") - private List blockedModels; - - /* - * Primary metric for regression task. - */ - @JsonProperty(value = "primaryMetric") - private RegressionPrimaryMetrics primaryMetric; - - /* - * Data inputs for AutoMLJob. - */ - @JsonProperty(value = "dataSettings") - private TableVerticalDataSettings dataSettings; - - /* - * Featurization inputs needed for AutoML job. - */ - @JsonProperty(value = "featurizationSettings") - private TableVerticalFeaturizationSettings featurizationSettings; - - /* - * Execution constraints for AutoMLJob. - */ - @JsonProperty(value = "limitSettings") - private TableVerticalLimitSettings limitSettings; - - /* - * Inputs for training phase for an AutoML Job. - */ - @JsonProperty(value = "trainingSettings") - private TrainingSettings trainingSettings; - - /** - * Get the allowedModels property: Allowed models for regression task. - * - * @return the allowedModels value. - */ - public List allowedModels() { - return this.allowedModels; - } - - /** - * Set the allowedModels property: Allowed models for regression task. - * - * @param allowedModels the allowedModels value to set. - * @return the Regression object itself. - */ - public Regression withAllowedModels(List allowedModels) { - this.allowedModels = allowedModels; - return this; - } - - /** - * Get the blockedModels property: Blocked models for regression task. - * - * @return the blockedModels value. - */ - public List blockedModels() { - return this.blockedModels; - } - - /** - * Set the blockedModels property: Blocked models for regression task. - * - * @param blockedModels the blockedModels value to set. - * @return the Regression object itself. - */ - public Regression withBlockedModels(List blockedModels) { - this.blockedModels = blockedModels; - return this; - } - - /** - * Get the primaryMetric property: Primary metric for regression task. - * - * @return the primaryMetric value. - */ - public RegressionPrimaryMetrics primaryMetric() { - return this.primaryMetric; - } - - /** - * Set the primaryMetric property: Primary metric for regression task. - * - * @param primaryMetric the primaryMetric value to set. - * @return the Regression object itself. - */ - public Regression withPrimaryMetric(RegressionPrimaryMetrics primaryMetric) { - this.primaryMetric = primaryMetric; - return this; - } - - /** - * Get the dataSettings property: Data inputs for AutoMLJob. - * - * @return the dataSettings value. - */ - public TableVerticalDataSettings dataSettings() { - return this.dataSettings; - } - - /** - * Set the dataSettings property: Data inputs for AutoMLJob. - * - * @param dataSettings the dataSettings value to set. - * @return the Regression object itself. - */ - public Regression withDataSettings(TableVerticalDataSettings dataSettings) { - this.dataSettings = dataSettings; - return this; - } - - /** - * Get the featurizationSettings property: Featurization inputs needed for AutoML job. - * - * @return the featurizationSettings value. - */ - public TableVerticalFeaturizationSettings featurizationSettings() { - return this.featurizationSettings; - } - - /** - * Set the featurizationSettings property: Featurization inputs needed for AutoML job. - * - * @param featurizationSettings the featurizationSettings value to set. - * @return the Regression object itself. - */ - public Regression withFeaturizationSettings(TableVerticalFeaturizationSettings featurizationSettings) { - this.featurizationSettings = featurizationSettings; - return this; - } - - /** - * Get the limitSettings property: Execution constraints for AutoMLJob. - * - * @return the limitSettings value. - */ - public TableVerticalLimitSettings limitSettings() { - return this.limitSettings; - } - - /** - * Set the limitSettings property: Execution constraints for AutoMLJob. - * - * @param limitSettings the limitSettings value to set. - * @return the Regression object itself. - */ - public Regression withLimitSettings(TableVerticalLimitSettings limitSettings) { - this.limitSettings = limitSettings; - return this; - } - - /** - * Get the trainingSettings property: Inputs for training phase for an AutoML Job. - * - * @return the trainingSettings value. - */ - public TrainingSettings trainingSettings() { - return this.trainingSettings; - } - - /** - * Set the trainingSettings property: Inputs for training phase for an AutoML Job. - * - * @param trainingSettings the trainingSettings value to set. - * @return the Regression object itself. - */ - public Regression withTrainingSettings(TrainingSettings trainingSettings) { - this.trainingSettings = trainingSettings; - return this; - } - - /** {@inheritDoc} */ - @Override - public Regression withLogVerbosity(LogVerbosity logVerbosity) { - super.withLogVerbosity(logVerbosity); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (dataSettings() != null) { - dataSettings().validate(); - } - if (featurizationSettings() != null) { - featurizationSettings().validate(); - } - if (limitSettings() != null) { - limitSettings().validate(); - } - if (trainingSettings() != null) { - trainingSettings().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RegressionModels.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RegressionModels.java deleted file mode 100644 index 7116f002cdee..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RegressionModels.java +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for RegressionModels. */ -public final class RegressionModels extends ExpandableStringEnum { - /** Static value ElasticNet for RegressionModels. */ - public static final RegressionModels ELASTIC_NET = fromString("ElasticNet"); - - /** Static value GradientBoosting for RegressionModels. */ - public static final RegressionModels GRADIENT_BOOSTING = fromString("GradientBoosting"); - - /** Static value DecisionTree for RegressionModels. */ - public static final RegressionModels DECISION_TREE = fromString("DecisionTree"); - - /** Static value KNN for RegressionModels. */ - public static final RegressionModels KNN = fromString("KNN"); - - /** Static value LassoLars for RegressionModels. */ - public static final RegressionModels LASSO_LARS = fromString("LassoLars"); - - /** Static value SGD for RegressionModels. */ - public static final RegressionModels SGD = fromString("SGD"); - - /** Static value RandomForest for RegressionModels. */ - public static final RegressionModels RANDOM_FOREST = fromString("RandomForest"); - - /** Static value ExtremeRandomTrees for RegressionModels. */ - public static final RegressionModels EXTREME_RANDOM_TREES = fromString("ExtremeRandomTrees"); - - /** Static value LightGBM for RegressionModels. */ - public static final RegressionModels LIGHT_GBM = fromString("LightGBM"); - - /** Static value XGBoostRegressor for RegressionModels. */ - public static final RegressionModels XGBOOST_REGRESSOR = fromString("XGBoostRegressor"); - - /** - * Creates or finds a RegressionModels from its string representation. - * - * @param name a name to look for. - * @return the corresponding RegressionModels. - */ - @JsonCreator - public static RegressionModels fromString(String name) { - return fromString(name, RegressionModels.class); - } - - /** - * Gets known RegressionModels values. - * - * @return known RegressionModels values. - */ - public static Collection values() { - return values(RegressionModels.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RegressionPrimaryMetrics.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RegressionPrimaryMetrics.java deleted file mode 100644 index cda7c0026ab7..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/RegressionPrimaryMetrics.java +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for RegressionPrimaryMetrics. */ -public final class RegressionPrimaryMetrics extends ExpandableStringEnum { - /** Static value SpearmanCorrelation for RegressionPrimaryMetrics. */ - public static final RegressionPrimaryMetrics SPEARMAN_CORRELATION = fromString("SpearmanCorrelation"); - - /** Static value NormalizedRootMeanSquaredError for RegressionPrimaryMetrics. */ - public static final RegressionPrimaryMetrics NORMALIZED_ROOT_MEAN_SQUARED_ERROR = - fromString("NormalizedRootMeanSquaredError"); - - /** Static value R2Score for RegressionPrimaryMetrics. */ - public static final RegressionPrimaryMetrics R2SCORE = fromString("R2Score"); - - /** Static value NormalizedMeanAbsoluteError for RegressionPrimaryMetrics. */ - public static final RegressionPrimaryMetrics NORMALIZED_MEAN_ABSOLUTE_ERROR = - fromString("NormalizedMeanAbsoluteError"); - - /** - * Creates or finds a RegressionPrimaryMetrics from its string representation. - * - * @param name a name to look for. - * @return the corresponding RegressionPrimaryMetrics. - */ - @JsonCreator - public static RegressionPrimaryMetrics fromString(String name) { - return fromString(name, RegressionPrimaryMetrics.class); - } - - /** - * Gets known RegressionPrimaryMetrics values. - * - * @return known RegressionPrimaryMetrics values. - */ - public static Collection values() { - return values(RegressionPrimaryMetrics.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SasAuthTypeWorkspaceConnectionProperties.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SasAuthTypeWorkspaceConnectionProperties.java new file mode 100644 index 000000000000..5d167d260064 --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SasAuthTypeWorkspaceConnectionProperties.java @@ -0,0 +1,84 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.models; + +import com.azure.core.annotation.Fluent; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** The SasAuthTypeWorkspaceConnectionProperties model. */ +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "authType") +@JsonTypeName("SAS") +@Fluent +public final class SasAuthTypeWorkspaceConnectionProperties extends WorkspaceConnectionPropertiesV2 { + /* + * The credentials property. + */ + @JsonProperty(value = "credentials") + private WorkspaceConnectionSharedAccessSignature credentials; + + /** + * Get the credentials property: The credentials property. + * + * @return the credentials value. + */ + public WorkspaceConnectionSharedAccessSignature credentials() { + return this.credentials; + } + + /** + * Set the credentials property: The credentials property. + * + * @param credentials the credentials value to set. + * @return the SasAuthTypeWorkspaceConnectionProperties object itself. + */ + public SasAuthTypeWorkspaceConnectionProperties withCredentials( + WorkspaceConnectionSharedAccessSignature credentials) { + this.credentials = credentials; + return this; + } + + /** {@inheritDoc} */ + @Override + public SasAuthTypeWorkspaceConnectionProperties withCategory(ConnectionCategory category) { + super.withCategory(category); + return this; + } + + /** {@inheritDoc} */ + @Override + public SasAuthTypeWorkspaceConnectionProperties withTarget(String target) { + super.withTarget(target); + return this; + } + + /** {@inheritDoc} */ + @Override + public SasAuthTypeWorkspaceConnectionProperties withValue(String value) { + super.withValue(value); + return this; + } + + /** {@inheritDoc} */ + @Override + public SasAuthTypeWorkspaceConnectionProperties withValueFormat(ValueFormat valueFormat) { + super.withValueFormat(valueFormat); + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + @Override + public void validate() { + super.validate(); + if (credentials() != null) { + credentials().validate(); + } + } +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ScheduleBase.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ScheduleBase.java index 1dcf02015d2a..dd8b71757b31 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ScheduleBase.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ScheduleBase.java @@ -6,131 +6,85 @@ import com.azure.core.annotation.Fluent; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.time.OffsetDateTime; -/** Base definition of a schedule. */ -@JsonTypeInfo( - use = JsonTypeInfo.Id.NAME, - include = JsonTypeInfo.As.PROPERTY, - property = "scheduleType", - defaultImpl = ScheduleBase.class) -@JsonTypeName("ScheduleBase") -@JsonSubTypes({ - @JsonSubTypes.Type(name = "Cron", value = CronSchedule.class), - @JsonSubTypes.Type(name = "Recurrence", value = RecurrenceSchedule.class) -}) +/** The ScheduleBase model. */ @Fluent -public class ScheduleBase { +public final class ScheduleBase { /* - * Specifies end time of schedule in ISO 8601 format. - * If not present, the schedule will run indefinitely + * The id property. */ - @JsonProperty(value = "endTime") - private OffsetDateTime endTime; + @JsonProperty(value = "id") + private String id; /* - * Specifies the schedule's status + * The provisioningStatus property. */ - @JsonProperty(value = "scheduleStatus") - private ScheduleStatus scheduleStatus; + @JsonProperty(value = "provisioningStatus") + private ScheduleProvisioningState provisioningStatus; /* - * Specifies start time of schedule in ISO 8601 format. + * The status property. */ - @JsonProperty(value = "startTime") - private OffsetDateTime startTime; - - /* - * Specifies time zone in which the schedule runs. - * TimeZone should follow Windows time zone format. - */ - @JsonProperty(value = "timeZone") - private String timeZone; - - /** - * Get the endTime property: Specifies end time of schedule in ISO 8601 format. If not present, the schedule will - * run indefinitely. - * - * @return the endTime value. - */ - public OffsetDateTime endTime() { - return this.endTime; - } - - /** - * Set the endTime property: Specifies end time of schedule in ISO 8601 format. If not present, the schedule will - * run indefinitely. - * - * @param endTime the endTime value to set. - * @return the ScheduleBase object itself. - */ - public ScheduleBase withEndTime(OffsetDateTime endTime) { - this.endTime = endTime; - return this; - } + @JsonProperty(value = "status") + private ScheduleStatus status; /** - * Get the scheduleStatus property: Specifies the schedule's status. + * Get the id property: The id property. * - * @return the scheduleStatus value. + * @return the id value. */ - public ScheduleStatus scheduleStatus() { - return this.scheduleStatus; + public String id() { + return this.id; } /** - * Set the scheduleStatus property: Specifies the schedule's status. + * Set the id property: The id property. * - * @param scheduleStatus the scheduleStatus value to set. + * @param id the id value to set. * @return the ScheduleBase object itself. */ - public ScheduleBase withScheduleStatus(ScheduleStatus scheduleStatus) { - this.scheduleStatus = scheduleStatus; + public ScheduleBase withId(String id) { + this.id = id; return this; } /** - * Get the startTime property: Specifies start time of schedule in ISO 8601 format. + * Get the provisioningStatus property: The provisioningStatus property. * - * @return the startTime value. + * @return the provisioningStatus value. */ - public OffsetDateTime startTime() { - return this.startTime; + public ScheduleProvisioningState provisioningStatus() { + return this.provisioningStatus; } /** - * Set the startTime property: Specifies start time of schedule in ISO 8601 format. + * Set the provisioningStatus property: The provisioningStatus property. * - * @param startTime the startTime value to set. + * @param provisioningStatus the provisioningStatus value to set. * @return the ScheduleBase object itself. */ - public ScheduleBase withStartTime(OffsetDateTime startTime) { - this.startTime = startTime; + public ScheduleBase withProvisioningStatus(ScheduleProvisioningState provisioningStatus) { + this.provisioningStatus = provisioningStatus; return this; } /** - * Get the timeZone property: Specifies time zone in which the schedule runs. TimeZone should follow Windows time - * zone format. + * Get the status property: The status property. * - * @return the timeZone value. + * @return the status value. */ - public String timeZone() { - return this.timeZone; + public ScheduleStatus status() { + return this.status; } /** - * Set the timeZone property: Specifies time zone in which the schedule runs. TimeZone should follow Windows time - * zone format. + * Set the status property: The status property. * - * @param timeZone the timeZone value to set. + * @param status the status value to set. * @return the ScheduleBase object itself. */ - public ScheduleBase withTimeZone(String timeZone) { - this.timeZone = timeZone; + public ScheduleBase withStatus(ScheduleStatus status) { + this.status = status; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ScheduleProvisioningState.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ScheduleProvisioningState.java new file mode 100644 index 000000000000..a3eaf712f174 --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ScheduleProvisioningState.java @@ -0,0 +1,41 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.models; + +import com.azure.core.util.ExpandableStringEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.util.Collection; + +/** Defines values for ScheduleProvisioningState. */ +public final class ScheduleProvisioningState extends ExpandableStringEnum { + /** Static value Completed for ScheduleProvisioningState. */ + public static final ScheduleProvisioningState COMPLETED = fromString("Completed"); + + /** Static value Provisioning for ScheduleProvisioningState. */ + public static final ScheduleProvisioningState PROVISIONING = fromString("Provisioning"); + + /** Static value Failed for ScheduleProvisioningState. */ + public static final ScheduleProvisioningState FAILED = fromString("Failed"); + + /** + * Creates or finds a ScheduleProvisioningState from its string representation. + * + * @param name a name to look for. + * @return the corresponding ScheduleProvisioningState. + */ + @JsonCreator + public static ScheduleProvisioningState fromString(String name) { + return fromString(name, ScheduleProvisioningState.class); + } + + /** + * Gets known ScheduleProvisioningState values. + * + * @return known ScheduleProvisioningState values. + */ + public static Collection values() { + return values(ScheduleProvisioningState.class); + } +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ScheduleType.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ScheduleType.java deleted file mode 100644 index d8e625b26711..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ScheduleType.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for ScheduleType. */ -public final class ScheduleType extends ExpandableStringEnum { - /** Static value Cron for ScheduleType. */ - public static final ScheduleType CRON = fromString("Cron"); - - /** Static value Recurrence for ScheduleType. */ - public static final ScheduleType RECURRENCE = fromString("Recurrence"); - - /** - * Creates or finds a ScheduleType from its string representation. - * - * @param name a name to look for. - * @return the corresponding ScheduleType. - */ - @JsonCreator - public static ScheduleType fromString(String name) { - return fromString(name, ScheduleType.class); - } - - /** - * Gets known ScheduleType values. - * - * @return known ScheduleType values. - */ - public static Collection values() { - return values(ScheduleType.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Seasonality.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Seasonality.java deleted file mode 100644 index 492ad5302809..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Seasonality.java +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Immutable; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** Forecasting seasonality. */ -@JsonTypeInfo( - use = JsonTypeInfo.Id.NAME, - include = JsonTypeInfo.As.PROPERTY, - property = "mode", - defaultImpl = Seasonality.class) -@JsonTypeName("Seasonality") -@JsonSubTypes({ - @JsonSubTypes.Type(name = "Auto", value = AutoSeasonality.class), - @JsonSubTypes.Type(name = "Custom", value = CustomSeasonality.class) -}) -@Immutable -public class Seasonality { - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SeasonalityMode.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SeasonalityMode.java deleted file mode 100644 index d8225d3d3201..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SeasonalityMode.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for SeasonalityMode. */ -public final class SeasonalityMode extends ExpandableStringEnum { - /** Static value Auto for SeasonalityMode. */ - public static final SeasonalityMode AUTO = fromString("Auto"); - - /** Static value Custom for SeasonalityMode. */ - public static final SeasonalityMode CUSTOM = fromString("Custom"); - - /** - * Creates or finds a SeasonalityMode from its string representation. - * - * @param name a name to look for. - * @return the corresponding SeasonalityMode. - */ - @JsonCreator - public static SeasonalityMode fromString(String name) { - return fromString(name, SeasonalityMode.class); - } - - /** - * Gets known SeasonalityMode values. - * - * @return known SeasonalityMode values. - */ - public static Collection values() { - return values(SeasonalityMode.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SecretsType.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SecretsType.java index 388b3554104f..ba8795f1034c 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SecretsType.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SecretsType.java @@ -22,12 +22,6 @@ public final class SecretsType extends ExpandableStringEnum { /** Static value ServicePrincipal for SecretsType. */ public static final SecretsType SERVICE_PRINCIPAL = fromString("ServicePrincipal"); - /** Static value KerberosPassword for SecretsType. */ - public static final SecretsType KERBEROS_PASSWORD = fromString("KerberosPassword"); - - /** Static value KerberosKeytab for SecretsType. */ - public static final SecretsType KERBEROS_KEYTAB = fromString("KerberosKeytab"); - /** * Creates or finds a SecretsType from its string representation. * diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ShortSeriesHandlingConfiguration.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ShortSeriesHandlingConfiguration.java deleted file mode 100644 index ef74acc66917..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ShortSeriesHandlingConfiguration.java +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for ShortSeriesHandlingConfiguration. */ -public final class ShortSeriesHandlingConfiguration extends ExpandableStringEnum { - /** Static value None for ShortSeriesHandlingConfiguration. */ - public static final ShortSeriesHandlingConfiguration NONE = fromString("None"); - - /** Static value Auto for ShortSeriesHandlingConfiguration. */ - public static final ShortSeriesHandlingConfiguration AUTO = fromString("Auto"); - - /** Static value Pad for ShortSeriesHandlingConfiguration. */ - public static final ShortSeriesHandlingConfiguration PAD = fromString("Pad"); - - /** Static value Drop for ShortSeriesHandlingConfiguration. */ - public static final ShortSeriesHandlingConfiguration DROP = fromString("Drop"); - - /** - * Creates or finds a ShortSeriesHandlingConfiguration from its string representation. - * - * @param name a name to look for. - * @return the corresponding ShortSeriesHandlingConfiguration. - */ - @JsonCreator - public static ShortSeriesHandlingConfiguration fromString(String name) { - return fromString(name, ShortSeriesHandlingConfiguration.class); - } - - /** - * Gets known ShortSeriesHandlingConfiguration values. - * - * @return known ShortSeriesHandlingConfiguration values. - */ - public static Collection values() { - return values(ShortSeriesHandlingConfiguration.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SslConfigStatus.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SslConfigStatus.java new file mode 100644 index 000000000000..54172d850853 --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SslConfigStatus.java @@ -0,0 +1,41 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.models; + +import com.azure.core.util.ExpandableStringEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.util.Collection; + +/** Defines values for SslConfigStatus. */ +public final class SslConfigStatus extends ExpandableStringEnum { + /** Static value Disabled for SslConfigStatus. */ + public static final SslConfigStatus DISABLED = fromString("Disabled"); + + /** Static value Enabled for SslConfigStatus. */ + public static final SslConfigStatus ENABLED = fromString("Enabled"); + + /** Static value Auto for SslConfigStatus. */ + public static final SslConfigStatus AUTO = fromString("Auto"); + + /** + * Creates or finds a SslConfigStatus from its string representation. + * + * @param name a name to look for. + * @return the corresponding SslConfigStatus. + */ + @JsonCreator + public static SslConfigStatus fromString(String name) { + return fromString(name, SslConfigStatus.class); + } + + /** + * Gets known SslConfigStatus values. + * + * @return known SslConfigStatus values. + */ + public static Collection values() { + return values(SslConfigStatus.class); + } +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SslConfiguration.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SslConfiguration.java index 656dd43a46d3..98a81724cc50 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SslConfiguration.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SslConfiguration.java @@ -14,7 +14,7 @@ public final class SslConfiguration { * Enable or disable ssl for scoring */ @JsonProperty(value = "status") - private SslConfigurationStatus status; + private SslConfigStatus status; /* * Cert data @@ -51,7 +51,7 @@ public final class SslConfiguration { * * @return the status value. */ - public SslConfigurationStatus status() { + public SslConfigStatus status() { return this.status; } @@ -61,7 +61,7 @@ public SslConfigurationStatus status() { * @param status the status value to set. * @return the SslConfiguration object itself. */ - public SslConfiguration withStatus(SslConfigurationStatus status) { + public SslConfiguration withStatus(SslConfigStatus status) { this.status = status; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SslConfigurationStatus.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SslConfigurationStatus.java deleted file mode 100644 index ee60c5c32bbd..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SslConfigurationStatus.java +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for SslConfigurationStatus. */ -public final class SslConfigurationStatus extends ExpandableStringEnum { - /** Static value Disabled for SslConfigurationStatus. */ - public static final SslConfigurationStatus DISABLED = fromString("Disabled"); - - /** Static value Enabled for SslConfigurationStatus. */ - public static final SslConfigurationStatus ENABLED = fromString("Enabled"); - - /** Static value Auto for SslConfigurationStatus. */ - public static final SslConfigurationStatus AUTO = fromString("Auto"); - - /** - * Creates or finds a SslConfigurationStatus from its string representation. - * - * @param name a name to look for. - * @return the corresponding SslConfigurationStatus. - */ - @JsonCreator - public static SslConfigurationStatus fromString(String name) { - return fromString(name, SslConfigurationStatus.class); - } - - /** - * Gets known SslConfigurationStatus values. - * - * @return known SslConfigurationStatus values. - */ - public static Collection values() { - return values(SslConfigurationStatus.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/StackEnsembleSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/StackEnsembleSettings.java deleted file mode 100644 index 39aeadd4f94e..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/StackEnsembleSettings.java +++ /dev/null @@ -1,105 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** Advances setting to customize StackEnsemble run. */ -@Fluent -public final class StackEnsembleSettings { - /* - * Optional parameters to pass to the initializer of the meta-learner. - */ - @JsonProperty(value = "stackMetaLearnerKWargs") - private Object stackMetaLearnerKWargs; - - /* - * Specifies the proportion of the training set (when choosing train and - * validation type of training) to be reserved for training the - * meta-learner. Default value is 0.2. - */ - @JsonProperty(value = "stackMetaLearnerTrainPercentage") - private Double stackMetaLearnerTrainPercentage; - - /* - * The meta-learner is a model trained on the output of the individual - * heterogeneous models. - */ - @JsonProperty(value = "stackMetaLearnerType") - private StackMetaLearnerType stackMetaLearnerType; - - /** - * Get the stackMetaLearnerKWargs property: Optional parameters to pass to the initializer of the meta-learner. - * - * @return the stackMetaLearnerKWargs value. - */ - public Object stackMetaLearnerKWargs() { - return this.stackMetaLearnerKWargs; - } - - /** - * Set the stackMetaLearnerKWargs property: Optional parameters to pass to the initializer of the meta-learner. - * - * @param stackMetaLearnerKWargs the stackMetaLearnerKWargs value to set. - * @return the StackEnsembleSettings object itself. - */ - public StackEnsembleSettings withStackMetaLearnerKWargs(Object stackMetaLearnerKWargs) { - this.stackMetaLearnerKWargs = stackMetaLearnerKWargs; - return this; - } - - /** - * Get the stackMetaLearnerTrainPercentage property: Specifies the proportion of the training set (when choosing - * train and validation type of training) to be reserved for training the meta-learner. Default value is 0.2. - * - * @return the stackMetaLearnerTrainPercentage value. - */ - public Double stackMetaLearnerTrainPercentage() { - return this.stackMetaLearnerTrainPercentage; - } - - /** - * Set the stackMetaLearnerTrainPercentage property: Specifies the proportion of the training set (when choosing - * train and validation type of training) to be reserved for training the meta-learner. Default value is 0.2. - * - * @param stackMetaLearnerTrainPercentage the stackMetaLearnerTrainPercentage value to set. - * @return the StackEnsembleSettings object itself. - */ - public StackEnsembleSettings withStackMetaLearnerTrainPercentage(Double stackMetaLearnerTrainPercentage) { - this.stackMetaLearnerTrainPercentage = stackMetaLearnerTrainPercentage; - return this; - } - - /** - * Get the stackMetaLearnerType property: The meta-learner is a model trained on the output of the individual - * heterogeneous models. - * - * @return the stackMetaLearnerType value. - */ - public StackMetaLearnerType stackMetaLearnerType() { - return this.stackMetaLearnerType; - } - - /** - * Set the stackMetaLearnerType property: The meta-learner is a model trained on the output of the individual - * heterogeneous models. - * - * @param stackMetaLearnerType the stackMetaLearnerType value to set. - * @return the StackEnsembleSettings object itself. - */ - public StackEnsembleSettings withStackMetaLearnerType(StackMetaLearnerType stackMetaLearnerType) { - this.stackMetaLearnerType = stackMetaLearnerType; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/StackMetaLearnerType.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/StackMetaLearnerType.java deleted file mode 100644 index 5b630344e176..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/StackMetaLearnerType.java +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for StackMetaLearnerType. */ -public final class StackMetaLearnerType extends ExpandableStringEnum { - /** Static value None for StackMetaLearnerType. */ - public static final StackMetaLearnerType NONE = fromString("None"); - - /** Static value LogisticRegression for StackMetaLearnerType. */ - public static final StackMetaLearnerType LOGISTIC_REGRESSION = fromString("LogisticRegression"); - - /** Static value LogisticRegressionCV for StackMetaLearnerType. */ - public static final StackMetaLearnerType LOGISTIC_REGRESSION_CV = fromString("LogisticRegressionCV"); - - /** Static value LightGBMClassifier for StackMetaLearnerType. */ - public static final StackMetaLearnerType LIGHT_GBMCLASSIFIER = fromString("LightGBMClassifier"); - - /** Static value ElasticNet for StackMetaLearnerType. */ - public static final StackMetaLearnerType ELASTIC_NET = fromString("ElasticNet"); - - /** Static value ElasticNetCV for StackMetaLearnerType. */ - public static final StackMetaLearnerType ELASTIC_NET_CV = fromString("ElasticNetCV"); - - /** Static value LightGBMRegressor for StackMetaLearnerType. */ - public static final StackMetaLearnerType LIGHT_GBMREGRESSOR = fromString("LightGBMRegressor"); - - /** Static value LinearRegression for StackMetaLearnerType. */ - public static final StackMetaLearnerType LINEAR_REGRESSION = fromString("LinearRegression"); - - /** - * Creates or finds a StackMetaLearnerType from its string representation. - * - * @param name a name to look for. - * @return the corresponding StackMetaLearnerType. - */ - @JsonCreator - public static StackMetaLearnerType fromString(String name) { - return fromString(name, StackMetaLearnerType.class); - } - - /** - * Gets known StackMetaLearnerType values. - * - * @return known StackMetaLearnerType values. - */ - public static Collection values() { - return values(StackMetaLearnerType.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/StochasticOptimizer.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/StochasticOptimizer.java deleted file mode 100644 index ac5dd8d6cee8..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/StochasticOptimizer.java +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for StochasticOptimizer. */ -public final class StochasticOptimizer extends ExpandableStringEnum { - /** Static value None for StochasticOptimizer. */ - public static final StochasticOptimizer NONE = fromString("None"); - - /** Static value Sgd for StochasticOptimizer. */ - public static final StochasticOptimizer SGD = fromString("Sgd"); - - /** Static value Adam for StochasticOptimizer. */ - public static final StochasticOptimizer ADAM = fromString("Adam"); - - /** Static value Adamw for StochasticOptimizer. */ - public static final StochasticOptimizer ADAMW = fromString("Adamw"); - - /** - * Creates or finds a StochasticOptimizer from its string representation. - * - * @param name a name to look for. - * @return the corresponding StochasticOptimizer. - */ - @JsonCreator - public static StochasticOptimizer fromString(String name) { - return fromString(name, StochasticOptimizer.class); - } - - /** - * Gets known StochasticOptimizer values. - * - * @return known StochasticOptimizer values. - */ - public static Collection values() { - return values(StochasticOptimizer.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SweepJob.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SweepJob.java index 6240a092e4c0..00958889974e 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SweepJob.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/SweepJob.java @@ -16,7 +16,7 @@ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "jobType") @JsonTypeName("Sweep") @Fluent -public final class SweepJob extends JobBaseDetails { +public final class SweepJob extends JobBaseProperties { /* * Early termination policies enable canceling poor-performing runs before * they complete @@ -268,13 +268,6 @@ public SweepJob withIsArchived(Boolean isArchived) { return this; } - /** {@inheritDoc} */ - @Override - public SweepJob withSchedule(ScheduleBase schedule) { - super.withSchedule(schedule); - return this; - } - /** {@inheritDoc} */ @Override public SweepJob withServices(Map services) { diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVertical.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVertical.java deleted file mode 100644 index 56816059ee7b..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVertical.java +++ /dev/null @@ -1,136 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** Abstract class for AutoML tasks that use table dataset as input - such as Classification/Regression/Forecasting. */ -@Fluent -public class TableVertical { - /* - * Data inputs for AutoMLJob. - */ - @JsonProperty(value = "dataSettings") - private TableVerticalDataSettings dataSettings; - - /* - * Featurization inputs needed for AutoML job. - */ - @JsonProperty(value = "featurizationSettings") - private TableVerticalFeaturizationSettings featurizationSettings; - - /* - * Execution constraints for AutoMLJob. - */ - @JsonProperty(value = "limitSettings") - private TableVerticalLimitSettings limitSettings; - - /* - * Inputs for training phase for an AutoML Job. - */ - @JsonProperty(value = "trainingSettings") - private TrainingSettings trainingSettings; - - /** - * Get the dataSettings property: Data inputs for AutoMLJob. - * - * @return the dataSettings value. - */ - public TableVerticalDataSettings dataSettings() { - return this.dataSettings; - } - - /** - * Set the dataSettings property: Data inputs for AutoMLJob. - * - * @param dataSettings the dataSettings value to set. - * @return the TableVertical object itself. - */ - public TableVertical withDataSettings(TableVerticalDataSettings dataSettings) { - this.dataSettings = dataSettings; - return this; - } - - /** - * Get the featurizationSettings property: Featurization inputs needed for AutoML job. - * - * @return the featurizationSettings value. - */ - public TableVerticalFeaturizationSettings featurizationSettings() { - return this.featurizationSettings; - } - - /** - * Set the featurizationSettings property: Featurization inputs needed for AutoML job. - * - * @param featurizationSettings the featurizationSettings value to set. - * @return the TableVertical object itself. - */ - public TableVertical withFeaturizationSettings(TableVerticalFeaturizationSettings featurizationSettings) { - this.featurizationSettings = featurizationSettings; - return this; - } - - /** - * Get the limitSettings property: Execution constraints for AutoMLJob. - * - * @return the limitSettings value. - */ - public TableVerticalLimitSettings limitSettings() { - return this.limitSettings; - } - - /** - * Set the limitSettings property: Execution constraints for AutoMLJob. - * - * @param limitSettings the limitSettings value to set. - * @return the TableVertical object itself. - */ - public TableVertical withLimitSettings(TableVerticalLimitSettings limitSettings) { - this.limitSettings = limitSettings; - return this; - } - - /** - * Get the trainingSettings property: Inputs for training phase for an AutoML Job. - * - * @return the trainingSettings value. - */ - public TrainingSettings trainingSettings() { - return this.trainingSettings; - } - - /** - * Set the trainingSettings property: Inputs for training phase for an AutoML Job. - * - * @param trainingSettings the trainingSettings value to set. - * @return the TableVertical object itself. - */ - public TableVertical withTrainingSettings(TrainingSettings trainingSettings) { - this.trainingSettings = trainingSettings; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (dataSettings() != null) { - dataSettings().validate(); - } - if (featurizationSettings() != null) { - featurizationSettings().validate(); - } - if (limitSettings() != null) { - limitSettings().validate(); - } - if (trainingSettings() != null) { - trainingSettings().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVerticalDataSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVerticalDataSettings.java deleted file mode 100644 index ac98e0ce4ded..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVerticalDataSettings.java +++ /dev/null @@ -1,101 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** Class for data inputs. */ -@Fluent -public final class TableVerticalDataSettings extends DataSettings { - /* - * Validation data inputs. - */ - @JsonProperty(value = "validationData") - private TableVerticalValidationDataSettings validationData; - - /* - * The name of the sample weight column. Automated ML supports a weighted - * column as an input, causing rows in the data to be weighted up or down. - */ - @JsonProperty(value = "weightColumnName") - private String weightColumnName; - - /** - * Get the validationData property: Validation data inputs. - * - * @return the validationData value. - */ - public TableVerticalValidationDataSettings validationData() { - return this.validationData; - } - - /** - * Set the validationData property: Validation data inputs. - * - * @param validationData the validationData value to set. - * @return the TableVerticalDataSettings object itself. - */ - public TableVerticalDataSettings withValidationData(TableVerticalValidationDataSettings validationData) { - this.validationData = validationData; - return this; - } - - /** - * Get the weightColumnName property: The name of the sample weight column. Automated ML supports a weighted column - * as an input, causing rows in the data to be weighted up or down. - * - * @return the weightColumnName value. - */ - public String weightColumnName() { - return this.weightColumnName; - } - - /** - * Set the weightColumnName property: The name of the sample weight column. Automated ML supports a weighted column - * as an input, causing rows in the data to be weighted up or down. - * - * @param weightColumnName the weightColumnName value to set. - * @return the TableVerticalDataSettings object itself. - */ - public TableVerticalDataSettings withWeightColumnName(String weightColumnName) { - this.weightColumnName = weightColumnName; - return this; - } - - /** {@inheritDoc} */ - @Override - public TableVerticalDataSettings withTargetColumnName(String targetColumnName) { - super.withTargetColumnName(targetColumnName); - return this; - } - - /** {@inheritDoc} */ - @Override - public TableVerticalDataSettings withTestData(TestDataSettings testData) { - super.withTestData(testData); - return this; - } - - /** {@inheritDoc} */ - @Override - public TableVerticalDataSettings withTrainingData(TrainingDataSettings trainingData) { - super.withTrainingData(trainingData); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (validationData() != null) { - validationData().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVerticalFeaturizationSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVerticalFeaturizationSettings.java deleted file mode 100644 index 03ae45a3adca..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVerticalFeaturizationSettings.java +++ /dev/null @@ -1,215 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; -import java.util.Map; - -/** Featurization Configuration. */ -@Fluent -public final class TableVerticalFeaturizationSettings extends FeaturizationSettings { - /* - * These transformers shall not be used in featurization. - */ - @JsonProperty(value = "blockedTransformers") - private List blockedTransformers; - - /* - * Dictionary of column name and its type (int, float, string, datetime - * etc). - */ - @JsonProperty(value = "columnNameAndTypes") - @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) - private Map columnNameAndTypes; - - /* - * Columns to be dropped from data during featurization. - */ - @JsonProperty(value = "dropColumns") - private List dropColumns; - - /* - * Determines whether to use Dnn based featurizers for data featurization. - */ - @JsonProperty(value = "enableDnnFeaturization") - private Boolean enableDnnFeaturization; - - /* - * Featurization mode - User can keep the default 'Auto' mode and AutoML - * will take care of necessary transformation of the data in featurization - * phase. - * If 'Off' is selected then no featurization is done. - * If 'Custom' is selected then user can specify additional inputs to - * customize how featurization is done. - */ - @JsonProperty(value = "mode") - private FeaturizationMode mode; - - /* - * User can specify additional transformers to be used along with the - * columns to which it would be applied and parameters for the transformer - * constructor. - */ - @JsonProperty(value = "transformerParams") - @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) - private Map> transformerParams; - - /** - * Get the blockedTransformers property: These transformers shall not be used in featurization. - * - * @return the blockedTransformers value. - */ - public List blockedTransformers() { - return this.blockedTransformers; - } - - /** - * Set the blockedTransformers property: These transformers shall not be used in featurization. - * - * @param blockedTransformers the blockedTransformers value to set. - * @return the TableVerticalFeaturizationSettings object itself. - */ - public TableVerticalFeaturizationSettings withBlockedTransformers(List blockedTransformers) { - this.blockedTransformers = blockedTransformers; - return this; - } - - /** - * Get the columnNameAndTypes property: Dictionary of column name and its type (int, float, string, datetime etc). - * - * @return the columnNameAndTypes value. - */ - public Map columnNameAndTypes() { - return this.columnNameAndTypes; - } - - /** - * Set the columnNameAndTypes property: Dictionary of column name and its type (int, float, string, datetime etc). - * - * @param columnNameAndTypes the columnNameAndTypes value to set. - * @return the TableVerticalFeaturizationSettings object itself. - */ - public TableVerticalFeaturizationSettings withColumnNameAndTypes(Map columnNameAndTypes) { - this.columnNameAndTypes = columnNameAndTypes; - return this; - } - - /** - * Get the dropColumns property: Columns to be dropped from data during featurization. - * - * @return the dropColumns value. - */ - public List dropColumns() { - return this.dropColumns; - } - - /** - * Set the dropColumns property: Columns to be dropped from data during featurization. - * - * @param dropColumns the dropColumns value to set. - * @return the TableVerticalFeaturizationSettings object itself. - */ - public TableVerticalFeaturizationSettings withDropColumns(List dropColumns) { - this.dropColumns = dropColumns; - return this; - } - - /** - * Get the enableDnnFeaturization property: Determines whether to use Dnn based featurizers for data featurization. - * - * @return the enableDnnFeaturization value. - */ - public Boolean enableDnnFeaturization() { - return this.enableDnnFeaturization; - } - - /** - * Set the enableDnnFeaturization property: Determines whether to use Dnn based featurizers for data featurization. - * - * @param enableDnnFeaturization the enableDnnFeaturization value to set. - * @return the TableVerticalFeaturizationSettings object itself. - */ - public TableVerticalFeaturizationSettings withEnableDnnFeaturization(Boolean enableDnnFeaturization) { - this.enableDnnFeaturization = enableDnnFeaturization; - return this; - } - - /** - * Get the mode property: Featurization mode - User can keep the default 'Auto' mode and AutoML will take care of - * necessary transformation of the data in featurization phase. If 'Off' is selected then no featurization is done. - * If 'Custom' is selected then user can specify additional inputs to customize how featurization is done. - * - * @return the mode value. - */ - public FeaturizationMode mode() { - return this.mode; - } - - /** - * Set the mode property: Featurization mode - User can keep the default 'Auto' mode and AutoML will take care of - * necessary transformation of the data in featurization phase. If 'Off' is selected then no featurization is done. - * If 'Custom' is selected then user can specify additional inputs to customize how featurization is done. - * - * @param mode the mode value to set. - * @return the TableVerticalFeaturizationSettings object itself. - */ - public TableVerticalFeaturizationSettings withMode(FeaturizationMode mode) { - this.mode = mode; - return this; - } - - /** - * Get the transformerParams property: User can specify additional transformers to be used along with the columns to - * which it would be applied and parameters for the transformer constructor. - * - * @return the transformerParams value. - */ - public Map> transformerParams() { - return this.transformerParams; - } - - /** - * Set the transformerParams property: User can specify additional transformers to be used along with the columns to - * which it would be applied and parameters for the transformer constructor. - * - * @param transformerParams the transformerParams value to set. - * @return the TableVerticalFeaturizationSettings object itself. - */ - public TableVerticalFeaturizationSettings withTransformerParams( - Map> transformerParams) { - this.transformerParams = transformerParams; - return this; - } - - /** {@inheritDoc} */ - @Override - public TableVerticalFeaturizationSettings withDatasetLanguage(String datasetLanguage) { - super.withDatasetLanguage(datasetLanguage); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (transformerParams() != null) { - transformerParams() - .values() - .forEach( - e -> { - if (e != null) { - e.forEach(e1 -> e1.validate()); - } - }); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVerticalLimitSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVerticalLimitSettings.java deleted file mode 100644 index 3b6fa66980ae..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVerticalLimitSettings.java +++ /dev/null @@ -1,206 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.time.Duration; - -/** Job execution constraints. */ -@Fluent -public final class TableVerticalLimitSettings { - /* - * Enable early termination, determines whether or not if AutoMLJob will - * terminate early if there is no score improvement in last 20 iterations. - */ - @JsonProperty(value = "enableEarlyTermination") - private Boolean enableEarlyTermination; - - /* - * Exit score for the AutoML job. - */ - @JsonProperty(value = "exitScore") - private Double exitScore; - - /* - * Maximum Concurrent iterations. - */ - @JsonProperty(value = "maxConcurrentTrials") - private Integer maxConcurrentTrials; - - /* - * Max cores per iteration. - */ - @JsonProperty(value = "maxCoresPerTrial") - private Integer maxCoresPerTrial; - - /* - * Number of iterations. - */ - @JsonProperty(value = "maxTrials") - private Integer maxTrials; - - /* - * AutoML job timeout. - */ - @JsonProperty(value = "timeout") - private Duration timeout; - - /* - * Iteration timeout. - */ - @JsonProperty(value = "trialTimeout") - private Duration trialTimeout; - - /** - * Get the enableEarlyTermination property: Enable early termination, determines whether or not if AutoMLJob will - * terminate early if there is no score improvement in last 20 iterations. - * - * @return the enableEarlyTermination value. - */ - public Boolean enableEarlyTermination() { - return this.enableEarlyTermination; - } - - /** - * Set the enableEarlyTermination property: Enable early termination, determines whether or not if AutoMLJob will - * terminate early if there is no score improvement in last 20 iterations. - * - * @param enableEarlyTermination the enableEarlyTermination value to set. - * @return the TableVerticalLimitSettings object itself. - */ - public TableVerticalLimitSettings withEnableEarlyTermination(Boolean enableEarlyTermination) { - this.enableEarlyTermination = enableEarlyTermination; - return this; - } - - /** - * Get the exitScore property: Exit score for the AutoML job. - * - * @return the exitScore value. - */ - public Double exitScore() { - return this.exitScore; - } - - /** - * Set the exitScore property: Exit score for the AutoML job. - * - * @param exitScore the exitScore value to set. - * @return the TableVerticalLimitSettings object itself. - */ - public TableVerticalLimitSettings withExitScore(Double exitScore) { - this.exitScore = exitScore; - return this; - } - - /** - * Get the maxConcurrentTrials property: Maximum Concurrent iterations. - * - * @return the maxConcurrentTrials value. - */ - public Integer maxConcurrentTrials() { - return this.maxConcurrentTrials; - } - - /** - * Set the maxConcurrentTrials property: Maximum Concurrent iterations. - * - * @param maxConcurrentTrials the maxConcurrentTrials value to set. - * @return the TableVerticalLimitSettings object itself. - */ - public TableVerticalLimitSettings withMaxConcurrentTrials(Integer maxConcurrentTrials) { - this.maxConcurrentTrials = maxConcurrentTrials; - return this; - } - - /** - * Get the maxCoresPerTrial property: Max cores per iteration. - * - * @return the maxCoresPerTrial value. - */ - public Integer maxCoresPerTrial() { - return this.maxCoresPerTrial; - } - - /** - * Set the maxCoresPerTrial property: Max cores per iteration. - * - * @param maxCoresPerTrial the maxCoresPerTrial value to set. - * @return the TableVerticalLimitSettings object itself. - */ - public TableVerticalLimitSettings withMaxCoresPerTrial(Integer maxCoresPerTrial) { - this.maxCoresPerTrial = maxCoresPerTrial; - return this; - } - - /** - * Get the maxTrials property: Number of iterations. - * - * @return the maxTrials value. - */ - public Integer maxTrials() { - return this.maxTrials; - } - - /** - * Set the maxTrials property: Number of iterations. - * - * @param maxTrials the maxTrials value to set. - * @return the TableVerticalLimitSettings object itself. - */ - public TableVerticalLimitSettings withMaxTrials(Integer maxTrials) { - this.maxTrials = maxTrials; - return this; - } - - /** - * Get the timeout property: AutoML job timeout. - * - * @return the timeout value. - */ - public Duration timeout() { - return this.timeout; - } - - /** - * Set the timeout property: AutoML job timeout. - * - * @param timeout the timeout value to set. - * @return the TableVerticalLimitSettings object itself. - */ - public TableVerticalLimitSettings withTimeout(Duration timeout) { - this.timeout = timeout; - return this; - } - - /** - * Get the trialTimeout property: Iteration timeout. - * - * @return the trialTimeout value. - */ - public Duration trialTimeout() { - return this.trialTimeout; - } - - /** - * Set the trialTimeout property: Iteration timeout. - * - * @param trialTimeout the trialTimeout value to set. - * @return the TableVerticalLimitSettings object itself. - */ - public TableVerticalLimitSettings withTrialTimeout(Duration trialTimeout) { - this.trialTimeout = trialTimeout; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVerticalValidationDataSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVerticalValidationDataSettings.java deleted file mode 100644 index 510c3ec34077..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TableVerticalValidationDataSettings.java +++ /dev/null @@ -1,95 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - -/** Validation settings for AutoML Table vertical tasks - Classification/Regression/Forecasting. */ -@Fluent -public final class TableVerticalValidationDataSettings extends ValidationDataSettings { - /* - * Columns to use for CVSplit data. - */ - @JsonProperty(value = "cvSplitColumnNames") - private List cvSplitColumnNames; - - /* - * Number of cross validation folds to be applied on training dataset - * when validation dataset is not provided. - */ - @JsonProperty(value = "nCrossValidations") - private NCrossValidations nCrossValidations; - - /** - * Get the cvSplitColumnNames property: Columns to use for CVSplit data. - * - * @return the cvSplitColumnNames value. - */ - public List cvSplitColumnNames() { - return this.cvSplitColumnNames; - } - - /** - * Set the cvSplitColumnNames property: Columns to use for CVSplit data. - * - * @param cvSplitColumnNames the cvSplitColumnNames value to set. - * @return the TableVerticalValidationDataSettings object itself. - */ - public TableVerticalValidationDataSettings withCvSplitColumnNames(List cvSplitColumnNames) { - this.cvSplitColumnNames = cvSplitColumnNames; - return this; - } - - /** - * Get the nCrossValidations property: Number of cross validation folds to be applied on training dataset when - * validation dataset is not provided. - * - * @return the nCrossValidations value. - */ - public NCrossValidations nCrossValidations() { - return this.nCrossValidations; - } - - /** - * Set the nCrossValidations property: Number of cross validation folds to be applied on training dataset when - * validation dataset is not provided. - * - * @param nCrossValidations the nCrossValidations value to set. - * @return the TableVerticalValidationDataSettings object itself. - */ - public TableVerticalValidationDataSettings withNCrossValidations(NCrossValidations nCrossValidations) { - this.nCrossValidations = nCrossValidations; - return this; - } - - /** {@inheritDoc} */ - @Override - public TableVerticalValidationDataSettings withData(MLTableJobInput data) { - super.withData(data); - return this; - } - - /** {@inheritDoc} */ - @Override - public TableVerticalValidationDataSettings withValidationDataSize(Double validationDataSize) { - super.withValidationDataSize(validationDataSize); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (nCrossValidations() != null) { - nCrossValidations().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetAggregationFunction.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetAggregationFunction.java deleted file mode 100644 index 2479f0d555f0..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetAggregationFunction.java +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for TargetAggregationFunction. */ -public final class TargetAggregationFunction extends ExpandableStringEnum { - /** Static value None for TargetAggregationFunction. */ - public static final TargetAggregationFunction NONE = fromString("None"); - - /** Static value Sum for TargetAggregationFunction. */ - public static final TargetAggregationFunction SUM = fromString("Sum"); - - /** Static value Max for TargetAggregationFunction. */ - public static final TargetAggregationFunction MAX = fromString("Max"); - - /** Static value Min for TargetAggregationFunction. */ - public static final TargetAggregationFunction MIN = fromString("Min"); - - /** Static value Mean for TargetAggregationFunction. */ - public static final TargetAggregationFunction MEAN = fromString("Mean"); - - /** - * Creates or finds a TargetAggregationFunction from its string representation. - * - * @param name a name to look for. - * @return the corresponding TargetAggregationFunction. - */ - @JsonCreator - public static TargetAggregationFunction fromString(String name) { - return fromString(name, TargetAggregationFunction.class); - } - - /** - * Gets known TargetAggregationFunction values. - * - * @return known TargetAggregationFunction values. - */ - public static Collection values() { - return values(TargetAggregationFunction.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetLags.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetLags.java deleted file mode 100644 index 247e53fc3cbf..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetLags.java +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Immutable; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** The number of past periods to lag from the target column. */ -@JsonTypeInfo( - use = JsonTypeInfo.Id.NAME, - include = JsonTypeInfo.As.PROPERTY, - property = "mode", - defaultImpl = TargetLags.class) -@JsonTypeName("TargetLags") -@JsonSubTypes({ - @JsonSubTypes.Type(name = "Auto", value = AutoTargetLags.class), - @JsonSubTypes.Type(name = "Custom", value = CustomTargetLags.class) -}) -@Immutable -public class TargetLags { - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetLagsMode.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetLagsMode.java deleted file mode 100644 index 75e0e3896045..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetLagsMode.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for TargetLagsMode. */ -public final class TargetLagsMode extends ExpandableStringEnum { - /** Static value Auto for TargetLagsMode. */ - public static final TargetLagsMode AUTO = fromString("Auto"); - - /** Static value Custom for TargetLagsMode. */ - public static final TargetLagsMode CUSTOM = fromString("Custom"); - - /** - * Creates or finds a TargetLagsMode from its string representation. - * - * @param name a name to look for. - * @return the corresponding TargetLagsMode. - */ - @JsonCreator - public static TargetLagsMode fromString(String name) { - return fromString(name, TargetLagsMode.class); - } - - /** - * Gets known TargetLagsMode values. - * - * @return known TargetLagsMode values. - */ - public static Collection values() { - return values(TargetLagsMode.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetRollingWindowSize.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetRollingWindowSize.java deleted file mode 100644 index 6d4fcbc957ab..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetRollingWindowSize.java +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Immutable; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** Forecasting target rolling window size. */ -@JsonTypeInfo( - use = JsonTypeInfo.Id.NAME, - include = JsonTypeInfo.As.PROPERTY, - property = "mode", - defaultImpl = TargetRollingWindowSize.class) -@JsonTypeName("TargetRollingWindowSize") -@JsonSubTypes({ - @JsonSubTypes.Type(name = "Auto", value = AutoTargetRollingWindowSize.class), - @JsonSubTypes.Type(name = "Custom", value = CustomTargetRollingWindowSize.class) -}) -@Immutable -public class TargetRollingWindowSize { - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetRollingWindowSizeMode.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetRollingWindowSizeMode.java deleted file mode 100644 index 602aaeea6f70..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TargetRollingWindowSizeMode.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for TargetRollingWindowSizeMode. */ -public final class TargetRollingWindowSizeMode extends ExpandableStringEnum { - /** Static value Auto for TargetRollingWindowSizeMode. */ - public static final TargetRollingWindowSizeMode AUTO = fromString("Auto"); - - /** Static value Custom for TargetRollingWindowSizeMode. */ - public static final TargetRollingWindowSizeMode CUSTOM = fromString("Custom"); - - /** - * Creates or finds a TargetRollingWindowSizeMode from its string representation. - * - * @param name a name to look for. - * @return the corresponding TargetRollingWindowSizeMode. - */ - @JsonCreator - public static TargetRollingWindowSizeMode fromString(String name) { - return fromString(name, TargetRollingWindowSizeMode.class); - } - - /** - * Gets known TargetRollingWindowSizeMode values. - * - * @return known TargetRollingWindowSizeMode values. - */ - public static Collection values() { - return values(TargetRollingWindowSizeMode.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TaskType.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TaskType.java deleted file mode 100644 index 4913494e15a8..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TaskType.java +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for TaskType. */ -public final class TaskType extends ExpandableStringEnum { - /** Static value Classification for TaskType. */ - public static final TaskType CLASSIFICATION = fromString("Classification"); - - /** Static value Regression for TaskType. */ - public static final TaskType REGRESSION = fromString("Regression"); - - /** Static value Forecasting for TaskType. */ - public static final TaskType FORECASTING = fromString("Forecasting"); - - /** Static value ImageClassification for TaskType. */ - public static final TaskType IMAGE_CLASSIFICATION = fromString("ImageClassification"); - - /** Static value ImageClassificationMultilabel for TaskType. */ - public static final TaskType IMAGE_CLASSIFICATION_MULTILABEL = fromString("ImageClassificationMultilabel"); - - /** Static value ImageObjectDetection for TaskType. */ - public static final TaskType IMAGE_OBJECT_DETECTION = fromString("ImageObjectDetection"); - - /** Static value ImageInstanceSegmentation for TaskType. */ - public static final TaskType IMAGE_INSTANCE_SEGMENTATION = fromString("ImageInstanceSegmentation"); - - /** Static value TextClassification for TaskType. */ - public static final TaskType TEXT_CLASSIFICATION = fromString("TextClassification"); - - /** Static value TextClassificationMultilabel for TaskType. */ - public static final TaskType TEXT_CLASSIFICATION_MULTILABEL = fromString("TextClassificationMultilabel"); - - /** Static value TextNER for TaskType. */ - public static final TaskType TEXT_NER = fromString("TextNER"); - - /** - * Creates or finds a TaskType from its string representation. - * - * @param name a name to look for. - * @return the corresponding TaskType. - */ - @JsonCreator - public static TaskType fromString(String name) { - return fromString(name, TaskType.class); - } - - /** - * Gets known TaskType values. - * - * @return known TaskType values. - */ - public static Collection values() { - return values(TaskType.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TestDataSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TestDataSettings.java deleted file mode 100644 index 53e832a6dfcd..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TestDataSettings.java +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** Test data inputs. */ -@Fluent -public final class TestDataSettings { - /* - * Test data MLTable. - */ - @JsonProperty(value = "data") - private MLTableJobInput data; - - /* - * The fraction of test dataset that needs to be set aside for validation - * purpose. - * Values between (0.0 , 1.0) - * Applied when validation dataset is not provided. - */ - @JsonProperty(value = "testDataSize") - private Double testDataSize; - - /** - * Get the data property: Test data MLTable. - * - * @return the data value. - */ - public MLTableJobInput data() { - return this.data; - } - - /** - * Set the data property: Test data MLTable. - * - * @param data the data value to set. - * @return the TestDataSettings object itself. - */ - public TestDataSettings withData(MLTableJobInput data) { - this.data = data; - return this; - } - - /** - * Get the testDataSize property: The fraction of test dataset that needs to be set aside for validation purpose. - * Values between (0.0 , 1.0) Applied when validation dataset is not provided. - * - * @return the testDataSize value. - */ - public Double testDataSize() { - return this.testDataSize; - } - - /** - * Set the testDataSize property: The fraction of test dataset that needs to be set aside for validation purpose. - * Values between (0.0 , 1.0) Applied when validation dataset is not provided. - * - * @param testDataSize the testDataSize value to set. - * @return the TestDataSettings object itself. - */ - public TestDataSettings withTestDataSize(Double testDataSize) { - this.testDataSize = testDataSize; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (data() != null) { - data().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TextClassification.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TextClassification.java deleted file mode 100644 index fcc2d0bc8462..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TextClassification.java +++ /dev/null @@ -1,146 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** Text Classification task in AutoML NLP vertical. NLP - Natural Language Processing. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType") -@JsonTypeName("TextClassification") -@Fluent -public final class TextClassification extends AutoMLVertical { - /* - * Primary metric for Text-Classification task. - */ - @JsonProperty(value = "primaryMetric") - private ClassificationPrimaryMetrics primaryMetric; - - /* - * Data inputs for AutoMLJob. - */ - @JsonProperty(value = "dataSettings") - private NlpVerticalDataSettings dataSettings; - - /* - * Featurization inputs needed for AutoML job. - */ - @JsonProperty(value = "featurizationSettings") - private NlpVerticalFeaturizationSettings featurizationSettings; - - /* - * Execution constraints for AutoMLJob. - */ - @JsonProperty(value = "limitSettings") - private NlpVerticalLimitSettings limitSettings; - - /** - * Get the primaryMetric property: Primary metric for Text-Classification task. - * - * @return the primaryMetric value. - */ - public ClassificationPrimaryMetrics primaryMetric() { - return this.primaryMetric; - } - - /** - * Set the primaryMetric property: Primary metric for Text-Classification task. - * - * @param primaryMetric the primaryMetric value to set. - * @return the TextClassification object itself. - */ - public TextClassification withPrimaryMetric(ClassificationPrimaryMetrics primaryMetric) { - this.primaryMetric = primaryMetric; - return this; - } - - /** - * Get the dataSettings property: Data inputs for AutoMLJob. - * - * @return the dataSettings value. - */ - public NlpVerticalDataSettings dataSettings() { - return this.dataSettings; - } - - /** - * Set the dataSettings property: Data inputs for AutoMLJob. - * - * @param dataSettings the dataSettings value to set. - * @return the TextClassification object itself. - */ - public TextClassification withDataSettings(NlpVerticalDataSettings dataSettings) { - this.dataSettings = dataSettings; - return this; - } - - /** - * Get the featurizationSettings property: Featurization inputs needed for AutoML job. - * - * @return the featurizationSettings value. - */ - public NlpVerticalFeaturizationSettings featurizationSettings() { - return this.featurizationSettings; - } - - /** - * Set the featurizationSettings property: Featurization inputs needed for AutoML job. - * - * @param featurizationSettings the featurizationSettings value to set. - * @return the TextClassification object itself. - */ - public TextClassification withFeaturizationSettings(NlpVerticalFeaturizationSettings featurizationSettings) { - this.featurizationSettings = featurizationSettings; - return this; - } - - /** - * Get the limitSettings property: Execution constraints for AutoMLJob. - * - * @return the limitSettings value. - */ - public NlpVerticalLimitSettings limitSettings() { - return this.limitSettings; - } - - /** - * Set the limitSettings property: Execution constraints for AutoMLJob. - * - * @param limitSettings the limitSettings value to set. - * @return the TextClassification object itself. - */ - public TextClassification withLimitSettings(NlpVerticalLimitSettings limitSettings) { - this.limitSettings = limitSettings; - return this; - } - - /** {@inheritDoc} */ - @Override - public TextClassification withLogVerbosity(LogVerbosity logVerbosity) { - super.withLogVerbosity(logVerbosity); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (dataSettings() != null) { - dataSettings().validate(); - } - if (featurizationSettings() != null) { - featurizationSettings().validate(); - } - if (limitSettings() != null) { - limitSettings().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TextClassificationMultilabel.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TextClassificationMultilabel.java deleted file mode 100644 index 0b35a8b86b92..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TextClassificationMultilabel.java +++ /dev/null @@ -1,139 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** Text Classification Multilabel task in AutoML NLP vertical. NLP - Natural Language Processing. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType") -@JsonTypeName("TextClassificationMultilabel") -@Fluent -public final class TextClassificationMultilabel extends AutoMLVertical { - /* - * Primary metric for Text-Classification-Multilabel task. - * Currently only Accuracy is supported as primary metric, hence user need - * not set it explicitly. - */ - @JsonProperty(value = "primaryMetric", access = JsonProperty.Access.WRITE_ONLY) - private ClassificationMultilabelPrimaryMetrics primaryMetric; - - /* - * Data inputs for AutoMLJob. - */ - @JsonProperty(value = "dataSettings") - private NlpVerticalDataSettings dataSettings; - - /* - * Featurization inputs needed for AutoML job. - */ - @JsonProperty(value = "featurizationSettings") - private NlpVerticalFeaturizationSettings featurizationSettings; - - /* - * Execution constraints for AutoMLJob. - */ - @JsonProperty(value = "limitSettings") - private NlpVerticalLimitSettings limitSettings; - - /** - * Get the primaryMetric property: Primary metric for Text-Classification-Multilabel task. Currently only Accuracy - * is supported as primary metric, hence user need not set it explicitly. - * - * @return the primaryMetric value. - */ - public ClassificationMultilabelPrimaryMetrics primaryMetric() { - return this.primaryMetric; - } - - /** - * Get the dataSettings property: Data inputs for AutoMLJob. - * - * @return the dataSettings value. - */ - public NlpVerticalDataSettings dataSettings() { - return this.dataSettings; - } - - /** - * Set the dataSettings property: Data inputs for AutoMLJob. - * - * @param dataSettings the dataSettings value to set. - * @return the TextClassificationMultilabel object itself. - */ - public TextClassificationMultilabel withDataSettings(NlpVerticalDataSettings dataSettings) { - this.dataSettings = dataSettings; - return this; - } - - /** - * Get the featurizationSettings property: Featurization inputs needed for AutoML job. - * - * @return the featurizationSettings value. - */ - public NlpVerticalFeaturizationSettings featurizationSettings() { - return this.featurizationSettings; - } - - /** - * Set the featurizationSettings property: Featurization inputs needed for AutoML job. - * - * @param featurizationSettings the featurizationSettings value to set. - * @return the TextClassificationMultilabel object itself. - */ - public TextClassificationMultilabel withFeaturizationSettings( - NlpVerticalFeaturizationSettings featurizationSettings) { - this.featurizationSettings = featurizationSettings; - return this; - } - - /** - * Get the limitSettings property: Execution constraints for AutoMLJob. - * - * @return the limitSettings value. - */ - public NlpVerticalLimitSettings limitSettings() { - return this.limitSettings; - } - - /** - * Set the limitSettings property: Execution constraints for AutoMLJob. - * - * @param limitSettings the limitSettings value to set. - * @return the TextClassificationMultilabel object itself. - */ - public TextClassificationMultilabel withLimitSettings(NlpVerticalLimitSettings limitSettings) { - this.limitSettings = limitSettings; - return this; - } - - /** {@inheritDoc} */ - @Override - public TextClassificationMultilabel withLogVerbosity(LogVerbosity logVerbosity) { - super.withLogVerbosity(logVerbosity); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (dataSettings() != null) { - dataSettings().validate(); - } - if (featurizationSettings() != null) { - featurizationSettings().validate(); - } - if (limitSettings() != null) { - limitSettings().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TextNer.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TextNer.java deleted file mode 100644 index aa93b9e1c0ba..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TextNer.java +++ /dev/null @@ -1,138 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** Text-NER task in AutoML NLP vertical. NER - Named Entity Recognition. NLP - Natural Language Processing. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "taskType") -@JsonTypeName("TextNER") -@Fluent -public final class TextNer extends AutoMLVertical { - /* - * Primary metric for Text-NER task. - * Only 'Accuracy' is supported for Text-NER, so user need not set this - * explicitly. - */ - @JsonProperty(value = "primaryMetric", access = JsonProperty.Access.WRITE_ONLY) - private ClassificationPrimaryMetrics primaryMetric; - - /* - * Data inputs for AutoMLJob. - */ - @JsonProperty(value = "dataSettings") - private NlpVerticalDataSettings dataSettings; - - /* - * Featurization inputs needed for AutoML job. - */ - @JsonProperty(value = "featurizationSettings") - private NlpVerticalFeaturizationSettings featurizationSettings; - - /* - * Execution constraints for AutoMLJob. - */ - @JsonProperty(value = "limitSettings") - private NlpVerticalLimitSettings limitSettings; - - /** - * Get the primaryMetric property: Primary metric for Text-NER task. Only 'Accuracy' is supported for Text-NER, so - * user need not set this explicitly. - * - * @return the primaryMetric value. - */ - public ClassificationPrimaryMetrics primaryMetric() { - return this.primaryMetric; - } - - /** - * Get the dataSettings property: Data inputs for AutoMLJob. - * - * @return the dataSettings value. - */ - public NlpVerticalDataSettings dataSettings() { - return this.dataSettings; - } - - /** - * Set the dataSettings property: Data inputs for AutoMLJob. - * - * @param dataSettings the dataSettings value to set. - * @return the TextNer object itself. - */ - public TextNer withDataSettings(NlpVerticalDataSettings dataSettings) { - this.dataSettings = dataSettings; - return this; - } - - /** - * Get the featurizationSettings property: Featurization inputs needed for AutoML job. - * - * @return the featurizationSettings value. - */ - public NlpVerticalFeaturizationSettings featurizationSettings() { - return this.featurizationSettings; - } - - /** - * Set the featurizationSettings property: Featurization inputs needed for AutoML job. - * - * @param featurizationSettings the featurizationSettings value to set. - * @return the TextNer object itself. - */ - public TextNer withFeaturizationSettings(NlpVerticalFeaturizationSettings featurizationSettings) { - this.featurizationSettings = featurizationSettings; - return this; - } - - /** - * Get the limitSettings property: Execution constraints for AutoMLJob. - * - * @return the limitSettings value. - */ - public NlpVerticalLimitSettings limitSettings() { - return this.limitSettings; - } - - /** - * Set the limitSettings property: Execution constraints for AutoMLJob. - * - * @param limitSettings the limitSettings value to set. - * @return the TextNer object itself. - */ - public TextNer withLimitSettings(NlpVerticalLimitSettings limitSettings) { - this.limitSettings = limitSettings; - return this; - } - - /** {@inheritDoc} */ - @Override - public TextNer withLogVerbosity(LogVerbosity logVerbosity) { - super.withLogVerbosity(logVerbosity); - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - @Override - public void validate() { - super.validate(); - if (dataSettings() != null) { - dataSettings().validate(); - } - if (featurizationSettings() != null) { - featurizationSettings().validate(); - } - if (limitSettings() != null) { - limitSettings().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TrainingDataSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TrainingDataSettings.java deleted file mode 100644 index a6c1a31f294b..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TrainingDataSettings.java +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** Training data input. */ -@Fluent -public final class TrainingDataSettings { - /* - * [Required] Training data MLTable. - */ - @JsonProperty(value = "data", required = true) - private MLTableJobInput data; - - /** - * Get the data property: [Required] Training data MLTable. - * - * @return the data value. - */ - public MLTableJobInput data() { - return this.data; - } - - /** - * Set the data property: [Required] Training data MLTable. - * - * @param data the data value to set. - * @return the TrainingDataSettings object itself. - */ - public TrainingDataSettings withData(MLTableJobInput data) { - this.data = data; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (data() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException("Missing required property data in model TrainingDataSettings")); - } else { - data().validate(); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(TrainingDataSettings.class); -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TrainingSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TrainingSettings.java deleted file mode 100644 index 6c2ef2bde7b6..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TrainingSettings.java +++ /dev/null @@ -1,213 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.time.Duration; - -/** Training related configuration. */ -@Fluent -public final class TrainingSettings { - /* - * Enable recommendation of DNN models. - */ - @JsonProperty(value = "enableDnnTraining") - private Boolean enableDnnTraining; - - /* - * Flag to turn on explainability on best model. - */ - @JsonProperty(value = "enableModelExplainability") - private Boolean enableModelExplainability; - - /* - * Flag for enabling onnx compatible models. - */ - @JsonProperty(value = "enableOnnxCompatibleModels") - private Boolean enableOnnxCompatibleModels; - - /* - * Enable stack ensemble run. - */ - @JsonProperty(value = "enableStackEnsemble") - private Boolean enableStackEnsemble; - - /* - * Enable voting ensemble run. - */ - @JsonProperty(value = "enableVoteEnsemble") - private Boolean enableVoteEnsemble; - - /* - * During VotingEnsemble and StackEnsemble model generation, multiple - * fitted models from the previous child runs are downloaded. - * Configure this parameter with a higher value than 300 secs, if more time - * is needed. - */ - @JsonProperty(value = "ensembleModelDownloadTimeout") - private Duration ensembleModelDownloadTimeout; - - /* - * Stack ensemble settings for stack ensemble run. - */ - @JsonProperty(value = "stackEnsembleSettings") - private StackEnsembleSettings stackEnsembleSettings; - - /** - * Get the enableDnnTraining property: Enable recommendation of DNN models. - * - * @return the enableDnnTraining value. - */ - public Boolean enableDnnTraining() { - return this.enableDnnTraining; - } - - /** - * Set the enableDnnTraining property: Enable recommendation of DNN models. - * - * @param enableDnnTraining the enableDnnTraining value to set. - * @return the TrainingSettings object itself. - */ - public TrainingSettings withEnableDnnTraining(Boolean enableDnnTraining) { - this.enableDnnTraining = enableDnnTraining; - return this; - } - - /** - * Get the enableModelExplainability property: Flag to turn on explainability on best model. - * - * @return the enableModelExplainability value. - */ - public Boolean enableModelExplainability() { - return this.enableModelExplainability; - } - - /** - * Set the enableModelExplainability property: Flag to turn on explainability on best model. - * - * @param enableModelExplainability the enableModelExplainability value to set. - * @return the TrainingSettings object itself. - */ - public TrainingSettings withEnableModelExplainability(Boolean enableModelExplainability) { - this.enableModelExplainability = enableModelExplainability; - return this; - } - - /** - * Get the enableOnnxCompatibleModels property: Flag for enabling onnx compatible models. - * - * @return the enableOnnxCompatibleModels value. - */ - public Boolean enableOnnxCompatibleModels() { - return this.enableOnnxCompatibleModels; - } - - /** - * Set the enableOnnxCompatibleModels property: Flag for enabling onnx compatible models. - * - * @param enableOnnxCompatibleModels the enableOnnxCompatibleModels value to set. - * @return the TrainingSettings object itself. - */ - public TrainingSettings withEnableOnnxCompatibleModels(Boolean enableOnnxCompatibleModels) { - this.enableOnnxCompatibleModels = enableOnnxCompatibleModels; - return this; - } - - /** - * Get the enableStackEnsemble property: Enable stack ensemble run. - * - * @return the enableStackEnsemble value. - */ - public Boolean enableStackEnsemble() { - return this.enableStackEnsemble; - } - - /** - * Set the enableStackEnsemble property: Enable stack ensemble run. - * - * @param enableStackEnsemble the enableStackEnsemble value to set. - * @return the TrainingSettings object itself. - */ - public TrainingSettings withEnableStackEnsemble(Boolean enableStackEnsemble) { - this.enableStackEnsemble = enableStackEnsemble; - return this; - } - - /** - * Get the enableVoteEnsemble property: Enable voting ensemble run. - * - * @return the enableVoteEnsemble value. - */ - public Boolean enableVoteEnsemble() { - return this.enableVoteEnsemble; - } - - /** - * Set the enableVoteEnsemble property: Enable voting ensemble run. - * - * @param enableVoteEnsemble the enableVoteEnsemble value to set. - * @return the TrainingSettings object itself. - */ - public TrainingSettings withEnableVoteEnsemble(Boolean enableVoteEnsemble) { - this.enableVoteEnsemble = enableVoteEnsemble; - return this; - } - - /** - * Get the ensembleModelDownloadTimeout property: During VotingEnsemble and StackEnsemble model generation, multiple - * fitted models from the previous child runs are downloaded. Configure this parameter with a higher value than 300 - * secs, if more time is needed. - * - * @return the ensembleModelDownloadTimeout value. - */ - public Duration ensembleModelDownloadTimeout() { - return this.ensembleModelDownloadTimeout; - } - - /** - * Set the ensembleModelDownloadTimeout property: During VotingEnsemble and StackEnsemble model generation, multiple - * fitted models from the previous child runs are downloaded. Configure this parameter with a higher value than 300 - * secs, if more time is needed. - * - * @param ensembleModelDownloadTimeout the ensembleModelDownloadTimeout value to set. - * @return the TrainingSettings object itself. - */ - public TrainingSettings withEnsembleModelDownloadTimeout(Duration ensembleModelDownloadTimeout) { - this.ensembleModelDownloadTimeout = ensembleModelDownloadTimeout; - return this; - } - - /** - * Get the stackEnsembleSettings property: Stack ensemble settings for stack ensemble run. - * - * @return the stackEnsembleSettings value. - */ - public StackEnsembleSettings stackEnsembleSettings() { - return this.stackEnsembleSettings; - } - - /** - * Set the stackEnsembleSettings property: Stack ensemble settings for stack ensemble run. - * - * @param stackEnsembleSettings the stackEnsembleSettings value to set. - * @return the TrainingSettings object itself. - */ - public TrainingSettings withStackEnsembleSettings(StackEnsembleSettings stackEnsembleSettings) { - this.stackEnsembleSettings = stackEnsembleSettings; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (stackEnsembleSettings() != null) { - stackEnsembleSettings().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TritonModelJobInput.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TritonModelJobInput.java index dde01e0b5fa9..8ffda7712078 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TritonModelJobInput.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TritonModelJobInput.java @@ -5,72 +5,52 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; /** The TritonModelJobInput model. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "jobInputType") -@JsonTypeName("TritonModel") +@JsonTypeName("triton_model") @Fluent -public final class TritonModelJobInput extends JobInput { +public final class TritonModelJobInput extends AssetJobInput { /* - * Input Asset Delivery Mode. + * Description for the input. */ - @JsonProperty(value = "mode") - private InputDeliveryMode mode; - - /* - * [Required] Input Asset URI. - */ - @JsonProperty(value = "uri", required = true) - private String uri; + @JsonProperty(value = "description") + private String description; /** - * Get the mode property: Input Asset Delivery Mode. + * Get the description property: Description for the input. * - * @return the mode value. + * @return the description value. */ - public InputDeliveryMode mode() { - return this.mode; + public String description() { + return this.description; } /** - * Set the mode property: Input Asset Delivery Mode. + * Set the description property: Description for the input. * - * @param mode the mode value to set. + * @param description the description value to set. * @return the TritonModelJobInput object itself. */ - public TritonModelJobInput withMode(InputDeliveryMode mode) { - this.mode = mode; + public TritonModelJobInput withDescription(String description) { + this.description = description; return this; } - /** - * Get the uri property: [Required] Input Asset URI. - * - * @return the uri value. - */ - public String uri() { - return this.uri; - } - - /** - * Set the uri property: [Required] Input Asset URI. - * - * @param uri the uri value to set. - * @return the TritonModelJobInput object itself. - */ - public TritonModelJobInput withUri(String uri) { - this.uri = uri; + /** {@inheritDoc} */ + @Override + public TritonModelJobInput withMode(InputDeliveryMode mode) { + super.withMode(mode); return this; } /** {@inheritDoc} */ @Override - public TritonModelJobInput withDescription(String description) { - super.withDescription(description); + public TritonModelJobInput withUri(String uri) { + super.withUri(uri); return this; } @@ -82,12 +62,5 @@ public TritonModelJobInput withDescription(String description) { @Override public void validate() { super.validate(); - if (uri() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException("Missing required property uri in model TritonModelJobInput")); - } } - - private static final ClientLogger LOGGER = new ClientLogger(TritonModelJobInput.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TritonModelJobOutput.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TritonModelJobOutput.java index 87b7ab40bfdd..e11a26caed2b 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TritonModelJobOutput.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/TritonModelJobOutput.java @@ -11,65 +11,46 @@ /** The TritonModelJobOutput model. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "jobOutputType") -@JsonTypeName("TritonModel") +@JsonTypeName("triton_model") @Fluent -public final class TritonModelJobOutput extends JobOutput { +public final class TritonModelJobOutput extends AssetJobOutput { /* - * Output Asset Delivery Mode. + * Description for the output. */ - @JsonProperty(value = "mode") - private OutputDeliveryMode mode; - - /* - * Output Asset URI. - */ - @JsonProperty(value = "uri") - private String uri; + @JsonProperty(value = "description") + private String description; /** - * Get the mode property: Output Asset Delivery Mode. + * Get the description property: Description for the output. * - * @return the mode value. + * @return the description value. */ - public OutputDeliveryMode mode() { - return this.mode; + public String description() { + return this.description; } /** - * Set the mode property: Output Asset Delivery Mode. + * Set the description property: Description for the output. * - * @param mode the mode value to set. + * @param description the description value to set. * @return the TritonModelJobOutput object itself. */ - public TritonModelJobOutput withMode(OutputDeliveryMode mode) { - this.mode = mode; + public TritonModelJobOutput withDescription(String description) { + this.description = description; return this; } - /** - * Get the uri property: Output Asset URI. - * - * @return the uri value. - */ - public String uri() { - return this.uri; - } - - /** - * Set the uri property: Output Asset URI. - * - * @param uri the uri value to set. - * @return the TritonModelJobOutput object itself. - */ - public TritonModelJobOutput withUri(String uri) { - this.uri = uri; + /** {@inheritDoc} */ + @Override + public TritonModelJobOutput withMode(OutputDeliveryMode mode) { + super.withMode(mode); return this; } /** {@inheritDoc} */ @Override - public TritonModelJobOutput withDescription(String description) { - super.withDescription(description); + public TritonModelJobOutput withUri(String uri) { + super.withUri(uri); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFileDataVersion.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFileDataVersion.java index e604e249f90e..19e2ce991b8e 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFileDataVersion.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFileDataVersion.java @@ -11,9 +11,9 @@ /** uri-file data version entity. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "dataType") -@JsonTypeName("UriFile") +@JsonTypeName("uri_file") @Fluent -public final class UriFileDataVersion extends DataVersionBaseDetails { +public final class UriFileDataVersion extends DataVersionBaseProperties { /** {@inheritDoc} */ @Override public UriFileDataVersion withDataUri(String dataUri) { diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFileJobInput.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFileJobInput.java index 88e20a573df0..68b2c34f8ab3 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFileJobInput.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFileJobInput.java @@ -5,72 +5,52 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; /** The UriFileJobInput model. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "jobInputType") -@JsonTypeName("UriFile") +@JsonTypeName("uri_file") @Fluent -public final class UriFileJobInput extends JobInput { +public final class UriFileJobInput extends AssetJobInput { /* - * Input Asset Delivery Mode. + * Description for the input. */ - @JsonProperty(value = "mode") - private InputDeliveryMode mode; - - /* - * [Required] Input Asset URI. - */ - @JsonProperty(value = "uri", required = true) - private String uri; + @JsonProperty(value = "description") + private String description; /** - * Get the mode property: Input Asset Delivery Mode. + * Get the description property: Description for the input. * - * @return the mode value. + * @return the description value. */ - public InputDeliveryMode mode() { - return this.mode; + public String description() { + return this.description; } /** - * Set the mode property: Input Asset Delivery Mode. + * Set the description property: Description for the input. * - * @param mode the mode value to set. + * @param description the description value to set. * @return the UriFileJobInput object itself. */ - public UriFileJobInput withMode(InputDeliveryMode mode) { - this.mode = mode; + public UriFileJobInput withDescription(String description) { + this.description = description; return this; } - /** - * Get the uri property: [Required] Input Asset URI. - * - * @return the uri value. - */ - public String uri() { - return this.uri; - } - - /** - * Set the uri property: [Required] Input Asset URI. - * - * @param uri the uri value to set. - * @return the UriFileJobInput object itself. - */ - public UriFileJobInput withUri(String uri) { - this.uri = uri; + /** {@inheritDoc} */ + @Override + public UriFileJobInput withMode(InputDeliveryMode mode) { + super.withMode(mode); return this; } /** {@inheritDoc} */ @Override - public UriFileJobInput withDescription(String description) { - super.withDescription(description); + public UriFileJobInput withUri(String uri) { + super.withUri(uri); return this; } @@ -82,12 +62,5 @@ public UriFileJobInput withDescription(String description) { @Override public void validate() { super.validate(); - if (uri() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException("Missing required property uri in model UriFileJobInput")); - } } - - private static final ClientLogger LOGGER = new ClientLogger(UriFileJobInput.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFileJobOutput.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFileJobOutput.java index 559611b1fb63..5fee769644e9 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFileJobOutput.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFileJobOutput.java @@ -11,65 +11,46 @@ /** The UriFileJobOutput model. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "jobOutputType") -@JsonTypeName("UriFile") +@JsonTypeName("uri_file") @Fluent -public final class UriFileJobOutput extends JobOutput { +public final class UriFileJobOutput extends AssetJobOutput { /* - * Output Asset Delivery Mode. + * Description for the output. */ - @JsonProperty(value = "mode") - private OutputDeliveryMode mode; - - /* - * Output Asset URI. - */ - @JsonProperty(value = "uri") - private String uri; + @JsonProperty(value = "description") + private String description; /** - * Get the mode property: Output Asset Delivery Mode. + * Get the description property: Description for the output. * - * @return the mode value. + * @return the description value. */ - public OutputDeliveryMode mode() { - return this.mode; + public String description() { + return this.description; } /** - * Set the mode property: Output Asset Delivery Mode. + * Set the description property: Description for the output. * - * @param mode the mode value to set. + * @param description the description value to set. * @return the UriFileJobOutput object itself. */ - public UriFileJobOutput withMode(OutputDeliveryMode mode) { - this.mode = mode; + public UriFileJobOutput withDescription(String description) { + this.description = description; return this; } - /** - * Get the uri property: Output Asset URI. - * - * @return the uri value. - */ - public String uri() { - return this.uri; - } - - /** - * Set the uri property: Output Asset URI. - * - * @param uri the uri value to set. - * @return the UriFileJobOutput object itself. - */ - public UriFileJobOutput withUri(String uri) { - this.uri = uri; + /** {@inheritDoc} */ + @Override + public UriFileJobOutput withMode(OutputDeliveryMode mode) { + super.withMode(mode); return this; } /** {@inheritDoc} */ @Override - public UriFileJobOutput withDescription(String description) { - super.withDescription(description); + public UriFileJobOutput withUri(String uri) { + super.withUri(uri); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFolderDataVersion.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFolderDataVersion.java index 2d20dd82ada1..49a701f4d565 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFolderDataVersion.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFolderDataVersion.java @@ -11,9 +11,9 @@ /** uri-folder data version entity. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "dataType") -@JsonTypeName("UriFolder") +@JsonTypeName("uri_folder") @Fluent -public final class UriFolderDataVersion extends DataVersionBaseDetails { +public final class UriFolderDataVersion extends DataVersionBaseProperties { /** {@inheritDoc} */ @Override public UriFolderDataVersion withDataUri(String dataUri) { diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFolderJobInput.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFolderJobInput.java index 7220e2d1e41e..cee4fcdfd4ba 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFolderJobInput.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFolderJobInput.java @@ -5,72 +5,52 @@ package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; /** The UriFolderJobInput model. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "jobInputType") -@JsonTypeName("UriFolder") +@JsonTypeName("uri_folder") @Fluent -public final class UriFolderJobInput extends JobInput { +public final class UriFolderJobInput extends AssetJobInput { /* - * Input Asset Delivery Mode. + * Description for the input. */ - @JsonProperty(value = "mode") - private InputDeliveryMode mode; - - /* - * [Required] Input Asset URI. - */ - @JsonProperty(value = "uri", required = true) - private String uri; + @JsonProperty(value = "description") + private String description; /** - * Get the mode property: Input Asset Delivery Mode. + * Get the description property: Description for the input. * - * @return the mode value. + * @return the description value. */ - public InputDeliveryMode mode() { - return this.mode; + public String description() { + return this.description; } /** - * Set the mode property: Input Asset Delivery Mode. + * Set the description property: Description for the input. * - * @param mode the mode value to set. + * @param description the description value to set. * @return the UriFolderJobInput object itself. */ - public UriFolderJobInput withMode(InputDeliveryMode mode) { - this.mode = mode; + public UriFolderJobInput withDescription(String description) { + this.description = description; return this; } - /** - * Get the uri property: [Required] Input Asset URI. - * - * @return the uri value. - */ - public String uri() { - return this.uri; - } - - /** - * Set the uri property: [Required] Input Asset URI. - * - * @param uri the uri value to set. - * @return the UriFolderJobInput object itself. - */ - public UriFolderJobInput withUri(String uri) { - this.uri = uri; + /** {@inheritDoc} */ + @Override + public UriFolderJobInput withMode(InputDeliveryMode mode) { + super.withMode(mode); return this; } /** {@inheritDoc} */ @Override - public UriFolderJobInput withDescription(String description) { - super.withDescription(description); + public UriFolderJobInput withUri(String uri) { + super.withUri(uri); return this; } @@ -82,12 +62,5 @@ public UriFolderJobInput withDescription(String description) { @Override public void validate() { super.validate(); - if (uri() == null) { - throw LOGGER - .logExceptionAsError( - new IllegalArgumentException("Missing required property uri in model UriFolderJobInput")); - } } - - private static final ClientLogger LOGGER = new ClientLogger(UriFolderJobInput.class); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFolderJobOutput.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFolderJobOutput.java index dbe331b23982..d61343181a27 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFolderJobOutput.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UriFolderJobOutput.java @@ -11,65 +11,46 @@ /** The UriFolderJobOutput model. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "jobOutputType") -@JsonTypeName("UriFolder") +@JsonTypeName("uri_folder") @Fluent -public final class UriFolderJobOutput extends JobOutput { +public final class UriFolderJobOutput extends AssetJobOutput { /* - * Output Asset Delivery Mode. + * Description for the output. */ - @JsonProperty(value = "mode") - private OutputDeliveryMode mode; - - /* - * Output Asset URI. - */ - @JsonProperty(value = "uri") - private String uri; + @JsonProperty(value = "description") + private String description; /** - * Get the mode property: Output Asset Delivery Mode. + * Get the description property: Description for the output. * - * @return the mode value. + * @return the description value. */ - public OutputDeliveryMode mode() { - return this.mode; + public String description() { + return this.description; } /** - * Set the mode property: Output Asset Delivery Mode. + * Set the description property: Description for the output. * - * @param mode the mode value to set. + * @param description the description value to set. * @return the UriFolderJobOutput object itself. */ - public UriFolderJobOutput withMode(OutputDeliveryMode mode) { - this.mode = mode; + public UriFolderJobOutput withDescription(String description) { + this.description = description; return this; } - /** - * Get the uri property: Output Asset URI. - * - * @return the uri value. - */ - public String uri() { - return this.uri; - } - - /** - * Set the uri property: Output Asset URI. - * - * @param uri the uri value to set. - * @return the UriFolderJobOutput object itself. - */ - public UriFolderJobOutput withUri(String uri) { - this.uri = uri; + /** {@inheritDoc} */ + @Override + public UriFolderJobOutput withMode(OutputDeliveryMode mode) { + super.withMode(mode); return this; } /** {@inheritDoc} */ @Override - public UriFolderJobOutput withDescription(String description) { - super.withDescription(description); + public UriFolderJobOutput withUri(String uri) { + super.withUri(uri); return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UseStl.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UseStl.java deleted file mode 100644 index 4e9d2d01c37f..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UseStl.java +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for UseStl. */ -public final class UseStl extends ExpandableStringEnum { - /** Static value None for UseStl. */ - public static final UseStl NONE = fromString("None"); - - /** Static value Season for UseStl. */ - public static final UseStl SEASON = fromString("Season"); - - /** Static value SeasonTrend for UseStl. */ - public static final UseStl SEASON_TREND = fromString("SeasonTrend"); - - /** - * Creates or finds a UseStl from its string representation. - * - * @param name a name to look for. - * @return the corresponding UseStl. - */ - @JsonCreator - public static UseStl fromString(String name) { - return fromString(name, UseStl.class); - } - - /** - * Gets known UseStl values. - * - * @return known UseStl values. - */ - public static Collection values() { - return values(UseStl.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UsernamePasswordAuthTypeWorkspaceConnectionProperties.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UsernamePasswordAuthTypeWorkspaceConnectionProperties.java new file mode 100644 index 000000000000..d1cafa1695bb --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/UsernamePasswordAuthTypeWorkspaceConnectionProperties.java @@ -0,0 +1,84 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.models; + +import com.azure.core.annotation.Fluent; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** The UsernamePasswordAuthTypeWorkspaceConnectionProperties model. */ +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "authType") +@JsonTypeName("UsernamePassword") +@Fluent +public final class UsernamePasswordAuthTypeWorkspaceConnectionProperties extends WorkspaceConnectionPropertiesV2 { + /* + * The credentials property. + */ + @JsonProperty(value = "credentials") + private WorkspaceConnectionUsernamePassword credentials; + + /** + * Get the credentials property: The credentials property. + * + * @return the credentials value. + */ + public WorkspaceConnectionUsernamePassword credentials() { + return this.credentials; + } + + /** + * Set the credentials property: The credentials property. + * + * @param credentials the credentials value to set. + * @return the UsernamePasswordAuthTypeWorkspaceConnectionProperties object itself. + */ + public UsernamePasswordAuthTypeWorkspaceConnectionProperties withCredentials( + WorkspaceConnectionUsernamePassword credentials) { + this.credentials = credentials; + return this; + } + + /** {@inheritDoc} */ + @Override + public UsernamePasswordAuthTypeWorkspaceConnectionProperties withCategory(ConnectionCategory category) { + super.withCategory(category); + return this; + } + + /** {@inheritDoc} */ + @Override + public UsernamePasswordAuthTypeWorkspaceConnectionProperties withTarget(String target) { + super.withTarget(target); + return this; + } + + /** {@inheritDoc} */ + @Override + public UsernamePasswordAuthTypeWorkspaceConnectionProperties withValue(String value) { + super.withValue(value); + return this; + } + + /** {@inheritDoc} */ + @Override + public UsernamePasswordAuthTypeWorkspaceConnectionProperties withValueFormat(ValueFormat valueFormat) { + super.withValueFormat(valueFormat); + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + @Override + public void validate() { + super.validate(); + if (credentials() != null) { + credentials().validate(); + } + } +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ValidationDataSettings.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ValidationDataSettings.java deleted file mode 100644 index 9e1610f594e3..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ValidationDataSettings.java +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.annotation.Fluent; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** Validation settings. */ -@Fluent -public class ValidationDataSettings { - /* - * Validation data MLTable. - */ - @JsonProperty(value = "data") - private MLTableJobInput data; - - /* - * The fraction of training dataset that needs to be set aside for - * validation purpose. - * Values between (0.0 , 1.0) - * Applied when validation dataset is not provided. - */ - @JsonProperty(value = "validationDataSize") - private Double validationDataSize; - - /** - * Get the data property: Validation data MLTable. - * - * @return the data value. - */ - public MLTableJobInput data() { - return this.data; - } - - /** - * Set the data property: Validation data MLTable. - * - * @param data the data value to set. - * @return the ValidationDataSettings object itself. - */ - public ValidationDataSettings withData(MLTableJobInput data) { - this.data = data; - return this; - } - - /** - * Get the validationDataSize property: The fraction of training dataset that needs to be set aside for validation - * purpose. Values between (0.0 , 1.0) Applied when validation dataset is not provided. - * - * @return the validationDataSize value. - */ - public Double validationDataSize() { - return this.validationDataSize; - } - - /** - * Set the validationDataSize property: The fraction of training dataset that needs to be set aside for validation - * purpose. Values between (0.0 , 1.0) Applied when validation dataset is not provided. - * - * @param validationDataSize the validationDataSize value to set. - * @return the ValidationDataSettings object itself. - */ - public ValidationDataSettings withValidationDataSize(Double validationDataSize) { - this.validationDataSize = validationDataSize; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (data() != null) { - data().validate(); - } - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ValidationMetricType.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ValidationMetricType.java deleted file mode 100644 index 1a88e58c6177..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ValidationMetricType.java +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for ValidationMetricType. */ -public final class ValidationMetricType extends ExpandableStringEnum { - /** Static value None for ValidationMetricType. */ - public static final ValidationMetricType NONE = fromString("None"); - - /** Static value Coco for ValidationMetricType. */ - public static final ValidationMetricType COCO = fromString("Coco"); - - /** Static value Voc for ValidationMetricType. */ - public static final ValidationMetricType VOC = fromString("Voc"); - - /** Static value CocoVoc for ValidationMetricType. */ - public static final ValidationMetricType COCO_VOC = fromString("CocoVoc"); - - /** - * Creates or finds a ValidationMetricType from its string representation. - * - * @param name a name to look for. - * @return the corresponding ValidationMetricType. - */ - @JsonCreator - public static ValidationMetricType fromString(String name) { - return fromString(name, ValidationMetricType.class); - } - - /** - * Gets known ValidationMetricType values. - * - * @return known ValidationMetricType values. - */ - public static Collection values() { - return values(ValidationMetricType.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Weekday.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Weekday.java deleted file mode 100644 index fe113a65753a..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Weekday.java +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for Weekday. */ -public final class Weekday extends ExpandableStringEnum { - /** Static value Monday for Weekday. */ - public static final Weekday MONDAY = fromString("Monday"); - - /** Static value Tuesday for Weekday. */ - public static final Weekday TUESDAY = fromString("Tuesday"); - - /** Static value Wednesday for Weekday. */ - public static final Weekday WEDNESDAY = fromString("Wednesday"); - - /** Static value Thursday for Weekday. */ - public static final Weekday THURSDAY = fromString("Thursday"); - - /** Static value Friday for Weekday. */ - public static final Weekday FRIDAY = fromString("Friday"); - - /** Static value Saturday for Weekday. */ - public static final Weekday SATURDAY = fromString("Saturday"); - - /** Static value Sunday for Weekday. */ - public static final Weekday SUNDAY = fromString("Sunday"); - - /** - * Creates or finds a Weekday from its string representation. - * - * @param name a name to look for. - * @return the corresponding Weekday. - */ - @JsonCreator - public static Weekday fromString(String name) { - return fromString(name, Weekday.class); - } - - /** - * Gets known Weekday values. - * - * @return known Weekday values. - */ - public static Collection values() { - return values(Weekday.class); - } -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Workspace.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Workspace.java index d3c6896d3395..e2a7b3f57de0 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Workspace.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/Workspace.java @@ -248,6 +248,14 @@ public interface Workspace { */ String mlFlowTrackingUri(); + /** + * Gets the v1LegacyMode property: Enabling v1_legacy_mode may prevent you from using features provided by the v2 + * API. + * + * @return the v1LegacyMode value. + */ + Boolean v1LegacyMode(); + /** * Gets the region of the resource. * @@ -318,7 +326,8 @@ interface WithCreate DefinitionStages.WithPublicNetworkAccess, DefinitionStages.WithSharedPrivateLinkResources, DefinitionStages.WithServiceManagedResourcesSettings, - DefinitionStages.WithPrimaryUserAssignedIdentity { + DefinitionStages.WithPrimaryUserAssignedIdentity, + DefinitionStages.WithV1LegacyMode { /** * Executes the create request. * @@ -548,6 +557,17 @@ interface WithPrimaryUserAssignedIdentity { */ WithCreate withPrimaryUserAssignedIdentity(String primaryUserAssignedIdentity); } + /** The stage of the Workspace definition allowing to specify v1LegacyMode. */ + interface WithV1LegacyMode { + /** + * Specifies the v1LegacyMode property: Enabling v1_legacy_mode may prevent you from using features provided + * by the v2 API.. + * + * @param v1LegacyMode Enabling v1_legacy_mode may prevent you from using features provided by the v2 API. + * @return the next definition stage. + */ + WithCreate withV1LegacyMode(Boolean v1LegacyMode); + } } /** * Begins update for the Workspace resource. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnection.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnection.java deleted file mode 100644 index 448fa89e35a6..000000000000 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnection.java +++ /dev/null @@ -1,193 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.machinelearning.models; - -import com.azure.core.management.SystemData; -import com.azure.core.util.Context; -import com.azure.resourcemanager.machinelearning.fluent.models.WorkspaceConnectionInner; - -/** An immutable client-side representation of WorkspaceConnection. */ -public interface WorkspaceConnection { - /** - * Gets the id property: Fully qualified resource Id for the resource. - * - * @return the id value. - */ - String id(); - - /** - * Gets the name property: The name of the resource. - * - * @return the name value. - */ - String name(); - - /** - * Gets the type property: The type of the resource. - * - * @return the type value. - */ - String type(); - - /** - * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. - * - * @return the systemData value. - */ - SystemData systemData(); - - /** - * Gets the category property: Category of the workspace connection. - * - * @return the category value. - */ - String category(); - - /** - * Gets the target property: Target of the workspace connection. - * - * @return the target value. - */ - String target(); - - /** - * Gets the authType property: Authorization type of the workspace connection. - * - * @return the authType value. - */ - String authType(); - - /** - * Gets the value property: Value details of the workspace connection. - * - * @return the value value. - */ - String value(); - - /** - * Gets the valueFormat property: format for the workspace connection value. - * - * @return the valueFormat value. - */ - ValueFormat valueFormat(); - - /** - * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.WorkspaceConnectionInner object. - * - * @return the inner object. - */ - WorkspaceConnectionInner innerModel(); - - /** The entirety of the WorkspaceConnection definition. */ - interface Definition - extends DefinitionStages.Blank, DefinitionStages.WithParentResource, DefinitionStages.WithCreate { - } - /** The WorkspaceConnection definition stages. */ - interface DefinitionStages { - /** The first stage of the WorkspaceConnection definition. */ - interface Blank extends WithParentResource { - } - /** The stage of the WorkspaceConnection definition allowing to specify parent resource. */ - interface WithParentResource { - /** - * Specifies resourceGroupName, workspaceName. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param workspaceName Name of Azure Machine Learning workspace. - * @return the next definition stage. - */ - WithCreate withExistingWorkspace(String resourceGroupName, String workspaceName); - } - /** - * The stage of the WorkspaceConnection definition which contains all the minimum required properties for the - * resource to be created, but also allows for any other optional properties to be specified. - */ - interface WithCreate - extends DefinitionStages.WithCategory, - DefinitionStages.WithTarget, - DefinitionStages.WithAuthType, - DefinitionStages.WithValue, - DefinitionStages.WithValueFormat { - /** - * Executes the create request. - * - * @return the created resource. - */ - WorkspaceConnection create(); - - /** - * Executes the create request. - * - * @param context The context to associate with this operation. - * @return the created resource. - */ - WorkspaceConnection create(Context context); - } - /** The stage of the WorkspaceConnection definition allowing to specify category. */ - interface WithCategory { - /** - * Specifies the category property: Category of the workspace connection.. - * - * @param category Category of the workspace connection. - * @return the next definition stage. - */ - WithCreate withCategory(String category); - } - /** The stage of the WorkspaceConnection definition allowing to specify target. */ - interface WithTarget { - /** - * Specifies the target property: Target of the workspace connection.. - * - * @param target Target of the workspace connection. - * @return the next definition stage. - */ - WithCreate withTarget(String target); - } - /** The stage of the WorkspaceConnection definition allowing to specify authType. */ - interface WithAuthType { - /** - * Specifies the authType property: Authorization type of the workspace connection.. - * - * @param authType Authorization type of the workspace connection. - * @return the next definition stage. - */ - WithCreate withAuthType(String authType); - } - /** The stage of the WorkspaceConnection definition allowing to specify value. */ - interface WithValue { - /** - * Specifies the value property: Value details of the workspace connection.. - * - * @param value Value details of the workspace connection. - * @return the next definition stage. - */ - WithCreate withValue(String value); - } - /** The stage of the WorkspaceConnection definition allowing to specify valueFormat. */ - interface WithValueFormat { - /** - * Specifies the valueFormat property: format for the workspace connection value. - * - * @param valueFormat format for the workspace connection value. - * @return the next definition stage. - */ - WithCreate withValueFormat(ValueFormat valueFormat); - } - } - /** - * Refreshes the resource to sync with Azure. - * - * @return the refreshed resource. - */ - WorkspaceConnection refresh(); - - /** - * Refreshes the resource to sync with Azure. - * - * @param context The context to associate with this operation. - * @return the refreshed resource. - */ - WorkspaceConnection refresh(Context context); -} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionManagedIdentity.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionManagedIdentity.java new file mode 100644 index 000000000000..e0aae15b2cef --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionManagedIdentity.java @@ -0,0 +1,72 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.models; + +import com.azure.core.annotation.Fluent; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** The WorkspaceConnectionManagedIdentity model. */ +@Fluent +public class WorkspaceConnectionManagedIdentity { + /* + * The resourceId property. + */ + @JsonProperty(value = "resourceId") + private String resourceId; + + /* + * The clientId property. + */ + @JsonProperty(value = "clientId") + private String clientId; + + /** + * Get the resourceId property: The resourceId property. + * + * @return the resourceId value. + */ + public String resourceId() { + return this.resourceId; + } + + /** + * Set the resourceId property: The resourceId property. + * + * @param resourceId the resourceId value to set. + * @return the WorkspaceConnectionManagedIdentity object itself. + */ + public WorkspaceConnectionManagedIdentity withResourceId(String resourceId) { + this.resourceId = resourceId; + return this; + } + + /** + * Get the clientId property: The clientId property. + * + * @return the clientId value. + */ + public String clientId() { + return this.clientId; + } + + /** + * Set the clientId property: The clientId property. + * + * @param clientId the clientId value to set. + * @return the WorkspaceConnectionManagedIdentity object itself. + */ + public WorkspaceConnectionManagedIdentity withClientId(String clientId) { + this.clientId = clientId; + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + public void validate() { + } +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionPersonalAccessToken.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionPersonalAccessToken.java new file mode 100644 index 000000000000..31481d31ce02 --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionPersonalAccessToken.java @@ -0,0 +1,46 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.models; + +import com.azure.core.annotation.Fluent; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** The WorkspaceConnectionPersonalAccessToken model. */ +@Fluent +public final class WorkspaceConnectionPersonalAccessToken { + /* + * The pat property. + */ + @JsonProperty(value = "pat") + private String pat; + + /** + * Get the pat property: The pat property. + * + * @return the pat value. + */ + public String pat() { + return this.pat; + } + + /** + * Set the pat property: The pat property. + * + * @param pat the pat value to set. + * @return the WorkspaceConnectionPersonalAccessToken object itself. + */ + public WorkspaceConnectionPersonalAccessToken withPat(String pat) { + this.pat = pat; + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + public void validate() { + } +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/WorkspaceConnectionProps.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionPropertiesV2.java similarity index 51% rename from sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/WorkspaceConnectionProps.java rename to sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionPropertiesV2.java index 15f018b7d07c..e7dcf650f488 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/fluent/models/WorkspaceConnectionProps.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionPropertiesV2.java @@ -2,33 +2,42 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.resourcemanager.machinelearning.fluent.models; +package com.azure.resourcemanager.machinelearning.models; import com.azure.core.annotation.Fluent; -import com.azure.resourcemanager.machinelearning.models.ValueFormat; import com.fasterxml.jackson.annotation.JsonProperty; - -/** Workspace Connection specific properties. */ +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** The WorkspaceConnectionPropertiesV2 model. */ +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.PROPERTY, + property = "authType", + defaultImpl = WorkspaceConnectionPropertiesV2.class) +@JsonTypeName("WorkspaceConnectionPropertiesV2") +@JsonSubTypes({ + @JsonSubTypes.Type(name = "PAT", value = PatAuthTypeWorkspaceConnectionProperties.class), + @JsonSubTypes.Type(name = "SAS", value = SasAuthTypeWorkspaceConnectionProperties.class), + @JsonSubTypes.Type(name = "UsernamePassword", value = UsernamePasswordAuthTypeWorkspaceConnectionProperties.class), + @JsonSubTypes.Type(name = "None", value = NoneAuthTypeWorkspaceConnectionProperties.class), + @JsonSubTypes.Type(name = "ManagedIdentity", value = ManagedIdentityAuthTypeWorkspaceConnectionProperties.class) +}) @Fluent -public final class WorkspaceConnectionProps { +public class WorkspaceConnectionPropertiesV2 { /* - * Category of the workspace connection. + * Category of the connection */ @JsonProperty(value = "category") - private String category; + private ConnectionCategory category; /* - * Target of the workspace connection. + * The target property. */ @JsonProperty(value = "target") private String target; - /* - * Authorization type of the workspace connection. - */ - @JsonProperty(value = "authType") - private String authType; - /* * Value details of the workspace connection. */ @@ -42,27 +51,27 @@ public final class WorkspaceConnectionProps { private ValueFormat valueFormat; /** - * Get the category property: Category of the workspace connection. + * Get the category property: Category of the connection. * * @return the category value. */ - public String category() { + public ConnectionCategory category() { return this.category; } /** - * Set the category property: Category of the workspace connection. + * Set the category property: Category of the connection. * * @param category the category value to set. - * @return the WorkspaceConnectionProps object itself. + * @return the WorkspaceConnectionPropertiesV2 object itself. */ - public WorkspaceConnectionProps withCategory(String category) { + public WorkspaceConnectionPropertiesV2 withCategory(ConnectionCategory category) { this.category = category; return this; } /** - * Get the target property: Target of the workspace connection. + * Get the target property: The target property. * * @return the target value. */ @@ -71,36 +80,16 @@ public String target() { } /** - * Set the target property: Target of the workspace connection. + * Set the target property: The target property. * * @param target the target value to set. - * @return the WorkspaceConnectionProps object itself. + * @return the WorkspaceConnectionPropertiesV2 object itself. */ - public WorkspaceConnectionProps withTarget(String target) { + public WorkspaceConnectionPropertiesV2 withTarget(String target) { this.target = target; return this; } - /** - * Get the authType property: Authorization type of the workspace connection. - * - * @return the authType value. - */ - public String authType() { - return this.authType; - } - - /** - * Set the authType property: Authorization type of the workspace connection. - * - * @param authType the authType value to set. - * @return the WorkspaceConnectionProps object itself. - */ - public WorkspaceConnectionProps withAuthType(String authType) { - this.authType = authType; - return this; - } - /** * Get the value property: Value details of the workspace connection. * @@ -114,9 +103,9 @@ public String value() { * Set the value property: Value details of the workspace connection. * * @param value the value value to set. - * @return the WorkspaceConnectionProps object itself. + * @return the WorkspaceConnectionPropertiesV2 object itself. */ - public WorkspaceConnectionProps withValue(String value) { + public WorkspaceConnectionPropertiesV2 withValue(String value) { this.value = value; return this; } @@ -134,9 +123,9 @@ public ValueFormat valueFormat() { * Set the valueFormat property: format for the workspace connection value. * * @param valueFormat the valueFormat value to set. - * @return the WorkspaceConnectionProps object itself. + * @return the WorkspaceConnectionPropertiesV2 object itself. */ - public WorkspaceConnectionProps withValueFormat(ValueFormat valueFormat) { + public WorkspaceConnectionPropertiesV2 withValueFormat(ValueFormat valueFormat) { this.valueFormat = valueFormat; return this; } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionPropertiesV2BasicResource.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionPropertiesV2BasicResource.java new file mode 100644 index 000000000000..22ef3cb48926 --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionPropertiesV2BasicResource.java @@ -0,0 +1,127 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.models; + +import com.azure.core.management.SystemData; +import com.azure.core.util.Context; +import com.azure.resourcemanager.machinelearning.fluent.models.WorkspaceConnectionPropertiesV2BasicResourceInner; + +/** An immutable client-side representation of WorkspaceConnectionPropertiesV2BasicResource. */ +public interface WorkspaceConnectionPropertiesV2BasicResource { + /** + * Gets the id property: Fully qualified resource Id for the resource. + * + * @return the id value. + */ + String id(); + + /** + * Gets the name property: The name of the resource. + * + * @return the name value. + */ + String name(); + + /** + * Gets the type property: The type of the resource. + * + * @return the type value. + */ + String type(); + + /** + * Gets the properties property: The properties property. + * + * @return the properties value. + */ + WorkspaceConnectionPropertiesV2 properties(); + + /** + * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. + * + * @return the systemData value. + */ + SystemData systemData(); + + /** + * Gets the inner + * com.azure.resourcemanager.machinelearning.fluent.models.WorkspaceConnectionPropertiesV2BasicResourceInner object. + * + * @return the inner object. + */ + WorkspaceConnectionPropertiesV2BasicResourceInner innerModel(); + + /** The entirety of the WorkspaceConnectionPropertiesV2BasicResource definition. */ + interface Definition + extends DefinitionStages.Blank, + DefinitionStages.WithParentResource, + DefinitionStages.WithProperties, + DefinitionStages.WithCreate { + } + /** The WorkspaceConnectionPropertiesV2BasicResource definition stages. */ + interface DefinitionStages { + /** The first stage of the WorkspaceConnectionPropertiesV2BasicResource definition. */ + interface Blank extends WithParentResource { + } + /** + * The stage of the WorkspaceConnectionPropertiesV2BasicResource definition allowing to specify parent resource. + */ + interface WithParentResource { + /** + * Specifies resourceGroupName, workspaceName. + * + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @return the next definition stage. + */ + WithProperties withExistingWorkspace(String resourceGroupName, String workspaceName); + } + /** The stage of the WorkspaceConnectionPropertiesV2BasicResource definition allowing to specify properties. */ + interface WithProperties { + /** + * Specifies the properties property: The properties property.. + * + * @param properties The properties property. + * @return the next definition stage. + */ + WithCreate withProperties(WorkspaceConnectionPropertiesV2 properties); + } + /** + * The stage of the WorkspaceConnectionPropertiesV2BasicResource definition which contains all the minimum + * required properties for the resource to be created, but also allows for any other optional properties to be + * specified. + */ + interface WithCreate { + /** + * Executes the create request. + * + * @return the created resource. + */ + WorkspaceConnectionPropertiesV2BasicResource create(); + + /** + * Executes the create request. + * + * @param context The context to associate with this operation. + * @return the created resource. + */ + WorkspaceConnectionPropertiesV2BasicResource create(Context context); + } + } + /** + * Refreshes the resource to sync with Azure. + * + * @return the refreshed resource. + */ + WorkspaceConnectionPropertiesV2BasicResource refresh(); + + /** + * Refreshes the resource to sync with Azure. + * + * @param context The context to associate with this operation. + * @return the refreshed resource. + */ + WorkspaceConnectionPropertiesV2BasicResource refresh(Context context); +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionPropertiesV2BasicResourceArmPaginatedResult.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionPropertiesV2BasicResourceArmPaginatedResult.java new file mode 100644 index 000000000000..fa1097597d03 --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionPropertiesV2BasicResourceArmPaginatedResult.java @@ -0,0 +1,67 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.models; + +import com.azure.core.annotation.Fluent; +import com.azure.resourcemanager.machinelearning.fluent.models.WorkspaceConnectionPropertiesV2BasicResourceInner; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; + +/** The WorkspaceConnectionPropertiesV2BasicResourceArmPaginatedResult model. */ +@Fluent +public final class WorkspaceConnectionPropertiesV2BasicResourceArmPaginatedResult { + /* + * The value property. + */ + @JsonProperty(value = "value") + private List value; + + /* + * The nextLink property. + */ + @JsonProperty(value = "nextLink", access = JsonProperty.Access.WRITE_ONLY) + private String nextLink; + + /** + * Get the value property: The value property. + * + * @return the value value. + */ + public List value() { + return this.value; + } + + /** + * Set the value property: The value property. + * + * @param value the value value to set. + * @return the WorkspaceConnectionPropertiesV2BasicResourceArmPaginatedResult object itself. + */ + public WorkspaceConnectionPropertiesV2BasicResourceArmPaginatedResult withValue( + List value) { + this.value = value; + return this; + } + + /** + * Get the nextLink property: The nextLink property. + * + * @return the nextLink value. + */ + public String nextLink() { + return this.nextLink; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + public void validate() { + if (value() != null) { + value().forEach(e -> e.validate()); + } + } +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionSharedAccessSignature.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionSharedAccessSignature.java new file mode 100644 index 000000000000..adcacedaf727 --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionSharedAccessSignature.java @@ -0,0 +1,46 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.models; + +import com.azure.core.annotation.Fluent; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** The WorkspaceConnectionSharedAccessSignature model. */ +@Fluent +public final class WorkspaceConnectionSharedAccessSignature { + /* + * The sas property. + */ + @JsonProperty(value = "sas") + private String sas; + + /** + * Get the sas property: The sas property. + * + * @return the sas value. + */ + public String sas() { + return this.sas; + } + + /** + * Set the sas property: The sas property. + * + * @param sas the sas value to set. + * @return the WorkspaceConnectionSharedAccessSignature object itself. + */ + public WorkspaceConnectionSharedAccessSignature withSas(String sas) { + this.sas = sas; + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + public void validate() { + } +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionUsernamePassword.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionUsernamePassword.java new file mode 100644 index 000000000000..083f0fad7346 --- /dev/null +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnectionUsernamePassword.java @@ -0,0 +1,72 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.machinelearning.models; + +import com.azure.core.annotation.Fluent; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** The WorkspaceConnectionUsernamePassword model. */ +@Fluent +public final class WorkspaceConnectionUsernamePassword { + /* + * The username property. + */ + @JsonProperty(value = "username") + private String username; + + /* + * The password property. + */ + @JsonProperty(value = "password") + private String password; + + /** + * Get the username property: The username property. + * + * @return the username value. + */ + public String username() { + return this.username; + } + + /** + * Set the username property: The username property. + * + * @param username the username value to set. + * @return the WorkspaceConnectionUsernamePassword object itself. + */ + public WorkspaceConnectionUsernamePassword withUsername(String username) { + this.username = username; + return this; + } + + /** + * Get the password property: The password property. + * + * @return the password value. + */ + public String password() { + return this.password; + } + + /** + * Set the password property: The password property. + * + * @param password the password value to set. + * @return the WorkspaceConnectionUsernamePassword object itself. + */ + public WorkspaceConnectionUsernamePassword withPassword(String password) { + this.password = password; + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + public void validate() { + } +} diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnections.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnections.java index d94b5a973c35..979eae626c42 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnections.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceConnections.java @@ -11,49 +11,41 @@ /** Resource collection API of WorkspaceConnections. */ public interface WorkspaceConnections { /** - * List all connections under a AML workspace. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. + * @param connectionName Friendly name of the workspace connection. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return paginated list of Workspace connection objects as paginated response with {@link PagedIterable}. + * @return the response. */ - PagedIterable list(String resourceGroupName, String workspaceName); + WorkspaceConnectionPropertiesV2BasicResource get( + String resourceGroupName, String workspaceName, String connectionName); /** - * List all connections under a AML workspace. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. - * @param target Target of the workspace connection. - * @param category Category of the workspace connection. + * @param connectionName Friendly name of the workspace connection. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return paginated list of Workspace connection objects as paginated response with {@link PagedIterable}. + * @return the response body along with {@link Response}. */ - PagedIterable list( - String resourceGroupName, String workspaceName, String target, String category, Context context); + Response getWithResponse( + String resourceGroupName, String workspaceName, String connectionName, Context context); /** - * Get the detail of a workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the detail of a workspace connection. */ - WorkspaceConnection get(String resourceGroupName, String workspaceName, String connectionName); + void delete(String resourceGroupName, String workspaceName, String connectionName); /** - * Get the detail of a workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection. @@ -61,64 +53,55 @@ PagedIterable list( * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the detail of a workspace connection along with {@link Response}. + * @return the {@link Response}. */ - Response getWithResponse( + Response deleteWithResponse( String resourceGroupName, String workspaceName, String connectionName, Context context); /** - * Delete a workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. - * @param connectionName Friendly name of the workspace connection. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. */ - void delete(String resourceGroupName, String workspaceName, String connectionName); + PagedIterable list(String resourceGroupName, String workspaceName); /** - * Delete a workspace connection. - * * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. - * @param connectionName Friendly name of the workspace connection. + * @param target Target of the workspace connection. + * @param category Category of the workspace connection. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link Response}. + * @return the paginated response with {@link PagedIterable}. */ - Response deleteWithResponse( - String resourceGroupName, String workspaceName, String connectionName, Context context); + PagedIterable list( + String resourceGroupName, String workspaceName, String target, String category, Context context); /** - * Get the detail of a workspace connection. - * * @param id the resource ID. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the detail of a workspace connection along with {@link Response}. + * @return the response body along with {@link Response}. */ - WorkspaceConnection getById(String id); + WorkspaceConnectionPropertiesV2BasicResource getById(String id); /** - * Get the detail of a workspace connection. - * * @param id the resource ID. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the detail of a workspace connection along with {@link Response}. + * @return the response body along with {@link Response}. */ - Response getByIdWithResponse(String id, Context context); + Response getByIdWithResponse(String id, Context context); /** - * Delete a workspace connection. - * * @param id the resource ID. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. @@ -127,8 +110,6 @@ Response deleteWithResponse( void deleteById(String id); /** - * Delete a workspace connection. - * * @param id the resource ID. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. @@ -139,10 +120,10 @@ Response deleteWithResponse( Response deleteByIdWithResponse(String id, Context context); /** - * Begins definition for a new WorkspaceConnection resource. + * Begins definition for a new WorkspaceConnectionPropertiesV2BasicResource resource. * * @param name resource name. - * @return the first stage of the new WorkspaceConnection definition. + * @return the first stage of the new WorkspaceConnectionPropertiesV2BasicResource definition. */ - WorkspaceConnection.DefinitionStages.Blank define(String name); + WorkspaceConnectionPropertiesV2BasicResource.DefinitionStages.Blank define(String name); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceProperties.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceProperties.java index 19ad751b1639..41e6d8c3f5a0 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceProperties.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/WorkspaceProperties.java @@ -187,6 +187,14 @@ public interface WorkspaceProperties { */ String mlFlowTrackingUri(); + /** + * Gets the v1LegacyMode property: Enabling v1_legacy_mode may prevent you from using features provided by the v2 + * API. + * + * @return the v1LegacyMode value. + */ + Boolean v1LegacyMode(); + /** * Gets the inner com.azure.resourcemanager.machinelearning.fluent.models.WorkspacePropertiesInner object. * diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsCreateOrUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsCreateOrUpdateSamples.java index eac86beb3de6..7bfd84294cfd 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsCreateOrUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsCreateOrUpdateSamples.java @@ -6,7 +6,7 @@ import com.azure.core.management.serializer.SerializerFactory; import com.azure.core.util.serializer.SerializerEncoding; -import com.azure.resourcemanager.machinelearning.models.BatchDeploymentDetails; +import com.azure.resourcemanager.machinelearning.models.BatchDeploymentProperties; import com.azure.resourcemanager.machinelearning.models.BatchLoggingLevel; import com.azure.resourcemanager.machinelearning.models.BatchOutputAction; import com.azure.resourcemanager.machinelearning.models.BatchRetrySettings; @@ -26,7 +26,7 @@ /** Samples for BatchDeployments CreateOrUpdate. */ public final class BatchDeploymentsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchDeployment/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchDeployment/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Batch Deployment. @@ -41,7 +41,7 @@ public static void createOrUpdateBatchDeployment( .withRegion("string") .withExistingBatchEndpoint("test-rg", "my-aml-workspace", "testEndpointName") .withProperties( - new BatchDeploymentDetails() + new BatchDeploymentProperties() .withCodeConfiguration(new CodeConfiguration().withCodeId("string").withScoringScript("string")) .withDescription("string") .withEnvironmentId("string") diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsDeleteSamples.java index 67c049a0f734..c12853121dde 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsDeleteSamples.java @@ -9,7 +9,7 @@ /** Samples for BatchDeployments Delete. */ public final class BatchDeploymentsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchDeployment/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchDeployment/delete.json */ /** * Sample code: Delete Batch Deployment. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsGetSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsGetSamples.java index 52763f10899a..28aee1349b3c 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsGetSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsGetSamples.java @@ -9,7 +9,7 @@ /** Samples for BatchDeployments Get. */ public final class BatchDeploymentsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchDeployment/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchDeployment/get.json */ /** * Sample code: Get Batch Deployment. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsListSamples.java index ebce2bdb3947..12688b385723 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsListSamples.java @@ -9,7 +9,7 @@ /** Samples for BatchDeployments List. */ public final class BatchDeploymentsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchDeployment/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchDeployment/list.json */ /** * Sample code: List Batch Deployment. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsUpdateSamples.java index a20abef1e252..cd9d72a512cc 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchDeploymentsUpdateSamples.java @@ -4,38 +4,24 @@ package com.azure.resourcemanager.machinelearning.generated; -import com.azure.core.management.serializer.SerializerFactory; import com.azure.core.util.Context; -import com.azure.core.util.serializer.SerializerEncoding; -import com.azure.resourcemanager.machinelearning.models.BatchDeploymentData; -import com.azure.resourcemanager.machinelearning.models.BatchLoggingLevel; -import com.azure.resourcemanager.machinelearning.models.BatchOutputAction; -import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentityType; +import com.azure.resourcemanager.machinelearning.models.BatchDeployment; import com.azure.resourcemanager.machinelearning.models.PartialBatchDeployment; -import com.azure.resourcemanager.machinelearning.models.PartialBatchRetrySettings; -import com.azure.resourcemanager.machinelearning.models.PartialCodeConfiguration; -import com.azure.resourcemanager.machinelearning.models.PartialIdAssetReference; -import com.azure.resourcemanager.machinelearning.models.PartialManagedServiceIdentity; -import com.azure.resourcemanager.machinelearning.models.PartialSku; -import com.azure.resourcemanager.machinelearning.models.SkuTier; -import java.io.IOException; -import java.time.Duration; import java.util.HashMap; import java.util.Map; /** Samples for BatchDeployments Update. */ public final class BatchDeploymentsUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchDeployment/update.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchDeployment/update.json */ /** * Sample code: Update Batch Deployment. * * @param manager Entry point to MachineLearningManager. */ - public static void updateBatchDeployment(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) - throws IOException { - BatchDeploymentData resource = + public static void updateBatchDeployment(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { + BatchDeployment resource = manager .batchDeployments() .getWithResponse("test-rg", "my-aml-workspace", "testEndpointName", "testDeploymentName", Context.NONE) @@ -43,41 +29,7 @@ public static void updateBatchDeployment(com.azure.resourcemanager.machinelearni resource .update() .withTags(mapOf()) - .withIdentity( - new PartialManagedServiceIdentity() - .withType(ManagedServiceIdentityType.SYSTEM_ASSIGNED) - .withUserAssignedIdentities( - mapOf( - "string", - SerializerFactory - .createDefaultManagementSerializerAdapter() - .deserialize("{}", Object.class, SerializerEncoding.JSON)))) - .withKind("string") - .withProperties( - new PartialBatchDeployment() - .withCodeConfiguration( - new PartialCodeConfiguration().withCodeId("string").withScoringScript("string")) - .withCompute("string") - .withDescription("string") - .withEnvironmentId("string") - .withEnvironmentVariables(mapOf("string", "string")) - .withErrorThreshold(1) - .withLoggingLevel(BatchLoggingLevel.INFO) - .withMaxConcurrencyPerInstance(1) - .withMiniBatchSize(1L) - .withModel(new PartialIdAssetReference().withAssetId("string")) - .withOutputAction(BatchOutputAction.SUMMARY_ONLY) - .withOutputFileName("string") - .withProperties(mapOf("string", "string")) - .withRetrySettings( - new PartialBatchRetrySettings().withMaxRetries(1).withTimeout(Duration.parse("PT5M")))) - .withSku( - new PartialSku() - .withCapacity(1) - .withFamily("string") - .withName("string") - .withSize("string") - .withTier(SkuTier.FREE)) + .withProperties(new PartialBatchDeployment().withDescription("string")) .apply(); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsCreateOrUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsCreateOrUpdateSamples.java index 349da87e6658..8cf66f8ab56f 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsCreateOrUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsCreateOrUpdateSamples.java @@ -5,7 +5,7 @@ package com.azure.resourcemanager.machinelearning.generated; import com.azure.resourcemanager.machinelearning.models.BatchEndpointDefaults; -import com.azure.resourcemanager.machinelearning.models.BatchEndpointDetails; +import com.azure.resourcemanager.machinelearning.models.BatchEndpointProperties; import com.azure.resourcemanager.machinelearning.models.EndpointAuthMode; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentity; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentityType; @@ -18,7 +18,7 @@ /** Samples for BatchEndpoints CreateOrUpdate. */ public final class BatchEndpointsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchEndpoint/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchEndpoint/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Batch Endpoint. @@ -33,7 +33,7 @@ public static void createOrUpdateBatchEndpoint( .withRegion("string") .withExistingWorkspace("test-rg", "my-aml-workspace") .withProperties( - new BatchEndpointDetails() + new BatchEndpointProperties() .withAuthMode(EndpointAuthMode.AMLTOKEN) .withDescription("string") .withProperties(mapOf("string", "string")) diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsDeleteSamples.java index a8f44bb8de56..893b986e7da5 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsDeleteSamples.java @@ -9,7 +9,7 @@ /** Samples for BatchEndpoints Delete. */ public final class BatchEndpointsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchEndpoint/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchEndpoint/delete.json */ /** * Sample code: Delete Batch Endpoint. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsGetSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsGetSamples.java index 19442d7d653e..4425c948ea91 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsGetSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsGetSamples.java @@ -9,7 +9,7 @@ /** Samples for BatchEndpoints Get. */ public final class BatchEndpointsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchEndpoint/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchEndpoint/get.json */ /** * Sample code: Get Batch Endpoint. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsListKeysSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsListKeysSamples.java index 88843178691a..b210bd1e1bab 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsListKeysSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsListKeysSamples.java @@ -9,7 +9,7 @@ /** Samples for BatchEndpoints ListKeys. */ public final class BatchEndpointsListKeysSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchEndpoint/listKeys.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchEndpoint/listKeys.json */ /** * Sample code: ListKeys Batch Endpoint. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsListSamples.java index 98907210c636..1d82078ea4d5 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsListSamples.java @@ -9,7 +9,7 @@ /** Samples for BatchEndpoints List. */ public final class BatchEndpointsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchEndpoint/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchEndpoint/list.json */ /** * Sample code: List Batch Endpoint. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsUpdateSamples.java index beaf25304088..95a29b91fd30 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/BatchEndpointsUpdateSamples.java @@ -7,13 +7,9 @@ import com.azure.core.management.serializer.SerializerFactory; import com.azure.core.util.Context; import com.azure.core.util.serializer.SerializerEncoding; -import com.azure.resourcemanager.machinelearning.models.BatchEndpointData; -import com.azure.resourcemanager.machinelearning.models.BatchEndpointDefaults; +import com.azure.resourcemanager.machinelearning.models.BatchEndpoint; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentityType; -import com.azure.resourcemanager.machinelearning.models.PartialBatchEndpoint; import com.azure.resourcemanager.machinelearning.models.PartialManagedServiceIdentity; -import com.azure.resourcemanager.machinelearning.models.PartialSku; -import com.azure.resourcemanager.machinelearning.models.SkuTier; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -21,7 +17,7 @@ /** Samples for BatchEndpoints Update. */ public final class BatchEndpointsUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/BatchEndpoint/update.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/BatchEndpoint/update.json */ /** * Sample code: Update Batch Endpoint. @@ -30,7 +26,7 @@ public final class BatchEndpointsUpdateSamples { */ public static void updateBatchEndpoint(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) throws IOException { - BatchEndpointData resource = + BatchEndpoint resource = manager .batchEndpoints() .getWithResponse("test-rg", "my-aml-workspace", "testEndpointName", Context.NONE) @@ -47,16 +43,6 @@ public static void updateBatchEndpoint(com.azure.resourcemanager.machinelearning SerializerFactory .createDefaultManagementSerializerAdapter() .deserialize("{}", Object.class, SerializerEncoding.JSON)))) - .withKind("string") - .withProperties( - new PartialBatchEndpoint().withDefaults(new BatchEndpointDefaults().withDeploymentName("string"))) - .withSku( - new PartialSku() - .withCapacity(1) - .withFamily("string") - .withName("string") - .withSize("string") - .withTier(SkuTier.FREE)) .apply(); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeContainersCreateOrUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeContainersCreateOrUpdateSamples.java index f31367a57160..e48524386783 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeContainersCreateOrUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeContainersCreateOrUpdateSamples.java @@ -4,14 +4,14 @@ package com.azure.resourcemanager.machinelearning.generated; -import com.azure.resourcemanager.machinelearning.models.CodeContainerDetails; +import com.azure.resourcemanager.machinelearning.models.CodeContainerProperties; import java.util.HashMap; import java.util.Map; /** Samples for CodeContainers CreateOrUpdate. */ public final class CodeContainersCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/CodeContainer/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/CodeContainer/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Code Container. @@ -25,7 +25,7 @@ public static void createOrUpdateCodeContainer( .define("testContainer") .withExistingWorkspace("testrg123", "testworkspace") .withProperties( - new CodeContainerDetails() + new CodeContainerProperties() .withDescription("string") .withTags(mapOf("tag1", "value1", "tag2", "value2"))) .create(); diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeContainersDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeContainersDeleteSamples.java index 71c42219e345..653e70576d78 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeContainersDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeContainersDeleteSamples.java @@ -9,7 +9,7 @@ /** Samples for CodeContainers Delete. */ public final class CodeContainersDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/CodeContainer/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/CodeContainer/delete.json */ /** * Sample code: Delete Code Container. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeContainersGetSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeContainersGetSamples.java index 4d56a219f3b0..2cf23a79bd35 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeContainersGetSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeContainersGetSamples.java @@ -9,7 +9,7 @@ /** Samples for CodeContainers Get. */ public final class CodeContainersGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/CodeContainer/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/CodeContainer/get.json */ /** * Sample code: Get Code Container. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeContainersListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeContainersListSamples.java index 69615834acac..c32f8f4c38d3 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeContainersListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeContainersListSamples.java @@ -9,7 +9,7 @@ /** Samples for CodeContainers List. */ public final class CodeContainersListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/CodeContainer/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/CodeContainer/list.json */ /** * Sample code: List Code Container. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeVersionsCreateOrUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeVersionsCreateOrUpdateSamples.java index 1ad229f94eb9..1cad2f77f1f9 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeVersionsCreateOrUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeVersionsCreateOrUpdateSamples.java @@ -4,14 +4,14 @@ package com.azure.resourcemanager.machinelearning.generated; -import com.azure.resourcemanager.machinelearning.models.CodeVersionDetails; +import com.azure.resourcemanager.machinelearning.models.CodeVersionProperties; import java.util.HashMap; import java.util.Map; /** Samples for CodeVersions CreateOrUpdate. */ public final class CodeVersionsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/CodeVersion/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/CodeVersion/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Code Version. @@ -25,7 +25,7 @@ public static void createOrUpdateCodeVersion( .define("string") .withExistingCode("test-rg", "my-aml-workspace", "string") .withProperties( - new CodeVersionDetails() + new CodeVersionProperties() .withDescription("string") .withProperties(mapOf("string", "string")) .withTags(mapOf("string", "string")) diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeVersionsDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeVersionsDeleteSamples.java index 2b63aece4d95..bf5414a646c6 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeVersionsDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeVersionsDeleteSamples.java @@ -9,7 +9,7 @@ /** Samples for CodeVersions Delete. */ public final class CodeVersionsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/CodeVersion/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/CodeVersion/delete.json */ /** * Sample code: Delete Code Version. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeVersionsGetSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeVersionsGetSamples.java index 67de6bacaf37..6184ca9af210 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeVersionsGetSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeVersionsGetSamples.java @@ -9,7 +9,7 @@ /** Samples for CodeVersions Get. */ public final class CodeVersionsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/CodeVersion/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/CodeVersion/get.json */ /** * Sample code: Get Code Version. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeVersionsListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeVersionsListSamples.java index 79352a832f3e..6f0167a26ecd 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeVersionsListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/CodeVersionsListSamples.java @@ -9,7 +9,7 @@ /** Samples for CodeVersions List. */ public final class CodeVersionsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/CodeVersion/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/CodeVersion/list.json */ /** * Sample code: List Code Version. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentContainersCreateOrUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentContainersCreateOrUpdateSamples.java index 98a987107b8e..e32e48846dd3 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentContainersCreateOrUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentContainersCreateOrUpdateSamples.java @@ -4,14 +4,14 @@ package com.azure.resourcemanager.machinelearning.generated; -import com.azure.resourcemanager.machinelearning.models.ComponentContainerDetails; +import com.azure.resourcemanager.machinelearning.models.ComponentContainerProperties; import java.util.HashMap; import java.util.Map; /** Samples for ComponentContainers CreateOrUpdate. */ public final class ComponentContainersCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ComponentContainer/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ComponentContainer/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Component Container. @@ -25,7 +25,7 @@ public static void createOrUpdateComponentContainer( .define("string") .withExistingWorkspace("test-rg", "my-aml-workspace") .withProperties( - new ComponentContainerDetails() + new ComponentContainerProperties() .withDescription("string") .withProperties(mapOf("string", "string")) .withTags(mapOf("string", "string"))) diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentContainersDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentContainersDeleteSamples.java index 1c013acc405a..9896d1cbf24d 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentContainersDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentContainersDeleteSamples.java @@ -9,7 +9,7 @@ /** Samples for ComponentContainers Delete. */ public final class ComponentContainersDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ComponentContainer/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ComponentContainer/delete.json */ /** * Sample code: Delete Component Container. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentContainersGetSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentContainersGetSamples.java index 263dcdff41a9..e13c8eee5794 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentContainersGetSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentContainersGetSamples.java @@ -9,7 +9,7 @@ /** Samples for ComponentContainers Get. */ public final class ComponentContainersGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ComponentContainer/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ComponentContainer/get.json */ /** * Sample code: Get Component Container. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentContainersListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentContainersListSamples.java index 7178143bf2dd..5bf1fde1073c 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentContainersListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentContainersListSamples.java @@ -9,7 +9,7 @@ /** Samples for ComponentContainers List. */ public final class ComponentContainersListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ComponentContainer/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ComponentContainer/list.json */ /** * Sample code: List Component Container. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentVersionsCreateOrUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentVersionsCreateOrUpdateSamples.java index 9a68d798b013..d90cd398c590 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentVersionsCreateOrUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentVersionsCreateOrUpdateSamples.java @@ -6,7 +6,7 @@ import com.azure.core.management.serializer.SerializerFactory; import com.azure.core.util.serializer.SerializerEncoding; -import com.azure.resourcemanager.machinelearning.models.ComponentVersionDetails; +import com.azure.resourcemanager.machinelearning.models.ComponentVersionProperties; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -14,7 +14,7 @@ /** Samples for ComponentVersions CreateOrUpdate. */ public final class ComponentVersionsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ComponentVersion/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ComponentVersion/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Component Version. @@ -28,7 +28,7 @@ public static void createOrUpdateComponentVersion( .define("string") .withExistingComponent("test-rg", "my-aml-workspace", "string") .withProperties( - new ComponentVersionDetails() + new ComponentVersionProperties() .withDescription("string") .withProperties(mapOf("string", "string")) .withTags(mapOf("string", "string")) diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentVersionsDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentVersionsDeleteSamples.java index fc97506a5b55..b7415a729ec8 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentVersionsDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentVersionsDeleteSamples.java @@ -9,7 +9,7 @@ /** Samples for ComponentVersions Delete. */ public final class ComponentVersionsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ComponentVersion/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ComponentVersion/delete.json */ /** * Sample code: Delete Component Version. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentVersionsGetSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentVersionsGetSamples.java index bc8884e51649..cbf63b9024da 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentVersionsGetSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentVersionsGetSamples.java @@ -9,7 +9,7 @@ /** Samples for ComponentVersions Get. */ public final class ComponentVersionsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ComponentVersion/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ComponentVersion/get.json */ /** * Sample code: Get Component Version. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentVersionsListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentVersionsListSamples.java index 24bfff55e286..f5faeb52c96f 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentVersionsListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComponentVersionsListSamples.java @@ -9,7 +9,7 @@ /** Samples for ComponentVersions List. */ public final class ComponentVersionsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ComponentVersion/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ComponentVersion/list.json */ /** * Sample code: List Component Version. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeCreateOrUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeCreateOrUpdateSamples.java index 10e44a1114e6..a6c7d52dc0db 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeCreateOrUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeCreateOrUpdateSamples.java @@ -34,7 +34,7 @@ /** Samples for Compute CreateOrUpdate. */ public final class ComputeCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/createOrUpdate/BasicAKSCompute.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/createOrUpdate/BasicAKSCompute.json */ /** * Sample code: Create an AKS Compute. @@ -52,7 +52,7 @@ public static void createAnAKSCompute(com.azure.resourcemanager.machinelearning. } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/createOrUpdate/AKSCompute.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/createOrUpdate/AKSCompute.json */ /** * Sample code: Update an AKS Compute. @@ -75,7 +75,7 @@ public static void updateAnAKSCompute(com.azure.resourcemanager.machinelearning. } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/createOrUpdate/KubernetesCompute.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/createOrUpdate/KubernetesCompute.json */ /** * Sample code: Attach a Kubernetes Compute. @@ -112,7 +112,7 @@ public static void attachAKubernetesCompute( } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/createOrUpdate/BasicAmlCompute.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/createOrUpdate/BasicAmlCompute.json */ /** * Sample code: Create a AML Compute. @@ -148,7 +148,7 @@ public static void createAAMLCompute(com.azure.resourcemanager.machinelearning.M } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/createOrUpdate/ComputeInstance.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/createOrUpdate/ComputeInstance.json */ /** * Sample code: Create an ComputeInstance Compute. @@ -182,7 +182,7 @@ public static void createAnComputeInstanceCompute( } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/createOrUpdate/ComputeInstanceMinimal.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/createOrUpdate/ComputeInstanceMinimal.json */ /** * Sample code: Create an ComputeInstance Compute with minimal inputs. @@ -202,7 +202,7 @@ public static void createAnComputeInstanceComputeWithMinimalInputs( } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/createOrUpdate/AmlCompute.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/createOrUpdate/AmlCompute.json */ /** * Sample code: Update a AML Compute. @@ -229,7 +229,7 @@ public static void updateAAMLCompute(com.azure.resourcemanager.machinelearning.M } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/createOrUpdate/BasicDataFactoryCompute.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/createOrUpdate/BasicDataFactoryCompute.json */ /** * Sample code: Create a DataFactory Compute. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeDeleteSamples.java index 946a49b31163..6963da8dcd16 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeDeleteSamples.java @@ -10,7 +10,7 @@ /** Samples for Compute Delete. */ public final class ComputeDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/delete.json */ /** * Sample code: Delete Compute. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeGetSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeGetSamples.java index 315fc0b9667e..abcb355f2bc4 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeGetSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeGetSamples.java @@ -9,7 +9,7 @@ /** Samples for Compute Get. */ public final class ComputeGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/get/AKSCompute.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/get/AKSCompute.json */ /** * Sample code: Get a AKS Compute. @@ -21,7 +21,7 @@ public static void getAAKSCompute(com.azure.resourcemanager.machinelearning.Mach } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/get/KubernetesCompute.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/get/KubernetesCompute.json */ /** * Sample code: Get a Kubernetes Compute. @@ -33,7 +33,7 @@ public static void getAKubernetesCompute(com.azure.resourcemanager.machinelearni } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/get/ComputeInstance.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/get/ComputeInstance.json */ /** * Sample code: Get an ComputeInstance. @@ -45,7 +45,7 @@ public static void getAnComputeInstance(com.azure.resourcemanager.machinelearnin } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/get/AmlCompute.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/get/AmlCompute.json */ /** * Sample code: Get a AML Compute. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeListKeysSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeListKeysSamples.java index 47910d43d61d..b62edea56b0f 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeListKeysSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeListKeysSamples.java @@ -9,7 +9,7 @@ /** Samples for Compute ListKeys. */ public final class ComputeListKeysSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/listKeys.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/listKeys.json */ /** * Sample code: List AKS Compute Keys. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeListNodesSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeListNodesSamples.java index c0804e8830f8..2afb4f779cd1 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeListNodesSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeListNodesSamples.java @@ -9,7 +9,7 @@ /** Samples for Compute ListNodes. */ public final class ComputeListNodesSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/listNodes.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/listNodes.json */ /** * Sample code: Get compute nodes information for a compute. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeListSamples.java index e934364e5361..5da7a1d58b72 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeListSamples.java @@ -9,7 +9,7 @@ /** Samples for Compute List. */ public final class ComputeListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/list.json */ /** * Sample code: Get Computes. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeRestartSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeRestartSamples.java index 24446e5c0afe..eb6b7727c9cb 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeRestartSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeRestartSamples.java @@ -9,7 +9,7 @@ /** Samples for Compute Restart. */ public final class ComputeRestartSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/restart.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/restart.json */ /** * Sample code: Restart ComputeInstance Compute. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeStartSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeStartSamples.java index 4dffc86033dd..060faf5ca27b 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeStartSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeStartSamples.java @@ -9,7 +9,7 @@ /** Samples for Compute Start. */ public final class ComputeStartSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/start.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/start.json */ /** * Sample code: Start ComputeInstance Compute. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeStopSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeStopSamples.java index 97a2961ce90d..792d61fd8c83 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeStopSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeStopSamples.java @@ -9,7 +9,7 @@ /** Samples for Compute Stop. */ public final class ComputeStopSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/stop.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/stop.json */ /** * Sample code: Stop ComputeInstance Compute. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeUpdateSamples.java index aa62d2b89740..bb3196e991c7 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ComputeUpdateSamples.java @@ -13,7 +13,7 @@ /** Samples for Compute Update. */ public final class ComputeUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Compute/patch.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Compute/patch.json */ /** * Sample code: Update a AmlCompute Compute. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataContainersCreateOrUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataContainersCreateOrUpdateSamples.java index 2a455cb7025e..4a95a5ad0795 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataContainersCreateOrUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataContainersCreateOrUpdateSamples.java @@ -4,7 +4,7 @@ package com.azure.resourcemanager.machinelearning.generated; -import com.azure.resourcemanager.machinelearning.models.DataContainerDetails; +import com.azure.resourcemanager.machinelearning.models.DataContainerProperties; import com.azure.resourcemanager.machinelearning.models.DataType; import java.util.HashMap; import java.util.Map; @@ -12,7 +12,7 @@ /** Samples for DataContainers CreateOrUpdate. */ public final class DataContainersCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/DataContainer/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/DataContainer/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Data Container. @@ -26,11 +26,11 @@ public static void createOrUpdateDataContainer( .define("datacontainer123") .withExistingWorkspace("testrg123", "workspace123") .withProperties( - new DataContainerDetails() + new DataContainerProperties() .withDescription("string") .withProperties(mapOf("properties1", "value1", "properties2", "value2")) .withTags(mapOf("tag1", "value1", "tag2", "value2")) - .withDataType(DataType.URI_FILE)) + .withDataType(DataType.fromString("UriFile"))) .create(); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataContainersDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataContainersDeleteSamples.java index 6677dbc8a623..fa02ca4dccdc 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataContainersDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataContainersDeleteSamples.java @@ -9,7 +9,7 @@ /** Samples for DataContainers Delete. */ public final class DataContainersDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/DataContainer/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/DataContainer/delete.json */ /** * Sample code: Delete Data Container. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataContainersGetSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataContainersGetSamples.java index 13a752ba4e0a..dc519b85b1ad 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataContainersGetSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataContainersGetSamples.java @@ -9,7 +9,7 @@ /** Samples for DataContainers Get. */ public final class DataContainersGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/DataContainer/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/DataContainer/get.json */ /** * Sample code: Get Data Container. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataContainersListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataContainersListSamples.java index 9615c1761d32..5c7e2ae19cc3 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataContainersListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataContainersListSamples.java @@ -9,7 +9,7 @@ /** Samples for DataContainers List. */ public final class DataContainersListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/DataContainer/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/DataContainer/list.json */ /** * Sample code: List Data Container. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataVersionsCreateOrUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataVersionsCreateOrUpdateSamples.java index b63f9f6aca9a..1b748b018ac7 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataVersionsCreateOrUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataVersionsCreateOrUpdateSamples.java @@ -11,7 +11,7 @@ /** Samples for DataVersions CreateOrUpdate. */ public final class DataVersionsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/DataVersionBase/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/DataVersionBase/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Data Version Base. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataVersionsDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataVersionsDeleteSamples.java index 9a2828b9b5f2..111a0c83f0cb 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataVersionsDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataVersionsDeleteSamples.java @@ -9,7 +9,7 @@ /** Samples for DataVersions Delete. */ public final class DataVersionsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/DataVersionBase/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/DataVersionBase/delete.json */ /** * Sample code: Delete Data Version Base. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataVersionsGetSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataVersionsGetSamples.java index 3ea2798ad6ee..0aeb7846dad8 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataVersionsGetSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataVersionsGetSamples.java @@ -9,7 +9,7 @@ /** Samples for DataVersions Get. */ public final class DataVersionsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/DataVersionBase/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/DataVersionBase/get.json */ /** * Sample code: Get Data Version Base. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataVersionsListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataVersionsListSamples.java index e2998d0c46a2..3639e6d76728 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataVersionsListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DataVersionsListSamples.java @@ -9,7 +9,7 @@ /** Samples for DataVersions List. */ public final class DataVersionsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/DataVersionBase/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/DataVersionBase/list.json */ /** * Sample code: List Data Version Base. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresCreateOrUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresCreateOrUpdateSamples.java index d01c90354593..a4fc92007f15 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresCreateOrUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresCreateOrUpdateSamples.java @@ -19,7 +19,7 @@ /** Samples for Datastores CreateOrUpdate. */ public final class DatastoresCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Datastore/AzureDataLakeGen1WServicePrincipal/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Datastore/AzureDataLakeGen1WServicePrincipal/createOrUpdate.json */ /** * Sample code: CreateOrUpdate datastore (Azure Data Lake Gen1 w/ ServicePrincipal). @@ -49,7 +49,7 @@ public static void createOrUpdateDatastoreAzureDataLakeGen1WServicePrincipal( } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Datastore/AzureDataLakeGen2WServicePrincipal/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Datastore/AzureDataLakeGen2WServicePrincipal/createOrUpdate.json */ /** * Sample code: CreateOrUpdate datastore (Azure Data Lake Gen2 w/ Service Principal). @@ -82,7 +82,7 @@ public static void createOrUpdateDatastoreAzureDataLakeGen2WServicePrincipal( } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Datastore/AzureBlobWAccountKey/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Datastore/AzureBlobWAccountKey/createOrUpdate.json */ /** * Sample code: CreateOrUpdate datastore (AzureBlob w/ AccountKey). @@ -111,7 +111,7 @@ public static void createOrUpdateDatastoreAzureBlobWAccountKey( } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Datastore/AzureFileWAccountKey/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Datastore/AzureFileWAccountKey/createOrUpdate.json */ /** * Sample code: CreateOrUpdate datastore (Azure File store w/ AccountKey). diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresDeleteSamples.java index 048a0689cb9a..633c2e394376 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresDeleteSamples.java @@ -9,7 +9,7 @@ /** Samples for Datastores Delete. */ public final class DatastoresDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Datastore/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Datastore/delete.json */ /** * Sample code: Delete datastore. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresGetSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresGetSamples.java index 362b7d544384..7adf63d92e51 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresGetSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresGetSamples.java @@ -9,7 +9,7 @@ /** Samples for Datastores Get. */ public final class DatastoresGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Datastore/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Datastore/get.json */ /** * Sample code: Get datastore. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresListSamples.java index 6d6bfc02cfba..a30f56f53db4 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresListSamples.java @@ -10,7 +10,7 @@ /** Samples for Datastores List. */ public final class DatastoresListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Datastore/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Datastore/list.json */ /** * Sample code: List datastores. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresListSecretsSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresListSecretsSamples.java index 6c73e14c3579..f7be14c0b925 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresListSecretsSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/DatastoresListSecretsSamples.java @@ -9,7 +9,7 @@ /** Samples for Datastores ListSecrets. */ public final class DatastoresListSecretsSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Datastore/listSecrets.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Datastore/listSecrets.json */ /** * Sample code: Get datastore secrets. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentContainersCreateOrUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentContainersCreateOrUpdateSamples.java index a1164dbfb388..d3d5c9eeb892 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentContainersCreateOrUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentContainersCreateOrUpdateSamples.java @@ -4,14 +4,14 @@ package com.azure.resourcemanager.machinelearning.generated; -import com.azure.resourcemanager.machinelearning.models.EnvironmentContainerDetails; +import com.azure.resourcemanager.machinelearning.models.EnvironmentContainerProperties; import java.util.HashMap; import java.util.Map; /** Samples for EnvironmentContainers CreateOrUpdate. */ public final class EnvironmentContainersCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/EnvironmentContainer/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/EnvironmentContainer/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Environment Container. @@ -25,7 +25,7 @@ public static void createOrUpdateEnvironmentContainer( .define("testEnvironment") .withExistingWorkspace("testrg123", "testworkspace") .withProperties( - new EnvironmentContainerDetails() + new EnvironmentContainerProperties() .withDescription("string") .withProperties( mapOf("additionalProp1", "string", "additionalProp2", "string", "additionalProp3", "string")) diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentContainersDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentContainersDeleteSamples.java index d82d3bc9a1eb..a1a3cc3a61f5 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentContainersDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentContainersDeleteSamples.java @@ -9,7 +9,7 @@ /** Samples for EnvironmentContainers Delete. */ public final class EnvironmentContainersDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/EnvironmentContainer/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/EnvironmentContainer/delete.json */ /** * Sample code: Delete Environment Container. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentContainersGetSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentContainersGetSamples.java index 234e62e20f55..25a2847f459d 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentContainersGetSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentContainersGetSamples.java @@ -9,7 +9,7 @@ /** Samples for EnvironmentContainers Get. */ public final class EnvironmentContainersGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/EnvironmentContainer/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/EnvironmentContainer/get.json */ /** * Sample code: Get Environment Container. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentContainersListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentContainersListSamples.java index 4d98d298ac4d..13b75fa4224c 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentContainersListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentContainersListSamples.java @@ -9,7 +9,7 @@ /** Samples for EnvironmentContainers List. */ public final class EnvironmentContainersListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/EnvironmentContainer/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/EnvironmentContainer/list.json */ /** * Sample code: List Environment Container. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentVersionsCreateOrUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentVersionsCreateOrUpdateSamples.java index 895d59ee9e49..e605cee9461a 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentVersionsCreateOrUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentVersionsCreateOrUpdateSamples.java @@ -5,7 +5,7 @@ package com.azure.resourcemanager.machinelearning.generated; import com.azure.resourcemanager.machinelearning.models.BuildContext; -import com.azure.resourcemanager.machinelearning.models.EnvironmentVersionDetails; +import com.azure.resourcemanager.machinelearning.models.EnvironmentVersionProperties; import com.azure.resourcemanager.machinelearning.models.InferenceContainerProperties; import com.azure.resourcemanager.machinelearning.models.Route; import java.util.HashMap; @@ -14,7 +14,7 @@ /** Samples for EnvironmentVersions CreateOrUpdate. */ public final class EnvironmentVersionsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/EnvironmentVersion/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/EnvironmentVersion/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Environment Version. @@ -28,7 +28,7 @@ public static void createOrUpdateEnvironmentVersion( .define("string") .withExistingEnvironment("test-rg", "my-aml-workspace", "string") .withProperties( - new EnvironmentVersionDetails() + new EnvironmentVersionProperties() .withDescription("string") .withProperties(mapOf("string", "string")) .withTags(mapOf("string", "string")) diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentVersionsDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentVersionsDeleteSamples.java index 6b75b32b0a58..6c5d044cd2e6 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentVersionsDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentVersionsDeleteSamples.java @@ -9,7 +9,7 @@ /** Samples for EnvironmentVersions Delete. */ public final class EnvironmentVersionsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/EnvironmentVersion/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/EnvironmentVersion/delete.json */ /** * Sample code: Delete Environment Version. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentVersionsGetSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentVersionsGetSamples.java index e4ef8171ec78..df17452024c7 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentVersionsGetSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentVersionsGetSamples.java @@ -9,7 +9,7 @@ /** Samples for EnvironmentVersions Get. */ public final class EnvironmentVersionsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/EnvironmentVersion/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/EnvironmentVersion/get.json */ /** * Sample code: Get Environment Version. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentVersionsListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentVersionsListSamples.java index 36b3677194fa..e958b01cdd46 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentVersionsListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/EnvironmentVersionsListSamples.java @@ -9,7 +9,7 @@ /** Samples for EnvironmentVersions List. */ public final class EnvironmentVersionsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/EnvironmentVersion/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/EnvironmentVersion/list.json */ /** * Sample code: List Environment Version. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsCancelSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsCancelSamples.java index e6df172f25aa..161ba4e9af01 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsCancelSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsCancelSamples.java @@ -9,7 +9,7 @@ /** Samples for Jobs Cancel. */ public final class JobsCancelSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/cancel.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/cancel.json */ /** * Sample code: Cancel Job. @@ -17,6 +17,6 @@ public final class JobsCancelSamples { * @param manager Entry point to MachineLearningManager. */ public static void cancelJob(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { - manager.jobs().cancelWithResponse("test-rg", "my-aml-workspace", "string", Context.NONE); + manager.jobs().cancel("test-rg", "my-aml-workspace", "string", Context.NONE); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsCreateOrUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsCreateOrUpdateSamples.java index a9e4a13e060e..3d9f1dbcbeb1 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsCreateOrUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsCreateOrUpdateSamples.java @@ -7,122 +7,32 @@ import com.azure.core.management.serializer.SerializerFactory; import com.azure.core.util.serializer.SerializerEncoding; import com.azure.resourcemanager.machinelearning.models.AmlToken; -import com.azure.resourcemanager.machinelearning.models.AutoMLJob; import com.azure.resourcemanager.machinelearning.models.CommandJob; import com.azure.resourcemanager.machinelearning.models.CommandJobLimits; -import com.azure.resourcemanager.machinelearning.models.CronSchedule; import com.azure.resourcemanager.machinelearning.models.Goal; import com.azure.resourcemanager.machinelearning.models.GridSamplingAlgorithm; -import com.azure.resourcemanager.machinelearning.models.ImageClassification; -import com.azure.resourcemanager.machinelearning.models.ImageLimitSettings; -import com.azure.resourcemanager.machinelearning.models.ImageModelDistributionSettingsClassification; -import com.azure.resourcemanager.machinelearning.models.ImageModelSettingsClassification; -import com.azure.resourcemanager.machinelearning.models.ImageVerticalDataSettings; import com.azure.resourcemanager.machinelearning.models.JobService; import com.azure.resourcemanager.machinelearning.models.LiteralJobInput; -import com.azure.resourcemanager.machinelearning.models.MLTableJobInput; import com.azure.resourcemanager.machinelearning.models.MedianStoppingPolicy; import com.azure.resourcemanager.machinelearning.models.Mpi; import com.azure.resourcemanager.machinelearning.models.Objective; import com.azure.resourcemanager.machinelearning.models.OutputDeliveryMode; import com.azure.resourcemanager.machinelearning.models.PipelineJob; import com.azure.resourcemanager.machinelearning.models.ResourceConfiguration; -import com.azure.resourcemanager.machinelearning.models.ScheduleStatus; import com.azure.resourcemanager.machinelearning.models.SweepJob; import com.azure.resourcemanager.machinelearning.models.SweepJobLimits; import com.azure.resourcemanager.machinelearning.models.TensorFlow; -import com.azure.resourcemanager.machinelearning.models.TrainingDataSettings; import com.azure.resourcemanager.machinelearning.models.TrialComponent; import com.azure.resourcemanager.machinelearning.models.UriFileJobOutput; import java.io.IOException; import java.time.Duration; -import java.time.OffsetDateTime; -import java.util.Arrays; import java.util.HashMap; import java.util.Map; /** Samples for Jobs CreateOrUpdate. */ public final class JobsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/AutoMLJob/createOrUpdate.json - */ - /** - * Sample code: CreateOrUpdate AutoML Job. - * - * @param manager Entry point to MachineLearningManager. - */ - public static void createOrUpdateAutoMLJob(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) - throws IOException { - manager - .jobs() - .define("string") - .withExistingWorkspace("test-rg", "my-aml-workspace") - .withProperties( - new AutoMLJob() - .withDescription("string") - .withProperties(mapOf("string", "string")) - .withTags(mapOf("string", "string")) - .withComputeId("string") - .withDisplayName("string") - .withExperimentName("string") - .withIdentity(new AmlToken()) - .withIsArchived(false) - .withSchedule( - new CronSchedule() - .withEndTime(OffsetDateTime.parse("2020-01-01T12:34:56.999Z")) - .withScheduleStatus(ScheduleStatus.DISABLED) - .withStartTime(OffsetDateTime.parse("2020-01-01T12:34:56.999Z")) - .withTimeZone("string") - .withExpression("string")) - .withServices( - mapOf( - "string", - new JobService() - .withEndpoint("string") - .withJobServiceType("string") - .withPort(1) - .withProperties(mapOf("string", "string")))) - .withEnvironmentId("string") - .withEnvironmentVariables(mapOf("string", "string")) - .withOutputs( - mapOf( - "string", - new UriFileJobOutput() - .withDescription("string") - .withMode(OutputDeliveryMode.READ_WRITE_MOUNT) - .withUri("string"))) - .withResources( - new ResourceConfiguration() - .withInstanceCount(1) - .withInstanceType("string") - .withProperties( - mapOf( - "string", - SerializerFactory - .createDefaultManagementSerializerAdapter() - .deserialize( - "{\"9bec0ab0-c62f-4fa9-a97c-7b24bbcc90ad\":null}", - Object.class, - SerializerEncoding.JSON)))) - .withTaskDetails( - new ImageClassification() - .withModelSettings(new ImageModelSettingsClassification().withValidationCropSize(2)) - .withSearchSpace( - Arrays - .asList( - new ImageModelDistributionSettingsClassification() - .withValidationCropSize("choice(2, 360)"))) - .withDataSettings( - new ImageVerticalDataSettings() - .withTargetColumnName("string") - .withTrainingData( - new TrainingDataSettings().withData(new MLTableJobInput().withUri("string")))) - .withLimitSettings(new ImageLimitSettings().withMaxTrials(2)))) - .create(); - } - - /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/SweepJob/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/SweepJob/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Sweep Job. @@ -187,7 +97,7 @@ public static void createOrUpdateSweepJob(com.azure.resourcemanager.machinelearn } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/PipelineJob/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/PipelineJob/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Pipeline Job. @@ -221,9 +131,9 @@ public static void createOrUpdatePipelineJob( mapOf( "string", new UriFileJobOutput() - .withDescription("string") .withMode(OutputDeliveryMode.UPLOAD) - .withUri("string"))) + .withUri("string") + .withDescription("string"))) .withSettings( SerializerFactory .createDefaultManagementSerializerAdapter() @@ -232,7 +142,7 @@ public static void createOrUpdatePipelineJob( } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/CommandJob/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/CommandJob/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Command Job. @@ -273,9 +183,9 @@ public static void createOrUpdateCommandJob( mapOf( "string", new UriFileJobOutput() - .withDescription("string") .withMode(OutputDeliveryMode.READ_WRITE_MOUNT) - .withUri("string"))) + .withUri("string") + .withDescription("string"))) .withResources( new ResourceConfiguration() .withInstanceCount(1) diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsDeleteSamples.java index 2f4693836fa9..12f5672538db 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsDeleteSamples.java @@ -9,7 +9,7 @@ /** Samples for Jobs Delete. */ public final class JobsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/delete.json */ /** * Sample code: Delete Job. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsGetSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsGetSamples.java index 15b7b3b2ead5..7ecc7b4287aa 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsGetSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsGetSamples.java @@ -9,7 +9,7 @@ /** Samples for Jobs Get. */ public final class JobsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/CommandJob/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/CommandJob/get.json */ /** * Sample code: Get Command Job. @@ -21,19 +21,7 @@ public static void getCommandJob(com.azure.resourcemanager.machinelearning.Machi } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/AutoMLJob/get.json - */ - /** - * Sample code: Get AutoML Job. - * - * @param manager Entry point to MachineLearningManager. - */ - public static void getAutoMLJob(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { - manager.jobs().getWithResponse("test-rg", "my-aml-workspace", "string", Context.NONE); - } - - /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/SweepJob/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/SweepJob/get.json */ /** * Sample code: Get Sweep Job. @@ -45,7 +33,7 @@ public static void getSweepJob(com.azure.resourcemanager.machinelearning.Machine } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/PipelineJob/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/PipelineJob/get.json */ /** * Sample code: Get Pipeline Job. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsListSamples.java index e4847e10f084..e0aa9eae95dc 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/JobsListSamples.java @@ -9,7 +9,7 @@ /** Samples for Jobs List. */ public final class JobsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/CommandJob/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/CommandJob/list.json */ /** * Sample code: List Command Job. @@ -17,11 +17,11 @@ public final class JobsListSamples { * @param manager Entry point to MachineLearningManager. */ public static void listCommandJob(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { - manager.jobs().list("test-rg", "my-aml-workspace", null, "string", "string", null, null, null, Context.NONE); + manager.jobs().list("test-rg", "my-aml-workspace", null, "string", "string", null, Context.NONE); } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/PipelineJob/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/PipelineJob/list.json */ /** * Sample code: List Pipeline Job. @@ -29,11 +29,11 @@ public static void listCommandJob(com.azure.resourcemanager.machinelearning.Mach * @param manager Entry point to MachineLearningManager. */ public static void listPipelineJob(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { - manager.jobs().list("test-rg", "my-aml-workspace", null, "string", "string", null, null, null, Context.NONE); + manager.jobs().list("test-rg", "my-aml-workspace", null, "string", "string", null, Context.NONE); } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/SweepJob/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Job/SweepJob/list.json */ /** * Sample code: List Sweep Job. @@ -41,18 +41,6 @@ public static void listPipelineJob(com.azure.resourcemanager.machinelearning.Mac * @param manager Entry point to MachineLearningManager. */ public static void listSweepJob(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { - manager.jobs().list("test-rg", "my-aml-workspace", null, "string", "string", null, null, null, Context.NONE); - } - - /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Job/AutoMLJob/list.json - */ - /** - * Sample code: List AutoML Job. - * - * @param manager Entry point to MachineLearningManager. - */ - public static void listAutoMLJob(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { - manager.jobs().list("test-rg", "my-aml-workspace", null, null, null, null, null, null, Context.NONE); + manager.jobs().list("test-rg", "my-aml-workspace", null, "string", "string", null, Context.NONE); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelContainersCreateOrUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelContainersCreateOrUpdateSamples.java index 9e3ef93b9261..b99f2dcb0e95 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelContainersCreateOrUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelContainersCreateOrUpdateSamples.java @@ -4,14 +4,14 @@ package com.azure.resourcemanager.machinelearning.generated; -import com.azure.resourcemanager.machinelearning.models.ModelContainerDetails; +import com.azure.resourcemanager.machinelearning.models.ModelContainerProperties; import java.util.HashMap; import java.util.Map; /** Samples for ModelContainers CreateOrUpdate. */ public final class ModelContainersCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ModelContainer/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ModelContainer/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Model Container. @@ -25,7 +25,7 @@ public static void createOrUpdateModelContainer( .define("testContainer") .withExistingWorkspace("testrg123", "workspace123") .withProperties( - new ModelContainerDetails() + new ModelContainerProperties() .withDescription("Model container description") .withTags(mapOf("tag1", "value1", "tag2", "value2"))) .create(); diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelContainersDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelContainersDeleteSamples.java index cef9bf1c56c9..1c198f7354c3 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelContainersDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelContainersDeleteSamples.java @@ -9,7 +9,7 @@ /** Samples for ModelContainers Delete. */ public final class ModelContainersDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ModelContainer/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ModelContainer/delete.json */ /** * Sample code: Delete Model Container. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelContainersGetSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelContainersGetSamples.java index 9a468e4f8c67..abab86e7ed8f 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelContainersGetSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelContainersGetSamples.java @@ -9,7 +9,7 @@ /** Samples for ModelContainers Get. */ public final class ModelContainersGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ModelContainer/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ModelContainer/get.json */ /** * Sample code: Get Model Container. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelContainersListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelContainersListSamples.java index 2f03b11e3632..b46f4913e848 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelContainersListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelContainersListSamples.java @@ -9,7 +9,7 @@ /** Samples for ModelContainers List. */ public final class ModelContainersListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ModelContainer/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ModelContainer/list.json */ /** * Sample code: List Model Container. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelVersionsCreateOrUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelVersionsCreateOrUpdateSamples.java index 4182de281143..44b053de63af 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelVersionsCreateOrUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelVersionsCreateOrUpdateSamples.java @@ -5,15 +5,14 @@ package com.azure.resourcemanager.machinelearning.generated; import com.azure.resourcemanager.machinelearning.models.FlavorData; -import com.azure.resourcemanager.machinelearning.models.ModelType; -import com.azure.resourcemanager.machinelearning.models.ModelVersionDetails; +import com.azure.resourcemanager.machinelearning.models.ModelVersionProperties; import java.util.HashMap; import java.util.Map; /** Samples for ModelVersions CreateOrUpdate. */ public final class ModelVersionsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ModelVersion/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ModelVersion/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Model Version. @@ -27,13 +26,13 @@ public static void createOrUpdateModelVersion( .define("string") .withExistingModel("test-rg", "my-aml-workspace", "string") .withProperties( - new ModelVersionDetails() + new ModelVersionProperties() .withDescription("string") .withProperties(mapOf("string", "string")) .withTags(mapOf("string", "string")) .withIsAnonymous(false) .withFlavors(mapOf("string", new FlavorData().withData(mapOf("string", "string")))) - .withModelType(ModelType.CUSTOM_MODEL) + .withModelType("CustomModel") .withModelUri("string")) .create(); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelVersionsDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelVersionsDeleteSamples.java index 5abcd0f8d1db..d8537e076d0a 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelVersionsDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelVersionsDeleteSamples.java @@ -9,7 +9,7 @@ /** Samples for ModelVersions Delete. */ public final class ModelVersionsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ModelVersion/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ModelVersion/delete.json */ /** * Sample code: Delete Model Version. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelVersionsGetSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelVersionsGetSamples.java index 78aff7dce52d..4e7840a399b4 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelVersionsGetSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelVersionsGetSamples.java @@ -9,7 +9,7 @@ /** Samples for ModelVersions Get. */ public final class ModelVersionsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ModelVersion/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ModelVersion/get.json */ /** * Sample code: Get Model Version. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelVersionsListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelVersionsListSamples.java index 921cc20186a1..d40bfece7c0a 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelVersionsListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/ModelVersionsListSamples.java @@ -9,7 +9,7 @@ /** Samples for ModelVersions List. */ public final class ModelVersionsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ModelVersion/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ModelVersion/list.json */ /** * Sample code: List Model Version. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsCreateOrUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsCreateOrUpdateSamples.java index ce44ed335916..e58420df4da3 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsCreateOrUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsCreateOrUpdateSamples.java @@ -24,7 +24,7 @@ /** Samples for OnlineDeployments CreateOrUpdate. */ public final class OnlineDeploymentsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/KubernetesOnlineDeployment/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/KubernetesOnlineDeployment/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Kubernetes Online Deployment. @@ -88,7 +88,7 @@ public static void createOrUpdateKubernetesOnlineDeployment( } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/ManagedOnlineDeployment/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/ManagedOnlineDeployment/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Managed Online Deployment. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsDeleteSamples.java index bdb98001c5bd..9963bf4eddef 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsDeleteSamples.java @@ -9,7 +9,7 @@ /** Samples for OnlineDeployments Delete. */ public final class OnlineDeploymentsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/delete.json */ /** * Sample code: Delete Online Deployment. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsGetLogsSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsGetLogsSamples.java index adefe6402f01..0d12c02eb896 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsGetLogsSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsGetLogsSamples.java @@ -11,7 +11,7 @@ /** Samples for OnlineDeployments GetLogs. */ public final class OnlineDeploymentsGetLogsSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/getLogs.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/getLogs.json */ /** * Sample code: Get Online Deployment Logs. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsGetSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsGetSamples.java index 5884827c3109..698bb46cab8c 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsGetSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsGetSamples.java @@ -9,7 +9,7 @@ /** Samples for OnlineDeployments Get. */ public final class OnlineDeploymentsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/KubernetesOnlineDeployment/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/KubernetesOnlineDeployment/get.json */ /** * Sample code: Get Kubernetes Online Deployment. @@ -24,7 +24,7 @@ public static void getKubernetesOnlineDeployment( } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/ManagedOnlineDeployment/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/ManagedOnlineDeployment/get.json */ /** * Sample code: Get Managed Online Deployment. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsListSamples.java index 8e453a170fff..312d613e5d3b 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsListSamples.java @@ -9,7 +9,7 @@ /** Samples for OnlineDeployments List. */ public final class OnlineDeploymentsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/list.json */ /** * Sample code: List Online Deployments. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsListSkusSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsListSkusSamples.java index 09e54d256445..d8c7a94e70a2 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsListSkusSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsListSkusSamples.java @@ -9,7 +9,7 @@ /** Samples for OnlineDeployments ListSkus. */ public final class OnlineDeploymentsListSkusSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/ManagedOnlineDeployment/listSkus.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/ManagedOnlineDeployment/listSkus.json */ /** * Sample code: List Managed Online Deployment Skus. @@ -24,7 +24,7 @@ public static void listManagedOnlineDeploymentSkus( } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/KubernetesOnlineDeployment/listSkus.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/KubernetesOnlineDeployment/listSkus.json */ /** * Sample code: List Kubernetes Online Deployment Skus. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsUpdateSamples.java index 3dff73c3bfa2..aa4487c63a41 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineDeploymentsUpdateSamples.java @@ -4,24 +4,17 @@ package com.azure.resourcemanager.machinelearning.generated; -import com.azure.core.management.serializer.SerializerFactory; import com.azure.core.util.Context; -import com.azure.core.util.serializer.SerializerEncoding; -import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentityType; -import com.azure.resourcemanager.machinelearning.models.OnlineDeploymentData; -import com.azure.resourcemanager.machinelearning.models.PartialKubernetesOnlineDeployment; -import com.azure.resourcemanager.machinelearning.models.PartialManagedOnlineDeployment; -import com.azure.resourcemanager.machinelearning.models.PartialManagedServiceIdentity; +import com.azure.resourcemanager.machinelearning.models.OnlineDeployment; import com.azure.resourcemanager.machinelearning.models.PartialSku; import com.azure.resourcemanager.machinelearning.models.SkuTier; -import java.io.IOException; import java.util.HashMap; import java.util.Map; /** Samples for OnlineDeployments Update. */ public final class OnlineDeploymentsUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/ManagedOnlineDeployment/update.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/ManagedOnlineDeployment/update.json */ /** * Sample code: Update Managed Online Deployment. @@ -29,8 +22,8 @@ public final class OnlineDeploymentsUpdateSamples { * @param manager Entry point to MachineLearningManager. */ public static void updateManagedOnlineDeployment( - com.azure.resourcemanager.machinelearning.MachineLearningManager manager) throws IOException { - OnlineDeploymentData resource = + com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { + OnlineDeployment resource = manager .onlineDeployments() .getWithResponse("test-rg", "my-aml-workspace", "testEndpointName", "testDeploymentName", Context.NONE) @@ -38,17 +31,6 @@ public static void updateManagedOnlineDeployment( resource .update() .withTags(mapOf()) - .withIdentity( - new PartialManagedServiceIdentity() - .withType(ManagedServiceIdentityType.SYSTEM_ASSIGNED) - .withUserAssignedIdentities( - mapOf( - "string", - SerializerFactory - .createDefaultManagementSerializerAdapter() - .deserialize("{}", Object.class, SerializerEncoding.JSON)))) - .withKind("string") - .withProperties(new PartialManagedOnlineDeployment()) .withSku( new PartialSku() .withCapacity(1) @@ -60,7 +42,7 @@ public static void updateManagedOnlineDeployment( } /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineDeployment/KubernetesOnlineDeployment/update.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineDeployment/KubernetesOnlineDeployment/update.json */ /** * Sample code: Update Kubernetes Online Deployment. @@ -68,8 +50,8 @@ public static void updateManagedOnlineDeployment( * @param manager Entry point to MachineLearningManager. */ public static void updateKubernetesOnlineDeployment( - com.azure.resourcemanager.machinelearning.MachineLearningManager manager) throws IOException { - OnlineDeploymentData resource = + com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { + OnlineDeployment resource = manager .onlineDeployments() .getWithResponse("test-rg", "my-aml-workspace", "testEndpointName", "testDeploymentName", Context.NONE) @@ -77,17 +59,6 @@ public static void updateKubernetesOnlineDeployment( resource .update() .withTags(mapOf()) - .withIdentity( - new PartialManagedServiceIdentity() - .withType(ManagedServiceIdentityType.SYSTEM_ASSIGNED) - .withUserAssignedIdentities( - mapOf( - "string", - SerializerFactory - .createDefaultManagementSerializerAdapter() - .deserialize("{}", Object.class, SerializerEncoding.JSON)))) - .withKind("string") - .withProperties(new PartialKubernetesOnlineDeployment()) .withSku( new PartialSku() .withCapacity(1) diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsCreateOrUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsCreateOrUpdateSamples.java index 618d1d9e5d70..2a775ba585b5 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsCreateOrUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsCreateOrUpdateSamples.java @@ -7,7 +7,7 @@ import com.azure.resourcemanager.machinelearning.models.EndpointAuthMode; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentity; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentityType; -import com.azure.resourcemanager.machinelearning.models.OnlineEndpointDetails; +import com.azure.resourcemanager.machinelearning.models.OnlineEndpointProperties; import com.azure.resourcemanager.machinelearning.models.Sku; import com.azure.resourcemanager.machinelearning.models.SkuTier; import com.azure.resourcemanager.machinelearning.models.UserAssignedIdentity; @@ -17,7 +17,7 @@ /** Samples for OnlineEndpoints CreateOrUpdate. */ public final class OnlineEndpointsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineEndpoint/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineEndpoint/createOrUpdate.json */ /** * Sample code: CreateOrUpdate Online Endpoint. @@ -32,7 +32,7 @@ public static void createOrUpdateOnlineEndpoint( .withRegion("string") .withExistingWorkspace("test-rg", "my-aml-workspace") .withProperties( - new OnlineEndpointDetails() + new OnlineEndpointProperties() .withAuthMode(EndpointAuthMode.AMLTOKEN) .withDescription("string") .withProperties(mapOf("string", "string")) diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsDeleteSamples.java index c0fd01296b3b..f6e9f3d22fdd 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsDeleteSamples.java @@ -9,7 +9,7 @@ /** Samples for OnlineEndpoints Delete. */ public final class OnlineEndpointsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineEndpoint/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineEndpoint/delete.json */ /** * Sample code: Delete Online Endpoint. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsGetSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsGetSamples.java index 8edd8ba5add5..799fbd9a46d8 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsGetSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsGetSamples.java @@ -9,7 +9,7 @@ /** Samples for OnlineEndpoints Get. */ public final class OnlineEndpointsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineEndpoint/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineEndpoint/get.json */ /** * Sample code: Get Online Endpoint. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsGetTokenSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsGetTokenSamples.java index 3707e6893a62..21be89f69844 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsGetTokenSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsGetTokenSamples.java @@ -9,7 +9,7 @@ /** Samples for OnlineEndpoints GetToken. */ public final class OnlineEndpointsGetTokenSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineEndpoint/getToken.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineEndpoint/getToken.json */ /** * Sample code: GetToken Online Endpoint. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsListKeysSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsListKeysSamples.java index 59d2d9bd2be7..5f440d309375 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsListKeysSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsListKeysSamples.java @@ -9,7 +9,7 @@ /** Samples for OnlineEndpoints ListKeys. */ public final class OnlineEndpointsListKeysSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineEndpoint/listKeys.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineEndpoint/listKeys.json */ /** * Sample code: ListKeys Online Endpoint. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsListSamples.java index bf76e04c91c3..787976889057 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsListSamples.java @@ -11,7 +11,7 @@ /** Samples for OnlineEndpoints List. */ public final class OnlineEndpointsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineEndpoint/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineEndpoint/list.json */ /** * Sample code: List Online Endpoint. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsRegenerateKeysSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsRegenerateKeysSamples.java index 1d9abdecc725..5265e8b8c315 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsRegenerateKeysSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsRegenerateKeysSamples.java @@ -11,7 +11,7 @@ /** Samples for OnlineEndpoints RegenerateKeys. */ public final class OnlineEndpointsRegenerateKeysSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineEndpoint/regenerateKeys.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineEndpoint/regenerateKeys.json */ /** * Sample code: RegenerateKeys Online Endpoint. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsUpdateSamples.java index 9c28f07a0c0e..0de2e9d60e48 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OnlineEndpointsUpdateSamples.java @@ -8,11 +8,8 @@ import com.azure.core.util.Context; import com.azure.core.util.serializer.SerializerEncoding; import com.azure.resourcemanager.machinelearning.models.ManagedServiceIdentityType; -import com.azure.resourcemanager.machinelearning.models.OnlineEndpointData; +import com.azure.resourcemanager.machinelearning.models.OnlineEndpoint; import com.azure.resourcemanager.machinelearning.models.PartialManagedServiceIdentity; -import com.azure.resourcemanager.machinelearning.models.PartialOnlineEndpoint; -import com.azure.resourcemanager.machinelearning.models.PartialSku; -import com.azure.resourcemanager.machinelearning.models.SkuTier; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -20,7 +17,7 @@ /** Samples for OnlineEndpoints Update. */ public final class OnlineEndpointsUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/OnlineEndpoint/update.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/OnlineEndpoint/update.json */ /** * Sample code: Update Online Endpoint. @@ -29,7 +26,7 @@ public final class OnlineEndpointsUpdateSamples { */ public static void updateOnlineEndpoint(com.azure.resourcemanager.machinelearning.MachineLearningManager manager) throws IOException { - OnlineEndpointData resource = + OnlineEndpoint resource = manager .onlineEndpoints() .getWithResponse("test-rg", "my-aml-workspace", "testEndpointName", Context.NONE) @@ -46,15 +43,6 @@ public static void updateOnlineEndpoint(com.azure.resourcemanager.machinelearnin SerializerFactory .createDefaultManagementSerializerAdapter() .deserialize("{}", Object.class, SerializerEncoding.JSON)))) - .withKind("string") - .withProperties(new PartialOnlineEndpoint().withTraffic(mapOf("string", 1))) - .withSku( - new PartialSku() - .withCapacity(1) - .withFamily("string") - .withName("string") - .withSize("string") - .withTier(SkuTier.FREE)) .apply(); } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OperationsListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OperationsListSamples.java index 9f6e24ddf75b..adafc363207f 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OperationsListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/OperationsListSamples.java @@ -9,7 +9,7 @@ /** Samples for Operations List. */ public final class OperationsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/operationsList.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/operationsList.json */ /** * Sample code: OperationsList. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateEndpointConnectionsCreateOrUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateEndpointConnectionsCreateOrUpdateSamples.java index adae22be8eef..46a109bd3faa 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateEndpointConnectionsCreateOrUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateEndpointConnectionsCreateOrUpdateSamples.java @@ -10,7 +10,7 @@ /** Samples for PrivateEndpointConnections CreateOrUpdate. */ public final class PrivateEndpointConnectionsCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/PrivateEndpointConnection/createOrUpdate.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/PrivateEndpointConnection/createOrUpdate.json */ /** * Sample code: WorkspacePutPrivateEndpointConnection. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateEndpointConnectionsDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateEndpointConnectionsDeleteSamples.java index d3c1d5fb9cd7..b1112a7d76fa 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateEndpointConnectionsDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateEndpointConnectionsDeleteSamples.java @@ -9,7 +9,7 @@ /** Samples for PrivateEndpointConnections Delete. */ public final class PrivateEndpointConnectionsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/PrivateEndpointConnection/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/PrivateEndpointConnection/delete.json */ /** * Sample code: WorkspaceDeletePrivateEndpointConnection. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateEndpointConnectionsGetSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateEndpointConnectionsGetSamples.java index ca77172dacf6..529f5a459d53 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateEndpointConnectionsGetSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateEndpointConnectionsGetSamples.java @@ -9,7 +9,7 @@ /** Samples for PrivateEndpointConnections Get. */ public final class PrivateEndpointConnectionsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/PrivateEndpointConnection/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/PrivateEndpointConnection/get.json */ /** * Sample code: WorkspaceGetPrivateEndpointConnection. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateEndpointConnectionsListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateEndpointConnectionsListSamples.java index 8a19dca8e692..ccad39824ea8 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateEndpointConnectionsListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateEndpointConnectionsListSamples.java @@ -9,7 +9,7 @@ /** Samples for PrivateEndpointConnections List. */ public final class PrivateEndpointConnectionsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/PrivateEndpointConnection/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/PrivateEndpointConnection/list.json */ /** * Sample code: StorageAccountListPrivateEndpointConnections. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateLinkResourcesListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateLinkResourcesListSamples.java index 6856fcce03df..6fda3f79ff39 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateLinkResourcesListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/PrivateLinkResourcesListSamples.java @@ -9,7 +9,7 @@ /** Samples for PrivateLinkResources List. */ public final class PrivateLinkResourcesListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/PrivateLinkResource/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/PrivateLinkResource/list.json */ /** * Sample code: WorkspaceListPrivateLinkResources. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/QuotasListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/QuotasListSamples.java index d8b5cac81338..84d5284ee669 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/QuotasListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/QuotasListSamples.java @@ -9,7 +9,7 @@ /** Samples for Quotas List. */ public final class QuotasListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Quota/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Quota/list.json */ /** * Sample code: List workspace quotas by VMFamily. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/QuotasUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/QuotasUpdateSamples.java index 858972271aaa..63865be497c1 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/QuotasUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/QuotasUpdateSamples.java @@ -13,7 +13,7 @@ /** Samples for Quotas Update. */ public final class QuotasUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Quota/update.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Quota/update.json */ /** * Sample code: update quotas. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/UsagesListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/UsagesListSamples.java index be1aaf51c237..585eab0704ca 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/UsagesListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/UsagesListSamples.java @@ -9,7 +9,7 @@ /** Samples for Usages List. */ public final class UsagesListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Usage/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Usage/list.json */ /** * Sample code: List Usages. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/VirtualMachineSizesListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/VirtualMachineSizesListSamples.java index 2419e5ae92a0..684c00ab7f9c 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/VirtualMachineSizesListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/VirtualMachineSizesListSamples.java @@ -9,7 +9,7 @@ /** Samples for VirtualMachineSizes List. */ public final class VirtualMachineSizesListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/VirtualMachineSize/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/VirtualMachineSize/list.json */ /** * Sample code: List VM Sizes. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceConnectionsCreateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceConnectionsCreateSamples.java index 491234c7d941..85d0bc5acd78 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceConnectionsCreateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceConnectionsCreateSamples.java @@ -4,10 +4,13 @@ package com.azure.resourcemanager.machinelearning.generated; +import com.azure.resourcemanager.machinelearning.models.ConnectionCategory; +import com.azure.resourcemanager.machinelearning.models.NoneAuthTypeWorkspaceConnectionProperties; + /** Samples for WorkspaceConnections Create. */ public final class WorkspaceConnectionsCreateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/WorkspaceConnection/create.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/WorkspaceConnection/create.json */ /** * Sample code: CreateWorkspaceConnection. @@ -20,10 +23,10 @@ public static void createWorkspaceConnection( .workspaceConnections() .define("connection-1") .withExistingWorkspace("resourceGroup-1", "workspace-1") - .withCategory("ACR") - .withTarget("www.facebook.com") - .withAuthType("PAT") - .withValue("secrets") + .withProperties( + new NoneAuthTypeWorkspaceConnectionProperties() + .withCategory(ConnectionCategory.CONTAINER_REGISTRY) + .withTarget("www.facebook.com")) .create(); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceConnectionsDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceConnectionsDeleteSamples.java index 87562608439c..7219d10da6c5 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceConnectionsDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceConnectionsDeleteSamples.java @@ -9,7 +9,7 @@ /** Samples for WorkspaceConnections Delete. */ public final class WorkspaceConnectionsDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/WorkspaceConnection/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/WorkspaceConnection/delete.json */ /** * Sample code: DeleteWorkspaceConnection. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceConnectionsGetSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceConnectionsGetSamples.java index 53c250dcd90b..1c50154a04b3 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceConnectionsGetSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceConnectionsGetSamples.java @@ -9,7 +9,7 @@ /** Samples for WorkspaceConnections Get. */ public final class WorkspaceConnectionsGetSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/WorkspaceConnection/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/WorkspaceConnection/get.json */ /** * Sample code: GetWorkspaceConnection. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceConnectionsListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceConnectionsListSamples.java index 6277f375754f..f3623bdafa6a 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceConnectionsListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceConnectionsListSamples.java @@ -9,7 +9,7 @@ /** Samples for WorkspaceConnections List. */ public final class WorkspaceConnectionsListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/WorkspaceConnection/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/WorkspaceConnection/list.json */ /** * Sample code: ListWorkspaceConnections. @@ -18,6 +18,8 @@ public final class WorkspaceConnectionsListSamples { */ public static void listWorkspaceConnections( com.azure.resourcemanager.machinelearning.MachineLearningManager manager) { - manager.workspaceConnections().list("resourceGroup-1", "workspace-1", "www.facebook.com", "ACR", Context.NONE); + manager + .workspaceConnections() + .list("resourceGroup-1", "workspace-1", "www.facebook.com", "ContainerRegistry", Context.NONE); } } diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceFeaturesListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceFeaturesListSamples.java index cb6c47bf13dd..65b649bd5c7a 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceFeaturesListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspaceFeaturesListSamples.java @@ -9,7 +9,7 @@ /** Samples for WorkspaceFeatures List. */ public final class WorkspaceFeaturesListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/WorkspaceFeature/list.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/WorkspaceFeature/list.json */ /** * Sample code: List Workspace features. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesCreateOrUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesCreateOrUpdateSamples.java index b4e2b9f950d4..73851edbcf0a 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesCreateOrUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesCreateOrUpdateSamples.java @@ -20,7 +20,7 @@ /** Samples for Workspaces CreateOrUpdate. */ public final class WorkspacesCreateOrUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/create.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/create.json */ /** * Sample code: Create Workspace. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesDeleteSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesDeleteSamples.java index 1aef475b3992..d60f8666dd1b 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesDeleteSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesDeleteSamples.java @@ -9,7 +9,7 @@ /** Samples for Workspaces Delete. */ public final class WorkspacesDeleteSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/delete.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/delete.json */ /** * Sample code: Delete Workspace. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesDiagnoseSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesDiagnoseSamples.java index 5b33bfb24009..a48fa7129951 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesDiagnoseSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesDiagnoseSamples.java @@ -13,7 +13,7 @@ /** Samples for Workspaces Diagnose. */ public final class WorkspacesDiagnoseSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/diagnose.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/diagnose.json */ /** * Sample code: Diagnose Workspace. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesGetByResourceGroupSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesGetByResourceGroupSamples.java index bb84f84805f1..84ccd3fb3876 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesGetByResourceGroupSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesGetByResourceGroupSamples.java @@ -9,7 +9,7 @@ /** Samples for Workspaces GetByResourceGroup. */ public final class WorkspacesGetByResourceGroupSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/get.json */ /** * Sample code: Get Workspace. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListByResourceGroupSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListByResourceGroupSamples.java index f5f83077eb3d..f2ea08df84b9 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListByResourceGroupSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListByResourceGroupSamples.java @@ -9,7 +9,7 @@ /** Samples for Workspaces ListByResourceGroup. */ public final class WorkspacesListByResourceGroupSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/listByResourceGroup.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/listByResourceGroup.json */ /** * Sample code: Get Workspaces by Resource Group. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListKeysSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListKeysSamples.java index df4927c6259a..bc03ffc6f97f 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListKeysSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListKeysSamples.java @@ -9,7 +9,7 @@ /** Samples for Workspaces ListKeys. */ public final class WorkspacesListKeysSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/listKeys.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/listKeys.json */ /** * Sample code: List Workspace Keys. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListNotebookAccessTokenSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListNotebookAccessTokenSamples.java index 34f02920a33b..95b5c59dd68f 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListNotebookAccessTokenSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListNotebookAccessTokenSamples.java @@ -9,7 +9,7 @@ /** Samples for Workspaces ListNotebookAccessToken. */ public final class WorkspacesListNotebookAccessTokenSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/listNotebookAccessToken.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/listNotebookAccessToken.json */ /** * Sample code: List Workspace Keys. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListNotebookKeysSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListNotebookKeysSamples.java index 5ab643e5d4d7..e95a80343707 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListNotebookKeysSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListNotebookKeysSamples.java @@ -9,7 +9,7 @@ /** Samples for Workspaces ListNotebookKeys. */ public final class WorkspacesListNotebookKeysSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Notebook/listKeys.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Notebook/listKeys.json */ /** * Sample code: List Workspace Keys. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListOutboundNetworkDependenciesEndpointsSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListOutboundNetworkDependenciesEndpointsSamples.java index 72632cc48754..7f2ba31d0ac3 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListOutboundNetworkDependenciesEndpointsSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListOutboundNetworkDependenciesEndpointsSamples.java @@ -9,7 +9,7 @@ /** Samples for Workspaces ListOutboundNetworkDependenciesEndpoints. */ public final class WorkspacesListOutboundNetworkDependenciesEndpointsSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/ExternalFQDN/get.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/ExternalFQDN/get.json */ /** * Sample code: ListOutboundNetworkDependenciesEndpoints. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListSamples.java index e6fcdfa952b8..efc34defd509 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListSamples.java @@ -9,7 +9,7 @@ /** Samples for Workspaces List. */ public final class WorkspacesListSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/listBySubscription.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/listBySubscription.json */ /** * Sample code: Get Workspaces by subscription. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListStorageAccountKeysSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListStorageAccountKeysSamples.java index c9800f875ebe..8c4de00b311a 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListStorageAccountKeysSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesListStorageAccountKeysSamples.java @@ -9,7 +9,7 @@ /** Samples for Workspaces ListStorageAccountKeys. */ public final class WorkspacesListStorageAccountKeysSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/listStorageAccountKeys.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/listStorageAccountKeys.json */ /** * Sample code: List Workspace Keys. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesPrepareNotebookSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesPrepareNotebookSamples.java index 64f0f16a6cbb..730ecc53da0a 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesPrepareNotebookSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesPrepareNotebookSamples.java @@ -9,7 +9,7 @@ /** Samples for Workspaces PrepareNotebook. */ public final class WorkspacesPrepareNotebookSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Notebook/prepare.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Notebook/prepare.json */ /** * Sample code: Prepare Notebook. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesResyncKeysSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesResyncKeysSamples.java index 4871b9e5f709..f5f3bbbfdf37 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesResyncKeysSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesResyncKeysSamples.java @@ -9,7 +9,7 @@ /** Samples for Workspaces ResyncKeys. */ public final class WorkspacesResyncKeysSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/resyncKeys.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/resyncKeys.json */ /** * Sample code: Resync Workspace Keys. diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesUpdateSamples.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesUpdateSamples.java index 3cffa00b21bc..ca48aa7e1287 100644 --- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesUpdateSamples.java +++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/samples/java/com/azure/resourcemanager/machinelearning/generated/WorkspacesUpdateSamples.java @@ -11,7 +11,7 @@ /** Samples for Workspaces Update. */ public final class WorkspacesUpdateSamples { /* - * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-02-01-preview/examples/Workspace/update.json + * x-ms-original-file: specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2022-05-01/examples/Workspace/update.json */ /** * Sample code: Update Workspace.