Skip to content

Commit 19a2ca2

Browse files
committed
Use java.nio chartsets instead of nimbusds
1 parent b6f54ca commit 19a2ca2

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

msal4j-persistence-extension/src/main/java/com/microsoft/aad/msal4jextensions/PersistenceTokenCacheAccessAspect.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
import com.microsoft.aad.msal4jextensions.persistence.ICacheAccessor;
1010
import com.microsoft.aad.msal4jextensions.persistence.linux.KeyRingAccessor;
1111
import com.microsoft.aad.msal4jextensions.persistence.mac.KeyChainAccessor;
12-
import com.nimbusds.jose.util.StandardCharset;
1312
import com.sun.jna.Platform;
1413
import org.slf4j.Logger;
1514
import org.slf4j.LoggerFactory;
1615

1716
import java.io.File;
1817
import java.io.IOException;
18+
import java.nio.charset.StandardCharsets;
1919
import java.nio.file.Files;
2020

2121
/**
@@ -124,7 +124,7 @@ public void beforeCacheAccess(ITokenCacheAccessContext iTokenCacheAccessContext)
124124
}
125125
byte[] data = cacheAccessor.read();
126126
if (data != null) {
127-
iTokenCacheAccessContext.tokenCache().deserialize(new String(data, StandardCharset.UTF_8));
127+
iTokenCacheAccessContext.tokenCache().deserialize(new String(data, StandardCharsets.UTF_8));
128128
}
129129

130130
updateLastSeenCacheFileModifiedTimestamp();
@@ -141,7 +141,7 @@ public void beforeCacheAccess(ITokenCacheAccessContext iTokenCacheAccessContext)
141141
public void afterCacheAccess(ITokenCacheAccessContext iTokenCacheAccessContext) {
142142
try {
143143
if (isWriteAccess(iTokenCacheAccessContext)) {
144-
cacheAccessor.write(iTokenCacheAccessContext.tokenCache().serialize().getBytes(StandardCharset.UTF_8));
144+
cacheAccessor.write(iTokenCacheAccessContext.tokenCache().serialize().getBytes(StandardCharsets.UTF_8));
145145
updateLastSeenCacheFileModifiedTimestamp();
146146
}
147147
} finally {

msal4j-persistence-extension/src/main/java/com/microsoft/aad/msal4jextensions/persistence/linux/KeyRingAccessor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import com.microsoft.aad.msal4jextensions.persistence.CacheFileAccessor;
77
import com.microsoft.aad.msal4jextensions.persistence.ICacheAccessor;
8-
import com.nimbusds.jose.util.StandardCharset;
98
import com.sun.jna.Pointer;
109

1110
import java.io.IOException;
@@ -57,7 +56,7 @@ public void verify() {
5756

5857
byte[] readData = read(testAttributeValue1, testAttributeValue2);
5958

60-
if (readData == null || !testData.equals(new String(readData, StandardCharset.UTF_8))) {
59+
if (readData == null || !testData.equals(new String(readData, StandardCharsets.UTF_8))) {
6160
throw new KeyRingAccessException("An error while validating KeyRing availability");
6261
}
6362

0 commit comments

Comments
 (0)