Skip to content

Commit f4f570e

Browse files
committed
Refactor: create AbstractPolicyManager
1 parent 6c1b7fd commit f4f570e

File tree

8 files changed

+435
-394
lines changed

8 files changed

+435
-394
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import org.elasticsearch.core.Booleans;
1313
import org.elasticsearch.entitlement.bridge.EntitlementChecker;
14+
import org.elasticsearch.entitlement.runtime.policy.AbstractPolicyManager;
1415
import org.elasticsearch.entitlement.runtime.policy.ElasticsearchEntitlementChecker;
1516
import org.elasticsearch.entitlement.runtime.policy.PathLookup;
1617
import org.elasticsearch.entitlement.runtime.policy.PolicyChecker;
@@ -76,15 +77,15 @@ public static void initialize(Instrumentation inst) throws Exception {
7677
* @param suppressFailureLogPackages
7778
* @param policyManager
7879
*/
79-
public record InitializeArgs(PathLookup pathLookup, Set<Package> suppressFailureLogPackages, PolicyManager policyManager) {
80+
public record InitializeArgs(PathLookup pathLookup, Set<Package> suppressFailureLogPackages, AbstractPolicyManager policyManager) {
8081
public InitializeArgs {
8182
requireNonNull(pathLookup);
8283
requireNonNull(suppressFailureLogPackages);
8384
requireNonNull(policyManager);
8485
}
8586
}
8687

87-
private static PolicyCheckerImpl createPolicyChecker(PolicyManager policyManager) {
88+
private static PolicyCheckerImpl createPolicyChecker(AbstractPolicyManager policyManager) {
8889
return new PolicyCheckerImpl(
8990
initializeArgs.suppressFailureLogPackages(),
9091
ENTITLEMENTS_MODULE,
@@ -115,7 +116,7 @@ private static void ensureClassesSensitiveToVerificationAreInitialized() {
115116
}
116117
}
117118

118-
static ElasticsearchEntitlementChecker initChecker(PolicyManager policyManager) {
119+
static ElasticsearchEntitlementChecker initChecker(AbstractPolicyManager policyManager) {
119120
final PolicyChecker policyChecker = createPolicyChecker(policyManager);
120121
final Class<?> clazz = EntitlementCheckerUtils.getVersionSpecificCheckerClass(
121122
ElasticsearchEntitlementChecker.class,

libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/AbstractPolicyManager.java

Lines changed: 412 additions & 0 deletions
Large diffs are not rendered by default.

libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyCheckerImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.elasticsearch.core.SuppressForbidden;
1515
import org.elasticsearch.entitlement.instrumentation.InstrumentationService;
1616
import org.elasticsearch.entitlement.runtime.api.NotEntitledException;
17-
import org.elasticsearch.entitlement.runtime.policy.PolicyManager.ModuleEntitlements;
17+
import org.elasticsearch.entitlement.runtime.policy.AbstractPolicyManager.ModuleEntitlements;
1818
import org.elasticsearch.entitlement.runtime.policy.entitlements.CreateClassLoaderEntitlement;
1919
import org.elasticsearch.entitlement.runtime.policy.entitlements.Entitlement;
2020
import org.elasticsearch.entitlement.runtime.policy.entitlements.ExitVMEntitlement;
@@ -65,14 +65,14 @@ public class PolicyCheckerImpl implements PolicyChecker {
6565
*/
6666
protected final Module entitlementsModule;
6767

68-
private final PolicyManager policyManager;
68+
private final AbstractPolicyManager policyManager;
6969

7070
private final PathLookup pathLookup;
7171

7272
public PolicyCheckerImpl(
7373
Set<Package> suppressFailureLogPackages,
7474
Module entitlementsModule,
75-
PolicyManager policyManager,
75+
AbstractPolicyManager policyManager,
7676
PathLookup pathLookup
7777
) {
7878
this.suppressFailureLogPackages = suppressFailureLogPackages;

0 commit comments

Comments
 (0)