Skip to content

Commit e25e01a

Browse files
authored
feat: policy structure review (#1968)
* rename existing policy modules * cleanup readme * Move PolicyDefinition class to the policy-spi module * Introduce policy-engine-spi and policy-engine modules * Rename package
1 parent 809f2ab commit e25e01a

File tree

92 files changed

+153
-90
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+153
-90
lines changed

README.md

-8
Original file line numberDiff line numberDiff line change
@@ -210,14 +210,6 @@ Contains code that demonstrates how the connector can be used in various scenari
210210
connector from a unit test in order to try out functionality quickly or how to implement an outward-facing REST API for
211211
a connector.
212212

213-
### `common`
214-
215-
Contains utility code such as collection utils, string utils and helper classes.
216-
217-
### `scripts`
218-
219-
Contains several scripts to deploy a connector in an AKS cluster on Microsoft Azure using Terraform.
220-
221213
## Releases
222214

223215
GitHub releases are listed [here](https://github.com/eclipse-dataspaceconnector/DataSpaceConnector/releases).

core/common/base/build.gradle.kts

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ val bouncycastleVersion: String by project
2626

2727
dependencies {
2828
api(project(":spi:common:core-spi"))
29+
api(project(":spi:common:policy-engine-spi"))
2930
api(project(":spi:common:transaction-spi"))
30-
implementation(project(":core:common:util"))
3131
implementation(project(":core:common:policy-engine"))
32+
implementation(project(":core:common:util"))
3233

3334
api("com.squareup.okhttp3:okhttp:${okHttpVersion}")
3435
api("dev.failsafe:failsafe:${failsafeVersion}")

core/common/base/src/main/java/org/eclipse/dataspaceconnector/core/CoreServicesExtension.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
import org.eclipse.dataspaceconnector.core.base.CommandHandlerRegistryImpl;
1818
import org.eclipse.dataspaceconnector.core.base.RemoteMessageDispatcherRegistryImpl;
1919
import org.eclipse.dataspaceconnector.core.base.agent.ParticipantAgentServiceImpl;
20-
import org.eclipse.dataspaceconnector.core.base.policy.PolicyEngineImpl;
21-
import org.eclipse.dataspaceconnector.core.base.policy.RuleBindingRegistryImpl;
22-
import org.eclipse.dataspaceconnector.core.base.policy.ScopeFilter;
2320
import org.eclipse.dataspaceconnector.core.event.EventExecutorServiceContainer;
2421
import org.eclipse.dataspaceconnector.core.event.EventRouterImpl;
2522
import org.eclipse.dataspaceconnector.core.health.HealthCheckServiceConfiguration;
2623
import org.eclipse.dataspaceconnector.core.health.HealthCheckServiceImpl;
24+
import org.eclipse.dataspaceconnector.core.policy.engine.PolicyEngineImpl;
25+
import org.eclipse.dataspaceconnector.core.policy.engine.RuleBindingRegistryImpl;
26+
import org.eclipse.dataspaceconnector.core.policy.engine.ScopeFilter;
2727
import org.eclipse.dataspaceconnector.core.security.DefaultPrivateKeyParseFunction;
2828
import org.eclipse.dataspaceconnector.policy.model.PolicyRegistrationTypes;
2929
import org.eclipse.dataspaceconnector.spi.EdcSetting;
@@ -32,8 +32,8 @@
3232
import org.eclipse.dataspaceconnector.spi.event.EventRouter;
3333
import org.eclipse.dataspaceconnector.spi.message.RemoteMessageDispatcherRegistry;
3434
import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
35-
import org.eclipse.dataspaceconnector.spi.policy.PolicyEngine;
36-
import org.eclipse.dataspaceconnector.spi.policy.RuleBindingRegistry;
35+
import org.eclipse.dataspaceconnector.spi.policy.engine.PolicyEngine;
36+
import org.eclipse.dataspaceconnector.spi.policy.engine.RuleBindingRegistry;
3737
import org.eclipse.dataspaceconnector.spi.security.CertificateResolver;
3838
import org.eclipse.dataspaceconnector.spi.security.PrivateKeyResolver;
3939
import org.eclipse.dataspaceconnector.spi.security.Vault;
@@ -97,7 +97,7 @@ public class CoreServicesExtension implements ServiceExtension {
9797
private EventExecutorServiceContainer eventExecutorServiceContainer;
9898

9999
private HealthCheckServiceImpl healthCheckService;
100-
private RuleBindingRegistryImpl ruleBindingRegistry;
100+
private RuleBindingRegistry ruleBindingRegistry;
101101
private ScopeFilter scopeFilter;
102102

103103
@Override

core/common/base/src/main/java/org/eclipse/dataspaceconnector/core/base/agent/ParticipantAgentServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* Default implementation.
3030
*/
3131
public class ParticipantAgentServiceImpl implements ParticipantAgentService {
32-
private List<ParticipantAgentServiceExtension> extensions = new ArrayList<>();
32+
private final List<ParticipantAgentServiceExtension> extensions = new ArrayList<>();
3333

3434
@Override
3535
public ParticipantAgent createFor(ClaimToken token) {

core/common/policy-engine/build.gradle.kts

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, 2021 Microsoft Corporation
2+
* Copyright (c) 2022 Bayerische Motoren Werke Aktiengesellschaft
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Apache License, Version 2.0 which is available at
@@ -8,7 +8,7 @@
88
* SPDX-License-Identifier: Apache-2.0
99
*
1010
* Contributors:
11-
* Microsoft Corporation - initial API and implementation
11+
* Bayerische Motoren Werke Aktiengesellschaft - initial API and implementation
1212
*
1313
*/
1414

@@ -18,7 +18,9 @@ plugins {
1818
}
1919

2020
dependencies {
21-
api(project(":core:common:policy-evaluator"))
21+
api(project(":spi:common:policy-engine-spi"))
22+
api(project(":spi:common:policy-model"))
23+
implementation(project(":core:common:policy-evaluator"))
2224
}
2325

2426
publishing {

core/common/base/src/main/java/org/eclipse/dataspaceconnector/core/base/policy/PolicyContextImpl.java core/common/policy-engine/src/main/java/org/eclipse/dataspaceconnector/core/policy/engine/PolicyContextImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
*
1414
*/
1515

16-
package org.eclipse.dataspaceconnector.core.base.policy;
16+
package org.eclipse.dataspaceconnector.core.policy.engine;
1717

1818
import org.eclipse.dataspaceconnector.spi.agent.ParticipantAgent;
19-
import org.eclipse.dataspaceconnector.spi.policy.PolicyContext;
19+
import org.eclipse.dataspaceconnector.spi.policy.engine.PolicyContext;
2020
import org.jetbrains.annotations.NotNull;
2121

2222
import java.util.ArrayList;

core/common/base/src/main/java/org/eclipse/dataspaceconnector/core/base/policy/PolicyEngineImpl.java core/common/policy-engine/src/main/java/org/eclipse/dataspaceconnector/core/policy/engine/PolicyEngineImpl.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212
*
1313
*/
1414

15-
package org.eclipse.dataspaceconnector.core.base.policy;
15+
package org.eclipse.dataspaceconnector.core.policy.engine;
1616

17-
import org.eclipse.dataspaceconnector.policy.engine.PolicyEvaluator;
18-
import org.eclipse.dataspaceconnector.policy.engine.RuleProblem;
17+
import org.eclipse.dataspaceconnector.policy.evaluator.PolicyEvaluator;
18+
import org.eclipse.dataspaceconnector.policy.evaluator.RuleProblem;
1919
import org.eclipse.dataspaceconnector.policy.model.Duty;
2020
import org.eclipse.dataspaceconnector.policy.model.Permission;
2121
import org.eclipse.dataspaceconnector.policy.model.Policy;
2222
import org.eclipse.dataspaceconnector.policy.model.Prohibition;
2323
import org.eclipse.dataspaceconnector.policy.model.Rule;
2424
import org.eclipse.dataspaceconnector.spi.agent.ParticipantAgent;
25-
import org.eclipse.dataspaceconnector.spi.policy.AtomicConstraintFunction;
26-
import org.eclipse.dataspaceconnector.spi.policy.PolicyContext;
27-
import org.eclipse.dataspaceconnector.spi.policy.PolicyEngine;
28-
import org.eclipse.dataspaceconnector.spi.policy.RuleFunction;
25+
import org.eclipse.dataspaceconnector.spi.policy.engine.AtomicConstraintFunction;
26+
import org.eclipse.dataspaceconnector.spi.policy.engine.PolicyContext;
27+
import org.eclipse.dataspaceconnector.spi.policy.engine.PolicyEngine;
28+
import org.eclipse.dataspaceconnector.spi.policy.engine.RuleFunction;
2929
import org.eclipse.dataspaceconnector.spi.result.Result;
3030

3131
import java.util.ArrayList;
@@ -43,13 +43,13 @@
4343
public class PolicyEngineImpl implements PolicyEngine {
4444
private static final String ALL_SCOPES_DELIMITED = ALL_SCOPES + ".";
4545

46-
private ScopeFilter scopeFilter;
46+
private final ScopeFilter scopeFilter;
4747

48-
private Map<String, List<ConstraintFunctionEntry<Rule>>> constraintFunctions = new TreeMap<>();
49-
private Map<String, List<RuleFunctionEntry<Rule>>> ruleFunctions = new TreeMap<>();
48+
private final Map<String, List<ConstraintFunctionEntry<Rule>>> constraintFunctions = new TreeMap<>();
49+
private final Map<String, List<RuleFunctionEntry<Rule>>> ruleFunctions = new TreeMap<>();
5050

51-
private List<BiFunction<Policy, PolicyContext, Boolean>> preValidators = new ArrayList<>();
52-
private List<BiFunction<Policy, PolicyContext, Boolean>> postValidators = new ArrayList<>();
51+
private final List<BiFunction<Policy, PolicyContext, Boolean>> preValidators = new ArrayList<>();
52+
private final List<BiFunction<Policy, PolicyContext, Boolean>> postValidators = new ArrayList<>();
5353

5454
public PolicyEngineImpl(ScopeFilter scopeFilter) {
5555
this.scopeFilter = scopeFilter;

core/common/base/src/main/java/org/eclipse/dataspaceconnector/core/base/policy/RuleBindingRegistryImpl.java core/common/policy-engine/src/main/java/org/eclipse/dataspaceconnector/core/policy/engine/RuleBindingRegistryImpl.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
*
1313
*/
1414

15-
package org.eclipse.dataspaceconnector.core.base.policy;
15+
package org.eclipse.dataspaceconnector.core.policy.engine;
1616

17-
import org.eclipse.dataspaceconnector.spi.policy.RuleBindingRegistry;
17+
import org.eclipse.dataspaceconnector.spi.policy.engine.RuleBindingRegistry;
1818

1919
import java.util.HashMap;
2020
import java.util.HashSet;
@@ -25,7 +25,7 @@ public class RuleBindingRegistryImpl implements RuleBindingRegistry {
2525
private static final String DELIMITER = ".";
2626
private static final String DELIMITED_ALL = "*" + DELIMITER;
2727

28-
private Map<String, Set<String>> ruleBindings = new HashMap<>();
28+
private final Map<String, Set<String>> ruleBindings = new HashMap<>();
2929

3030
@Override
3131
public void bind(String ruleType, String scope) {

core/common/base/src/main/java/org/eclipse/dataspaceconnector/core/base/policy/ScopeFilter.java core/common/policy-engine/src/main/java/org/eclipse/dataspaceconnector/core/policy/engine/ScopeFilter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*/
1414

15-
package org.eclipse.dataspaceconnector.core.base.policy;
15+
package org.eclipse.dataspaceconnector.core.policy.engine;
1616

1717
import org.eclipse.dataspaceconnector.policy.model.AtomicConstraint;
1818
import org.eclipse.dataspaceconnector.policy.model.Constraint;
@@ -24,7 +24,7 @@
2424
import org.eclipse.dataspaceconnector.policy.model.Prohibition;
2525
import org.eclipse.dataspaceconnector.policy.model.Rule;
2626
import org.eclipse.dataspaceconnector.policy.model.XoneConstraint;
27-
import org.eclipse.dataspaceconnector.spi.policy.RuleBindingRegistry;
27+
import org.eclipse.dataspaceconnector.spi.policy.engine.RuleBindingRegistry;
2828
import org.jetbrains.annotations.Nullable;
2929

3030
import java.util.List;

core/common/base/src/test/java/org/eclipse/dataspaceconnector/core/base/policy/PolicyEngineImplScenariosTest.java core/common/policy-engine/src/test/java/org/eclipse/dataspaceconnector/core/policy/engine/PolicyEngineImplScenariosTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*/
1414

15-
package org.eclipse.dataspaceconnector.core.base.policy;
15+
package org.eclipse.dataspaceconnector.core.policy.engine;
1616

1717
import org.eclipse.dataspaceconnector.policy.model.Action;
1818
import org.eclipse.dataspaceconnector.policy.model.AtomicConstraint;
@@ -21,7 +21,7 @@
2121
import org.eclipse.dataspaceconnector.policy.model.Policy;
2222
import org.eclipse.dataspaceconnector.policy.model.Prohibition;
2323
import org.eclipse.dataspaceconnector.spi.agent.ParticipantAgent;
24-
import org.eclipse.dataspaceconnector.spi.policy.RuleBindingRegistry;
24+
import org.eclipse.dataspaceconnector.spi.policy.engine.RuleBindingRegistry;
2525
import org.junit.jupiter.api.BeforeEach;
2626
import org.junit.jupiter.api.Test;
2727

@@ -31,7 +31,7 @@
3131
import static java.util.Collections.emptyMap;
3232
import static org.assertj.core.api.Assertions.assertThat;
3333
import static org.eclipse.dataspaceconnector.policy.model.Operator.IN;
34-
import static org.eclipse.dataspaceconnector.spi.policy.PolicyEngine.ALL_SCOPES;
34+
import static org.eclipse.dataspaceconnector.spi.policy.engine.PolicyEngine.ALL_SCOPES;
3535

3636
/**
3737
* Tests key policy enforcement scenarios. Also serves as a blueprint for custom policy functions.

core/common/base/src/test/java/org/eclipse/dataspaceconnector/core/base/policy/PolicyEngineImplTest.java core/common/policy-engine/src/test/java/org/eclipse/dataspaceconnector/core/policy/engine/PolicyEngineImplTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*/
1414

15-
package org.eclipse.dataspaceconnector.core.base.policy;
15+
package org.eclipse.dataspaceconnector.core.policy.engine;
1616

1717
import org.eclipse.dataspaceconnector.policy.model.Action;
1818
import org.eclipse.dataspaceconnector.policy.model.AtomicConstraint;
@@ -22,15 +22,15 @@
2222
import org.eclipse.dataspaceconnector.policy.model.Policy;
2323
import org.eclipse.dataspaceconnector.policy.model.Prohibition;
2424
import org.eclipse.dataspaceconnector.spi.agent.ParticipantAgent;
25-
import org.eclipse.dataspaceconnector.spi.policy.RuleBindingRegistry;
25+
import org.eclipse.dataspaceconnector.spi.policy.engine.RuleBindingRegistry;
2626
import org.junit.jupiter.api.Assertions;
2727
import org.junit.jupiter.api.BeforeEach;
2828
import org.junit.jupiter.api.Test;
2929

3030
import static java.util.Collections.emptyMap;
3131
import static org.assertj.core.api.Assertions.assertThat;
3232
import static org.eclipse.dataspaceconnector.policy.model.Operator.EQ;
33-
import static org.eclipse.dataspaceconnector.spi.policy.PolicyEngine.ALL_SCOPES;
33+
import static org.eclipse.dataspaceconnector.spi.policy.engine.PolicyEngine.ALL_SCOPES;
3434

3535
class PolicyEngineImplTest {
3636
private static final String TEST_SCOPE = "test";

core/common/base/src/test/java/org/eclipse/dataspaceconnector/core/base/policy/RuleBindingRegistryImplTest.java core/common/policy-engine/src/test/java/org/eclipse/dataspaceconnector/core/policy/engine/RuleBindingRegistryImplTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
*
1313
*/
1414

15-
package org.eclipse.dataspaceconnector.core.base.policy;
15+
package org.eclipse.dataspaceconnector.core.policy.engine;
1616

17-
import org.eclipse.dataspaceconnector.spi.policy.PolicyEngine;
17+
import org.eclipse.dataspaceconnector.spi.policy.engine.PolicyEngine;
1818
import org.junit.jupiter.api.BeforeEach;
1919
import org.junit.jupiter.api.Test;
2020

core/common/base/src/test/java/org/eclipse/dataspaceconnector/core/base/policy/ScopeFilterTest.java core/common/policy-engine/src/test/java/org/eclipse/dataspaceconnector/core/policy/engine/ScopeFilterTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*/
1414

15-
package org.eclipse.dataspaceconnector.core.base.policy;
15+
package org.eclipse.dataspaceconnector.core.policy.engine;
1616

1717
import org.eclipse.dataspaceconnector.policy.model.Action;
1818
import org.eclipse.dataspaceconnector.policy.model.AndConstraint;
@@ -24,7 +24,7 @@
2424
import org.eclipse.dataspaceconnector.policy.model.Policy;
2525
import org.eclipse.dataspaceconnector.policy.model.PolicyType;
2626
import org.eclipse.dataspaceconnector.policy.model.Prohibition;
27-
import org.eclipse.dataspaceconnector.spi.policy.RuleBindingRegistry;
27+
import org.eclipse.dataspaceconnector.spi.policy.engine.RuleBindingRegistry;
2828
import org.junit.jupiter.api.BeforeEach;
2929
import org.junit.jupiter.api.Test;
3030

@@ -49,7 +49,6 @@ void verifyFiltersUnboundPermissionType() {
4949
assertThat(scopeFilter.applyScope(permission, "unbound.scope")).isNull();
5050
}
5151

52-
5352
@Test
5453
void verifyFiltersPolicy() {
5554
registry.bind(REPORT_ACTION.getType(), BOUND_SCOPE);

core/common/policy-evaluator/build.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ plugins {
1818
}
1919

2020
dependencies {
21+
api(project(":spi:common:policy-model"))
2122
}
23+
2224
publishing {
2325
publications {
2426
create<MavenPublication>("policy-evaluator") {

core/common/policy-engine/src/main/java/org/eclipse/dataspaceconnector/policy/engine/ConstraintProblem.java core/common/policy-evaluator/src/main/java/org/eclipse/dataspaceconnector/policy/evaluator/ConstraintProblem.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*/
1414

15-
package org.eclipse.dataspaceconnector.policy.engine;
15+
package org.eclipse.dataspaceconnector.policy.evaluator;
1616

1717
import org.eclipse.dataspaceconnector.policy.model.Constraint;
1818

core/common/policy-engine/src/main/java/org/eclipse/dataspaceconnector/policy/engine/PolicyEvaluationResult.java core/common/policy-evaluator/src/main/java/org/eclipse/dataspaceconnector/policy/evaluator/PolicyEvaluationResult.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*/
1414

15-
package org.eclipse.dataspaceconnector.policy.engine;
15+
package org.eclipse.dataspaceconnector.policy.evaluator;
1616

1717
import org.jetbrains.annotations.NotNull;
1818

core/common/policy-engine/src/main/java/org/eclipse/dataspaceconnector/policy/engine/PolicyEvaluator.java core/common/policy-evaluator/src/main/java/org/eclipse/dataspaceconnector/policy/evaluator/PolicyEvaluator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*/
1414

15-
package org.eclipse.dataspaceconnector.policy.engine;
15+
package org.eclipse.dataspaceconnector.policy.evaluator;
1616

1717
import org.eclipse.dataspaceconnector.policy.model.AndConstraint;
1818
import org.eclipse.dataspaceconnector.policy.model.AtomicConstraint;

core/common/policy-engine/src/main/java/org/eclipse/dataspaceconnector/policy/engine/RuleProblem.java core/common/policy-evaluator/src/main/java/org/eclipse/dataspaceconnector/policy/evaluator/RuleProblem.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*/
1414

15-
package org.eclipse.dataspaceconnector.policy.engine;
15+
package org.eclipse.dataspaceconnector.policy.evaluator;
1616

1717
import com.fasterxml.jackson.annotation.JsonCreator;
1818
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;

core/common/policy-engine/src/test/java/org/eclipse/dataspaceconnector/policy/engine/model/PolicyEvaluatorScenarioTest.java core/common/policy-evaluator/src/test/java/org/eclipse/dataspaceconnector/policy/engine/model/PolicyEvaluatorScenarioTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package org.eclipse.dataspaceconnector.policy.engine.model;
1616

17-
import org.eclipse.dataspaceconnector.policy.engine.PolicyEvaluator;
17+
import org.eclipse.dataspaceconnector.policy.evaluator.PolicyEvaluator;
1818
import org.eclipse.dataspaceconnector.policy.model.AndConstraint;
1919
import org.eclipse.dataspaceconnector.policy.model.AtomicConstraint;
2020
import org.eclipse.dataspaceconnector.policy.model.Permission;

core/common/policy-engine/src/test/java/org/eclipse/dataspaceconnector/policy/engine/model/PolicyEvaluatorTest.java core/common/policy-evaluator/src/test/java/org/eclipse/dataspaceconnector/policy/engine/model/PolicyEvaluatorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package org.eclipse.dataspaceconnector.policy.engine.model;
1616

17-
import org.eclipse.dataspaceconnector.policy.engine.PolicyEvaluator;
17+
import org.eclipse.dataspaceconnector.policy.evaluator.PolicyEvaluator;
1818
import org.eclipse.dataspaceconnector.policy.model.Action;
1919
import org.eclipse.dataspaceconnector.policy.model.Duty;
2020
import org.eclipse.dataspaceconnector.policy.model.Permission;

core/control-plane/contract/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ plugins {
2222
}
2323

2424
dependencies {
25+
api(project(":spi:common:policy-engine-spi"))
2526
api(project(":spi:control-plane:contract-spi"))
2627

2728
implementation(project(":core:common:state-machine"))

core/control-plane/contract/src/main/java/org/eclipse/dataspaceconnector/contract/ContractServiceExtension.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import org.eclipse.dataspaceconnector.spi.event.EventRouter;
4747
import org.eclipse.dataspaceconnector.spi.message.RemoteMessageDispatcherRegistry;
4848
import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
49-
import org.eclipse.dataspaceconnector.spi.policy.PolicyEngine;
49+
import org.eclipse.dataspaceconnector.spi.policy.engine.PolicyEngine;
5050
import org.eclipse.dataspaceconnector.spi.policy.store.PolicyArchive;
5151
import org.eclipse.dataspaceconnector.spi.policy.store.PolicyDefinitionStore;
5252
import org.eclipse.dataspaceconnector.spi.retry.ExponentialWaitStrategy;

core/control-plane/contract/src/main/java/org/eclipse/dataspaceconnector/contract/offer/ContractDefinitionServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.eclipse.dataspaceconnector.spi.message.Range;
2323
import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
2424
import org.eclipse.dataspaceconnector.spi.policy.PolicyDefinition;
25-
import org.eclipse.dataspaceconnector.spi.policy.PolicyEngine;
25+
import org.eclipse.dataspaceconnector.spi.policy.engine.PolicyEngine;
2626
import org.eclipse.dataspaceconnector.spi.policy.store.PolicyDefinitionStore;
2727
import org.eclipse.dataspaceconnector.spi.query.QuerySpec;
2828
import org.eclipse.dataspaceconnector.spi.result.Result;

core/control-plane/contract/src/main/java/org/eclipse/dataspaceconnector/contract/validation/ContractValidationServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.eclipse.dataspaceconnector.spi.contract.offer.ContractDefinitionService;
2323
import org.eclipse.dataspaceconnector.spi.contract.validation.ContractValidationService;
2424
import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
25-
import org.eclipse.dataspaceconnector.spi.policy.PolicyEngine;
25+
import org.eclipse.dataspaceconnector.spi.policy.engine.PolicyEngine;
2626
import org.eclipse.dataspaceconnector.spi.policy.store.PolicyDefinitionStore;
2727
import org.eclipse.dataspaceconnector.spi.result.Result;
2828
import org.eclipse.dataspaceconnector.spi.types.domain.contract.agreement.ContractAgreement;

core/control-plane/contract/src/test/java/org/eclipse/dataspaceconnector/contract/offer/ContractDefinitionServiceImplTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.eclipse.dataspaceconnector.spi.message.Range;
2222
import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
2323
import org.eclipse.dataspaceconnector.spi.policy.PolicyDefinition;
24-
import org.eclipse.dataspaceconnector.spi.policy.PolicyEngine;
24+
import org.eclipse.dataspaceconnector.spi.policy.engine.PolicyEngine;
2525
import org.eclipse.dataspaceconnector.spi.policy.store.PolicyDefinitionStore;
2626
import org.eclipse.dataspaceconnector.spi.query.QuerySpec;
2727
import org.eclipse.dataspaceconnector.spi.result.Result;

0 commit comments

Comments
 (0)