From ee96b56e467375a8db2bb8c3b74cd5a37825ceb6 Mon Sep 17 00:00:00 2001
From: Mark Hansen <markhansen@google.com>
Date: Sun, 7 Jul 2024 20:39:29 -0700
Subject: [PATCH] Fix rawtypes warning suppression in FieldSet

PiperOrigin-RevId: 650106954
---
 java/core/src/main/java/com/google/protobuf/FieldSet.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/java/core/src/main/java/com/google/protobuf/FieldSet.java b/java/core/src/main/java/com/google/protobuf/FieldSet.java
index ea67b5b3d5..1ecab66b7c 100644
--- a/java/core/src/main/java/com/google/protobuf/FieldSet.java
+++ b/java/core/src/main/java/com/google/protobuf/FieldSet.java
@@ -78,7 +78,7 @@ final class FieldSet<T extends FieldSet.FieldDescriptorLite<T>> {
   /** Get an immutable empty FieldSet. */
   @SuppressWarnings("unchecked")
   public static <T extends FieldSet.FieldDescriptorLite<T>> FieldSet<T> emptySet() {
-    return DEFAULT_INSTANCE;
+    return (FieldSet<T>) DEFAULT_INSTANCE;
   }
 
   /** Construct a new Builder. */
@@ -86,8 +86,7 @@ final class FieldSet<T extends FieldSet.FieldDescriptorLite<T>> {
     return new Builder<T>();
   }
 
-  @SuppressWarnings("rawtypes")
-  private static final FieldSet DEFAULT_INSTANCE = new FieldSet(true);
+  private static final FieldSet<?> DEFAULT_INSTANCE = new FieldSet<>(true);
 
   /** Returns {@code true} if empty, {@code false} otherwise. */
   boolean isEmpty() {