Skip to content

Commit c4899ff

Browse files
author
SDKAuto
committed
CodeGen from PR 33794 in Azure/azure-rest-api-specs
Merge e51b34db03a4de507256a1610e22efb93415f989 into 921483a6a7a53b8eeb1b67338f597261f68e4502
1 parent cbacda2 commit c4899ff

File tree

7 files changed

+148
-74
lines changed

7 files changed

+148
-74
lines changed

‎sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/DeidentificationAsyncClient.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ public PagedFlux<BinaryData> listJobs(RequestOptions requestOptions) {
352352
* }
353353
* </pre>
354354
*
355-
* @param jobName The name of a job.
355+
* @param name The name of a job.
356356
* @param requestOptions The options to configure the HTTP request before HTTP client sends it.
357357
* @throws HttpResponseException thrown if the request is rejected by server.
358358
* @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -362,8 +362,8 @@ public PagedFlux<BinaryData> listJobs(RequestOptions requestOptions) {
362362
*/
363363
@Generated
364364
@ServiceMethod(returns = ReturnType.COLLECTION)
365-
public PagedFlux<BinaryData> listJobDocuments(String jobName, RequestOptions requestOptions) {
366-
return this.serviceClient.listJobDocumentsAsync(jobName, requestOptions);
365+
public PagedFlux<BinaryData> listJobDocuments(String name, RequestOptions requestOptions) {
366+
return this.serviceClient.listJobDocumentsAsync(name, requestOptions);
367367
}
368368

369369
/**
@@ -584,7 +584,7 @@ public PollerFlux<DeidentificationJob, DeidentificationJob> beginDeidentifyDocum
584584
*/
585585
@Generated
586586
@ServiceMethod(returns = ReturnType.COLLECTION)
587-
private PagedFlux<DeidentificationJob> listJobs(String continuationToken) {
587+
public PagedFlux<DeidentificationJob> listJobs(String continuationToken) {
588588
// Generated convenience method for listJobs
589589
RequestOptions requestOptions = new RequestOptions();
590590
if (continuationToken != null) {
@@ -656,13 +656,13 @@ public PagedFlux<DeidentificationJob> listJobs() {
656656
*/
657657
@Generated
658658
@ServiceMethod(returns = ReturnType.COLLECTION)
659-
private PagedFlux<DeidentificationDocumentDetails> listJobDocuments(String jobName, String continuationToken) {
659+
public PagedFlux<DeidentificationDocumentDetails> listJobDocuments(String name, String continuationToken) {
660660
// Generated convenience method for listJobDocuments
661661
RequestOptions requestOptions = new RequestOptions();
662662
if (continuationToken != null) {
663663
requestOptions.addQueryParam("continuationToken", continuationToken, false);
664664
}
665-
PagedFlux<BinaryData> pagedFluxResponse = listJobDocuments(jobName, requestOptions);
665+
PagedFlux<BinaryData> pagedFluxResponse = listJobDocuments(name, requestOptions);
666666
return PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> {
667667
Flux<PagedResponse<BinaryData>> flux = (continuationTokenParam == null)
668668
? pagedFluxResponse.byPage().take(1)
@@ -682,7 +682,7 @@ private PagedFlux<DeidentificationDocumentDetails> listJobDocuments(String jobNa
682682
*
683683
* Resource list operation template.
684684
*
685-
* @param jobName The name of a job.
685+
* @param name The name of a job.
686686
* @throws IllegalArgumentException thrown if parameters fail the validation.
687687
* @throws HttpResponseException thrown if the request is rejected by server.
688688
* @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -693,10 +693,10 @@ private PagedFlux<DeidentificationDocumentDetails> listJobDocuments(String jobNa
693693
*/
694694
@Generated
695695
@ServiceMethod(returns = ReturnType.COLLECTION)
696-
public PagedFlux<DeidentificationDocumentDetails> listJobDocuments(String jobName) {
696+
public PagedFlux<DeidentificationDocumentDetails> listJobDocuments(String name) {
697697
// Generated convenience method for listJobDocuments
698698
RequestOptions requestOptions = new RequestOptions();
699-
PagedFlux<BinaryData> pagedFluxResponse = listJobDocuments(jobName, requestOptions);
699+
PagedFlux<BinaryData> pagedFluxResponse = listJobDocuments(name, requestOptions);
700700
return PagedFlux.create(() -> (continuationTokenParam, pageSizeParam) -> {
701701
Flux<PagedResponse<BinaryData>> flux = (continuationTokenParam == null)
702702
? pagedFluxResponse.byPage().take(1)

‎sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/DeidentificationClient.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ public PagedIterable<BinaryData> listJobs(RequestOptions requestOptions) {
346346
* }
347347
* </pre>
348348
*
349-
* @param jobName The name of a job.
349+
* @param name The name of a job.
350350
* @param requestOptions The options to configure the HTTP request before HTTP client sends it.
351351
* @throws HttpResponseException thrown if the request is rejected by server.
352352
* @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -357,8 +357,8 @@ public PagedIterable<BinaryData> listJobs(RequestOptions requestOptions) {
357357
*/
358358
@Generated
359359
@ServiceMethod(returns = ReturnType.COLLECTION)
360-
public PagedIterable<BinaryData> listJobDocuments(String jobName, RequestOptions requestOptions) {
361-
return this.serviceClient.listJobDocuments(jobName, requestOptions);
360+
public PagedIterable<BinaryData> listJobDocuments(String name, RequestOptions requestOptions) {
361+
return this.serviceClient.listJobDocuments(name, requestOptions);
362362
}
363363

364364
/**
@@ -623,13 +623,13 @@ public PagedIterable<DeidentificationJob> listJobs() {
623623
*/
624624
@Generated
625625
@ServiceMethod(returns = ReturnType.COLLECTION)
626-
private PagedIterable<DeidentificationDocumentDetails> listJobDocuments(String jobName, String continuationToken) {
626+
public PagedIterable<DeidentificationDocumentDetails> listJobDocuments(String name, String continuationToken) {
627627
// Generated convenience method for listJobDocuments
628628
RequestOptions requestOptions = new RequestOptions();
629629
if (continuationToken != null) {
630630
requestOptions.addQueryParam("continuationToken", continuationToken, false);
631631
}
632-
return serviceClient.listJobDocuments(jobName, requestOptions)
632+
return serviceClient.listJobDocuments(name, requestOptions)
633633
.mapPage(bodyItemValue -> bodyItemValue.toObject(DeidentificationDocumentDetails.class));
634634
}
635635

@@ -638,7 +638,7 @@ private PagedIterable<DeidentificationDocumentDetails> listJobDocuments(String j
638638
*
639639
* Resource list operation template.
640640
*
641-
* @param jobName The name of a job.
641+
* @param name The name of a job.
642642
* @throws IllegalArgumentException thrown if parameters fail the validation.
643643
* @throws HttpResponseException thrown if the request is rejected by server.
644644
* @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -650,10 +650,10 @@ private PagedIterable<DeidentificationDocumentDetails> listJobDocuments(String j
650650
*/
651651
@Generated
652652
@ServiceMethod(returns = ReturnType.COLLECTION)
653-
public PagedIterable<DeidentificationDocumentDetails> listJobDocuments(String jobName) {
653+
public PagedIterable<DeidentificationDocumentDetails> listJobDocuments(String name) {
654654
// Generated convenience method for listJobDocuments
655655
RequestOptions requestOptions = new RequestOptions();
656-
return serviceClient.listJobDocuments(jobName, requestOptions)
656+
return serviceClient.listJobDocuments(name, requestOptions)
657657
.mapPage(bodyItemValue -> bodyItemValue.toObject(DeidentificationDocumentDetails.class));
658658
}
659659

‎sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/models/DeidentificationDocumentDetails.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,26 +40,14 @@ public final class DeidentificationDocumentDetails implements JsonSerializable<D
4040
* Status of the document.
4141
*/
4242
@Generated
43-
private final OperationState status;
43+
private final OperationStatus status;
4444

4545
/*
4646
* Error when document fails.
4747
*/
4848
@Generated
4949
private ResponseError error;
5050

51-
/**
52-
* Creates an instance of DeidentificationDocumentDetails class.
53-
*
54-
* @param input the input value to set.
55-
* @param status the status value to set.
56-
*/
57-
@Generated
58-
private DeidentificationDocumentDetails(DeidentificationDocumentLocation input, OperationState status) {
59-
this.input = input;
60-
this.status = status;
61-
}
62-
6351
/**
6452
* Get the id property: Id of the document details.
6553
*
@@ -96,7 +84,7 @@ public DeidentificationDocumentLocation getOutput() {
9684
* @return the status value.
9785
*/
9886
@Generated
99-
public OperationState getStatus() {
87+
public OperationStatus getStatus() {
10088
return this.status;
10189
}
10290

@@ -138,7 +126,7 @@ public static DeidentificationDocumentDetails fromJson(JsonReader jsonReader) th
138126
return jsonReader.readObject(reader -> {
139127
String id = null;
140128
DeidentificationDocumentLocation input = null;
141-
OperationState status = null;
129+
OperationStatus status = null;
142130
DeidentificationDocumentLocation output = null;
143131
ResponseError error = null;
144132
while (reader.nextToken() != JsonToken.END_OBJECT) {
@@ -149,7 +137,7 @@ public static DeidentificationDocumentDetails fromJson(JsonReader jsonReader) th
149137
} else if ("input".equals(fieldName)) {
150138
input = DeidentificationDocumentLocation.fromJson(reader);
151139
} else if ("status".equals(fieldName)) {
152-
status = OperationState.fromString(reader.getString());
140+
status = OperationStatus.fromString(reader.getString());
153141
} else if ("output".equals(fieldName)) {
154142
output = DeidentificationDocumentLocation.fromJson(reader);
155143
} else if ("error".equals(fieldName)) {
@@ -166,4 +154,16 @@ public static DeidentificationDocumentDetails fromJson(JsonReader jsonReader) th
166154
return deserializedDeidentificationDocumentDetails;
167155
});
168156
}
157+
158+
/**
159+
* Creates an instance of DeidentificationDocumentDetails class.
160+
*
161+
* @param input the input value to set.
162+
* @param status the status value to set.
163+
*/
164+
@Generated
165+
private DeidentificationDocumentDetails(DeidentificationDocumentLocation input, OperationStatus status) {
166+
this.input = input;
167+
this.status = status;
168+
}
169169
}

‎sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/models/DeidentificationJob.java‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ public final class DeidentificationJob implements JsonSerializable<Deidentificat
2626
@Generated
2727
private String name;
2828

29-
/*
30-
* Operation to perform on the input documents.
31-
*/
32-
@Generated
33-
private DeidentificationOperationType operation;
34-
3529
/*
3630
* Storage location to perform the operation on.
3731
*/
@@ -54,7 +48,7 @@ public final class DeidentificationJob implements JsonSerializable<Deidentificat
5448
* Current status of a job.
5549
*/
5650
@Generated
57-
private OperationState status;
51+
private OperationStatus status;
5852

5953
/*
6054
* Error when job fails in it's entirety.
@@ -112,28 +106,6 @@ public String getName() {
112106
return this.name;
113107
}
114108

115-
/**
116-
* Get the operation property: Operation to perform on the input documents.
117-
*
118-
* @return the operation value.
119-
*/
120-
@Generated
121-
public DeidentificationOperationType getOperation() {
122-
return this.operation;
123-
}
124-
125-
/**
126-
* Set the operation property: Operation to perform on the input documents.
127-
*
128-
* @param operation the operation value to set.
129-
* @return the DeidentificationJob object itself.
130-
*/
131-
@Generated
132-
public DeidentificationJob setOperation(DeidentificationOperationType operation) {
133-
this.operation = operation;
134-
return this;
135-
}
136-
137109
/**
138110
* Get the sourceLocation property: Storage location to perform the operation on.
139111
*
@@ -182,7 +154,7 @@ public DeidentificationJob setCustomizations(DeidentificationJobCustomizationOpt
182154
* @return the status value.
183155
*/
184156
@Generated
185-
public OperationState getStatus() {
157+
public OperationStatus getStatus() {
186158
return this.status;
187159
}
188160

@@ -249,7 +221,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
249221
jsonWriter.writeStartObject();
250222
jsonWriter.writeJsonField("sourceLocation", this.sourceLocation);
251223
jsonWriter.writeJsonField("targetLocation", this.targetLocation);
252-
jsonWriter.writeStringField("operation", this.operation == null ? null : this.operation.toString());
224+
jsonWriter.writeStringField("operation", this.operationType == null ? null : this.operationType.toString());
253225
jsonWriter.writeJsonField("customizations", this.customizations);
254226
return jsonWriter.writeEndObject();
255227
}
@@ -269,10 +241,10 @@ public static DeidentificationJob fromJson(JsonReader jsonReader) throws IOExcep
269241
String name = null;
270242
SourceStorageLocation sourceLocation = null;
271243
TargetStorageLocation targetLocation = null;
272-
OperationState status = null;
244+
OperationStatus status = null;
273245
OffsetDateTime lastUpdatedAt = null;
274246
OffsetDateTime createdAt = null;
275-
DeidentificationOperationType operation = null;
247+
DeidentificationOperationType operationType = null;
276248
DeidentificationJobCustomizationOptions customizations = null;
277249
ResponseError error = null;
278250
OffsetDateTime startedAt = null;
@@ -287,15 +259,15 @@ public static DeidentificationJob fromJson(JsonReader jsonReader) throws IOExcep
287259
} else if ("targetLocation".equals(fieldName)) {
288260
targetLocation = TargetStorageLocation.fromJson(reader);
289261
} else if ("status".equals(fieldName)) {
290-
status = OperationState.fromString(reader.getString());
262+
status = OperationStatus.fromString(reader.getString());
291263
} else if ("lastUpdatedAt".equals(fieldName)) {
292264
lastUpdatedAt = reader
293265
.getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
294266
} else if ("createdAt".equals(fieldName)) {
295267
createdAt = reader
296268
.getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
297269
} else if ("operation".equals(fieldName)) {
298-
operation = DeidentificationOperationType.fromString(reader.getString());
270+
operationType = DeidentificationOperationType.fromString(reader.getString());
299271
} else if ("customizations".equals(fieldName)) {
300272
customizations = DeidentificationJobCustomizationOptions.fromJson(reader);
301273
} else if ("error".equals(fieldName)) {
@@ -315,12 +287,40 @@ public static DeidentificationJob fromJson(JsonReader jsonReader) throws IOExcep
315287
deserializedDeidentificationJob.status = status;
316288
deserializedDeidentificationJob.lastUpdatedAt = lastUpdatedAt;
317289
deserializedDeidentificationJob.createdAt = createdAt;
318-
deserializedDeidentificationJob.operation = operation;
290+
deserializedDeidentificationJob.operationType = operationType;
319291
deserializedDeidentificationJob.customizations = customizations;
320292
deserializedDeidentificationJob.error = error;
321293
deserializedDeidentificationJob.startedAt = startedAt;
322294
deserializedDeidentificationJob.summary = summary;
323295
return deserializedDeidentificationJob;
324296
});
325297
}
298+
299+
/*
300+
* Operation to perform on the input documents.
301+
*/
302+
@Generated
303+
private DeidentificationOperationType operationType;
304+
305+
/**
306+
* Get the operationType property: Operation to perform on the input documents.
307+
*
308+
* @return the operationType value.
309+
*/
310+
@Generated
311+
public DeidentificationOperationType getOperationType() {
312+
return this.operationType;
313+
}
314+
315+
/**
316+
* Set the operationType property: Operation to perform on the input documents.
317+
*
318+
* @param operationType the operationType value to set.
319+
* @return the DeidentificationJob object itself.
320+
*/
321+
@Generated
322+
public DeidentificationJob setOperationType(DeidentificationOperationType operationType) {
323+
this.operationType = operationType;
324+
return this;
325+
}
326326
}

0 commit comments

Comments
 (0)