From dd23182292f068eb69584f87ba676ef4e8a21001 Mon Sep 17 00:00:00 2001 From: adrian-kong Date: Wed, 6 Apr 2022 13:03:29 +1000 Subject: [PATCH 1/3] Suppressed warnings and deprecation notices for Java Adds @SuppressedWarning for unchecked generics and removes SBPStruct#parse return from generic to SBPStruct. Relates to DEVINFRA-479 --- java/src/com/swiftnav/sbp/SBPMessage.java | 7 ++++--- java/src/com/swiftnav/sbp/SBPStruct.java | 2 +- java/src/com/swiftnav/sbp/client/SBPHandler.java | 10 ++-------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/java/src/com/swiftnav/sbp/SBPMessage.java b/java/src/com/swiftnav/sbp/SBPMessage.java index 7777be0fd5..cb6d8f2b0e 100644 --- a/java/src/com/swiftnav/sbp/SBPMessage.java +++ b/java/src/com/swiftnav/sbp/SBPMessage.java @@ -92,6 +92,7 @@ protected void build(Builder builder) { } /** There is no exposed access to this class outside of libsbp. */ + @SuppressWarnings("unchecked") public class Parser { private ByteBuffer buf; @@ -212,11 +213,11 @@ public T[] getArray(Class t) { LinkedList l = new LinkedList(); while (true) { try { - T tmp = t.newInstance(); + T tmp = t.getDeclaredConstructor().newInstance(); tmp.parse(this); l.add(tmp); } catch (BufferUnderflowException e) { - return (T[]) l.toArray((T[]) Array.newInstance(t, l.size())); + return l.toArray((T[]) Array.newInstance(t, l.size())); } catch (Exception e) { e.printStackTrace(); return null; @@ -228,7 +229,7 @@ public T[] getArray(Class t, int n) { T[] ret = (T[]) Array.newInstance(t, n); for (int i = 0; i < n; i++) { try { - ret[i] = t.newInstance(); + ret[i] = t.getDeclaredConstructor().newInstance(); ret[i].parse(this); } catch (Exception e) { e.printStackTrace(); diff --git a/java/src/com/swiftnav/sbp/SBPStruct.java b/java/src/com/swiftnav/sbp/SBPStruct.java index 7f8a3efa49..99f1f1f755 100644 --- a/java/src/com/swiftnav/sbp/SBPStruct.java +++ b/java/src/com/swiftnav/sbp/SBPStruct.java @@ -20,7 +20,7 @@ protected SBPStruct() {} protected abstract void build(SBPMessage.Builder builder); - protected abstract T parse(SBPMessage.Parser parser) throws SBPBinaryException; + protected abstract SBPStruct parse(SBPMessage.Parser parser) throws SBPBinaryException; protected abstract JSONObject toJSON(); diff --git a/java/src/com/swiftnav/sbp/client/SBPHandler.java b/java/src/com/swiftnav/sbp/client/SBPHandler.java index 0fd5a3c100..9cc3ecd6d7 100644 --- a/java/src/com/swiftnav/sbp/client/SBPHandler.java +++ b/java/src/com/swiftnav/sbp/client/SBPHandler.java @@ -116,11 +116,7 @@ public void addCallbackMulti(int[] ids, Reference cb) { public void removeCallback(SBPCallback cb) { synchronized (callbacks) { for (List> cblist : callbacks.values()) { - for (Reference ref : cblist) { - if (ref.get() == cb) { - cblist.remove(ref); - } - } + cblist.removeIf(ref -> ref.get() == cb); } strongCallbacks.remove(cb); } @@ -201,9 +197,7 @@ protected SBPMessage getNext() { if (msg != null) { return msg; } - continue; - } catch (InterruptedException e) { - continue; + } catch (InterruptedException ignored) { } } // If we get here finished is set to true so there are no more messages available From 274ddd85551a707425a11c9ff3fd4257d93c3b14 Mon Sep 17 00:00:00 2001 From: adrian-kong Date: Fri, 8 Apr 2022 08:24:47 +1000 Subject: [PATCH 2/3] Skip SONAR check --- java/src/com/swiftnav/sbp/client/SBPHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/src/com/swiftnav/sbp/client/SBPHandler.java b/java/src/com/swiftnav/sbp/client/SBPHandler.java index 9cc3ecd6d7..eed798dada 100644 --- a/java/src/com/swiftnav/sbp/client/SBPHandler.java +++ b/java/src/com/swiftnav/sbp/client/SBPHandler.java @@ -197,7 +197,7 @@ protected SBPMessage getNext() { if (msg != null) { return msg; } - } catch (InterruptedException ignored) { + } catch (InterruptedException ignored) { //NOSONAR } } // If we get here finished is set to true so there are no more messages available From 783447bba3ae7573f22beaa21c064b961a1a5799 Mon Sep 17 00:00:00 2001 From: Jason Mobarak Date: Fri, 8 Apr 2022 10:43:25 +1000 Subject: [PATCH 3/3] Java spotless fix --- java/src/com/swiftnav/sbp/client/SBPHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/src/com/swiftnav/sbp/client/SBPHandler.java b/java/src/com/swiftnav/sbp/client/SBPHandler.java index eed798dada..3f565ae2a6 100644 --- a/java/src/com/swiftnav/sbp/client/SBPHandler.java +++ b/java/src/com/swiftnav/sbp/client/SBPHandler.java @@ -197,7 +197,7 @@ protected SBPMessage getNext() { if (msg != null) { return msg; } - } catch (InterruptedException ignored) { //NOSONAR + } catch (InterruptedException ignored) { // NOSONAR } } // If we get here finished is set to true so there are no more messages available