From 0e765ed012e0df4932bddfe5b076ab45636488d8 Mon Sep 17 00:00:00 2001
From: samvaity <savaity@microsoft.com>
Date: Thu, 27 May 2021 14:01:53 -0700
Subject: [PATCH 1/3] Add options overload API's

---
 .../azure-ai-metricsadvisor/README.md         |  27 +--
 .../MetricsAdvisorAsyncClient.java            | 157 ++++++++++++++++++
 .../metricsadvisor/MetricsAdvisorClient.java  |  23 ---
 ...tricsAdvisorAdministrationAsyncClient.java |  36 ++++
 .../MetricsAdvisorAdministrationClient.java   |  16 +-
 .../ListIncidentsAlertedSample.java           |   4 +-
 ...AdvisorAsyncClientJavaDocCodeSnippets.java | 142 +++++++++++++++-
 ...tricsAdvisorClientJavaDocCodeSnippets.java |  32 ----
 .../ai/metricsadvisor/ReadmeSamples.java      |   4 +-
 .../AnomalyDetectionConfigurationSample.java  |   3 +-
 .../DataFeedIngestionSample.java              |   3 +-
 ...trationAsyncClientJavaDocCodeSnippets.java |  31 +++-
 ...ministrationClientJavaDocCodeSnippets.java |  14 +-
 .../AnomalyIncidentForAlertTest.java          |   4 +-
 .../DataFeedIngestionOperationTest.java       |   2 +-
 .../DetectionConfigurationTest.java           |   3 +-
 16 files changed, 396 insertions(+), 105 deletions(-)

diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md
index 228af14359a40..4ec7a2006966b 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md
@@ -49,7 +49,7 @@ You will need two keys to authenticate the client:
 Once you have the two keys and endpoint, you can use the `MetricsAdvisorKeyCredential` class to authenticate the clients as follows:
 
 #### Create a Metrics Advisor client using MetricsAdvisorKeyCredential
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L64-L68-->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L65-L69-->
 ```java
 MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key");
 MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder()
@@ -59,7 +59,7 @@ MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder()
 ```
 
 #### Create a Metrics Administration client using MetricsAdvisorKeyCredential
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L75-L80 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L76-L81 -->
 ```java
 MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key");
 MetricsAdvisorAdministrationClient metricsAdvisorAdminClient =
@@ -97,7 +97,7 @@ Authorization is easiest using [DefaultAzureCredential][wiki_identity]. It finds
 running environment. For more information about using Azure Active Directory authorization with Metrics Advisor, please
 refer to [the associated documentation][aad_authorization].
 #### Create a Metrics Advisor client using AAD authentication
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L87-L91 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L88-L92 -->
 ```java
 TokenCredential credential = new DefaultAzureCredentialBuilder().build();
 MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder()
@@ -107,7 +107,7 @@ MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder()
 ```
 
 #### Create a Metrics Administration client using AAD authentication
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L98-L103 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L99-L104 -->
 ```java
 TokenCredential credential = new DefaultAzureCredentialBuilder().build();
 MetricsAdvisorAdministrationClient metricsAdvisorAdminClient =
@@ -174,7 +174,7 @@ A notification hook is the entry point that allows the users to subscribe to rea
 
 #### Add a data feed from a sample or data source
 This example ingests the user specified `SQLServerDataFeedSource` data feed source data to the service.
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L110-L147 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L111-L148 -->
 ```java
 DataFeed dataFeed = new DataFeed()
     .setName("dataFeedName")
@@ -212,13 +212,13 @@ System.out.printf("Data feed source type: %s%n", createdSqlDataFeed.getSourceTyp
 
 if (SQL_SERVER_DB == createdSqlDataFeed.getSourceType()) {
     System.out.printf("Data feed sql server query: %s%n",
-        ((SQLServerDataFeedSource) createdSqlDataFeed.getSource()).getQuery());
+        ((SqlServerDataFeedSource) createdSqlDataFeed.getSource()).getQuery());
 }
 ```
 #### Check ingestion status
 This example checks the ingestion status of a previously provided data feed source.
 
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L154-L165 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L155-L167 -->
 ```java
 String dataFeedId = "3d48er30-6e6e-4391-b78f-b00dfee1e6f5";
 
@@ -226,7 +226,8 @@ metricsAdvisorAdminClient.listDataFeedIngestionStatus(
     dataFeedId,
     new ListDataFeedIngestionOptions(
         OffsetDateTime.parse("2020-01-01T00:00:00Z"),
-        OffsetDateTime.parse("2020-09-09T00:00:00Z"))
+        OffsetDateTime.parse("2020-09-09T00:00:00Z")),
+    Context.NONE
 ).forEach(dataFeedIngestionStatus -> {
     System.out.printf("Message : %s%n", dataFeedIngestionStatus.getMessage());
     System.out.printf("Timestamp value : %s%n", dataFeedIngestionStatus.getTimestamp());
@@ -237,7 +238,7 @@ metricsAdvisorAdminClient.listDataFeedIngestionStatus(
 #### Configure anomaly detection configuration
 This example demonstrates how a user can configure an anomaly detection configuration for their data.
 
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L172-L202 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L174-L204 -->
 ```java
 String metricId = "3d48er30-6e6e-4391-b78f-b00dfee1e6f5";
 
@@ -274,7 +275,7 @@ final AnomalyDetectionConfiguration anomalyDetectionConfiguration =
 
 ### Add hooks for receiving anomaly alerts
 This example creates an email hook that receives anomaly incident alerts.
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L209-L221 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L211-L223 -->
 ```java
 NotificationHook emailNotificationHook = new EmailNotificationHook("email Hook")
     .setDescription("my email Hook")
@@ -293,7 +294,7 @@ System.out.printf("Email Hook emails to alert: %s%n",
 
 #### Configure an anomaly alert configuration
 This example demonstrates how a user can configure an alerting configuration for detected anomalies in their data.
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L228-L248 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L230-L250 -->
 
 ```java
 String detectionConfigurationId1 = "9ol48er30-6e6e-4391-b78f-b00dfee1e6f5";
@@ -351,7 +352,7 @@ Metrics Advisor clients raises `HttpResponseException` [exceptions][http_respons
 to provide a non existing feedback Id an `HttpResponseException` would be raised with an error indicating the failure cause.
 In the following code snippet, the error is handled
 gracefully by catching the exception and display the additional information about the error.
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L282-L286 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L284-L288 -->
 ```java
 try {
     metricsAdvisorClient.getFeedback("non_existing_feedback_id");
@@ -376,7 +377,7 @@ For more details see the [samples README][samples_readme].
 #### Async APIs
 All the examples shown so far have been using synchronous APIs, but we provide full support for async APIs as well.
 You'll need to use `MetricsAdvisorAsyncClient`
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L293-L297 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L295-L299 -->
 ```java
 MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key");
 MetricsAdvisorAsyncClient metricsAdvisorAsyncClient = new MetricsAdvisorClientBuilder()
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java
index 1c42b48738408..43fd4e2188870 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java
@@ -117,6 +117,28 @@ public class MetricsAdvisorAsyncClient {
         this.service = service;
     }
 
+    /**
+     * List series definition for a metric.
+     *
+     * <p><strong>Code sample</strong></p>
+     * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricSeriesDefinitions#String-OffsetDateTime}
+     *
+     * @param metricId metric unique id.
+     * @param activeSince the start time for querying series ingested after this time.
+     *
+     * @return A {@link PagedFlux} of the {@link MetricSeriesDefinition metric series definitions}.
+     * @throws IllegalArgumentException thrown if {@code metricId} fail the UUID format validation.
+     * @throws ErrorCodeException thrown if the request is rejected by server.
+     * @throws NullPointerException thrown if the {@code metricId} or {@code activeSince}
+     * is null.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<MetricSeriesDefinition> listMetricSeriesDefinitions(
+        String metricId,
+        OffsetDateTime activeSince) {
+        return listMetricSeriesDefinitions(metricId, activeSince);
+    }
+
     /**
      * List series definition for a metric.
      *
@@ -375,6 +397,29 @@ private Mono<PagedResponse<String>> listMetricDimensionValuesNextPageAsync(Strin
                 null));
     }
 
+    /**
+     * List the enrichment status for a metric.
+     *
+     * <p><strong>Code sample</strong></p>
+     * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricEnrichmentStatus#String-OffsetDateTime-OffsetDateTime}
+     *
+     * @param metricId metric unique id.
+     * @param startTime The start time for querying the time series data.
+     * @param endTime The end time for querying the time series data.
+     *
+     * @return the list of enrichment status's for the specified metric.
+     * @throws IllegalArgumentException thrown if {@code metricId} fail the UUID format validation.
+     * @throws ErrorCodeException thrown if the request is rejected by server.
+     * @throws NullPointerException thrown if {@code metricId}, {@code startTime} and {@code endTime}
+     * is null.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<EnrichmentStatus> listMetricEnrichmentStatus(
+        String metricId,
+        OffsetDateTime startTime, OffsetDateTime endTime) {
+        return listMetricEnrichmentStatus(metricId, startTime, endTime, null);
+    }
+
     /**
      * List the enrichment status for a metric.
      *
@@ -562,6 +607,30 @@ PagedFlux<MetricEnrichedSeriesData> listMetricEnrichedSeriesData(String detectio
                 null));
     }
 
+    /**
+     * Fetch the anomalies identified by an anomaly detection configuration.
+     *
+     * <p><strong>Code sample</strong></p>
+     * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomalies#String-OffsetDateTime-OffsetDateTime}
+     *
+     * @param detectionConfigurationId The anomaly detection configuration id.
+     * @param startTime The start time of the time range within which the anomalies were detected.
+     * @param endTime The end time of the time range within which the anomalies were detected.
+     *
+     * @return The anomalies.
+     * @throws IllegalArgumentException thrown if {@code detectionConfigurationId} does not conform
+     *     to the UUID format specification
+     *     or {@code options.filter} is used to set severity but either min or max severity is missing.
+     * @throws NullPointerException thrown if the {@code detectionConfigurationId} or {@code options}
+     *     or {@code startTime} or {@code endTime} is null.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<DataPointAnomaly> listAnomalies(
+        String detectionConfigurationId,
+        OffsetDateTime startTime, OffsetDateTime endTime) {
+        return listAnomalies(detectionConfigurationId, startTime, endTime, null);
+    }
+
     /**
      * Fetch the anomalies identified by an anomaly detection configuration.
      *
@@ -681,6 +750,28 @@ private Mono<PagedResponse<DataPointAnomaly>> listAnomaliesForDetectionConfigNex
             .map(response -> AnomalyTransforms.fromInnerPagedResponse(response));
     }
 
+    /**
+     * Fetch the incidents identified by an anomaly detection configuration.
+     *
+     * <p><strong>Code sample</strong></p>
+     * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidents#String-OffsetDateTime-OffsetDateTime}
+     *
+     * @param detectionConfigurationId The anomaly detection configuration id.
+     * @param startTime The start time of the time range within which the incidents were detected.
+     * @param endTime The end time of the time range within which the incidents were detected.
+     * @return The incidents.
+     * @throws IllegalArgumentException thrown if {@code detectionConfigurationId} does not conform
+     *     to the UUID format specification.
+     * @throws NullPointerException thrown if the {@code detectionConfigurationId} or {@code options}
+     *     or {@code startTime} or {@code endTime} is null.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<AnomalyIncident> listIncidents(
+        String detectionConfigurationId,
+        OffsetDateTime startTime, OffsetDateTime endTime) {
+        return listIncidents(detectionConfigurationId, startTime, endTime, null);
+    }
+
     /**
      * Fetch the incidents identified by an anomaly detection configuration.
      *
@@ -871,6 +962,30 @@ private Mono<PagedResponse<IncidentRootCause>> listIncidentRootCausesInternal(An
             .map(res -> IncidentRootCauseTransforms.fromInnerResponse(res));
     }
 
+    /**
+     * Fetch dimension values that have anomalies.
+     *
+     * <p><strong>Code sample</strong></p>
+     * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomalyDimensionValues#String-String-OffsetDateTime-OffsetDateTime}
+     *
+     * @param detectionConfigurationId Identifies the configuration used to detect the anomalies.
+     * @param dimensionName The dimension name to retrieve the values for.
+     * @param startTime The start time of the time range within which the anomalies were identified.
+     * @param endTime The end time of the time range within which the anomalies were identified.
+     * @return The dimension values with anomalies.
+     * @throws IllegalArgumentException thrown if {@code detectionConfigurationId} does not conform
+     *     to the UUID format specification.
+     * @throws NullPointerException thrown if the {@code detectionConfigurationId} or {@code dimensionName}
+     *     or {@code options} or {@code startTime} or {@code endTime} is null.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<String> listAnomalyDimensionValues(
+        String detectionConfigurationId,
+        String dimensionName,
+        OffsetDateTime startTime, OffsetDateTime endTime) {
+        return listAnomalyDimensionValues(detectionConfigurationId, dimensionName, startTime, endTime);
+    }
+
     /**
      * Fetch dimension values that have anomalies.
      *
@@ -997,6 +1112,27 @@ private Mono<PagedResponse<String>> listAnomalyDimensionValuesNextPageAsync(
                 error));
     }
 
+    /**
+     * Fetch the alerts triggered by an anomaly alert configuration.
+     *
+     * <p><strong>Code sample</strong></p>
+     * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAlerts#String-OffsetDateTime-OffsetDateTime}
+     *
+     * @param alertConfigurationId The anomaly alert configuration id.
+     * @param startTime The start time of the time range within which the alerts were triggered.
+     * @param endTime The end time of the time range within which the alerts were triggered.
+     * @return The alerts.
+     * @throws IllegalArgumentException thrown if {@code alertConfigurationId} does not conform
+     *     to the UUID format specification.
+     * @throws NullPointerException thrown if the {@code alertConfigurationId}
+     *     or {@code startTime} or {@code endTime} is null.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<AnomalyAlert> listAlerts(
+        String alertConfigurationId, OffsetDateTime startTime, OffsetDateTime endTime) {
+        return listAlerts(alertConfigurationId, startTime, endTime, null);
+    }
+
     /**
      * Fetch the alerts triggered by an anomaly alert configuration.
      *
@@ -1194,6 +1330,27 @@ private Mono<PagedResponse<DataPointAnomaly>> listAnomaliesForAlertNextPageAsync
             .map(response -> AnomalyTransforms.fromInnerPagedResponse(response));
     }
 
+
+    /**
+     * Fetch the incidents in an alert.
+     *
+     * <p><strong>Code sample</strong></p>
+     * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidents#String-String-ListIncidentsAlertedOptions}
+     *
+     * @param alertConfigurationId The anomaly alert configuration id.
+     * @param alertId The alert id.
+     * @return The incidents.
+     * @throws IllegalArgumentException thrown if {@code alertConfigurationId} or {@code alertId} does not
+     *     conform to the UUID format specification.
+     * @throws NullPointerException thrown if the {@code alertConfigurationId} or {@code alertId} is null.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<AnomalyIncident> listIncidents(
+        String alertConfigurationId,
+        String alertId) {
+        return listIncidents(alertConfigurationId, alertId, null);
+    }
+
     /**
      * Fetch the incidents in an alert.
      *
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java
index 800cfcda322fd..b14b39a67f490 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java
@@ -574,29 +574,6 @@ public PagedIterable<DataPointAnomaly> listAnomalies(
             context == null ? Context.NONE : context));
     }
 
-    /**
-     * Fetch the incidents in an alert.
-     *
-     * <p><strong>Code sample</strong></p>
-     * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidents#String-String-ListIncidentsAlertedOptions}
-     *
-     * @param alertConfigurationId The anomaly alert configuration id.
-     * @param alertId The alert id.
-     * @param options The additional parameters.
-     *
-     * @return The incidents.
-     * @throws IllegalArgumentException thrown if {@code alertConfigurationId} or {@code alertId} does not
-     * conform to the UUID format specification.
-     * @throws NullPointerException thrown if the {@code alertConfigurationId} or {@code alertId} is null.
-     */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedIterable<AnomalyIncident> listIncidents(
-        String alertConfigurationId,
-        String alertId,
-        ListIncidentsAlertedOptions options) {
-        return listIncidents(alertConfigurationId, alertId, options, Context.NONE);
-    }
-
     /**
      * Fetch the incidents in an alert.
      *
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java
index 9dc8bd3ca1ef9..9c9dfac92765f 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java
@@ -497,6 +497,25 @@ private Mono<PagedResponse<DataFeed>> listDataFeedsNextPageAsync(String nextPage
                 null));
     }
 
+    /**
+     * Fetch the ingestion status of a data feed.
+     *
+     * <p><strong>Code sample</strong></p>
+     * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listDataFeedIngestionStatus#String}
+     *
+     * @param dataFeedId The data feed id.
+     *
+     * @return The ingestion statuses.
+     * @throws IllegalArgumentException If {@code dataFeedId} does not conform to the UUID format specification.
+     * @throws NullPointerException If {@code dataFeedId}, {@code options}, {@code options.startTime},
+     * {@code options.endTime}  is null.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<DataFeedIngestionStatus> listDataFeedIngestionStatus(
+        String dataFeedId) {
+        return listDataFeedIngestionStatus(dataFeedId);
+    }
+
     /**
      * Fetch the ingestion status of a data feed.
      *
@@ -984,6 +1003,23 @@ Mono<Response<Void>> deleteMetricAnomalyDetectionConfigWithResponse(String detec
             .doOnError(error -> logger.warning("Failed to delete MetricAnomalyDetectionConfiguration", error));
     }
 
+    /**
+     * Given a metric id, retrieve all anomaly detection configurations applied to it.
+     *
+     * <p><strong>Code sample</strong></p>
+     * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listMetricAnomalyDetectionConfigs#String}
+     *
+     * @param metricId The metric id.
+     * @return The anomaly detection configurations.
+     * @throws NullPointerException thrown if the {@code metricId} is null.
+     * @throws IllegalArgumentException If {@code metricId} does not conform to the UUID format specification.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<AnomalyDetectionConfiguration> listMetricAnomalyDetectionConfigs(
+        String metricId) {
+        return listMetricAnomalyDetectionConfigs(metricId);
+    }
+
     /**
      * Given a metric id, retrieve all anomaly detection configurations applied to it.
      *
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClient.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClient.java
index 12bec1fd7c9c7..28993345ffed6 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClient.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClient.java
@@ -214,10 +214,9 @@ public PagedIterable<DataFeed> listDataFeeds(ListDataFeedOptions options, Contex
      * Fetch the ingestion status of a data feed.
      *
      * <p><strong>Code sample</strong></p>
-     * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listDataFeedIngestionStatus#String-ListDataFeedIngestionOptions}
+     * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listDataFeedIngestionStatus#String}
      *
      * @param dataFeedId The data feed id.
-     * @param options The additional parameters.
      * @return The ingestion statuses.
      * @throws IllegalArgumentException If {@code dataFeedId} does not conform to the UUID format specification.
      * @throws NullPointerException If {@code dataFeedId}, {@code options}, {@code options.startTime},
@@ -225,9 +224,8 @@ public PagedIterable<DataFeed> listDataFeeds(ListDataFeedOptions options, Contex
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<DataFeedIngestionStatus> listDataFeedIngestionStatus(
-        String dataFeedId,
-        ListDataFeedIngestionOptions options) {
-        return listDataFeedIngestionStatus(dataFeedId, options, Context.NONE);
+        String dataFeedId) {
+        return listDataFeedIngestionStatus(dataFeedId, null, Context.NONE);
     }
 
     /**
@@ -519,19 +517,17 @@ public Response<Void> deleteMetricAnomalyDetectionConfigWithResponse(
      * Given a metric id, retrieve all anomaly detection configurations applied to it.
      *
      * <p><strong>Code sample</strong></p>
-     * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listMetricAnomalyDetectionConfigs#String-ListMetricAnomalyDetectionConfigsOptions}
+     * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listMetricAnomalyDetectionConfigs#String}
      *
      * @param metricId The metric id.
-     * @param options th e additional configurable options to specify when querying the result.
      * @return The anomaly detection configurations.
      * @throws NullPointerException thrown if the {@code metricId} is null.
      * @throws IllegalArgumentException If {@code metricId} does not conform to the UUID format specification.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<AnomalyDetectionConfiguration> listMetricAnomalyDetectionConfigs(
-        String metricId,
-        ListMetricAnomalyDetectionConfigsOptions options) {
-        return new PagedIterable<>(client.listMetricAnomalyDetectionConfigs(metricId, options,
+        String metricId) {
+        return new PagedIterable<>(client.listMetricAnomalyDetectionConfigs(metricId, null,
             Context.NONE));
     }
 
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedSample.java
index afb6541df9966..99b348db60180 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedSample.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedSample.java
@@ -7,6 +7,7 @@
 import com.azure.ai.metricsadvisor.models.ListIncidentsAlertedOptions;
 import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential;
 import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.util.Context;
 
 /**
  * Sample demonstrates how to list incidents in an alert.
@@ -27,7 +28,8 @@ public static void main(String[] args) {
         PagedIterable<AnomalyIncident> incidentsIterable = advisorClient.listIncidents(
             alertConfigurationId,
             alertId,
-            options);
+            options,
+            Context.NONE);
 
         for (AnomalyIncident anomalyIncident : incidentsIterable) {
             System.out.printf("DataFeedMetric Id: %s%n", anomalyIncident.getMetricId());
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java
index ef2090739172c..492c8406a47cd 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java
@@ -85,7 +85,23 @@ public void createMetricAdvisorAsyncClientWithPipeline() {
      * Code snippet for
      * {@link MetricsAdvisorAsyncClient#listMetricSeriesDefinitions(String, OffsetDateTime, ListMetricSeriesDefinitionOptions)}
      */
+
     public void listMetricSeriesDefinitions() {
+        // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricSeriesDefinitions#String-OffsetDateTime
+        String metricId = "b460abfc-7a58-47d7-9d99-21ee21fdfc6e";
+        final OffsetDateTime activeSince = OffsetDateTime.parse("2020-07-10T00:00:00Z");
+
+        metricsAdvisorAsyncClient.listMetricSeriesDefinitions(metricId, activeSince)
+            .subscribe(metricSeriesDefinition -> {
+                System.out.printf("Data Feed Metric id for the retrieved series definition : %s%n",
+                    metricSeriesDefinition.getMetricId());
+                System.out.printf("Series Key:");
+                System.out.println(metricSeriesDefinition.getSeriesKey().asMap());
+            });
+        // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricSeriesDefinitions#String-OffsetDateTime
+    }
+
+    public void listMetricSeriesDefinitionsWithOptions() {
         // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricSeriesDefinitions#String-OffsetDateTime-ListMetricSeriesDefinitionOptions
         String metricId = "b460abfc-7a58-47d7-9d99-21ee21fdfc6e";
         final OffsetDateTime activeSince = OffsetDateTime.parse("2020-07-10T00:00:00Z");
@@ -154,10 +170,35 @@ public void listMetricDimensionValuesWithOptions() {
         // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricDimensionValues#String-String-ListMetricDimensionValuesOptions
     }
 
+    public void listIncidentsForAlert() {
+        // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidents#String-String
+        final String alertConfigurationId = "ff3014a0-bbbb-41ec-a637-677e77b81299";
+        final String alertId = "1746b031c00";
+
+        metricsAdvisorAsyncClient.listIncidents(
+            alertConfigurationId,
+            alertId)
+            .subscribe(incident -> {
+                System.out.printf("Data Feed Metric Id: %s%n", incident.getMetricId());
+                System.out.printf("Detection Configuration Id: %s%n", incident.getDetectionConfigurationId());
+                System.out.printf("Anomaly Incident Id: %s%n", incident.getId());
+                System.out.printf("Anomaly Incident Start Time: %s%n", incident.getStartTime());
+                System.out.printf("Anomaly Incident AnomalySeverity: %s%n", incident.getSeverity());
+                System.out.printf("Anomaly Incident Status: %s%n", incident.getStatus());
+                System.out.printf("Root DataFeedDimension Key:");
+                DimensionKey rootDimension = incident.getRootDimensionKey();
+                for (Map.Entry<String, String> dimension : rootDimension.asMap().entrySet()) {
+                    System.out.printf("DimensionName: %s DimensionValue:%s%n",
+                        dimension.getKey(), dimension.getValue());
+                }
+            });
+        // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidents#String-String
+    }
+
     /**
      * Code snippet for {@link MetricsAdvisorAsyncClient#listIncidents(String, String, ListIncidentsAlertedOptions)}.
      */
-    public void listIncidentsForAlert() {
+    public void listIncidentsForAlertWithOptions() {
         // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidents#String-String-ListIncidentsAlertedOptions
         final String alertConfigurationId = "ff3014a0-bbbb-41ec-a637-677e77b81299";
         final String alertId = "1746b031c00";
@@ -239,10 +280,26 @@ public void listAnomaliesForAlertWithOptions() {
         // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomalies#String-String-ListAnomaliesAlertedOptions
     }
 
+    public void listAlertForAlertConfiguration() {
+        // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAlerts#String-OffsetDateTime-OffsetDateTime
+        final String alertConfigurationId = "ff3014a0-bbbb-41ec-a637-677e77b81299";
+        final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z");
+        final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z");
+        final AlertQueryTimeMode timeMode = AlertQueryTimeMode.ANOMALY_TIME;
+
+        metricsAdvisorAsyncClient.listAlerts(alertConfigurationId, startTime, endTime)
+            .subscribe(alert -> {
+                System.out.printf("Anomaly Alert Id: %s%n", alert.getId());
+                System.out.printf("Created Time: %s%n", alert.getCreatedTime());
+                System.out.printf("Modified Time: %s%n", alert.getModifiedTime());
+            });
+        // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAlerts#String-OffsetDateTime-OffsetDateTime
+    }
+
     /**
      * Code snippet for {@link MetricsAdvisorAsyncClient#listAlerts(String, OffsetDateTime, OffsetDateTime, ListAlertOptions)}.
      */
-    public void listAlertForAlertConfiguration() {
+    public void listAlertForAlertConfigurationWithOptions() {
         // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAlerts#String-OffsetDateTime-OffsetDateTime-ListAlertOptions
         final String alertConfigurationId = "ff3014a0-bbbb-41ec-a637-677e77b81299";
         final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z");
@@ -261,10 +318,22 @@ public void listAlertForAlertConfiguration() {
         // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAlerts#String-OffsetDateTime-OffsetDateTime-ListAlertOptions
     }
 
-    /**
-     * Code snippet for {@link MetricsAdvisorAsyncClient#listAnomalyDimensionValues(String, String, OffsetDateTime, OffsetDateTime, ListAnomalyDimensionValuesOptions)}.
-     */
     public void listAnomalyDimensionValues() {
+        // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomalyDimensionValues#String-String-OffsetDateTime-OffsetDateTime
+        final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8";
+        final String dimensionName = "Dim1";
+        final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z");
+        final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z");
+
+        metricsAdvisorAsyncClient.listAnomalyDimensionValues(detectionConfigurationId,
+            dimensionName,
+            startTime, endTime)
+            .subscribe(dimensionValue -> {
+                System.out.printf("DataFeedDimension Value: %s%n", dimensionValue);
+            });
+        // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomalyDimensionValues#String-String-OffsetDateTime-OffsetDateTime
+    }
+    public void listAnomalyDimensionValuesWithOptions() {
         // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomalyDimensionValues#String-String-OffsetDateTime-OffsetDateTime-ListAnomalyDimensionValuesOptions
         final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8";
         final String dimensionName = "Dim1";
@@ -283,10 +352,31 @@ public void listAnomalyDimensionValues() {
         // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomalyDimensionValues#String-String-OffsetDateTime-OffsetDateTime-ListAnomalyDimensionValuesOptions
     }
 
+    public void listIncidentsForDetectionConfig() {
+        // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidents#String-OffsetDateTime-OffsetDateTime
+        final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8";
+        final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z");
+        final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z");
+
+        PagedFlux<AnomalyIncident> incidentsFlux
+            = metricsAdvisorAsyncClient.listIncidents(detectionConfigurationId, startTime, endTime);
+
+        incidentsFlux.subscribe(incident -> {
+            System.out.printf("Data Feed Metric Id: %s%n", incident.getMetricId());
+            System.out.printf("Detection Configuration Id: %s%n", incident.getDetectionConfigurationId());
+            System.out.printf("Anomaly Incident Id: %s%n", incident.getId());
+            System.out.printf("Anomaly Incident Start Time: %s%n", incident.getStartTime());
+            System.out.printf("Anomaly Incident AnomalySeverity: %s%n", incident.getSeverity());
+            System.out.printf("Anomaly Incident Status: %s%n", incident.getStatus());
+            System.out.printf("Root DataFeedDimension Key: %s%n", incident.getRootDimensionKey().asMap());
+        });
+        // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidents#String-OffsetDateTime-OffsetDateTime
+    }
+
     /**
      * Code snippet for {@link MetricsAdvisorAsyncClient#listIncidents(String, OffsetDateTime, OffsetDateTime, ListIncidentsDetectedOptions)}.
      */
-    public void listIncidentsForDetectionConfig() {
+    public void listIncidentsForDetectionConfigWithOptions() {
         // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidents#String-OffsetDateTime-OffsetDateTime-ListIncidentsDetectedOptions
         final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8";
         final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z");
@@ -309,10 +399,30 @@ public void listIncidentsForDetectionConfig() {
         // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidents#String-OffsetDateTime-OffsetDateTime-ListIncidentsDetectedOptions
     }
 
+    public void listAnomaliesForDetectionConfiguration() {
+        // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomalies#String-OffsetDateTime-OffsetDateTime
+        final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8";
+        final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z");
+        final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z");
+
+        metricsAdvisorAsyncClient.listAnomalies(detectionConfigurationId,
+            startTime, endTime)
+            .subscribe(anomaly -> {
+                System.out.printf("DataPoint Anomaly AnomalySeverity: %s%n", anomaly.getSeverity());
+                System.out.printf("Series Key:");
+                DimensionKey seriesKey = anomaly.getSeriesKey();
+                for (Map.Entry<String, String> dimension : seriesKey.asMap().entrySet()) {
+                    System.out.printf("DimensionName: %s DimensionValue:%s%n",
+                        dimension.getKey(), dimension.getValue());
+                }
+            });
+        // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomalies#String-OffsetDateTime-OffsetDateTime
+    }
+
     /**
      * Code snippet for {@link MetricsAdvisorAsyncClient#listAnomalies(String, OffsetDateTime, OffsetDateTime, ListAnomaliesDetectedOptions)}.
      */
-    public void listAnomaliesForDetectionConfiguration() {
+    public void listAnomaliesForDetectionConfigurationWithOptions() {
         // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomalies#String-OffsetDateTime-OffsetDateTime-ListAnomaliesDetectedOptions
         final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8";
         final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z");
@@ -568,10 +678,26 @@ public void listIncidentRootCausesWithIncident() {
         // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentRootCauses#AnomalyIncident
     }
 
+    public void listMetricEnrichmentStatus() {
+        // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricEnrichmentStatus#String-OffsetDateTime-OffsetDateTime
+        final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z");
+        final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z");
+        final String metricId = "d3gh4i4-b804-4ab9-a70f-0da0c89cft3l";
+
+        metricsAdvisorAsyncClient.listMetricEnrichmentStatus(metricId, startTime, endTime)
+            .subscribe(enrichmentStatus -> {
+                System.out.printf("Data Feed Metric enrichment status : %s%n", enrichmentStatus.getStatus());
+                System.out.printf("Data Feed Metric enrichment status message: %s%n", enrichmentStatus.getMessage());
+                System.out.printf("Data Feed Metric enrichment status data slice timestamp : %s%n",
+                    enrichmentStatus.getTimestamp());
+            });
+        // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricEnrichmentStatus#String-OffsetDateTime-OffsetDateTime
+    }
+
     /**
      * Code snippet for {@link MetricsAdvisorAsyncClient#listMetricEnrichmentStatus(String, OffsetDateTime, OffsetDateTime, ListMetricEnrichmentStatusOptions)}.
      */
-    public void listMetricEnrichmentStatus() {
+    public void listMetricEnrichmentStatusWithOptions() {
         // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricEnrichmentStatus#String-OffsetDateTime-OffsetDateTime-ListMetricEnrichmentStatusOptions
         final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z");
         final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z");
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java
index 9e05696bb0129..c98ff4f6a74be 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java
@@ -202,38 +202,6 @@ public void listMetricDimensionValuesWithOptions() {
         // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricDimensionValues#String-String-ListMetricDimensionValuesOptions-Context
     }
 
-    /**
-     * Code snippet for {@link MetricsAdvisorClient#listIncidents(String, String, ListIncidentsAlertedOptions)}.
-     */
-    public void listIncidentsForAlert() {
-        // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidents#String-String-ListIncidentsAlertedOptions
-        final String alertConfigurationId = "ff3014a0-bbbb-41ec-a637-677e77b81299";
-        final String alertId = "1746b031c00";
-        final ListIncidentsAlertedOptions options = new ListIncidentsAlertedOptions()
-            .setMaxPageSize(10);
-
-        PagedIterable<AnomalyIncident> incidentsIterable = metricsAdvisorClient.listIncidents(
-            alertConfigurationId,
-            alertId,
-            options);
-
-        for (AnomalyIncident anomalyIncident : incidentsIterable) {
-            System.out.printf("Data Feed Metric Id: %s%n", anomalyIncident.getMetricId());
-            System.out.printf("Detection Configuration Id: %s%n", anomalyIncident.getDetectionConfigurationId());
-            System.out.printf("Anomaly Incident Id: %s%n", anomalyIncident.getId());
-            System.out.printf("Anomaly Incident Start Time: %s%n", anomalyIncident.getStartTime());
-            System.out.printf("Anomaly Incident AnomalySeverity: %s%n", anomalyIncident.getSeverity());
-            System.out.printf("Anomaly Incident Status: %s%n", anomalyIncident.getStatus());
-            System.out.printf("Root DataFeedDimension Key:");
-            DimensionKey rootDimension = anomalyIncident.getRootDimensionKey();
-            for (Map.Entry<String, String> dimension : rootDimension.asMap().entrySet()) {
-                System.out.printf("DimensionName: %s DimensionValue:%s%n",
-                    dimension.getKey(), dimension.getValue());
-            }
-        }
-        // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidents#String-String-ListIncidentsAlertedOptions
-    }
-
     /**
      * Code snippet for {@link MetricsAdvisorClient#listIncidents(String, String, ListIncidentsAlertedOptions, Context)}.
      */
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java
index 3cf61022dc333..30d88cb96047c 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java
@@ -38,6 +38,7 @@
 import com.azure.ai.metricsadvisor.models.SuppressCondition;
 import com.azure.core.credential.TokenCredential;
 import com.azure.core.exception.HttpResponseException;
+import com.azure.core.util.Context;
 import com.azure.identity.DefaultAzureCredentialBuilder;
 
 import java.time.OffsetDateTime;
@@ -157,7 +158,8 @@ public void checkIngestionStatus() {
             dataFeedId,
             new ListDataFeedIngestionOptions(
                 OffsetDateTime.parse("2020-01-01T00:00:00Z"),
-                OffsetDateTime.parse("2020-09-09T00:00:00Z"))
+                OffsetDateTime.parse("2020-09-09T00:00:00Z")),
+            Context.NONE
         ).forEach(dataFeedIngestionStatus -> {
             System.out.printf("Message : %s%n", dataFeedIngestionStatus.getMessage());
             System.out.printf("Timestamp value : %s%n", dataFeedIngestionStatus.getTimestamp());
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/AnomalyDetectionConfigurationSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/AnomalyDetectionConfigurationSample.java
index 4f7124abd75a3..34917d6f00595 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/AnomalyDetectionConfigurationSample.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/AnomalyDetectionConfigurationSample.java
@@ -56,8 +56,7 @@ public static void main(String[] args) {
         // List configurations
         System.out.printf("Listing detection configurations%n");
         PagedIterable<AnomalyDetectionConfiguration> detectionConfigsIterable
-            = advisorAdministrationClient.listMetricAnomalyDetectionConfigs(metricId,
-                new ListMetricAnomalyDetectionConfigsOptions());
+            = advisorAdministrationClient.listMetricAnomalyDetectionConfigs(metricId);
 
         for (AnomalyDetectionConfiguration detectionConfig : detectionConfigsIterable) {
             printDetectionConfiguration(detectionConfig);
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DataFeedIngestionSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DataFeedIngestionSample.java
index 4c9bed81fd0d4..e38f841aaa8a0 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DataFeedIngestionSample.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DataFeedIngestionSample.java
@@ -8,6 +8,7 @@
 import com.azure.ai.metricsadvisor.models.ListDataFeedIngestionOptions;
 import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential;
 import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.util.Context;
 
 import java.time.OffsetDateTime;
 
@@ -29,7 +30,7 @@ public static void main(String[] args) {
         final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z");
         final ListDataFeedIngestionOptions options = new ListDataFeedIngestionOptions(startTime, endTime);
         PagedIterable<DataFeedIngestionStatus> ingestionStatusIterable
-            = advisorAdministrationClient.listDataFeedIngestionStatus(dataFeedId, options);
+            = advisorAdministrationClient.listDataFeedIngestionStatus(dataFeedId, options, Context.NONE);
 
         for (DataFeedIngestionStatus ingestionStatus : ingestionStatusIterable) {
             System.out.printf("Timestamp: %s%n", ingestionStatus.getTimestamp());
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java
index cdb740e16fdcf..54d149a9bdbb6 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java
@@ -543,10 +543,24 @@ public void listHooksWithOptions() {
         // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listHooks#ListHookOptions
     }
 
+    public void listDataFeedIngestionStatus() {
+        // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listDataFeedIngestionStatus#String
+        final String dataFeedId = "4957a2f7-a0f4-4fc0-b8d7-d866c1df0f4c";
+        final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z");
+        final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z");
+        metricsAdvisorAdminAsyncClient.listDataFeedIngestionStatus(dataFeedId)
+            .subscribe(ingestionStatus -> {
+                System.out.printf("Timestamp: %s%n", ingestionStatus.getTimestamp());
+                System.out.printf("Status: %s%n", ingestionStatus.getStatus());
+                System.out.printf("Message: %s%n", ingestionStatus.getMessage());
+            });
+        // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listDataFeedIngestionStatus#String
+    }
+
     /**
      * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#listDataFeedIngestionStatus(String, ListDataFeedIngestionOptions)}.
      */
-    public void listDataFeedIngestionStatus() {
+    public void listDataFeedIngestionStatusWithOptions() {
         // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listDataFeedIngestionStatus#String-ListDataFeedIngestionOptions
         final String dataFeedId = "4957a2f7-a0f4-4fc0-b8d7-d866c1df0f4c";
         final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z");
@@ -1065,10 +1079,23 @@ public void getDetectionConfigurationWithResponse() {
         // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getMetricAnomalyDetectionConfigWithResponse#String
     }
 
+    public void listDetectionConfigurations() {
+        // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listMetricAnomalyDetectionConfigs#String
+        final String metricId = "0b836da8-10e6-46cd-8f4f-28262e113a62";
+        metricsAdvisorAdminAsyncClient.listMetricAnomalyDetectionConfigs(metricId)
+            .subscribe(detectionConfig -> {
+                System.out.printf("Detection config Id: %s%n", detectionConfig.getId());
+                System.out.printf("Name: %s%n", detectionConfig.getName());
+                System.out.printf("Description: %s%n", detectionConfig.getDescription());
+                System.out.printf("MetricId: %s%n", detectionConfig.getMetricId());
+            });
+        // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listMetricAnomalyDetectionConfigs#String
+    }
+
     /**
      * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#listMetricAnomalyDetectionConfigs(String, ListMetricAnomalyDetectionConfigsOptions)}.
      */
-    public void listDetectionConfigurations() {
+    public void listDetectionConfigurationsWithOptions() {
         // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listMetricAnomalyDetectionConfigs#String-ListMetricAnomalyDetectionConfigsOptions
         final String metricId = "0b836da8-10e6-46cd-8f4f-28262e113a62";
         metricsAdvisorAdminAsyncClient.listMetricAnomalyDetectionConfigs(metricId,
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java
index 421c288fa0c61..ff19cd9df7fcf 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java
@@ -529,23 +529,22 @@ public void listHooksWithOptions() {
     }
 
     /**
-     * Code snippet for {@link MetricsAdvisorAdministrationClient#listDataFeedIngestionStatus(String, ListDataFeedIngestionOptions)}.
+     * Code snippet for {@link MetricsAdvisorAdministrationClient#listDataFeedIngestionStatus(String)}.
      */
     public void listDataFeedIngestionStatus() {
-        // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listDataFeedIngestionStatus#String-ListDataFeedIngestionOptions
+        // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listDataFeedIngestionStatus#String
         final String dataFeedId = "4957a2f7-a0f4-4fc0-b8d7-d866c1df0f4c";
         final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z");
         final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z");
-        final ListDataFeedIngestionOptions options = new ListDataFeedIngestionOptions(startTime, endTime);
         PagedIterable<DataFeedIngestionStatus> ingestionStatuses
-            = metricsAdvisorAdminClient.listDataFeedIngestionStatus(dataFeedId, options);
+            = metricsAdvisorAdminClient.listDataFeedIngestionStatus(dataFeedId);
 
         for (DataFeedIngestionStatus ingestionStatus : ingestionStatuses) {
             System.out.printf("Timestamp: %s%n", ingestionStatus.getTimestamp());
             System.out.printf("Status: %s%n", ingestionStatus.getStatus());
             System.out.printf("Message: %s%n", ingestionStatus.getMessage());
         }
-        // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listDataFeedIngestionStatus#String-ListDataFeedIngestionOptions
+        // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listDataFeedIngestionStatus#String
     }
 
     /**
@@ -1066,14 +1065,13 @@ public void getDetectionConfigurationWithResponse() {
     }
 
     /**
-     * Code snippet for {@link MetricsAdvisorAdministrationClient#listMetricAnomalyDetectionConfigs(String, ListMetricAnomalyDetectionConfigsOptions)}.
+     * Code snippet for {@link MetricsAdvisorAdministrationClient#listMetricAnomalyDetectionConfigs(String)}.
      */
     public void listDetectionConfigurations() {
         // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listMetricAnomalyDetectionConfigs#String-ListMetricAnomalyDetectionConfigsOptions
         final String metricId = "0b836da8-10e6-46cd-8f4f-28262e113a62";
         PagedIterable<AnomalyDetectionConfiguration> configsIterable
-            = metricsAdvisorAdminClient.listMetricAnomalyDetectionConfigs(metricId,
-                new ListMetricAnomalyDetectionConfigsOptions());
+            = metricsAdvisorAdminClient.listMetricAnomalyDetectionConfigs(metricId);
 
         for (AnomalyDetectionConfiguration detectionConfig : configsIterable) {
             System.out.printf("Detection config Id: %s%n", detectionConfig.getId());
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentForAlertTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentForAlertTest.java
index 45097c2cf8178..9754c52b14222 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentForAlertTest.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentForAlertTest.java
@@ -10,6 +10,7 @@
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.core.test.TestBase;
+import com.azure.core.util.Context;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
@@ -45,7 +46,8 @@ public void listIncidentsForAlert(HttpClient httpClient, MetricsAdvisorServiceVe
             = client.listIncidents(
             ListIncidentsForAlertInput.INSTANCE.alertConfigurationId,
             ListIncidentsForAlertInput.INSTANCE.alertId,
-            ListIncidentsForAlertInput.INSTANCE.options);
+            ListIncidentsForAlertInput.INSTANCE.options,
+            Context.NONE);
 
         int[] cnt = new int[1];
         for (AnomalyIncident anomalyIncident : incidentsIterable) {
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedIngestionOperationTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedIngestionOperationTest.java
index da81403b8d625..5e6379da2df6e 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedIngestionOperationTest.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedIngestionOperationTest.java
@@ -46,7 +46,7 @@ public void listIngestionStatus(HttpClient httpClient, MetricsAdvisorServiceVers
 
         PagedIterable<DataFeedIngestionStatus> ingestionStatusIterable
             = client.listDataFeedIngestionStatus(ListIngestionStatusInput.INSTANCE.dataFeedId,
-            ListIngestionStatusInput.INSTANCE.options);
+            ListIngestionStatusInput.INSTANCE.options, Context.NONE);
 
         for (DataFeedIngestionStatus ingestionStatus : ingestionStatusIterable) {
             assertListIngestionStatusOutput(ingestionStatus);
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTest.java
index 51847d8051748..3c860033641d9 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTest.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTest.java
@@ -7,7 +7,6 @@
 import com.azure.ai.metricsadvisor.models.AnomalyDetectionConfiguration;
 import com.azure.ai.metricsadvisor.models.DataFeed;
 import com.azure.ai.metricsadvisor.models.DataFeedMetric;
-import com.azure.ai.metricsadvisor.models.ListMetricAnomalyDetectionConfigsOptions;
 import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion;
 import com.azure.core.http.HttpClient;
 import com.azure.core.test.TestBase;
@@ -143,7 +142,7 @@ public void createDetectionConfigurationForMultipleSeriesAndGroup(HttpClient htt
             assertNotNull(configuration);
             id.set(configuration.getId());
 
-            client.listMetricAnomalyDetectionConfigs(costMetricId, new ListMetricAnomalyDetectionConfigsOptions())
+            client.listMetricAnomalyDetectionConfigs(costMetricId)
                 .forEach(config -> Assertions.assertNotNull(config));
         } finally {
             if (!CoreUtils.isNullOrEmpty(id.get())) {

From 677ff98070299163e2a39227f4e71d21cb0fa9ea Mon Sep 17 00:00:00 2001
From: samvaity <savaity@microsoft.com>
Date: Thu, 27 May 2021 14:25:12 -0700
Subject: [PATCH 2/3] revert DataFeedIngestionOption changes

---
 .../azure-ai-metricsadvisor/README.md         | 27 +++++++++----------
 .../MetricsAdvisorAdministrationClient.java   |  7 ++---
 .../ai/metricsadvisor/ReadmeSamples.java      |  6 ++---
 .../DataFeedIngestionSample.java              |  3 +--
 ...ministrationClientJavaDocCodeSnippets.java |  9 ++++---
 5 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md
index 4ec7a2006966b..228af14359a40 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md
@@ -49,7 +49,7 @@ You will need two keys to authenticate the client:
 Once you have the two keys and endpoint, you can use the `MetricsAdvisorKeyCredential` class to authenticate the clients as follows:
 
 #### Create a Metrics Advisor client using MetricsAdvisorKeyCredential
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L65-L69-->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L64-L68-->
 ```java
 MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key");
 MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder()
@@ -59,7 +59,7 @@ MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder()
 ```
 
 #### Create a Metrics Administration client using MetricsAdvisorKeyCredential
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L76-L81 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L75-L80 -->
 ```java
 MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key");
 MetricsAdvisorAdministrationClient metricsAdvisorAdminClient =
@@ -97,7 +97,7 @@ Authorization is easiest using [DefaultAzureCredential][wiki_identity]. It finds
 running environment. For more information about using Azure Active Directory authorization with Metrics Advisor, please
 refer to [the associated documentation][aad_authorization].
 #### Create a Metrics Advisor client using AAD authentication
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L88-L92 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L87-L91 -->
 ```java
 TokenCredential credential = new DefaultAzureCredentialBuilder().build();
 MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder()
@@ -107,7 +107,7 @@ MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder()
 ```
 
 #### Create a Metrics Administration client using AAD authentication
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L99-L104 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L98-L103 -->
 ```java
 TokenCredential credential = new DefaultAzureCredentialBuilder().build();
 MetricsAdvisorAdministrationClient metricsAdvisorAdminClient =
@@ -174,7 +174,7 @@ A notification hook is the entry point that allows the users to subscribe to rea
 
 #### Add a data feed from a sample or data source
 This example ingests the user specified `SQLServerDataFeedSource` data feed source data to the service.
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L111-L148 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L110-L147 -->
 ```java
 DataFeed dataFeed = new DataFeed()
     .setName("dataFeedName")
@@ -212,13 +212,13 @@ System.out.printf("Data feed source type: %s%n", createdSqlDataFeed.getSourceTyp
 
 if (SQL_SERVER_DB == createdSqlDataFeed.getSourceType()) {
     System.out.printf("Data feed sql server query: %s%n",
-        ((SqlServerDataFeedSource) createdSqlDataFeed.getSource()).getQuery());
+        ((SQLServerDataFeedSource) createdSqlDataFeed.getSource()).getQuery());
 }
 ```
 #### Check ingestion status
 This example checks the ingestion status of a previously provided data feed source.
 
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L155-L167 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L154-L165 -->
 ```java
 String dataFeedId = "3d48er30-6e6e-4391-b78f-b00dfee1e6f5";
 
@@ -226,8 +226,7 @@ metricsAdvisorAdminClient.listDataFeedIngestionStatus(
     dataFeedId,
     new ListDataFeedIngestionOptions(
         OffsetDateTime.parse("2020-01-01T00:00:00Z"),
-        OffsetDateTime.parse("2020-09-09T00:00:00Z")),
-    Context.NONE
+        OffsetDateTime.parse("2020-09-09T00:00:00Z"))
 ).forEach(dataFeedIngestionStatus -> {
     System.out.printf("Message : %s%n", dataFeedIngestionStatus.getMessage());
     System.out.printf("Timestamp value : %s%n", dataFeedIngestionStatus.getTimestamp());
@@ -238,7 +237,7 @@ metricsAdvisorAdminClient.listDataFeedIngestionStatus(
 #### Configure anomaly detection configuration
 This example demonstrates how a user can configure an anomaly detection configuration for their data.
 
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L174-L204 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L172-L202 -->
 ```java
 String metricId = "3d48er30-6e6e-4391-b78f-b00dfee1e6f5";
 
@@ -275,7 +274,7 @@ final AnomalyDetectionConfiguration anomalyDetectionConfiguration =
 
 ### Add hooks for receiving anomaly alerts
 This example creates an email hook that receives anomaly incident alerts.
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L211-L223 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L209-L221 -->
 ```java
 NotificationHook emailNotificationHook = new EmailNotificationHook("email Hook")
     .setDescription("my email Hook")
@@ -294,7 +293,7 @@ System.out.printf("Email Hook emails to alert: %s%n",
 
 #### Configure an anomaly alert configuration
 This example demonstrates how a user can configure an alerting configuration for detected anomalies in their data.
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L230-L250 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L228-L248 -->
 
 ```java
 String detectionConfigurationId1 = "9ol48er30-6e6e-4391-b78f-b00dfee1e6f5";
@@ -352,7 +351,7 @@ Metrics Advisor clients raises `HttpResponseException` [exceptions][http_respons
 to provide a non existing feedback Id an `HttpResponseException` would be raised with an error indicating the failure cause.
 In the following code snippet, the error is handled
 gracefully by catching the exception and display the additional information about the error.
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L284-L288 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L282-L286 -->
 ```java
 try {
     metricsAdvisorClient.getFeedback("non_existing_feedback_id");
@@ -377,7 +376,7 @@ For more details see the [samples README][samples_readme].
 #### Async APIs
 All the examples shown so far have been using synchronous APIs, but we provide full support for async APIs as well.
 You'll need to use `MetricsAdvisorAsyncClient`
-<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L295-L299 -->
+<!-- embedme ./src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java#L293-L297 -->
 ```java
 MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key");
 MetricsAdvisorAsyncClient metricsAdvisorAsyncClient = new MetricsAdvisorClientBuilder()
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClient.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClient.java
index 28993345ffed6..431015ddf1b35 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClient.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClient.java
@@ -214,9 +214,10 @@ public PagedIterable<DataFeed> listDataFeeds(ListDataFeedOptions options, Contex
      * Fetch the ingestion status of a data feed.
      *
      * <p><strong>Code sample</strong></p>
-     * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listDataFeedIngestionStatus#String}
+     * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listDataFeedIngestionStatus#String-ListDataFeedIngestionOptions}
      *
      * @param dataFeedId The data feed id.
+     * @param options The additional parameters.
      * @return The ingestion statuses.
      * @throws IllegalArgumentException If {@code dataFeedId} does not conform to the UUID format specification.
      * @throws NullPointerException If {@code dataFeedId}, {@code options}, {@code options.startTime},
@@ -224,8 +225,8 @@ public PagedIterable<DataFeed> listDataFeeds(ListDataFeedOptions options, Contex
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<DataFeedIngestionStatus> listDataFeedIngestionStatus(
-        String dataFeedId) {
-        return listDataFeedIngestionStatus(dataFeedId, null, Context.NONE);
+        String dataFeedId, ListDataFeedIngestionOptions options) {
+        return listDataFeedIngestionStatus(dataFeedId, options, Context.NONE);
     }
 
     /**
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java
index 30d88cb96047c..45bad1a43580f 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java
@@ -32,13 +32,12 @@
 import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential;
 import com.azure.ai.metricsadvisor.models.MySqlDataFeedSource;
 import com.azure.ai.metricsadvisor.models.NotificationHook;
-import com.azure.ai.metricsadvisor.models.SqlServerDataFeedSource;
 import com.azure.ai.metricsadvisor.models.SeverityCondition;
 import com.azure.ai.metricsadvisor.models.SmartDetectionCondition;
+import com.azure.ai.metricsadvisor.models.SqlServerDataFeedSource;
 import com.azure.ai.metricsadvisor.models.SuppressCondition;
 import com.azure.core.credential.TokenCredential;
 import com.azure.core.exception.HttpResponseException;
-import com.azure.core.util.Context;
 import com.azure.identity.DefaultAzureCredentialBuilder;
 
 import java.time.OffsetDateTime;
@@ -158,8 +157,7 @@ public void checkIngestionStatus() {
             dataFeedId,
             new ListDataFeedIngestionOptions(
                 OffsetDateTime.parse("2020-01-01T00:00:00Z"),
-                OffsetDateTime.parse("2020-09-09T00:00:00Z")),
-            Context.NONE
+                OffsetDateTime.parse("2020-09-09T00:00:00Z"))
         ).forEach(dataFeedIngestionStatus -> {
             System.out.printf("Message : %s%n", dataFeedIngestionStatus.getMessage());
             System.out.printf("Timestamp value : %s%n", dataFeedIngestionStatus.getTimestamp());
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DataFeedIngestionSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DataFeedIngestionSample.java
index e38f841aaa8a0..4c9bed81fd0d4 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DataFeedIngestionSample.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DataFeedIngestionSample.java
@@ -8,7 +8,6 @@
 import com.azure.ai.metricsadvisor.models.ListDataFeedIngestionOptions;
 import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential;
 import com.azure.core.http.rest.PagedIterable;
-import com.azure.core.util.Context;
 
 import java.time.OffsetDateTime;
 
@@ -30,7 +29,7 @@ public static void main(String[] args) {
         final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z");
         final ListDataFeedIngestionOptions options = new ListDataFeedIngestionOptions(startTime, endTime);
         PagedIterable<DataFeedIngestionStatus> ingestionStatusIterable
-            = advisorAdministrationClient.listDataFeedIngestionStatus(dataFeedId, options, Context.NONE);
+            = advisorAdministrationClient.listDataFeedIngestionStatus(dataFeedId, options);
 
         for (DataFeedIngestionStatus ingestionStatus : ingestionStatusIterable) {
             System.out.printf("Timestamp: %s%n", ingestionStatus.getTimestamp());
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java
index ff19cd9df7fcf..4f7ffc35507a5 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java
@@ -529,22 +529,23 @@ public void listHooksWithOptions() {
     }
 
     /**
-     * Code snippet for {@link MetricsAdvisorAdministrationClient#listDataFeedIngestionStatus(String)}.
+     * Code snippet for {@link MetricsAdvisorAdministrationClient#listDataFeedIngestionStatus(String, ListDataFeedIngestionOptions)}.
      */
     public void listDataFeedIngestionStatus() {
-        // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listDataFeedIngestionStatus#String
+        // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listDataFeedIngestionStatus#String-ListDataFeedIngestionOptions
         final String dataFeedId = "4957a2f7-a0f4-4fc0-b8d7-d866c1df0f4c";
         final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z");
         final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z");
+        final ListDataFeedIngestionOptions options = new ListDataFeedIngestionOptions(startTime, endTime);
         PagedIterable<DataFeedIngestionStatus> ingestionStatuses
-            = metricsAdvisorAdminClient.listDataFeedIngestionStatus(dataFeedId);
+            = metricsAdvisorAdminClient.listDataFeedIngestionStatus(dataFeedId, options);
 
         for (DataFeedIngestionStatus ingestionStatus : ingestionStatuses) {
             System.out.printf("Timestamp: %s%n", ingestionStatus.getTimestamp());
             System.out.printf("Status: %s%n", ingestionStatus.getStatus());
             System.out.printf("Message: %s%n", ingestionStatus.getMessage());
         }
-        // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listDataFeedIngestionStatus#String
+        // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listDataFeedIngestionStatus#String-ListDataFeedIngestionOptions
     }
 
     /**

From 57e7b2376be61fed55dca0cde2a72f763d785844 Mon Sep 17 00:00:00 2001
From: samvaity <savaity@microsoft.com>
Date: Fri, 28 May 2021 09:25:33 -0700
Subject: [PATCH 3/3] update listDataFeedIngestionStatus

---
 ...tricsAdvisorAdministrationAsyncClient.java | 19 -------------------
 ...trationAsyncClientJavaDocCodeSnippets.java | 14 --------------
 .../DataFeedIngestionOperationTest.java       |  2 +-
 3 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java
index 9c9dfac92765f..1b3de37088b89 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java
@@ -497,25 +497,6 @@ private Mono<PagedResponse<DataFeed>> listDataFeedsNextPageAsync(String nextPage
                 null));
     }
 
-    /**
-     * Fetch the ingestion status of a data feed.
-     *
-     * <p><strong>Code sample</strong></p>
-     * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listDataFeedIngestionStatus#String}
-     *
-     * @param dataFeedId The data feed id.
-     *
-     * @return The ingestion statuses.
-     * @throws IllegalArgumentException If {@code dataFeedId} does not conform to the UUID format specification.
-     * @throws NullPointerException If {@code dataFeedId}, {@code options}, {@code options.startTime},
-     * {@code options.endTime}  is null.
-     */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedFlux<DataFeedIngestionStatus> listDataFeedIngestionStatus(
-        String dataFeedId) {
-        return listDataFeedIngestionStatus(dataFeedId);
-    }
-
     /**
      * Fetch the ingestion status of a data feed.
      *
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java
index 54d149a9bdbb6..3f6a2d937309b 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java
@@ -543,20 +543,6 @@ public void listHooksWithOptions() {
         // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listHooks#ListHookOptions
     }
 
-    public void listDataFeedIngestionStatus() {
-        // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listDataFeedIngestionStatus#String
-        final String dataFeedId = "4957a2f7-a0f4-4fc0-b8d7-d866c1df0f4c";
-        final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z");
-        final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z");
-        metricsAdvisorAdminAsyncClient.listDataFeedIngestionStatus(dataFeedId)
-            .subscribe(ingestionStatus -> {
-                System.out.printf("Timestamp: %s%n", ingestionStatus.getTimestamp());
-                System.out.printf("Status: %s%n", ingestionStatus.getStatus());
-                System.out.printf("Message: %s%n", ingestionStatus.getMessage());
-            });
-        // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listDataFeedIngestionStatus#String
-    }
-
     /**
      * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#listDataFeedIngestionStatus(String, ListDataFeedIngestionOptions)}.
      */
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedIngestionOperationTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedIngestionOperationTest.java
index 5e6379da2df6e..da81403b8d625 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedIngestionOperationTest.java
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedIngestionOperationTest.java
@@ -46,7 +46,7 @@ public void listIngestionStatus(HttpClient httpClient, MetricsAdvisorServiceVers
 
         PagedIterable<DataFeedIngestionStatus> ingestionStatusIterable
             = client.listDataFeedIngestionStatus(ListIngestionStatusInput.INSTANCE.dataFeedId,
-            ListIngestionStatusInput.INSTANCE.options, Context.NONE);
+            ListIngestionStatusInput.INSTANCE.options);
 
         for (DataFeedIngestionStatus ingestionStatus : ingestionStatusIterable) {
             assertListIngestionStatusOutput(ingestionStatus);