replace deprecated ExpressionJsonConverter

Author: NielsCW

src/main/java/com/contentgrid/gateway/runtime/security/jwt/issuer/RuntimeJwtClaimsResolver.java

@@ -5,19 +5,21 @@
 import com.contentgrid.gateway.runtime.web.ContentGridAppRequestWebFilter;
 import com.contentgrid.gateway.security.authority.AuthenticationDetails;
 import com.contentgrid.gateway.security.jwt.issuer.JwtClaimsResolver;
-import com.contentgrid.thunx.encoding.json.ExpressionJsonConverter;
+import com.contentgrid.thunx.encoding.ThunkExpressionEncoder;
+import com.contentgrid.thunx.encoding.json.JsonThunkExpressionCoder;
 import com.contentgrid.thunx.predicates.model.ThunkExpression;
 import com.contentgrid.thunx.spring.security.ReactivePolicyAuthorizationManager;
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.JWTClaimsSet.Builder;
+import java.nio.charset.StandardCharsets;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.oauth2.core.oidc.StandardClaimNames;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
 @RequiredArgsConstructor
 public class RuntimeJwtClaimsResolver implements JwtClaimsResolver {
-    private static final ExpressionJsonConverter thunxExpressionConverter = new ExpressionJsonConverter();
+    private static final ThunkExpressionEncoder thunxExpressionEncoder = new JsonThunkExpressionCoder();
 
     @Override
     public Mono<JWTClaimsSet> resolveAdditionalClaims(ServerWebExchange exchange, AuthenticationDetails authenticationDetails) {
@@ -28,7 +30,7 @@ public Mono<JWTClaimsSet> resolveAdditionalClaims(ServerWebExchange exchange, Au
         var jwtClaimsBuilder = new Builder();
 
         if(abacPolicyPredicate != null) {
-            jwtClaimsBuilder.claim("x-abac-context", thunxExpressionConverter.encode(abacPolicyPredicate));
+            jwtClaimsBuilder.claim("x-abac-context", new String(thunxExpressionEncoder.encode(abacPolicyPredicate), StandardCharsets.UTF_8));
         }
 
         return Mono.just(