PGPainless/sop-java
1
0
Fork 0
mirror of https://codeberg.org/PGPainless/sop-java.git synced 2025-09-08 17:59:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

Verification: Rename description to jsonOrDescription

Browse source
This commit is contained in:
Paul Schaub 2025-06-03 14:30:54 +02:00
parent 5a7a8ae901
commit bff4423f93
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sop-java-testfixtures/src/main/java/sop/testsuite/assertions/VerificationAssert.java
View file

@ -45,12 +45,12 @@ public final class VerificationAssert {
} }
public VerificationAssert hasDescription(String description) { public VerificationAssert hasDescription(String description) {
assertEquals(description, verification.getDescription().get()); assertEquals(description, verification.getJsonOrDescription().get());
return this; return this;
} }
public VerificationAssert hasDescriptionOrNull(String description) { public VerificationAssert hasDescriptionOrNull(String description) {
if (verification.getDescription().isEmpty()) { if (verification.getJsonOrDescription().isEmpty()) {
return this; return this;
} }

9
sop-java/src/main/kotlin/sop/Verification.kt
View file

@ -15,7 +15,7 @@ data class Verification(
val signingKeyFingerprint: String, val signingKeyFingerprint: String,
val signingCertFingerprint: String, val signingCertFingerprint: String,
val signatureMode: Optional<SignatureMode>, val signatureMode: Optional<SignatureMode>,
val description: Optional<String> val jsonOrDescription: Optional<String>
) { ) {
@JvmOverloads @JvmOverloads
constructor( constructor(
@ -31,10 +31,15 @@ data class Verification(
Optional.ofNullable(signatureMode), Optional.ofNullable(signatureMode),
Optional.ofNullable(description?.trim())) Optional.ofNullable(description?.trim()))
@Deprecated("Replaced by jsonOrDescription",
replaceWith = ReplaceWith("jsonOrDescription")
)
val description = jsonOrDescription
override fun toString(): String = override fun toString(): String =
"${UTCUtil.formatUTCDate(creationTime)} $signingKeyFingerprint $signingCertFingerprint" + "${UTCUtil.formatUTCDate(creationTime)} $signingKeyFingerprint $signingCertFingerprint" +
(if (signatureMode.isPresent) " mode:${signatureMode.get()}" else "") + (if (signatureMode.isPresent) " mode:${signatureMode.get()}" else "") +
(if (description.isPresent) " ${description.get()}" else "") (if (jsonOrDescription.isPresent) " ${jsonOrDescription.get()}" else "")
companion object { companion object {
@JvmStatic @JvmStatic