From 7cca54b195dc45a7dfa550c621121993e8c8a764 Mon Sep 17 00:00:00 2001 From: offa Date: Thu, 21 Oct 2021 09:21:53 +0200 Subject: [PATCH 1/2] Use try-with-resource --- .../plugins/content/JellyScriptContent.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/main/java/hudson/plugins/emailext/plugins/content/JellyScriptContent.java b/src/main/java/hudson/plugins/emailext/plugins/content/JellyScriptContent.java index 175cd7342..33b4efbbe 100644 --- a/src/main/java/hudson/plugins/emailext/plugins/content/JellyScriptContent.java +++ b/src/main/java/hudson/plugins/emailext/plugins/content/JellyScriptContent.java @@ -44,24 +44,14 @@ public JellyScriptContent() { } @Override - public String evaluate(@NonNull Run run, FilePath workspace, @NonNull TaskListener listener, String macroName) throws MacroEvaluationException, IOException, InterruptedException { - InputStream inputStream = null; - - try { - inputStream = getFileInputStream(run, workspace, template, JELLY_EXTENSION); + public String evaluate(@NonNull Run run, FilePath workspace, @NonNull TaskListener listener, String macroName) + throws MacroEvaluationException, IOException, InterruptedException { + try (InputStream inputStream = getFileInputStream(run, workspace, template, JELLY_EXTENSION)) { return renderContent(run, inputStream, listener); } catch (JellyException e) { return "JellyException: " + e.getMessage(); } catch (FileNotFoundException e) { return generateMissingFile("Jelly", template); - } finally { - try { - if (inputStream != null) { - inputStream.close(); - } - } catch (IOException e) { - // ignore - } } } From 4b5a9622b338c77705143f218165867cc274a0d4 Mon Sep 17 00:00:00 2001 From: offa Date: Thu, 21 Oct 2021 09:21:53 +0200 Subject: [PATCH 2/2] Add missing @NonNull annotation --- .../hudson/plugins/emailext/watching/EmailExtWatchAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/hudson/plugins/emailext/watching/EmailExtWatchAction.java b/src/main/java/hudson/plugins/emailext/watching/EmailExtWatchAction.java index 16959e63d..0a1da59d9 100644 --- a/src/main/java/hudson/plugins/emailext/watching/EmailExtWatchAction.java +++ b/src/main/java/hudson/plugins/emailext/watching/EmailExtWatchAction.java @@ -67,7 +67,7 @@ public UserProperty newInstance(User user) { @NonNull @Override - public UserProperty newInstance(StaplerRequest req, JSONObject json) throws FormException { + public UserProperty newInstance(StaplerRequest req, @NonNull JSONObject json) throws FormException { List triggers = req != null ? req.bindJSONToList(EmailTrigger.class, json) : Collections.emptyList(); return new UserProperty(triggers); }