Skip to content

Commit 8f7c832

Browse files
gkiko10gkiko10
committed
fmt
1 parent 6142aed commit 8f7c832

File tree

2 files changed

+71
-40
lines changed

2 files changed

+71
-40
lines changed

‎databricks-sdk-java/src/main/java/com/databricks/sdk/mixin/JobsExt.java‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,38 @@ public JobsExt(JobsService mock) {
1818
/**
1919
* List jobs.
2020
*
21-
* <p>Retrieves a list of jobs. If the job has multiple pages of tasks, job_clusters, parameters or environments,
22-
* it will paginate through all pages and aggregate the results.
21+
* <p>Retrieves a list of jobs. If the job has multiple pages of tasks, job_clusters, parameters
22+
* or environments, it will paginate through all pages and aggregate the results.
2323
*/
2424
public Iterable<BaseJob> list(ListJobsRequest request) {
2525
// fetch jobs with limited elements in top level arrays
26-
Iterable<BaseJob> jobsList = super.list(request);
26+
Iterable<BaseJob> jobsList = super.list(request);
2727

2828
if (!request.getExpandTasks()) {
2929
return jobsList;
3030
}
3131

3232
Iterator<BaseJob> iterator = jobsList.iterator();
33-
return () -> new Iterator<BaseJob>() {
34-
@Override
35-
public boolean hasNext() {
36-
return iterator.hasNext();
37-
}
38-
39-
@Override
40-
public BaseJob next() {
41-
BaseJob job = iterator.next();
42-
// fully fetch all top level arrays for the job
43-
GetJobRequest getJobRequest = new GetJobRequest().setJobId(job.getJobId());
44-
Job fullJob = get(getJobRequest);
45-
job.getSettings().setTasks(fullJob.getSettings().getTasks());
46-
job.getSettings().setJobClusters(fullJob.getSettings().getJobClusters());
47-
job.getSettings().setParameters(fullJob.getSettings().getParameters());
48-
job.getSettings().setEnvironments(fullJob.getSettings().getEnvironments());
49-
return job;
50-
}
51-
};
33+
return () ->
34+
new Iterator<BaseJob>() {
35+
@Override
36+
public boolean hasNext() {
37+
return iterator.hasNext();
38+
}
39+
40+
@Override
41+
public BaseJob next() {
42+
BaseJob job = iterator.next();
43+
// fully fetch all top level arrays for the job
44+
GetJobRequest getJobRequest = new GetJobRequest().setJobId(job.getJobId());
45+
Job fullJob = get(getJobRequest);
46+
job.getSettings().setTasks(fullJob.getSettings().getTasks());
47+
job.getSettings().setJobClusters(fullJob.getSettings().getJobClusters());
48+
job.getSettings().setParameters(fullJob.getSettings().getParameters());
49+
job.getSettings().setEnvironments(fullJob.getSettings().getEnvironments());
50+
return job;
51+
}
52+
};
5253
}
5354

5455
/**

‎databricks-sdk-java/src/test/java/com/databricks/sdk/mixin/JobsExtTest.java‎

Lines changed: 48 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ public void testListJobsWithoutExpandTasks() {
218218
jobsOnSecondPage.add(job3);
219219
jobsOnSecondPage.add(job4);
220220
when(service.list(any()))
221-
.thenReturn(new ListJobsResponse().setJobs(jobsOnFirstPage))
222-
.thenReturn(new ListJobsResponse().setJobs(jobsOnSecondPage));
221+
.thenReturn(new ListJobsResponse().setJobs(jobsOnFirstPage))
222+
.thenReturn(new ListJobsResponse().setJobs(jobsOnSecondPage));
223223
JobsExt jobsExt = new JobsExt(service);
224224

225225
ListJobsRequest request = new ListJobsRequest().setExpandTasks(false);
@@ -231,7 +231,8 @@ public void testListJobsWithoutExpandTasks() {
231231
expectedJobsList.add(job3);
232232
expectedJobsList.add(job4);
233233
for (BaseJob job : jobsList) {
234-
BaseJob expectedJob = expectedJobsList.stream()
234+
BaseJob expectedJob =
235+
expectedJobsList.stream()
235236
.filter(e -> e.getJobId().equals(job.getJobId()))
236237
.findFirst()
237238
.orElse(null);
@@ -248,30 +249,56 @@ public void testListJobs() {
248249
BaseJob job2 = new BaseJob().setJobId(200L).setSettings(new JobSettings().setName("job2"));
249250
addTasks(job2, "job2_taskKey1", "job2_taskKey2");
250251

251-
Job getJob1_page1 = new Job()
252+
Job getJob1_page1 =
253+
new Job()
252254
.setJobId(100L)
253255
.setNextPageToken("job1_page2token")
254256
.setSettings(new JobSettings().setName("job1"));
255257
addTasks(getJob1_page1, "job1_taskKey1", "job1_taskKey2");
256-
Job getJob1_page2 = new Job()
257-
.setJobId(100L)
258-
.setSettings(new JobSettings().setName("job1"));
258+
Job getJob1_page2 = new Job().setJobId(100L).setSettings(new JobSettings().setName("job1"));
259259
addTasks(getJob1_page2, "job1_taskKey3", "job1_taskKey4");
260260

261-
Job getJob2_page1 = new Job()
261+
Job getJob2_page1 =
262+
new Job()
262263
.setJobId(200L)
263264
.setNextPageToken("job2_page2token")
264265
.setSettings(new JobSettings().setName("job2"));
265266
addTasks(getJob2_page1, "job2_taskKey1", "job2_taskKey2");
266-
Job getJob2_page2 = new Job()
267-
.setJobId(200L)
268-
.setSettings(new JobSettings().setName("job2"));
267+
Job getJob2_page2 = new Job().setJobId(200L).setSettings(new JobSettings().setName("job2"));
269268
addTasks(getJob2_page2, "job2_taskKey3", "job2_taskKey4");
270269

271-
doReturn(getJob1_page1).when(service).get(argThat(request -> request != null && request.getJobId() == 100L && request.getPageToken() == null));
272-
doReturn(getJob1_page2).when(service).get(argThat(request -> request != null && request.getJobId() == 100L && "job1_page2token".equals(request.getPageToken())));
273-
doReturn(getJob2_page1).when(service).get(argThat(request -> request != null && request.getJobId() == 200L && request.getPageToken() == null));
274-
doReturn(getJob2_page2).when(service).get(argThat(request -> request != null && request.getJobId() == 200L && "job2_page2token".equals(request.getPageToken())));
270+
doReturn(getJob1_page1)
271+
.when(service)
272+
.get(
273+
argThat(
274+
request ->
275+
request != null
276+
&& request.getJobId() == 100L
277+
&& request.getPageToken() == null));
278+
doReturn(getJob1_page2)
279+
.when(service)
280+
.get(
281+
argThat(
282+
request ->
283+
request != null
284+
&& request.getJobId() == 100L
285+
&& "job1_page2token".equals(request.getPageToken())));
286+
doReturn(getJob2_page1)
287+
.when(service)
288+
.get(
289+
argThat(
290+
request ->
291+
request != null
292+
&& request.getJobId() == 200L
293+
&& request.getPageToken() == null));
294+
doReturn(getJob2_page2)
295+
.when(service)
296+
.get(
297+
argThat(
298+
request ->
299+
request != null
300+
&& request.getJobId() == 200L
301+
&& "job2_page2token".equals(request.getPageToken())));
275302

276303
List<BaseJob> jobsOnFirstPage = new ArrayList<>();
277304
jobsOnFirstPage.add(job1);
@@ -283,15 +310,18 @@ public void testListJobs() {
283310
ListJobsRequest request = new ListJobsRequest().setExpandTasks(true);
284311
Iterable<BaseJob> jobsList = jobsExt.list(request);
285312

286-
BaseJob expectedJob1 = new BaseJob().setJobId(100L).setSettings(new JobSettings().setName("job1"));
313+
BaseJob expectedJob1 =
314+
new BaseJob().setJobId(100L).setSettings(new JobSettings().setName("job1"));
287315
addTasks(expectedJob1, "job1_taskKey1", "job1_taskKey2", "job1_taskKey3", "job1_taskKey4");
288-
BaseJob expectedJob2 = new BaseJob().setJobId(200L).setSettings(new JobSettings().setName("job2"));
316+
BaseJob expectedJob2 =
317+
new BaseJob().setJobId(200L).setSettings(new JobSettings().setName("job2"));
289318
addTasks(expectedJob2, "job2_taskKey1", "job2_taskKey2", "job2_taskKey3", "job2_taskKey4");
290319
List<BaseJob> expectedJobsList = new ArrayList<>();
291320
expectedJobsList.add(expectedJob1);
292321
expectedJobsList.add(expectedJob2);
293322
for (BaseJob job : jobsList) {
294-
BaseJob expectedJob = expectedJobsList.stream()
323+
BaseJob expectedJob =
324+
expectedJobsList.stream()
295325
.filter(e -> e.getJobId().equals(job.getJobId()))
296326
.findFirst()
297327
.orElse(null);

0 commit comments

Comments
 (0)