Skip to content

Commit d99f680

Browse files
committed
Updated Jobs and add tests.
1 parent e38238b commit d99f680

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

dlp/src/main/java/com/example/dlp/Jobs.java

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@
1919
import com.google.cloud.dlp.v2.DlpServiceClient;
2020
import com.google.privacy.dlp.v2.DeleteDlpJobRequest;
2121
import com.google.privacy.dlp.v2.DlpJob;
22+
import com.google.privacy.dlp.v2.DlpJobName;
2223
import com.google.privacy.dlp.v2.DlpJobType;
2324
import com.google.privacy.dlp.v2.ListDlpJobsRequest;
25+
import com.google.privacy.dlp.v2.ProjectName;
2426
import org.apache.commons.cli.CommandLine;
2527
import org.apache.commons.cli.CommandLineParser;
2628
import org.apache.commons.cli.DefaultParser;
@@ -32,10 +34,10 @@
3234

3335
public class Jobs {
3436

37+
// [START dlp_list_jobs]
3538
private static void listJobs(String projectId, String filter, DlpJobType jobType)
3639
throws Exception {
3740
/**
38-
* [START dlp_list_jobs]
3941
*
4042
* List DLP jobs
4143
*
@@ -47,54 +49,55 @@ private static void listJobs(String projectId, String filter, DlpJobType jobType
4749
try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
4850
ListDlpJobsRequest listDlpJobsRequest =
4951
ListDlpJobsRequest.newBuilder()
50-
.setParent(projectId)
52+
.setParent(ProjectName.of(projectId).toString())
5153
.setFilter(filter)
5254
.setType(jobType)
5355
.build();
5456
DlpServiceClient.ListDlpJobsPagedResponse response =
5557
dlpServiceClient.listDlpJobs(listDlpJobsRequest);
5658
for (DlpJob dlpJob : response.getPage().getValues()) {
57-
System.out.println("Job name: " + dlpJob.getState());
58-
System.out.println("Job state: " + dlpJob.getState());
59+
System.out.println(dlpJob.getName() + " -- " + dlpJob.getState());
5960
}
6061
}
6162
}
6263
// [END dlp_list_jobs]
6364

6465
/**
65-
* [START dlp_delete_job]
6666
*
6767
* Delete a DLP Job
6868
*
6969
* @param projectId Google Cloud ProjectID
7070
* @param jobId DLP Job ID
7171
*/
72+
// [START dlp_delete_job]
7273
private static void deleteJob(String projectId, String jobId) {
7374

7475
try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
7576
// construct complete job name
76-
String jobName = String.format("projects/%s/dlpJobs/%s", projectId, jobId);
77+
DlpJobName job = DlpJobName.of(projectId, jobId);
7778

7879
DeleteDlpJobRequest deleteDlpJobRequest =
79-
DeleteDlpJobRequest.newBuilder().setName(jobName).build();
80+
DeleteDlpJobRequest.newBuilder().setName(job.toString()).build();
8081

8182
// submit job deletion request
8283
dlpServiceClient.deleteDlpJob(deleteDlpJobRequest);
84+
85+
System.out.println("Job deleted successfully.");
8386
} catch (Exception e) {
8487
System.err.println("Error deleting DLP job: " + e.getMessage());
8588
}
86-
// [END dlp_delete_job]
8789
}
90+
// [END dlp_delete_job]
8891

8992
/** Command line application to list and delete DLP jobs the Data Loss Prevention API. */
9093
public static void main(String[] args) throws Exception {
9194

9295
OptionGroup optionsGroup = new OptionGroup();
9396
optionsGroup.setRequired(true);
94-
Option listOption = new Option("l", "list", true, "List DLP Jobs");
97+
Option listOption = new Option("l", "list", false, "List DLP Jobs");
9598
optionsGroup.addOption(listOption);
9699

97-
Option deleteOption = new Option("d", "delete", true, "Delete DLP Jobs");
100+
Option deleteOption = new Option("d", "delete", false, "Delete DLP Jobs");
98101
optionsGroup.addOption(deleteOption);
99102

100103
Options commandLineOptions = new Options();
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package com.example.dlp;
2+
3+
public class JobsIT {
4+
5+
}

0 commit comments

Comments
 (0)