Skip to content

Commit 0fdaee9

Browse files
committed
Review exportToCSV method
1 parent 6ba7631 commit 0fdaee9

19 files changed

Lines changed: 33 additions & 61 deletions

roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/controller/AIPController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1372,9 +1372,8 @@ public DescriptiveMetadata process(RequestContext requestContext, RequestControl
13721372

13731373
@Override
13741374
public ResponseEntity<StreamingResponseBody> exportToCSV(String findRequestString) {
1375-
RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
13761375
// delegate
1377-
return ApiUtils.okResponse(indexService.exportToCSV(requestContext.getUser(), findRequestString, IndexedAIP.class));
1376+
return ApiUtils.okResponse(indexService.exportToCSV(findRequestString, IndexedAIP.class));
13781377
}
13791378

13801379
@Override

roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/controller/AuditLogController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ public StringResponse process(RequestContext requestContext, RequestControllerAs
113113

114114
@Override
115115
public ResponseEntity<StreamingResponseBody> exportToCSV(String findRequestString) {
116-
RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
117116
// delegate
118-
return ApiUtils.okResponse(indexService.exportToCSV(requestContext.getUser(), findRequestString, LogEntry.class));
117+
return ApiUtils.okResponse(indexService.exportToCSV(findRequestString, LogEntry.class));
119118
}
120119
}

roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/controller/DIPController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,7 @@ public Job process(RequestContext requestContext, RequestControllerAssistant con
150150

151151
@Override
152152
public ResponseEntity<StreamingResponseBody> exportToCSV(String findRequestString) {
153-
RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
154153
// delegate
155-
return ApiUtils.okResponse(indexService.exportToCSV(requestContext.getUser(), findRequestString, IndexedDIP.class));
154+
return ApiUtils.okResponse(indexService.exportToCSV(findRequestString, IndexedDIP.class));
156155
}
157156
}

roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/controller/DIPFileController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ public List<String> suggest(SuggestRequest suggestRequest) {
6565

6666
@Override
6767
public ResponseEntity<StreamingResponseBody> exportToCSV(String findRequestString) {
68-
RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
6968
// delegate
70-
return ApiUtils.okResponse(indexService.exportToCSV(requestContext.getUser(), findRequestString, DIPFile.class));
69+
return ApiUtils.okResponse(indexService.exportToCSV(findRequestString, DIPFile.class));
7170
}
7271
}

roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/controller/DisposalConfirmationController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,8 @@ public DisposalConfirmationForm process(RequestContext requestContext,
207207

208208
@Override
209209
public ResponseEntity<StreamingResponseBody> exportToCSV(String findRequestString) {
210-
RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
211210
// delegate
212211
return ApiUtils
213-
.okResponse(indexService.exportToCSV(requestContext.getUser(), findRequestString, DisposalConfirmation.class));
212+
.okResponse(indexService.exportToCSV(findRequestString, DisposalConfirmation.class));
214213
}
215214
}

roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/controller/Exportable.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.roda.wui.api.v2.controller;
22

3-
import org.roda.core.data.v2.index.FindRequest;
43
import org.springframework.http.MediaType;
54
import org.springframework.http.ResponseEntity;
65
import org.springframework.web.bind.annotation.PostMapping;

roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/controller/FilesController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,10 +405,9 @@ public List<String> process(RequestContext requestContext, RequestControllerAssi
405405

406406
@Override
407407
public ResponseEntity<StreamingResponseBody> exportToCSV(String findRequestString) {
408-
RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
409408
// delegate
410409
return ApiUtils
411-
.okResponse(indexService.exportToCSV(requestContext.getUser(), findRequestString, IndexedFile.class));
410+
.okResponse(indexService.exportToCSV(findRequestString, IndexedFile.class));
412411
}
413412

414413
@GetMapping(path = "/{uuid}/metadata/technical/{typeId}/html", produces = MediaType.TEXT_HTML_VALUE)

roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/controller/JobReportController.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,11 @@ public class JobReportController implements JobReportRestService, Exportable {
3939

4040
@Override
4141
public IndexedReport findByUuid(String uuid, String localeString) {
42-
RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
4342
return indexService.retrieve(IndexedReport.class, uuid, new ArrayList<>());
4443
}
4544

4645
@Override
4746
public IndexResult<IndexedReport> find(@RequestBody FindRequest findRequest, String localeString) {
48-
RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
4947
return indexService.find(IndexedReport.class, findRequest, localeString);
5048
}
5149

@@ -61,15 +59,13 @@ public LongResponse count(@RequestBody CountRequest countRequest) {
6159

6260
@Override
6361
public List<String> suggest(SuggestRequest suggestRequest) {
64-
RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
6562
return indexService.suggest(suggestRequest, IndexedReport.class);
6663
}
6764

6865
@Override
6966
public ResponseEntity<StreamingResponseBody> exportToCSV(String findRequestString) {
70-
RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
7167
// delegate
7268
return ApiUtils.okResponse(
73-
indexService.exportToCSV(requestContext.getUser(), findRequestString, IndexedReport.class));
69+
indexService.exportToCSV(findRequestString, IndexedReport.class));
7470
}
7571
}

roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/controller/JobsController.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@
7676
@RequestMapping(path = "/api/v2/jobs")
7777
public class JobsController implements JobsRestService, Exportable {
7878
@Autowired
79-
private HttpServletRequest request;
79+
HttpServletRequest request;
8080

8181
@Autowired
82-
private JobService jobService;
82+
JobService jobService;
8383

8484
@Autowired
85-
private IndexService indexService;
85+
IndexService indexService;
8686

8787
@Override
8888
public Job getJobFromModel(String jobId) {
@@ -125,7 +125,8 @@ public Job createJob(@RequestBody CreateJobRequest jobRequest) {
125125
if (!(jobRequest.getSourceObjects() instanceof SelectedItemsNoneRequest)) {
126126
sourceObjectsClass = SelectedItemsUtils.parseClass(jobRequest.getSourceObjectsClass());
127127
}
128-
SelectedItems<?> sourceObjects = CommonServicesUtils.convertSelectedItems(jobRequest.getSourceObjects(), sourceObjectsClass);
128+
SelectedItems<?> sourceObjects = CommonServicesUtils.convertSelectedItems(jobRequest.getSourceObjects(),
129+
sourceObjectsClass);
129130
Job job = JobUtils.createJob(jobRequest.getName(), JobPriority.valueOf(jobRequest.getPriority()),
130131
JobParallelism.valueOf(jobRequest.getParallelism()), sourceObjects, jobRequest.getPlugin(),
131132
jobRequest.getPluginParameters());
@@ -348,13 +349,11 @@ public List<PluginInfo> getJobPluginInfo(@RequestBody PluginInfoRequest pluginIn
348349

349350
@Override
350351
public IndexedJob findByUuid(String uuid, String localeString) {
351-
RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
352352
return indexService.retrieve(IndexedJob.class, uuid, new ArrayList<>());
353353
}
354354

355355
@Override
356356
public IndexResult<IndexedJob> find(@RequestBody FindRequest findRequest, String localeString) {
357-
RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
358357
return indexService.find(IndexedJob.class, findRequest, localeString);
359358
}
360359

@@ -370,15 +369,12 @@ public LongResponse count(@RequestBody CountRequest countRequest) {
370369

371370
@Override
372371
public List<String> suggest(SuggestRequest suggestRequest) {
373-
RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
374372
return indexService.suggest(suggestRequest, IndexedJob.class);
375373
}
376374

377375
@Override
378376
public ResponseEntity<StreamingResponseBody> exportToCSV(String findRequestString) {
379-
RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
380377
// delegate
381-
return ApiUtils.okResponse(
382-
indexService.exportToCSV(requestContext.getUser(), findRequestString, IndexedJob.class));
378+
return ApiUtils.okResponse(indexService.exportToCSV(findRequestString, IndexedJob.class));
383379
}
384380
}

roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/controller/MembersController.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,16 @@
8888
@RestController
8989
@RequestMapping(path = "/api/v2/members")
9090
public class MembersController implements MembersRestService, Exportable {
91-
9291
private static final Logger LOGGER = LoggerFactory.getLogger(MembersController.class);
92+
9393
@Autowired
94-
private HttpServletRequest request;
94+
HttpServletRequest request;
9595

9696
@Autowired
97-
private MembersService membersService;
97+
MembersService membersService;
9898

9999
@Autowired
100-
private IndexService indexService;
100+
IndexService indexService;
101101

102102
public static void logout(HttpServletRequest request, List<String> extraAttributesToBeRemovedFromSession) {
103103
User user = UserUtility.getUser(request);
@@ -799,13 +799,11 @@ public User registerUser(@RequestBody RegisterUserRequest registerUserRequest, S
799799

800800
@Override
801801
public RodaPrincipal findByUuid(String uuid, String localeString) {
802-
RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
803802
return indexService.retrieve(RodaPrincipal.class, uuid, new ArrayList<>());
804803
}
805804

806805
@Override
807806
public IndexResult<RODAMember> find(@RequestBody FindRequest findRequest, String localeString) {
808-
RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
809807
return indexService.find(RODAMember.class, findRequest, localeString);
810808
}
811809

@@ -821,14 +819,12 @@ public LongResponse count(@RequestBody CountRequest countRequest) {
821819

822820
@Override
823821
public List<String> suggest(SuggestRequest suggestRequest) {
824-
RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
825822
return indexService.suggest(suggestRequest, RODAMember.class);
826823
}
827824

828825
@Override
829826
public ResponseEntity<StreamingResponseBody> exportToCSV(String findRequestString) {
830-
RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
831827
// delegate
832-
return ApiUtils.okResponse(indexService.exportToCSV(requestContext.getUser(), findRequestString, RODAMember.class));
828+
return ApiUtils.okResponse(indexService.exportToCSV(findRequestString, RODAMember.class));
833829
}
834830
}

0 commit comments

Comments
 (0)