From f82f8764cf7501384f8b0eb6c58357817e6ea058 Mon Sep 17 00:00:00 2001
From: dotasek <david.otasek@smilecdr.com>
Date: Fri, 25 Oct 2024 17:01:09 -0400
Subject: [PATCH] Tidy up code

***NO_CI***
---
 .../org/hl7/fhir/utilities/http/ManagedWebAccessBuilder.java  | 4 +---
 .../java/org/hl7/fhir/utilities/http/SimpleHTTPClient.java    | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/http/ManagedWebAccessBuilder.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/http/ManagedWebAccessBuilder.java
index 5a7f376e1..fdb15e7fc 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/http/ManagedWebAccessBuilder.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/http/ManagedWebAccessBuilder.java
@@ -22,8 +22,7 @@ public class ManagedWebAccessBuilder extends ManagedWebAccessBuilderBase<Managed
   }
   
   private Map<String, String> newHeaders() {
-    Map<String, String> headers = new HashMap<String, String>();
-    headers.putAll(this.getHeaders());
+    Map<String, String> headers = new HashMap<String, String>(this.getHeaders());
     if (getAuthenticationMode() == HTTPAuthenticationMode.TOKEN) {
       headers.put("Authorization", "Bearer " + getToken());
     } else if (getAuthenticationMode() == HTTPAuthenticationMode.BASIC) {
@@ -35,7 +34,6 @@ public class ManagedWebAccessBuilder extends ManagedWebAccessBuilderBase<Managed
     if (getUserAgent() != null) {
       headers.put("User-Agent", getUserAgent());
     }
-
     return headers;
   }
 
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/http/SimpleHTTPClient.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/http/SimpleHTTPClient.java
index ed6fa849c..bf35ee906 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/http/SimpleHTTPClient.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/http/SimpleHTTPClient.java
@@ -109,7 +109,7 @@ public class SimpleHTTPClient {
   private void setAuthenticationHeader(HttpURLConnection c) {
     String authHeaderValue = null;
     if (authenticationMode == HTTPAuthenticationMode.TOKEN) {
-      authHeaderValue = "Bearer " + new String(token);
+      authHeaderValue = "Bearer " + token;
     } else if (authenticationMode == HTTPAuthenticationMode.BASIC) {
       String auth = username+":"+password;
       byte[] encodedAuth = Base64.getEncoder().encode(auth.getBytes(StandardCharsets.UTF_8));