Skip to content

Commit fa53d7a

Browse files
actypactyp
committed
Use PSF methods for run description printing
1 parent d235499 commit fa53d7a

8 files changed

Lines changed: 64 additions & 64 deletions

File tree

‎src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/EdhocMapperConfig.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -244,24 +244,24 @@ public void printRunDescriptionSelf(PrintWriter printWriter) {
244244
super.printRunDescriptionSelf(printWriter);
245245
printWriter.println();
246246
printWriter.println("### EdhocMapperConfig Parameters");
247-
printRunDescriptionNullableParam(printWriter, "-protocolVersion", protocolVersion);
248-
printWriter.println("-combinedMessageVersion\n" + combinedMessageVersion);
249-
printWriter.println("-edhocRole\n" + edhocRole);
250-
printWriter.println("-edhocCoapResource\n" + edhocCoapResource);
251-
printWriter.println("-appCoapResource\n" + appCoapResource);
252-
printWriter.println("-appMessageCodeToCoapServer\n" + appMessageCodeToCoapServer);
253-
printWriter.println("-appMessagePayloadToCoapServer\n" + appMessagePayloadToCoapServer);
254-
printWriter.println("-appMessageCodeToCoapClient\n" + appMessageCodeToCoapClient);
255-
printWriter.println("-appMessagePayloadToCoapClient\n" + appMessagePayloadToCoapClient);
256-
printRunDescriptionBooleanParam(printWriter, "-coapErrorAsEdhocError", coapErrorAsEdhocError, false);
257-
printRunDescriptionBooleanParam(printWriter, "-disableContentFormat", disableContentFormat, false);
258-
printRunDescriptionBooleanParam(printWriter, "-useOldContentFormat", useOldContentFormat, false);
259-
printRunDescriptionBooleanParam(printWriter, "-enableSessionReset", enableSessionReset, false);
260-
printRunDescriptionBooleanParam(printWriter, "-disableCXCorrelation", disableCXCorrelation, false);
261-
printWriter.println("-ownConnectionId\n" + ownConnectionId);
262-
printRunDescriptionBooleanParam(printWriter, "-disableOwnConnectionIdGeneration\n", disableOwnConnectionIdGeneration, false);
263-
printRunDescriptionNullableParam(printWriter, "-forceOscoreSenderId", forceOscoreSenderId);
264-
printRunDescriptionNullableParam(printWriter, "-forceOscoreRecipientId", forceOscoreRecipientId);
247+
printRDParam(printWriter, "-protocolVersion", protocolVersion);
248+
printRDParam(printWriter, "-combinedMessageVersion", combinedMessageVersion);
249+
printRDParam(printWriter, "-edhocRole", edhocRole);
250+
printRDStringParam(printWriter, "-edhocCoapResource", edhocCoapResource);
251+
printRDStringParam(printWriter, "-appCoapResource", appCoapResource);
252+
printRDStringParam(printWriter, "-appMessageCodeToCoapServer", appMessageCodeToCoapServer);
253+
printRDStringParam(printWriter, "-appMessagePayloadToCoapServer", appMessagePayloadToCoapServer);
254+
printRDStringParam(printWriter, "-appMessageCodeToCoapClient", appMessageCodeToCoapClient);
255+
printRDStringParam(printWriter, "-appMessagePayloadToCoapClient", appMessagePayloadToCoapClient);
256+
printRDBooleanParam(printWriter, "-coapErrorAsEdhocError", coapErrorAsEdhocError);
257+
printRDBooleanParam(printWriter, "-disableContentFormat", disableContentFormat);
258+
printRDBooleanParam(printWriter, "-useOldContentFormat", useOldContentFormat);
259+
printRDBooleanParam(printWriter, "-enableSessionReset", enableSessionReset);
260+
printRDBooleanParam(printWriter, "-disableCXCorrelation", disableCXCorrelation);
261+
printRDStringParam(printWriter, "-ownConnectionId", ownConnectionId);
262+
printRDBooleanParam(printWriter, "-disableOwnConnectionIdGeneration", disableOwnConnectionIdGeneration);
263+
printRDStringParam(printWriter, "-forceOscoreSenderId", forceOscoreSenderId);
264+
printRDStringParam(printWriter, "-forceOscoreRecipientId", forceOscoreRecipientId);
265265
}
266266

267267
@Override

‎src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/AuthenticationConfig.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ public TestVectorAuthenticationConfig getTestVectorAuthenticationConfig() {
7272
@Override
7373
public void printRunDescriptionSelf(PrintWriter printWriter) {
7474
printWriter.println("### AuthenticationConfig Parameters");
75-
printRunDescriptionNullableParam(printWriter, "-mapCredType", mapCredType);
76-
printRunDescriptionNullableParam(printWriter, "-mapIdCredType", mapIdCredType);
77-
printRunDescriptionNullableParam(printWriter, "-sulCredType", sulCredType);
78-
printRunDescriptionNullableParam(printWriter, "-sulIdCredType", sulIdCredType);
79-
printWriter.println("-trustModel\n" + trustModel);
75+
printRDParam(printWriter, "-mapCredType", mapCredType);
76+
printRDParam(printWriter, "-mapIdCredType", mapIdCredType);
77+
printRDParam(printWriter, "-sulCredType", sulCredType);
78+
printRDParam(printWriter, "-sulIdCredType", sulIdCredType);
79+
printRDParam(printWriter, "-trustModel", trustModel);
8080
}
8181

8282
@Override

‎src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/ManyFilesAuthenticationConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ public boolean isUsed() {
7272
@Override
7373
public void printRunDescriptionSelf(PrintWriter printWriter) {
7474
printWriter.println("### ManyFilesAuthenticationConfig Parameters");
75-
printRunDescriptionNullableParam(printWriter, "-mapAuthenticationMethod", mapAuthenticationMethod);
76-
printRunDescriptionNullableParam(printWriter, "-mapSupportedCipherSuites\n", mapSupportedCipherSuites);
75+
printRDParam(printWriter, "-mapAuthenticationMethod", mapAuthenticationMethod);
76+
printRDListParam(printWriter, "-mapSupportedCipherSuites", mapSupportedCipherSuites);
7777
}
7878

7979
@Override

‎src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/TestVectorAuthenticationConfig.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ private TestVector jsonFile2TestVector(String filename, String key) {
7171
@Override
7272
public void printRunDescriptionSelf(PrintWriter printWriter) {
7373
printWriter.println("### TestVectorAuthenticationConfig Parameters");
74-
printRunDescriptionNullableParam(printWriter, "-testVectorFile", testVectorFile);
75-
printRunDescriptionNullableParam(printWriter, "-testVectorJsonKey", testVectorJsonKey);
76-
printRunDescriptionNullableParam(printWriter, "-testVectorPeerKeyCurve", testVectorPeerKeyCurve);
74+
printRDStringParam(printWriter, "-testVectorJson", testVectorFile);
75+
printRDStringParam(printWriter, "-testVectorJsonKey", testVectorJsonKey);
76+
printRDStringParam(printWriter, "-testVectorPeerKeyCurve", testVectorPeerKeyCurve);
7777
}
7878
}

‎src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/Ed25519KeySigConfig.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ public String getSulX5uLink() {
8686
@Override
8787
public void printRunDescriptionSelf(PrintWriter printWriter) {
8888
printWriter.println("### Ed25519KeySigConfig Parameters");
89-
printRunDescriptionNullableParam(printWriter, "-mapEd25519PrivKeySig", mapPrivateFilename);
90-
printRunDescriptionNullableParam(printWriter, "-mapEd25519PubKeySig", mapPublicFilename);
91-
printRunDescriptionNullableParam(printWriter, "-mapEd25519KidSig", mapKid);
92-
printRunDescriptionNullableParam(printWriter, "-mapEd25519X509CertSig", mapX509Filename);
93-
printRunDescriptionNullableParam(printWriter, "-mapEd25519X5uLinkSig", mapX5uLink);
94-
printRunDescriptionNullableParam(printWriter, "-sulEd25519PubKeySig", sulPublicFilename);
95-
printRunDescriptionNullableParam(printWriter, "-sulEd25519KidSig", sulKid);
96-
printRunDescriptionNullableParam(printWriter, "-sulEd25519X509CertSig", sulX509Filename);
97-
printRunDescriptionNullableParam(printWriter, "-sulEd25519X5uLinkSig", sulX5uLink);
89+
printRDStringParam(printWriter, "-mapEd25519PrivKeySig", mapPrivateFilename);
90+
printRDStringParam(printWriter, "-mapEd25519PubKeySig", mapPublicFilename);
91+
printRDStringParam(printWriter, "-mapEd25519KidSig", mapKid);
92+
printRDStringParam(printWriter, "-mapEd25519X509CertSig", mapX509Filename);
93+
printRDStringParam(printWriter, "-mapEd25519X5uLinkSig", mapX5uLink);
94+
printRDStringParam(printWriter, "-sulEd25519PubKeySig", sulPublicFilename);
95+
printRDStringParam(printWriter, "-sulEd25519KidSig", sulKid);
96+
printRDStringParam(printWriter, "-sulEd25519X509CertSig", sulX509Filename);
97+
printRDStringParam(printWriter, "-sulEd25519X5uLinkSig", sulX5uLink);
9898
}
9999
}

‎src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/P256KeySigConfig.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ public String getSulX5uLink() {
8686
@Override
8787
public void printRunDescriptionSelf(PrintWriter printWriter) {
8888
printWriter.println("### P256KeySigConfig Parameters");
89-
printRunDescriptionNullableParam(printWriter, "-mapP256PrivKeySig", mapPrivateFilename);
90-
printRunDescriptionNullableParam(printWriter, "-mapP256PubKeySig", mapPublicFilename);
91-
printRunDescriptionNullableParam(printWriter, "-mapP256KidSig", mapKid);
92-
printRunDescriptionNullableParam(printWriter, "-mapP256X509CertSig", mapX509Filename);
93-
printRunDescriptionNullableParam(printWriter, "-mapP256X5uLinkSig", mapX5uLink);
94-
printRunDescriptionNullableParam(printWriter, "-sulP256PubKeySig", sulPublicFilename);
95-
printRunDescriptionNullableParam(printWriter, "-sulP256KidSig", sulKid);
96-
printRunDescriptionNullableParam(printWriter, "-sulP256X509CertSig", sulX509Filename);
97-
printRunDescriptionNullableParam(printWriter, "-sulP256X5uLinkSig", sulX5uLink);
89+
printRDStringParam(printWriter, "-mapP256PrivKeySig", mapPrivateFilename);
90+
printRDStringParam(printWriter, "-mapP256PubKeySig", mapPublicFilename);
91+
printRDStringParam(printWriter, "-mapP256KidSig", mapKid);
92+
printRDStringParam(printWriter, "-mapP256X509CertSig", mapX509Filename);
93+
printRDStringParam(printWriter, "-mapP256X5uLinkSig", mapX5uLink);
94+
printRDStringParam(printWriter, "-sulP256PubKeySig", sulPublicFilename);
95+
printRDStringParam(printWriter, "-sulP256KidSig", sulKid);
96+
printRDStringParam(printWriter, "-sulP256X509CertSig", sulX509Filename);
97+
printRDStringParam(printWriter, "-sulP256X5uLinkSig", sulX5uLink);
9898
}
9999
}

‎src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/P256KeyStatConfig.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ public String getSulX5uLink() {
8686
@Override
8787
public void printRunDescriptionSelf(PrintWriter printWriter) {
8888
printWriter.println("### P256KeyStatConfig Parameters");
89-
printRunDescriptionNullableParam(printWriter, "-mapP256PrivKeyStat", mapPrivateFilename);
90-
printRunDescriptionNullableParam(printWriter, "-mapP256PubKeyStat", mapPublicFilename);
91-
printRunDescriptionNullableParam(printWriter, "-mapP256KidStat", mapKid);
92-
printRunDescriptionNullableParam(printWriter, "-mapP256X509CertStat", mapX509Filename);
93-
printRunDescriptionNullableParam(printWriter, "-mapP256X5uLinkStat", mapX5uLink);
94-
printRunDescriptionNullableParam(printWriter, "-sulP256PubKeyStat", sulPublicFilename);
95-
printRunDescriptionNullableParam(printWriter, "-sulP256KidStat", sulKid);
96-
printRunDescriptionNullableParam(printWriter, "-sulP256X509CertStat", sulX509Filename);
97-
printRunDescriptionNullableParam(printWriter, "-sulP256X5uLinkStat", sulX5uLink);
89+
printRDStringParam(printWriter, "-mapP256PrivKeyStat", mapPrivateFilename);
90+
printRDStringParam(printWriter, "-mapP256PubKeyStat", mapPublicFilename);
91+
printRDStringParam(printWriter, "-mapP256KidStat", mapKid);
92+
printRDStringParam(printWriter, "-mapP256X509CertStat", mapX509Filename);
93+
printRDStringParam(printWriter, "-mapP256X5uLinkStat", mapX5uLink);
94+
printRDStringParam(printWriter, "-sulP256PubKeyStat", sulPublicFilename);
95+
printRDStringParam(printWriter, "-sulP256KidStat", sulKid);
96+
printRDStringParam(printWriter, "-sulP256X509CertStat", sulX509Filename);
97+
printRDStringParam(printWriter, "-sulP256X5uLinkStat", sulX5uLink);
9898
}
9999
}

‎src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/X25519KeyStatConfig.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ public String getSulX5uLink() {
8585
@Override
8686
public void printRunDescriptionSelf(PrintWriter printWriter) {
8787
printWriter.println("### X25519KeyStatConfig Parameters");
88-
printRunDescriptionNullableParam(printWriter, "-mapX25519PrivKeyStat", mapPrivateFilename);
89-
printRunDescriptionNullableParam(printWriter, "-mapX25519PubKeyStat", mapPublicFilename);
90-
printRunDescriptionNullableParam(printWriter, "-mapX25519KidStat", mapKid);
91-
printRunDescriptionNullableParam(printWriter, "-mapX25519X509CertStat", mapX509Filename);
92-
printRunDescriptionNullableParam(printWriter, "-mapX25519X5uLinkStat", mapX5uLink);
93-
printRunDescriptionNullableParam(printWriter, "-sulX25519PubKeyStat", sulPublicFilename);
94-
printRunDescriptionNullableParam(printWriter, "-sulX25519KidStat", sulKid);
95-
printRunDescriptionNullableParam(printWriter, "-sulX25519X509CertStat", sulX509Filename);
96-
printRunDescriptionNullableParam(printWriter, "-sulX25519X5uLinkStat", sulX5uLink);
88+
printRDStringParam(printWriter, "-mapX25519PrivKeyStat", mapPrivateFilename);
89+
printRDStringParam(printWriter, "-mapX25519PubKeyStat", mapPublicFilename);
90+
printRDStringParam(printWriter, "-mapX25519KidStat", mapKid);
91+
printRDStringParam(printWriter, "-mapX25519X509CertStat", mapX509Filename);
92+
printRDStringParam(printWriter, "-mapX25519X5uLinkStat", mapX5uLink);
93+
printRDStringParam(printWriter, "-sulX25519PubKeyStat", sulPublicFilename);
94+
printRDStringParam(printWriter, "-sulX25519KidStat", sulKid);
95+
printRDStringParam(printWriter, "-sulX25519X509CertStat", sulX509Filename);
96+
printRDStringParam(printWriter, "-sulX25519X5uLinkStat", sulX5uLink);
9797
}
9898
}

0 commit comments

Comments
 (0)