Resolve merge conflicts

Author: Avery-Dunn

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

@@ -9,6 +9,8 @@
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
 import com.azure.json.ReadValueCallback;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -17,19 +19,11 @@
 import java.util.*;
 
 class JsonHelper {
+    private static final Logger LOG = LoggerFactory.getLogger(JsonHelper.class);
 
     private JsonHelper() {
     }
 
-    static <T> T convertJsonToObject(final String json, final Class<T> tClass) {
-        try {
-            return mapper.readValue(json, tClass);
-        } catch (Exception e) {
-            LOG.error(String.format("Error converting JSON string into %s: %s", tClass, e.getMessage()));
-            throw new MsalJsonParsingException(e.getMessage(), AuthenticationErrorCode.INVALID_JSON);
-        }
-    }
-
     static IdToken createIdTokenFromEncodedTokenString(String token) {
         return convertJsonStringToJsonSerializableObject(getTokenPayloadClaims(token), IdToken::fromJson);
     }

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

@@ -638,8 +638,6 @@ void managedIdentityTest_WithClaims(ManagedIdentitySourceType source, String end
         // Clear caching to avoid cross test pollution.
         miApp.tokenCache().accessTokens.clear();
 
-        String claimsJson = "{\"default\":\"claim\"}";
-
         // First call, get the token from the identity provider.
         IAuthenticationResult result = miApp.acquireTokenForManagedIdentity(
             ManagedIdentityParameters.builder(resource)
@@ -659,7 +657,7 @@ void managedIdentityTest_WithClaims(ManagedIdentitySourceType source, String end
         // Third call, when claims are passed bypass the cache.
         result = miApp.acquireTokenForManagedIdentity(
                 ManagedIdentityParameters.builder(resource)
-                        .claims(claimsJson)
+                        .claims(TestConfiguration.CLAIMS_REQUEST)
                         .build()).get();
 
         assertNotNull(result.accessToken());
@@ -689,7 +687,6 @@ void managedIdentity_ClaimsAndCapabilities(ManagedIdentitySourceType source, Str
         // Clear caching to avoid cross test pollution.
         miApp.tokenCache().accessTokens.clear();
 
-        String claimsJson = "{\"default\":\"claim\"}";
         // First call, get the token from the identity provider.
         IAuthenticationResult result = miApp.acquireTokenForManagedIdentity(
                 ManagedIdentityParameters.builder(resource)
@@ -709,7 +706,7 @@ void managedIdentity_ClaimsAndCapabilities(ManagedIdentitySourceType source, Str
         // Third call, when claims are passed bypass the cache.
         result = miApp.acquireTokenForManagedIdentity(
                 ManagedIdentityParameters.builder(resource)
-                        .claims(claimsJson)
+                        .claims(TestConfiguration.CLAIMS_REQUEST)
                         .build()).get();
 
         assertNotNull(result.accessToken());