From 462c9f032f02f1b0cf08d1facd1546e9abf37ed8 Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Fri, 9 Apr 2021 18:48:53 +0300 Subject: [PATCH] Added @Nonnull annotation to Passphrase.fromPassword() --- .../src/main/java/org/pgpainless/util/Passphrase.java | 7 ++++--- .../java/org/pgpainless/key/protection/PassphraseTest.java | 7 ------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pgpainless-core/src/main/java/org/pgpainless/util/Passphrase.java b/pgpainless-core/src/main/java/org/pgpainless/util/Passphrase.java index f57474b0..6aa89e91 100644 --- a/pgpainless-core/src/main/java/org/pgpainless/util/Passphrase.java +++ b/pgpainless-core/src/main/java/org/pgpainless/util/Passphrase.java @@ -15,6 +15,7 @@ */ package org.pgpainless.util; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Arrays; @@ -37,11 +38,11 @@ public class Passphrase { /** * Create a {@link Passphrase} from a {@link String}. * - * @param password password that may be null + * @param password password * @return passphrase */ - public static Passphrase fromPassword(@Nullable String password) { - return new Passphrase(password == null ? null : password.toCharArray()); + public static Passphrase fromPassword(@Nonnull String password) { + return new Passphrase(password.toCharArray()); } /** diff --git a/pgpainless-core/src/test/java/org/pgpainless/key/protection/PassphraseTest.java b/pgpainless-core/src/test/java/org/pgpainless/key/protection/PassphraseTest.java index 376b86b1..637162c6 100644 --- a/pgpainless-core/src/test/java/org/pgpainless/key/protection/PassphraseTest.java +++ b/pgpainless-core/src/test/java/org/pgpainless/key/protection/PassphraseTest.java @@ -37,11 +37,4 @@ public class PassphraseTest { assertFalse(passphrase.isValid()); assertThrows(IllegalStateException.class, passphrase::getChars); } - - @Test - public void testFromPasswordNull() { - Passphrase passphrase = Passphrase.fromPassword(null); - assertArrayEquals(null, passphrase.getChars()); - assertTrue(passphrase.isValid()); - } }