PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2025-09-09 18:29:39 +02:00
Code Issues Releases Wiki Activity

Fix checkstyle issues

Browse source
This commit is contained in:
Paul Schaub 2025-04-10 13:12:45 +02:00
parent 151e0232c0
commit 2c11a141d7
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
pgpainless-sop/src/main/kotlin/org/pgpainless/sop/MergeCertsImpl.kt
View file

@ -4,6 +4,8 @@
package org.pgpainless.sop package org.pgpainless.sop
import java.io.InputStream
import java.io.OutputStream
import org.bouncycastle.bcpg.KeyIdentifier import org.bouncycastle.bcpg.KeyIdentifier
import org.bouncycastle.bcpg.PacketFormat import org.bouncycastle.bcpg.PacketFormat
import org.bouncycastle.openpgp.api.OpenPGPCertificate import org.bouncycastle.openpgp.api.OpenPGPCertificate
@ -11,8 +13,6 @@ import org.pgpainless.PGPainless
import org.pgpainless.util.ArmoredOutputStreamFactory import org.pgpainless.util.ArmoredOutputStreamFactory
import sop.Ready import sop.Ready
import sop.operation.MergeCerts import sop.operation.MergeCerts
import java.io.InputStream
import java.io.OutputStream
class MergeCertsImpl(private val api: PGPainless) : MergeCerts { class MergeCertsImpl(private val api: PGPainless) : MergeCerts {
@ -47,11 +47,12 @@ class MergeCertsImpl(private val api: PGPainless) : MergeCerts {
baseCerts[update.keyIdentifier] = api.mergeCertificate(baseCert, update) baseCerts[update.keyIdentifier] = api.mergeCertificate(baseCert, update)
} }
val out = if (armor) { val out =
ArmoredOutputStreamFactory.get(outputStream) if (armor) {
} else { ArmoredOutputStreamFactory.get(outputStream)
outputStream } else {
} outputStream
}
// emit merged and updated base certs // emit merged and updated base certs
for (merged in baseCerts.values) { for (merged in baseCerts.values) {
@ -66,9 +67,7 @@ class MergeCertsImpl(private val api: PGPainless) : MergeCerts {
} }
} }
override fun noArmor(): MergeCerts = apply { override fun noArmor(): MergeCerts = apply { armor = false }
armor = false
}
// from command line // from command line
override fun updates(updateCerts: InputStream): MergeCerts = apply { override fun updates(updateCerts: InputStream): MergeCerts = apply {

3
pgpainless-sop/src/main/kotlin/org/pgpainless/sop/VersionImpl.kt
View file

@ -24,7 +24,8 @@ class VersionImpl(private val api: PGPainless) : Version {
override fun getExtendedVersion(): String { override fun getExtendedVersion(): String {
val bcVersion = val bcVersion =
String.format(Locale.US, "Bouncy Castle %.2f", BouncyCastleProvider().versionStr.toDouble()) String.format(
Locale.US, "Bouncy Castle %.2f", BouncyCastleProvider().versionStr.toDouble())
val specVersion = String.format("%02d", SOP_VERSION) val specVersion = String.format("%02d", SOP_VERSION)
return """${getName()} ${getVersion()} return """${getName()} ${getVersion()}
https://codeberg.org/PGPainless/pgpainless/src/branch/main/pgpainless-sop https://codeberg.org/PGPainless/pgpainless/src/branch/main/pgpainless-sop