motiejus
/
jgit
1
Fork 0
Code Releases Activity

PushCertificate: Add toTextWithSignature() method 

Change-Id: Ic0129373cc0c0321ffa43dc11a658d4f891ec2c2
This commit is contained in:
Dave Borowitz 2015-07-15 18:07:06 -07:00
parent 74a57f3744
commit 39dc898dca
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushCertificateParserTest.java
View File

@ -215,6 +215,7 @@ public void parseCertFromPktLine() throws Exception {
cmd.getNewId().name());
assertEquals(concatPacketLines(INPUT, 0, 6), cert.toText());
assertEquals(concatPacketLines(INPUT, 0, 17), cert.toTextWithSignature());
String signature = concatPacketLines(INPUT, 6, 17);
assertTrue(signature.startsWith(PushCertificateParser.BEGIN_SIGNATURE));

17
org.eclipse.jgit/src/org/eclipse/jgit/transport/PushCertificate.java
View File

@ -203,6 +203,19 @@ public String getSignature() {
* @since 4.1
*/
public String toText() {
return toStringBuilder().toString();
}
/**
* @return original text payload plus signature; the final output will be
* valid as input to {@link PushCertificateParser#fromString(String)}.
* @since 4.1
*/
public String toTextWithSignature() {
return toStringBuilder().append(signature).toString();
}
private StringBuilder toStringBuilder() {
StringBuilder sb = new StringBuilder()
.append(VERSION).append(' ').append(version).append('\n')
.append(PUSHER).append(' ').append(getPusher())
@ -215,7 +228,7 @@ public String toText() {
.append(' ').append(cmd.getNewId().name())
.append(' ').append(cmd.getRefName()).append('\n');
}
return sb.toString();
return sb;
}
@Override
@ -256,6 +269,6 @@ private static boolean commandsEqual(PushCertificate c1, PushCertificate c2) {
@Override
public String toString() {
return getClass().getSimpleName() + '['
+ toText() + signature + ']';
+ toTextWithSignature() + ']';
}
}