Skip to content

Commit 45fd95e

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 01e4b7c commit 45fd95e

File tree

3 files changed

+18
-85
lines changed

3 files changed

+18
-85
lines changed

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReader.java‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,8 @@ public final class FieldSubsetReader extends SequentialStoredFieldsLeafReader {
7676
* @param filter fields to filter.
7777
* @param isMapped whether a field is mapped or not.
7878
*/
79-
public static DirectoryReader wrap(
80-
DirectoryReader in,
81-
CharacterRunAutomaton filter,
82-
Function<String, Boolean> isMapped
83-
) throws IOException {
79+
public static DirectoryReader wrap(DirectoryReader in, CharacterRunAutomaton filter, Function<String, Boolean> isMapped)
80+
throws IOException {
8481
return new FieldSubsetDirectoryReader(in, filter, isMapped);
8582
}
8683

@@ -90,11 +87,8 @@ static class FieldSubsetDirectoryReader extends FilterDirectoryReader {
9087
private final CharacterRunAutomaton filter;
9188
private final Function<String, Boolean> isMapped;
9289

93-
FieldSubsetDirectoryReader(
94-
DirectoryReader in,
95-
final CharacterRunAutomaton filter,
96-
Function<String, Boolean> isMapped
97-
) throws IOException {
90+
FieldSubsetDirectoryReader(DirectoryReader in, final CharacterRunAutomaton filter, Function<String, Boolean> isMapped)
91+
throws IOException {
9892
super(in, new FilterDirectoryReader.SubReaderWrapper() {
9993
@Override
10094
public LeafReader wrap(LeafReader reader) {
@@ -148,11 +142,7 @@ public CacheHelper getReaderCacheHelper() {
148142
/**
149143
* Wrap a single segment, exposing a subset of its fields.
150144
*/
151-
FieldSubsetReader(
152-
LeafReader in,
153-
CharacterRunAutomaton filter,
154-
Function<String, Boolean> isMapped
155-
) throws IOException {
145+
FieldSubsetReader(LeafReader in, CharacterRunAutomaton filter, Function<String, Boolean> isMapped) throws IOException {
156146
super(in);
157147
ArrayList<FieldInfo> filteredInfos = new ArrayList<>();
158148
for (FieldInfo fi : in.getFieldInfos()) {

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/permission/FieldPermissions.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -244,16 +244,11 @@ public boolean hasFieldLevelSecurity() {
244244
}
245245

246246
/** Return a wrapped reader that only exposes allowed fields. */
247-
public DirectoryReader filter(DirectoryReader reader, Function<String, Boolean> isMapped)
248-
throws IOException {
247+
public DirectoryReader filter(DirectoryReader reader, Function<String, Boolean> isMapped) throws IOException {
249248
if (hasFieldLevelSecurity() == false) {
250249
return reader;
251250
}
252-
return FieldSubsetReader.wrap(
253-
reader,
254-
permittedFieldsAutomaton,
255-
isMapped
256-
);
251+
return FieldSubsetReader.wrap(reader, permittedFieldsAutomaton, isMapped);
257252
}
258253

259254
Automaton getIncludeAutomaton() {

‎x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReaderTests.java‎

Lines changed: 11 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -744,11 +744,7 @@ public void testSourceFilteringIntegration() throws Exception {
744744

745745
// open reader
746746
Automaton automaton = Automatons.patterns(Arrays.asList("fieldA", SourceFieldMapper.NAME));
747-
DirectoryReader ir = FieldSubsetReader.wrap(
748-
DirectoryReader.open(iw),
749-
new CharacterRunAutomaton(automaton),
750-
(fieldName) -> true
751-
);
747+
DirectoryReader ir = FieldSubsetReader.wrap(DirectoryReader.open(iw), new CharacterRunAutomaton(automaton), (fieldName) -> true);
752748

753749
// see only one field
754750
{
@@ -900,27 +896,15 @@ public void testVisibilityOriginalFieldNames() throws Exception {
900896
// Field a is mapped:
901897

902898
var filter = new CharacterRunAutomaton(Automatons.patterns(List.of("a", "c")));
903-
try (
904-
DirectoryReader ir = FieldSubsetReader.wrap(
905-
DirectoryReader.open(iw),
906-
filter,
907-
(fieldName) -> false
908-
)
909-
) {
899+
try (DirectoryReader ir = FieldSubsetReader.wrap(DirectoryReader.open(iw), filter, (fieldName) -> false)) {
910900

911901
Document fields = ir.storedFields().document(0);
912902
assertEquals(2, fields.getFields().size());
913903
assertEquals(new BytesRef("a"), fields.getBinaryValue("a._original"));
914904
assertEquals(new BytesRef("c"), fields.getBinaryValue("c"));
915905
}
916906
// Field a is not mapped:
917-
try (
918-
DirectoryReader ir = FieldSubsetReader.wrap(
919-
DirectoryReader.open(iw),
920-
filter,
921-
(fieldName) -> true
922-
)
923-
) {
907+
try (DirectoryReader ir = FieldSubsetReader.wrap(DirectoryReader.open(iw), filter, (fieldName) -> true)) {
924908

925909
Document fields = ir.storedFields().document(0);
926910
assertEquals(1, fields.getFields().size());
@@ -929,27 +913,15 @@ public void testVisibilityOriginalFieldNames() throws Exception {
929913
}
930914
// Field b is mapped:
931915
filter = new CharacterRunAutomaton(Automatons.patterns(List.of("b", "c")));
932-
try (
933-
DirectoryReader ir = FieldSubsetReader.wrap(
934-
DirectoryReader.open(iw),
935-
filter,
936-
(fieldName) -> false
937-
)
938-
) {
916+
try (DirectoryReader ir = FieldSubsetReader.wrap(DirectoryReader.open(iw), filter, (fieldName) -> false)) {
939917

940918
Document fields = ir.storedFields().document(0);
941919
assertEquals(2, fields.getFields().size());
942920
assertEquals(new BytesRef("b"), fields.getBinaryValue("b._ignore_malformed"));
943921
assertEquals(new BytesRef("c"), fields.getBinaryValue("c"));
944922
}
945923
// Field b is not mapped:
946-
try (
947-
DirectoryReader ir = FieldSubsetReader.wrap(
948-
DirectoryReader.open(iw),
949-
filter,
950-
(fieldName) -> true
951-
)
952-
) {
924+
try (DirectoryReader ir = FieldSubsetReader.wrap(DirectoryReader.open(iw), filter, (fieldName) -> true)) {
953925

954926
Document fields = ir.storedFields().document(0);
955927
assertEquals(1, fields.getFields().size());
@@ -1122,11 +1094,7 @@ public void testFieldNames() throws Exception {
11221094
Set<String> fields = new HashSet<>();
11231095
fields.add("fieldA");
11241096
Automaton automaton = Automatons.patterns(Arrays.asList("fieldA", FieldNamesFieldMapper.NAME));
1125-
DirectoryReader ir = FieldSubsetReader.wrap(
1126-
DirectoryReader.open(iw),
1127-
new CharacterRunAutomaton(automaton),
1128-
(fieldName) -> false
1129-
);
1097+
DirectoryReader ir = FieldSubsetReader.wrap(DirectoryReader.open(iw), new CharacterRunAutomaton(automaton), (fieldName) -> false);
11301098

11311099
// see only one field
11321100
LeafReader segmentReader = ir.leaves().get(0).reader();
@@ -1184,11 +1152,7 @@ public void testFieldNamesThreeFields() throws Exception {
11841152

11851153
// open reader
11861154
Automaton automaton = Automatons.patterns(Arrays.asList("fieldA", "fieldC", FieldNamesFieldMapper.NAME));
1187-
DirectoryReader ir = FieldSubsetReader.wrap(
1188-
DirectoryReader.open(iw),
1189-
new CharacterRunAutomaton(automaton),
1190-
(fieldName) -> false
1191-
);
1155+
DirectoryReader ir = FieldSubsetReader.wrap(DirectoryReader.open(iw), new CharacterRunAutomaton(automaton), (fieldName) -> false);
11921156

11931157
// see only two fields
11941158
LeafReader segmentReader = ir.leaves().get(0).reader();
@@ -1233,11 +1197,7 @@ public void testFieldNamesMissing() throws Exception {
12331197

12341198
// open reader
12351199
Automaton automaton = Automatons.patterns(Arrays.asList("fieldA", "fieldC", FieldNamesFieldMapper.NAME));
1236-
DirectoryReader ir = FieldSubsetReader.wrap(
1237-
DirectoryReader.open(iw),
1238-
new CharacterRunAutomaton(automaton),
1239-
(fieldName) -> false
1240-
);
1200+
DirectoryReader ir = FieldSubsetReader.wrap(DirectoryReader.open(iw), new CharacterRunAutomaton(automaton), (fieldName) -> false);
12411201

12421202
// see only one field
12431203
LeafReader segmentReader = ir.leaves().get(0).reader();
@@ -1271,11 +1231,7 @@ public void testFieldNamesOldIndex() throws Exception {
12711231

12721232
// open reader
12731233
Automaton automaton = Automatons.patterns(Arrays.asList("fieldA", SourceFieldMapper.NAME));
1274-
DirectoryReader ir = FieldSubsetReader.wrap(
1275-
DirectoryReader.open(iw),
1276-
new CharacterRunAutomaton(automaton),
1277-
(fieldName) -> false
1278-
);
1234+
DirectoryReader ir = FieldSubsetReader.wrap(DirectoryReader.open(iw), new CharacterRunAutomaton(automaton), (fieldName) -> false);
12791235

12801236
// see only one field
12811237
LeafReader segmentReader = ir.leaves().get(0).reader();
@@ -1404,11 +1360,7 @@ public void testWrapTwice() throws Exception {
14041360
);
14051361
IllegalArgumentException e = expectThrows(
14061362
IllegalArgumentException.class,
1407-
() -> FieldSubsetReader.wrap(
1408-
directoryReader,
1409-
new CharacterRunAutomaton(Automata.makeString("fieldA")),
1410-
(fieldName) -> false
1411-
)
1363+
() -> FieldSubsetReader.wrap(directoryReader, new CharacterRunAutomaton(Automata.makeString("fieldA")), (fieldName) -> false)
14121364
);
14131365
assertThat(
14141366
e.getMessage(),
@@ -1594,11 +1546,7 @@ public void testProducesStoredFieldsReader() throws Exception {
15941546

15951547
// open reader
15961548
Automaton automaton = Automatons.patterns(Arrays.asList("fieldA", SourceFieldMapper.NAME));
1597-
DirectoryReader ir = FieldSubsetReader.wrap(
1598-
DirectoryReader.open(iw),
1599-
new CharacterRunAutomaton(automaton),
1600-
(fieldName) -> false
1601-
);
1549+
DirectoryReader ir = FieldSubsetReader.wrap(DirectoryReader.open(iw), new CharacterRunAutomaton(automaton), (fieldName) -> false);
16021550

16031551
TestUtil.checkReader(ir);
16041552
assertThat(ir.leaves().size(), greaterThanOrEqualTo(1));

0 commit comments

Comments
 (0)