Remove headers if not set by developer

Author: sgonzalezMSFT

src/main/java/com/microsoft/aad/msal4j/HttpHeaders.java

@@ -52,14 +52,20 @@ private String initHeaderMap() {
             headerMap.put(key, val);
             sb.append(key).append("=").append(val).append(";");
         };
+
         init.accept(PRODUCT_HEADER_NAME, PRODUCT_HEADER_VALUE);
         init.accept(PRODUCT_VERSION_HEADER_NAME, PRODUCT_VERSION_HEADER_VALUE);
         init.accept(OS_HEADER_NAME, OS_HEADER_VALUE);
         init.accept(CPU_HEADER_NAME, CPU_HEADER_VALUE);
         init.accept(REQUEST_CORRELATION_ID_IN_RESPONSE_HEADER_NAME, REQUEST_CORRELATION_ID_IN_RESPONSE_HEADER_VALUE);
         init.accept(CORRELATION_ID_HEADER_NAME, this.correlationIdHeaderValue);
-        init.accept(APPLICATION_NAME_HEADER_NAME, this.applicationNameHeaderValue);
-        init.accept(APPLICATION_VERSION_HEADER_NAME, this.applicationVersionHeaderValue);
+
+        if(!StringHelper.isBlank(this.applicationNameHeaderValue)){
+            init.accept(APPLICATION_NAME_HEADER_NAME, this.applicationNameHeaderValue);
+        }
+        if(!StringHelper.isBlank(this.applicationVersionHeaderValue)){
+            init.accept(APPLICATION_VERSION_HEADER_NAME, this.applicationVersionHeaderValue);
+        }
 
         return sb.toString();
     }

src/main/java/com/microsoft/aad/msal4j/RequestContext.java

@@ -26,22 +26,16 @@ public RequestContext(ClientApplicationBase clientApplication, PublicApi publicA
         this.clientId = StringHelper.isBlank(clientApplication.clientId()) ?
                 "unset_client_id" :
                 clientApplication.clientId();
-        this.applicationName = StringHelper.isBlank(clientApplication.applicationName()) ?
-                "" :
-                clientApplication.applicationName();
-
-        this.applicationVersion = StringHelper.isBlank(clientApplication.applicationVersion()) ?
-                "" :
-                clientApplication.applicationVersion();
-
         this.correlationId = StringHelper.isBlank(clientApplication.correlationId()) ?
                 generateNewCorrelationId() :
                 clientApplication.correlationId();
 
+        this.applicationVersion = clientApplication.applicationVersion();
+        this.applicationName = clientApplication.applicationName();
         this.publicApi = publicApi;
     }
 
-    static String generateNewCorrelationId(){
+    private static String generateNewCorrelationId(){
         return UUID.randomUUID().toString();
     }
 }

src/test/java/com/microsoft/aad/msal4j/HttpHeaderTest.java

@@ -53,8 +53,8 @@ public void testHttpHeaderConstructor_valuesNotSet(){
         Assert.assertEquals(httpHeaderMap.get("x-client-VER"), "1.0");
         Assert.assertEquals(httpHeaderMap.get("x-client-CPU"), System.getProperty("os.arch"));
         Assert.assertEquals(httpHeaderMap.get("x-client-OS"), System.getProperty("os.name"));
-        Assert.assertEquals(httpHeaderMap.get("x-app-name"), "");
-        Assert.assertEquals(httpHeaderMap.get("x-app-ver"), "");
+        Assert.assertNull(httpHeaderMap.get("x-app-name"));
+        Assert.assertNull(httpHeaderMap.get("x-app-ver"));
         Assert.assertNotNull(httpHeaderMap.get("client-request-id"));
     }
 }