Solved Spotbugs issues

Author: bbottema

modules/core-module/src/main/java/org/simplejavamail/api/mailer/config/Pkcs12Config.java

@@ -32,7 +32,7 @@ private Pkcs12Config(@NotNull InputStream pkcs12StoreStream, @NotNull char[] sto
 	}
 
 	private Pkcs12Config(@NotNull byte[] pkcs12StoreData, @NotNull char[] storePassword, @NotNull String keyAlias, @NotNull char[] keyPassword) {
-		this.pkcs12StoreData = pkcs12StoreData;
+		this.pkcs12StoreData = pkcs12StoreData.clone();
 		this.storePassword = storePassword;
 		this.keyAlias = keyAlias;
 		this.keyPassword = keyPassword;
@@ -129,7 +129,7 @@ public Pkcs12ConfigBuilder pkcs12Store(InputStream pkcs12StoreStream)
 		}
 
 		public Pkcs12ConfigBuilder pkcs12Store(byte[] pkcs12StoreData) {
-			this.pkcs12StoreData = pkcs12StoreData;
+			this.pkcs12StoreData = pkcs12StoreData.clone();
 			return this;
 		}
 

modules/core-module/src/main/java/org/simplejavamail/internal/util/MiscUtil.java

@@ -127,10 +127,12 @@ public static String readInputStreamToString(@NotNull final InputStream inputStr
 	@NotNull
 	public static byte[] readInputStreamToBytes(@NotNull final InputStream inputStream)
 			throws IOException {
-		byte[] targetArray = new byte[inputStream.available()];
-		//noinspection ResultOfMethodCallIgnored
-		inputStream.read(targetArray);
-		return targetArray;
+		try (InputStream is = inputStream) {
+			byte[] targetArray = new byte[is.available()];
+			//noinspection ResultOfMethodCallIgnored
+			is.read(targetArray);
+			return targetArray;
+		}
 	}
 
 	/**

modules/simple-java-mail/src/main/java/org/simplejavamail/email/internal/EmailPopulatingBuilderImpl.java

@@ -1722,7 +1722,7 @@ public InternalEmailPopulatingBuilder withDecryptedAttachments(@NotNull final Li
 	@Cli.ExcludeApi(reason = "delegated method is an identical api from CLI point of view")
 	public EmailPopulatingBuilder signWithDomainKey(@NotNull final byte[] dkimPrivateKey, @NotNull final String signingDomain, @NotNull final String dkimSelector) {
 		checkNonEmptyArgument(dkimPrivateKey, "dkimPrivateKey");
-		return signWithDomainKey(new ByteArrayInputStream(dkimPrivateKey), signingDomain, dkimSelector);
+		return signWithDomainKey(new ByteArrayInputStream(dkimPrivateKey.clone()), signingDomain, dkimSelector);
 	}
 
 	/**
@@ -1741,9 +1741,10 @@ public EmailPopulatingBuilder signWithDomainKey(@NotNull final String dkimPrivat
 	@Override
 	@Cli.ExcludeApi(reason = "delegated method is an identical api from CLI point of view")
 	public EmailPopulatingBuilder signWithDomainKey(@NotNull final File dkimPrivateKeyFile, @NotNull final String signingDomain, @NotNull final String dkimSelector) {
-		try {
-			return signWithDomainKey(new FileInputStream(checkNonEmptyArgument(dkimPrivateKeyFile, "dkimPrivateKeyFile")), signingDomain, dkimSelector);
-		} catch (FileNotFoundException e) {
+		checkNonEmptyArgument(dkimPrivateKeyFile, "dkimPrivateKeyFile");
+		try (FileInputStream dkimPrivateKeyInputStream = new FileInputStream(dkimPrivateKeyFile)) {
+			return signWithDomainKey(dkimPrivateKeyInputStream, signingDomain, dkimSelector);
+		} catch (IOException e) {
 			throw new EmailException(format(ERROR_READING_FROM_FILE, dkimPrivateKeyFile), e);
 		}
 	}