mirror of
https://github.com/pgpainless/pgpainless.git
synced 2024-11-18 02:12:06 +01:00
Mark ArmoredOutputStreamFactory methods as @Nullable
This commit is contained in:
parent
8b4dd0fc25
commit
772c0407b3
1 changed files with 9 additions and 4 deletions
|
@ -9,6 +9,9 @@ import java.io.OutputStream;
|
||||||
import org.bouncycastle.bcpg.ArmoredOutputStream;
|
import org.bouncycastle.bcpg.ArmoredOutputStream;
|
||||||
import org.pgpainless.encryption_signing.ProducerOptions;
|
import org.pgpainless.encryption_signing.ProducerOptions;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Factory to create configured {@link ArmoredOutputStream ArmoredOutputStreams}.
|
* Factory to create configured {@link ArmoredOutputStream ArmoredOutputStreams}.
|
||||||
* The configuration entails setting custom version and comment headers.
|
* The configuration entails setting custom version and comment headers.
|
||||||
|
@ -32,7 +35,8 @@ public final class ArmoredOutputStreamFactory {
|
||||||
* @param outputStream inner stream
|
* @param outputStream inner stream
|
||||||
* @return armored output stream
|
* @return armored output stream
|
||||||
*/
|
*/
|
||||||
public static ArmoredOutputStream get(OutputStream outputStream) {
|
@Nonnull
|
||||||
|
public static ArmoredOutputStream get(@Nonnull OutputStream outputStream) {
|
||||||
ArmoredOutputStream armoredOutputStream = new ArmoredOutputStream(outputStream);
|
ArmoredOutputStream armoredOutputStream = new ArmoredOutputStream(outputStream);
|
||||||
armoredOutputStream.clearHeaders();
|
armoredOutputStream.clearHeaders();
|
||||||
if (version != null && !version.isEmpty()) {
|
if (version != null && !version.isEmpty()) {
|
||||||
|
@ -52,7 +56,8 @@ public final class ArmoredOutputStreamFactory {
|
||||||
* @param options options
|
* @param options options
|
||||||
* @return armored output stream
|
* @return armored output stream
|
||||||
*/
|
*/
|
||||||
public static ArmoredOutputStream get(OutputStream outputStream, ProducerOptions options) {
|
@Nonnull
|
||||||
|
public static ArmoredOutputStream get(@Nonnull OutputStream outputStream, @Nonnull ProducerOptions options) {
|
||||||
if (options.isHideArmorHeaders()) {
|
if (options.isHideArmorHeaders()) {
|
||||||
ArmoredOutputStream armorOut = new ArmoredOutputStream(outputStream);
|
ArmoredOutputStream armorOut = new ArmoredOutputStream(outputStream);
|
||||||
armorOut.clearHeaders();
|
armorOut.clearHeaders();
|
||||||
|
@ -69,7 +74,7 @@ public final class ArmoredOutputStreamFactory {
|
||||||
*
|
*
|
||||||
* @param versionString version string
|
* @param versionString version string
|
||||||
*/
|
*/
|
||||||
public static void setVersionInfo(String versionString) {
|
public static void setVersionInfo(@Nullable String versionString) {
|
||||||
if (versionString == null) {
|
if (versionString == null) {
|
||||||
version = null;
|
version = null;
|
||||||
return;
|
return;
|
||||||
|
@ -98,7 +103,7 @@ public final class ArmoredOutputStreamFactory {
|
||||||
*
|
*
|
||||||
* @param commentString comment
|
* @param commentString comment
|
||||||
*/
|
*/
|
||||||
public static void setComment(String commentString) {
|
public static void setComment(@Nullable String commentString) {
|
||||||
if (commentString == null) {
|
if (commentString == null) {
|
||||||
throw new IllegalArgumentException("Comment cannot be null.");
|
throw new IllegalArgumentException("Comment cannot be null.");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue