Address UX study feedback and API review feedback (#23799)

* Update APIs and README for user study
Azure · Aug 31, 2021 · 218cc1d · 218cc1d
1 parent f3920a2
commit 218cc1d
Show file tree

Hide file tree

Showing 130 changed files with 2,281 additions and 1,498 deletions.
diff --git a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
@@ -361,7 +361,7 @@ the main ServiceBusClientBuilder. -->
 
   <!-- Suppress the check on code-gen classes -->
   <suppress checks="[a-zA-Z0-9]*" files="com.azure.monitor.opentelemetry.exporter.implementation.*"/>
-  <suppress checks="[a-zA-Z0-9]*" files="com.azure.monitor.query..*.implementation.*"/>
+  <suppress checks="[a-zA-Z0-9]*" files="com.azure.monitor.query.implementation..*"/>
   <suppress checks="Indentation" files="com.azure.security.keyvault.administration.implementation.RoleAssignmentsImpl"/>
   <suppress checks="Indentation" files="com.azure.security.keyvault.administration.implementation.RoleDefinitionsImpl"/>
   <suppress checks="Indentation" files="com.azure.ai.metricsadvisor.implementation.AzureCognitiveServiceMetricsAdvisorRestAPIOpenAPIV2Impl"/>

diff --git a/pom.xml b/pom.xml
@@ -604,6 +604,7 @@
                   <!-- codesnippets4javadoc does not support scanning sub-directories and doesn't support wildcards for filepaths.
                       So, path for aggregate reports have to be defined relative to parent pom -->
                   <additionalOptions>-maxLineLength 120
+                    -snippetpath ${project.basedir}/sdk/agrifood/azure-verticals-agrifood-farming/src/samples/java
                     -snippetpath ${project.basedir}/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java
                     -snippetpath ${project.basedir}/sdk/confidentialledger/azure-security-confidentialledger/src/samples/java
                     -snippetpath ${project.basedir}/sdk/containerregistry/azure-containers-containerregistry/src/samples/java
@@ -619,11 +620,11 @@
                     -snippetpath ${project.basedir}/sdk/cosmos/azure-cosmos/src/samples/java
                     -snippetpath ${project.basedir}/sdk/digitaltwins/azure-digitaltwins-core/src/samples/java
                     -snippetpath ${project.basedir}/sdk/eventhubs/azure-messaging-eventhubs/src/samples/java
-                    -snippetpath ${project.basedir}/sdk/agrifood/azure-verticals-agrifood-farming/src/samples/java
                     <!-- -snippetpath ${project.basedir}/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java-->
                     -snippetpath ${project.basedir}/sdk/keyvault/azure-security-keyvault-certificates/src/samples/java
                     -snippetpath ${project.basedir}/sdk/keyvault/azure-security-keyvault-keys/src/samples/java
                     -snippetpath ${project.basedir}/sdk/keyvault/azure-security-keyvault-secrets/src/samples/java
+                    -snippetpath ${project.basedir}/sdk/monitor/azure-monitor-query/src/samples/java
                     -snippetpath ${project.basedir}/sdk/purview/azure-analytics-purview-catalog/src/samples/java
                     -snippetpath ${project.basedir}/sdk/purview/azure-analytics-purview-scanning/src/samples/java
                     -snippetpath ${project.basedir}/sdk/servicebus/azure-messaging-servicebus/src/samples/java

diff --git a/...ure-monitor-query-perf/src/main/java/com/azure/monitor/query/perf/LogsBatchQueryTest.java b/...ure-monitor-query-perf/src/main/java/com/azure/monitor/query/perf/LogsBatchQueryTest.java
@@ -2,6 +2,7 @@
 
 import com.azure.core.util.Configuration;
 import com.azure.monitor.query.LogsQueryClient;
+import com.azure.monitor.query.models.LogsBatchQuery;
 import com.azure.monitor.query.perf.core.ServiceTest;
 import com.azure.perf.test.core.PerfStressOptions;
 import reactor.core.publisher.Mono;
@@ -32,11 +33,15 @@ public LogsBatchQueryTest(PerfStressOptions options) {
 
     @Override
     public void run() {
-        logsQueryClient.queryBatch(workspaceId, LOGS_BATCH_QUERIES, null);
+        LogsBatchQuery batchQuery = new LogsBatchQuery();
+        LOGS_BATCH_QUERIES.forEach(query -> batchQuery.addQuery(workspaceId, query, null));
+        logsQueryClient.queryBatch(batchQuery);
     }
 
     @Override
     public Mono<Void> runAsync() {
-        return logsQueryAsyncClient.queryBatch(workspaceId, LOGS_BATCH_QUERIES, null).then();
+        LogsBatchQuery batchQuery = new LogsBatchQuery();
+        LOGS_BATCH_QUERIES.forEach(query -> batchQuery.addQuery(workspaceId, query, null));
+        return logsQueryAsyncClient.queryBatch(batchQuery).then();
     }
 }
diff --git a/...e-monitor-query-perf/src/main/java/com/azure/monitor/query/perf/LogsQueryAsModelTest.java b/...e-monitor-query-perf/src/main/java/com/azure/monitor/query/perf/LogsQueryAsModelTest.java
@@ -29,13 +29,11 @@ public LogsQueryAsModelTest(PerfStressOptions options) {
 
     @Override
     public void run() {
-        logsQueryClient.query(workspaceId, LOGS_QUERY, null).toObject(CustomModel.class);
+        logsQueryClient.query(workspaceId, LOGS_QUERY, null, CustomModel.class);
     }
 
     @Override
     public Mono<Void> runAsync() {
-        return logsQueryAsyncClient.query(workspaceId, LOGS_QUERY, null)
-                .map(response -> response.toObject(CustomModel.class))
-                .then();
+        return logsQueryAsyncClient.query(workspaceId, LOGS_QUERY, null, CustomModel.class).then();
     }
 }