Revert "Various NetworkTables fixes (wpilibsuite#815)"

This reverts commit 60e3ba1.

Author: sciencewhiz

api/src/main/java/edu/wpi/first/shuffleboard/api/util/FxUtils.java

@@ -4,14 +4,9 @@
 import edu.wpi.first.shuffleboard.api.widget.ParametrizedController;
 
 import java.io.IOException;
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
 import javafx.application.Platform;
@@ -43,14 +38,6 @@ public final class FxUtils {
 
   private static final Object FX_CONTROLLER_KEY = new Object();
 
-  private static final ScheduledExecutorService laterScheduler =
-          Executors.newSingleThreadScheduledExecutor(runnable -> {
-            var thread = new Thread(runnable);
-            thread.setDaemon(true);
-            thread.setName("Shuffleboard Run Later Scheduler");
-            return thread;
-          });
-
   private FxUtils() {
     throw new UnsupportedOperationException("This is a utility class!");
   }
@@ -81,15 +68,6 @@ public static CompletableFuture<Boolean> runOnFxThread(Runnable task) {
     return future;
   }
 
-  /**
-   * Runs a task on the platform thread at some point in the future.
-   * @param task the task to run
-   * @param delay how far in the future the task should run
-   */
-  public static void runLater(Runnable task, Duration delay) {
-    laterScheduler.schedule(() -> runOnFxThread(task), delay.get(ChronoUnit.NANOS), TimeUnit.NANOSECONDS);
-  }
-
   /**
    * Binds a property to the value of an entry in a map.
    *

plugins/networktables/src/main/java/edu/wpi/first/shuffleboard/plugin/networktables/TabGenerator.java

@@ -102,12 +102,12 @@ public void start() {
         });
 
     metadataSubscriber =
-        new MultiSubscriber(inst, new String[] {METADATA_TABLE_NAME + "/"});
+        new MultiSubscriber(inst, new String[] {METADATA_TABLE_NAME + "/"}, PubSubOption.hidden(true));
     metadataListener = inst.addListener(
         metadataSubscriber,
         EnumSet.of(NetworkTableEvent.Kind.kValueAll, NetworkTableEvent.Kind.kImmediate),
         this::metadataChanged);
-    dataSubscriber = new MultiSubscriber(inst, new String[] {ROOT_TABLE_NAME + "/"});
+    dataSubscriber = new MultiSubscriber(inst, new String[] {ROOT_TABLE_NAME + "/"}, PubSubOption.hidden(true));
     dataListener = inst.addListener(
         dataSubscriber,
         EnumSet.of(NetworkTableEvent.Kind.kValueAll, NetworkTableEvent.Kind.kImmediate),

plugins/networktables/src/main/java/edu/wpi/first/shuffleboard/plugin/networktables/sources/CompositeNetworkTableSource.java

@@ -47,7 +47,7 @@ public CompositeNetworkTableSource(String tableName, ComplexDataType<D> dataType
     setData(dataType.getDefaultValue());
 
     setTableListener((key, event) -> {
-      String relativeKey = NetworkTable.basenameKey(key);
+      String relativeKey = NetworkTable.normalizeKey(key.substring(path.length() + 1), false);
       if (event.is(NetworkTableEvent.Kind.kUnpublish)) {
         backingMap.remove(relativeKey);
       } else if (event.valueData != null) {

plugins/networktables/src/main/java/edu/wpi/first/shuffleboard/plugin/networktables/sources/NetworkTableSource.java

@@ -16,7 +16,6 @@
 import edu.wpi.first.networktables.NetworkTableInstance;
 import edu.wpi.first.networktables.PubSubOption;
 
-import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.Map;
 import java.util.Optional;
@@ -73,19 +72,7 @@ protected final void setTableListener(TableListener listener) {
     }
     setConnected(true);
     if (isSingular()) {
-      // Handle leading slashes. Topic names are exact and do no normalization
-      String topicName;
-      if (Arrays.stream(inst.getTopicInfo()).anyMatch(t -> t.name.equals(fullTableKey))) {
-        topicName = fullTableKey;
-      } else {
-        if (fullTableKey.startsWith("/")) {
-          topicName = NetworkTable.normalizeKey(fullTableKey, false);
-        } else {
-          topicName = NetworkTable.normalizeKey(fullTableKey, true);
-        }
-      }
-
-      singleSub = inst.getTopic(topicName).genericSubscribe(PubSubOption.hidden(false), PubSubOption.sendAll(true));
+      singleSub = inst.getTopic(fullTableKey).genericSubscribe(PubSubOption.hidden(false), PubSubOption.sendAll(true));
       listenerUid = inst.addListener(
         singleSub,
         EnumSet.of(
@@ -211,19 +198,24 @@ public static void removeAllCachedSources() {
   public static DataSource<?> forKey(String fullTableKey) {
     String key = NetworkTable.normalizeKey(fullTableKey, false);
     final String uri = NetworkTableSourceType.getInstance().toUri(key);
-    return sources.computeIfAbsent(uri, __ -> {
-      DataType<?> lookup = NetworkTableUtils.dataTypeForEntry(key);
-      if (lookup == DataTypes.Unknown) {
-        // No known data type, fall back to generic map data
-        lookup = DataTypes.Map;
-      }
-      if (lookup.isComplex()) {
+    if (NetworkTableUtils.rootTable.containsKey(key)) {
+      // Key-value pair
+      return sources.computeIfAbsent(uri, __ ->
+          new SingleKeyNetworkTableSource<>(NetworkTableUtils.rootTable, key,
+              NetworkTableUtils.dataTypeForEntry(key)));
+    }
+    if (NetworkTableUtils.rootTable.containsSubTable(key) || key.isEmpty()) {
+      // Composite
+      return sources.computeIfAbsent(uri, __ -> {
+        DataType<?> lookup = NetworkTableUtils.dataTypeForEntry(key);
+        if (lookup == DataTypes.Unknown) {
+          // No known data type, fall back to generic map data
+          lookup = DataTypes.Map;
+        }
         return new CompositeNetworkTableSource<>(key, (ComplexDataType<?>) lookup);
-      } else {
-        return new SingleKeyNetworkTableSource<>(NetworkTableUtils.rootTable, key,
-                NetworkTableUtils.dataTypeForEntry(key));
-      }
-    });
+      });
+    }
+    return DataSource.none();
   }
 
   /**

plugins/networktables/src/main/java/edu/wpi/first/shuffleboard/plugin/networktables/sources/NetworkTableSourceType.java

@@ -26,7 +26,6 @@
 import java.util.HashMap;
 import java.util.List;
 
-import java.time.Duration;
 import java.util.Map;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
@@ -82,10 +81,7 @@ public NetworkTableSourceType(NetworkTablesPlugin plugin) {
                     topic.getInfo(),
                     null,
                     null,
-                    null
-                ),
-                true
-            );
+                    null));
           }
         }
       });
@@ -97,7 +93,7 @@ public NetworkTableSourceType(NetworkTablesPlugin plugin) {
         EnumSet.of(
           NetworkTableEvent.Kind.kImmediate,
           NetworkTableEvent.Kind.kTopic),
-        event -> AsyncUtils.runAsync(() -> handleEvent(event, true)));
+        event -> AsyncUtils.runAsync(() -> handleEvent(event)));
   }
 
   @Override
@@ -195,16 +191,9 @@ public String toUri(String sourceName) {
     return super.toUri(NetworkTable.normalizeKey(sourceName));
   }
 
-  private void handleEvent(NetworkTableEvent event, boolean allowDeferral) {
+  private void handleEvent(NetworkTableEvent event) {
     final boolean delete = event.is(NetworkTableEvent.Kind.kUnpublish);
     final TopicInfo topicInfo = event.topicInfo;
-
-    if (!topicInfo.name.endsWith("/.type") && allowDeferral) {
-      // Defer later to avoid race conditions where type metadata is not received first
-      FxUtils.runLater(() -> handleEvent(event, false), Duration.ofMillis(50));
-      return;
-    }
-
     if (topicInfo.name.endsWith("/.type") && !delete) {
       // Got type metadata for composite data
       // Remove trailing "/.type"