diff -r 2c3cc4b01880 -r c16ac7a2eba4 src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Metadata.java --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Metadata.java Wed Oct 30 16:14:56 2019 +0100 +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Metadata.java Wed Oct 30 19:43:52 2019 +0100 @@ -35,10 +35,12 @@ import jdk.jfr.consumer.RecordingFile; import jdk.jfr.internal.Type; -import jdk.jfr.internal.consumer.RecordingInternals; +import jdk.jfr.internal.consumer.JdkJfrConsumer; final class Metadata extends Command { + private final static JdkJfrConsumer PRIVATE_ACCESS = JdkJfrConsumer.instance(); + private static class TypeComparator implements Comparator { @Override @@ -89,6 +91,7 @@ } } + @Override public String getName() { return "metadata"; @@ -125,7 +128,7 @@ PrettyWriter prettyWriter = new PrettyWriter(pw); prettyWriter.setShowIds(showIds); try (RecordingFile rf = new RecordingFile(file)) { - List types = RecordingInternals.INSTANCE.readTypes(rf); + List types = PRIVATE_ACCESS.readTypes(rf); Collections.sort(types, new TypeComparator()); for (Type type : types) { prettyWriter.printType(type);