Message Handler handleSync returns the DF instance

terminal2 · Nov 16, 2020 · 259d3fe · 259d3fe
1 parent e6e6c89
commit 259d3fe
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/main/java/aero/t2s/modes/ModeSHandler.java b/src/main/java/aero/t2s/modes/ModeSHandler.java
@@ -27,7 +27,7 @@ public void onMessage(Consumer<DownlinkFormat> onMessage) {
  }
 
  public abstract void handle(String data);
- public abstract void handleSync(String data);
+ public abstract DownlinkFormat handleSync(String data);
 
 
  protected short[] toData(final String input) throws EmptyMessageException {

diff --git a/src/main/java/aero/t2s/modes/ModeSMessageHandler.java b/src/main/java/aero/t2s/modes/ModeSMessageHandler.java
@@ -29,19 +29,23 @@ public void handle(final String input) {
  executor.execute(() -> handleSync(input));
  }
 
- public void handleSync(final String input) {
+ public DownlinkFormat handleSync(final String input) {
  try {
  DownlinkFormat df = decoder.decode(toData(input));
 
  if (onMessage != null) {
  onMessage.accept(df);
  }
+
+ return df;
  } catch (EmptyMessageException ignored) {
  } catch (InvalidExtendedSquitterTypeCodeException | UnknownDownlinkFormatException e) {
  LOGGER.error(e.getMessage());
  } catch (Throwable throwable) {
  LOGGER.error("Message could not be parsed", throwable);
  }
+
+ return null;
  }
 
 

diff --git a/src/main/java/aero/t2s/modes/ModeSTrackHandler.java b/src/main/java/aero/t2s/modes/ModeSTrackHandler.java
@@ -45,13 +45,13 @@ public void handle(final String input) {
  executor.execute(() -> handleSync(input));
  }
 
- public void handleSync(final String input) {
+ public DownlinkFormat handleSync(final String input) {
  try {
  DownlinkFormat df = decoder.decode(toData(input));
  Track track = decoder.getTrack(df.getIcao());
 
  if (track == null) {
- return;
+ return null;
  }
 
  df.apply(track);
@@ -66,12 +66,16 @@ public void handleSync(final String input) {
  if (onMessage != null) {
  onMessage.accept(df);
  }
+
+ return df;
  } catch (EmptyMessageException ignored) {
  } catch (InvalidExtendedSquitterTypeCodeException | UnknownDownlinkFormatException e) {
  LOGGER.error(e.getMessage());
  } catch (Throwable throwable) {
  LOGGER.error("Message could not be parsed", throwable);
  }
+
+ return null;
  }
 
  public void enableCleanup() {