Skip to content

Commit 5e3d7be

Browse files
srnagarsrnagar
authored
Azure Monitor Query: Regenerate code from stable swagger definitions (Azure#32524)
* Regenerate code from stable swagger definitions * update builder * add override annotation
1 parent 9feff2d commit 5e3d7be

File tree

92 files changed

+1775
-1023
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1775
-1023
lines changed

‎sdk/monitor/azure-monitor-query/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<jacoco.skip>true</jacoco.skip>
3232
<javaModulesSurefireArgLine>
3333
--add-exports com.azure.core/com.azure.core.implementation.jackson=ALL-UNNAMED
34+
--add-exports com.azure.core/com.azure.core.implementation.util=ALL-UNNAMED
3435
--add-opens com.azure.monitor.query/com.azure.monitor.query=ALL-UNNAMED
3536
</javaModulesSurefireArgLine>
3637
<checkstyle.excludes>**/implementation/**/*.java</checkstyle.excludes>

‎sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/LogsQueryAsyncClient.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.azure.monitor.query.models.LogsBatchQuery;
3030
import com.azure.monitor.query.models.LogsBatchQueryResult;
3131
import com.azure.monitor.query.models.LogsBatchQueryResultCollection;
32+
import com.azure.monitor.query.models.LogsColumnType;
3233
import com.azure.monitor.query.models.LogsQueryOptions;
3334
import com.azure.monitor.query.models.LogsQueryResult;
3435
import com.azure.monitor.query.models.LogsQueryResultStatus;
@@ -391,8 +392,12 @@ private LogsQueryResult getLogsQueryResult(List<Table> innerTables, Object inner
391392
LogsTableRow tableRow = new LogsTableRow(i, new ArrayList<>());
392393
tableRows.add(tableRow);
393394
for (int j = 0; j < row.size(); j++) {
395+
LogsColumnType columnType = table.getColumns().get(j).getType() == null
396+
? null
397+
: LogsColumnType.fromString(table.getColumns().get(j).getType().toString());
394398
LogsTableCell cell = new LogsTableCell(table.getColumns().get(j).getName(),
395-
table.getColumns().get(j).getType(), j, i, row.get(j));
399+
columnType, j, i,
400+
row.get(j));
396401
tableCells.add(cell);
397402
tableRow.getRow().add(cell);
398403
}

‎sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/LogsQueryClientBuilder.java‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@
44
package com.azure.monitor.query;
55

66
import com.azure.core.annotation.ServiceClientBuilder;
7+
import com.azure.core.client.traits.ConfigurationTrait;
8+
import com.azure.core.client.traits.EndpointTrait;
9+
import com.azure.core.client.traits.HttpTrait;
10+
import com.azure.core.client.traits.TokenCredentialTrait;
711
import com.azure.core.credential.TokenCredential;
812
import com.azure.core.http.HttpClient;
913
import com.azure.core.http.HttpPipeline;
1014
import com.azure.core.http.policy.HttpLogOptions;
1115
import com.azure.core.http.policy.HttpPipelinePolicy;
16+
import com.azure.core.http.policy.RetryOptions;
1217
import com.azure.core.http.policy.RetryPolicy;
1318
import com.azure.core.util.ClientOptions;
1419
import com.azure.core.util.Configuration;
@@ -39,17 +44,18 @@
3944
* <!-- end com.azure.monitor.query.LogsQueryClient.instantiation -->
4045
*/
4146
@ServiceClientBuilder(serviceClients = {LogsQueryClient.class, LogsQueryAsyncClient.class})
42-
public final class LogsQueryClientBuilder {
47+
public final class LogsQueryClientBuilder implements EndpointTrait<LogsQueryClientBuilder>,
48+
HttpTrait<LogsQueryClientBuilder>, ConfigurationTrait<LogsQueryClientBuilder>, TokenCredentialTrait<LogsQueryClientBuilder> {
4349
private final ClientLogger logger = new ClientLogger(LogsQueryClientBuilder.class);
4450
private final AzureLogAnalyticsImplBuilder innerLogBuilder = new AzureLogAnalyticsImplBuilder();
45-
private ClientOptions clientOptions;
4651
private LogsQueryServiceVersion serviceVersion;
4752

4853
/**
4954
* Sets the log query endpoint.
5055
* @param endpoint the host value.
5156
* @return the {@link LogsQueryClientBuilder}.
5257
*/
58+
@Override
5359
public LogsQueryClientBuilder endpoint(String endpoint) {
5460
innerLogBuilder.host(endpoint);
5561
return this;
@@ -60,6 +66,7 @@ public LogsQueryClientBuilder endpoint(String endpoint) {
6066
* @param pipeline the pipeline value.
6167
* @return the {@link LogsQueryClientBuilder}.
6268
*/
69+
@Override
6370
public LogsQueryClientBuilder pipeline(HttpPipeline pipeline) {
6471
innerLogBuilder.pipeline(pipeline);
6572
return this;
@@ -70,6 +77,7 @@ public LogsQueryClientBuilder pipeline(HttpPipeline pipeline) {
7077
* @param httpClient the httpClient value.
7178
* @return the {@link LogsQueryClientBuilder}.
7279
*/
80+
@Override
7381
public LogsQueryClientBuilder httpClient(HttpClient httpClient) {
7482
innerLogBuilder.httpClient(httpClient);
7583
return this;
@@ -80,6 +88,7 @@ public LogsQueryClientBuilder httpClient(HttpClient httpClient) {
8088
* @param configuration the configuration value.
8189
* @return the {@link LogsQueryClientBuilder}.
8290
*/
91+
@Override
8392
public LogsQueryClientBuilder configuration(Configuration configuration) {
8493
innerLogBuilder.configuration(configuration);
8594
return this;
@@ -90,6 +99,7 @@ public LogsQueryClientBuilder configuration(Configuration configuration) {
9099
* @param httpLogOptions the httpLogOptions value.
91100
* @return the {@link LogsQueryClientBuilder}.
92101
*/
102+
@Override
93103
public LogsQueryClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) {
94104
innerLogBuilder.httpLogOptions(httpLogOptions);
95105
return this;
@@ -105,11 +115,23 @@ public LogsQueryClientBuilder retryPolicy(RetryPolicy retryPolicy) {
105115
return this;
106116
}
107117

118+
/**
119+
* Sets the {@link RetryOptions} used for creating the client.
120+
* @param retryOptions The {@link RetryOptions}.
121+
* @return the updated {@link LogsQueryClientBuilder}.
122+
*/
123+
@Override
124+
public LogsQueryClientBuilder retryOptions(RetryOptions retryOptions) {
125+
innerLogBuilder.retryOptions(retryOptions);
126+
return this;
127+
}
128+
108129
/**
109130
* Adds a custom Http pipeline policy.
110131
* @param customPolicy The custom Http pipeline policy to add.
111132
* @return the {@link LogsQueryClientBuilder}.
112133
*/
134+
@Override
113135
public LogsQueryClientBuilder addPolicy(HttpPipelinePolicy customPolicy) {
114136
innerLogBuilder.addPolicy(customPolicy);
115137
return this;
@@ -120,6 +142,7 @@ public LogsQueryClientBuilder addPolicy(HttpPipelinePolicy customPolicy) {
120142
* @param tokenCredential the tokenCredential value.
121143
* @return the {@link LogsQueryClientBuilder}.
122144
*/
145+
@Override
123146
public LogsQueryClientBuilder credential(TokenCredential tokenCredential) {
124147
innerLogBuilder.credential(tokenCredential);
125148
return this;
@@ -130,8 +153,9 @@ public LogsQueryClientBuilder credential(TokenCredential tokenCredential) {
130153
* @param clientOptions The {@link ClientOptions}.
131154
* @return the {@link LogsQueryClientBuilder}.
132155
*/
156+
@Override
133157
public LogsQueryClientBuilder clientOptions(ClientOptions clientOptions) {
134-
this.clientOptions = clientOptions;
158+
innerLogBuilder.clientOptions(clientOptions);
135159
return this;
136160
}
137161

‎sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/MetricsQueryAsyncClient.java‎

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,16 @@
2424
import com.azure.monitor.query.implementation.metricsdefinitions.MetricsDefinitionsClientImpl;
2525
import com.azure.monitor.query.implementation.metricsdefinitions.models.LocalizableString;
2626
import com.azure.monitor.query.implementation.metricsnamespaces.MetricsNamespacesClientImpl;
27+
import com.azure.monitor.query.models.AggregationType;
2728
import com.azure.monitor.query.models.MetricAvailability;
29+
import com.azure.monitor.query.models.MetricClass;
2830
import com.azure.monitor.query.models.MetricDefinition;
2931
import com.azure.monitor.query.models.MetricResult;
3032
import com.azure.monitor.query.models.MetricNamespace;
33+
import com.azure.monitor.query.models.MetricUnit;
3134
import com.azure.monitor.query.models.MetricsQueryOptions;
3235
import com.azure.monitor.query.models.MetricsQueryResult;
36+
import com.azure.monitor.query.models.NamespaceClassification;
3337
import com.azure.monitor.query.models.QueryTimeInterval;
3438
import com.azure.monitor.query.models.TimeSeriesElement;
3539
import com.azure.monitor.query.models.MetricValue;
@@ -160,11 +164,22 @@ private MetricDefinition mapToMetricDefinition(com.azure.monitor.query.implement
160164
dimensions = definition.getDimensions().stream().map(LocalizableString::getValue)
161165
.collect(Collectors.toList());
162166
}
167+
MetricClass metricClass = definition.getMetricClass() == null ? null : MetricClass.fromString(definition.getMetricClass().toString());
168+
MetricUnit metricUnit = definition.getUnit() == null ? null : MetricUnit.fromString(definition.getUnit().toString());
169+
AggregationType primaryAggregationType = definition.getPrimaryAggregationType() == null
170+
? null
171+
: AggregationType.fromString(definition.getPrimaryAggregationType().toString());
172+
List<AggregationType> supportedAggregationTypes = null;
173+
if (CoreUtils.isNullOrEmpty(definition.getSupportedAggregationTypes())) {
174+
supportedAggregationTypes = definition.getSupportedAggregationTypes()
175+
.stream()
176+
.map(aggregationType -> AggregationType.fromString(aggregationType.toString()))
177+
.collect(Collectors.toList());
178+
}
163179
MetricsHelper.setMetricDefinitionProperties(metricDefinition,
164180
definition.isDimensionRequired(), definition.getResourceId(), definition.getNamespace(),
165181
definition.getName().getValue(), definition.getDisplayDescription(), definition.getCategory(),
166-
definition.getMetricClass(), definition.getUnit(), definition.getPrimaryAggregationType(),
167-
definition.getSupportedAggregationTypes(),
182+
metricClass, metricUnit, primaryAggregationType, supportedAggregationTypes,
168183
mapMetricAvailabilities(definition.getMetricAvailabilities()), definition.getId(),
169184
dimensions);
170185
return metricDefinition;
@@ -190,8 +205,11 @@ PagedFlux<MetricNamespace> listMetricNamespaces(String resourceUri, OffsetDateTi
190205

191206
private MetricNamespace mapMetricNamespace(com.azure.monitor.query.implementation.metricsnamespaces.models.MetricNamespace namespaceImpl) {
192207
MetricNamespace metricNamespace = new MetricNamespace();
193-
MetricsHelper.setMetricNamespaceProperties(metricNamespace, namespaceImpl.getClassification(),
194-
namespaceImpl.getId(), namespaceImpl.getName(),
208+
NamespaceClassification classification = namespaceImpl.getClassification() == null
209+
? null
210+
: NamespaceClassification.fromString(namespaceImpl.getClassification().toString());
211+
MetricsHelper.setMetricNamespaceProperties(metricNamespace,
212+
classification, namespaceImpl.getId(), namespaceImpl.getName(),
195213
namespaceImpl.getProperties() == null ? null : namespaceImpl.getProperties().getMetricNamespaceName(),
196214
namespaceImpl.getType());
197215

@@ -241,9 +259,14 @@ private Response<MetricsQueryResult> convertToMetricsQueryResult(Response<Metric
241259

242260
private List<MetricResult> mapMetrics(List<Metric> value) {
243261
return value.stream()
244-
.map(metric -> new MetricResult(metric.getId(), metric.getType(), metric.getUnit(), metric.getName().getValue(),
245-
mapTimeSeries(metric.getTimeseries()), metric.getDisplayDescription(),
246-
new ResponseError(metric.getErrorCode(), metric.getErrorMessage())))
262+
.map(metric -> {
263+
MetricUnit metricUnit = metric.getUnit() == null ? null : MetricUnit.fromString(metric.getUnit().toString());
264+
return new MetricResult(metric.getId(), metric.getType(),
265+
metricUnit,
266+
metric.getName().getValue(),
267+
mapTimeSeries(metric.getTimeseries()), metric.getDisplayDescription(),
268+
new ResponseError(metric.getErrorCode(), metric.getErrorMessage()));
269+
})
247270
.collect(Collectors.toList());
248271
}
249272

‎sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/MetricsQueryClientBuilder.java‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@
44
package com.azure.monitor.query;
55

66
import com.azure.core.annotation.ServiceClientBuilder;
7+
import com.azure.core.client.traits.ConfigurationTrait;
8+
import com.azure.core.client.traits.EndpointTrait;
9+
import com.azure.core.client.traits.HttpTrait;
10+
import com.azure.core.client.traits.TokenCredentialTrait;
711
import com.azure.core.credential.TokenCredential;
812
import com.azure.core.http.HttpClient;
913
import com.azure.core.http.HttpPipeline;
1014
import com.azure.core.http.policy.HttpLogOptions;
1115
import com.azure.core.http.policy.HttpPipelinePolicy;
16+
import com.azure.core.http.policy.RetryOptions;
1217
import com.azure.core.http.policy.RetryPolicy;
1318
import com.azure.core.util.ClientOptions;
1419
import com.azure.core.util.Configuration;
@@ -41,23 +46,23 @@
4146
* <!-- end com.azure.monitor.query.MetricsQueryClient.instantiation -->
4247
*/
4348
@ServiceClientBuilder(serviceClients = {MetricsQueryClient.class, MetricsQueryAsyncClient.class})
44-
public final class MetricsQueryClientBuilder {
49+
public final class MetricsQueryClientBuilder implements EndpointTrait<MetricsQueryClientBuilder>,
50+
HttpTrait<MetricsQueryClientBuilder>, ConfigurationTrait<MetricsQueryClientBuilder>, TokenCredentialTrait<MetricsQueryClientBuilder> {
4551

4652
private final MonitorManagementClientImplBuilder innerMetricsBuilder = new MonitorManagementClientImplBuilder();
4753
private final MetricsDefinitionsClientImplBuilder innerMetricsDefinitionsBuilder =
4854
new MetricsDefinitionsClientImplBuilder();
4955
private final MetricsNamespacesClientImplBuilder innerMetricsNamespaceBuilder =
5056
new MetricsNamespacesClientImplBuilder();
5157
private final ClientLogger logger = new ClientLogger(MetricsQueryClientBuilder.class);
52-
private ClientOptions clientOptions;
5358
private MetricsQueryServiceVersion serviceVersion;
5459

55-
5660
/**
5761
* Sets the metrics query endpoint.
5862
* @param endpoint the host value.
5963
* @return the MetricsClientBuilder.
6064
*/
65+
@Override
6166
public MetricsQueryClientBuilder endpoint(String endpoint) {
6267
innerMetricsBuilder.host(endpoint);
6368
innerMetricsDefinitionsBuilder.host(endpoint);
@@ -70,6 +75,7 @@ public MetricsQueryClientBuilder endpoint(String endpoint) {
7075
* @param pipeline the pipeline value.
7176
* @return the MetricsClientBuilder.
7277
*/
78+
@Override
7379
public MetricsQueryClientBuilder pipeline(HttpPipeline pipeline) {
7480
innerMetricsBuilder.pipeline(pipeline);
7581
innerMetricsDefinitionsBuilder.pipeline(pipeline);
@@ -82,6 +88,7 @@ public MetricsQueryClientBuilder pipeline(HttpPipeline pipeline) {
8288
* @param httpClient the httpClient value.
8389
* @return the MetricsClientBuilder.
8490
*/
91+
@Override
8592
public MetricsQueryClientBuilder httpClient(HttpClient httpClient) {
8693
innerMetricsBuilder.httpClient(httpClient);
8794
innerMetricsDefinitionsBuilder.httpClient(httpClient);
@@ -94,6 +101,7 @@ public MetricsQueryClientBuilder httpClient(HttpClient httpClient) {
94101
* @param configuration the configuration value.
95102
* @return the MetricsClientBuilder.
96103
*/
104+
@Override
97105
public MetricsQueryClientBuilder configuration(Configuration configuration) {
98106
innerMetricsBuilder.configuration(configuration);
99107
innerMetricsDefinitionsBuilder.configuration(configuration);
@@ -106,6 +114,7 @@ public MetricsQueryClientBuilder configuration(Configuration configuration) {
106114
* @param httpLogOptions the httpLogOptions value.
107115
* @return the MetricsClientBuilder.
108116
*/
117+
@Override
109118
public MetricsQueryClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) {
110119
innerMetricsBuilder.httpLogOptions(httpLogOptions);
111120
innerMetricsDefinitionsBuilder.httpLogOptions(httpLogOptions);
@@ -125,11 +134,25 @@ public MetricsQueryClientBuilder retryPolicy(RetryPolicy retryPolicy) {
125134
return this;
126135
}
127136

137+
/**
138+
* Sets the {@link RetryOptions} used for creating the client.
139+
* @param retryOptions The {@link RetryOptions}.
140+
* @return the updated {@link MetricsQueryClientBuilder}.
141+
*/
142+
@Override
143+
public MetricsQueryClientBuilder retryOptions(RetryOptions retryOptions) {
144+
innerMetricsBuilder.retryOptions(retryOptions);
145+
innerMetricsDefinitionsBuilder.retryOptions(retryOptions);
146+
innerMetricsNamespaceBuilder.retryOptions(retryOptions);
147+
return this;
148+
}
149+
128150
/**
129151
* Adds a custom Http pipeline policy.
130152
* @param customPolicy The custom Http pipeline policy to add.
131153
* @return the MetricsClientBuilder.
132154
*/
155+
@Override
133156
public MetricsQueryClientBuilder addPolicy(HttpPipelinePolicy customPolicy) {
134157
innerMetricsBuilder.addPolicy(customPolicy);
135158
innerMetricsDefinitionsBuilder.addPolicy(customPolicy);
@@ -142,6 +165,7 @@ public MetricsQueryClientBuilder addPolicy(HttpPipelinePolicy customPolicy) {
142165
* @param tokenCredential the tokenCredential value.
143166
* @return the MetricsClientBuilder.
144167
*/
168+
@Override
145169
public MetricsQueryClientBuilder credential(TokenCredential tokenCredential) {
146170
innerMetricsBuilder.credential(tokenCredential);
147171
innerMetricsDefinitionsBuilder.credential(tokenCredential);
@@ -154,8 +178,11 @@ public MetricsQueryClientBuilder credential(TokenCredential tokenCredential) {
154178
* @param clientOptions The {@link ClientOptions}.
155179
* @return the {@link MetricsQueryClientBuilder}
156180
*/
181+
@Override
157182
public MetricsQueryClientBuilder clientOptions(ClientOptions clientOptions) {
158-
this.clientOptions = clientOptions;
183+
innerMetricsBuilder.clientOptions(clientOptions);
184+
innerMetricsDefinitionsBuilder.clientOptions(clientOptions);
185+
innerMetricsNamespaceBuilder.clientOptions(clientOptions);
159186
return this;
160187
}
161188

‎sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/implementation/logs/AzureLogAnalyticsImpl.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,25 +50,25 @@ public SerializerAdapter getSerializerAdapter() {
5050
return this.serializerAdapter;
5151
}
5252

53-
/** The QueriesImpl object to access its operations. */
53+
/** The Queries object to access its operations. */
5454
private final QueriesImpl queries;
5555

5656
/**
57-
* Gets the QueriesImpl object to access its operations.
57+
* Gets the Queries object to access its operations.
5858
*
59-
* @return the QueriesImpl object.
59+
* @return the Queries object.
6060
*/
6161
public QueriesImpl getQueries() {
6262
return this.queries;
6363
}
6464

65-
/** The MetadatasImpl object to access its operations. */
65+
/** The Metadatas object to access its operations. */
6666
private final MetadatasImpl metadatas;
6767

6868
/**
69-
* Gets the MetadatasImpl object to access its operations.
69+
* Gets the Metadatas object to access its operations.
7070
*
71-
* @return the MetadatasImpl object.
71+
* @return the Metadatas object.
7272
*/
7373
public MetadatasImpl getMetadatas() {
7474
return this.metadatas;

0 commit comments

Comments
 (0)