Merge pull request #17 from Oblarg/update-2023

Update for 2023
Oblarg · Nov 13, 2022 · a2cb135 · a2cb135
2 parents ab4e8e9 + 62712fd
commit a2cb135
Show file tree

Hide file tree

Showing 20 changed files with 107 additions and 85 deletions.
diff --git a/docs/index-all.html b/docs/index-all.html
@@ -660,7 +660,7 @@ <h2 class="title">R</h2>
 <dl>
 <dt><span class="memberNameLink"><a href="io/github/oblarg/oblog/annotations/Log.ThreeAxisAccelerometer.html#range()">range()</a></span> - Method in annotation type io.github.oblarg.oblog.annotations.<a href="io/github/oblarg/oblog/annotations/Log.ThreeAxisAccelerometer.html" title="annotation in io.github.oblarg.oblog.annotations">Log.ThreeAxisAccelerometer</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="io/github/oblarg/oblog/Logger.html#registerEntry(edu.wpi.first.networktables.NetworkTableEntry,java.util.function.Supplier)">registerEntry(NetworkTableEntry, Supplier&lt;Object&gt;)</a></span> - Static method in class io.github.oblarg.oblog.<a href="io/github/oblarg/oblog/Logger.html" title="class in io.github.oblarg.oblog">Logger</a></dt>
+<dt><span class="memberNameLink"><a href="io/github/oblarg/oblog/Logger.html#registerEntry(edu.wpi.first.networktables.GenericEntry,java.util.function.Supplier)">registerEntry(GenericEntry, Supplier&lt;Object&gt;)</a></span> - Static method in class io.github.oblarg.oblog.<a href="io/github/oblarg/oblog/Logger.html" title="class in io.github.oblarg.oblog">Logger</a></dt>
 <dd>
 <div class="block">Registers a new entry.</div>
 </dd>

diff --git a/docs/io/github/oblarg/oblog/Logger.html b/docs/io/github/oblarg/oblog/Logger.html
@@ -207,7 +207,7 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i4" class="altColor">
 <td class="colFirst"><code>static void</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#registerEntry(edu.wpi.first.networktables.NetworkTableEntry,java.util.function.Supplier)">registerEntry</a></span>&#8203;(edu.wpi.first.networktables.NetworkTableEntry&nbsp;entry,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#registerEntry(edu.wpi.first.networktables.GenericEntry,java.util.function.Supplier)">registerEntry</a></span>&#8203;(edu.wpi.first.networktables.GenericEntry&nbsp;entry,
              java.util.function.Supplier&lt;java.lang.Object&gt;&nbsp;supplier)</code></th>
 <td class="colLast">
 <div class="block">Registers a new entry.</div>
@@ -389,13 +389,13 @@ <h4>updateEntries</h4>
 <div class="block">Updates all entries.  Must be called periodically from the main robot loop.</div>
 </li>
 </ul>
-<a id="registerEntry(edu.wpi.first.networktables.NetworkTableEntry,java.util.function.Supplier)">
+<a id="registerEntry(edu.wpi.first.networktables.GenericEntry,java.util.function.Supplier)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>registerEntry</h4>
-<pre class="methodSignature">public static&nbsp;void&nbsp;registerEntry&#8203;(edu.wpi.first.networktables.NetworkTableEntry&nbsp;entry,
+<pre class="methodSignature">public static&nbsp;void&nbsp;registerEntry&#8203;(edu.wpi.first.networktables.GenericEntry&nbsp;entry,
                                  java.util.function.Supplier&lt;java.lang.Object&gt;&nbsp;supplier)</pre>
 <div class="block">Registers a new entry.  To be called during initial logging configuration for any value that
  will

diff --git a/docs/io/github/oblarg/oblog/SimpleWidgetWrapper.html b/docs/io/github/oblarg/oblog/SimpleWidgetWrapper.html
@@ -147,7 +147,7 @@ <h3>Method Summary</h3>
 <th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>edu.wpi.first.networktables.NetworkTableEntry</code></td>
+<td class="colFirst"><code>edu.wpi.first.networktables.GenericEntry</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getEntry()">getEntry</a></span>()</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -196,7 +196,7 @@ <h3>Method Detail</h3>
 <ul class="blockList">
 <li class="blockList">
 <h4>getEntry</h4>
-<pre class="methodSignature">edu.wpi.first.networktables.NetworkTableEntry&nbsp;getEntry()</pre>
+<pre class="methodSignature">edu.wpi.first.networktables.GenericEntry&nbsp;getEntry()</pre>
 </li>
 </ul>
 <a id="withProperties(java.util.Map)">

diff --git a/docs/member-search-index.js b/docs/member-search-index.js
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id 'maven-publish'
-    id "edu.wpi.first.GradleRIO" version "2022.1.1-beta-3"
+    id "edu.wpi.first.GradleRIO" version "2023.1.1-beta-3"
 }
 
 // Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries.

diff --git a/lib/src/main/java/io/github/oblarg/oblog/Logger.java b/lib/src/main/java/io/github/oblarg/oblog/Logger.java
@@ -1,15 +1,16 @@
 package io.github.oblarg.oblog;
 
 import edu.wpi.first.cscore.VideoSource;
-import edu.wpi.first.networktables.EntryListenerFlags;
+import edu.wpi.first.networktables.GenericEntry;
+import edu.wpi.first.networktables.NetworkTableEvent;
 import edu.wpi.first.networktables.NetworkTableInstance;
 import edu.wpi.first.util.sendable.Sendable;
 import edu.wpi.first.wpilibj.*;
 import edu.wpi.first.wpilibj.shuffleboard.*;
 
 import io.github.oblarg.oblog.annotations.*;
 
-import edu.wpi.first.networktables.NetworkTableEntry;
+import edu.wpi.first.networktables.GenericEntry;
 
 import static java.util.Map.entry;
 
@@ -130,7 +131,7 @@ public static void updateEntries() {
    * @param entry The entry to be updated.
    * @param supplier The supplier with which to update the entry.
    */
-  public static void registerEntry(NetworkTableEntry entry, Supplier<Object> supplier) {
+  public static void registerEntry(GenericEntry entry, Supplier<Object> supplier) {
     entrySupplierMap.put(entry, supplier);
   }
 
@@ -258,7 +259,7 @@ static void configureLoggingTest(
   }
 
   /** A map of the suppliers that are used to update each entry. */
-  private static final Map<NetworkTableEntry, Supplier<Object>> entrySupplierMap = new HashMap<>();
+  private static final Map<GenericEntry, Supplier<Object>> entrySupplierMap = new HashMap<>();
 
   enum LogType {
     LOG,
@@ -304,41 +305,41 @@ void processSetter(
                       params.tabName().equals("DEFAULT")
                           ? bin
                           : new WrappedShuffleboardContainer(Shuffleboard.getTab(params.tabName()));
-                  NetworkTableEntry entry =
+                  GenericEntry entry =
                       bin.add(
                               (params.name().equals("NO_NAME")) ? name : params.name(),
                               params.defaultValueBoolean())
                           .withWidget(BuiltInWidgets.kToggleButton.getWidgetName())
                           .withPosition(params.columnIndex(), params.rowIndex())
                           .withSize(params.width(), params.height())
                           .getEntry();
-                  nt.addEntryListener(
-                      entry,
+                  nt.addListener(
+                      entry.getTopic(),
+                      EnumSet.of(NetworkTableEvent.Kind.kValueAll),
                       (entryNotification) ->
                           setterRunner.execute(
-                              () -> setter.accept((boolean) entryNotification.value.getValue())),
-                      EntryListenerFlags.kUpdate);
+                              () -> setter.accept(entryNotification.valueData.value.getValue())));
                   setter.accept(params.defaultValueBoolean());
                 } else {
                   Config params = (Config) rawParams;
                   bin =
                       params.tabName().equals("DEFAULT")
                           ? bin
                           : new WrappedShuffleboardContainer(Shuffleboard.getTab(params.tabName()));
-                  NetworkTableEntry entry =
+                  GenericEntry entry =
                       bin.add(
                               (params.name().equals("NO_NAME")) ? name : params.name(),
                               params.defaultValueNumeric())
                           .withWidget(BuiltInWidgets.kTextView.getWidgetName())
                           .withPosition(params.columnIndex(), params.rowIndex())
                           .withSize(params.width(), params.height())
                           .getEntry();
-                  nt.addEntryListener(
-                      entry,
+                  nt.addListener(
+                      entry.getTopic(),
+                      EnumSet.of(NetworkTableEvent.Kind.kValueAll),
                       (entryNotification) ->
                           setterRunner.execute(
-                              () -> setter.accept((Number) entryNotification.value.getValue())),
-                      EntryListenerFlags.kUpdate);
+                              () -> setter.accept(entryNotification.valueData.value.getValue())));
                   setter.accept(params.defaultValueNumeric());
                 }
               }),
@@ -350,20 +351,20 @@ void processSetter(
                     params.tabName().equals("DEFAULT")
                         ? bin
                         : new WrappedShuffleboardContainer(Shuffleboard.getTab(params.tabName()));
-                NetworkTableEntry entry =
+                GenericEntry entry =
                     bin.add(
                             (params.name().equals("NO_NAME")) ? name : params.name(),
                             params.defaultValue())
                         .withWidget(BuiltInWidgets.kToggleButton.getWidgetName())
                         .withPosition(params.columnIndex(), params.rowIndex())
                         .withSize(params.width(), params.height())
                         .getEntry();
-                nt.addEntryListener(
-                    entry,
+                nt.addListener(
+                    entry.getTopic(),
+                    EnumSet.of(NetworkTableEvent.Kind.kValueAll),
                     (entryNotification) ->
                         setterRunner.execute(
-                            () -> setter.accept((boolean) entryNotification.value.getValue())),
-                    EntryListenerFlags.kUpdate);
+                            () -> setter.accept(entryNotification.valueData.value.getValue())));
                 setter.accept(params.defaultValue());
               }),
           entry(
@@ -374,20 +375,20 @@ void processSetter(
                     params.tabName().equals("DEFAULT")
                         ? bin
                         : new WrappedShuffleboardContainer(Shuffleboard.getTab(params.tabName()));
-                NetworkTableEntry entry =
+                GenericEntry entry =
                     bin.add(
                             (params.name().equals("NO_NAME")) ? name : params.name(),
                             params.defaultValue())
                         .withWidget(BuiltInWidgets.kToggleSwitch.getWidgetName())
                         .withPosition(params.columnIndex(), params.rowIndex())
                         .withSize(params.width(), params.height())
                         .getEntry();
-                nt.addEntryListener(
-                    entry,
+                nt.addListener(
+                    entry.getTopic(),
+                    EnumSet.of(NetworkTableEvent.Kind.kValueAll),
                     (entryNotification) ->
                         setterRunner.execute(
-                            () -> setter.accept((boolean) entryNotification.value.getValue())),
-                    EntryListenerFlags.kUpdate);
+                            () -> setter.accept(entryNotification.valueData.value.getValue())));
                 setter.accept(params.defaultValue());
               }),
           entry(
@@ -398,7 +399,7 @@ void processSetter(
                     params.tabName().equals("DEFAULT")
                         ? bin
                         : new WrappedShuffleboardContainer(Shuffleboard.getTab(params.tabName()));
-                NetworkTableEntry entry =
+                GenericEntry entry =
                     bin.add(
                             (params.name().equals("NO_NAME")) ? name : params.name(),
                             params.defaultValue())
@@ -411,12 +412,12 @@ void processSetter(
                         .withPosition(params.columnIndex(), params.rowIndex())
                         .withSize(params.width(), params.height())
                         .getEntry();
-                nt.addEntryListener(
-                    entry,
+                nt.addListener(
+                    entry.getTopic(),
+                    EnumSet.of(NetworkTableEvent.Kind.kValueAll),
                     (entryNotification) ->
                         setterRunner.execute(
-                            () -> setter.accept((Number) entryNotification.value.getValue())),
-                    EntryListenerFlags.kUpdate);
+                            () -> setter.accept(entryNotification.valueData.value.getValue())));
                 setter.accept(params.defaultValue());
               }));
 

diff --git a/lib/src/main/java/io/github/oblarg/oblog/NTContainer.java b/lib/src/main/java/io/github/oblarg/oblog/NTContainer.java
@@ -23,7 +23,7 @@ public ShuffleboardLayoutWrapper getLayout(String title, LayoutType type) {
   public SimpleWidgetWrapper add(String title, Object defaultValue) {
     logErrorCheck(defaultValue, title, table.getPath());
     try {
-      return new NTSimpleWidget(table.getEntry(title), defaultValue);
+      return new NTSimpleWidget(table.getTopic(title).getGenericEntry(), defaultValue);
     } catch (IllegalArgumentException e) {
       throw new IllegalArgumentException(
           "Error!  Attempted to log duplicate widget "

diff --git a/lib/src/main/java/io/github/oblarg/oblog/NTLayout.java b/lib/src/main/java/io/github/oblarg/oblog/NTLayout.java
@@ -30,7 +30,7 @@ public ShuffleboardLayoutWrapper getLayout(String title, LayoutType type) {
   public SimpleWidgetWrapper add(String title, Object defaultValue) {
     logErrorCheck(defaultValue, title, table.getPath());
     try {
-      return new NTSimpleWidget(table.getEntry(title), defaultValue);
+      return new NTSimpleWidget(table.getTopic(title).getGenericEntry(), defaultValue);
     } catch (IllegalArgumentException e) {
       throw new IllegalArgumentException(
           "Error!  Attempted to log duplicate widget "

diff --git a/lib/src/main/java/io/github/oblarg/oblog/NTSimpleWidget.java b/lib/src/main/java/io/github/oblarg/oblog/NTSimpleWidget.java
@@ -1,20 +1,21 @@
 package io.github.oblarg.oblog;
 
+import edu.wpi.first.networktables.GenericEntry;
 import edu.wpi.first.networktables.NetworkTableEntry;
 
 import java.util.Map;
 
 class NTSimpleWidget implements SimpleWidgetWrapper {
 
-  NetworkTableEntry entry;
+  GenericEntry entry;
 
-  NTSimpleWidget(NetworkTableEntry entry, Object value) {
+  NTSimpleWidget(GenericEntry entry, Object value) {
     this.entry = entry;
     entry.setValue(value);
   }
 
   @Override
-  public NetworkTableEntry getEntry() {
+  public GenericEntry getEntry() {
     return entry;
   }
 

diff --git a/lib/src/main/java/io/github/oblarg/oblog/SimpleWidgetWrapper.java b/lib/src/main/java/io/github/oblarg/oblog/SimpleWidgetWrapper.java
@@ -1,6 +1,6 @@
 package io.github.oblarg.oblog;
 
-import edu.wpi.first.networktables.NetworkTableEntry;
+import edu.wpi.first.networktables.GenericEntry;
 
 import java.util.Map;
 
@@ -9,7 +9,7 @@
  * implementation if desired.
  */
 public interface SimpleWidgetWrapper {
-  NetworkTableEntry getEntry();
+  GenericEntry getEntry();
 
   SimpleWidgetWrapper withProperties(Map<String, Object> properties);
 

diff --git a/lib/src/main/java/io/github/oblarg/oblog/WrappedSimpleWidget.java b/lib/src/main/java/io/github/oblarg/oblog/WrappedSimpleWidget.java
@@ -1,6 +1,6 @@
 package io.github.oblarg.oblog;
 
-import edu.wpi.first.networktables.NetworkTableEntry;
+import edu.wpi.first.networktables.GenericEntry;
 import edu.wpi.first.wpilibj.shuffleboard.SimpleWidget;
 
 import java.util.Map;
@@ -14,7 +14,7 @@ class WrappedSimpleWidget implements SimpleWidgetWrapper {
   }
 
   @Override
-  public NetworkTableEntry getEntry() {
+  public GenericEntry getEntry() {
     return widget.getEntry();
   }
 

diff --git a/lib/src/test/java/io/github/oblarg/oblog/ArraysAndListsTester.java b/lib/src/test/java/io/github/oblarg/oblog/ArraysAndListsTester.java
@@ -1,6 +1,6 @@
 package io.github.oblarg.oblog;
 
-import edu.wpi.first.networktables.NetworkTableEntry;
+import edu.wpi.first.networktables.GenericEntry;
 import edu.wpi.first.wpilibj.shuffleboard.BuiltInLayouts;
 import org.junit.Test;
 
@@ -16,7 +16,7 @@ public class ArraysAndListsTester {
   public void testArraysAndLists() {
     long startTime = System.currentTimeMillis();
 
-    List<NetworkTableEntry> mockedEntries = new ArrayList<>();
+    List<GenericEntry> mockedEntries = new ArrayList<>();
 
     TestRootContainer rootContainer = new TestRootContainer();
 
@@ -47,7 +47,7 @@ public void testArraysAndLists() {
 
     Logger.updateEntries();
 
-    for (NetworkTableEntry entry : mockedEntries) {
+    for (GenericEntry entry : mockedEntries) {
       verify(entry).setValue(any());
     }
 

diff --git a/lib/src/test/java/io/github/oblarg/oblog/ChildRecursionTester.java b/lib/src/test/java/io/github/oblarg/oblog/ChildRecursionTester.java
@@ -1,6 +1,6 @@
 package io.github.oblarg.oblog;
 
-import edu.wpi.first.networktables.NetworkTableEntry;
+import edu.wpi.first.networktables.GenericEntry;
 import edu.wpi.first.wpilibj.shuffleboard.BuiltInLayouts;
 import org.junit.Test;
 
@@ -14,7 +14,7 @@
 public class ChildRecursionTester {
   @Test
   public void testChildRecursion() {
-    List<NetworkTableEntry> mockedEntries = new ArrayList<>();
+    List<GenericEntry> mockedEntries = new ArrayList<>();
 
     TestRootContainer rootContainer = new TestRootContainer();
 
@@ -32,7 +32,7 @@ public void testChildRecursion() {
 
     Logger.updateEntries();
 
-    for (NetworkTableEntry entry : mockedEntries) {
+    for (GenericEntry entry : mockedEntries) {
       verify(entry).setValue(any());
     }
   }

diff --git a/lib/src/test/java/io/github/oblarg/oblog/ConfigMethodNameTester.java b/lib/src/test/java/io/github/oblarg/oblog/ConfigMethodNameTester.java
@@ -1,6 +1,6 @@
 package io.github.oblarg.oblog;
 
-import edu.wpi.first.networktables.NetworkTableEntry;
+import edu.wpi.first.networktables.GenericEntry;
 import edu.wpi.first.wpilibj.shuffleboard.BuiltInLayouts;
 
 import io.github.oblarg.oblog.annotations.Config;
@@ -14,7 +14,7 @@
 public class ConfigMethodNameTester {
   @Test
   public void testConfigMethodName() {
-    List<NetworkTableEntry> mockedEntries = new ArrayList<>();
+    List<GenericEntry> mockedEntries = new ArrayList<>();
 
     TestRootContainer rootContainer = new TestRootContainer();
 

diff --git a/lib/src/test/java/io/github/oblarg/oblog/CyclicDetectionTester.java b/lib/src/test/java/io/github/oblarg/oblog/CyclicDetectionTester.java
@@ -1,6 +1,6 @@
 package io.github.oblarg.oblog;
 
-import edu.wpi.first.networktables.NetworkTableEntry;
+import edu.wpi.first.networktables.GenericEntry;
 import edu.wpi.first.wpilibj.shuffleboard.BuiltInLayouts;
 import org.junit.Test;
 
@@ -14,7 +14,7 @@ public class CyclicDetectionTester {
 
   @Test
   public void testCyclic() {
-    List<NetworkTableEntry> mockedEntries = new ArrayList<>();
+    List<GenericEntry> mockedEntries = new ArrayList<>();
 
     TestRootContainer rootContainer = new TestRootContainer();
 
@@ -30,7 +30,7 @@ public void testCyclic() {
 
     Logger.updateEntries();
 
-    for (NetworkTableEntry entry : mockedEntries) {
+    for (GenericEntry entry : mockedEntries) {
       verify(entry).setValue(any());
     }
   }