[wpinet] Fix incorrect jni definitions (#4605)

Also re-enables the check task that would have caught this.

wpinet/src/main/native/cpp/jni/WPINetJNI.cpp

@@ -50,12 +50,12 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* vm, void* reserved) {
 }
 
 /*
- * Class:     edu_wpi_first_util_WPIUtilJNI
+ * Class:     edu_wpi_first_net_WPINetJNI
  * Method:    addPortForwarder
  * Signature: (ILjava/lang/String;I)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_util_WPIUtilJNI_addPortForwarder
+Java_edu_wpi_first_net_WPINetJNI_addPortForwarder
   (JNIEnv* env, jclass, jint port, jstring remoteHost, jint remotePort)
 {
   wpi::PortForwarder::GetInstance().Add(static_cast<unsigned int>(port),
@@ -64,24 +64,24 @@ Java_edu_wpi_first_util_WPIUtilJNI_addPortForwarder
 }
 
 /*
- * Class:     edu_wpi_first_util_WPIUtilJNI
+ * Class:     edu_wpi_first_net_WPINetJNI
  * Method:    removePortForwarder
  * Signature: (I)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_util_WPIUtilJNI_removePortForwarder
+Java_edu_wpi_first_net_WPINetJNI_removePortForwarder
   (JNIEnv* env, jclass, jint port)
 {
   wpi::PortForwarder::GetInstance().Remove(port);
 }
 
 /*
- * Class:     edu_wpi_first_util_WPIUtilJNI
+ * Class:     edu_wpi_first_net_WPINetJNI
  * Method:    createMulticastServiceAnnouncer
  * Signature: (Ljava/lang/String;Ljava/lang/String;I[Ljava/lang/Object;[Ljava/lang/Object;)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_util_WPIUtilJNI_createMulticastServiceAnnouncer
+Java_edu_wpi_first_net_WPINetJNI_createMulticastServiceAnnouncer
   (JNIEnv* env, jclass, jstring serviceName, jstring serviceType, jint port,
    jobjectArray keys, jobjectArray values)
 {
@@ -119,12 +119,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_createMulticastServiceAnnouncer
 }
 
 /*
- * Class:     edu_wpi_first_util_WPIUtilJNI
+ * Class:     edu_wpi_first_net_WPINetJNI
  * Method:    freeMulticastServiceAnnouncer
  * Signature: (I)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_util_WPIUtilJNI_freeMulticastServiceAnnouncer
+Java_edu_wpi_first_net_WPINetJNI_freeMulticastServiceAnnouncer
   (JNIEnv* env, jclass, jint handle)
 {
   auto& manager = wpi::GetMulticastManager();
@@ -134,12 +134,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_freeMulticastServiceAnnouncer
 }
 
 /*
- * Class:     edu_wpi_first_util_WPIUtilJNI
+ * Class:     edu_wpi_first_net_WPINetJNI
  * Method:    startMulticastServiceAnnouncer
  * Signature: (I)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_util_WPIUtilJNI_startMulticastServiceAnnouncer
+Java_edu_wpi_first_net_WPINetJNI_startMulticastServiceAnnouncer
   (JNIEnv* env, jclass, jint handle)
 {
   auto& manager = wpi::GetMulticastManager();
@@ -149,12 +149,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_startMulticastServiceAnnouncer
 }
 
 /*
- * Class:     edu_wpi_first_util_WPIUtilJNI
+ * Class:     edu_wpi_first_net_WPINetJNI
  * Method:    stopMulticastServiceAnnouncer
  * Signature: (I)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_util_WPIUtilJNI_stopMulticastServiceAnnouncer
+Java_edu_wpi_first_net_WPINetJNI_stopMulticastServiceAnnouncer
   (JNIEnv* env, jclass, jint handle)
 {
   auto& manager = wpi::GetMulticastManager();
@@ -164,12 +164,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_stopMulticastServiceAnnouncer
 }
 
 /*
- * Class:     edu_wpi_first_util_WPIUtilJNI
+ * Class:     edu_wpi_first_net_WPINetJNI
  * Method:    getMulticastServiceAnnouncerHasImplementation
  * Signature: (I)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_util_WPIUtilJNI_getMulticastServiceAnnouncerHasImplementation
+Java_edu_wpi_first_net_WPINetJNI_getMulticastServiceAnnouncerHasImplementation
   (JNIEnv* env, jclass, jint handle)
 {
   auto& manager = wpi::GetMulticastManager();
@@ -179,12 +179,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_getMulticastServiceAnnouncerHasImplementation
 }
 
 /*
- * Class:     edu_wpi_first_util_WPIUtilJNI
+ * Class:     edu_wpi_first_net_WPINetJNI
  * Method:    createMulticastServiceResolver
  * Signature: (Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_util_WPIUtilJNI_createMulticastServiceResolver
+Java_edu_wpi_first_net_WPINetJNI_createMulticastServiceResolver
   (JNIEnv* env, jclass, jstring serviceType)
 {
   auto& manager = wpi::GetMulticastManager();
@@ -202,12 +202,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_createMulticastServiceResolver
 }
 
 /*
- * Class:     edu_wpi_first_util_WPIUtilJNI
+ * Class:     edu_wpi_first_net_WPINetJNI
  * Method:    freeMulticastServiceResolver
  * Signature: (I)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_util_WPIUtilJNI_freeMulticastServiceResolver
+Java_edu_wpi_first_net_WPINetJNI_freeMulticastServiceResolver
   (JNIEnv* env, jclass, jint handle)
 {
   auto& manager = wpi::GetMulticastManager();
@@ -217,12 +217,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_freeMulticastServiceResolver
 }
 
 /*
- * Class:     edu_wpi_first_util_WPIUtilJNI
+ * Class:     edu_wpi_first_net_WPINetJNI
  * Method:    startMulticastServiceResolver
  * Signature: (I)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_util_WPIUtilJNI_startMulticastServiceResolver
+Java_edu_wpi_first_net_WPINetJNI_startMulticastServiceResolver
   (JNIEnv* env, jclass, jint handle)
 {
   auto& manager = wpi::GetMulticastManager();
@@ -232,12 +232,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_startMulticastServiceResolver
 }
 
 /*
- * Class:     edu_wpi_first_util_WPIUtilJNI
+ * Class:     edu_wpi_first_net_WPINetJNI
  * Method:    stopMulticastServiceResolver
  * Signature: (I)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_util_WPIUtilJNI_stopMulticastServiceResolver
+Java_edu_wpi_first_net_WPINetJNI_stopMulticastServiceResolver
   (JNIEnv* env, jclass, jint handle)
 {
   auto& manager = wpi::GetMulticastManager();
@@ -247,12 +247,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_stopMulticastServiceResolver
 }
 
 /*
- * Class:     edu_wpi_first_util_WPIUtilJNI
+ * Class:     edu_wpi_first_net_WPINetJNI
  * Method:    getMulticastServiceResolverHasImplementation
  * Signature: (I)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_util_WPIUtilJNI_getMulticastServiceResolverHasImplementation
+Java_edu_wpi_first_net_WPINetJNI_getMulticastServiceResolverHasImplementation
   (JNIEnv* env, jclass, jint handle)
 {
   auto& manager = wpi::GetMulticastManager();
@@ -262,12 +262,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_getMulticastServiceResolverHasImplementation
 }
 
 /*
- * Class:     edu_wpi_first_util_WPIUtilJNI
+ * Class:     edu_wpi_first_net_WPINetJNI
  * Method:    getMulticastServiceResolverEventHandle
  * Signature: (I)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_util_WPIUtilJNI_getMulticastServiceResolverEventHandle
+Java_edu_wpi_first_net_WPINetJNI_getMulticastServiceResolverEventHandle
   (JNIEnv* env, jclass, jint handle)
 {
   auto& manager = wpi::GetMulticastManager();
@@ -277,12 +277,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_getMulticastServiceResolverEventHandle
 }
 
 /*
- * Class:     edu_wpi_first_util_WPIUtilJNI
+ * Class:     edu_wpi_first_net_WPINetJNI
  * Method:    getMulticastServiceResolverData
  * Signature: (I)[Ljava/lang/Object;
  */
 JNIEXPORT jobjectArray JNICALL
-Java_edu_wpi_first_util_WPIUtilJNI_getMulticastServiceResolverData
+Java_edu_wpi_first_net_WPINetJNI_getMulticastServiceResolverData
   (JNIEnv* env, jclass, jint handle)
 {
   static jmethodID constructor =