diff --git a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/DetachInbandSignatureAndMessageCmd.java b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/DetachInbandSignatureAndMessageCmd.java index f5c71a2..b1e2f70 100644 --- a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/DetachInbandSignatureAndMessageCmd.java +++ b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/DetachInbandSignatureAndMessageCmd.java @@ -12,7 +12,7 @@ import picocli.CommandLine; import sop.Signatures; import sop.cli.picocli.SopCLI; import sop.exception.SOPGPException; -import sop.operation.DetachInbandSignatureAndMessage; +import sop.operation.InlineDetach; @CommandLine.Command(name = "detach-inband-signature-and-message", description = "Split a clearsigned message", @@ -32,7 +32,7 @@ public class DetachInbandSignatureAndMessageCmd implements Runnable { @Override public void run() { - DetachInbandSignatureAndMessage detach = SopCLI.getSop().detachInbandSignatureAndMessage(); + InlineDetach detach = SopCLI.getSop().detachInbandSignatureAndMessage(); if (detach == null) { throw new SOPGPException.UnsupportedSubcommand("Command 'detach-inband-signature-and-message' not implemented."); } diff --git a/sop-java-picocli/src/test/java/sop/cli/picocli/SOPTest.java b/sop-java-picocli/src/test/java/sop/cli/picocli/SOPTest.java index 6360a77..127f853 100644 --- a/sop-java-picocli/src/test/java/sop/cli/picocli/SOPTest.java +++ b/sop-java-picocli/src/test/java/sop/cli/picocli/SOPTest.java @@ -17,7 +17,7 @@ import sop.SOP; import sop.operation.Armor; import sop.operation.Dearmor; import sop.operation.Decrypt; -import sop.operation.DetachInbandSignatureAndMessage; +import sop.operation.InlineDetach; import sop.operation.Encrypt; import sop.operation.ExtractCert; import sop.operation.GenerateKey; @@ -93,7 +93,7 @@ public class SOPTest { } @Override - public DetachInbandSignatureAndMessage detachInbandSignatureAndMessage() { + public InlineDetach detachInbandSignatureAndMessage() { return null; } }; diff --git a/sop-java/src/main/java/sop/SOP.java b/sop-java/src/main/java/sop/SOP.java index 2c2ccf1..f2f5392 100644 --- a/sop-java/src/main/java/sop/SOP.java +++ b/sop-java/src/main/java/sop/SOP.java @@ -7,7 +7,7 @@ package sop; import sop.operation.Armor; import sop.operation.Dearmor; import sop.operation.Decrypt; -import sop.operation.DetachInbandSignatureAndMessage; +import sop.operation.InlineDetach; import sop.operation.Encrypt; import sop.operation.ExtractCert; import sop.operation.GenerateKey; @@ -91,5 +91,5 @@ public interface SOP { */ Dearmor dearmor(); - DetachInbandSignatureAndMessage detachInbandSignatureAndMessage(); + InlineDetach detachInbandSignatureAndMessage(); } diff --git a/sop-java/src/main/java/sop/operation/DetachInbandSignatureAndMessage.java b/sop-java/src/main/java/sop/operation/InlineDetach.java similarity index 92% rename from sop-java/src/main/java/sop/operation/DetachInbandSignatureAndMessage.java rename to sop-java/src/main/java/sop/operation/InlineDetach.java index 9e22258..080ca9f 100644 --- a/sop-java/src/main/java/sop/operation/DetachInbandSignatureAndMessage.java +++ b/sop-java/src/main/java/sop/operation/InlineDetach.java @@ -14,13 +14,13 @@ import sop.Signatures; /** * Split cleartext signed messages up into data and signatures. */ -public interface DetachInbandSignatureAndMessage { +public interface InlineDetach { /** * Do not wrap the signatures in ASCII armor. * @return builder */ - DetachInbandSignatureAndMessage noArmor(); + InlineDetach noArmor(); /** * Detach the provided cleartext signed message from its signatures.