Skip to content

Commit

Permalink
[CI] Auto commit changes from spotless
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticsearchmachine committed Jan 15, 2025
1 parent 696f6c8 commit 2665be2
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -267,16 +267,24 @@ public interface EntitlementChecker {
//

void check$java_util_Scanner$(Class<?> callerClass, File source);

void check$java_util_Scanner$(Class<?> callerClass, File source, String charsetName);

void check$java_util_Scanner$(Class<?> callerClass, File source, Charset charset);

void check$java_util_Scanner$(Class<?> callerClass, File source, CharsetDecoder charsetDecoder);

void check$java_io_FileOutputStream$(Class<?> callerClass, String name);

void check$java_io_FileOutputStream$(Class<?> callerClass, String name, boolean append);

void check$java_io_FileOutputStream$(Class<?> callerClass, File file);

void check$java_io_FileOutputStream$(Class<?> callerClass, File file, boolean append);

void check$java_io_FileOutputStream$(Class<?> callerClass, FileDescriptor fdObj);

void check$java_nio_file_Files$newInputStream(Class<?> callerClass, Path path, OpenOption... options);

void check$java_nio_file_Files$newOutputStream(Class<?> callerClass, Path path, OpenOption... options);
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
package org.elasticsearch.entitlement.runtime.policy;

import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,12 @@ record ModuleEntitlements(Map<Class<? extends Entitlement>, List<Entitlement>> e
public static ModuleEntitlements from(List<Entitlement> entitlements) {
var fileEntitlements = entitlements.stream()
.filter(e -> e.getClass().equals(FileEntitlement.class))
.map(e -> (FileEntitlement) e).toList();
return new ModuleEntitlements(entitlements.stream().collect(groupingBy(Entitlement::getClass)), new FileAccessTree(fileEntitlements));
.map(e -> (FileEntitlement) e)
.toList();
return new ModuleEntitlements(
entitlements.stream().collect(groupingBy(Entitlement::getClass)),
new FileAccessTree(fileEntitlements)
);
}

public boolean hasEntitlement(Class<? extends Entitlement> entitlementClass) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ private static Path path(String s) {
}

public void testEmpty() {
var tree = new FileAccessTree(List.of());
assertThat(tree.canRead(path("path")), is(false));
assertThat(tree.canWrite(path("path")), is(false));
var tree = new FileAccessTree(List.of());
assertThat(tree.canRead(path("path")), is(false));
assertThat(tree.canWrite(path("path")), is(false));
}

public void testRead() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@

import static java.util.Map.entry;
import static org.elasticsearch.entitlement.runtime.policy.PolicyManager.ALL_UNNAMED;
import static org.elasticsearch.test.LambdaMatchers.transformedMatch;
import static org.hamcrest.Matchers.aMapWithSize;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.sameInstance;

Expand Down

0 comments on commit 2665be2

Please sign in to comment.