File tree Expand file tree Collapse file tree 2 files changed +9
-6
lines changed
main/java/org/elasticsearch/entitlement/runtime/policy
test/java/org/elasticsearch/entitlement/runtime/policy Expand file tree Collapse file tree 2 files changed +9
-6
lines changed Original file line number Diff line number Diff line change 2323import java .nio .file .Paths ;
2424import java .util .ArrayList ;
2525import java .util .Arrays ;
26+ import java .util .HashMap ;
2627import java .util .HashSet ;
27- import java .util .LinkedHashMap ;
2828import java .util .List ;
2929import java .util .Map ;
3030import java .util .Objects ;
@@ -55,7 +55,7 @@ public String toString() {
5555 }
5656
5757 static List <ExclusivePath > buildExclusivePathList (List <ExclusiveFileEntitlement > exclusiveFileEntitlements , PathLookup pathLookup ) {
58- Map <String , ExclusivePath > exclusivePaths = new LinkedHashMap <>();
58+ Map <String , ExclusivePath > exclusivePaths = new HashMap <>();
5959 for (ExclusiveFileEntitlement efe : exclusiveFileEntitlements ) {
6060 for (FilesEntitlement .FileData fd : efe .filesEntitlement ().filesData ()) {
6161 if (fd .exclusive ()) {
Original file line number Diff line number Diff line change 3838import static org .elasticsearch .entitlement .runtime .policy .PolicyManager .ALL_UNNAMED ;
3939import static org .elasticsearch .entitlement .runtime .policy .PolicyManager .SERVER_COMPONENT_NAME ;
4040import static org .hamcrest .Matchers .aMapWithSize ;
41- import static org .hamcrest .Matchers .equalTo ;
41+ import static org .hamcrest .Matchers .allOf ;
42+ import static org .hamcrest .Matchers .containsString ;
4243import static org .hamcrest .Matchers .is ;
4344import static org .hamcrest .Matchers .sameInstance ;
4445
@@ -493,9 +494,11 @@ public void testFilesEntitlementsWithExclusive() {
493494 );
494495 assertThat (
495496 iae .getMessage (),
496- equalTo (
497- "Path [/base/test] is already exclusive to [plugin1][test.module1],"
498- + " cannot add exclusive access for [plugin2][test.module2]"
497+ allOf (
498+ containsString ("Path [/base/test] is already exclusive" ),
499+ containsString ("[plugin1][test.module1]" ),
500+ containsString ("[plugin2][test.module2]" ),
501+ containsString ("cannot add exclusive access" )
499502 )
500503 );
501504
You can’t perform that action at this time.
0 commit comments