External processor should honor $ in usage string

wso2 · Sep 27, 2024 · 2003ea7 · 2003ea7
1 parent cebc399
commit 2003ea7
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/....wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/grpc/ExternalProcessorService.java b/....wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/grpc/ExternalProcessorService.java
@@ -330,6 +330,9 @@ private static Usage extractUsageFromBody(String body, String completionTokenPat
 
             // Extract completion token count
             String[] keysForCompletionTokens = completionTokenPath.split("\\.");
+            if (keysForCompletionTokens.length > 0 && "$".equals(keysForCompletionTokens[0])) {
+                keysForCompletionTokens = Arrays.copyOfRange(keysForCompletionTokens, 1, keysForCompletionTokens.length);
+            }
             JsonNode currentNodeForCompletionToken = null;
             if (rootNode.has(keysForCompletionTokens[0])) {
                 currentNodeForCompletionToken = rootNode.get(keysForCompletionTokens[0]);
@@ -347,6 +350,9 @@ private static Usage extractUsageFromBody(String body, String completionTokenPat
 
             // Extract total token count
             String[] keysForTotalTokens = totalTokenPath.split("\\.");
+            if (keysForTotalTokens.length > 0 && "$".equals(keysForTotalTokens[0])) {
+                keysForTotalTokens = Arrays.copyOfRange(keysForTotalTokens, 1, keysForTotalTokens.length);
+            }
             JsonNode currentNodeForTotalToken = null;
             if (rootNode.has(keysForTotalTokens[0])) {
                 currentNodeForTotalToken = rootNode.get(keysForTotalTokens[0]);