From 165d2837cfaa0021d0be083bcb2d4efb4e6a252b Mon Sep 17 00:00:00 2001
From: sciencewhiz <sciencewhiz@users.noreply.github.com>
Date: Sat, 12 Feb 2022 22:30:02 -0800
Subject: [PATCH] [wpilib] Preferences: Set Persistent in Init methods (#4025)

Fixes #4018
---
 wpilibc/src/main/native/cpp/Preferences.cpp                 | 6 ++++++
 .../src/main/java/edu/wpi/first/wpilibj/Preferences.java    | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/wpilibc/src/main/native/cpp/Preferences.cpp b/wpilibc/src/main/native/cpp/Preferences.cpp
index e17db69b70..4663875e99 100644
--- a/wpilibc/src/main/native/cpp/Preferences.cpp
+++ b/wpilibc/src/main/native/cpp/Preferences.cpp
@@ -87,6 +87,7 @@ void Preferences::PutString(std::string_view key, std::string_view value) {
 void Preferences::InitString(std::string_view key, std::string_view value) {
   auto entry = ::GetInstance().table->GetEntry(key);
   entry.SetDefaultString(value);
+  entry.SetPersistent();
 }
 
 void Preferences::SetInt(std::string_view key, int value) {
@@ -102,6 +103,7 @@ void Preferences::PutInt(std::string_view key, int value) {
 void Preferences::InitInt(std::string_view key, int value) {
   auto entry = ::GetInstance().table->GetEntry(key);
   entry.SetDefaultDouble(value);
+  entry.SetPersistent();
 }
 
 void Preferences::SetDouble(std::string_view key, double value) {
@@ -117,6 +119,7 @@ void Preferences::PutDouble(std::string_view key, double value) {
 void Preferences::InitDouble(std::string_view key, double value) {
   auto entry = ::GetInstance().table->GetEntry(key);
   entry.SetDefaultDouble(value);
+  entry.SetPersistent();
 }
 
 void Preferences::SetFloat(std::string_view key, float value) {
@@ -132,6 +135,7 @@ void Preferences::PutFloat(std::string_view key, float value) {
 void Preferences::InitFloat(std::string_view key, float value) {
   auto entry = ::GetInstance().table->GetEntry(key);
   entry.SetDefaultDouble(value);
+  entry.SetPersistent();
 }
 
 void Preferences::SetBoolean(std::string_view key, bool value) {
@@ -147,6 +151,7 @@ void Preferences::PutBoolean(std::string_view key, bool value) {
 void Preferences::InitBoolean(std::string_view key, bool value) {
   auto entry = ::GetInstance().table->GetEntry(key);
   entry.SetDefaultBoolean(value);
+  entry.SetPersistent();
 }
 
 void Preferences::SetLong(std::string_view key, int64_t value) {
@@ -162,6 +167,7 @@ void Preferences::PutLong(std::string_view key, int64_t value) {
 void Preferences::InitLong(std::string_view key, int64_t value) {
   auto entry = ::GetInstance().table->GetEntry(key);
   entry.SetDefaultDouble(value);
+  entry.SetPersistent();
 }
 
 bool Preferences::ContainsKey(std::string_view key) {
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Preferences.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Preferences.java
index a15fb70b08..cf7b9ec1da 100644
--- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Preferences.java
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Preferences.java
@@ -109,6 +109,7 @@ public final class Preferences {
   public static void initString(String key, String value) {
     NetworkTableEntry entry = m_table.getEntry(key);
     entry.setDefaultString(value);
+    entry.setPersistent();
   }
 
   /**
@@ -144,6 +145,7 @@ public final class Preferences {
   public static void initInt(String key, int value) {
     NetworkTableEntry entry = m_table.getEntry(key);
     entry.setDefaultDouble(value);
+    entry.setPersistent();
   }
 
   /**
@@ -179,6 +181,7 @@ public final class Preferences {
   public static void initDouble(String key, double value) {
     NetworkTableEntry entry = m_table.getEntry(key);
     entry.setDefaultDouble(value);
+    entry.setPersistent();
   }
 
   /**
@@ -214,6 +217,7 @@ public final class Preferences {
   public static void initFloat(String key, float value) {
     NetworkTableEntry entry = m_table.getEntry(key);
     entry.setDefaultDouble(value);
+    entry.setPersistent();
   }
 
   /**
@@ -249,6 +253,7 @@ public final class Preferences {
   public static void initBoolean(String key, boolean value) {
     NetworkTableEntry entry = m_table.getEntry(key);
     entry.setDefaultBoolean(value);
+    entry.setPersistent();
   }
 
   /**
@@ -284,6 +289,7 @@ public final class Preferences {
   public static void initLong(String key, long value) {
     NetworkTableEntry entry = m_table.getEntry(key);
     entry.setDefaultDouble(value);
+    entry.setPersistent();
   }
 
   /**