Merge pull request #4 from barnhill/show-proper-headers

Only show certain headers in success cases, show errors in headers

Author: barnhill

build.gradle

@@ -45,7 +45,7 @@ test {
 }
 
 dependencies {
-    implementation 'com.pnuema.java:barcode:1.14'
+    implementation 'com.pnuema.java:barcode:1.15'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'

src/main/java/com/pnuema/java/barcode/barcodeapi/controllers/v1/BarcodeController.java

@@ -99,21 +99,24 @@ private ResponseEntity<byte[]> generateBarcode(
 
         //attach debug info to header
         responseHeaders.set("x-barcode-version", barcode.getTitle() + " " + barcode.getVersion());
-        responseHeaders.set("x-encoded-type", typeEnum.name());
-        responseHeaders.set("x-encoded-value",  barcode.getEncodedValue());
-        responseHeaders.set("x-encoding-time", barcode.getEncodingTime() + " ms");
-        responseHeaders.set("x-draw-time",  barcode.getDrawTime() + " ms");
         responseHeaders.set("x-raw-value", barcode.getRawData());
         responseHeaders.set("x-label-font", barcode.getLabelFont().getName());
         responseHeaders.set("x-served-by", getMachineName());
 
         if (exception != null || image == null) {
+            //noinspection DataFlowIssue,UastIncorrectHttpHeaderInspection
+            responseHeaders.set("x-error", exception.getMessage());
             return ResponseEntity
                     .badRequest()
                     .headers(responseHeaders)
                     .body(null);
         }
 
+        responseHeaders.set("x-encoded-type", typeEnum.name());
+        responseHeaders.set("x-encoded-value",  barcode.getEncodedValue());
+        responseHeaders.set("x-encoding-time", barcode.getEncodingTime() + " ms");
+        responseHeaders.set("x-draw-time",  barcode.getDrawTime() + " ms");
+
         return ResponseEntity
                 .ok()
                 .headers(responseHeaders)