AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

List available services in API docs when requesting arbitrary data

Browse Source
This commit is contained in:
CalDescent 2021-11-20 11:46:03 +00:00
parent c79ec11b07
commit 530fc67a05
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/qortal/api/resource/ArbitraryResource.java
View File

@ -278,13 +278,13 @@ public class ArbitraryResource {
}
)
@SecurityRequirement(name = "apiKey")
public HttpServletResponse get(@PathParam("service") String serviceString,
public HttpServletResponse get(@PathParam("service") Service service,
@PathParam("name") String name,
@QueryParam("filepath") String filepath,
@QueryParam("rebuild") boolean rebuild) {
Security.checkApiCallAllowed(request);
return this.download(serviceString, name, null, filepath, rebuild);
return this.download(service, name, null, filepath, rebuild);
}
@GET
@ -305,14 +305,14 @@ public class ArbitraryResource {
}
)
@SecurityRequirement(name = "apiKey")
public HttpServletResponse get(@PathParam("service") String serviceString,
public HttpServletResponse get(@PathParam("service") Service service,
@PathParam("name") String name,
@PathParam("identifier") String identifier,
@QueryParam("filepath") String filepath,
@QueryParam("rebuild") boolean rebuild) {
Security.checkApiCallAllowed(request);
return this.download(serviceString, name, identifier, filepath, rebuild);
return this.download(service, name, identifier, filepath, rebuild);
}
@POST
@ -504,13 +504,12 @@ public class ArbitraryResource {
}
}
private HttpServletResponse download(String serviceString, String name, String identifier, String filepath, boolean rebuild) {
private HttpServletResponse download(Service service, String name, String identifier, String filepath, boolean rebuild) {
if (filepath == null) {
throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.INVALID_CRITERIA, "Missing filepath");
}
Service service = Service.valueOf(serviceString);
ArbitraryDataReader arbitraryDataReader = new ArbitraryDataReader(name, ArbitraryDataFile.ResourceIdType.NAME, service, identifier);
try {