Clean up comments

Author: Avery-Dunn

msal4j-sdk/src/integrationtest/java/com/microsoft/aad/msal4j/AgenticIT.java

@@ -20,12 +20,12 @@
 
 /**
  * Integration tests for agentic (agent identity) scenarios using MSAL Java APIs.
- * Corresponds to .NET's Agentic.cs — tests the MSAL-level APIs for the agent identity flow
+ * Tests the MSAL-level APIs for the agent identity flow
  * (specifically the FMI portions that are available on this branch).
  *
  * <p>These tests use MSAL token acquisition APIs (unlike AgenticRawHttpIT which uses raw HTTP).
  *
- * <p>Test configuration (same as .NET Agentic.cs):
+ * <p>Test configuration:
  * <ul>
  *   <li>Blueprint app: {@link #BLUEPRINT_CLIENT_ID}</li>
  *   <li>Agent app: {@link #AGENT_APP_ID}</li>
@@ -42,7 +42,7 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class AgenticIT {
 
-    // Same config as .NET Agentic.cs
+    // Lab test configuration
     private static final String BLUEPRINT_CLIENT_ID = "aab5089d-e764-47e3-9f28-cc11c2513821";
     private static final String TENANT_ID = "10c419d4-4a50-45b2-aa4e-919fb84df24f";
     private static final String AGENT_APP_ID = "ab18ca07-d139-4840-8b3b-4be9610c6ed5";
@@ -74,8 +74,6 @@ void init() throws KeyStoreException, NoSuchProviderException,
      * This tests Leg 2 of the agent identity flow:
      * 1. Blueprint CCA acquires FMI credential (fmi_path = agentAppId)
      * 2. Agent CCA uses that credential as client_assertion to get Graph token
-     *
-     * Corresponds to .NET's AgentGetsAppTokenForGraphTest.
      */
     @Test
     void agentGetsAppToken_UsingFmiAssertion() throws Exception {

msal4j-sdk/src/integrationtest/java/com/microsoft/aad/msal4j/FmiIT.java

@@ -21,8 +21,7 @@
 
 /**
  * Integration tests for FMI (Federated Managed Identity) support.
- * Corresponds to .NET's FmiIntegrationTests.cs — validates real Entra ID interactions
- * for the FMI token acquisition flows described in the FMI protocol spec v1.0 Section 3.2.
+ * Validates real Entra ID interactions for the FMI token acquisition flows.
  *
  * <p>Test apps are in MSID Lab 4:
  * <ul>
@@ -41,7 +40,7 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class FmiIT {
 
-    // Same configuration as .NET's FmiIntegrationTests.cs
+    // Lab test configuration
     private static final String TENANT_ID = "10c419d4-4a50-45b2-aa4e-919fb84df24f";
     private static final String RMA_CLIENT_ID = "3bf56293-fbb5-42bd-a407-248ba7431a8c";
     private static final String WEB_API_SCOPE = "api://aa464f73-2868-4f67-b0e7-fc2f749e757f/.default";

msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/StringHelper.java

@@ -83,8 +83,8 @@ static boolean isNullOrBlank(final String str) {
 
     /**
      * Computes an extended cache key hash from a sorted map of key-value components.
-     * Uses the same algorithm as MSAL .NET, Go, and Python: concatenate sorted key+value pairs,
-     * SHA-256 hash, then Base64URL encode without padding.
+     * Concatenates sorted key+value pairs, SHA-256 hashes, then Base64URL encodes without padding.
+     * This algorithm is cross-SDK compatible (same output for the same inputs in all MSAL SDKs).
      *
      * @param cacheKeyComponents a sorted map of component names to values
      * @return Base64URL-encoded SHA-256 hash, or empty string if the map is null/empty

msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/TokenCache.java

@@ -340,7 +340,7 @@ private static AccessTokenCacheEntity createAccessTokenCacheEntity(TokenRequestE
     /**
      * Computes the extended cache key hash for a request, if applicable.
      * Currently, this is used for client credential requests with an fmi_path parameter.
-     * The algorithm matches MSAL .NET/Go/Python: sorted key-value concatenation → SHA-256 → Base64URL.
+     * The algorithm uses sorted key-value concatenation → SHA-256 → Base64URL (cross-SDK compatible).
      */
     private static String computeExtCacheKeyHashForRequest(MsalRequest msalRequest) {
         if (msalRequest instanceof ClientCredentialRequest) {

msal4j-sdk/src/test/java/com/microsoft/aad/msal4j/FmiTest.java

@@ -20,15 +20,12 @@
  * Tests for FMI (Federated Managed Identity) support in client credential flows.
  * Covers fmi_path body parameter injection, cache key isolation via ext_cache_key,
  * and assertion context (AssertionRequestOptions) propagation.
- *
- * These tests correspond to MSAL .NET's FmiIntegrationTests (§1-§3) and
- * UserFederatedIdentityCredentialTests (§4-§5) in the AgentIDs_ComponentsReference.
  */
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class FmiTest {
 
     // ========================================================================
-    // §2: fmi_path body parameter
+    // fmi_path body parameter
     // ========================================================================
 
     @Test
@@ -99,7 +96,7 @@ void fmiPath_NotIncludedWhenNull() throws Exception {
     }
 
     // ========================================================================
-    // §3: Cache key isolation (ext_cache_key)
+    // Cache key isolation (ext_cache_key)
     // ========================================================================
 
     @Test
@@ -226,7 +223,7 @@ void fmiPath_CacheDoesNotCollideWithNonFmiTokens() throws Exception {
     }
 
     // ========================================================================
-    // §3: ext_cache_key hash computation
+    // ext_cache_key hash computation
     // ========================================================================
 
     @Test
@@ -236,7 +233,7 @@ void computeExtCacheKeyHash_EmptyMapReturnsEmpty() {
     }
 
     // ========================================================================
-    // §5: Assertion context — AssertionRequestOptions
+    // Assertion context — AssertionRequestOptions
     // ========================================================================
 
     @Test
@@ -374,16 +371,16 @@ void fmiPath_WhitespaceOnlyThrowsIllegalArgumentException() {
     }
 
     // ========================================================================
-    // §3: Exact cache key string validation (cross-SDK compatibility)
+    // Exact cache key string validation (cross-SDK compatibility)
     // ========================================================================
 
     @Test
-    void fmiPath_CacheKeyFormat_MatchesDotNetFormat() throws Exception {
+    void fmiPath_CacheKeyFormat_MatchesCrossSDKFormat() throws Exception {
         // This test verifies that the internal cache key produced by Java uses the correct
         // format: "-{env}-atext-{clientId}-{tenantId}-{scopes}-{hash}"
-        // Using the same fmi_path as .NET's Flow1 test: "SomeFmiPath/FmiCredentialPath"
+        // Using the same fmi_path as other SDKs' integration tests: "SomeFmiPath/FmiCredentialPath"
         // Expected hash (case-sensitive): zm2n0E62zwTsnNsozptLsoOoB_C7i-GfpxHYQQINJUw
-        // The full cache key is lowercased (both .NET and Java do this).
+        // The full cache key is lowercased.
         // Java resolves login.microsoftonline.com → login.windows.net (preferred alias).
         DefaultHttpClient httpClientMock = mock(DefaultHttpClient.class);
 
@@ -430,21 +427,21 @@ void fmiPath_CacheKeyFormat_MatchesDotNetFormat() throws Exception {
 
     @Test
     void fmiPath_HashValueMatchesCrossSDK() {
-        // Verify that the Java hash computation matches .NET for known inputs
+        // Verify that the Java hash computation matches other MSAL SDKs for known inputs
         TreeMap<String, String> components = new TreeMap<>();
         components.put("fmi_path", "SomeFmiPath/FmiCredentialPath");
 
         String hash = StringHelper.computeExtCacheKeyHash(components);
         assertEquals("zm2n0E62zwTsnNsozptLsoOoB_C7i-GfpxHYQQINJUw", hash,
-                "Hash for 'SomeFmiPath/FmiCredentialPath' should match .NET/Go/Python");
+                "Hash for 'SomeFmiPath/FmiCredentialPath' should match cross-SDK value");
 
-        // Second known value from .NET tests
+        // Second known value
         TreeMap<String, String> components2 = new TreeMap<>();
         components2.put("fmi_path", "SomeFmiPath/Path");
 
         String hash2 = StringHelper.computeExtCacheKeyHash(components2);
         assertEquals("7CX57Q63os7benQ6ER0sxgJPtNQSv7TGb5zexcidFoI", hash2,
-                "Hash for 'SomeFmiPath/Path' should match .NET");
+                "Hash for 'SomeFmiPath/Path' should match cross-SDK value");
     }
 
     @Test