-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add new endpoint to IResourceRS interface
- Loading branch information
Showing
4 changed files
with
189 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
pic-sure-api-war/src/main/java/edu/harvard/dbmi/avillach/service/FormatService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| package edu.harvard.dbmi.avillach.service; | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import edu.harvard.dbmi.avillach.data.entity.Resource; | ||
| import edu.harvard.dbmi.avillach.data.repository.ResourceRepository; | ||
| import edu.harvard.dbmi.avillach.domain.QueryRequest; | ||
| import edu.harvard.dbmi.avillach.util.Utilities; | ||
| import edu.harvard.dbmi.avillach.util.exception.ApplicationException; | ||
| import edu.harvard.dbmi.avillach.util.exception.ProtocolException; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import javax.inject.Inject; | ||
| import javax.ws.rs.core.HttpHeaders; | ||
| import javax.ws.rs.core.Response; | ||
| import java.util.HashMap; | ||
| import java.util.UUID; | ||
|
|
||
| public class FormatService { | ||
|
|
||
| private final Logger logger = LoggerFactory.getLogger(FormatService.class); | ||
|
|
||
| private final static ObjectMapper mapper = new ObjectMapper(); | ||
|
|
||
| @Inject | ||
| ResourceRepository resourceRepo; | ||
|
|
||
| @Inject | ||
| ResourceWebClient resourceWebClient; | ||
|
|
||
| public Response format(QueryRequest credentialsQueryRequest, HttpHeaders headers) { | ||
| Resource resource = resourceRepo.getById(credentialsQueryRequest.getResourceUUID()); | ||
| if (resource == null){ | ||
| throw new ProtocolException(ProtocolException.RESOURCE_NOT_FOUND + credentialsQueryRequest.getResourceUUID().toString()); | ||
| } | ||
|
|
||
| if (resource.getResourceRSPath() == null){ | ||
| throw new ApplicationException(ApplicationException.MISSING_RESOURCE_PATH); | ||
| } | ||
| if (credentialsQueryRequest == null){ | ||
| credentialsQueryRequest = new QueryRequest(); | ||
| } | ||
|
|
||
| if (credentialsQueryRequest.getResourceCredentials() == null) { | ||
| credentialsQueryRequest.setResourceCredentials(new HashMap<String, String>()); | ||
| } | ||
|
|
||
| String requestSourceFromHeader = Utilities.getRequestSourceFromHeader(headers); | ||
| logger.info("path=/info/{resourceId}, resourceId={}, requestSource={}, credentialsQueryRequest={}", | ||
| credentialsQueryRequest.getResourceUUID().toString(), | ||
| requestSourceFromHeader, | ||
| Utilities.convertQueryRequestToString(mapper, credentialsQueryRequest) | ||
| ); | ||
|
|
||
| return resourceWebClient.queryContinuous(resource.getResourceRSPath(), credentialsQueryRequest, requestSourceFromHeader); | ||
| } | ||
|
|
||
| } |
51 changes: 51 additions & 0 deletions
51
...est/java/edu/harvard/hms/dbmi/avillach/AggregateDataSharingResourceRSAcceptanceTests.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters