Merge pull request #832 from eclipse-passage/572897-2

Bug 572897 lic api goes out from the shadows
eclipse-passage · Jul 14, 2021 · cb3f729 · cb3f729
2 parents 592f07f + 77d88e3
commit cb3f729
Show file tree

Hide file tree

Showing 263 changed files with 1,030 additions and 955 deletions.
diff --git a/...ipse.passage.lac.gear/src/org/eclipse/passage/lac/internal/gear/RuntimeConfiguration.java b/...ipse.passage.lac.gear/src/org/eclipse/passage/lac/internal/gear/RuntimeConfiguration.java
@@ -17,6 +17,22 @@
 import java.util.Collections;
 import java.util.function.Supplier;
 
+import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget;
+import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluationService;
+import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluatorsRegistry;
+import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionParsingService;
+import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionPasringRegistry;
+import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionProtocol;
+import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionTokenAssessmentService;
+import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionTokenAssessorsRegistry;
+import org.eclipse.passage.lic.api.conditions.evaluation.PermissionEmittersRegistry;
+import org.eclipse.passage.lic.api.conditions.evaluation.PermissionEmittingService;
+import org.eclipse.passage.lic.api.conditions.mining.ConditionTransport;
+import org.eclipse.passage.lic.api.conditions.mining.ConditionTransportRegistry;
+import org.eclipse.passage.lic.api.conditions.mining.ContentType;
+import org.eclipse.passage.lic.api.conditions.mining.MinedConditions;
+import org.eclipse.passage.lic.api.conditions.mining.MinedConditionsRegistry;
+import org.eclipse.passage.lic.api.conditions.mining.MiningEquipment;
 import org.eclipse.passage.lic.api.inspection.RuntimeEnvironment;
 import org.eclipse.passage.lic.api.inspection.RuntimeEnvironmentRegistry;
 import org.eclipse.passage.lic.api.io.Hashes;
@@ -29,6 +45,11 @@
 import org.eclipse.passage.lic.api.registry.StringServiceId;
 import org.eclipse.passage.lic.api.requirements.ResolvedRequirements;
 import org.eclipse.passage.lic.api.requirements.ResolvedRequirementsRegistry;
+import org.eclipse.passage.lic.base.conditions.evaluation.BasePermissionEmittingService;
+import org.eclipse.passage.lic.base.conditions.evaluation.BerlinProtocolExpressionParseService;
+import org.eclipse.passage.lic.base.conditions.evaluation.SimpleMapExpressionEvaluationService;
+import org.eclipse.passage.lic.base.conditions.mining.PathResidentConditions;
+import org.eclipse.passage.lic.base.conditions.mining.PersonalLicenseMiningEquipment;
 import org.eclipse.passage.lic.base.io.PathKeyKeeper;
 import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry;
 import org.eclipse.passage.lic.bc.BcStreamCodec;
@@ -39,30 +60,9 @@
 import org.eclipse.passage.lic.internal.api.LicensedProduct;
 import org.eclipse.passage.lic.internal.api.acquire.LicenseAcquisitionService;
 import org.eclipse.passage.lic.internal.api.acquire.LicenseAcquisitionServicesRegistry;
-import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget;
-import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluationService;
-import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluatorsRegistry;
-import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionParsingService;
-import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionPasringRegistry;
-import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionProtocol;
-import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionTokenAssessmentService;
-import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionTokenAssessorsRegistry;
-import org.eclipse.passage.lic.internal.api.conditions.evaluation.PermissionEmittersRegistry;
-import org.eclipse.passage.lic.internal.api.conditions.evaluation.PermissionEmittingService;
-import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransport;
-import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransportRegistry;
-import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType;
-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.conditions.mining.MiningEquipment;
 import org.eclipse.passage.lic.internal.api.restrictions.PermissionsExaminationService;
 import org.eclipse.passage.lic.internal.api.restrictions.PermissionsExaminationServicesRegistry;
 import org.eclipse.passage.lic.internal.base.acquire.PathLicenseAcquisitionService;
-import org.eclipse.passage.lic.internal.base.conditions.evaluation.BasePermissionEmittingService;
-import org.eclipse.passage.lic.internal.base.conditions.evaluation.BerlinProtocolExpressionParseService;
-import org.eclipse.passage.lic.internal.base.conditions.evaluation.SimpleMapExpressionEvaluationService;
-import org.eclipse.passage.lic.internal.base.conditions.mining.PathResidentConditions;
-import org.eclipse.passage.lic.internal.base.conditions.mining.PersonalLicenseMiningEquipment;
 import org.eclipse.passage.lic.internal.json.JsonConditionTransport;
 import org.eclipse.passage.lic.internal.licenses.model.toberemoved.UserFilteringConditionTransport;
 import org.eclipse.passage.lic.internal.net.api.handle.NetRequest;

diff --git a/...ipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/ServerAuthentication.java b/...ipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/ServerAuthentication.java
@@ -12,18 +12,18 @@
  *******************************************************************************/
 package org.eclipse.passage.lbc.internal.base;
 
+import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluationException;
+import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluatorsRegistry;
+import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionParsingException;
+import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionPasringRegistry;
+import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionTokenAssessorsRegistry;
 import org.eclipse.passage.lic.api.inspection.RuntimeEnvironmentRegistry;
+import org.eclipse.passage.lic.base.conditions.evaluation.Authentication;
+import org.eclipse.passage.lic.base.conditions.evaluation.BerlinProtocolExpressionParseService;
+import org.eclipse.passage.lic.base.conditions.evaluation.SimpleMapExpressionEvaluationService;
 import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry;
 import org.eclipse.passage.lic.internal.api.EvaluationInstructions;
 import org.eclipse.passage.lic.internal.api.LicensingException;
-import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluationException;
-import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluatorsRegistry;
-import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionParsingException;
-import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionPasringRegistry;
-import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionTokenAssessorsRegistry;
-import org.eclipse.passage.lic.internal.base.conditions.evaluation.Authentication;
-import org.eclipse.passage.lic.internal.base.conditions.evaluation.BerlinProtocolExpressionParseService;
-import org.eclipse.passage.lic.internal.base.conditions.evaluation.SimpleMapExpressionEvaluationService;
 import org.eclipse.passage.lic.oshi.HardwareAssessmentService;
 import org.eclipse.passage.lic.oshi.HardwareEnvironment;
 

diff --git a/....lbc.base/src/org/eclipse/passage/lbc/internal/base/ServerAuthenticationInstructions.java b/....lbc.base/src/org/eclipse/passage/lbc/internal/base/ServerAuthenticationInstructions.java
@@ -15,9 +15,9 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
+import org.eclipse.passage.lic.base.conditions.BaseEvaluationInstructions;
 import org.eclipse.passage.lic.internal.api.EvaluationInstructions;
 import org.eclipse.passage.lic.internal.api.EvaluationType;
-import org.eclipse.passage.lic.internal.base.conditions.BaseEvaluationInstructions;
 import org.eclipse.passage.lic.internal.net.ServerAuthenticationExpression;
 import org.eclipse.passage.lic.internal.net.ServerAuthenticationType;
 import org.eclipse.passage.lic.internal.net.api.handle.NetRequest;

diff --git a/...ipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/acquire/LicensePacks.java b/...ipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/acquire/LicensePacks.java
@@ -23,12 +23,12 @@
 import org.apache.logging.log4j.Logger;
 import org.eclipse.passage.lic.api.io.KeyKeeper;
 import org.eclipse.passage.lic.api.io.StreamCodec;
+import org.eclipse.passage.lic.base.conditions.mining.DecodedContent;
 import org.eclipse.passage.lic.base.io.FileCollection;
 import org.eclipse.passage.lic.base.io.FloatingFileExtension;
 import org.eclipse.passage.lic.base.io.PathFromLicensedProduct;
 import org.eclipse.passage.lic.internal.api.LicensedProduct;
 import org.eclipse.passage.lic.internal.api.LicensingException;
-import org.eclipse.passage.lic.internal.base.conditions.mining.DecodedContent;
 import org.eclipse.passage.lic.internal.emf.EObjectFromBytes;
 import org.eclipse.passage.lic.licenses.model.api.FloatingLicensePack;
 import org.eclipse.passage.lic.licenses.model.meta.LicensesPackage;

diff --git a/...s/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/api/FlsGear.java b/...s/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/api/FlsGear.java
@@ -15,13 +15,13 @@
 import java.nio.file.Path;
 import java.util.function.Supplier;
 
+import org.eclipse.passage.lic.api.conditions.mining.ConditionTransport;
+import org.eclipse.passage.lic.api.conditions.mining.ContentType;
 import org.eclipse.passage.lic.api.io.HashesRegistry;
 import org.eclipse.passage.lic.api.io.KeyKeeper;
 import org.eclipse.passage.lic.api.io.StreamCodec;
 import org.eclipse.passage.lic.internal.api.Gear;
 import org.eclipse.passage.lic.internal.api.LicensedProduct;
-import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransport;
-import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType;
 
 public interface FlsGear extends Gear {
 

diff --git a/....eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/interaction/Pack.java b/....eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/interaction/Pack.java
@@ -19,12 +19,12 @@
 
 import org.eclipse.passage.lbc.internal.base.api.FlsGear;
 import org.eclipse.passage.lbc.internal.base.api.FlsGearAwre;
+import org.eclipse.passage.lic.base.conditions.mining.DecodedContent;
 import org.eclipse.passage.lic.base.io.FileKeyKeeper;
 import org.eclipse.passage.lic.internal.api.LicensedProduct;
 import org.eclipse.passage.lic.internal.api.LicensingException;
 import org.eclipse.passage.lic.internal.base.BaseLicensedProduct;
 import org.eclipse.passage.lic.internal.base.InvalidLicensedProduct;
-import org.eclipse.passage.lic.internal.base.conditions.mining.DecodedContent;
 import org.eclipse.passage.lic.internal.emf.EObjectFromBytes;
 import org.eclipse.passage.lic.licenses.model.api.FloatingLicensePack;
 import org.eclipse.passage.lic.licenses.model.api.ProductRef;

diff --git a/....passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/AssembledConditions.java b/....passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/AssembledConditions.java
@@ -21,15 +21,15 @@
 import java.util.Optional;
 
 import org.eclipse.passage.lbc.internal.base.i18n.BaseMessages;
+import org.eclipse.passage.lic.api.conditions.Condition;
+import org.eclipse.passage.lic.api.conditions.ValidityPeriod;
+import org.eclipse.passage.lic.api.conditions.VersionMatch;
+import org.eclipse.passage.lic.base.conditions.BaseCondition;
+import org.eclipse.passage.lic.base.conditions.BaseEvaluationInstructions;
+import org.eclipse.passage.lic.base.conditions.BaseValidityPeriodClosed;
 import org.eclipse.passage.lic.internal.api.EvaluationInstructions;
 import org.eclipse.passage.lic.internal.api.EvaluationType;
 import org.eclipse.passage.lic.internal.api.LicensingException;
-import org.eclipse.passage.lic.internal.api.conditions.Condition;
-import org.eclipse.passage.lic.internal.api.conditions.ValidityPeriod;
-import org.eclipse.passage.lic.internal.api.conditions.VersionMatch;
-import org.eclipse.passage.lic.internal.base.conditions.BaseCondition;
-import org.eclipse.passage.lic.internal.base.conditions.BaseEvaluationInstructions;
-import org.eclipse.passage.lic.internal.base.conditions.BaseValidityPeriodClosed;
 import org.eclipse.passage.lic.internal.licenses.convert.PVersionMatch;
 import org.eclipse.passage.lic.licenses.model.api.FeatureGrant;
 import org.eclipse.passage.lic.licenses.model.api.FloatingLicensePack;

diff --git a/...g.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/Conditions.java b/...g.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/Conditions.java
@@ -21,9 +21,9 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.passage.lbc.internal.base.EncodedResponse;
 import org.eclipse.passage.lbc.internal.base.api.RawRequest;
+import org.eclipse.passage.lic.api.conditions.ConditionPack;
 import org.eclipse.passage.lic.internal.api.PassageAction;
 import org.eclipse.passage.lic.internal.api.ServiceInvocationResult;
-import org.eclipse.passage.lic.internal.api.conditions.ConditionPack;
 import org.eclipse.passage.lic.internal.base.diagnostic.DiagnosticExplained;
 import org.eclipse.passage.lic.internal.base.diagnostic.NoErrors;
 import org.eclipse.passage.lic.internal.net.api.handle.NetResponse;

diff --git a/...e.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/FloatingConditions.java b/...e.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/FloatingConditions.java
@@ -15,11 +15,11 @@
 import java.nio.file.Path;
 import java.util.function.Supplier;
 
+import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget;
+import org.eclipse.passage.lic.base.conditions.mining.LocalConditions;
 import org.eclipse.passage.lic.base.io.FloatingFileExtension;
 import org.eclipse.passage.lic.base.io.PathFromLicensedProduct;
 import org.eclipse.passage.lic.internal.api.LicensedProduct;
-import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget;
-import org.eclipse.passage.lic.internal.base.conditions.mining.LocalConditions;
 
 final class FloatingConditions extends LocalConditions {
 

diff --git a/...age.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/PersonalLicenseGenerated.java b/...age.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/PersonalLicenseGenerated.java
@@ -19,9 +19,9 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+import org.eclipse.passage.lic.api.conditions.Condition;
+import org.eclipse.passage.lic.api.conditions.ValidityPeriodClosed;
 import org.eclipse.passage.lic.internal.api.LicensedProduct;
-import org.eclipse.passage.lic.internal.api.conditions.Condition;
-import org.eclipse.passage.lic.internal.api.conditions.ValidityPeriodClosed;
 import org.eclipse.passage.lic.internal.licenses.model.EmptyPersonalFeatureGrant;
 import org.eclipse.passage.lic.internal.licenses.model.EmptyPersonalLicensePack;
 import org.eclipse.passage.lic.licenses.model.api.PersonalFeatureGrant;

diff --git a/....lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/ReassemblingMiningEquipment.java b/....lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/ReassemblingMiningEquipment.java
@@ -18,12 +18,12 @@
 
 import org.eclipse.passage.lbc.internal.base.api.FlsGear;
 import org.eclipse.passage.lbc.internal.base.api.FlsGearAwre;
+import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget;
+import org.eclipse.passage.lic.api.conditions.mining.ContentType;
+import org.eclipse.passage.lic.api.conditions.mining.MiningEquipment;
+import org.eclipse.passage.lic.api.conditions.mining.MiningTool;
 import org.eclipse.passage.lic.internal.api.LicensedProduct;
 import org.eclipse.passage.lic.internal.api.LicensingException;
-import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget;
-import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType;
-import org.eclipse.passage.lic.internal.api.conditions.mining.MiningEquipment;
-import org.eclipse.passage.lic.internal.api.conditions.mining.MiningTool;
 
 public final class ReassemblingMiningEquipment implements MiningEquipment {
 

diff --git a/...ssage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/ReassemblingMiningTool.java b/...ssage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/ReassemblingMiningTool.java
@@ -21,21 +21,21 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.eclipse.passage.lbc.internal.base.i18n.BaseMessages;
+import org.eclipse.passage.lic.api.conditions.Condition;
+import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget;
+import org.eclipse.passage.lic.api.conditions.ConditionPack;
+import org.eclipse.passage.lic.api.conditions.mining.ConditionTransport;
 import org.eclipse.passage.lic.api.io.KeyKeeper;
 import org.eclipse.passage.lic.api.io.StreamCodec;
+import org.eclipse.passage.lic.base.conditions.BaseConditionOrigin;
+import org.eclipse.passage.lic.base.conditions.BaseConditionPack;
+import org.eclipse.passage.lic.base.conditions.mining.ArmedMiningTool;
 import org.eclipse.passage.lic.internal.api.LicensedProduct;
 import org.eclipse.passage.lic.internal.api.LicensingException;
 import org.eclipse.passage.lic.internal.api.ServiceInvocationResult;
-import org.eclipse.passage.lic.internal.api.conditions.Condition;
-import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget;
-import org.eclipse.passage.lic.internal.api.conditions.ConditionPack;
-import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransport;
 import org.eclipse.passage.lic.internal.api.diagnostic.Trouble;
 import org.eclipse.passage.lic.internal.base.BaseLicensedProduct;
 import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult;
-import org.eclipse.passage.lic.internal.base.conditions.BaseConditionOrigin;
-import org.eclipse.passage.lic.internal.base.conditions.BaseConditionPack;
-import org.eclipse.passage.lic.internal.base.conditions.mining.ArmedMiningTool;
 import org.eclipse.passage.lic.internal.base.diagnostic.BaseDiagnostic;
 import org.eclipse.passage.lic.internal.base.diagnostic.code.ServiceFailedOnMorsel;
 import org.eclipse.passage.lic.internal.emf.EObjectFromBytes;

diff --git a/...se.passage.lbc.fls.gear/src/org/eclipse/passage/lbc/internal/fls/gear/PassageFlsGear.java b/...se.passage.lbc.fls.gear/src/org/eclipse/passage/lbc/internal/fls/gear/PassageFlsGear.java
@@ -16,6 +16,8 @@
 import java.util.function.Supplier;
 
 import org.eclipse.passage.lbc.internal.base.api.FlsGear;
+import org.eclipse.passage.lic.api.conditions.mining.ConditionTransport;
+import org.eclipse.passage.lic.api.conditions.mining.ContentType;
 import org.eclipse.passage.lic.api.io.Hashes;
 import org.eclipse.passage.lic.api.io.HashesRegistry;
 import org.eclipse.passage.lic.api.io.KeyKeeper;
@@ -27,8 +29,6 @@
 import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry;
 import org.eclipse.passage.lic.bc.BcStreamCodec;
 import org.eclipse.passage.lic.internal.api.LicensedProduct;
-import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransport;
-import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType;
 import org.eclipse.passage.lic.internal.licenses.model.toberemoved.XmiConditionTransport;
 
 @SuppressWarnings("restriction")