renaming

Author: ldematte

libs/entitlement/src/main/java/org/elasticsearch/entitlement/initialization/EntitlementInitialization.java

@@ -23,7 +23,7 @@
 import org.elasticsearch.entitlement.runtime.policy.PathLookup;
 import org.elasticsearch.entitlement.runtime.policy.Policy;
 import org.elasticsearch.entitlement.runtime.policy.PolicyManager;
-import org.elasticsearch.entitlement.runtime.policy.PolicyParserUtils;
+import org.elasticsearch.entitlement.runtime.policy.PolicyUtils;
 import org.elasticsearch.entitlement.runtime.policy.Scope;
 import org.elasticsearch.entitlement.runtime.policy.entitlements.CreateClassLoaderEntitlement;
 import org.elasticsearch.entitlement.runtime.policy.entitlements.Entitlement;
@@ -273,7 +273,7 @@ private static PolicyManager createPolicyManager() {
             "server",
             bootstrapArgs.serverPolicyPatch() == null
                 ? serverScopes
-                : PolicyParserUtils.mergeScopes(serverScopes, bootstrapArgs.serverPolicyPatch().scopes())
+                : PolicyUtils.mergeScopes(serverScopes, bootstrapArgs.serverPolicyPatch().scopes())
         );
 
         // agents run without a module, so this is a special hack for the apm agent

libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyParserUtils.java renamed to libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyUtils.java

@@ -35,9 +35,9 @@
 import static java.util.Objects.requireNonNull;
 import static org.elasticsearch.entitlement.runtime.policy.PolicyManager.ALL_UNNAMED;
 
-public class PolicyParserUtils {
+public class PolicyUtils {
 
-    private static final Logger logger = LogManager.getLogger(PolicyParserUtils.class);
+    private static final Logger logger = LogManager.getLogger(PolicyUtils.class);
 
     public static List<Scope> mergeScopes(List<Scope> mainScopes, List<Scope> additionalScopes) {
         var result = new ArrayList<Scope>();

libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/PolicyParserUtilsTests.java renamed to libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/PolicyUtilsTests.java

@@ -22,7 +22,7 @@
 import static org.hamcrest.Matchers.nullValue;
 
 @ESTestCase.WithoutSecurityManager
-public class PolicyParserUtilsTests extends ESTestCase {
+public class PolicyUtilsTests extends ESTestCase {
 
     public void testCreatePluginPolicyWithOverride() {
 
@@ -48,7 +48,7 @@ public void testCreatePluginPolicyWithOverride() {
             )
         );
 
-        var policy = PolicyParserUtils.parsePolicyOverrideIfExists(
+        var policy = PolicyUtils.parsePolicyOverrideIfExists(
             base64EncodedPolicy,
             "9.0.0",
             true,
@@ -81,7 +81,7 @@ public void testCreatePluginPolicyWithOverrideAnyVersion() {
             )
         );
 
-        var policy = PolicyParserUtils.parsePolicyOverrideIfExists(
+        var policy = PolicyUtils.parsePolicyOverrideIfExists(
             base64EncodedPolicy,
             "abcdef",
             true,
@@ -109,7 +109,7 @@ public void testNoOverriddenPolicyWithVersionMismatch() {
             StandardCharsets.UTF_8
         );
 
-        var policy = PolicyParserUtils.parsePolicyOverrideIfExists(
+        var policy = PolicyUtils.parsePolicyOverrideIfExists(
             base64EncodedPolicy,
             "9.1.0",
             true,
@@ -137,7 +137,7 @@ public void testNoOverriddenPolicyWithValidationError() {
             StandardCharsets.UTF_8
         );
 
-        var policy = PolicyParserUtils.parsePolicyOverrideIfExists(base64EncodedPolicy, "9.0.0", true, "test-plugin", Set.of());
+        var policy = PolicyUtils.parsePolicyOverrideIfExists(base64EncodedPolicy, "9.0.0", true, "test-plugin", Set.of());
 
         assertThat(policy, nullValue());
     }
@@ -155,7 +155,7 @@ public void testNoOverriddenPolicyWithParsingError() {
             StandardCharsets.UTF_8
         );
 
-        var policy = PolicyParserUtils.parsePolicyOverrideIfExists(base64EncodedPolicy, "9.0.0", true, "test-plugin", Set.of());
+        var policy = PolicyUtils.parsePolicyOverrideIfExists(base64EncodedPolicy, "9.0.0", true, "test-plugin", Set.of());
 
         assertThat(policy, nullValue());
     }

server/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java

@@ -36,7 +36,7 @@
 import org.elasticsearch.entitlement.runtime.api.NotEntitledException;
 import org.elasticsearch.entitlement.runtime.policy.Policy;
 import org.elasticsearch.entitlement.runtime.policy.PolicyManager;
-import org.elasticsearch.entitlement.runtime.policy.PolicyParserUtils;
+import org.elasticsearch.entitlement.runtime.policy.PolicyUtils;
 import org.elasticsearch.entitlement.runtime.policy.entitlements.LoadNativeLibrariesEntitlement;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.index.IndexVersion;
@@ -242,14 +242,14 @@ private static void initPhase2(Bootstrap bootstrap) throws IOException {
 
             var pluginData = Stream.concat(
                 modulesBundles.stream()
-                    .map(bundle -> new PolicyParserUtils.PluginData(bundle.getDir(), bundle.pluginDescriptor().isModular(), false)),
+                    .map(bundle -> new PolicyUtils.PluginData(bundle.getDir(), bundle.pluginDescriptor().isModular(), false)),
                 pluginsBundles.stream()
-                    .map(bundle -> new PolicyParserUtils.PluginData(bundle.getDir(), bundle.pluginDescriptor().isModular(), true))
+                    .map(bundle -> new PolicyUtils.PluginData(bundle.getDir(), bundle.pluginDescriptor().isModular(), true))
             ).toList();
 
             var pluginPolicyOverrides = collectPluginPolicyOverrides(modulesBundles, pluginsBundles, logger);
-            var pluginPolicies = PolicyParserUtils.createPluginPolicies(pluginData, pluginPolicyOverrides, Build.current().version());
-            var serverPolicyOverride = PolicyParserUtils.parsePolicyOverrideIfExists(
+            var pluginPolicies = PolicyUtils.createPluginPolicies(pluginData, pluginPolicyOverrides, Build.current().version());
+            var serverPolicyOverride = PolicyUtils.parsePolicyOverrideIfExists(
                 System.getProperty(SERVER_POLICY_OVERRIDE),
                 Build.current().version(),
                 false,