From 9cc163a999eb8e9597d45b095b642c25071043bd Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Tue, 23 Apr 2024 18:43:36 +0000
Subject: [PATCH] 8330178: Clean up non-standard use of /** comments in
 `java.base`

Reviewed-by: darcy, iris, dfuchs, aivanov, naoto
---
 .../classes/apple/security/AppleProvider.java |  2 +-
 .../classes/java/net/DefaultInterface.java    | 10 ++++-----
 .../com/sun/crypto/provider/SunJCE.java       |  2 +-
 .../share/classes/java/io/FilePermission.java |  4 +---
 .../java/io/ObjectStreamConstants.java        |  2 +-
 .../classes/java/lang/invoke/LambdaForm.java  |  6 ++---
 .../share/classes/java/math/BigInteger.java   |  2 +-
 .../classes/java/math/MutableBigInteger.java  |  8 +++----
 .../classes/java/net/HttpURLConnection.java   |  2 +-
 .../classes/java/util/regex/Pattern.java      | 12 +++++-----
 .../internal/access/JavaAWTFontAccess.java    |  4 ++--
 .../jdk/internal/icu/lang/UCharacter.java     |  2 +-
 .../jdk/internal/icu/text/BidiBase.java       | 20 ++++++++---------
 .../classes/jdk/internal/icu/text/UTF16.java  |  2 +-
 .../jdk/internal/platform/Metrics.java        | 12 +++++-----
 .../sun/net/www/content/text/plain.java       |  8 +++----
 .../www/protocol/file/FileURLConnection.java  | 11 +++++-----
 .../AbstractDelegateHttpsURLConnection.java   |  4 ++--
 .../classes/sun/nio/ch/Interruptible.java     |  4 ++--
 .../sun/security/pkcs/ParsingException.java   |  9 ++++----
 .../sun/security/provider/SeedGenerator.java  | 22 +++++++++----------
 .../sun/security/util/ByteArrayTagOrder.java  |  7 +++---
 .../classes/sun/security/util/IOUtils.java    |  7 +++---
 23 files changed, 78 insertions(+), 84 deletions(-)

diff --git a/src/java.base/macosx/classes/apple/security/AppleProvider.java b/src/java.base/macosx/classes/apple/security/AppleProvider.java
index 87efda6ebb1..3f584be336b 100644
--- a/src/java.base/macosx/classes/apple/security/AppleProvider.java
+++ b/src/java.base/macosx/classes/apple/security/AppleProvider.java
@@ -28,7 +28,7 @@ package apple.security;
 import java.security.*;
 import static sun.security.util.SecurityConstants.PROVIDER_VER;
 
-/**
+/*
  * The Apple Security Provider.
  */
 
diff --git a/src/java.base/macosx/classes/java/net/DefaultInterface.java b/src/java.base/macosx/classes/java/net/DefaultInterface.java
index 1901fcb156a..b46de34a7cc 100644
--- a/src/java.base/macosx/classes/java/net/DefaultInterface.java
+++ b/src/java.base/macosx/classes/java/net/DefaultInterface.java
@@ -25,6 +25,11 @@
 
 package java.net;
 
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Enumeration;
+import java.io.IOException;
+
 /**
  * Choose a network interface to be the default for
  * outgoing IPv6 traffic that does not specify a scope_id (and which needs one).
@@ -37,11 +42,6 @@ package java.net;
  * that returns null.
  */
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Enumeration;
-import java.io.IOException;
-
 class DefaultInterface {
 
     private static final NetworkInterface defaultInterface =
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java b/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
index 7914eb8ba0b..9bb1fa7ff82 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
@@ -34,7 +34,7 @@ import java.util.List;
 import static sun.security.util.SecurityConstants.PROVIDER_VER;
 import static sun.security.util.SecurityProviderConstants.*;
 
-/**
+/*
  * The "SunJCE" Cryptographic Service Provider.
  *
  * @author Jan Luehe
diff --git a/src/java.base/share/classes/java/io/FilePermission.java b/src/java.base/share/classes/java/io/FilePermission.java
index 7c07c608171..808c4293143 100644
--- a/src/java.base/share/classes/java/io/FilePermission.java
+++ b/src/java.base/share/classes/java/io/FilePermission.java
@@ -1231,12 +1231,10 @@ final class FilePermissionCollection extends PermissionCollection
         new ObjectStreamField("permissions", Vector.class),
     };
 
-    /**
-     * @serialData "permissions" field (a Vector containing the FilePermissions).
-     */
     /**
      * Writes the contents of the perms field out as a Vector for
      * serialization compatibility with earlier releases.
+     * @serialData "permissions" field (a Vector containing the FilePermissions).
      *
      * @param  out the {@code ObjectOutputStream} to which data is written
      * @throws IOException if an I/O error occurs
diff --git a/src/java.base/share/classes/java/io/ObjectStreamConstants.java b/src/java.base/share/classes/java/io/ObjectStreamConstants.java
index d8ebbd23e73..4f06ba7f89e 100644
--- a/src/java.base/share/classes/java/io/ObjectStreamConstants.java
+++ b/src/java.base/share/classes/java/io/ObjectStreamConstants.java
@@ -139,7 +139,7 @@ public interface ObjectStreamConstants {
     static final int baseWireHandle = 0x7e0000;
 
 
-    /******************************************************/
+    /* ****************************************************/
     /* Bit masks for ObjectStreamClass flag.*/
 
     /**
diff --git a/src/java.base/share/classes/java/lang/invoke/LambdaForm.java b/src/java.base/share/classes/java/lang/invoke/LambdaForm.java
index 8b75d7510fe..823f527b6c4 100644
--- a/src/java.base/share/classes/java/lang/invoke/LambdaForm.java
+++ b/src/java.base/share/classes/java/lang/invoke/LambdaForm.java
@@ -571,7 +571,7 @@ class LambdaForm {
         return true;
     }
 
-    /** Invoke this form on the given arguments. */
+    // /** Invoke this form on the given arguments. */
     // final Object invoke(Object... args) throws Throwable {
     //     // NYI: fit this into the fast path?
     //     return interpretWithArguments(args);
@@ -923,9 +923,9 @@ class LambdaForm {
         return invocationCounter == -1;
     }
 
+    /** Interpretively invoke this form on the given arguments. */
     @Hidden
     @DontInline
-    /** Interpretively invoke this form on the given arguments. */
     Object interpretWithArguments(Object... argumentValues) throws Throwable {
         if (TRACE_INTERPRETER)
             return interpretWithArgumentsTracing(argumentValues);
@@ -940,9 +940,9 @@ class LambdaForm {
         return rv;
     }
 
+    /** Evaluate a single Name within this form, applying its function to its arguments. */
     @Hidden
     @DontInline
-    /** Evaluate a single Name within this form, applying its function to its arguments. */
     Object interpretName(Name name, Object[] values) throws Throwable {
         if (TRACE_INTERPRETER)
             traceInterpreter("| interpretName", name.debugString(), (Object[]) null);
diff --git a/src/java.base/share/classes/java/math/BigInteger.java b/src/java.base/share/classes/java/math/BigInteger.java
index 8d12c6de0a7..a972faafb45 100644
--- a/src/java.base/share/classes/java/math/BigInteger.java
+++ b/src/java.base/share/classes/java/math/BigInteger.java
@@ -4843,7 +4843,7 @@ public class BigInteger extends Number implements Comparable<BigInteger> {
         0x40000000, 0x4cfa3cc1, 0x5c13d840, 0x6d91b519, 0x39aa400
     };
 
-    /**
+    /*
      * These routines provide access to the two's complement representation
      * of BigIntegers.
      */
diff --git a/src/java.base/share/classes/java/math/MutableBigInteger.java b/src/java.base/share/classes/java/math/MutableBigInteger.java
index 76e48d00cf1..eca42ee25b1 100644
--- a/src/java.base/share/classes/java/math/MutableBigInteger.java
+++ b/src/java.base/share/classes/java/math/MutableBigInteger.java
@@ -25,6 +25,10 @@
 
 package java.math;
 
+import static java.math.BigDecimal.INFLATED;
+import static java.math.BigInteger.LONG_MASK;
+import java.util.Arrays;
+
 /**
  * A class used to represent multiprecision integers that makes efficient
  * use of allocated space by allowing a number to occupy only part of
@@ -42,10 +46,6 @@ package java.math;
  * @since   1.3
  */
 
-import static java.math.BigDecimal.INFLATED;
-import static java.math.BigInteger.LONG_MASK;
-import java.util.Arrays;
-
 class MutableBigInteger {
     /**
      * Holds the magnitude of this MutableBigInteger in big endian order.
diff --git a/src/java.base/share/classes/java/net/HttpURLConnection.java b/src/java.base/share/classes/java/net/HttpURLConnection.java
index b501fa25e45..b405fb10a16 100644
--- a/src/java.base/share/classes/java/net/HttpURLConnection.java
+++ b/src/java.base/share/classes/java/net/HttpURLConnection.java
@@ -675,7 +675,7 @@ public abstract class HttpURLConnection extends URLConnection {
         return null;
     }
 
-    /**
+    /*
      * The response codes for HTTP, as of version 1.1.
      */
 
diff --git a/src/java.base/share/classes/java/util/regex/Pattern.java b/src/java.base/share/classes/java/util/regex/Pattern.java
index 1c2fd151b8d..62ef125fdee 100644
--- a/src/java.base/share/classes/java/util/regex/Pattern.java
+++ b/src/java.base/share/classes/java/util/regex/Pattern.java
@@ -2225,7 +2225,7 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
                Character.isSurrogate((char)ch);
     }
 
-    /**
+    /*
      *  The following methods handle the main parsing. They are sorted
      *  according to their precedence order, the lowest one first.
      */
@@ -2282,10 +2282,10 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
         }
     }
 
-    @SuppressWarnings("fallthrough")
     /**
      * Parsing of sequences between alternations.
      */
+    @SuppressWarnings("fallthrough")
     private Node sequence(Node end) {
         Node head = null;
         Node tail = null;
@@ -2409,10 +2409,10 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
         return head;
     }
 
-    @SuppressWarnings("fallthrough")
     /**
      * Parse and add a new Single or Slice.
      */
+    @SuppressWarnings("fallthrough")
     private Node atom() {
         int first = 0;
         int prev = -1;
@@ -3322,10 +3322,10 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
         return head;
     }
 
-    @SuppressWarnings("fallthrough")
     /**
      * Parses inlined match flags and set them appropriately.
      */
+    @SuppressWarnings("fallthrough")
     private void addFlag() {
         int ch = peek();
         for (;;) {
@@ -3364,11 +3364,11 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
         }
     }
 
-    @SuppressWarnings("fallthrough")
     /**
      * Parses the second part of inlined match flags and turns off
      * flags appropriately.
      */
+    @SuppressWarnings("fallthrough")
     private void subFlag() {
         int ch = peek();
         for (;;) {
@@ -3708,7 +3708,7 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
         return hasSupplementary ? new SliceS(tmp) : new Slice(tmp);
     }
 
-    /**
+    /*
      * The following classes are the building components of the object
      * tree that represents a compiled regular expression. The object tree
      * is made of individual elements that handle constructs in the Pattern.
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaAWTFontAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaAWTFontAccess.java
index 6a5102b5088..139f02450b8 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaAWTFontAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaAWTFontAccess.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
+package jdk.internal.access;
+
 /**
  * SharedSecrets interface used for the access from java.text.Bidi
  */
 
-package jdk.internal.access;
-
 public interface JavaAWTFontAccess {
 
     // java.awt.font.TextAttribute constants
diff --git a/src/java.base/share/classes/jdk/internal/icu/lang/UCharacter.java b/src/java.base/share/classes/jdk/internal/icu/lang/UCharacter.java
index 1fa93390215..cd87db30d7f 100644
--- a/src/java.base/share/classes/jdk/internal/icu/lang/UCharacter.java
+++ b/src/java.base/share/classes/jdk/internal/icu/lang/UCharacter.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-/**
+/*
 *******************************************************************************
 * Copyright (C) 1996-2014, International Business Machines Corporation and
 * others. All Rights Reserved.
diff --git a/src/java.base/share/classes/jdk/internal/icu/text/BidiBase.java b/src/java.base/share/classes/jdk/internal/icu/text/BidiBase.java
index cdfdef9fbf9..bfeb0b7e621 100644
--- a/src/java.base/share/classes/jdk/internal/icu/text/BidiBase.java
+++ b/src/java.base/share/classes/jdk/internal/icu/text/BidiBase.java
@@ -2409,9 +2409,9 @@ public class BidiBase {
         return directionFromFlags();
     }
 
-    /*********************************************************************/
+    /* *******************************************************************/
     /* The Properties state machine table                                */
-    /*********************************************************************/
+    /* *******************************************************************/
     /*                                                                   */
     /* All table cells are 8 bits:                                       */
     /*      bits 0..4:  next state                                       */
@@ -2422,9 +2422,9 @@ public class BidiBase {
     /* Cells may also be of format "_(x,y)" where x represents an action */
     /* to perform and y represents the next state.                       */
     /*                                                                   */
-    /*********************************************************************/
+    /* *******************************************************************/
     /* Definitions and type for properties state tables                  */
-    /*********************************************************************/
+    /* *******************************************************************/
     private static final int IMPTABPROPS_COLUMNS = 16;
     private static final int IMPTABPROPS_RES = IMPTABPROPS_COLUMNS - 1;
     private static short GetStateProps(short cell) {
@@ -2447,7 +2447,7 @@ public class BidiBase {
     private static final short _S  = 5;
     private static final short _B  = 6; /* reduced dirProp */
 
-    /*********************************************************************/
+    /* *******************************************************************/
     /*                                                                   */
     /*      PROPERTIES  STATE  TABLE                                     */
     /*                                                                   */
@@ -2510,9 +2510,9 @@ public class BidiBase {
 /*23 ENR+ET      */ {  32+1,  32+2,    21,  32+5,  32+7, 32+15, 32+17,  32+7,    23,  32+7,    23,    23,  32+3,    18,    21,   _AN }
     };
 
-    /*********************************************************************/
+    /* *******************************************************************/
     /* The levels state machine tables                                   */
-    /*********************************************************************/
+    /* *******************************************************************/
     /*                                                                   */
     /* All table cells are 8 bits:                                       */
     /*      bits 0..3:  next state                                       */
@@ -2525,9 +2525,9 @@ public class BidiBase {
     /*                                                                   */
     /* This format limits each table to 16 states each and to 15 actions.*/
     /*                                                                   */
-    /*********************************************************************/
+    /* *******************************************************************/
     /* Definitions and type for levels state tables                      */
-    /*********************************************************************/
+    /* *******************************************************************/
     private static final int IMPTABLEVELS_COLUMNS = _B + 2;
     private static final int IMPTABLEVELS_RES = IMPTABLEVELS_COLUMNS - 1;
     private static short GetState(byte cell) { return (short)(cell & 0x0f); }
@@ -2544,7 +2544,7 @@ public class BidiBase {
         }
     }
 
-    /*********************************************************************/
+    /* *******************************************************************/
     /*                                                                   */
     /*      LEVELS  STATE  TABLES                                        */
     /*                                                                   */
diff --git a/src/java.base/share/classes/jdk/internal/icu/text/UTF16.java b/src/java.base/share/classes/jdk/internal/icu/text/UTF16.java
index 4205487a966..e84e1d4c0d4 100644
--- a/src/java.base/share/classes/jdk/internal/icu/text/UTF16.java
+++ b/src/java.base/share/classes/jdk/internal/icu/text/UTF16.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/**
+/*
  *******************************************************************************
  * Copyright (C) 1996-2014, International Business Machines Corporation and
  * others. All Rights Reserved.
diff --git a/src/java.base/share/classes/jdk/internal/platform/Metrics.java b/src/java.base/share/classes/jdk/internal/platform/Metrics.java
index c45e3e52257..50523d137ef 100644
--- a/src/java.base/share/classes/jdk/internal/platform/Metrics.java
+++ b/src/java.base/share/classes/jdk/internal/platform/Metrics.java
@@ -72,7 +72,7 @@ public interface Metrics {
     public String getProvider();
 
 
-    /*****************************************************************
+    /* ***************************************************************
      * CPU Accounting Subsystem
      ****************************************************************/
 
@@ -123,7 +123,7 @@ public interface Metrics {
      */
     public long getCpuSystemUsage();
 
-    /*****************************************************************
+    /* ***************************************************************
      * CPU Scheduling Metrics
      ****************************************************************/
 
@@ -215,7 +215,7 @@ public interface Metrics {
      */
     public long getEffectiveCpuCount();
 
-    /*****************************************************************
+    /* ***************************************************************
      * CPU Sets
      ****************************************************************/
 
@@ -271,7 +271,7 @@ public interface Metrics {
      */
     public int[] getEffectiveCpuSetMems();
 
-    /*****************************************************************
+    /* ***************************************************************
      * Memory Subsystem
      ****************************************************************/
 
@@ -352,7 +352,7 @@ public interface Metrics {
      */
     public long getMemorySoftLimit();
 
-    /*****************************************************************
+    /* ***************************************************************
      * pids subsystem
      ****************************************************************/
 
@@ -373,7 +373,7 @@ public interface Metrics {
      */
     public long getPidsCurrent();
 
-    /*****************************************************************
+    /* ***************************************************************
      * BlKIO Subsystem
      ****************************************************************/
 
diff --git a/src/java.base/share/classes/sun/net/www/content/text/plain.java b/src/java.base/share/classes/sun/net/www/content/text/plain.java
index 32836559756..33a9032b2bc 100644
--- a/src/java.base/share/classes/sun/net/www/content/text/plain.java
+++ b/src/java.base/share/classes/sun/net/www/content/text/plain.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-/**
- * Plain text file handler.
- * @author  Steven B. Byrne
- */
 package sun.net.www.content.text;
 import java.net.*;
 import java.io.InputStream;
 import java.io.IOException;
 
+/**
+ * Plain text file handler.
+ * @author  Steven B. Byrne
+ */
 public class plain extends ContentHandler {
     /**
      * Returns a PlainTextInputStream object from which data
diff --git a/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java
index a27a6137a37..16fb1d2ea6c 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java
@@ -23,12 +23,6 @@
  * questions.
  */
 
-/**
- * Open an file input stream given a URL.
- * @author      James Gosling
- * @author      Steven B. Byrne
- */
-
 package sun.net.www.protocol.file;
 
 import java.net.URL;
@@ -40,6 +34,11 @@ import sun.net.www.*;
 import java.util.*;
 import java.text.SimpleDateFormat;
 
+/**
+ * Open a file input stream given a URL.
+ * @author      James Gosling
+ * @author      Steven B. Byrne
+ */
 public class FileURLConnection extends URLConnection {
 
     private static final String CONTENT_LENGTH = "content-length";
diff --git a/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
index ff54e474b8e..39d05b6e0e4 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -65,7 +65,7 @@ public abstract class AbstractDelegateHttpsURLConnection extends
 
     protected abstract javax.net.ssl.HostnameVerifier getHostnameVerifier();
 
-    /**
+    /*
      * No user application is able to call these routines, as no one
      * should ever get access to an instance of
      * DelegateHttpsURLConnection (sun.* or com.*)
diff --git a/src/java.base/share/classes/sun/nio/ch/Interruptible.java b/src/java.base/share/classes/sun/nio/ch/Interruptible.java
index 5785ba52e24..b5d9a7d2b3f 100644
--- a/src/java.base/share/classes/sun/nio/ch/Interruptible.java
+++ b/src/java.base/share/classes/sun/nio/ch/Interruptible.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
+package sun.nio.ch;
+
 /**
  * An object that interrupts a thread blocked in an I/O operation.
  */
 
-package sun.nio.ch;
-
 public interface Interruptible {
 
     /**
diff --git a/src/java.base/share/classes/sun/security/pkcs/ParsingException.java b/src/java.base/share/classes/sun/security/pkcs/ParsingException.java
index d0f5999013d..ea7571491a0 100644
--- a/src/java.base/share/classes/sun/security/pkcs/ParsingException.java
+++ b/src/java.base/share/classes/sun/security/pkcs/ParsingException.java
@@ -23,16 +23,15 @@
  * questions.
  */
 
+package sun.security.pkcs;
+
+import java.io.IOException;
+
 /**
  * Generic PKCS Parsing exception.
  *
  * @author Benjamin Renaud
  */
-
-package sun.security.pkcs;
-
-import java.io.IOException;
-
 public class ParsingException extends IOException {
 
     @java.io.Serial
diff --git a/src/java.base/share/classes/sun/security/provider/SeedGenerator.java b/src/java.base/share/classes/sun/security/provider/SeedGenerator.java
index 94ffc26ab3f..b4c9355bccf 100644
--- a/src/java.base/share/classes/sun/security/provider/SeedGenerator.java
+++ b/src/java.base/share/classes/sun/security/provider/SeedGenerator.java
@@ -25,6 +25,17 @@
 
 package sun.security.provider;
 
+import java.security.*;
+import java.io.*;
+import java.util.Properties;
+import java.util.Enumeration;
+import java.net.*;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Random;
+import sun.security.util.Debug;
+
 /**
  * This class generates seeds for the SHA1PRNG cryptographically strong
  * random number generator.
@@ -66,17 +77,6 @@ package sun.security.provider;
  * @author Gadi Guy
  */
 
-import java.security.*;
-import java.io.*;
-import java.util.Properties;
-import java.util.Enumeration;
-import java.net.*;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Random;
-import sun.security.util.Debug;
-
 abstract class SeedGenerator {
 
     // Static instance is created at link time
diff --git a/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java b/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java
index dd5fae526ac..65f20ac816c 100644
--- a/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java
+++ b/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java
@@ -23,6 +23,9 @@
  * questions.
  */
 
+package sun.security.util;
+
+import java.util.Comparator;
 
 /**
  * ByteArrayTagOrder: a class for comparing two DER encodings by the
@@ -31,10 +34,6 @@
  * @author D. N. Hoover
  */
 
-package sun.security.util;
-
-import java.util.Comparator;
-
 public class ByteArrayTagOrder implements Comparator<byte[]> {
 
     /**
diff --git a/src/java.base/share/classes/sun/security/util/IOUtils.java b/src/java.base/share/classes/sun/security/util/IOUtils.java
index 4837e2b70a0..a103f36eb2c 100644
--- a/src/java.base/share/classes/sun/security/util/IOUtils.java
+++ b/src/java.base/share/classes/sun/security/util/IOUtils.java
@@ -23,16 +23,15 @@
  * questions.
  */
 
-/**
- * IOUtils: A collection of IO-related public static methods.
- */
-
 package sun.security.util;
 
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 
+/**
+ * IOUtils: A collection of IO-related public static methods.
+ */
 public class IOUtils {
 
     /**