[Backport 2.x] [Manual Backport] Bump org.jruby.joni:joni from 2.1.48 to 2.2.1 in /libs/grok (#8015)

CHANGELOG.md

@@ -28,6 +28,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `commons-io:commons-io` from 2.12.0 to 2.13.0 (#8014, #8013, #8010)
 - Bump `com.diffplug.spotless` from 6.18.0 to 6.19.0 (#8007)
 - Bump `'com.azure:azure-storage-blob` to 12.22.2 from 12.21.1 ([#8043](https://github.com/opensearch-project/OpenSearch/pull/8043))
+- Bump `org.jruby.joni:joni` from 2.1.48 to 2.2.1 (#8015)
 
 ### Changed
 - Replace jboss-annotations-api_1.2_spec with jakarta.annotation-api ([#7836](https://github.com/opensearch-project/OpenSearch/pull/7836))

libs/grok/build.gradle

@@ -29,7 +29,7 @@
  */
 
 dependencies {
-  api 'org.jruby.joni:joni:2.1.44'
+  api 'org.jruby.joni:joni:2.2.1'
   // joni dependencies:
   api 'org.jruby.jcodings:jcodings:1.0.58'
 

libs/grok/licenses/joni-2.2.1.jar.sha1

@@ -0,0 +1 @@
+23d2f2eff7fa0cda465d86ec9d8bab53e496d9e6

libs/grok/src/main/java/org/opensearch/grok/Grok.java

@@ -214,8 +214,8 @@ private String groupMatch(String name, Region region, String pattern) {
                 name.getBytes(StandardCharsets.UTF_8).length,
                 region
             );
-            int begin = region.beg[number];
-            int end = region.end[number];
+            int begin = region.getBeg(number);
+            int end = region.getEnd(number);
             return new String(pattern.getBytes(StandardCharsets.UTF_8), begin, end - begin, StandardCharsets.UTF_8);
         } catch (StringIndexOutOfBoundsException e) {
             return null;
@@ -270,7 +270,12 @@ protected String toRegex(String grokPattern) {
                 grokPart = String.format(Locale.US, "(?<%s>%s)", patternName + "_" + result, pattern);
             }
             String start = new String(grokPatternBytes, 0, result, StandardCharsets.UTF_8);
-            String rest = new String(grokPatternBytes, region.end[0], grokPatternBytes.length - region.end[0], StandardCharsets.UTF_8);
+            String rest = new String(
+                grokPatternBytes,
+                region.getEnd(0),
+                grokPatternBytes.length - region.getEnd(0),
+                StandardCharsets.UTF_8
+            );
             grokPattern = grokPart + rest;
             res.append(start);
         }

libs/grok/src/main/java/org/opensearch/grok/GrokCaptureType.java

@@ -105,9 +105,9 @@ protected final GrokCaptureExtracter rawExtracter(int[] backRefs, Consumer<? sup
             @Override
             void extract(byte[] utf8Bytes, int offset, Region region) {
                 for (int number : backRefs) {
-                    if (region.beg[number] >= 0) {
-                        int matchOffset = offset + region.beg[number];
-                        int matchLength = region.end[number] - region.beg[number];
+                    if (region.getBeg(number) >= 0) {
+                        int matchOffset = offset + region.getBeg(number);
+                        int matchLength = region.getEnd(number) - region.getBeg(number);
                         emit.accept(new String(utf8Bytes, matchOffset, matchLength, StandardCharsets.UTF_8));
                         return; // Capture only the first value.
                     }