Update:

1. Address PR comments, moved new kotlin files to 'common4j/src/main/com/microsoft/identity/common/java/' to keep it consistent with rest of kotlin file location.

Author: prsaminathan

common/src/main/java/com/microsoft/identity/common/internal/result/MsalBrokerResultAdapter.java

@@ -60,7 +60,7 @@
 import com.microsoft.identity.common.internal.request.AuthenticationSchemeTypeAdapter;
 import com.microsoft.identity.common.internal.util.GzipUtil;
 import com.microsoft.identity.common.java.authorities.AzureActiveDirectoryAudience;
-import com.microsoft.identity.common.kotlin.broker.BrokerPerformanceMetrics;
+import com.microsoft.identity.common.java.broker.BrokerPerformanceMetrics;
 import com.microsoft.identity.common.java.cache.CacheRecord;
 import com.microsoft.identity.common.java.cache.ICacheRecord;
 import com.microsoft.identity.common.java.commands.AcquirePrtSsoTokenBatchResult;

…otlin/broker/BrokerPerformanceMetrics.kt …/java/broker/BrokerPerformanceMetrics.ktcommon4j/src/main/com/microsoft/identity/common/kotlin/broker/BrokerPerformanceMetrics.kt renamed to common4j/src/main/com/microsoft/identity/common/java/broker/BrokerPerformanceMetrics.kt common4j/src/main/com/microsoft/identity/common/kotlin/broker/BrokerPerformanceMetrics.kt renamed to common4j/src/main/com/microsoft/identity/common/java/broker/BrokerPerformanceMetrics.kt

@@ -1,26 +1,4 @@
-// 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.kotlin.broker
+package com.microsoft.identity.common.java.broker
 
 import com.microsoft.identity.common.java.logging.Logger
 

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

@@ -0,0 +1,5 @@
+package com.microsoft.identity.common.java.broker
+
+interface IBrokerPerformanceMetricsProvider {
+    var brokerPerformanceMetrics: BrokerPerformanceMetrics
+}

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

@@ -26,8 +26,8 @@
 import com.microsoft.identity.common.java.telemetry.Telemetry;
 import com.microsoft.identity.common.java.telemetry.events.ErrorEvent;
 import com.microsoft.identity.common.java.util.StringUtil;
-import com.microsoft.identity.common.kotlin.broker.BrokerPerformanceMetrics;
-import com.microsoft.identity.common.kotlin.broker.IBrokerPerformanceMetricsProvider;
+import com.microsoft.identity.common.java.broker.BrokerPerformanceMetrics;
+import com.microsoft.identity.common.java.broker.IBrokerPerformanceMetricsProvider;
 
 import java.util.ArrayList;
 import java.util.Arrays;

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

@@ -25,11 +25,8 @@
 import com.microsoft.identity.common.java.WarningType;
 import com.microsoft.identity.common.java.providers.oauth2.TokenResult;
 import com.microsoft.identity.common.java.providers.oauth2.AuthorizationResult;
-import com.microsoft.identity.common.java.result.ILocalAuthenticationResult;
-import com.microsoft.identity.common.kotlin.broker.BrokerPerformanceMetrics;
-import com.microsoft.identity.common.kotlin.broker.IBrokerPerformanceMetricsProvider;
-
-import javax.annotation.Nullable;
+import com.microsoft.identity.common.java.broker.BrokerPerformanceMetrics;
+import com.microsoft.identity.common.java.broker.IBrokerPerformanceMetricsProvider;
 
 public class AcquireTokenResult implements IBrokerPerformanceMetricsProvider {