Skip to content

Commit b14b5a1

Browse files
authored
Reduce warnings in entitlement REST tests (#123028) (#123063)
Backport of a bunch of minor cosmetic changes to reduce warnings.
1 parent 245a3a0 commit b14b5a1

File tree

11 files changed

+113
-132
lines changed

11 files changed

+113
-132
lines changed

libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/DummyImplementations.java

Lines changed: 66 additions & 68 deletions
Large diffs are not rendered by default.

libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/FileCheckActions.java

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import static org.elasticsearch.entitlement.qa.test.EntitlementTest.ExpectedAccess.PLUGINS;
4141

4242
@SuppressForbidden(reason = "Explicitly checking APIs that are forbidden")
43-
@SuppressWarnings("unused") // Called via reflection
43+
@SuppressWarnings({ "unused" /* called via reflection */, "ResultOfMethodCallIgnored" })
4444
class FileCheckActions {
4545

4646
static Path testRootDir = Paths.get(System.getProperty("es.entitlements.testdir"));
@@ -62,17 +62,17 @@ static Path readWriteFile() {
6262
}
6363

6464
@EntitlementTest(expectedAccess = PLUGINS)
65-
static void fileCanExecute() throws IOException {
65+
static void fileCanExecute() {
6666
readFile().toFile().canExecute();
6767
}
6868

6969
@EntitlementTest(expectedAccess = PLUGINS)
70-
static void fileCanRead() throws IOException {
70+
static void fileCanRead() {
7171
readFile().toFile().canRead();
7272
}
7373

7474
@EntitlementTest(expectedAccess = PLUGINS)
75-
static void fileCanWrite() throws IOException {
75+
static void fileCanWrite() {
7676
readFile().toFile().canWrite();
7777
}
7878

@@ -101,68 +101,68 @@ static void fileDeleteOnExit() throws IOException {
101101
}
102102

103103
@EntitlementTest(expectedAccess = PLUGINS)
104-
static void fileExists() throws IOException {
104+
static void fileExists() {
105105
readFile().toFile().exists();
106106
}
107107

108108
@EntitlementTest(expectedAccess = PLUGINS)
109-
static void fileIsDirectory() throws IOException {
109+
static void fileIsDirectory() {
110110
readFile().toFile().isDirectory();
111111
}
112112

113113
@EntitlementTest(expectedAccess = PLUGINS)
114-
static void fileIsFile() throws IOException {
114+
static void fileIsFile() {
115115
readFile().toFile().isFile();
116116
}
117117

118118
@EntitlementTest(expectedAccess = PLUGINS)
119-
static void fileIsHidden() throws IOException {
119+
static void fileIsHidden() {
120120
readFile().toFile().isHidden();
121121
}
122122

123123
@EntitlementTest(expectedAccess = PLUGINS)
124-
static void fileLastModified() throws IOException {
124+
static void fileLastModified() {
125125
readFile().toFile().lastModified();
126126
}
127127

128128
@EntitlementTest(expectedAccess = PLUGINS)
129-
static void fileLength() throws IOException {
129+
static void fileLength() {
130130
readFile().toFile().length();
131131
}
132132

133133
@EntitlementTest(expectedAccess = PLUGINS)
134-
static void fileList() throws IOException {
134+
static void fileList() {
135135
readDir().toFile().list();
136136
}
137137

138138
@EntitlementTest(expectedAccess = PLUGINS)
139-
static void fileListWithFilter() throws IOException {
139+
static void fileListWithFilter() {
140140
readDir().toFile().list((dir, name) -> true);
141141
}
142142

143143
@EntitlementTest(expectedAccess = PLUGINS)
144-
static void fileListFiles() throws IOException {
144+
static void fileListFiles() {
145145
readDir().toFile().listFiles();
146146
}
147147

148148
@EntitlementTest(expectedAccess = PLUGINS)
149-
static void fileListFilesWithFileFilter() throws IOException {
149+
static void fileListFilesWithFileFilter() {
150150
readDir().toFile().listFiles(pathname -> true);
151151
}
152152

153153
@EntitlementTest(expectedAccess = PLUGINS)
154-
static void fileListFilesWithFilenameFilter() throws IOException {
154+
static void fileListFilesWithFilenameFilter() {
155155
readDir().toFile().listFiles((dir, name) -> true);
156156
}
157157

158158
@EntitlementTest(expectedAccess = PLUGINS)
159-
static void fileMkdir() throws IOException {
159+
static void fileMkdir() {
160160
Path mkdir = readWriteDir().resolve("mkdir");
161161
mkdir.toFile().mkdir();
162162
}
163163

164164
@EntitlementTest(expectedAccess = PLUGINS)
165-
static void fileMkdirs() throws IOException {
165+
static void fileMkdirs() {
166166
Path mkdir = readWriteDir().resolve("mkdirs");
167167
mkdir.toFile().mkdirs();
168168
}
@@ -175,27 +175,27 @@ static void fileRenameTo() throws IOException {
175175
}
176176

177177
@EntitlementTest(expectedAccess = PLUGINS)
178-
static void fileSetExecutable() throws IOException {
178+
static void fileSetExecutable() {
179179
readWriteFile().toFile().setExecutable(false);
180180
}
181181

182182
@EntitlementTest(expectedAccess = PLUGINS)
183-
static void fileSetExecutableOwner() throws IOException {
183+
static void fileSetExecutableOwner() {
184184
readWriteFile().toFile().setExecutable(false, false);
185185
}
186186

187187
@EntitlementTest(expectedAccess = PLUGINS)
188-
static void fileSetLastModified() throws IOException {
188+
static void fileSetLastModified() {
189189
readWriteFile().toFile().setLastModified(System.currentTimeMillis());
190190
}
191191

192192
@EntitlementTest(expectedAccess = PLUGINS)
193-
static void fileSetReadable() throws IOException {
193+
static void fileSetReadable() {
194194
readWriteFile().toFile().setReadable(true);
195195
}
196196

197197
@EntitlementTest(expectedAccess = PLUGINS)
198-
static void fileSetReadableOwner() throws IOException {
198+
static void fileSetReadableOwner() {
199199
readWriteFile().toFile().setReadable(true, false);
200200
}
201201

@@ -207,12 +207,12 @@ static void fileSetReadOnly() throws IOException {
207207
}
208208

209209
@EntitlementTest(expectedAccess = PLUGINS)
210-
static void fileSetWritable() throws IOException {
210+
static void fileSetWritable() {
211211
readWriteFile().toFile().setWritable(true);
212212
}
213213

214214
@EntitlementTest(expectedAccess = PLUGINS)
215-
static void fileSetWritableOwner() throws IOException {
215+
static void fileSetWritableOwner() {
216216
readWriteFile().toFile().setWritable(true, false);
217217
}
218218

@@ -363,6 +363,7 @@ static void keystoreGetInstance_FileLoadStoreParameter() throws IOException {
363363
}
364364

365365
@EntitlementTest(expectedAccess = PLUGINS)
366+
@SuppressWarnings("DataFlowIssue") // Passing null to a @NotNull parameter
366367
static void keystoreBuilderNewInstance() {
367368
try {
368369
KeyStore.Builder.newInstance("", null, readFile().toFile(), null);

libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/FileStoreActions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import static org.elasticsearch.entitlement.qa.test.EntitlementTest.ExpectedAccess.ALWAYS_DENIED;
1717
import static org.elasticsearch.entitlement.qa.test.EntitlementTest.ExpectedAccess.SERVER_ONLY;
1818

19+
@SuppressWarnings({ "unused" /* called via reflection */ })
1920
class FileStoreActions {
2021

2122
@EntitlementTest(expectedAccess = ALWAYS_DENIED)

libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/ManageThreadsActions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import static org.elasticsearch.entitlement.qa.test.EntitlementTest.ExpectedAccess.PLUGINS;
1818

1919
@SuppressForbidden(reason = "testing entitlements")
20-
@SuppressWarnings("unused") // used via reflection
20+
@SuppressWarnings({ "unused" /* called via reflaction */, "removal" })
2121
class ManageThreadsActions {
2222
private ManageThreadsActions() {}
2323

libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/NetworkAccessCheckActions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ static void urlOpenConnectionWithProxy() throws URISyntaxException, IOException
8181
assert urlConnection != null;
8282
}
8383

84-
static void createLDAPCertStore() throws NoSuchAlgorithmException {
84+
static void createLDAPCertStore() {
8585
try {
8686
// We pass down null params to provoke a InvalidAlgorithmParameterException
8787
CertStore.getInstance("LDAP", null);

libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/NioChannelsActions.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import static org.elasticsearch.entitlement.qa.test.EntitlementTest.ExpectedAccess.ALWAYS_DENIED;
2424
import static org.elasticsearch.entitlement.qa.test.EntitlementTest.ExpectedAccess.PLUGINS;
2525

26+
@SuppressWarnings({ "unused" /* called via reflection */ })
2627
class NioChannelsActions {
2728

2829
@EntitlementTest(expectedAccess = ALWAYS_DENIED)
@@ -51,7 +52,7 @@ static void fileChannelOpenForReadWithOptions() throws IOException {
5152
}
5253

5354
@EntitlementTest(expectedAccess = ALWAYS_DENIED)
54-
static void createAsynchronousFileChannel() throws IOException {
55+
static void createAsynchronousFileChannel() {
5556
new DummyImplementations.DummyAsynchronousFileChannel().close();
5657
}
5758

libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/NioFileSystemActions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import static org.elasticsearch.entitlement.qa.test.EntitlementTest.ExpectedAccess.PLUGINS;
2828
import static org.elasticsearch.entitlement.qa.test.EntitlementTest.ExpectedAccess.SERVER_ONLY;
2929

30+
@SuppressWarnings({ "unused" /* called via reflection */ })
3031
class NioFileSystemActions {
3132

3233
@EntitlementTest(expectedAccess = SERVER_ONLY)

libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/NioFilesActions.java

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import static org.elasticsearch.entitlement.qa.test.FileCheckActions.readWriteDir;
4040
import static org.elasticsearch.entitlement.qa.test.FileCheckActions.readWriteFile;
4141

42+
@SuppressWarnings({ "unused" /* called via reflection */ })
4243
class NioFilesActions {
4344

4445
@EntitlementTest(expectedAccess = PLUGINS)
@@ -313,52 +314,36 @@ static void checkFilesIsExecutable() {
313314

314315
@EntitlementTest(expectedAccess = PLUGINS)
315316
static void checkFilesWalkFileTree() throws IOException {
316-
Files.walkFileTree(readDir(), new FileVisitor<>() {
317-
@Override
318-
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
319-
return FileVisitResult.SKIP_SUBTREE;
320-
}
321-
322-
@Override
323-
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
324-
return FileVisitResult.SKIP_SUBTREE;
325-
}
326-
327-
@Override
328-
public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
329-
return FileVisitResult.SKIP_SUBTREE;
330-
}
331-
332-
@Override
333-
public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
334-
return FileVisitResult.SKIP_SUBTREE;
335-
}
336-
});
317+
Files.walkFileTree(readDir(), dummyVisitor());
337318
}
338319

339320
@EntitlementTest(expectedAccess = PLUGINS)
340321
static void checkFilesWalkFileTreeWithOptions() throws IOException {
341-
Files.walkFileTree(readDir(), Set.of(FileVisitOption.FOLLOW_LINKS), 2, new FileVisitor<>() {
322+
Files.walkFileTree(readDir(), Set.of(FileVisitOption.FOLLOW_LINKS), 2, dummyVisitor());
323+
}
324+
325+
private static FileVisitor<Path> dummyVisitor() {
326+
return new FileVisitor<>() {
342327
@Override
343-
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
328+
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
344329
return FileVisitResult.SKIP_SUBTREE;
345330
}
346331

347332
@Override
348-
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
333+
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
349334
return FileVisitResult.SKIP_SUBTREE;
350335
}
351336

352337
@Override
353-
public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
338+
public FileVisitResult visitFileFailed(Path file, IOException exc) {
354339
return FileVisitResult.SKIP_SUBTREE;
355340
}
356341

357342
@Override
358-
public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
343+
public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
359344
return FileVisitResult.SKIP_SUBTREE;
360345
}
361-
});
346+
};
362347
}
363348

364349
@EntitlementTest(expectedAccess = PLUGINS)

libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/PathActions.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import static org.elasticsearch.entitlement.qa.test.EntitlementTest.ExpectedAccess.PLUGINS;
1818

19+
@SuppressWarnings({ "unused" /* called via reflection */, "rawtypes" })
1920
class PathActions {
2021

2122
@EntitlementTest(expectedAccess = PLUGINS)
@@ -28,7 +29,6 @@ static void checkToRealPathNoFollow() throws IOException {
2829
FileCheckActions.readFile().toRealPath(LinkOption.NOFOLLOW_LINKS);
2930
}
3031

31-
@SuppressWarnings("rawtypes")
3232
@EntitlementTest(expectedAccess = PLUGINS)
3333
static void checkRegister() throws IOException {
3434
try (var watchService = FileSystems.getDefault().newWatchService()) {
@@ -38,7 +38,6 @@ static void checkRegister() throws IOException {
3838
}
3939
}
4040

41-
@SuppressWarnings("rawtypes")
4241
@EntitlementTest(expectedAccess = PLUGINS)
4342
static void checkRegisterWithModifiers() throws IOException {
4443
try (var watchService = FileSystems.getDefault().newWatchService()) {

libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/SpiActions.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import static org.elasticsearch.entitlement.qa.test.EntitlementTest.ExpectedAccess.ALWAYS_DENIED;
1717

18+
@SuppressWarnings({ "unused" /* called via reflection */ })
1819
class SpiActions {
1920
@EntitlementTest(expectedAccess = ALWAYS_DENIED)
2021
static void createBreakIteratorProvider() {
@@ -78,14 +79,7 @@ static void createLocaleServiceProvider() {
7879

7980
@EntitlementTest(expectedAccess = ALWAYS_DENIED)
8081
static void getInheritedChannel() throws IOException {
81-
Channel channel = null;
82-
try {
83-
channel = SelectorProvider.provider().inheritedChannel();
84-
} finally {
85-
if (channel != null) {
86-
channel.close();
87-
}
88-
}
82+
try (Channel channel = SelectorProvider.provider().inheritedChannel()) {}
8983
}
9084

9185
@EntitlementTest(expectedAccess = ALWAYS_DENIED)

0 commit comments

Comments
 (0)