From d8240afe426629bca916e5a170ca7098647396fa Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Wed, 23 Oct 2019 13:01:40 -0700
Subject: [PATCH] 8232442: Suppress warnings on non-serializable non-transient
 instance fields in java.management.*

Reviewed-by: rriggs, mchung
---
 .../classes/com/sun/jmx/remote/internal/rmi/ProxyRef.java  | 5 +++--
 .../classes/javax/management/remote/rmi/RMIConnector.java  | 3 ++-
 .../share/classes/javax/management/Attribute.java          | 3 ++-
 .../javax/management/AttributeChangeNotification.java      | 4 +++-
 .../javax/management/BadAttributeValueExpException.java    | 3 ++-
 .../classes/javax/management/ImmutableDescriptor.java      | 3 ++-
 .../javax/management/InvalidApplicationException.java      | 3 ++-
 .../javax/management/NotificationFilterSupport.java        | 3 ++-
 .../classes/javax/management/loading/PrivateMLet.java      | 3 ++-
 .../javax/management/monitor/MonitorNotification.java      | 5 ++++-
 .../javax/management/openmbean/CompositeDataSupport.java   | 3 ++-
 .../openmbean/OpenMBeanAttributeInfoSupport.java           | 7 ++++++-
 .../openmbean/OpenMBeanParameterInfoSupport.java           | 7 ++++++-
 .../javax/management/openmbean/TabularDataSupport.java     | 3 ++-
 .../classes/javax/management/openmbean/TabularType.java    | 3 ++-
 .../share/classes/sun/management/LazyCompositeData.java    | 3 ++-
 .../classes/sun/management/LockInfoCompositeData.java      | 3 ++-
 .../sun/management/MemoryNotifInfoCompositeData.java       | 3 ++-
 .../classes/sun/management/MemoryUsageCompositeData.java   | 3 ++-
 .../classes/sun/management/MonitorInfoCompositeData.java   | 3 ++-
 .../classes/sun/management/ThreadInfoCompositeData.java    | 4 +++-
 .../sun/management/counter/perf/PerfByteArrayCounter.java  | 3 ++-
 .../sun/management/counter/perf/PerfLongArrayCounter.java  | 4 +++-
 .../sun/management/counter/perf/PerfLongCounter.java       | 3 ++-
 24 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/ProxyRef.java b/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/ProxyRef.java
index a86f26b90c..8dd0932020 100644
--- a/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/ProxyRef.java
+++ b/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/ProxyRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,8 @@ import java.rmi.server.RemoteObject;
 import java.rmi.server.RemoteRef;
 
 
-@SuppressWarnings("deprecation")
+@SuppressWarnings({"deprecation",
+                   "serial"}) // Externalizable class w/o no-arg c'tor
 public class ProxyRef implements RemoteRef {
     private static final long serialVersionUID = -6503061366316814723L;
 
diff --git a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java
index 200340136e..f493a800f2 100644
--- a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java
+++ b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2245,6 +2245,7 @@ public class RMIConnector implements JMXConnector, Serializable, JMXAddressable
      *
      * @see #RMIConnector(RMIServer,Map)
      **/
+    @SuppressWarnings("serial") // Not statically typed as Serializable
     private final RMIServer rmiServer;
 
     /**
diff --git a/src/java.management/share/classes/javax/management/Attribute.java b/src/java.management/share/classes/javax/management/Attribute.java
index 64d9bb290d..21593bd67b 100644
--- a/src/java.management/share/classes/javax/management/Attribute.java
+++ b/src/java.management/share/classes/javax/management/Attribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,6 +49,7 @@ public class Attribute implements Serializable   {
     /**
      * @serial Attribute value
      */
+    @SuppressWarnings("serial") // Conditionally serializable
     private Object value= null;
 
 
diff --git a/src/java.management/share/classes/javax/management/AttributeChangeNotification.java b/src/java.management/share/classes/javax/management/AttributeChangeNotification.java
index 62870a3dd0..eb08b33d6d 100644
--- a/src/java.management/share/classes/javax/management/AttributeChangeNotification.java
+++ b/src/java.management/share/classes/javax/management/AttributeChangeNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,11 +74,13 @@ public class AttributeChangeNotification extends javax.management.Notification {
     /**
      * @serial The MBean attribute old value.
      */
+    @SuppressWarnings("serial") // Conditionally serializable
     private Object oldValue = null;
 
     /**
      * @serial The MBean attribute new value.
      */
+    @SuppressWarnings("serial") // Conditionally serializable
     private Object newValue = null;
 
 
diff --git a/src/java.management/share/classes/javax/management/BadAttributeValueExpException.java b/src/java.management/share/classes/javax/management/BadAttributeValueExpException.java
index d343338a4f..e9a27e4d7b 100644
--- a/src/java.management/share/classes/javax/management/BadAttributeValueExpException.java
+++ b/src/java.management/share/classes/javax/management/BadAttributeValueExpException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,7 @@ public class BadAttributeValueExpException extends Exception   {
      * @serial A string representation of the attribute that originated this exception.
      * for example, the string value can be the return of {@code attribute.toString()}
      */
+    @SuppressWarnings("serial") // See handling in constructor and readObject
     private Object val;
 
     /**
diff --git a/src/java.management/share/classes/javax/management/ImmutableDescriptor.java b/src/java.management/share/classes/javax/management/ImmutableDescriptor.java
index 64764a55e3..675c199059 100644
--- a/src/java.management/share/classes/javax/management/ImmutableDescriptor.java
+++ b/src/java.management/share/classes/javax/management/ImmutableDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,7 @@ public class ImmutableDescriptor implements Descriptor {
      * elements in this array match the corresponding elements in the
      * {@code names} array.
      */
+    @SuppressWarnings("serial") // Conditionally serializable
     private final Object[] values;
 
     private transient int hashCode = -1;
diff --git a/src/java.management/share/classes/javax/management/InvalidApplicationException.java b/src/java.management/share/classes/javax/management/InvalidApplicationException.java
index 63a5a0cd2a..31371ac166 100644
--- a/src/java.management/share/classes/javax/management/InvalidApplicationException.java
+++ b/src/java.management/share/classes/javax/management/InvalidApplicationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,7 @@ public class InvalidApplicationException extends Exception   {
     /**
      * @serial The object representing the class of the MBean
      */
+    @SuppressWarnings("serial") // Not statically typed as Serializable
     private Object val;
 
 
diff --git a/src/java.management/share/classes/javax/management/NotificationFilterSupport.java b/src/java.management/share/classes/javax/management/NotificationFilterSupport.java
index 7979d46c49..c67298de2f 100644
--- a/src/java.management/share/classes/javax/management/NotificationFilterSupport.java
+++ b/src/java.management/share/classes/javax/management/NotificationFilterSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,6 +64,7 @@ public class NotificationFilterSupport implements NotificationFilter {
      * @serial {@link Vector} that contains the enabled notification types.
      *         The default value is an empty vector.
      */
+    @SuppressWarnings("serial") // Not statically typed as Serializable
     private List<String> enabledTypes = new Vector<String>();
 
 
diff --git a/src/java.management/share/classes/javax/management/loading/PrivateMLet.java b/src/java.management/share/classes/javax/management/loading/PrivateMLet.java
index 0b5535bda7..f9b0d0ebd7 100644
--- a/src/java.management/share/classes/javax/management/loading/PrivateMLet.java
+++ b/src/java.management/share/classes/javax/management/loading/PrivateMLet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@ import java.net.URLStreamHandlerFactory;
  *
  * @since 1.5
  */
+@SuppressWarnings("serial") // Externalizable class w/o no-arg c'tor
 public class PrivateMLet extends MLet implements PrivateClassLoader {
     private static final long serialVersionUID = 2503458973393711979L;
 
diff --git a/src/java.management/share/classes/javax/management/monitor/MonitorNotification.java b/src/java.management/share/classes/javax/management/monitor/MonitorNotification.java
index a82ca882a9..614fc4d64e 100644
--- a/src/java.management/share/classes/javax/management/monitor/MonitorNotification.java
+++ b/src/java.management/share/classes/javax/management/monitor/MonitorNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -162,6 +162,7 @@ public class MonitorNotification extends javax.management.Notification {
     /**
      * @serial Monitor notification observed object.
      */
+    @SuppressWarnings("serial") // Not statically typed as Serializable
     private ObjectName observedObject = null;
 
     /**
@@ -172,6 +173,7 @@ public class MonitorNotification extends javax.management.Notification {
     /**
      * @serial Monitor notification derived gauge.
      */
+    @SuppressWarnings("serial") // Not statically typed as Serializable
     private Object derivedGauge = null;
 
     /**
@@ -179,6 +181,7 @@ public class MonitorNotification extends javax.management.Notification {
      *         This value is used to keep the threshold/string (depending on the
      *         monitor type) that triggered off this notification.
      */
+    @SuppressWarnings("serial") // Not statically typed as Serializable
     private Object trigger = null;
 
 
diff --git a/src/java.management/share/classes/javax/management/openmbean/CompositeDataSupport.java b/src/java.management/share/classes/javax/management/openmbean/CompositeDataSupport.java
index 38c7469269..373c9e602f 100644
--- a/src/java.management/share/classes/javax/management/openmbean/CompositeDataSupport.java
+++ b/src/java.management/share/classes/javax/management/openmbean/CompositeDataSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,6 +62,7 @@ public class CompositeDataSupport
      * respective values.
      *         A {@link SortedMap} is used for faster retrieval of elements.
      */
+    @SuppressWarnings("serial") // Conditionally serializable
     private final SortedMap<String, Object> contents;
 
     /**
diff --git a/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
index 9ea4c98767..a7ff232e8e 100644
--- a/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
+++ b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,27 +64,32 @@ public class OpenMBeanAttributeInfoSupport
     /**
      * @serial The open mbean attribute's <i>open type</i>
      */
+    @SuppressWarnings("serial") // Not statically typed as Serializable
     private OpenType<?> openType;
 
     /**
      * @serial The open mbean attribute's default value
      */
+    @SuppressWarnings("serial") // Not statically typed as Serializable
     private final Object defaultValue;
 
     /**
      * @serial The open mbean attribute's legal values. This {@link
      * Set} is unmodifiable
      */
+    @SuppressWarnings("serial") // Conditionally serializable
     private final Set<?> legalValues;  // to be constructed unmodifiable
 
     /**
      * @serial The open mbean attribute's min value
      */
+    @SuppressWarnings("serial") // Conditionally serializable
     private final Comparable<?> minValue;
 
     /**
      * @serial The open mbean attribute's max value
      */
+    @SuppressWarnings("serial") // Conditionally serializable
     private final Comparable<?> maxValue;
 
 
diff --git a/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java
index 4cf21fd89a..454f089650 100644
--- a/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java
+++ b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,27 +58,32 @@ public class OpenMBeanParameterInfoSupport
     /**
      * @serial The open mbean parameter's <i>open type</i>
      */
+    @SuppressWarnings("serial") // Not statically typed as Serializable
     private OpenType<?>    openType;
 
     /**
      * @serial The open mbean parameter's default value
      */
+    @SuppressWarnings("serial") // Not statically typed as Serializable
     private Object      defaultValue    = null;
 
     /**
      * @serial The open mbean parameter's legal values. This {@link
      * Set} is unmodifiable
      */
+    @SuppressWarnings("serial") // Conditionally serializable
     private Set<?> legalValues     = null;  // to be constructed unmodifiable
 
     /**
      * @serial The open mbean parameter's min value
      */
+    @SuppressWarnings("serial") // Conditionally serializable
     private Comparable<?> minValue        = null;
 
     /**
      * @serial The open mbean parameter's max value
      */
+    @SuppressWarnings("serial") // Conditionally serializable
     private Comparable<?> maxValue        = null;
 
 
diff --git a/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java b/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java
index 28092a5cbd..7dd47dc539 100644
--- a/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java
+++ b/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,6 +86,7 @@ public class TabularDataSupport
      * @serial This tabular data instance's contents: a {@link HashMap}
      */
     // field cannot be final because of clone method
+    @SuppressWarnings("serial") // Conditionally serializable
     private Map<Object,CompositeData> dataMap;
 
     /**
diff --git a/src/java.management/share/classes/javax/management/openmbean/TabularType.java b/src/java.management/share/classes/javax/management/openmbean/TabularType.java
index bb72d228e0..11e5e61f4d 100644
--- a/src/java.management/share/classes/javax/management/openmbean/TabularType.java
+++ b/src/java.management/share/classes/javax/management/openmbean/TabularType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,6 +59,7 @@ public class TabularType extends OpenType<TabularData> {
      * @serial The items used to index each row element, kept in the order the user gave
      *         This is an unmodifiable {@link ArrayList}
      */
+    @SuppressWarnings("serial") // Conditionally serializable
     private List<String> indexNames;
 
 
diff --git a/src/java.management/share/classes/sun/management/LazyCompositeData.java b/src/java.management/share/classes/sun/management/LazyCompositeData.java
index 879c11bfee..9d1ddd354d 100644
--- a/src/java.management/share/classes/sun/management/LazyCompositeData.java
+++ b/src/java.management/share/classes/sun/management/LazyCompositeData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,6 +46,7 @@ import javax.management.openmbean.TabularType;
 public abstract class LazyCompositeData
         implements CompositeData, Serializable {
 
+    @SuppressWarnings("serial") // Not statically typed as Serializable
     private CompositeData compositeData;
 
     // Implementation of the CompositeData interface
diff --git a/src/java.management/share/classes/sun/management/LockInfoCompositeData.java b/src/java.management/share/classes/sun/management/LockInfoCompositeData.java
index b62e236a3d..087ce3d780 100644
--- a/src/java.management/share/classes/sun/management/LockInfoCompositeData.java
+++ b/src/java.management/share/classes/sun/management/LockInfoCompositeData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@ import javax.management.openmbean.OpenDataException;
  * construction of a CompositeData use in the local case.
  */
 public class LockInfoCompositeData extends LazyCompositeData {
+    @SuppressWarnings("serial") // Not statically typed as Serializable
     private final LockInfo lock;
 
     private LockInfoCompositeData(LockInfo li) {
diff --git a/src/java.management/share/classes/sun/management/MemoryNotifInfoCompositeData.java b/src/java.management/share/classes/sun/management/MemoryNotifInfoCompositeData.java
index 219b2d9fbc..d8eb6ad3b5 100644
--- a/src/java.management/share/classes/sun/management/MemoryNotifInfoCompositeData.java
+++ b/src/java.management/share/classes/sun/management/MemoryNotifInfoCompositeData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@ import javax.management.openmbean.OpenDataException;
  * construction of a CompositeData use in the local case.
  */
 public class MemoryNotifInfoCompositeData extends LazyCompositeData {
+    @SuppressWarnings("serial") // Not statically typed as Serializable
     private final MemoryNotificationInfo memoryNotifInfo;
 
     private MemoryNotifInfoCompositeData(MemoryNotificationInfo info) {
diff --git a/src/java.management/share/classes/sun/management/MemoryUsageCompositeData.java b/src/java.management/share/classes/sun/management/MemoryUsageCompositeData.java
index 0b3a6e0656..7413757e71 100644
--- a/src/java.management/share/classes/sun/management/MemoryUsageCompositeData.java
+++ b/src/java.management/share/classes/sun/management/MemoryUsageCompositeData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@ import javax.management.openmbean.OpenDataException;
  * construction of a CompositeData use in the local case.
  */
 public class MemoryUsageCompositeData extends LazyCompositeData {
+    @SuppressWarnings("serial") // Not statically typed as Serializable
     private final MemoryUsage usage;
 
     private MemoryUsageCompositeData(MemoryUsage u) {
diff --git a/src/java.management/share/classes/sun/management/MonitorInfoCompositeData.java b/src/java.management/share/classes/sun/management/MonitorInfoCompositeData.java
index d10e07d6e3..3c6d51f799 100644
--- a/src/java.management/share/classes/sun/management/MonitorInfoCompositeData.java
+++ b/src/java.management/share/classes/sun/management/MonitorInfoCompositeData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,7 @@ import javax.management.openmbean.OpenType;
  * construction of a CompositeData use in the local case.
  */
 public class MonitorInfoCompositeData extends LazyCompositeData {
+    @SuppressWarnings("serial") // Not statically typed as Serializable
     private final MonitorInfo lock;
 
     private MonitorInfoCompositeData(MonitorInfo mi) {
diff --git a/src/java.management/share/classes/sun/management/ThreadInfoCompositeData.java b/src/java.management/share/classes/sun/management/ThreadInfoCompositeData.java
index 29a474630f..ee8c7739d7 100644
--- a/src/java.management/share/classes/sun/management/ThreadInfoCompositeData.java
+++ b/src/java.management/share/classes/sun/management/ThreadInfoCompositeData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,9 @@ import javax.management.openmbean.OpenType;
  * construction of a CompositeData use in the local case.
  */
 public class ThreadInfoCompositeData extends LazyCompositeData {
+    @SuppressWarnings("serial") // Not statically typed as Serializable
     private final ThreadInfo threadInfo;
+    @SuppressWarnings("serial") // Not statically typed as Serializable
     private final CompositeData cdata;
 
     private ThreadInfoCompositeData(ThreadInfo ti) {
diff --git a/src/java.management/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java b/src/java.management/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java
index 615d569747..9a637f9e26 100644
--- a/src/java.management/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java
+++ b/src/java.management/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@ import java.nio.*;
 public class PerfByteArrayCounter extends AbstractCounter
        implements ByteArrayCounter {
 
+    @SuppressWarnings("serial") // Value indirectly copied as a byte[] in writeReplace
     ByteBuffer bb;
 
     PerfByteArrayCounter(String name, Units u, Variability v,
diff --git a/src/java.management/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java b/src/java.management/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java
index bb48e8e2cd..2acc852d70 100644
--- a/src/java.management/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java
+++ b/src/java.management/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,8 @@ import java.nio.ReadOnlyBufferException;
 public class PerfLongArrayCounter extends AbstractCounter
        implements LongArrayCounter {
 
+
+    @SuppressWarnings("serial") // Value indirectly copied as a long[] in writeReplace
     LongBuffer lb;
 
     PerfLongArrayCounter(String name, Units u, Variability v,
diff --git a/src/java.management/share/classes/sun/management/counter/perf/PerfLongCounter.java b/src/java.management/share/classes/sun/management/counter/perf/PerfLongCounter.java
index b0246ed717..c75e548722 100644
--- a/src/java.management/share/classes/sun/management/counter/perf/PerfLongCounter.java
+++ b/src/java.management/share/classes/sun/management/counter/perf/PerfLongCounter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import java.nio.ReadOnlyBufferException;
 public class PerfLongCounter extends AbstractCounter
        implements LongCounter {
 
+    @SuppressWarnings("serial") // Value indirectly copied as a long[] in writeReplace
     LongBuffer lb;
 
     // package private