fix(events): permit JFR Event Types without label attributes (backport …

…#804) (#805) fix(events): permit JFR Event Types without label attributes (#804) (cherry picked from commit ea87588) Co-authored-by: Andrew Azores <[email protected]>
cryostatio · Feb 13, 2025 · 08242d1 · 08242d1
1 parent a04d876
commit 08242d1
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/io/cryostat/events/SerializableEventTypeInfo.java b/src/main/java/io/cryostat/events/SerializableEventTypeInfo.java
@@ -27,15 +27,17 @@
 
 @SuppressFBWarnings("EI_EXPOSE_REP")
 public record SerializableEventTypeInfo(
-        String name,
         String typeId,
+        String name,
         String description,
         String[] category,
         Map<String, SerializableOptionDescriptor> options) {
 
     public SerializableEventTypeInfo {
-        Objects.requireNonNull(name);
         Objects.requireNonNull(typeId);
+        if (name == null) {
+            name = "";
+        }
         if (description == null) {
             description = "";
         }
@@ -61,6 +63,6 @@ public static SerializableEventTypeInfo fromEventTypeInfo(IEventTypeInfo info) {
                     SerializableOptionDescriptor.fromOptionDescriptor(entry.getValue()));
         }
 
-        return new SerializableEventTypeInfo(name, typeId, description, category, options);
+        return new SerializableEventTypeInfo(typeId, name, description, category, options);
     }
 }