Skip to content

Commit f513d85

Browse files
yoshi-automationsduskis
yoshi-automation
authored and
sduskis
committed
---
yaml --- r: 35839 b: refs/heads/autosynth-dataproc c: 9b17a44 h: refs/heads/master i: 35837: 73783be 35835: 441a237 35831: f725708 35823: 9b5fb42 35807: 20be32f 35775: ef22aa5 35711: c18e351 35583: a088066 35327: bc00e21 34815: adcded2
1 parent bd8df4e commit f513d85

3 files changed

Lines changed: 102 additions & 102 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ refs/tags/v0.78.0: 62d4bd30605ab3578f9a08d84487fb0b33ac2ff5
165165
refs/tags/v0.79.0: 82287b570708748c411d05c40f3932cff9606feb
166166
refs/tags/v0.80.0: f745e744d38e4fe636f34d0e04795ba3d014287d
167167
refs/tags/v0.81.0: ed3a0c85339ea6b73560b9a570abfbb76b93a263
168-
refs/heads/autosynth-dataproc: 55f9f52990e6749fa4a3f5ba1f49358262820475
168+
refs/heads/autosynth-dataproc: 9b17a44462475b91d3b19af78c12f02a4f27245c
169169
refs/heads/autosynth-securitycenter: b24087060036e623e57d2454ba5dabeaf1e530c5
170170
refs/heads/autosynth-talent: 4ca901879f86aab61091cea52e8a9b653639df24
171171
refs/tags/v0.82.0: 7b9807d5d0a400c757b8905fee768be4c85eba25

‎branches/autosynth-dataproc/google-cloud-clients/google-cloud-datalabeling/src/main/java/com/google/cloud/datalabeling/v1beta1/DataLabelingServiceClient.java‎

Lines changed: 96 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -114,39 +114,43 @@ public class DataLabelingServiceClient implements BackgroundResource {
114114
private final DataLabelingServiceStub stub;
115115
private final OperationsClient operationsClient;
116116

117-
private static final PathTemplate PROJECT_PATH_TEMPLATE =
118-
PathTemplate.createWithoutUrlEncoding("projects/{project}");
117+
private static final PathTemplate ANNOTATED_DATASET_PATH_TEMPLATE =
118+
PathTemplate.createWithoutUrlEncoding(
119+
"projects/{project}/datasets/{dataset}/annotatedDatasets/{annotated_dataset}");
119120

120121
private static final PathTemplate ANNOTATION_SPEC_SET_PATH_TEMPLATE =
121122
PathTemplate.createWithoutUrlEncoding(
122123
"projects/{project}/annotationSpecSets/{annotation_spec_set}");
123124

125+
private static final PathTemplate DATA_ITEM_PATH_TEMPLATE =
126+
PathTemplate.createWithoutUrlEncoding(
127+
"projects/{project}/datasets/{dataset}/dataItems/{data_item}");
128+
124129
private static final PathTemplate DATASET_PATH_TEMPLATE =
125130
PathTemplate.createWithoutUrlEncoding("projects/{project}/datasets/{dataset}");
126131

127-
private static final PathTemplate ANNOTATED_DATASET_PATH_TEMPLATE =
128-
PathTemplate.createWithoutUrlEncoding(
129-
"projects/{project}/datasets/{dataset}/annotatedDatasets/{annotated_dataset}");
130-
131132
private static final PathTemplate EXAMPLE_PATH_TEMPLATE =
132133
PathTemplate.createWithoutUrlEncoding(
133134
"projects/{project}/datasets/{dataset}/annotatedDatasets/{annotated_dataset}/examples/{example}");
134135

135-
private static final PathTemplate DATA_ITEM_PATH_TEMPLATE =
136-
PathTemplate.createWithoutUrlEncoding(
137-
"projects/{project}/datasets/{dataset}/dataItems/{data_item}");
138-
139136
private static final PathTemplate INSTRUCTION_PATH_TEMPLATE =
140137
PathTemplate.createWithoutUrlEncoding("projects/{project}/instructions/{instruction}");
141138

139+
private static final PathTemplate PROJECT_PATH_TEMPLATE =
140+
PathTemplate.createWithoutUrlEncoding("projects/{project}");
141+
142142
/**
143-
* Formats a string containing the fully-qualified path to represent a project resource.
143+
* Formats a string containing the fully-qualified path to represent a annotated_dataset resource.
144144
*
145-
* @deprecated Use the {@link ProjectName} class instead.
145+
* @deprecated Use the {@link AnnotatedDatasetName} class instead.
146146
*/
147147
@Deprecated
148-
public static final String formatProjectName(String project) {
149-
return PROJECT_PATH_TEMPLATE.instantiate("project", project);
148+
public static final String formatAnnotatedDatasetName(
149+
String project, String dataset, String annotatedDataset) {
150+
return ANNOTATED_DATASET_PATH_TEMPLATE.instantiate(
151+
"project", project,
152+
"dataset", dataset,
153+
"annotated_dataset", annotatedDataset);
150154
}
151155

152156
/**
@@ -163,29 +167,28 @@ public static final String formatAnnotationSpecSetName(String project, String an
163167
}
164168

165169
/**
166-
* Formats a string containing the fully-qualified path to represent a dataset resource.
170+
* Formats a string containing the fully-qualified path to represent a data_item resource.
167171
*
168-
* @deprecated Use the {@link DatasetName} class instead.
172+
* @deprecated Use the {@link DataItemName} class instead.
169173
*/
170174
@Deprecated
171-
public static final String formatDatasetName(String project, String dataset) {
172-
return DATASET_PATH_TEMPLATE.instantiate(
175+
public static final String formatDataItemName(String project, String dataset, String dataItem) {
176+
return DATA_ITEM_PATH_TEMPLATE.instantiate(
173177
"project", project,
174-
"dataset", dataset);
178+
"dataset", dataset,
179+
"data_item", dataItem);
175180
}
176181

177182
/**
178-
* Formats a string containing the fully-qualified path to represent a annotated_dataset resource.
183+
* Formats a string containing the fully-qualified path to represent a dataset resource.
179184
*
180-
* @deprecated Use the {@link AnnotatedDatasetName} class instead.
185+
* @deprecated Use the {@link DatasetName} class instead.
181186
*/
182187
@Deprecated
183-
public static final String formatAnnotatedDatasetName(
184-
String project, String dataset, String annotatedDataset) {
185-
return ANNOTATED_DATASET_PATH_TEMPLATE.instantiate(
188+
public static final String formatDatasetName(String project, String dataset) {
189+
return DATASET_PATH_TEMPLATE.instantiate(
186190
"project", project,
187-
"dataset", dataset,
188-
"annotated_dataset", annotatedDataset);
191+
"dataset", dataset);
189192
}
190193

191194
/**
@@ -203,19 +206,6 @@ public static final String formatExampleName(
203206
"example", example);
204207
}
205208

206-
/**
207-
* Formats a string containing the fully-qualified path to represent a data_item resource.
208-
*
209-
* @deprecated Use the {@link DataItemName} class instead.
210-
*/
211-
@Deprecated
212-
public static final String formatDataItemName(String project, String dataset, String dataItem) {
213-
return DATA_ITEM_PATH_TEMPLATE.instantiate(
214-
"project", project,
215-
"dataset", dataset,
216-
"data_item", dataItem);
217-
}
218-
219209
/**
220210
* Formats a string containing the fully-qualified path to represent a instruction resource.
221211
*
@@ -229,13 +219,47 @@ public static final String formatInstructionName(String project, String instruct
229219
}
230220

231221
/**
232-
* Parses the project from the given fully-qualified path which represents a project resource.
222+
* Formats a string containing the fully-qualified path to represent a project resource.
233223
*
234224
* @deprecated Use the {@link ProjectName} class instead.
235225
*/
236226
@Deprecated
237-
public static final String parseProjectFromProjectName(String projectName) {
238-
return PROJECT_PATH_TEMPLATE.parse(projectName).get("project");
227+
public static final String formatProjectName(String project) {
228+
return PROJECT_PATH_TEMPLATE.instantiate("project", project);
229+
}
230+
231+
/**
232+
* Parses the project from the given fully-qualified path which represents a annotated_dataset
233+
* resource.
234+
*
235+
* @deprecated Use the {@link AnnotatedDatasetName} class instead.
236+
*/
237+
@Deprecated
238+
public static final String parseProjectFromAnnotatedDatasetName(String annotatedDatasetName) {
239+
return ANNOTATED_DATASET_PATH_TEMPLATE.parse(annotatedDatasetName).get("project");
240+
}
241+
242+
/**
243+
* Parses the dataset from the given fully-qualified path which represents a annotated_dataset
244+
* resource.
245+
*
246+
* @deprecated Use the {@link AnnotatedDatasetName} class instead.
247+
*/
248+
@Deprecated
249+
public static final String parseDatasetFromAnnotatedDatasetName(String annotatedDatasetName) {
250+
return ANNOTATED_DATASET_PATH_TEMPLATE.parse(annotatedDatasetName).get("dataset");
251+
}
252+
253+
/**
254+
* Parses the annotated_dataset from the given fully-qualified path which represents a
255+
* annotated_dataset resource.
256+
*
257+
* @deprecated Use the {@link AnnotatedDatasetName} class instead.
258+
*/
259+
@Deprecated
260+
public static final String parseAnnotatedDatasetFromAnnotatedDatasetName(
261+
String annotatedDatasetName) {
262+
return ANNOTATED_DATASET_PATH_TEMPLATE.parse(annotatedDatasetName).get("annotated_dataset");
239263
}
240264

241265
/**
@@ -264,57 +288,53 @@ public static final String parseAnnotationSpecSetFromAnnotationSpecSetName(
264288
}
265289

266290
/**
267-
* Parses the project from the given fully-qualified path which represents a dataset resource.
291+
* Parses the project from the given fully-qualified path which represents a data_item resource.
268292
*
269-
* @deprecated Use the {@link DatasetName} class instead.
293+
* @deprecated Use the {@link DataItemName} class instead.
270294
*/
271295
@Deprecated
272-
public static final String parseProjectFromDatasetName(String datasetName) {
273-
return DATASET_PATH_TEMPLATE.parse(datasetName).get("project");
296+
public static final String parseProjectFromDataItemName(String dataItemName) {
297+
return DATA_ITEM_PATH_TEMPLATE.parse(dataItemName).get("project");
274298
}
275299

276300
/**
277-
* Parses the dataset from the given fully-qualified path which represents a dataset resource.
301+
* Parses the dataset from the given fully-qualified path which represents a data_item resource.
278302
*
279-
* @deprecated Use the {@link DatasetName} class instead.
303+
* @deprecated Use the {@link DataItemName} class instead.
280304
*/
281305
@Deprecated
282-
public static final String parseDatasetFromDatasetName(String datasetName) {
283-
return DATASET_PATH_TEMPLATE.parse(datasetName).get("dataset");
306+
public static final String parseDatasetFromDataItemName(String dataItemName) {
307+
return DATA_ITEM_PATH_TEMPLATE.parse(dataItemName).get("dataset");
284308
}
285309

286310
/**
287-
* Parses the project from the given fully-qualified path which represents a annotated_dataset
288-
* resource.
311+
* Parses the data_item from the given fully-qualified path which represents a data_item resource.
289312
*
290-
* @deprecated Use the {@link AnnotatedDatasetName} class instead.
313+
* @deprecated Use the {@link DataItemName} class instead.
291314
*/
292315
@Deprecated
293-
public static final String parseProjectFromAnnotatedDatasetName(String annotatedDatasetName) {
294-
return ANNOTATED_DATASET_PATH_TEMPLATE.parse(annotatedDatasetName).get("project");
316+
public static final String parseDataItemFromDataItemName(String dataItemName) {
317+
return DATA_ITEM_PATH_TEMPLATE.parse(dataItemName).get("data_item");
295318
}
296319

297320
/**
298-
* Parses the dataset from the given fully-qualified path which represents a annotated_dataset
299-
* resource.
321+
* Parses the project from the given fully-qualified path which represents a dataset resource.
300322
*
301-
* @deprecated Use the {@link AnnotatedDatasetName} class instead.
323+
* @deprecated Use the {@link DatasetName} class instead.
302324
*/
303325
@Deprecated
304-
public static final String parseDatasetFromAnnotatedDatasetName(String annotatedDatasetName) {
305-
return ANNOTATED_DATASET_PATH_TEMPLATE.parse(annotatedDatasetName).get("dataset");
326+
public static final String parseProjectFromDatasetName(String datasetName) {
327+
return DATASET_PATH_TEMPLATE.parse(datasetName).get("project");
306328
}
307329

308330
/**
309-
* Parses the annotated_dataset from the given fully-qualified path which represents a
310-
* annotated_dataset resource.
331+
* Parses the dataset from the given fully-qualified path which represents a dataset resource.
311332
*
312-
* @deprecated Use the {@link AnnotatedDatasetName} class instead.
333+
* @deprecated Use the {@link DatasetName} class instead.
313334
*/
314335
@Deprecated
315-
public static final String parseAnnotatedDatasetFromAnnotatedDatasetName(
316-
String annotatedDatasetName) {
317-
return ANNOTATED_DATASET_PATH_TEMPLATE.parse(annotatedDatasetName).get("annotated_dataset");
336+
public static final String parseDatasetFromDatasetName(String datasetName) {
337+
return DATASET_PATH_TEMPLATE.parse(datasetName).get("dataset");
318338
}
319339

320340
/**
@@ -358,36 +378,6 @@ public static final String parseExampleFromExampleName(String exampleName) {
358378
return EXAMPLE_PATH_TEMPLATE.parse(exampleName).get("example");
359379
}
360380

361-
/**
362-
* Parses the project from the given fully-qualified path which represents a data_item resource.
363-
*
364-
* @deprecated Use the {@link DataItemName} class instead.
365-
*/
366-
@Deprecated
367-
public static final String parseProjectFromDataItemName(String dataItemName) {
368-
return DATA_ITEM_PATH_TEMPLATE.parse(dataItemName).get("project");
369-
}
370-
371-
/**
372-
* Parses the dataset from the given fully-qualified path which represents a data_item resource.
373-
*
374-
* @deprecated Use the {@link DataItemName} class instead.
375-
*/
376-
@Deprecated
377-
public static final String parseDatasetFromDataItemName(String dataItemName) {
378-
return DATA_ITEM_PATH_TEMPLATE.parse(dataItemName).get("dataset");
379-
}
380-
381-
/**
382-
* Parses the data_item from the given fully-qualified path which represents a data_item resource.
383-
*
384-
* @deprecated Use the {@link DataItemName} class instead.
385-
*/
386-
@Deprecated
387-
public static final String parseDataItemFromDataItemName(String dataItemName) {
388-
return DATA_ITEM_PATH_TEMPLATE.parse(dataItemName).get("data_item");
389-
}
390-
391381
/**
392382
* Parses the project from the given fully-qualified path which represents a instruction resource.
393383
*
@@ -409,6 +399,16 @@ public static final String parseInstructionFromInstructionName(String instructio
409399
return INSTRUCTION_PATH_TEMPLATE.parse(instructionName).get("instruction");
410400
}
411401

402+
/**
403+
* Parses the project from the given fully-qualified path which represents a project resource.
404+
*
405+
* @deprecated Use the {@link ProjectName} class instead.
406+
*/
407+
@Deprecated
408+
public static final String parseProjectFromProjectName(String projectName) {
409+
return PROJECT_PATH_TEMPLATE.parse(projectName).get("project");
410+
}
411+
412412
/** Constructs an instance of DataLabelingServiceClient with default settings. */
413413
public static final DataLabelingServiceClient create() throws IOException {
414414
return create(DataLabelingServiceSettings.newBuilder().build());

‎branches/autosynth-dataproc/google-cloud-clients/google-cloud-datalabeling/synth.metadata‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"updateTime": "2019-04-03T07:39:57.719728Z",
2+
"updateTime": "2019-04-23T07:39:35.286852Z",
33
"sources": [
44
{
55
"generator": {
66
"name": "artman",
7-
"version": "0.16.22",
8-
"dockerImage": "googleapis/artman@sha256:e7f9554322a8aa1416c122c918fdc4cdec8cfe816f027fc948dec0be7edef320"
7+
"version": "0.17.0",
8+
"dockerImage": "googleapis/artman@sha256:c58f4ec3838eb4e0718eb1bccc6512bd6850feaa85a360a9e38f6f848ec73bc2"
99
}
1010
},
1111
{
1212
"git": {
1313
"name": "googleapis",
1414
"remote": "https://github.com/googleapis/googleapis.git",
15-
"sha": "8dab717b2851750c829530669fe5cebafef22fb8",
16-
"internalRef": "241646671"
15+
"sha": "547e19e7df398e9290e8e3674d7351efc500f9b0",
16+
"internalRef": "244712781"
1717
}
1818
}
1919
],

0 commit comments

Comments
 (0)