PGPainless/sop-java
1
0
Fork 0
mirror of https://codeberg.org/PGPainless/sop-java.git synced 2024-11-29 10:32:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Verification: Annotate with @Nonnull, @Nullable

Browse source
This commit is contained in:
Paul Schaub 2023-04-27 12:52:12 +02:00
parent 44e6dd2180
commit 8b8863c6df
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
sop-java/src/main/java/sop/Verification.java
View file

@ -8,6 +8,8 @@ import sop.enums.SignatureMode;
import sop.util.Optional; import sop.util.Optional;
import sop.util.UTCUtil; import sop.util.UTCUtil;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.Date; import java.util.Date;
/** /**
@ -30,7 +32,9 @@ public class Verification {
* @param signingKeyFingerprint fingerprint of the signing (sub-) key * @param signingKeyFingerprint fingerprint of the signing (sub-) key
* @param signingCertFingerprint fingerprint of the certificate * @param signingCertFingerprint fingerprint of the certificate
*/ */
public Verification(Date creationTime, String signingKeyFingerprint, String signingCertFingerprint) { public Verification(@Nonnull Date creationTime,
@Nonnull String signingKeyFingerprint,
@Nonnull String signingCertFingerprint) {
this(creationTime, signingKeyFingerprint, signingCertFingerprint, Optional.ofEmpty(), Optional.ofEmpty()); this(creationTime, signingKeyFingerprint, signingCertFingerprint, Optional.ofEmpty(), Optional.ofEmpty());
} }
@ -43,7 +47,11 @@ public class Verification {
* @param signatureMode signature mode (optional, may be <pre>null</pre>) * @param signatureMode signature mode (optional, may be <pre>null</pre>)
* @param description free-form description, e.g. <pre>certificate from dkg.asc</pre> (optional, may be <pre>null</pre>) * @param description free-form description, e.g. <pre>certificate from dkg.asc</pre> (optional, may be <pre>null</pre>)
*/ */
public Verification(Date creationTime, String signingKeyFingerprint, String signingCertFingerprint, SignatureMode signatureMode, String description) { public Verification(@Nonnull Date creationTime,
@Nonnull String signingKeyFingerprint,
@Nonnull String signingCertFingerprint,
@Nullable SignatureMode signatureMode,
@Nullable String description) {
this( this(
creationTime, creationTime,
signingKeyFingerprint, signingKeyFingerprint,
@ -53,7 +61,11 @@ public class Verification {
); );
} }
private Verification(Date creationTime, String signingKeyFingerprint, String signingCertFingerprint, Optional<SignatureMode> signatureMode, Optional<String> description) { private Verification(@Nonnull Date creationTime,
@Nonnull String signingKeyFingerprint,
@Nonnull String signingCertFingerprint,
@Nonnull Optional<SignatureMode> signatureMode,
@Nonnull Optional<String> description) {
this.creationTime = creationTime; this.creationTime = creationTime;
this.signingKeyFingerprint = signingKeyFingerprint; this.signingKeyFingerprint = signingKeyFingerprint;
this.signingCertFingerprint = signingCertFingerprint; this.signingCertFingerprint = signingCertFingerprint;
@ -61,14 +73,15 @@ public class Verification {
this.description = description; this.description = description;
} }
private static String nullSafeTrim(String string) { private static String nullSafeTrim(@Nullable String string) {
if (string == null) { if (string == null) {
return null; return null;
} }
return string.trim(); return string.trim();
} }
public static Verification fromString(String toString) { @Nonnull
public static Verification fromString(@Nonnull String toString) {
String[] split = toString.trim().split(" "); String[] split = toString.trim().split(" ");
if (split.length < 3) { if (split.length < 3) {
throw new IllegalArgumentException("Verification must be of the format 'UTC-DATE OpenPGPFingerprint OpenPGPFingerprint [mode] [info]'"); throw new IllegalArgumentException("Verification must be of the format 'UTC-DATE OpenPGPFingerprint OpenPGPFingerprint [mode] [info]'");
@ -111,6 +124,7 @@ public class Verification {
* *
* @return signature creation time * @return signature creation time
*/ */
@Nonnull
public Date getCreationTime() { public Date getCreationTime() {
return creationTime; return creationTime;
} }
@ -120,6 +134,7 @@ public class Verification {
* *
* @return signing key fingerprint * @return signing key fingerprint
*/ */
@Nonnull
public String getSigningKeyFingerprint() { public String getSigningKeyFingerprint() {
return signingKeyFingerprint; return signingKeyFingerprint;
} }
@ -129,6 +144,7 @@ public class Verification {
* *
* @return signing certificate fingerprint * @return signing certificate fingerprint
*/ */
@Nonnull
public String getSigningCertFingerprint() { public String getSigningCertFingerprint() {
return signingCertFingerprint; return signingCertFingerprint;
} }
@ -139,6 +155,7 @@ public class Verification {
* *
* @return signature mode * @return signature mode
*/ */
@Nonnull
public Optional<SignatureMode> getSignatureMode() { public Optional<SignatureMode> getSignatureMode() {
return signatureMode; return signatureMode;
} }
@ -149,6 +166,7 @@ public class Verification {
* *
* @return description * @return description
*/ */
@Nonnull
public Optional<String> getDescription() { public Optional<String> getDescription() {
return description; return description;
} }