Merge pull request #4 from AustEcon/master

bitcoin-sv · Feb 4, 2022 · 4b05ddf · 4b05ddf
2 parents 3ed8002 + 508062a
commit 4b05ddf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/README.MD b/README.MD
@@ -68,14 +68,14 @@ Retrieves the header with the given hash
 ```
 /api/v1/chain/header/{hash}
 ```
-The content type: ```application/octet-stream``` can be provided in the requst header to return the headers raw bytes.
+The Accept type: ```application/octet-stream``` can be provided in the request header to return the headers raw bytes.
 
 #### Query Headers By Height (batched)
 Retrieves the header with the given hash
 ```
 /api/v1/chain/header/byHeight?height=<start_height>&count=<count>
 ```
-The Accept type: ```application/octet-stream``` can be provided in the requst header to return the headers as a 
+The Accept type: ```application/octet-stream``` can be provided in the request header to return the headers as a 
 stream of raw bytes.
 
 The query parameter: height is required. The count of headers requested is optional (default = 1)

diff --git a/src/main/java/io/bitcoinsv/headerSV/api/v1/controller/BlockHeaderControllerV1.java b/src/main/java/io/bitcoinsv/headerSV/api/v1/controller/BlockHeaderControllerV1.java
@@ -32,26 +32,23 @@ public BlockHeaderControllerV1(HSVFacade blockChainFacade) {
 
     @RequestMapping("/{hash}")
     public ResponseEntity<?> getHeader(@PathVariable String hash,
-                                       @RequestHeader(value = "Accept", required = false, defaultValue = "application/json") MediaType acceptContentType) {
+                                       @RequestHeader(value = "Accept", required = false, defaultValue = "application/json") String acceptContentType) {
         BlockHeaderDTO blockHeaderDTO = hsvFacade.getBlockHeader(hash);
 
         if (blockHeaderDTO == null) {
             throw new ResponseStatusException(HttpStatus.NO_CONTENT, "BlockHeader not found");
         }
 
-        switch (acceptContentType.toString()) {
-            case MediaType.APPLICATION_OCTET_STREAM_VALUE:
-                return ResponseEntity
-                        .ok()
-                        .contentType(MediaType.APPLICATION_OCTET_STREAM)
-                        .body(blockHeaderDTO.getHeaderReadOnly().serialize());
-
-            default:
-                return ResponseEntity
-                        .ok()
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .body(blockHeaderDTO);
+        if (MediaType.APPLICATION_OCTET_STREAM_VALUE.equals(acceptContentType)) {
+            return ResponseEntity
+                    .ok()
+                    .contentType(MediaType.APPLICATION_OCTET_STREAM)
+                    .body(blockHeaderDTO.getHeaderReadOnly().serialize());
         }
+        return ResponseEntity
+                .ok()
+                .contentType(MediaType.APPLICATION_JSON)
+                .body(blockHeaderDTO);
     }
 
     @RequestMapping("/{hash}/ancestors")
@@ -67,14 +64,14 @@ public ResponseEntity<?> getAncestors(@PathVariable String hash, @RequestBody St
 
     @RequestMapping("/byHeight")
     public ResponseEntity<?> getHeadersByHeight(@RequestParam String height, @RequestParam(defaultValue = "1") String count,
-                                                @RequestHeader(value = "Accept", required = false, defaultValue = "application/json") MediaType acceptContentType){
+                                                @RequestHeader(value = "Accept", required = false, defaultValue = "application/json") String acceptContentType){
         try {
             if (Integer.parseInt(count) > 2000) {
                 throw new IllegalArgumentException("Count exceeds max value of 2000 headers");
             }
 
             List<BlockHeaderDTO> headers = hsvFacade.getHeadersByHeight(Integer.parseInt(height), Integer.parseInt(count));
-            if (acceptContentType.toString().equals(MediaType.APPLICATION_OCTET_STREAM_VALUE)) {
+            if (acceptContentType.equals(MediaType.APPLICATION_OCTET_STREAM_VALUE)) {
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 for (BlockHeaderDTO header : headers) {
                     baos.write(header.getHeaderReadOnly().serialize());