add type parameters to fix compilation
Original commit: elastic/x-pack-elasticsearch@0a8a16f9a0
This commit is contained in:
parent
c34598a3cd
commit
0a7b4257f5
|
@ -109,16 +109,16 @@ public class IndicesAccessControlTests extends ESTestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testMergeNotGrantedAndGranted() {
|
public void testMergeNotGrantedAndGranted() {
|
||||||
final Set<String> notGrantedFields = randomFrom(null, Collections.emptySet(), Collections.singleton("baz"));
|
final Set<String> notGrantedFields = randomFrom(null, Collections.<String>emptySet(), Collections.singleton("baz"));
|
||||||
final Set<BytesReference> notGrantedQueries = randomFrom(null, Collections.emptySet(),
|
final Set<BytesReference> notGrantedQueries = randomFrom(null, Collections.<BytesReference>emptySet(),
|
||||||
Collections.singleton(new BytesArray(new byte[] { randomByte() })));
|
Collections.<BytesReference>singleton(new BytesArray(new byte[] { randomByte() })));
|
||||||
final IndexAccessControl indexAccessControl = new IndexAccessControl(false, notGrantedFields, notGrantedQueries);
|
final IndexAccessControl indexAccessControl = new IndexAccessControl(false, notGrantedFields, notGrantedQueries);
|
||||||
|
|
||||||
final BytesReference query1 = new BytesArray(new byte[] { 0x1 });
|
final BytesReference query1 = new BytesArray(new byte[] { 0x1 });
|
||||||
final Set<String> fields =
|
final Set<String> fields =
|
||||||
randomFrom(null, Collections.singleton("foo"), Sets.newHashSet("foo", "bar"), Collections.emptySet());
|
randomFrom(null, Collections.singleton("foo"), Sets.newHashSet("foo", "bar"), Collections.<String>emptySet());
|
||||||
final Set<BytesReference> queries =
|
final Set<BytesReference> queries =
|
||||||
randomFrom(null, Collections.singleton(query1), Collections.emptySet());
|
randomFrom(null, Collections.singleton(query1), Collections.<BytesReference>emptySet());
|
||||||
final IndexAccessControl other = new IndexAccessControl(true, fields, queries);
|
final IndexAccessControl other = new IndexAccessControl(true, fields, queries);
|
||||||
|
|
||||||
IndexAccessControl merged = indexAccessControl.merge(other);
|
IndexAccessControl merged = indexAccessControl.merge(other);
|
||||||
|
@ -133,16 +133,16 @@ public class IndicesAccessControlTests extends ESTestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testMergeNotGranted() {
|
public void testMergeNotGranted() {
|
||||||
final Set<String> notGrantedFields = randomFrom(null, Collections.emptySet(), Collections.singleton("baz"));
|
final Set<String> notGrantedFields = randomFrom(null, Collections.<String>emptySet(), Collections.singleton("baz"));
|
||||||
final Set<BytesReference> notGrantedQueries = randomFrom(null, Collections.emptySet(),
|
final Set<BytesReference> notGrantedQueries = randomFrom(null, Collections.<BytesReference>emptySet(),
|
||||||
Collections.singleton(new BytesArray(new byte[] { randomByte() })));
|
Collections.singleton(new BytesArray(new byte[] { randomByte() })));
|
||||||
final IndexAccessControl indexAccessControl = new IndexAccessControl(false, notGrantedFields, notGrantedQueries);
|
final IndexAccessControl indexAccessControl = new IndexAccessControl(false, notGrantedFields, notGrantedQueries);
|
||||||
|
|
||||||
final BytesReference query1 = new BytesArray(new byte[] { 0x1 });
|
final BytesReference query1 = new BytesArray(new byte[] { 0x1 });
|
||||||
final Set<String> fields =
|
final Set<String> fields =
|
||||||
randomFrom(null, Collections.singleton("foo"), Sets.newHashSet("foo", "bar"), Collections.emptySet());
|
randomFrom(null, Collections.singleton("foo"), Sets.newHashSet("foo", "bar"), Collections.<String>emptySet());
|
||||||
final Set<BytesReference> queries =
|
final Set<BytesReference> queries =
|
||||||
randomFrom(null, Collections.singleton(query1), Collections.emptySet());
|
randomFrom(null, Collections.singleton(query1), Collections.<BytesReference>emptySet());
|
||||||
final IndexAccessControl other = new IndexAccessControl(false, fields, queries);
|
final IndexAccessControl other = new IndexAccessControl(false, fields, queries);
|
||||||
|
|
||||||
IndexAccessControl merged = indexAccessControl.merge(other);
|
IndexAccessControl merged = indexAccessControl.merge(other);
|
||||||
|
|
Loading…
Reference in New Issue