Release 1.1.0

Author: hirsivaja

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'io.github.hirsivaja'
-version = '1.0.5'
+version = '1.1.0'
 
 repositories {
     mavenCentral()

src/main/java/com/github/hirsivaja/ip/IpPayload.java

@@ -45,12 +45,10 @@ static IpPayload decode(ByteBuffer in) {
         in.mark();
         byte version = (byte) (in.get() >>> Ipv4Header.VERSION_SHIFT);
         in.reset();
-        if(version == Ipv4Header.VERSION) {
-            return Ipv4Payload.decode(in);
-        } else if (version == Ipv6Header.VERSION) {
-            return Ipv6Payload.decode(in);
-        } else {
-            throw new IllegalArgumentException("Not an IP payload");
-        }
+        return switch (version) {
+            case Ipv4Header.VERSION -> Ipv4Payload.decode(in);
+            case Ipv6Header.VERSION -> Ipv6Payload.decode(in);
+            default -> throw new IllegalArgumentException("Not an IP payload");
+        };
     }
 }

src/main/java/com/github/hirsivaja/ip/IpProtocol.java

@@ -3,7 +3,7 @@
 public sealed interface IpProtocol permits IpProtocol.GenericIpProtocol, IpProtocol.Type {
     byte type();
 
-    public static IpProtocol fromType(byte type) {
+    static IpProtocol fromType(byte type) {
         for (Type identifier : Type.values()) {
             if (identifier.type() == type) {
                 return identifier;
@@ -12,9 +12,9 @@ public static IpProtocol fromType(byte type) {
         return new GenericIpProtocol(type);
     }
 
-    public record GenericIpProtocol(byte type) implements IpProtocol {}
+    record GenericIpProtocol(byte type) implements IpProtocol {}
 
-    public enum Type implements IpProtocol {
+    enum Type implements IpProtocol {
         HOP_BY_HOP((byte) 0x00),
         ICMP((byte) 0x01),
         IGMP((byte) 0x02),
@@ -29,15 +29,15 @@ public enum Type implements IpProtocol {
         NO_NEXT((byte) 0x3B),
         DESTINATION((byte) 0x3C);
 
-        private final byte type;
+        private final byte typeValue;
 
         Type(byte type) {
-            this.type = type;
+            this.typeValue = type;
         }
 
         @Override
         public byte type() {
-            return type;
+            return typeValue;
         }
     }
 }

src/main/java/com/github/hirsivaja/ip/ipv4/Ipv4Payload.java

@@ -38,7 +38,7 @@ static boolean isIpv4Payload(ByteBuffer in){
         return isIpv4;
     }
 
-    public record GenericIpv4Payload(Ipv4Header header, ByteArray payload) implements Ipv4Payload {
+    record GenericIpv4Payload(Ipv4Header header, ByteArray payload) implements Ipv4Payload {
 
         @Override
         public void encode(ByteBuffer out) {

src/main/java/com/github/hirsivaja/ip/ipv6/Ipv6Header.java

@@ -96,7 +96,7 @@ public IpProtocol lastNextHeader() {
         if(extensionHeaders.isEmpty()){
             return nextHeader;
         } else {
-            return extensionHeaders.get(extensionHeaders.size() - 1).nextHeader();
+            return extensionHeaders.getLast().nextHeader();
         }
     }
 

src/main/java/com/github/hirsivaja/ip/ipv6/Ipv6Payload.java

@@ -56,7 +56,7 @@ static boolean isIpv6Payload(ByteBuffer in) {
         return false;
     }
 
-    public record GenericIpv6Payload(Ipv6Header header, ByteArray payload) implements Ipv6Payload {
+    record GenericIpv6Payload(Ipv6Header header, ByteArray payload) implements Ipv6Payload {
 
         @Override
         public void encode(ByteBuffer out) {

src/main/java/com/github/hirsivaja/ip/tcp/TcpMessagePayload.java

@@ -23,7 +23,7 @@ public TcpMessagePayload(IpHeader header, TcpHeader tcpHeader, ByteArray payload
         short checksum = tcpHeader.checksum() == 0 ?
                 IpUtils.calculateInternetChecksum(generateChecksumData(header, tcpHeader, payload.array())) :
                 tcpHeader.checksum();
-        this.tcpHeader = new TcpHeader((short) tcpHeader.srcPort(), (short) tcpHeader.dstPort(), tcpHeader.sequenceNumber(),
+        this.tcpHeader = new TcpHeader(tcpHeader.srcPort(), tcpHeader.dstPort(), tcpHeader.sequenceNumber(),
                 tcpHeader.ackNumber(), tcpHeader.flags(), tcpHeader.windowSize(), checksum,
                 tcpHeader.urgentPointer(), tcpHeader.rawOptions());
         this.payload = payload;

src/main/java/com/github/hirsivaja/ip/udp/UdpMessagePayload.java

@@ -23,16 +23,16 @@ public UdpMessagePayload(IpHeader header, UdpHeader udpHeader, ByteArray payload
         short checksum = udpHeader.checksum() == 0 ?
                 IpUtils.calculateInternetChecksum(generateChecksumData(header, udpHeader, payload.array())) :
                 udpHeader.checksum();
-        this.udpHeader = new UdpHeader((short) udpHeader.srcPort(), (short) udpHeader.dstPort(),
+        this.udpHeader = new UdpHeader(udpHeader.srcPort(), udpHeader.dstPort(),
                 (short) udpHeader.dataLength(), checksum);
         this.payload = payload;
     }
 
     @Override
     public void encode(ByteBuffer out) {
         header.encode(out);
-        out.putShort((short) udpHeader.srcPort());
-        out.putShort((short) udpHeader.dstPort());
+        out.putShort(udpHeader.srcPort());
+        out.putShort(udpHeader.dstPort());
         out.putShort((short) (payload.length() + UdpHeader.UDP_HEADER_LEN));
         out.putShort(udpHeader.checksum());
         out.put(payload.array());

src/main/java/module-info.java

@@ -1,3 +1,3 @@
-module Jipcs {
+module com.github.hirsivaja.jipcs {
     requires java.logging;
 }

src/test/java/com/github/hirsivaja/ip/ipv6/extension/ExtensionHeaderTest.java

@@ -28,7 +28,7 @@ public void authenticationTest() {
         IpPayload payload = Ipv6Payload.decode(ByteBuffer.wrap(ipv6Bytes));
 
         Assert.assertEquals(2, ((Ipv6Header) payload.header()).extensionHeaders().size());
-        AuthenticationHeaderExtension ah = (AuthenticationHeaderExtension) ((Ipv6Header) payload.header()).extensionHeaders().get(0);
+        AuthenticationHeaderExtension ah = (AuthenticationHeaderExtension) ((Ipv6Header) payload.header()).extensionHeaders().getFirst();
         Assert.assertEquals(0x12345678, ah.authenticationHeader().spi());
         Assert.assertEquals(0x87654321, ah.authenticationHeader().seqNumber());
         Assert.assertArrayEquals(IpUtils.parseHexBinary("55555555"), ah.authenticationHeader().icv().array());