From c3d3a600f7742ff593e26c8a7849174acf33fbfc Mon Sep 17 00:00:00 2001 From: Luka Absandze Date: Wed, 21 Aug 2024 16:00:33 +0400 Subject: [PATCH] Make java code jdk11 compliant --- erpc_java/deploy.xml | 6 +- erpc_java/pom.xml | 6 +- .../erpc/auxiliary/MessageInfo.java | 75 +++++++++++++++++-- .../erpc/auxiliary/MessageType.java | 19 +++-- .../erpc/auxiliary/RequestContext.java | 73 +++++++++++++++++- 5 files changed, 158 insertions(+), 21 deletions(-) diff --git a/erpc_java/deploy.xml b/erpc_java/deploy.xml index 2d496677..ec042708 100644 --- a/erpc_java/deploy.xml +++ b/erpc_java/deploy.xml @@ -38,8 +38,8 @@ - 21 - 21 + 11 + 11 UTF-8 @@ -192,4 +192,4 @@ - \ No newline at end of file + diff --git a/erpc_java/pom.xml b/erpc_java/pom.xml index 5173cdba..ec420d1f 100644 --- a/erpc_java/pom.xml +++ b/erpc_java/pom.xml @@ -38,8 +38,8 @@ - 21 - 21 + 11 + 11 UTF-8 @@ -126,4 +126,4 @@ - \ No newline at end of file + diff --git a/erpc_java/src/main/java/io/github/embeddedrpc/erpc/auxiliary/MessageInfo.java b/erpc_java/src/main/java/io/github/embeddedrpc/erpc/auxiliary/MessageInfo.java index 781404b0..bb51db46 100644 --- a/erpc_java/src/main/java/io/github/embeddedrpc/erpc/auxiliary/MessageInfo.java +++ b/erpc_java/src/main/java/io/github/embeddedrpc/erpc/auxiliary/MessageInfo.java @@ -6,17 +6,80 @@ package io.github.embeddedrpc.erpc.auxiliary; +import java.util.Objects; + +public final class MessageInfo { + private final MessageType type; + private final int service; + private final int request; + private final int sequence; + /** - * Record storing information about message. + * Class storing information about message. * * @param type Message type * @param service Service identification * @param request Request identification * @param sequence Sequence number */ -public record MessageInfo( - MessageType type, - int service, - int request, - int sequence) { + public MessageInfo(MessageType type, int service, int request, int sequence) { + this.type = type; + this.service = service; + this.request = request; + this.sequence = sequence; + } + +/** + * Get message type. + * + * @return type +*/ + public MessageType type() { + return type; + } + +/** + * Get message service. + * + * @return service +*/ + public int service() { + return service; + } + +/** + * Get message request. + * + * @return request +*/ + public int request() { + return request; + } + + +/** + * Get message sequence. + * + * @return sequence +*/ + public int sequence() { + return sequence; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof MessageInfo)) { + return false; + } + MessageInfo that = (MessageInfo) o; + return service == that.service && request == that.request && sequence == that.sequence && type == that.type; + } + + @Override + public int hashCode() { + return Objects.hash(type, service, request, sequence); + } } diff --git a/erpc_java/src/main/java/io/github/embeddedrpc/erpc/auxiliary/MessageType.java b/erpc_java/src/main/java/io/github/embeddedrpc/erpc/auxiliary/MessageType.java index bc79c4e3..846860ca 100644 --- a/erpc_java/src/main/java/io/github/embeddedrpc/erpc/auxiliary/MessageType.java +++ b/erpc_java/src/main/java/io/github/embeddedrpc/erpc/auxiliary/MessageType.java @@ -57,12 +57,17 @@ public int getValue() { * @return Corresponding MessageType */ public static MessageType getMessageType(int value) { - return switch (value) { - case 0 -> kInvocationMessage; - case 1 -> kOnewayMessage; - case 2 -> kReplyMessage; - case 3 -> kNotificationMessage; - default -> throw new RuntimeException("Invalid MessageType " + value); - }; + switch (value) { + case 0: + return kInvocationMessage; + case 1: + return kOnewayMessage; + case 2: + return kReplyMessage; + case 3: + return kNotificationMessage; + default: + throw new RuntimeException("Invalid MessageType " + value); + } } } diff --git a/erpc_java/src/main/java/io/github/embeddedrpc/erpc/auxiliary/RequestContext.java b/erpc_java/src/main/java/io/github/embeddedrpc/erpc/auxiliary/RequestContext.java index f539b714..5a6c906f 100644 --- a/erpc_java/src/main/java/io/github/embeddedrpc/erpc/auxiliary/RequestContext.java +++ b/erpc_java/src/main/java/io/github/embeddedrpc/erpc/auxiliary/RequestContext.java @@ -9,13 +9,82 @@ import io.github.embeddedrpc.erpc.codec.Codec; import groovyjarjarantlr.ByteBuffer; +import java.util.Objects; + +public final class RequestContext { + private final int sequence; + private final ByteBuffer message; + private final Codec codec; + private final Boolean isOneWay; + /** - * Record storing request context. + * Class storing request context. * * @param sequence Sequence number * @param message Message to be sent * @param codec Codec used to store send and received message * @param isOneWay Request direction */ -public record RequestContext(int sequence, ByteBuffer message, Codec codec, Boolean isOneWay) { + public RequestContext(int sequence, ByteBuffer message, Codec codec, Boolean isOneWay) { + this.sequence = sequence; + this.message = message; + this.codec = codec; + this.isOneWay = isOneWay; + } + +/** + * Get request context sequence. + * + * @return sequence +*/ + public int sequence() { + return sequence; + } + +/** + * Get request context message. + * + * @return message +*/ + public ByteBuffer message() { + return message; + } + +/** + * Get request context codec. + * + * @return codec +*/ + public Codec codec() { + return codec; + } + +/** + * is request context oneWay. + * + * @return isOneWay +*/ + public boolean isOneWay() { + return isOneWay; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof RequestContext)) { + return false; + } + RequestContext that = (RequestContext) o; + return sequence == that.sequence + && Objects.equals(message, that.message) + && Objects.equals(codec, that.codec) + && Objects.equals(isOneWay, that.isOneWay); + } + + @Override + public int hashCode() { + return Objects.hash(sequence, message, codec, isOneWay); + } }