From 9b10c69475dc493c64c19c78502c698a575fe7da Mon Sep 17 00:00:00 2001 From: Erik Gahlin Date: Tue, 7 Mar 2023 23:32:09 +0000 Subject: [PATCH] 8303622: JFR: Missing message with Objects.requireNonNull Reviewed-by: mgronlun --- .../classes/jdk/jfr/AnnotationElement.java | 4 ++-- .../share/classes/jdk/jfr/Recording.java | 6 ++--- .../jdk/jfr/consumer/RecordedObject.java | 4 ++-- .../jdk/jfr/consumer/RecordingFile.java | 3 ++- .../jdk/jfr/consumer/RecordingStream.java | 4 ++-- .../management/jfr/RemoteRecordingStream.java | 22 +++++++++---------- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/jdk.jfr/share/classes/jdk/jfr/AnnotationElement.java b/src/jdk.jfr/share/classes/jdk/jfr/AnnotationElement.java index 8d552a511d7..7324723c3c6 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/AnnotationElement.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/AnnotationElement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2023, 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 @@ -329,7 +329,7 @@ public final class AnnotationElement { * it exists, else {@code null} */ public final A getAnnotation(Class annotationType) { - Objects.requireNonNull(annotationType); + Objects.requireNonNull(annotationType, "annotationType"); return type.getAnnotation(annotationType); } diff --git a/src/jdk.jfr/share/classes/jdk/jfr/Recording.java b/src/jdk.jfr/share/classes/jdk/jfr/Recording.java index e8b24a70a74..4409f51f45d 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/Recording.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/Recording.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2023, 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 @@ -693,8 +693,8 @@ public final class Recording implements Closeable { } private void setSetting(String id, String value) { - Objects.requireNonNull(id); - Objects.requireNonNull(value); + Objects.requireNonNull(id, "id"); + Objects.requireNonNull(value, "value"); internal.setSetting(id, value); } diff --git a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedObject.java b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedObject.java index 55597e5714b..bc9f443b5c3 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedObject.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2023, 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 @@ -193,7 +193,7 @@ public sealed class RecordedObject * @see #getFields() */ public boolean hasField(String name) { - Objects.requireNonNull(name); + Objects.requireNonNull(name, "name"); for (ValueDescriptor v : objectContext.fields) { if (v.getName().equals(name)) { return true; diff --git a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingFile.java b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingFile.java index bd0c8ae395f..4c9baaf5309 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingFile.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingFile.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2023, 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 @@ -267,6 +267,7 @@ public final class RecordingFile implements Closeable { * {@code checkRead} method denies read access to the file. */ public static List readAllEvents(Path path) throws IOException { + Objects.requireNonNull(path, "path"); try (RecordingFile r = new RecordingFile(path)) { List list = new ArrayList<>(); while (r.hasMoreEvents()) { diff --git a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingStream.java b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingStream.java index c77bbd9a2b9..cba39f0cd4f 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingStream.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2023, 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 @@ -441,7 +441,7 @@ public final class RecordingStream implements AutoCloseable, EventStream { * @since 17 */ public void dump(Path destination) throws IOException { - Objects.requireNonNull(destination); + Objects.requireNonNull(destination, "destination"); Object recorder = PrivateAccess.getInstance().getPlatformRecorder(); synchronized (recorder) { RecordingState state = recording.getState(); diff --git a/src/jdk.management.jfr/share/classes/jdk/management/jfr/RemoteRecordingStream.java b/src/jdk.management.jfr/share/classes/jdk/management/jfr/RemoteRecordingStream.java index ddf4ffa72de..a4c35941081 100644 --- a/src/jdk.management.jfr/share/classes/jdk/management/jfr/RemoteRecordingStream.java +++ b/src/jdk.management.jfr/share/classes/jdk/management/jfr/RemoteRecordingStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2023, 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 @@ -109,8 +109,8 @@ public final class RemoteRecordingStream implements EventStream { @Override public void with(String name, String value) { - Objects.requireNonNull(name); - Objects.requireNonNull(value); + Objects.requireNonNull(name, "name"); + Objects.requireNonNull(value, "value"); // FlightRecorderMXBean implementation always returns // new instance of Map so no need to create new here. Map newSettings = getEventSettings(); @@ -210,12 +210,12 @@ public final class RemoteRecordingStream implements EventStream { } @SuppressWarnings("removal") - private RemoteRecordingStream(MBeanServerConnection connection, Path dir, boolean delete) throws IOException { - Objects.requireNonNull(connection); - Objects.requireNonNull(dir); + private RemoteRecordingStream(MBeanServerConnection connection, Path directory, boolean delete) throws IOException { + Objects.requireNonNull(connection, "connection"); + Objects.requireNonNull(directory, "directory"); accessControllerContext = AccessController.getContext(); // Make sure users can't implement malicious version of a Path object. - path = Paths.get(dir.toString()); + path = Paths.get(directory.toString()); if (!Files.exists(path)) { throw new IOException("Download directory doesn't exist"); } @@ -334,7 +334,7 @@ public final class RemoteRecordingStream implements EventStream { * @see Recording#setSettings(Map) */ public void setSettings(Map settings) { - Objects.requireNonNull(settings); + Objects.requireNonNull(settings, "settings"); try { mbean.setRecordingSettings(recordingId, settings); } catch (Exception e) { @@ -355,7 +355,7 @@ public final class RemoteRecordingStream implements EventStream { * */ public EventSettings disable(String name) { - Objects.requireNonNull(name); + Objects.requireNonNull(name, "name"); EventSettings s = ManagementSupport.newEventSettings(new RemoteSettings(mbean, recordingId)); try { return s.with(name + "#" + ENABLED, "false"); @@ -379,7 +379,7 @@ public final class RemoteRecordingStream implements EventStream { * @see EventType */ public EventSettings enable(String name) { - Objects.requireNonNull(name); + Objects.requireNonNull(name, "name"); EventSettings s = ManagementSupport.newEventSettings(new RemoteSettings(mbean, recordingId)); try { return s.with(name + "#" + ENABLED, "true"); @@ -656,7 +656,7 @@ public final class RemoteRecordingStream implements EventStream { * @since 17 */ public void dump(Path destination) throws IOException { - Objects.requireNonNull(destination); + Objects.requireNonNull(destination, "destination"); long id = -1; try { FileDump fileDump;