RFR: 7307: Move org.openjdk.jmc.flightrecorder.configuration bundle from application to core [v5]

Alex Macdonald aptmac at openjdk.org
Tue Sep 26 14:26:31 UTC 2023


On Wed, 20 Sep 2023 16:34:32 GMT, Joshua Matsuoka <jmatsuoka at openjdk.org> wrote:

>> This PR addresses JMC-7307 [[0]](https://bugs.openjdk.java.net/browse/JMC-7307), in which it would be helpful to have flightrecorder.configuration distributed in jmc core.
>> 
>> This PR continues from #299 , Alex is currently away so I'll be continuing this PR/bug. This PR builds off of Alex's existing branch and preserves the history. It fixes the merge conflicts and addresses the remaining review comments on #299 .
>> 
>> [0] https://bugs.openjdk.java.net/browse/JMC-7307
>
> Joshua Matsuoka has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Running spotless

Just a couple of checkstyle issues here:
- there's a redundant import in both `SecurelyStoredByteArray` and `SecurityManagerFactory`
- `PersistentCredentials` had it's import of `java.util.regex.Pattern` removed.

Other than that I think it's just the license header update to 2023 and then this should be ready for re-reviewing.

Here's a quick diff that you could apply to fix:

diff --git a/core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/security/PersistentCredentials.java b/core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/security/PersistentCredentials.java
index 4e4197b5..1f8bf860 100644
--- a/core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/security/PersistentCredentials.java
+++ b/core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/security/PersistentCredentials.java
@@ -33,6 +33,7 @@
 package org.openjdk.jmc.common.security;
 
 import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * {@link ICredentials} stored in the {@link ISecurityManager}. The username and password are lazy
diff --git a/core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/security/SecurelyStoredByteArray.java b/core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/security/SecurelyStoredByteArray.java
index aa85e5d5..8cd47f8f 100644
--- a/core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/security/SecurelyStoredByteArray.java
+++ b/core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/security/SecurelyStoredByteArray.java
@@ -32,8 +32,6 @@
  */
 package org.openjdk.jmc.common.security;
 
-import org.openjdk.jmc.common.security.SecurityManagerFactory;
-
 public class SecurelyStoredByteArray {
 
 	private final String id;
diff --git a/core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/security/SecurityManagerFactory.java b/core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/security/SecurityManagerFactory.java
index 64cd7b66..4eb8dac0 100644
--- a/core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/security/SecurityManagerFactory.java
+++ b/core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/security/SecurityManagerFactory.java
@@ -35,8 +35,6 @@ package org.openjdk.jmc.common.security;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.openjdk.jmc.common.security.ISecurityManager;
-
 /**
  * This is the global security manager factory for Mission Control. You can only have one
  * SecurityManager, and it is initialized at start. It can not be changed once initialized. The only

-------------

PR Comment: https://git.openjdk.org/jmc/pull/469#issuecomment-1735650689


More information about the jmc-dev mailing list