diff a/src/java.base/share/classes/java/security/cert/Certificate.java b/src/java.base/share/classes/java/security/cert/Certificate.java
--- a/src/java.base/share/classes/java/security/cert/Certificate.java
+++ b/src/java.base/share/classes/java/security/cert/Certificate.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, 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
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this
@@ -63,14 +63,14 @@
 public abstract class Certificate implements java.io.Serializable {
 
     @java.io.Serial
     private static final long serialVersionUID = -3585440601605666277L;
 
-    // the certificate type
+    /** The certificate type. */
     private final String type;
 
-    /** Cache the hash code for the certiticate */
+    /** Cache the hash code for the certiticate. */
     private int hash = -1; // Default to -1
 
     /**
      * Creates a certificate of the specified type.
      *
@@ -242,11 +242,14 @@
     protected static class CertificateRep implements java.io.Serializable {
 
         @java.io.Serial
         private static final long serialVersionUID = -8563758940495660020L;
 
+        /** The standard name of the certificate type. */
         private String type;
+
+        /** The certificate data. */
         private byte[] data;
 
         /**
          * Construct the alternate Certificate class with the Certificate
          * type and Certificate encoding bytes.
