Skip to content

Commit

Permalink
Bump com.google.errorprone:error_prone_core from 2.32.0 to 2.36.0 (#100)
Browse files Browse the repository at this point in the history
* Resolve spotbugs error using record

---------

Co-authored-by: actyp <[email protected]>
  • Loading branch information
dependabot[bot] and actyp authored Dec 29, 2024
1 parent 37cab79 commit d044dee
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<protocol-state-fuzzer.version>1.0.0</protocol-state-fuzzer.version>
<cf-edhoc.version>0.0.0</cf-edhoc.version>
<error-prone.version>2.32.0</error-prone.version>
<error-prone.version>2.36.0</error-prone.version>
<gson.version>2.11.0</gson.version>
<guava.version>33.4.0-jre</guava.version>
<jakarta-xml.version>4.0.2</jakarta-xml.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,12 @@ public void receiveRequest(Exchange exchange, Request request) {
}

// Prepare the actual OSCORE request, by replacing the payload
byte[] oscorePayload = combinedMessagePair.oscorePayload();
byte[] oscorePayload = combinedMessagePair.oscorePayload;
LOGGER.debug(EdhocUtil.byteArrayToString("OSCORE request payload", oscorePayload));
request.setPayload(oscorePayload);

// Rebuild the full message_3 sequence
CBORObject edhocMessage3 = combinedMessagePair.edhocMessage3();
CBORObject edhocMessage3 = combinedMessagePair.edhocMessage3;
List<CBORObject> edhocObjectList = new ArrayList<>();

// Find C_R, by encoding the 'kid' from the OSCORE option
Expand Down Expand Up @@ -296,7 +296,15 @@ protected byte[] createCombinedMessage(byte[] message3Sequence, byte[] oscorePay
return combinedMessage;
}

protected record CombinedMessagePair(CBORObject edhocMessage3, byte[] oscorePayload) {}
protected static class CombinedMessagePair {
public CBORObject edhocMessage3;
public byte[] oscorePayload;

public CombinedMessagePair(CBORObject edhocMessage3, byte[] oscorePayload) {
this.edhocMessage3 = edhocMessage3;
this.oscorePayload = oscorePayload;
}
}

protected CombinedMessagePair splitCombinedMessage(byte[] combinedMessage) {
if (combinedMessage == null) {
Expand Down

0 comments on commit d044dee

Please sign in to comment.