From 96dabe93539283e3fe5a15af2005d04ffb407109 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Wed, 13 May 2026 22:31:30 +0200 Subject: [PATCH 1/2] fix file names of TargetStateAndStatusMsg V1/V2 according to convention --- .../serosystems/example/ExampleDecoder.java | 6 ++--- .../lib1090/StatefulModeSDecoder.java | 4 ++-- ...V1.java => TargetStateAndStatusV1Msg.java} | 10 ++++---- ...V2.java => TargetStateAndStatusV2Msg.java} | 10 ++++---- .../lib1090/StatefulModeSDecoderTest.java | 24 +++++++++---------- ...ava => TargetStateAndStatusV1MsgTest.java} | 6 ++--- ...ava => TargetStateAndStatusV2MsgTest.java} | 10 ++++---- 7 files changed, 35 insertions(+), 35 deletions(-) rename src/main/java/de/serosystems/lib1090/msgs/adsb/{TargetStateAndStatusMsgV1.java => TargetStateAndStatusV1Msg.java} (95%) rename src/main/java/de/serosystems/lib1090/msgs/adsb/{TargetStateAndStatusMsgV2.java => TargetStateAndStatusV2Msg.java} (97%) rename src/test/java/de/serosystems/lib1090/msgs/adsb/{TargetStateAndStatusMsgV1Test.java => TargetStateAndStatusV1MsgTest.java} (93%) rename src/test/java/de/serosystems/lib1090/msgs/adsb/{TargetStateAndStatusMsgV2Test.java => TargetStateAndStatusV2MsgTest.java} (93%) diff --git a/src/main/java/de/serosystems/example/ExampleDecoder.java b/src/main/java/de/serosystems/example/ExampleDecoder.java index c306e34..8022654 100644 --- a/src/main/java/de/serosystems/example/ExampleDecoder.java +++ b/src/main/java/de/serosystems/example/ExampleDecoder.java @@ -300,8 +300,8 @@ public void decodeMsg(long timestamp, String raw, Position receiver) { break; case ADSB_TARGET_STATE_AND_STATUS: System.out.println("["+icao24+"]: Target State and Status reported"); - if (msg instanceof TargetStateAndStatusMsgV1) { - TargetStateAndStatusMsgV1 tStatus = (TargetStateAndStatusMsgV1) msg; + if (msg instanceof TargetStateAndStatusV1Msg) { + TargetStateAndStatusV1Msg tStatus = (TargetStateAndStatusV1Msg) msg; System.out.println(" Navigation Accuracy Category for position (NACp): " + tStatus.getNACp()); System.out.println(" Has operational TCAS: " + tStatus.hasOperationalTCAS()); System.out.println(" Surveillance/Source Integrity Level (SIL): " + tStatus.getSIL()); @@ -318,7 +318,7 @@ public void decodeMsg(long timestamp, String raw, Position receiver) { } } else { - TargetStateAndStatusMsgV2 tStatus = (TargetStateAndStatusMsgV2) msg; + TargetStateAndStatusV2Msg tStatus = (TargetStateAndStatusV2Msg) msg; System.out.println(" Navigation Accuracy Category for position (NACp): " + tStatus.getNACp()); System.out.println(" Has operational TCAS: " + tStatus.hasOperationalTCAS()); System.out.println(" Surveillance/Source Integrity Level (SIL): " + tStatus.getSIL()); diff --git a/src/main/java/de/serosystems/lib1090/StatefulModeSDecoder.java b/src/main/java/de/serosystems/lib1090/StatefulModeSDecoder.java index fd09a1d..3a9b503 100644 --- a/src/main/java/de/serosystems/lib1090/StatefulModeSDecoder.java +++ b/src/main/java/de/serosystems/lib1090/StatefulModeSDecoder.java @@ -405,9 +405,9 @@ private ExtendedSquitter decodeADSB(ModeSDownlinkMsg modes, long timestamp) thro if (ftc == 29) { int subtype = (es1090.getMessage()[0] >>> 1) & 0x3; if (subtype == 0 && dd.adsbVersion == 1) { - return new TargetStateAndStatusMsgV1(es1090); + return new TargetStateAndStatusV1Msg(es1090); } else if (subtype == 1 && dd.adsbVersion == 2) { - return new TargetStateAndStatusMsgV2(es1090); + return new TargetStateAndStatusV2Msg(es1090); } } diff --git a/src/main/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusMsgV1.java b/src/main/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusV1Msg.java similarity index 95% rename from src/main/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusMsgV1.java rename to src/main/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusV1Msg.java index 4cc56d6..67f0e90 100644 --- a/src/main/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusMsgV1.java +++ b/src/main/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusV1Msg.java @@ -28,7 +28,7 @@ /** * Decoder for ADS-B target state and status message as specified in DO-260A (ADS-B version 1). */ -public class TargetStateAndStatusMsgV1 extends ExtendedSquitter implements Serializable, TargetStateAndStatusMsg { +public class TargetStateAndStatusV1Msg extends ExtendedSquitter implements Serializable, TargetStateAndStatusMsg { private static final long serialVersionUID = -3226687215928593692L; @@ -49,14 +49,14 @@ public class TargetStateAndStatusMsgV1 extends ExtendedSquitter implements Seria private byte emergency_priority_status; /** protected no-arg constructor e.g. for serialization with Kryo **/ - protected TargetStateAndStatusMsgV1() { } + protected TargetStateAndStatusV1Msg() { } /** * @param raw_message The full Mode S message in hex representation * @throws BadFormatException if message has the wrong typecode or ADS-B version * @throws UnspecifiedFormatError if message has the wrong subtype */ - public TargetStateAndStatusMsgV1(String raw_message) throws BadFormatException, UnspecifiedFormatError { + public TargetStateAndStatusV1Msg(String raw_message) throws BadFormatException, UnspecifiedFormatError { this(new ExtendedSquitter(raw_message)); } @@ -65,7 +65,7 @@ public TargetStateAndStatusMsgV1(String raw_message) throws BadFormatException, * @throws BadFormatException if message has the wrong typecode or ADS-B version * @throws UnspecifiedFormatError if message has the wrong subtype */ - public TargetStateAndStatusMsgV1(byte[] raw_message) throws BadFormatException, UnspecifiedFormatError { + public TargetStateAndStatusV1Msg(byte[] raw_message) throws BadFormatException, UnspecifiedFormatError { this(new ExtendedSquitter(raw_message)); } @@ -74,7 +74,7 @@ public TargetStateAndStatusMsgV1(byte[] raw_message) throws BadFormatException, * @throws BadFormatException if message has the wrong typecode * @throws UnspecifiedFormatError if message has the wrong subtype */ - public TargetStateAndStatusMsgV1(ExtendedSquitter squitter) throws BadFormatException, UnspecifiedFormatError { + public TargetStateAndStatusV1Msg(ExtendedSquitter squitter) throws BadFormatException, UnspecifiedFormatError { super(squitter); setType(subtype.ADSB_TARGET_STATE_AND_STATUS); diff --git a/src/main/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusMsgV2.java b/src/main/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusV2Msg.java similarity index 97% rename from src/main/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusMsgV2.java rename to src/main/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusV2Msg.java index f9e2f9c..07f53dd 100644 --- a/src/main/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusMsgV2.java +++ b/src/main/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusV2Msg.java @@ -29,7 +29,7 @@ * * @author Markus Fuchs (fuchs@opensky-network.org) */ -public class TargetStateAndStatusMsgV2 extends ExtendedSquitter implements Serializable, TargetStateAndStatusMsg { +public class TargetStateAndStatusV2Msg extends ExtendedSquitter implements Serializable, TargetStateAndStatusMsg { private static final long serialVersionUID = 7485953168219273935L; @@ -52,14 +52,14 @@ public class TargetStateAndStatusMsgV2 extends ExtendedSquitter implements Seria private boolean lnav_mode_engaged; /** protected no-arg constructor e.g. for serialization with Kryo **/ - protected TargetStateAndStatusMsgV2() { } + protected TargetStateAndStatusV2Msg() { } /** * @param raw_message The full Mode S message in hex representation * @throws BadFormatException if message has the wrong typecode or ADS-B version * @throws UnspecifiedFormatError if message has the wrong subtype */ - public TargetStateAndStatusMsgV2(String raw_message) throws BadFormatException, UnspecifiedFormatError { + public TargetStateAndStatusV2Msg(String raw_message) throws BadFormatException, UnspecifiedFormatError { this(new ExtendedSquitter(raw_message)); } @@ -68,7 +68,7 @@ public TargetStateAndStatusMsgV2(String raw_message) throws BadFormatException, * @throws BadFormatException if message has the wrong typecode or ADS-B version * @throws UnspecifiedFormatError if message has the wrong subtype */ - public TargetStateAndStatusMsgV2(byte[] raw_message) throws BadFormatException, UnspecifiedFormatError { + public TargetStateAndStatusV2Msg(byte[] raw_message) throws BadFormatException, UnspecifiedFormatError { this(new ExtendedSquitter(raw_message)); } @@ -77,7 +77,7 @@ public TargetStateAndStatusMsgV2(byte[] raw_message) throws BadFormatException, * @throws BadFormatException if message has the wrong typecode or if reserved bits are set * @throws UnspecifiedFormatError if message has the wrong subtype */ - public TargetStateAndStatusMsgV2(ExtendedSquitter squitter) throws BadFormatException, UnspecifiedFormatError { + public TargetStateAndStatusV2Msg(ExtendedSquitter squitter) throws BadFormatException, UnspecifiedFormatError { super(squitter); setType(subtype.ADSB_TARGET_STATE_AND_STATUS); diff --git a/src/test/java/de/serosystems/lib1090/StatefulModeSDecoderTest.java b/src/test/java/de/serosystems/lib1090/StatefulModeSDecoderTest.java index 86a6604..7a99ba4 100644 --- a/src/test/java/de/serosystems/lib1090/StatefulModeSDecoderTest.java +++ b/src/test/java/de/serosystems/lib1090/StatefulModeSDecoderTest.java @@ -24,10 +24,10 @@ import de.serosystems.lib1090.msgs.adsb.ModeACodeV1Msg; import de.serosystems.lib1090.msgs.adsb.ModeACodeV1MsgTest; import de.serosystems.lib1090.msgs.adsb.OperationalStatusMsgTest; -import de.serosystems.lib1090.msgs.adsb.TargetStateAndStatusMsgV1; -import de.serosystems.lib1090.msgs.adsb.TargetStateAndStatusMsgV1Test; -import de.serosystems.lib1090.msgs.adsb.TargetStateAndStatusMsgV2; -import de.serosystems.lib1090.msgs.adsb.TargetStateAndStatusMsgV2Test; +import de.serosystems.lib1090.msgs.adsb.TargetStateAndStatusV1Msg; +import de.serosystems.lib1090.msgs.adsb.TargetStateAndStatusV1MsgTest; +import de.serosystems.lib1090.msgs.adsb.TargetStateAndStatusV2Msg; +import de.serosystems.lib1090.msgs.adsb.TargetStateAndStatusV2MsgTest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -49,7 +49,7 @@ public void setUp() { @Test public void tssV0Me11Set_shouldNotDecode() throws UnspecifiedFormatError, BadFormatException { // decoder assumes ADS-B v0 and should not decode TSS - final ModeSDownlinkMsg reply = decoder.decode(TargetStateAndStatusMsgV2Test.TSS_WITH_ME11_BIT_SET, 0L); + final ModeSDownlinkMsg reply = decoder.decode(TargetStateAndStatusV2MsgTest.TSS_WITH_ME11_BIT_SET, 0L); assertEquals(ModeSDownlinkMsg.subtype.EXTENDED_SQUITTER, reply.getType()); assertNotEquals(ModeSDownlinkMsg.subtype.ADSB_TARGET_STATE_AND_STATUS, reply.getType()); @@ -61,11 +61,11 @@ public void tssV2ME11Set_shouldDecode() throws UnspecifiedFormatError, BadFormat decoder.decode(OperationalStatusMsgTest.A_OPSTAT_V2, 0L); // decode message with ME bit 11 set - final ModeSDownlinkMsg reply = decoder.decode(TargetStateAndStatusMsgV2Test.TSS_WITH_ME11_BIT_SET, 0L); + final ModeSDownlinkMsg reply = decoder.decode(TargetStateAndStatusV2MsgTest.TSS_WITH_ME11_BIT_SET, 0L); assertEquals(ModeSDownlinkMsg.subtype.ADSB_TARGET_STATE_AND_STATUS, reply.getType()); - TargetStateAndStatusMsgV2 tss = (TargetStateAndStatusMsgV2) reply; + TargetStateAndStatusV2Msg tss = (TargetStateAndStatusV2Msg) reply; assertFalse(tss.hasSILSupplement()); assertFalse(tss.isFMSSelectedAltitude()); @@ -74,22 +74,22 @@ public void tssV2ME11Set_shouldDecode() throws UnspecifiedFormatError, BadFormat @Test public void tssV1_shouldDecode() throws UnspecifiedFormatError, BadFormatException { - decoder.decode(TargetStateAndStatusMsgV1Test.A_OPSTAT_V1, 0L); + decoder.decode(TargetStateAndStatusV1MsgTest.A_OPSTAT_V1, 0L); - final ModeSDownlinkMsg reply = decoder.decode(TargetStateAndStatusMsgV1Test.TSS_V1, 0L); + final ModeSDownlinkMsg reply = decoder.decode(TargetStateAndStatusV1MsgTest.TSS_V1, 0L); assertEquals(ModeSDownlinkMsg.subtype.ADSB_TARGET_STATE_AND_STATUS, reply.getType()); - assertTrue(reply instanceof TargetStateAndStatusMsgV1); + assertTrue(reply instanceof TargetStateAndStatusV1Msg); - TargetStateAndStatusMsgV1 tss = (TargetStateAndStatusMsgV1) reply; + TargetStateAndStatusV1Msg tss = (TargetStateAndStatusV1Msg) reply; assertEquals(9, tss.getNACp()); } @Test public void modeACodeV1_shouldDecode() throws UnspecifiedFormatError, BadFormatException { - decoder.decode(TargetStateAndStatusMsgV1Test.A_OPSTAT_V1, 0L); + decoder.decode(TargetStateAndStatusV1MsgTest.A_OPSTAT_V1, 0L); final ModeSDownlinkMsg reply = decoder.decode(ModeACodeV1MsgTest.MODE_A_CODE_V1, 0L); diff --git a/src/test/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusMsgV1Test.java b/src/test/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusV1MsgTest.java similarity index 93% rename from src/test/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusMsgV1Test.java rename to src/test/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusV1MsgTest.java index d150af8..18cbbe1 100644 --- a/src/test/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusMsgV1Test.java +++ b/src/test/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusV1MsgTest.java @@ -31,14 +31,14 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -public class TargetStateAndStatusMsgV1Test { +public class TargetStateAndStatusV1MsgTest { - public static final String TSS_V1 = withSubtype(TargetStateAndStatusMsgV2Test.TSS_WITHOUT_HEADING, 0); + public static final String TSS_V1 = withSubtype(TargetStateAndStatusV2MsgTest.TSS_WITHOUT_HEADING, 0); public static final String A_OPSTAT_V1 = withAddress("8D000000F8000200492900000000", "89653e"); @Test public void testDecodeTssV1() throws UnspecifiedFormatError, BadFormatException { - final TargetStateAndStatusMsgV1 tss = new TargetStateAndStatusMsgV1(Tools.hexStringToByteArray(TSS_V1)); + final TargetStateAndStatusV1Msg tss = new TargetStateAndStatusV1Msg(Tools.hexStringToByteArray(TSS_V1)); assertEquals("89653e", tss.getAddress().getHexAddress()); assertEquals(17, tss.getDownlinkFormat()); diff --git a/src/test/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusMsgV2Test.java b/src/test/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusV2MsgTest.java similarity index 93% rename from src/test/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusMsgV2Test.java rename to src/test/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusV2MsgTest.java index 1cb8a7d..c72922c 100644 --- a/src/test/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusMsgV2Test.java +++ b/src/test/java/de/serosystems/lib1090/msgs/adsb/TargetStateAndStatusV2MsgTest.java @@ -28,7 +28,7 @@ /** * @author Markus Fuchs (fuchs@opensky-network.org) */ -public class TargetStateAndStatusMsgV2Test { +public class TargetStateAndStatusV2MsgTest { // A TSS report observed in reality, decomposed by single bits public static final String TSS_WITHOUT_HEADING = @@ -138,7 +138,7 @@ public class TargetStateAndStatusMsgV2Test { @Test public void testTssWithoutHeading() throws UnspecifiedFormatError, BadFormatException { - final TargetStateAndStatusMsgV2 tss = new TargetStateAndStatusMsgV2(Tools.hexStringToByteArray(TSS_WITHOUT_HEADING)); + final TargetStateAndStatusV2Msg tss = new TargetStateAndStatusV2Msg(Tools.hexStringToByteArray(TSS_WITHOUT_HEADING)); assertEquals("89653e", tss.getAddress().getHexAddress()); assertEquals(17, tss.getDownlinkFormat()); @@ -167,7 +167,7 @@ public void testTssWithoutHeading() throws UnspecifiedFormatError, BadFormatExce @Test public void testTssWithHeadingLt180Degrees() throws UnspecifiedFormatError, BadFormatException { - final TargetStateAndStatusMsgV2 tss = new TargetStateAndStatusMsgV2(Tools.hexStringToByteArray(TSS_HEADING_LT_180_DEG)); + final TargetStateAndStatusV2Msg tss = new TargetStateAndStatusV2Msg(Tools.hexStringToByteArray(TSS_HEADING_LT_180_DEG)); assertEquals("89653e", tss.getAddress().getHexAddress()); assertEquals(17, tss.getDownlinkFormat()); @@ -196,7 +196,7 @@ public void testTssWithHeadingLt180Degrees() throws UnspecifiedFormatError, BadF @Test public void testTssWithHeadingGt180Degrees() throws UnspecifiedFormatError, BadFormatException { - final TargetStateAndStatusMsgV2 tss = new TargetStateAndStatusMsgV2(Tools.hexStringToByteArray(TSS_HEADING_GT_180_DEG)); + final TargetStateAndStatusV2Msg tss = new TargetStateAndStatusV2Msg(Tools.hexStringToByteArray(TSS_HEADING_GT_180_DEG)); assertEquals("89653e", tss.getAddress().getHexAddress()); assertEquals(17, tss.getDownlinkFormat()); @@ -226,7 +226,7 @@ public void testTssWithHeadingGt180Degrees() throws UnspecifiedFormatError, BadF @Test public void testInvalidReservedBits_shouldThrowBadFormatException() { try { - final TargetStateAndStatusMsgV2 tss = new TargetStateAndStatusMsgV2(Tools.hexStringToByteArray(INVALID_TSS)); + final TargetStateAndStatusV2Msg tss = new TargetStateAndStatusV2Msg(Tools.hexStringToByteArray(INVALID_TSS)); fail(); } catch (BadFormatException e) { // NOP From 00ac36d47a37e532caca22a97751a71b0c15ffd7 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Wed, 13 May 2026 22:48:24 +0200 Subject: [PATCH 2/2] renamed AirborneVelocityMsg to match convention --- .../{AirborneVelocityMessage.java => AirborneVelocityMsg.java} | 2 +- .../de/serosystems/lib1090/msgs/adsb/AirspeedHeadingMsg.java | 2 +- .../de/serosystems/lib1090/msgs/adsb/VelocityOverGroundMsg.java | 2 +- .../{AirborneVelocityMessage.java => AirborneVelocityMsg.java} | 2 +- .../de/serosystems/lib1090/msgs/adsr/AirspeedHeadingMsg.java | 2 +- .../de/serosystems/lib1090/msgs/adsr/VelocityOverGroundMsg.java | 2 +- .../{AirborneVelocityMessage.java => AirborneVelocityMsg.java} | 2 +- .../de/serosystems/lib1090/msgs/tisb/AirspeedHeadingMsg.java | 2 +- .../de/serosystems/lib1090/msgs/tisb/VelocityOverGroundMsg.java | 2 +- .../serosystems/lib1090/msgs/adsb/AirspeedHeadingMsgTest.java | 2 +- .../lib1090/msgs/adsb/VelocityOverGroundMsgTest.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) rename src/main/java/de/serosystems/lib1090/msgs/adsb/{AirborneVelocityMessage.java => AirborneVelocityMsg.java} (98%) rename src/main/java/de/serosystems/lib1090/msgs/adsr/{AirborneVelocityMessage.java => AirborneVelocityMsg.java} (97%) rename src/main/java/de/serosystems/lib1090/msgs/tisb/{AirborneVelocityMessage.java => AirborneVelocityMsg.java} (97%) diff --git a/src/main/java/de/serosystems/lib1090/msgs/adsb/AirborneVelocityMessage.java b/src/main/java/de/serosystems/lib1090/msgs/adsb/AirborneVelocityMsg.java similarity index 98% rename from src/main/java/de/serosystems/lib1090/msgs/adsb/AirborneVelocityMessage.java rename to src/main/java/de/serosystems/lib1090/msgs/adsb/AirborneVelocityMsg.java index 046a35a..446a5fe 100644 --- a/src/main/java/de/serosystems/lib1090/msgs/adsb/AirborneVelocityMessage.java +++ b/src/main/java/de/serosystems/lib1090/msgs/adsb/AirborneVelocityMsg.java @@ -23,7 +23,7 @@ /** * Common API for ADS-B airborne velocity messages across message subtypes. */ -public interface AirborneVelocityMessage { +public interface AirborneVelocityMsg { /** * @return true if the aircraft indicates an intent to change altitude or a similar flight status change diff --git a/src/main/java/de/serosystems/lib1090/msgs/adsb/AirspeedHeadingMsg.java b/src/main/java/de/serosystems/lib1090/msgs/adsb/AirspeedHeadingMsg.java index d298e56..a611b7c 100644 --- a/src/main/java/de/serosystems/lib1090/msgs/adsb/AirspeedHeadingMsg.java +++ b/src/main/java/de/serosystems/lib1090/msgs/adsb/AirspeedHeadingMsg.java @@ -28,7 +28,7 @@ * Decoder for ADS-B airspeed and heading messages * @author Matthias Schäfer (schaefer@sero-systems.de) */ -public class AirspeedHeadingMsg extends ExtendedSquitter implements Serializable, AirborneVelocityMessage { +public class AirspeedHeadingMsg extends ExtendedSquitter implements Serializable, AirborneVelocityMsg { private static final long serialVersionUID = 6901092011249128775L; diff --git a/src/main/java/de/serosystems/lib1090/msgs/adsb/VelocityOverGroundMsg.java b/src/main/java/de/serosystems/lib1090/msgs/adsb/VelocityOverGroundMsg.java index 9ed4e9a..18cb8e7 100644 --- a/src/main/java/de/serosystems/lib1090/msgs/adsb/VelocityOverGroundMsg.java +++ b/src/main/java/de/serosystems/lib1090/msgs/adsb/VelocityOverGroundMsg.java @@ -28,7 +28,7 @@ * Decoder for ADS-B velocity messages * @author Matthias Schäfer (schaefer@sero-systems.de) */ -public class VelocityOverGroundMsg extends ExtendedSquitter implements Serializable, AirborneVelocityMessage { +public class VelocityOverGroundMsg extends ExtendedSquitter implements Serializable, AirborneVelocityMsg { private static final long serialVersionUID = 1774082354457574555L; diff --git a/src/main/java/de/serosystems/lib1090/msgs/adsr/AirborneVelocityMessage.java b/src/main/java/de/serosystems/lib1090/msgs/adsr/AirborneVelocityMsg.java similarity index 97% rename from src/main/java/de/serosystems/lib1090/msgs/adsr/AirborneVelocityMessage.java rename to src/main/java/de/serosystems/lib1090/msgs/adsr/AirborneVelocityMsg.java index cab0f23..46dc5da 100644 --- a/src/main/java/de/serosystems/lib1090/msgs/adsr/AirborneVelocityMessage.java +++ b/src/main/java/de/serosystems/lib1090/msgs/adsr/AirborneVelocityMsg.java @@ -23,7 +23,7 @@ /** * Common API for ADS-R airborne velocity messages across message subtypes. */ -public interface AirborneVelocityMessage { +public interface AirborneVelocityMsg { /** * @return the ICAO Mode A Flag used for address type determination diff --git a/src/main/java/de/serosystems/lib1090/msgs/adsr/AirspeedHeadingMsg.java b/src/main/java/de/serosystems/lib1090/msgs/adsr/AirspeedHeadingMsg.java index feab880..39ab532 100644 --- a/src/main/java/de/serosystems/lib1090/msgs/adsr/AirspeedHeadingMsg.java +++ b/src/main/java/de/serosystems/lib1090/msgs/adsr/AirspeedHeadingMsg.java @@ -28,7 +28,7 @@ * Decoder for ADS-R airspeed and heading messages * @author Matthias Schäfer (schaefer@sero-systems.de) */ -public class AirspeedHeadingMsg extends ExtendedSquitter implements Serializable, AirborneVelocityMessage { +public class AirspeedHeadingMsg extends ExtendedSquitter implements Serializable, AirborneVelocityMsg { private static final long serialVersionUID = -5847938116356997891L; diff --git a/src/main/java/de/serosystems/lib1090/msgs/adsr/VelocityOverGroundMsg.java b/src/main/java/de/serosystems/lib1090/msgs/adsr/VelocityOverGroundMsg.java index 3ad5e17..d29c6cc 100644 --- a/src/main/java/de/serosystems/lib1090/msgs/adsr/VelocityOverGroundMsg.java +++ b/src/main/java/de/serosystems/lib1090/msgs/adsr/VelocityOverGroundMsg.java @@ -28,7 +28,7 @@ * Decoder for ADS-R velocity messages * @author Matthias Schäfer (schaefer@sero-systems.de) */ -public class VelocityOverGroundMsg extends ExtendedSquitter implements Serializable, AirborneVelocityMessage { +public class VelocityOverGroundMsg extends ExtendedSquitter implements Serializable, AirborneVelocityMsg { private static final long serialVersionUID = -4871907161197614315L; diff --git a/src/main/java/de/serosystems/lib1090/msgs/tisb/AirborneVelocityMessage.java b/src/main/java/de/serosystems/lib1090/msgs/tisb/AirborneVelocityMsg.java similarity index 97% rename from src/main/java/de/serosystems/lib1090/msgs/tisb/AirborneVelocityMessage.java rename to src/main/java/de/serosystems/lib1090/msgs/tisb/AirborneVelocityMsg.java index 46aec41..6d4a41b 100644 --- a/src/main/java/de/serosystems/lib1090/msgs/tisb/AirborneVelocityMessage.java +++ b/src/main/java/de/serosystems/lib1090/msgs/tisb/AirborneVelocityMsg.java @@ -23,7 +23,7 @@ /** * Common API for TIS-B airborne velocity messages across message subtypes. */ -public interface AirborneVelocityMessage { +public interface AirborneVelocityMsg { /** * @return the ICAO Mode A Flag used for address type determination diff --git a/src/main/java/de/serosystems/lib1090/msgs/tisb/AirspeedHeadingMsg.java b/src/main/java/de/serosystems/lib1090/msgs/tisb/AirspeedHeadingMsg.java index f06d33e..1fe45f4 100644 --- a/src/main/java/de/serosystems/lib1090/msgs/tisb/AirspeedHeadingMsg.java +++ b/src/main/java/de/serosystems/lib1090/msgs/tisb/AirspeedHeadingMsg.java @@ -30,7 +30,7 @@ * Decoder for TIS-B airspeed+heading message (DO-260B, 2.2.17.3.4). * @author Matthias Schaefer (schaefer@sero-systems.de) */ -public class AirspeedHeadingMsg extends ExtendedSquitter implements Serializable, AirborneVelocityMessage { +public class AirspeedHeadingMsg extends ExtendedSquitter implements Serializable, AirborneVelocityMsg { private static final long serialVersionUID = 944130622021621845L; diff --git a/src/main/java/de/serosystems/lib1090/msgs/tisb/VelocityOverGroundMsg.java b/src/main/java/de/serosystems/lib1090/msgs/tisb/VelocityOverGroundMsg.java index bfc64c4..ea4733f 100644 --- a/src/main/java/de/serosystems/lib1090/msgs/tisb/VelocityOverGroundMsg.java +++ b/src/main/java/de/serosystems/lib1090/msgs/tisb/VelocityOverGroundMsg.java @@ -30,7 +30,7 @@ * Decoder for TIS-B velocity message (DO-260B, 2.2.17.3.4). * @author Matthias Schaefer (schaefer@sero-systems.de) */ -public class VelocityOverGroundMsg extends ExtendedSquitter implements Serializable, AirborneVelocityMessage { +public class VelocityOverGroundMsg extends ExtendedSquitter implements Serializable, AirborneVelocityMsg { private static final long serialVersionUID = 4633940058263818959L; diff --git a/src/test/java/de/serosystems/lib1090/msgs/adsb/AirspeedHeadingMsgTest.java b/src/test/java/de/serosystems/lib1090/msgs/adsb/AirspeedHeadingMsgTest.java index e2b7a62..1ac4c49 100644 --- a/src/test/java/de/serosystems/lib1090/msgs/adsb/AirspeedHeadingMsgTest.java +++ b/src/test/java/de/serosystems/lib1090/msgs/adsb/AirspeedHeadingMsgTest.java @@ -55,7 +55,7 @@ public void testNACvRawAndAccuracyBound() throws Exception { @Test public void testImplementsAirborneVelocityMessage() throws Exception { AirspeedHeadingMsg msg = new AirspeedHeadingMsg("8DA05F219B06B6AF189400CBC33F"); - assertInstanceOf(AirborneVelocityMessage.class, msg); + assertInstanceOf(AirborneVelocityMsg.class, msg); } @Test diff --git a/src/test/java/de/serosystems/lib1090/msgs/adsb/VelocityOverGroundMsgTest.java b/src/test/java/de/serosystems/lib1090/msgs/adsb/VelocityOverGroundMsgTest.java index 43b59be..bc836f2 100644 --- a/src/test/java/de/serosystems/lib1090/msgs/adsb/VelocityOverGroundMsgTest.java +++ b/src/test/java/de/serosystems/lib1090/msgs/adsb/VelocityOverGroundMsgTest.java @@ -54,7 +54,7 @@ public void testNACvRawAndAccuracyBound_485020() throws Exception { @Test public void testImplementsAirborneVelocityMessage() throws Exception { VelocityOverGroundMsg msg = new VelocityOverGroundMsg("8D485020994409940838175B284F"); - assertInstanceOf(AirborneVelocityMessage.class, msg); + assertInstanceOf(AirborneVelocityMsg.class, msg); } @Test