Merge pull request #362 from offa/dev

Replace some deprecated APIs

Author: jtnord

src/main/java/com/cloudbees/plugins/credentials/ContextMenuIconUtils.java

@@ -28,8 +28,6 @@
 import hudson.Functions;
 import hudson.model.Action;
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import jenkins.model.ModelObjectWithContextMenu;
 import org.apache.commons.jelly.JellyContext;
 import org.apache.commons.lang.StringUtils;

src/main/java/com/cloudbees/plugins/credentials/CredentialsNameProvider.java

@@ -26,6 +26,8 @@
 import com.cloudbees.plugins.credentials.common.IdCredentials;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
+
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -89,13 +91,14 @@ Result name(@NonNull Credentials credentials, @NonNull Class<?> clazz) {
         NameWith nameWith = clazz.getAnnotation(NameWith.class);
         if (nameWith != null) {
             try {
-                CredentialsNameProvider nameProvider = nameWith.value().newInstance();
+                CredentialsNameProvider nameProvider = nameWith.value().getDeclaredConstructor().newInstance();
                 String name = nameProvider.getName(credentials);
                 if (!name.isEmpty()) {
                     LOGGER.fine(() -> "named `" + name + "` from " + nameProvider);
                     return new Result(name, nameWith.priority());
                 }
-            } catch (ClassCastException | InstantiationException | IllegalAccessException e) {
+            } catch (ClassCastException | InstantiationException | IllegalAccessException
+                     | InvocationTargetException | NoSuchMethodException e) {
                 // ignore
             }
         }

src/main/java/com/cloudbees/plugins/credentials/CredentialsProvider.java

@@ -63,6 +63,7 @@
 import hudson.security.SecurityRealm;
 import hudson.util.ListBoxModel;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
 import java.security.DigestOutputStream;
@@ -1382,7 +1383,7 @@ public final boolean hasCredentialsDescriptors() {
     public static Fingerprint getFingerprintOf(@NonNull Credentials c) throws IOException {
         try {
             MessageDigest md5 = MessageDigest.getInstance("MD5");
-            DigestOutputStream out = new DigestOutputStream(new NullOutputStream(), md5);
+            DigestOutputStream out = new DigestOutputStream(OutputStream.nullOutputStream(), md5);
             try {
                 FINGERPRINT_XML.toXML(c, new OutputStreamWriter(out, StandardCharsets.UTF_8));
             } finally {
@@ -1408,7 +1409,7 @@ public static Fingerprint getOrCreateFingerprintOf(@NonNull Credentials c) throw
                 c instanceof IdCredentials ? ((IdCredentials) c).getId() : "unknown", CredentialsNameProvider.name(c));
         try {
             MessageDigest md5 = MessageDigest.getInstance("MD5");
-            DigestOutputStream out = new DigestOutputStream(new NullOutputStream(), md5);
+            DigestOutputStream out = new DigestOutputStream(OutputStream.nullOutputStream(), md5);
             try {
                 FINGERPRINT_XML.toXML(c, new OutputStreamWriter(out, StandardCharsets.UTF_8));
             } finally {

src/main/java/com/cloudbees/plugins/credentials/CredentialsResolver.java

@@ -25,6 +25,8 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
+
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -126,14 +128,14 @@ public static <C extends Credentials> CredentialsResolver<Credentials, C> getRes
             // if the reflective instantiation proves a hot point, put a cache in front.
             try {
                 @SuppressWarnings("unchecked")
-                final CredentialsResolver<Credentials, C> resolver = resolveWith.value().newInstance();
+                final CredentialsResolver<Credentials, C> resolver = resolveWith.value().getDeclaredConstructor().newInstance();
                 if (Credentials.class.isAssignableFrom(resolver.getFromClass())
                         && clazz.isAssignableFrom(resolver.getToClass())) {
                     return resolver;
                 }
                 LOGGER.log(Level.SEVERE, "Resolver {0} for type {1} resolves to {2} which is not assignable to {1}",
                         new Object[]{resolver.getClass(), clazz, resolver.getToClass()});
-            } catch (InstantiationException | IllegalAccessException e) {
+            } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
                 LOGGER.log(Level.WARNING, "Could not instantiate resolver: " + resolveWith.value(), e);
                 return null;
             }

src/main/java/com/cloudbees/plugins/credentials/CredentialsUseListener.java

@@ -2,7 +2,6 @@
 
 import hudson.ExtensionPoint;
 import hudson.model.Item;
-import hudson.model.ModelObject;
 import hudson.model.Node;
 import hudson.model.Run;
 import jenkins.util.Listeners;

src/main/java/com/cloudbees/plugins/credentials/impl/CertificateCredentialsImpl.java

@@ -35,16 +35,16 @@
 import hudson.model.Descriptor;
 import hudson.model.Items;
 import hudson.util.FormValidation;
-import hudson.util.IOUtils;
 import hudson.util.Secret;
 import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.ObjectStreamException;
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Paths;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
@@ -365,13 +365,8 @@ public FileOnMasterKeyStoreSource(String keyStoreFile) {
         @Override
         public byte[] getKeyStoreBytes() {
             try {
-                InputStream inputStream = new FileInputStream(keyStoreFile);
-                try {
-                    return IOUtils.toByteArray(inputStream);
-                } finally {
-                    IOUtils.closeQuietly(inputStream);
-                }
-            } catch (IOException e) {
+                return Files.readAllBytes(Paths.get(keyStoreFile));
+            } catch (IOException | InvalidPathException e) {
                 LOGGER.log(Level.WARNING, "Could not read private key file " + keyStoreFile, e);
                 return new byte[0];
             }

src/test/java/com/cloudbees/plugins/credentials/CredentialsParameterDefinitionTest.java

@@ -35,6 +35,7 @@
 import hudson.security.ACL;
 import hudson.security.ACLContext;
 import hudson.tasks.Builder;
+import org.hamcrest.Matchers;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ErrorCollector;
@@ -50,9 +51,13 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.hamcrest.Matchers.*;
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.core.IsNot.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
 
 public class CredentialsParameterDefinitionTest {
 

src/test/java/com/cloudbees/plugins/credentials/SystemCredentialsProviderTest.java

@@ -39,6 +39,7 @@
 import hudson.tasks.BuildStepDescriptor;
 import hudson.tasks.Builder;
 
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import jenkins.security.QueueItemAuthenticatorConfiguration;
 import org.acegisecurity.Authentication;
@@ -82,7 +83,7 @@ public void malformedInput() throws Exception {
         assertTrue(new SystemCredentialsProvider().getCredentials().isEmpty());
         SystemCredentialsProvider.getInstance().save();
         assertFalse(new SystemCredentialsProvider().getCredentials().isEmpty());
-        FileUtils.writeStringToFile(SystemCredentialsProvider.getConfigFile().getFile(), "<<barf>>");
+        FileUtils.writeStringToFile(SystemCredentialsProvider.getConfigFile().getFile(), "<<barf>>", StandardCharsets.UTF_8);
         assertTrue(new SystemCredentialsProvider().getCredentials().isEmpty());
     }