[CI] Auto commit changes from spotless

prdoyle · Feb 6, 2025 · 9211e23 · 9211e23
1 parent 0134a93
commit 9211e23
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/...ugin/src/main/java/org/elasticsearch/entitlement/qa/test/RestEntitlementsCheckAction.java b/...ugin/src/main/java/org/elasticsearch/entitlement/qa/test/RestEntitlementsCheckAction.java
@@ -205,12 +205,16 @@ static CheckAction alwaysDenied(CheckedRunnable<Exception> action) {
             entry("symbol_lookup_name", new CheckAction(VersionSpecificNativeChecks::symbolLookupWithName, false, 22)),
             entry("symbol_lookup_path", new CheckAction(VersionSpecificNativeChecks::symbolLookupWithPath, false, 22)),
 
-            entry("java_lang_Thread$setContextClassLoader", forPlugins(RestEntitlementsCheckAction::java_lang_Thread$setContextClassLoader)),
+            entry(
+                "java_lang_Thread$setContextClassLoader",
+                forPlugins(RestEntitlementsCheckAction::java_lang_Thread$setContextClassLoader)
+            ),
             entry("java_lang_Thread$_1", deniedToPlugins(RestEntitlementsCheckAction::java_lang_Thread$_1)),
             entry("java_lang_Thread$_2", deniedToPlugins(RestEntitlementsCheckAction::java_lang_Thread$_2)),
             entry("java_lang_Thread$_3", deniedToPlugins(RestEntitlementsCheckAction::java_lang_Thread$_3)),
             entry("java_lang_Thread$_4", deniedToPlugins(RestEntitlementsCheckAction::java_lang_Thread$_4)),
-            // entry("java_lang_Thread$_5", deniedToPlugins(RestEntitlementsCheckAction::java_lang_Thread$_5)), // This check is not yet active
+            // entry("java_lang_Thread$_5", deniedToPlugins(RestEntitlementsCheckAction::java_lang_Thread$_5)), // This check is not yet
+            // active
             entry("java_lang_Thread$_6", deniedToPlugins(RestEntitlementsCheckAction::java_lang_Thread$_6)),
             entry("java_lang_Thread$_7", deniedToPlugins(RestEntitlementsCheckAction::java_lang_Thread$_7)),
             entry(
@@ -223,10 +227,22 @@ static CheckAction alwaysDenied(CheckedRunnable<Exception> action) {
             ),
             entry("java_lang_ThreadGroup$_1", deniedToPlugins(RestEntitlementsCheckAction::java_lang_ThreadGroup$_1)),
             entry("java_lang_ThreadGroup$_2", deniedToPlugins(RestEntitlementsCheckAction::java_lang_ThreadGroup$_2)),
-            entry("java_util_concurrent_ForkJoinPool$_1", deniedToPlugins(RestEntitlementsCheckAction::java_util_concurrent_ForkJoinPool$_1)),
-            entry("java_util_concurrent_ForkJoinPool$_2", deniedToPlugins(RestEntitlementsCheckAction::java_util_concurrent_ForkJoinPool$_2)),
-            entry("java_util_concurrent_ForkJoinPool$_3", deniedToPlugins(RestEntitlementsCheckAction::java_util_concurrent_ForkJoinPool$_3)),
-            entry("java_util_concurrent_ForkJoinPool$_4", deniedToPlugins(RestEntitlementsCheckAction::java_util_concurrent_ForkJoinPool$_4)),
+            entry(
+                "java_util_concurrent_ForkJoinPool$_1",
+                deniedToPlugins(RestEntitlementsCheckAction::java_util_concurrent_ForkJoinPool$_1)
+            ),
+            entry(
+                "java_util_concurrent_ForkJoinPool$_2",
+                deniedToPlugins(RestEntitlementsCheckAction::java_util_concurrent_ForkJoinPool$_2)
+            ),
+            entry(
+                "java_util_concurrent_ForkJoinPool$_3",
+                deniedToPlugins(RestEntitlementsCheckAction::java_util_concurrent_ForkJoinPool$_3)
+            ),
+            entry(
+                "java_util_concurrent_ForkJoinPool$_4",
+                deniedToPlugins(RestEntitlementsCheckAction::java_util_concurrent_ForkJoinPool$_4)
+            ),
             entry(
                 "java_util_concurrent_ForkJoinPool$DefaultForkJoinWorkerThreadFactory$newThread",
                 deniedToPlugins(RestEntitlementsCheckAction::java_util_concurrent_ForkJoinPool$DefaultForkJoinWorkerThreadFactory$newThread)
@@ -285,7 +301,10 @@ static CheckAction alwaysDenied(CheckedRunnable<Exception> action) {
                 "java_lang_Thread$setUncaughtExceptionHandler",
                 deniedToPlugins(RestEntitlementsCheckAction::java_lang_Thread$setUncaughtExceptionHandler)
             ),
-            entry("java_lang_ThreadGroup$setMaxPriority", deniedToPlugins(RestEntitlementsCheckAction::java_lang_ThreadGroup$setMaxPriority))
+            entry(
+                "java_lang_ThreadGroup$setMaxPriority",
+                deniedToPlugins(RestEntitlementsCheckAction::java_lang_ThreadGroup$setMaxPriority)
+            )
         ),
         getTestEntries(FileCheckActions.class),
         getTestEntries(SpiActions.class),

diff --git a/...entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyManager.java b/...entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyManager.java
@@ -233,7 +233,11 @@ private Optional<String> walkStackForCheckMethodName() {
         // Look up the check$ method to compose an informative error message.
         // This way, we don't need to painstakingly describe every individual global-state change.
         return StackWalker.getInstance()
-            .walk(frames -> frames.map(StackFrame::getMethodName).dropWhile(not(methodName -> methodName.startsWith(InstrumentationService.CHECK_METHOD_PREFIX))).findFirst())
+            .walk(
+                frames -> frames.map(StackFrame::getMethodName)
+                    .dropWhile(not(methodName -> methodName.startsWith(InstrumentationService.CHECK_METHOD_PREFIX)))
+                    .findFirst()
+            )
             .map(this::operationDescription);
     }