Update:

1. Addressed PR comments.

Author: prsaminathan

common4j/src/main/com/microsoft/identity/common/java/broker/BrokerPerformanceMetrics.kt

@@ -1,3 +1,25 @@
+//  Copyright (c) Microsoft Corporation.
+//  All rights reserved.
+//
+//  This code is licensed under the MIT License.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files(the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions :
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
 package com.microsoft.identity.common.java.broker
 
 import com.microsoft.identity.common.java.logging.Logger
@@ -53,22 +75,5 @@ class BrokerPerformanceMetrics(
 
     companion object {
         private val TAG = BrokerPerformanceMetrics::class.java.simpleName
-
-
-        /**
-         * A safe default instance used when no real metrics are available.
-         * Ensures non-null contract for Java callers.
-         *
-         * @param brokerRequestReceivedTimestamp Current time as placeholder.
-         * @param brokerResponseGenerationTimestamp Current time as placeholder.
-         */
-        @JvmField
-        var EMPTY = run {
-            val now = System.currentTimeMillis()
-            BrokerPerformanceMetrics(
-                brokerRequestReceivedTimestamp = now,
-                brokerResponseGenerationTimestamp = now
-            )
-        }
     }
 }

common4j/src/main/com/microsoft/identity/common/java/broker/IBrokerPerformanceMetricsProvider.kt

@@ -1,5 +1,27 @@
+//  Copyright (c) Microsoft Corporation.
+//  All rights reserved.
+//
+//  This code is licensed under the MIT License.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files(the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions :
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
 package com.microsoft.identity.common.java.broker
 
 interface IBrokerPerformanceMetricsProvider {
-    var brokerPerformanceMetrics: BrokerPerformanceMetrics
+    var brokerPerformanceMetrics: BrokerPerformanceMetrics?
 }

common4j/src/main/com/microsoft/identity/common/java/exception/BaseException.java

@@ -221,13 +221,11 @@ public String getUsername() {
     }
 
     public void setBrokerPerformanceMetrics(final BrokerPerformanceMetrics brokerPerformanceMetrics) {
-        this.mBrokerPerformanceMetrics = brokerPerformanceMetrics != null ?
-                brokerPerformanceMetrics : BrokerPerformanceMetrics.EMPTY;
+        this.mBrokerPerformanceMetrics = brokerPerformanceMetrics;
     }
 
     public BrokerPerformanceMetrics getBrokerPerformanceMetrics() {
-        return this.mBrokerPerformanceMetrics != null ?
-                mBrokerPerformanceMetrics : BrokerPerformanceMetrics.EMPTY;
+        return this.mBrokerPerformanceMetrics;
     }
 
     public void setUsername(@Nullable final String username) {

common4j/src/main/com/microsoft/identity/common/java/result/AcquireTokenResult.java

@@ -58,13 +58,11 @@ public void setTokenResult(TokenResult tokenResult) {
     }
 
     public void setBrokerPerformanceMetrics(BrokerPerformanceMetrics brokerPerformanceMetrics) {
-        this.mBrokerPerformanceMetrics = brokerPerformanceMetrics != null ?
-                brokerPerformanceMetrics : BrokerPerformanceMetrics.EMPTY;
+        this.mBrokerPerformanceMetrics = brokerPerformanceMetrics;
     }
 
     public BrokerPerformanceMetrics getBrokerPerformanceMetrics() {
-        return this.mBrokerPerformanceMetrics != null ?
-                mBrokerPerformanceMetrics : BrokerPerformanceMetrics.EMPTY;
+        return this.mBrokerPerformanceMetrics;
     }
 
     // Suppressing rawtype warnings due to the generic type AuthorizationResult