Bug 564328 API revision | conditions | rethink key interfaces

side work:
  - revised versions of `ConditionMiner` and registry  are added
  - `Framework` interface is extended with the corresponding supplier
  - `Framework` implementations follow the changes
  - `ResolvedRequirements` interface license header is fixed

Signed-off-by: elena.parovyshnaya <elena.parovyshnaya@gmail.com>

bundles/org.eclipse.passage.lic.api/META-INF/MANIFEST.MF

@@ -23,6 +23,7 @@ Export-Package: org.eclipse.passage.lic.api,
    org.eclipse.passage.loc.users.ui,
    org.eclipse.passage.loc.api",
  org.eclipse.passage.lic.internal.api.conditions;x-internal:=true,
+ org.eclipse.passage.lic.internal.api.conditions.mining;x-internal:=true,
  org.eclipse.passage.lic.internal.api.registry;x-internal:=true,
  org.eclipse.passage.lic.internal.api.requirements;x-internal:=true,
  org.eclipse.passage.lic.internal.api.restrictions;x-internal:=true,

bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/ConditionMiner.java

@@ -15,23 +15,28 @@
 import org.eclipse.passage.lic.api.LicensingConfiguration;
 
 /**
- * <p>The miner to extract {@link LicensingCondition}s from different sources like</p>
+ * <p>
+ * The miner to extract {@link LicensingCondition}s from different sources like
+ * </p>
  * <ul>
  * <li>local file system</li>
  * <li>network server</li>
  * <li>etc</li>
  * </ul>
- * <p>The service is intended to implement the third phase of <i>access cycle</i>.</p>
+ * <p>
+ * The service is intended to implement the third phase of <i>access cycle</i>.
+ * </p>
  *
  * @see LicensingCondition
  * @see org.eclipse.passage.lic.api
+ * @deprecated use MinedConditions
  * @since 0.4.0
  */
+@Deprecated
 public interface ConditionMiner {
 
 	/**
-	 * Extracts {@link LicensingCondition}s for given
-	 * {@link LicensingConfiguration}
+	 * Extracts {@link LicensingCondition}s for given {@link LicensingConfiguration}
 	 * 
 	 * @param configuration the {@link LicensingConfiguration}
 	 * @return the {@link Iterable}<{@link LicensingCondition}>, may be empty

bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/Framework.java

@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.eclipse.passage.lic.internal.api;
 
+import org.eclipse.passage.lic.internal.api.conditions.mining.MinedConditionsRegistry;
 import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirementsRegistry;
 
 /**
@@ -38,4 +39,6 @@ public interface Framework {
 
 	ResolvedRequirementsRegistry requirementsRegistry();
 
+	MinedConditionsRegistry conditionsRegistry();
+
 }

bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/MinedConditions.java

@@ -0,0 +1,26 @@
+package org.eclipse.passage.lic.internal.api.conditions.mining;
+
+import java.util.Collection;
+
+import org.eclipse.passage.lic.internal.api.conditions.Condition;
+import org.eclipse.passage.lic.internal.api.registry.Service;
+import org.eclipse.passage.lic.internal.api.registry.StringServiceId;
+
+/**
+ * <p>
+ * The miner to extract {@link Condition}s from different sources like
+ * </p>
+ * <ul>
+ * <li>local file system</li>
+ * <li>network server</li>
+ * <li>etc</li>
+ * </ul>
+ * <p>
+ * The service is intended to implement the third phase of <i>access cycle</i>.
+ * </p>
+ */
+public interface MinedConditions extends Service<StringServiceId> {
+
+	Collection<Condition> all();
+
+}

bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/MinedConditionsRegistry.java

@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2020 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0/.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lic.internal.api.conditions.mining;
+
+import java.util.function.Supplier;
+
+import org.eclipse.passage.lic.internal.api.registry.Registry;
+import org.eclipse.passage.lic.internal.api.registry.StringServiceId;
+
+public interface MinedConditionsRegistry extends Supplier<Registry<StringServiceId, MinedConditions>> {
+
+}

bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/requirements/ResolvedRequirements.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2020 ArSysOp
+ * Copyright (c) 2020 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at

bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/DemoFramework.java

@@ -15,6 +15,8 @@
 import java.util.Arrays;
 
 import org.eclipse.passage.lic.internal.api.Framework;
+import org.eclipse.passage.lic.internal.api.conditions.mining.MinedConditions;
+import org.eclipse.passage.lic.internal.api.conditions.mining.MinedConditionsRegistry;
 import org.eclipse.passage.lic.internal.api.registry.Registry;
 import org.eclipse.passage.lic.internal.api.registry.StringServiceId;
 import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirements;
@@ -25,21 +27,31 @@
 
 @SuppressWarnings("restriction")
 final class DemoFramework implements Framework {
-	
+
 	private final Registry<StringServiceId, ResolvedRequirements> requirements;
+	private final Registry<StringServiceId, MinedConditions> conditions;
 	static final Framework demo = new DemoFramework();
 
 	private DemoFramework() {
 		requirements = //
-				new ReadOnlyRegistry<StringServiceId, ResolvedRequirements>(Arrays.asList(//
+				new ReadOnlyRegistry<>(Arrays.asList(//
 						new BundleRequirements(), //
 						new ComponentRequirements()) //
 				);
+		conditions = //
+				new ReadOnlyRegistry<>(Arrays.asList(//
+				)//
+				);
 	}
 
 	@Override
 	public ResolvedRequirementsRegistry requirementsRegistry() {
 		return () -> requirements;
 	}
 
+	@Override
+	public MinedConditionsRegistry conditionsRegistry() {
+		return () -> conditions;
+	}
+
 }

tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/base/tests/LicensingVersionsTest.java

@@ -25,6 +25,7 @@
 
 import org.junit.Test;
 
+// fully covered 
 public class LicensingVersionsTest {
 
 	@Test

tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/SabotagedFramework.java

@@ -15,6 +15,8 @@
 import java.util.ArrayList;
 
 import org.eclipse.passage.lic.internal.api.Framework;
+import org.eclipse.passage.lic.internal.api.conditions.mining.MinedConditions;
+import org.eclipse.passage.lic.internal.api.conditions.mining.MinedConditionsRegistry;
 import org.eclipse.passage.lic.internal.api.registry.Registry;
 import org.eclipse.passage.lic.internal.api.registry.StringServiceId;
 import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirements;
@@ -26,10 +28,15 @@ final class SabotagedFramework implements Framework {
 
 	@Override
 	public ResolvedRequirementsRegistry requirementsRegistry() {
-		return new NoResolvers();
+		return new NoRequirementResolvers();
 	}
 
-	private static class NoResolvers implements ResolvedRequirementsRegistry {
+	@Override
+	public MinedConditionsRegistry conditionsRegistry() {
+		return new NoConditionMiners();
+	}
+
+	private static class NoRequirementResolvers implements ResolvedRequirementsRegistry {
 
 		@Override
 		public Registry<StringServiceId, ResolvedRequirements> get() {
@@ -38,4 +45,13 @@ public Registry<StringServiceId, ResolvedRequirements> get() {
 
 	}
 
+	private static class NoConditionMiners implements MinedConditionsRegistry {
+
+		@Override
+		public Registry<StringServiceId, MinedConditions> get() {
+			return new ReadOnlyRegistry<StringServiceId, MinedConditions>(new ArrayList<>());
+		}
+
+	}
+
 }