diff --git a/src/main/java/org/qortal/api/resource/ArbitraryResource.java b/src/main/java/org/qortal/api/resource/ArbitraryResource.java index 22962d37..9a076c0a 100644 --- a/src/main/java/org/qortal/api/resource/ArbitraryResource.java +++ b/src/main/java/org/qortal/api/resource/ArbitraryResource.java @@ -296,78 +296,6 @@ public class ArbitraryResource { return this.upload(null, Service.valueOf(serviceString), name, null, path); } - @PUT - @Path("/{service}/{name}") - @Operation( - summary = "Build raw, unsigned, ARBITRARY transaction, based on a user-supplied path, using the PUT method", - description = "A PUT transaction replaces the data held for this name and service in its entirety.", - requestBody = @RequestBody( - required = true, - content = @Content( - mediaType = MediaType.TEXT_PLAIN, - schema = @Schema( - type = "string", example = "/Users/user/Documents/MyDirectoryOrFile" - ) - ) - ), - responses = { - @ApiResponse( - description = "raw, unsigned, ARBITRARY transaction encoded in Base58", - content = @Content( - mediaType = MediaType.TEXT_PLAIN, - schema = @Schema( - type = "string" - ) - ) - ) - } - ) - @SecurityRequirement(name = "apiKey") - public String put(@PathParam("service") String serviceString, - @PathParam("name") String name, - String path) { - Security.checkApiCallAllowed(request); - - return this.upload(Method.PUT, Service.valueOf(serviceString), name, null, path); - } - - @PATCH - @Path("/{service}/{name}") - @Operation( - summary = "Build raw, unsigned, ARBITRARY transaction, based on a user-supplied path, using the PATCH method", - description = "A PATCH transaction calculates the delta between the current state on the on-chain state, " + - "and then publishes only the differences.", - requestBody = @RequestBody( - required = true, - content = @Content( - mediaType = MediaType.TEXT_PLAIN, - schema = @Schema( - type = "string", example = "/Users/user/Documents/MyDirectoryOrFile" - ) - ) - ), - responses = { - @ApiResponse( - description = "raw, unsigned, ARBITRARY transaction encoded in Base58", - content = @Content( - mediaType = MediaType.TEXT_PLAIN, - schema = @Schema( - type = "string" - ) - ) - ) - } - ) - @SecurityRequirement(name = "apiKey") - public String patch(@PathParam("service") String serviceString, - @PathParam("name") String name, - String path) { - Security.checkApiCallAllowed(request); - - return this.upload(Method.PATCH, Service.valueOf(serviceString), name, null, path); - } - - @POST @Path("/{service}/{name}/{identifier}") @Operation( @@ -404,80 +332,6 @@ public class ArbitraryResource { return this.upload(null, Service.valueOf(serviceString), name, identifier, path); } - @PUT - @Path("/{service}/{name}/{identifier}") - @Operation( - summary = "Build raw, unsigned, ARBITRARY transaction, based on a user-supplied path, using the PUT method", - description = "A PUT transaction replaces the data held for this name and service in its entirety.", - requestBody = @RequestBody( - required = true, - content = @Content( - mediaType = MediaType.TEXT_PLAIN, - schema = @Schema( - type = "string", example = "/Users/user/Documents/MyDirectoryOrFile" - ) - ) - ), - responses = { - @ApiResponse( - description = "raw, unsigned, ARBITRARY transaction encoded in Base58", - content = @Content( - mediaType = MediaType.TEXT_PLAIN, - schema = @Schema( - type = "string" - ) - ) - ) - } - ) - @SecurityRequirement(name = "apiKey") - public String put(@PathParam("service") String serviceString, - @PathParam("name") String name, - @PathParam("identifier") String identifier, - String path) { - Security.checkApiCallAllowed(request); - - return this.upload(Method.PUT, Service.valueOf(serviceString), name, identifier, path); - } - - @PATCH - @Path("/{service}/{name}/{identifier}") - @Operation( - summary = "Build raw, unsigned, ARBITRARY transaction, based on a user-supplied path, using the PATCH method", - description = "A PATCH transaction calculates the delta between the current state on the on-chain state, " + - "and then publishes only the differences.", - requestBody = @RequestBody( - required = true, - content = @Content( - mediaType = MediaType.TEXT_PLAIN, - schema = @Schema( - type = "string", example = "/Users/user/Documents/MyDirectoryOrFile" - ) - ) - ), - responses = { - @ApiResponse( - description = "raw, unsigned, ARBITRARY transaction encoded in Base58", - content = @Content( - mediaType = MediaType.TEXT_PLAIN, - schema = @Schema( - type = "string" - ) - ) - ) - } - ) - @SecurityRequirement(name = "apiKey") - public String patch(@PathParam("service") String serviceString, - @PathParam("name") String name, - @PathParam("identifier") String identifier, - String path) { - Security.checkApiCallAllowed(request); - - return this.upload(Method.PATCH, Service.valueOf(serviceString), name, identifier, path); - } - - private String upload(Method method, Service service, String name, String identifier, String path) { // Fetch public key from registered name try (final Repository repository = RepositoryManager.getRepository()) { diff --git a/tools/qdata b/tools/qdata index 04450852..55e69f30 100755 --- a/tools/qdata +++ b/tools/qdata @@ -8,7 +8,7 @@ if [ -z "$*" ]; then echo "Usage:" echo echo "Host/update data:" - echo "qdata [POST/PUT/PATCH] [service] [name] [dirpath] " + echo "qdata POST [service] [name] [dirpath] " echo echo "Fetch data:" echo "qdata GET [service] [name] " @@ -36,7 +36,7 @@ if [ -z "${name}" ]; then fi -if [[ "${method}" == "POST" || "${method}" == "PUT" || "${method}" == "PATCH" ]]; then +if [[ "${method}" == "POST" ]]; then directory=$4 identifier=$5