8264809: test-lib fails to build due to some warnings in ASN1Formatte…

…r and jfr Reviewed-by: rriggs
openjdk · Apr 8, 2021 · 88eb291 · 88eb291 · openjdk-notifier · Apr 8, 2021
1 parent a863ab6
commit 88eb291
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/test/lib/jdk/test/lib/hexdump/ASN1Formatter.java b/test/lib/jdk/test/lib/hexdump/ASN1Formatter.java
@@ -151,6 +151,7 @@ public void annotate(DataInputStream in, Appendable out) throws IOException {
      * @param prefix a string to prefix each line of output, used for indentation
      * @throws IOException if an I/O error occurs
      */
+    @SuppressWarnings("fallthrough")
     private int annotate(DataInputStream in, Appendable out, int available, String prefix) throws IOException {
         int origAvailable = available;
         while (available != 0 || origAvailable < 0) {

diff --git a/test/lib/jdk/test/lib/jfr/GCHelper.java b/test/lib/jdk/test/lib/jfr/GCHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -333,7 +333,7 @@ public static List<GcBatch> createFromEvents(List<RecordedEvent> events) throws
                         // No existing batch. Create new.
                         currBatch = new GcBatch();
                         batches.add(currBatch);
-                        openGcIds.push(new Integer(gcId));
+                        openGcIds.push(Integer.valueOf(gcId));
                     }
                 }
                 boolean isEndEvent = currBatch.addEvent(event);

diff --git a/test/lib/jdk/test/lib/jfr/SimpleEventHelper.java b/test/lib/jdk/test/lib/jfr/SimpleEventHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -77,7 +77,7 @@ public static void verifyContains(List<RecordedEvent> events, int ... ids) throw
         for (RecordedEvent event : getSimpleEvents(events)) {
             int id = Events.assertField(event, "id").getValue();
             System.out.printf("event.id=%d%n", id);
-            missingIds.remove(new Integer(id));
+            missingIds.remove(Integer.valueOf(id));
         }
         if (!missingIds.isEmpty()) {
             missingIds.forEach(id -> System.out.println("Missing MyEvent with id " + id));