Bug 565011 rebuild the core of condition expression evaluation

- extend `AccessCycleConfiguration` with newly designed service registries - implement extensions in sealed configuration - cover new facilities with tests in scope of `FrameworkContractTest` suite Signed-off-by: elena.parovyshnaya <[email protected]>
eclipse-passage · Jul 8, 2020 · 14f1b73 · 14f1b73
1 parent 46fb574
commit 14f1b73
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/...se.passage.lic.api/src/org/eclipse/passage/lic/internal/api/AccessCycleConfiguration.java b/...se.passage.lic.api/src/org/eclipse/passage/lic/internal/api/AccessCycleConfiguration.java
@@ -43,6 +43,6 @@ public interface AccessCycleConfiguration {
 
 	ExpressionEvaluatorsRegistry expressionEvaluators();
 
-	ExpressionTokenAssessorsRegistry tokenEvaluators();
+	ExpressionTokenAssessorsRegistry expressionAssessors();
 
 }
diff --git a/....seal.demo/src/org/eclipse/passage/seal/internal/demo/SealedAccessCycleConfiguration.java b/....seal.demo/src/org/eclipse/passage/seal/internal/demo/SealedAccessCycleConfiguration.java
@@ -105,7 +105,7 @@ final class SealedAccessCycleConfiguration implements AccessCycleConfiguration {
 		emitters = new ReadOnlyRegistry<>(Arrays.asList(//
 				new BasePermissionEmittingService(//
 						expressionParsers(), //
-						tokenEvaluators(), //
+						expressionAssessors(), //
 						expressionEvaluators())//
 		));
 		expressionParsers = new ReadOnlyRegistry<>(Arrays.asList(//
@@ -164,7 +164,7 @@ public ExpressionEvaluatorsRegistry expressionEvaluators() {
 	}
 
 	@Override
-	public ExpressionTokenAssessorsRegistry tokenEvaluators() {
+	public ExpressionTokenAssessorsRegistry expressionAssessors() {
 		return () -> tokenEvaluators;
 	}
 

diff --git a/...se.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/FrameworkContractTest.java b/...se.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/FrameworkContractTest.java
@@ -193,17 +193,17 @@ public final void hasEvaluatorForDefaultExpressionFormat() {
 	@Test
 	@Ignore // yet to be implemented (OSHI-based)
 	public final void canAssessConditionExpressionsSegment() {
-		assertServiceRegistryIsFunctional(config().tokenEvaluators().get());
+		assertServiceRegistryIsFunctional(config().expressionAssessors().get());
 	}
 
 	@Test
 	public final void prohibitsExpressionSegmentAssessmentServicesExtension() {
-		assertTrue(readOnly(config().tokenEvaluators().get()));
+		assertTrue(readOnly(config().expressionAssessors().get()));
 	}
 
 	@Test
 	public final void prohibitsInjectionIntoSegmentAssessmentServices() {
-		assertServiceInjectionsIsProhibited(config().tokenEvaluators().get(),
+		assertServiceInjectionsIsProhibited(config().expressionAssessors().get(),
 				new FakeExpressionTokenAssessmentService());
 	}
 

diff --git a/...ests/src/org/eclipse/passage/lic/internal/base/tests/requirements/SabotagedFramework.java b/...ests/src/org/eclipse/passage/lic/internal/base/tests/requirements/SabotagedFramework.java
@@ -94,7 +94,7 @@ public ExpressionEvaluatorsRegistry expressionEvaluators() {
 		}
 
 		@Override
-		public ExpressionTokenAssessorsRegistry tokenEvaluators() {
+		public ExpressionTokenAssessorsRegistry expressionAssessors() {
 			return () -> noService();
 		}