From 77d88e3995a9811fae472f8cfb56522486de12ab Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Wed, 14 Jul 2021 13:32:34 +0300 Subject: [PATCH] Bug 572897 lic api goes out from the shadows publish - `lic.api.conditions.*` - `lic.base.conditions.*` structures and services implementation - `lic.hc` remote condition mining and acquisition services implementation Signed-off-by: eparovyshnaya --- .../internal/gear/RuntimeConfiguration.java | 42 ++++++++--------- .../internal/base/ServerAuthentication.java | 16 +++---- .../ServerAuthenticationInstructions.java | 2 +- .../internal/base/acquire/LicensePacks.java | 2 +- .../lbc/internal/base/api/FlsGear.java | 4 +- .../lbc/internal/base/interaction/Pack.java | 2 +- .../base/mine/AssembledConditions.java | 12 ++--- .../lbc/internal/base/mine/Conditions.java | 2 +- .../base/mine/FloatingConditions.java | 4 +- .../base/mine/PersonalLicenseGenerated.java | 4 +- .../mine/ReassemblingMiningEquipment.java | 8 ++-- .../base/mine/ReassemblingMiningTool.java | 14 +++--- .../lbc/internal/fls/gear/PassageFlsGear.java | 4 +- .../seal/BaseAccessCycleConfiguration.java | 34 +++++++------- .../seal/SealedAccessCycleConfiguration.java | 8 ++-- .../META-INF/MANIFEST.MF | 46 ++----------------- .../OSGI-INF/l10n/bundle.properties | 2 +- .../api/conditions/Condition.java | 2 +- .../api/conditions/ConditionMiningTarget.java | 6 ++- .../api/conditions/ConditionOrigin.java | 2 +- .../api/conditions/ConditionPack.java | 6 ++- .../api/conditions/IssuerSignature.java | 2 +- .../conditions/LicenseSignatureIsEmpty.java | 2 +- .../api/conditions/MatchingRule.java | 4 +- .../api/conditions/ValidityPeriod.java | 6 ++- .../api/conditions/ValidityPeriodClosed.java | 6 ++- .../api/conditions/ValidityPeriodOpen.java | 6 ++- .../api/conditions/VersionMatch.java | 5 +- .../api/conditions/evaluation/Emission.java | 6 +-- .../ExpressionEvaluationException.java | 7 ++- .../ExpressionEvaluationService.java | 4 +- .../ExpressionEvaluatorsRegistry.java | 7 ++- .../ExpressionParsingException.java | 7 ++- .../evaluation/ExpressionParsingService.java | 6 ++- .../evaluation/ExpressionPasringRegistry.java | 7 ++- .../evaluation/ExpressionProtocol.java | 7 ++- .../ExpressionTokenAssessmentService.java | 2 +- .../ExpressionTokenAssessorsRegistry.java | 2 +- .../evaluation/ParsedExpression.java | 7 ++- .../api/conditions/evaluation/Permission.java | 11 +++-- .../PermissionEmittersRegistry.java | 7 ++- .../evaluation/PermissionEmittingService.java | 9 ++-- .../conditions/evaluation/package-info.java | 4 +- .../conditions/mining/ConditionTransport.java | 6 +-- .../mining/ConditionTransportRegistry.java | 7 ++- .../api/conditions/mining/ContentType.java | 6 ++- .../mining/LicenseReadingService.java | 9 ++-- .../conditions/mining/MinedConditions.java | 12 +++-- .../mining/MinedConditionsRegistry.java | 9 ++-- .../conditions/mining/MiningEquipment.java | 9 ++-- .../api/conditions/mining/MiningTool.java | 9 ++-- .../api/conditions/package-info.java | 4 +- .../passage/lic/api/io/StreamCodec.java | 2 +- .../api/AccessCycleConfiguration.java | 14 +++--- .../passage/lic/internal/api/Passage.java | 2 +- .../acquire/LicenseAcquisitionService.java | 2 +- .../LicenseAcquisitionServicesRegistry.java | 2 +- .../api/conditions/vault/package-info.java | 25 ---------- .../restrictions/ExaminationCertificate.java | 2 +- .../PermissionObservationService.java | 2 +- .../PermissionsExaminationService.java | 2 +- .../api/restrictions/Restriction.java | 2 +- .../META-INF/MANIFEST.MF | 21 ++------- .../passage/lic/base/access/Conditions.java | 8 ++-- .../passage/lic/base/access/Cycle.java | 4 +- .../passage/lic/base/access/CycleFilter.java | 4 +- .../eclipse/passage/lic/base/access/Lock.java | 4 +- .../passage/lic/base/access/Permissions.java | 8 ++-- .../passage/lic/base/access/Restrictions.java | 2 +- .../lic/base/access/SumOfCertificates.java | 2 +- .../base/conditions/BaseCondition.java | 8 ++-- .../base/conditions/BaseConditionOrigin.java | 8 ++-- .../base/conditions/BaseConditionPack.java | 13 ++++-- .../BaseEvaluationInstructions.java | 2 +- .../base/conditions/BaseIssuerSignature.java | 10 ++-- .../conditions/BaseValidityPeriodClosed.java | 9 ++-- .../base/conditions/BaseVersionMatch.java | 11 +++-- .../conditions/ConditionsFeatureFilter.java | 9 ++-- .../base/conditions/FeatureConditionPack.java | 12 +++-- .../conditions/MatchingRuleCompatible.java | 4 +- .../base/conditions/MatchingRuleDefault.java | 7 ++- .../conditions/MatchingRuleEquivalent.java | 6 ++- .../conditions/MatchingRuleForIdentifier.java | 9 ++-- .../MatchingRuleGreaterOrEqual.java | 6 ++- .../base/conditions/MatchingRulePerfect.java | 5 +- .../RequiredVersionVsAllowedVersion.java | 6 ++- .../base/conditions/StrictMatchingRule.java | 8 ++-- .../conditions/UnknownConditionOrigin.java | 8 ++-- .../conditions/evaluation/Authentication.java | 18 ++++---- .../conditions/evaluation/BasePermission.java | 13 ++++-- .../BasePermissionEmittingService.java | 26 +++++------ .../BerlinProtocolExpressionParseService.java | 15 +++--- .../evaluation/FormalizedExpression.java | 12 ++--- .../evaluation/SimpleMapExpression.java | 11 +++-- .../SimpleMapExpressionEvaluationService.java | 17 ++++--- .../conditions/evaluation/SumOfEmissions.java | 11 +++-- .../conditions/mining/ArmedMiningTool.java | 13 ++++-- .../mining/BaseLicenseReadingService.java | 15 +++--- .../conditions/mining/DecodedContent.java | 7 ++- .../mining/LicensingContentType.java | 9 ++-- .../conditions/mining/LocalConditions.java | 16 ++++--- .../mining/PathResidentConditions.java | 8 ++-- .../PersonalLicenseMiningEquipment.java | 16 +++---- .../mining/PersonalLicenseMiningTool.java | 16 +++---- .../mining/SecurityKeyAlgorithm.java | 7 ++- .../conditions/mining/SecurityKeySize.java | 7 ++- .../mining/UserHomeMiningTarget.java | 9 ++-- .../mining/UserHomeResidentConditions.java | 6 +-- .../lic/base/requirements/BaseFeature.java | 2 + .../base/requirements/BaseRequirement.java | 2 + .../RequirementsFeatureFilter.java | 3 ++ .../UnsatisfiableRequirement.java | 2 + .../PathLicenseAcquisitionService.java | 2 +- .../UserHomeLicenseAcquisitionService.java | 4 +- .../BaseExaminationCertificate.java | 2 +- .../BasePermissionsExaminationService.java | 2 +- .../restrictions/ExaminationExplained.java | 2 +- .../OSGI-INF/l10n/bundle.properties | 2 +- .../requirements/RequirementToCapability.java | 2 +- .../equinox/LicenseReadingServiceRequest.java | 4 +- ...onfigurationLicenseAcquisitionService.java | 2 +- ...InstallationLicenseAcquisitionService.java | 2 +- .../conditions/ConfigurationMiningTarget.java | 2 +- .../ConfigurationResidentConditions.java | 4 +- .../conditions/InstallationMiningTarget.java | 2 +- .../InstallationResidentConditions.java | 4 +- .../META-INF/MANIFEST.MF | 10 ++-- .../OSGI-INF/l10n/bundle.properties | 2 +- .../lic/{internal => }/hc/remote/Client.java | 7 ++- .../hc/remote/Configuration.java | 7 ++- .../{internal => }/hc/remote/Connection.java | 9 ++-- .../hc/remote/QueryParameters.java | 7 ++- .../lic/{internal => }/hc/remote/Request.java | 7 ++- .../hc/remote/RequestContext.java | 4 +- .../hc/remote/ResponseHandler.java | 9 ++-- .../hc/remote/impl/AccessFiles.java | 2 +- .../hc/remote/impl/AccessPacks.java | 7 ++- .../hc/remote/impl/BaseConfiguration.java | 10 ++-- .../hc/remote/impl/BaseRequestContext.java | 4 +- .../remote/impl/EObjectFromXmiResponse.java | 8 ++-- .../hc/remote/impl/Equipment.java | 11 +++-- .../impl/FloatingServerCoordinates.java | 2 +- .../hc/remote/impl/HttpClient.java | 10 ++-- .../hc/remote/impl/NetConnection.java | 8 ++-- .../hc/remote/impl/RemoteRequest.java | 10 ++-- .../hc/remote/impl/RemoteServiceData.java | 7 ++- .../hc/remote/impl/RequestParameters.java | 4 +- .../hc/remote/impl/ResultsTransfered.java | 8 ++-- .../hc/remote/impl/ServiceAny.java | 6 +-- .../hc/remote/impl/ServiceEvery.java | 6 +-- .../hc/remote/impl/ServiceRemote.java | 8 ++-- .../acquire/AcquireRequestParameters.java | 4 +- .../acquire/ReleaseRequestParameters.java | 4 +- .../hc/remote/impl/acquire/RemoteAcquire.java | 30 ++++++------ .../acquire/RemoteAcquisitionService.java | 14 +++--- .../hc/remote/impl/acquire/RemoteRelease.java | 26 +++++------ .../remote/impl/mine/DecryptedConditions.java | 22 ++++----- .../impl/mine/MineRequestParameters.java | 4 +- .../hc/remote/impl/mine/RemoteConditions.java | 26 +++++------ .../impl/mine/RemoteConditionsRequest.java | 12 ++--- .../licensing/ImportLicenseDialog.java | 10 ++-- .../json/AcquiredExaminationCertificate.java | 2 +- .../internal/json/ConditionDeserializer.java | 2 +- .../lic/internal/json/ConditionPack.java | 2 +- .../internal/json/ConditionSerializer.java | 4 +- .../passage/lic/internal/json/Json.java | 24 +++++----- .../internal/json/JsonConditionTransport.java | 4 +- .../lic/internal/json/JsonObjectMapper.java | 2 +- .../licenses/convert/EIssuerSignature.java | 4 +- .../licenses/convert/PIssuerSignature.java | 4 +- .../licenses/convert/PVersionMatch.java | 10 ++-- .../BaseXmiConditionTransport.java | 14 +++--- .../internal/net/api/handle/NetResponse.java | 2 +- .../internal/net/handle/EObjectTransfer.java | 2 +- .../lic/internal/net/handle/Failure.java | 2 +- .../lic/internal/net/handle/PlainSuceess.java | 2 +- .../lic/oshi/HardwareAssessmentService.java | 4 +- .../core/FloatingLicensePackFromRequest.java | 2 +- .../licenses/core/LicenseSignature.java | 2 +- .../issue/ClosedValidityPeriodReduction.java | 4 +- .../FloatingLicenseIssuingProtection.java | 14 +++--- .../PersonalLicenseIssuingProtection.java | 4 +- .../core/request/FloatingLicenseData.java | 2 +- .../OperatorAccessCycleConfiguration.java | 42 ++++++++--------- .../emfforms/renderers/MatchRuleRenderer.java | 12 ++--- .../renderers/MatchingRuleExplained.java | 2 +- .../demo/BaseAccessCycleConfiguration.java | 34 +++++++------- .../DirectedAccessCycleConfiguration.java | 8 ++-- .../seal/internal/demo/FloatingLicensing.java | 16 +++---- .../demo/FocusedAccessCycleConfiguration.java | 2 +- .../internal/demo/LicensingDirection.java | 2 +- .../seal/internal/demo/PersonalLicensing.java | 10 ++-- .../OSGI-INF/l10n/bundle.properties | 2 +- .../ConditionMiningServicesRegitryTest.java | 2 +- ...ConditionTransportServicesRegitryTest.java | 2 +- ...pressionEvaluationServicesRegitryTest.java | 2 +- .../ExpressionParsingServicesRegitryTest.java | 2 +- ...ionTokenAssessmentServicesRegitryTest.java | 2 +- .../lic/api/tests/FrameworkContractTest.java | 8 ++-- ...PermissionEmittingServicesRegitryTest.java | 2 +- .../lic/api/tests/ReadOnlyCollectionTest.java | 2 +- ...uirementResolutionServicesRegitryTest.java | 2 +- .../ResolvedRequirementsContractTest.java | 1 - .../conditions/MatchingRuleContractTest.java | 5 +- .../ValidityPeriodClosedContractTest.java | 5 +- .../ValidityPeriodContractTest.java | 5 +- .../ValidityPeriodOpenContractTest.java | 5 +- .../conditions/evaluation/EmissionTest.java | 4 +- ...pressionEvaluationServiceContractTest.java | 8 ++-- .../ExpressionFormatContractTest.java | 2 +- .../ExpressionParsingServiceContractTest.java | 6 +-- .../ConditionTransportContractTest.java | 7 ++- .../conditions/mining/ContentTypeTest.java | 2 +- .../tests/fakes/conditions/FakeCondition.java | 7 ++- .../fakes/conditions/FakeConditionPack.java | 9 ++-- .../FakeExpressionEvaluationService.java | 10 ++-- .../FakeExpressionParsingService.java | 10 ++-- .../FakeExpressionTokenAssessmentService.java | 2 +- .../evaluation/FakeParsedExpression.java | 4 +- .../conditions/evaluation/FakePermission.java | 9 ++-- .../FakePermissionEmittingService.java | 9 ++-- .../mining/FakeMinedConditions.java | 9 ++-- .../fakes/io/FakeConditionTransport.java | 4 +- .../OSGI-INF/l10n/bundle.properties | 2 +- .../tests/conditions/BaseConditionTest.java | 16 +++---- .../BaseEvaluationInstructionsTest.java | 2 +- .../BaseValidityPeriodClosedTest.java | 2 +- .../MatchingRuleCompatibleTest.java | 4 +- .../MatchingRuleEquivalentTest.java | 4 +- .../MatchingRuleForIdentifierTest.java | 14 +++--- .../MatchingRuleGreaterOrEqualTest.java | 4 +- .../conditions/MatchingRulePerfectTest.java | 4 +- .../BaseValidityPeriodContractTest.java | 4 +- .../MatchingRuleCompatibleContractTest.java | 4 +- .../MatchingRuleDefaultContractTest.java | 4 +- .../MatchingRuleEquivalentContractTest.java | 4 +- ...atchingRuleGreaterOrEqualContractTest.java | 4 +- .../MatchingRulePerfectContractTest.java | 4 +- .../BasePermissionEmittingServiceTest.java | 30 ++++++------ .../evaluation/BasePermissionTest.java | 6 +-- ...linProtocolExpressionParseServiceTest.java | 10 ++-- .../conditions/evaluation/BiasedAssessor.java | 4 +- ...pleMapExpressionEvaluationServiceTest.java | 10 ++-- .../evaluation/SumOfEmissionsTest.java | 6 +-- .../conditions/mining/HeadOnlyTransport.java | 20 ++++---- .../mining/LocalConditionsTest.java | 8 ++-- .../requirements/SabotagedFramework.java | 14 +++--- ...BasePermissionsExaminationServiceTest.java | 2 +- .../ExaminationExplainedTest.java | 14 +++--- .../base/tests/restrictions/TestState.java | 20 ++++---- .../OSGI-INF/l10n/bundle.properties | 2 +- .../hc/tests/RemoteConditionsRequestTest.java | 2 +- .../internal/hc/tests/remote/AcquireTest.java | 4 +- .../internal/hc/tests/remote/MineTest.java | 6 +-- .../hc/tests/remote/ShortcutClient.java | 8 ++-- .../hc/tests/remote/ShortcutConnection.java | 6 +-- .../hc/tests/remote/TestEquipment.java | 4 +- .../hc/tests/remote/TestRequestContext.java | 4 +- .../tests/JsonConditionTransportTest.java | 4 +- .../lic/json/tests/TestConditions.java | 16 +++---- .../XmiLicensingConditionExtractorTest.java | 2 +- .../tests/XmiConditionTransportTest.java | 14 +++--- .../mining/BaseLicenseReadingServiceTest.java | 16 +++---- 263 files changed, 1030 insertions(+), 955 deletions(-) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/Condition.java (97%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/ConditionMiningTarget.java (94%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/ConditionOrigin.java (91%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/ConditionPack.java (90%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/IssuerSignature.java (91%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/LicenseSignatureIsEmpty.java (92%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/MatchingRule.java (93%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/ValidityPeriod.java (90%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/ValidityPeriodClosed.java (89%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/ValidityPeriodOpen.java (87%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/VersionMatch.java (93%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/evaluation/Emission.java (89%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/evaluation/ExpressionEvaluationException.java (86%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/evaluation/ExpressionEvaluationService.java (91%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/evaluation/ExpressionEvaluatorsRegistry.java (85%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/evaluation/ExpressionParsingException.java (86%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/evaluation/ExpressionParsingService.java (87%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/evaluation/ExpressionPasringRegistry.java (85%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/evaluation/ExpressionProtocol.java (93%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/evaluation/ExpressionTokenAssessmentService.java (96%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/evaluation/ExpressionTokenAssessorsRegistry.java (91%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/evaluation/ParsedExpression.java (81%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/evaluation/Permission.java (75%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/evaluation/PermissionEmittersRegistry.java (86%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/evaluation/PermissionEmittingService.java (92%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/evaluation/package-info.java (95%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/mining/ConditionTransport.java (89%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/mining/ConditionTransportRegistry.java (85%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/mining/ContentType.java (94%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/mining/LicenseReadingService.java (82%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/mining/MinedConditions.java (88%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/mining/MinedConditionsRegistry.java (78%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/mining/MiningEquipment.java (79%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/mining/MiningTool.java (80%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/conditions/package-info.java (89%) delete mode 100644 bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/vault/package-info.java rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/BaseCondition.java (87%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/BaseConditionOrigin.java (86%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/BaseConditionPack.java (79%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/BaseEvaluationInstructions.java (95%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/BaseIssuerSignature.java (90%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/BaseValidityPeriodClosed.java (89%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/BaseVersionMatch.java (81%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/ConditionsFeatureFilter.java (87%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/FeatureConditionPack.java (82%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/MatchingRuleCompatible.java (94%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/MatchingRuleDefault.java (88%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/MatchingRuleEquivalent.java (94%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/MatchingRuleForIdentifier.java (90%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/MatchingRuleGreaterOrEqual.java (92%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/MatchingRulePerfect.java (90%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/RequiredVersionVsAllowedVersion.java (96%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/StrictMatchingRule.java (88%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/UnknownConditionOrigin.java (76%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/evaluation/Authentication.java (71%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/evaluation/BasePermission.java (86%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/evaluation/BasePermissionEmittingService.java (84%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/evaluation/BerlinProtocolExpressionParseService.java (83%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/evaluation/FormalizedExpression.java (84%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/evaluation/SimpleMapExpression.java (81%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/evaluation/SimpleMapExpressionEvaluationService.java (84%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/evaluation/SumOfEmissions.java (81%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/mining/ArmedMiningTool.java (80%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/mining/BaseLicenseReadingService.java (79%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/mining/DecodedContent.java (93%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/mining/LicensingContentType.java (83%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/mining/LocalConditions.java (88%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/mining/PathResidentConditions.java (80%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/mining/PersonalLicenseMiningEquipment.java (81%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/mining/PersonalLicenseMiningTool.java (84%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/mining/SecurityKeyAlgorithm.java (92%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/mining/SecurityKeySize.java (92%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/mining/UserHomeMiningTarget.java (79%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/conditions/mining/UserHomeResidentConditions.java (89%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/Client.java (86%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/Configuration.java (84%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/Connection.java (85%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/QueryParameters.java (85%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/Request.java (88%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/RequestContext.java (92%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/ResponseHandler.java (79%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/AccessFiles.java (96%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/AccessPacks.java (97%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/BaseConfiguration.java (90%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/BaseRequestContext.java (88%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/EObjectFromXmiResponse.java (88%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/Equipment.java (88%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/FloatingServerCoordinates.java (95%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/HttpClient.java (87%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/NetConnection.java (93%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/RemoteRequest.java (88%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/RemoteServiceData.java (92%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/RequestParameters.java (96%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/ResultsTransfered.java (88%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/ServiceAny.java (92%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/ServiceEvery.java (89%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/ServiceRemote.java (93%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/acquire/AcquireRequestParameters.java (91%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/acquire/ReleaseRequestParameters.java (91%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/acquire/RemoteAcquire.java (72%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/acquire/RemoteAcquisitionService.java (83%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/acquire/RemoteRelease.java (76%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/mine/DecryptedConditions.java (75%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/mine/MineRequestParameters.java (90%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/mine/RemoteConditions.java (72%) rename bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/{internal => }/hc/remote/impl/mine/RemoteConditionsRequest.java (73%) diff --git a/bundles/org.eclipse.passage.lac.gear/src/org/eclipse/passage/lac/internal/gear/RuntimeConfiguration.java b/bundles/org.eclipse.passage.lac.gear/src/org/eclipse/passage/lac/internal/gear/RuntimeConfiguration.java index e21230ddd..4ede85476 100644 --- a/bundles/org.eclipse.passage.lac.gear/src/org/eclipse/passage/lac/internal/gear/RuntimeConfiguration.java +++ b/bundles/org.eclipse.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/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/ServerAuthentication.java b/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/ServerAuthentication.java index 52fff1317..0cdca17d9 100644 --- a/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/ServerAuthentication.java +++ b/bundles/org.eclipse.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/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/ServerAuthenticationInstructions.java b/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/ServerAuthenticationInstructions.java index 45d4c519b..0bdf43e13 100644 --- a/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/ServerAuthenticationInstructions.java +++ b/bundles/org.eclipse.passage.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/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/acquire/LicensePacks.java b/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/acquire/LicensePacks.java index c4a538ddc..2725ff918 100644 --- a/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/acquire/LicensePacks.java +++ b/bundles/org.eclipse.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/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/api/FlsGear.java b/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/api/FlsGear.java index f22b2ec21..3e905b0d4 100644 --- a/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/api/FlsGear.java +++ b/bundles/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/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/interaction/Pack.java b/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/interaction/Pack.java index 96ae2c79b..6c0e58b5a 100644 --- a/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/interaction/Pack.java +++ b/bundles/org.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/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/AssembledConditions.java b/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/AssembledConditions.java index 82dc01f84..ae0d5c577 100644 --- a/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/AssembledConditions.java +++ b/bundles/org.eclipse.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/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/Conditions.java b/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/Conditions.java index 8822fbb91..a2fef7786 100644 --- a/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/Conditions.java +++ b/bundles/org.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/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/FloatingConditions.java b/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/FloatingConditions.java index 921b83a43..6bcf9c75c 100644 --- a/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/FloatingConditions.java +++ b/bundles/org.eclipse.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/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/PersonalLicenseGenerated.java b/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/PersonalLicenseGenerated.java index 09fcdaf25..33e434f54 100644 --- a/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/PersonalLicenseGenerated.java +++ b/bundles/org.eclipse.passage.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/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/ReassemblingMiningEquipment.java b/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/ReassemblingMiningEquipment.java index a06f2ebbc..cb19adae7 100644 --- a/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/ReassemblingMiningEquipment.java +++ b/bundles/org.eclipse.passage.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/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/ReassemblingMiningTool.java b/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/ReassemblingMiningTool.java index 0f7347fc9..99d94f6e6 100644 --- a/bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/mine/ReassemblingMiningTool.java +++ b/bundles/org.eclipse.passage.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/bundles/org.eclipse.passage.lbc.fls.gear/src/org/eclipse/passage/lbc/internal/fls/gear/PassageFlsGear.java b/bundles/org.eclipse.passage.lbc.fls.gear/src/org/eclipse/passage/lbc/internal/fls/gear/PassageFlsGear.java index 5fae3c86f..cb80065dd 100644 --- a/bundles/org.eclipse.passage.lbc.fls.gear/src/org/eclipse/passage/lbc/internal/fls/gear/PassageFlsGear.java +++ b/bundles/org.eclipse.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") diff --git a/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/BaseAccessCycleConfiguration.java b/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/BaseAccessCycleConfiguration.java index f09e418a3..8476be94a 100644 --- a/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/BaseAccessCycleConfiguration.java +++ b/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/BaseAccessCycleConfiguration.java @@ -16,6 +16,19 @@ import java.util.Collections; import java.util.function.Supplier; +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.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; @@ -28,6 +41,10 @@ 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.PersonalLicenseMiningEquipment; import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry; import org.eclipse.passage.lic.bc.BcStreamCodec; import org.eclipse.passage.lic.equinox.io.BundleKeyKeeper; @@ -36,25 +53,8 @@ import org.eclipse.passage.lic.internal.api.AccessCycleConfiguration; import org.eclipse.passage.lic.internal.api.EvaluationType; import org.eclipse.passage.lic.internal.api.LicensedProduct; -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.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.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.PersonalLicenseMiningEquipment; import org.eclipse.passage.lic.internal.base.restrictions.BasePermissionsExaminationService; import org.eclipse.passage.lic.internal.licenses.model.toberemoved.XmiConditionTransport; import org.eclipse.passage.lic.oshi.HardwareAssessmentService; diff --git a/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/SealedAccessCycleConfiguration.java b/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/SealedAccessCycleConfiguration.java index 192c8a1db..f19ebca62 100644 --- a/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/SealedAccessCycleConfiguration.java +++ b/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/SealedAccessCycleConfiguration.java @@ -15,16 +15,16 @@ import java.util.Arrays; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; +import org.eclipse.passage.lic.api.conditions.mining.MinedConditions; +import org.eclipse.passage.lic.api.conditions.mining.MinedConditionsRegistry; import org.eclipse.passage.lic.api.registry.Registry; +import org.eclipse.passage.lic.base.conditions.mining.UserHomeResidentConditions; import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry; 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.mining.MinedConditions; -import org.eclipse.passage.lic.internal.api.conditions.mining.MinedConditionsRegistry; import org.eclipse.passage.lic.internal.base.acquire.UserHomeLicenseAcquisitionService; -import org.eclipse.passage.lic.internal.base.conditions.mining.UserHomeResidentConditions; import org.eclipse.passage.lic.internal.equinox.acquire.ConfigurationLicenseAcquisitionService; import org.eclipse.passage.lic.internal.equinox.acquire.InstallationLicenseAcquisitionService; import org.eclipse.passage.lic.internal.equinox.conditions.ConfigurationResidentConditions; diff --git a/bundles/org.eclipse.passage.lic.api/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.api/META-INF/MANIFEST.MF index a922b730f..15af957bf 100644 --- a/bundles/org.eclipse.passage.lic.api/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.api/META-INF/MANIFEST.MF @@ -8,6 +8,9 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.passage.lic.api.access, + org.eclipse.passage.lic.api.conditions, + org.eclipse.passage.lic.api.conditions.evaluation, + org.eclipse.passage.lic.api.conditions.mining, org.eclipse.passage.lic.api.inspection, org.eclipse.passage.lic.api.io, org.eclipse.passage.lic.api.registry, @@ -56,49 +59,6 @@ Export-Package: org.eclipse.passage.lic.api.access, org.eclipse.passage.lic.hc.tests, org.eclipse.passage.lbc.jetty, org.eclipse.passage.lic.licenses.model", - org.eclipse.passage.lic.internal.api.conditions; - x-friends:="org.eclipse.passage.lbc.api, - org.eclipse.passage.lbc.base, - org.eclipse.passage.lic.base, - org.eclipse.passage.lic.json, - org.eclipse.passage.lic.hc, - org.eclipse.passage.lic.api, - org.eclipse.passage.loc.api, - org.eclipse.passage.loc.licenses.core, - org.eclipse.passage.loc.dashboard.ui, - org.eclipse.passage.lbc.base.tests, - org.eclipse.passage.lic.licenses.migration, - org.eclipse.passage.lic.licenses.migration.tests, - org.eclipse.passage.lic.base.tests, - org.eclipse.passage.lic.equinox, - org.eclipse.passage.lic.hc.tests, - org.eclipse.passage.lic.jface, - org.eclipse.passage.lic.net, - org.eclipse.passage.lic.oshi", - org.eclipse.passage.lic.internal.api.conditions.evaluation; - x-friends:="org.eclipse.passage.lic.base, - org.eclipse.passage.lic.api.tests, - org.eclipse.passage.lbc.base, - org.eclipse.passage.lic.json, - org.eclipse.passage.lic.oshi", - org.eclipse.passage.lic.internal.api.conditions.mining; - x-friends:="org.eclipse.passage.lac.jetty, - org.eclipse.passage.lbc.api, - org.eclipse.passage.lbc.base, - org.eclipse.passage.lbc.jetty, - org.eclipse.passage.lic.api.tests, - org.eclipse.passage.lic.base, - org.eclipse.passage.lic.base.tests, - org.eclipse.passage.lic.equinox, - org.eclipse.passage.lic.hc, - org.eclipse.passage.lic.hc.tests, - org.eclipse.passage.lic.jface, - org.eclipse.passage.lic.json, - org.eclipse.passage.lic.licenses.migration, - org.eclipse.passage.seal.demo, - org.eclipse.passage.lac, - org.eclipse.passage.lic.net, - org.eclipse.passage.lic.jetty", org.eclipse.passage.lic.internal.api.diagnostic; x-friends:="org.eclipse.passage.lic.base, org.eclipse.passage.lic.jface, diff --git a/bundles/org.eclipse.passage.lic.api/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.api/OSGI-INF/l10n/bundle.properties index 822a82a56..224f66ba3 100644 --- a/bundles/org.eclipse.passage.lic.api/OSGI-INF/l10n/bundle.properties +++ b/bundles/org.eclipse.passage.lic.api/OSGI-INF/l10n/bundle.properties @@ -14,7 +14,7 @@ Bundle-Name = Passage LIC API Bundle-Vendor = Eclipse Passage -Bundle-Copyright = Copyright (c) 2018, 2020 ArSysOp and others.\n\ +Bundle-Copyright = Copyright (c) 2018, 2021 ArSysOp and others.\n\ \n\ This program and the accompanying materials are made\n\ available under the terms of the Eclipse Public License 2.0\n\ diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/Condition.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/Condition.java similarity index 97% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/Condition.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/Condition.java index 6ff2f3f9c..1f93b24ed 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/Condition.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/Condition.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions; +package org.eclipse.passage.lic.api.conditions; import org.eclipse.passage.lic.internal.api.EvaluationInstructions; diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/ConditionMiningTarget.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/ConditionMiningTarget.java similarity index 94% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/ConditionMiningTarget.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/ConditionMiningTarget.java index c68a87ff0..90080a2b2 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/ConditionMiningTarget.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/ConditionMiningTarget.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions; +package org.eclipse.passage.lic.api.conditions; import java.util.Objects; @@ -18,6 +18,8 @@ /** * String-valued {@linkplain ServiceId} with mime content type semantics + * + * @since 1.1 */ public abstract class ConditionMiningTarget implements ServiceId { diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/ConditionOrigin.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/ConditionOrigin.java similarity index 91% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/ConditionOrigin.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/ConditionOrigin.java index 769f732ef..8680b5e89 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/ConditionOrigin.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/ConditionOrigin.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions; +package org.eclipse.passage.lic.api.conditions; public interface ConditionOrigin { diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/ConditionPack.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/ConditionPack.java similarity index 90% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/ConditionPack.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/ConditionPack.java index 3412ee7e6..5b7852d1f 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/ConditionPack.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/ConditionPack.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions; +package org.eclipse.passage.lic.api.conditions; import java.util.Collection; @@ -24,6 +24,8 @@ * conditions of the same origin means this origin compromising, but does not * affect fates of conditions from other origins. *

+ * + * @since 1.1 */ public interface ConditionPack { diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/IssuerSignature.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/IssuerSignature.java similarity index 91% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/IssuerSignature.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/IssuerSignature.java index 688c07600..0b27f146e 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/IssuerSignature.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/IssuerSignature.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions; +package org.eclipse.passage.lic.api.conditions; import java.util.Map; import java.util.Optional; diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/LicenseSignatureIsEmpty.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/LicenseSignatureIsEmpty.java similarity index 92% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/LicenseSignatureIsEmpty.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/LicenseSignatureIsEmpty.java index 6013a1298..48a5440df 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/LicenseSignatureIsEmpty.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/LicenseSignatureIsEmpty.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions; +package org.eclipse.passage.lic.api.conditions; import java.util.function.Predicate; diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/MatchingRule.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/MatchingRule.java similarity index 93% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/MatchingRule.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/MatchingRule.java index 87a55507d..286851b17 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/MatchingRule.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/MatchingRule.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions; +package org.eclipse.passage.lic.api.conditions; import org.eclipse.passage.lic.api.requirements.Requirement; diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/ValidityPeriod.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/ValidityPeriod.java similarity index 90% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/ValidityPeriod.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/ValidityPeriod.java index 2c4e5fc95..daf77f862 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/ValidityPeriod.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/ValidityPeriod.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions; +package org.eclipse.passage.lic.api.conditions; import java.time.ZonedDateTime; @@ -22,6 +22,8 @@ *

* Examples: 'from 1st of May, 2020 for two months' or 'each Friday ever'. *

+ * + * @since 1.1 */ public interface ValidityPeriod { diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/ValidityPeriodClosed.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/ValidityPeriodClosed.java similarity index 89% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/ValidityPeriodClosed.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/ValidityPeriodClosed.java index d7aff6125..087c959db 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/ValidityPeriodClosed.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/ValidityPeriodClosed.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions; +package org.eclipse.passage.lic.api.conditions; import java.time.ZonedDateTime; @@ -23,6 +23,8 @@ * Guarantees that if an instance survived creation, it is consistent: * {@code from < to} *

+ * + * @since 1.1 */ public interface ValidityPeriodClosed extends ValidityPeriodOpen { diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/ValidityPeriodOpen.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/ValidityPeriodOpen.java similarity index 87% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/ValidityPeriodOpen.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/ValidityPeriodOpen.java index f077a0eb9..a8b98bf48 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/ValidityPeriodOpen.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/ValidityPeriodOpen.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,13 +10,15 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions; +package org.eclipse.passage.lic.api.conditions; import java.time.ZonedDateTime; /** * {@linkplain ValidityPeriod} with a defined start. Is open, meaning has * no predefined end date. + * + * @since 1.1 */ public interface ValidityPeriodOpen extends ValidityPeriod { diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/VersionMatch.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/VersionMatch.java similarity index 93% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/VersionMatch.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/VersionMatch.java index ba2365b34..c15f3c2f9 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/VersionMatch.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/VersionMatch.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions; +package org.eclipse.passage.lic.api.conditions; /** * @@ -31,6 +31,7 @@ * * @see Condition * @see MatchingRule + * @since 1.1 */ public interface VersionMatch { diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/Emission.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/Emission.java similarity index 89% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/Emission.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/Emission.java index 62c9dc2f4..7362ffdef 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/Emission.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/Emission.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,13 +10,13 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.evaluation; +package org.eclipse.passage.lic.api.conditions.evaluation; import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.eclipse.passage.lic.internal.api.conditions.ConditionPack; +import org.eclipse.passage.lic.api.conditions.ConditionPack; /** * Aggregates results of a {@linkplain ConditionPack}'s successful evaluation. diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionEvaluationException.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionEvaluationException.java similarity index 86% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionEvaluationException.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionEvaluationException.java index f960acabc..399664e84 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionEvaluationException.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionEvaluationException.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,8 +10,11 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.evaluation; +package org.eclipse.passage.lic.api.conditions.evaluation; +/** + * @since 1.1 + */ @SuppressWarnings("serial") public final class ExpressionEvaluationException extends Exception { diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionEvaluationService.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionEvaluationService.java similarity index 91% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionEvaluationService.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionEvaluationService.java index 54324d0ac..48eb16ea1 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionEvaluationService.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionEvaluationService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.evaluation; +package org.eclipse.passage.lic.api.conditions.evaluation; import org.eclipse.passage.lic.api.registry.Service; diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionEvaluatorsRegistry.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionEvaluatorsRegistry.java similarity index 85% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionEvaluatorsRegistry.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionEvaluatorsRegistry.java index 9e23da31d..2134ecc42 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionEvaluatorsRegistry.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionEvaluatorsRegistry.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,12 +10,15 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.evaluation; +package org.eclipse.passage.lic.api.conditions.evaluation; import java.util.function.Supplier; import org.eclipse.passage.lic.api.registry.Registry; +/** + * @since 1.1 + */ public interface ExpressionEvaluatorsRegistry extends Supplier> { diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionParsingException.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionParsingException.java similarity index 86% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionParsingException.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionParsingException.java index caa25c2a3..515ed26ef 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionParsingException.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionParsingException.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,8 +10,11 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.evaluation; +package org.eclipse.passage.lic.api.conditions.evaluation; +/** + * @since 1.1 + */ @SuppressWarnings("serial") public final class ExpressionParsingException extends Exception { diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionParsingService.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionParsingService.java similarity index 87% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionParsingService.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionParsingService.java index d62a65347..fb0d02f14 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionParsingService.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionParsingService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,13 +10,15 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.evaluation; +package org.eclipse.passage.lic.api.conditions.evaluation; import org.eclipse.passage.lic.api.registry.Service; /** * An implementation must follow the contract defined in * {@code ExpressionParsingServiceContractTest} + * + * @since 1.1 */ public interface ExpressionParsingService extends Service { diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionPasringRegistry.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionPasringRegistry.java similarity index 85% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionPasringRegistry.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionPasringRegistry.java index faf511a45..0323e43ed 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionPasringRegistry.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionPasringRegistry.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,12 +10,15 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.evaluation; +package org.eclipse.passage.lic.api.conditions.evaluation; import java.util.function.Supplier; import org.eclipse.passage.lic.api.registry.Registry; +/** + * @since 1.1 + */ public interface ExpressionPasringRegistry extends Supplier> { } diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionProtocol.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionProtocol.java similarity index 93% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionProtocol.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionProtocol.java index 683047933..0e80d8116 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionProtocol.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionProtocol.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,12 +10,15 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.evaluation; +package org.eclipse.passage.lic.api.conditions.evaluation; import java.util.Objects; import org.eclipse.passage.lic.api.registry.ServiceId; +/** + * @since 1.1 + */ public abstract class ExpressionProtocol implements ServiceId { private final String identifier; diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionTokenAssessmentService.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionTokenAssessmentService.java similarity index 96% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionTokenAssessmentService.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionTokenAssessmentService.java index 054993625..d7bcfed3e 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionTokenAssessmentService.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionTokenAssessmentService.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.evaluation; +package org.eclipse.passage.lic.api.conditions.evaluation; import org.eclipse.passage.lic.api.registry.Service; import org.eclipse.passage.lic.internal.api.EvaluationType; diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionTokenAssessorsRegistry.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionTokenAssessorsRegistry.java similarity index 91% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionTokenAssessorsRegistry.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionTokenAssessorsRegistry.java index 967a0520f..d67fb5299 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ExpressionTokenAssessorsRegistry.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ExpressionTokenAssessorsRegistry.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.evaluation; +package org.eclipse.passage.lic.api.conditions.evaluation; import java.util.function.Supplier; diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ParsedExpression.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ParsedExpression.java similarity index 81% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ParsedExpression.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ParsedExpression.java index d4e3d2a80..307e93342 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/ParsedExpression.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/ParsedExpression.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,8 +10,11 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.evaluation; +package org.eclipse.passage.lic.api.conditions.evaluation; +/** + * @since 1.1 + */ public interface ParsedExpression { ExpressionProtocol protocol(); diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/Permission.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/Permission.java similarity index 75% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/Permission.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/Permission.java index 2f2e6bd91..8c572a0d5 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/Permission.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/Permission.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,14 +10,17 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.evaluation; +package org.eclipse.passage.lic.api.conditions.evaluation; import java.time.ZonedDateTime; +import org.eclipse.passage.lic.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.ConditionOrigin; 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.ConditionOrigin; +/** + * @since 1.1 + */ public interface Permission { LicensedProduct product(); diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/PermissionEmittersRegistry.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/PermissionEmittersRegistry.java similarity index 86% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/PermissionEmittersRegistry.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/PermissionEmittersRegistry.java index 4c838a032..8aab07ff0 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/PermissionEmittersRegistry.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/PermissionEmittersRegistry.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,13 +10,16 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.evaluation; +package org.eclipse.passage.lic.api.conditions.evaluation; import java.util.function.Supplier; import org.eclipse.passage.lic.api.registry.Registry; import org.eclipse.passage.lic.api.registry.StringServiceId; +/** + * @since 1.1 + */ public interface PermissionEmittersRegistry extends Supplier> { } diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/PermissionEmittingService.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/PermissionEmittingService.java similarity index 92% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/PermissionEmittingService.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/PermissionEmittingService.java index cfea3ddef..62df1604c 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/PermissionEmittingService.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/PermissionEmittingService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,16 +10,19 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.evaluation; +package org.eclipse.passage.lic.api.conditions.evaluation; import java.util.Collection; +import org.eclipse.passage.lic.api.conditions.ConditionPack; import org.eclipse.passage.lic.api.registry.Service; import org.eclipse.passage.lic.api.registry.StringServiceId; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -import org.eclipse.passage.lic.internal.api.conditions.ConditionPack; +/** + * @since 1.1 + */ public interface PermissionEmittingService extends Service { /** diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/package-info.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/package-info.java similarity index 95% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/package-info.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/package-info.java index ef4153b89..bc0150aea 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/package-info.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/evaluation/package-info.java @@ -59,8 +59,8 @@ * * * - * @see org.eclipse.passage.lic.internal.api.conditions.Condition + * @see org.eclipse.passage.lic.api.conditions.Condition * @see org.eclipse.passage.lic.internal.api.EvaluationType * @see org.eclipse.passage.lic.api.inspection.RuntimeEnvironment */ -package org.eclipse.passage.lic.internal.api.conditions.evaluation; +package org.eclipse.passage.lic.api.conditions.evaluation; diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/ConditionTransport.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/ConditionTransport.java similarity index 89% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/ConditionTransport.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/ConditionTransport.java index a47dd684a..2ab1e7907 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/ConditionTransport.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/ConditionTransport.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.mining; +package org.eclipse.passage.lic.api.conditions.mining; import java.io.IOException; import java.io.InputStream; @@ -18,9 +18,9 @@ import java.util.Collections; import java.util.Optional; +import org.eclipse.passage.lic.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.IssuerSignature; import org.eclipse.passage.lic.api.registry.Service; -import org.eclipse.passage.lic.internal.api.conditions.Condition; -import org.eclipse.passage.lic.internal.api.conditions.IssuerSignature; /** * Encapsulates knowledge how to retrieve {@link Condition}(s) from an input diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/ConditionTransportRegistry.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/ConditionTransportRegistry.java similarity index 85% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/ConditionTransportRegistry.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/ConditionTransportRegistry.java index a302c849c..6fe302745 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/ConditionTransportRegistry.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/ConditionTransportRegistry.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,12 +10,15 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.mining; +package org.eclipse.passage.lic.api.conditions.mining; import java.util.function.Supplier; import org.eclipse.passage.lic.api.registry.Registry; +/** + * @since 1.1 + */ public interface ConditionTransportRegistry extends Supplier> { } diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/ContentType.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/ContentType.java similarity index 94% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/ContentType.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/ContentType.java index e02849732..818fd59b2 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/ContentType.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/ContentType.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.mining; +package org.eclipse.passage.lic.api.conditions.mining; import java.util.Objects; @@ -20,6 +20,8 @@ * FIXME: move to upper package * * String-valued {@linkplain ServiceId} with mime content type semantics + * + * @since 1.1 */ public abstract class ContentType implements ServiceId { diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/LicenseReadingService.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/LicenseReadingService.java similarity index 82% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/LicenseReadingService.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/LicenseReadingService.java index efca462d1..4f71f3021 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/LicenseReadingService.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/LicenseReadingService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,16 +10,19 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.mining; +package org.eclipse.passage.lic.api.conditions.mining; import java.nio.file.Path; import java.util.Collection; +import org.eclipse.passage.lic.api.conditions.ConditionPack; import org.eclipse.passage.lic.api.registry.Service; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -import org.eclipse.passage.lic.internal.api.conditions.ConditionPack; +/** + * @since 1.1 + */ public interface LicenseReadingService extends Service { ServiceInvocationResult> read(Path path); diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/MinedConditions.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/MinedConditions.java similarity index 88% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/MinedConditions.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/MinedConditions.java index 0ec807831..a0950b1bc 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/MinedConditions.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/MinedConditions.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,16 +10,16 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.mining; +package org.eclipse.passage.lic.api.conditions.mining; import java.util.Collection; +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.registry.Service; import org.eclipse.passage.lic.internal.api.LicensedProduct; 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; /** *

@@ -38,6 +38,8 @@ *

* The service is intended to implement the third phase of access cycle. *

+ * + * @since 1.1 */ public interface MinedConditions extends Service { diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/MinedConditionsRegistry.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/MinedConditionsRegistry.java similarity index 78% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/MinedConditionsRegistry.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/MinedConditionsRegistry.java index 0e17e70a1..bef276aa0 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/MinedConditionsRegistry.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/MinedConditionsRegistry.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,13 +10,16 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.mining; +package org.eclipse.passage.lic.api.conditions.mining; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; import org.eclipse.passage.lic.api.registry.Registry; -import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget; +/** + * @since 1.1 + */ public interface MinedConditionsRegistry extends Supplier> { } diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/MiningEquipment.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/MiningEquipment.java similarity index 79% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/MiningEquipment.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/MiningEquipment.java index b272c6716..e454ef861 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/MiningEquipment.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/MiningEquipment.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,12 +10,15 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.mining; +package org.eclipse.passage.lic.api.conditions.mining; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; 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; +/** + * @since 1.1 + */ public interface MiningEquipment { MiningTool tool(LicensedProduct product, ConditionMiningTarget miner) throws LicensingException; diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/MiningTool.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/MiningTool.java similarity index 80% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/MiningTool.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/MiningTool.java index d1ceccc00..6a8d5f84a 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/MiningTool.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/mining/MiningTool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,14 +10,17 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.conditions.mining; +package org.eclipse.passage.lic.api.conditions.mining; import java.nio.file.Path; import java.util.Collection; +import org.eclipse.passage.lic.api.conditions.ConditionPack; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -import org.eclipse.passage.lic.internal.api.conditions.ConditionPack; +/** + * @since 1.1 + */ public interface MiningTool { ServiceInvocationResult> mine(Collection sources); diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/package-info.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/package-info.java similarity index 89% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/package-info.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/package-info.java index 23fa44b8a..9e8fe318d 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/package-info.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/conditions/package-info.java @@ -1,5 +1,5 @@ /* ***************************************************************************** - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -24,4 +24,4 @@ * any. *

*/ -package org.eclipse.passage.lic.internal.api.conditions; \ No newline at end of file +package org.eclipse.passage.lic.api.conditions; \ No newline at end of file diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/io/StreamCodec.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/io/StreamCodec.java index 7bfdad5a9..297132f86 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/io/StreamCodec.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/io/StreamCodec.java @@ -19,10 +19,10 @@ import java.nio.file.Path; import java.util.Objects; +import org.eclipse.passage.lic.api.conditions.mining.MinedConditions; import org.eclipse.passage.lic.api.registry.Service; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.LicensingException; -import org.eclipse.passage.lic.internal.api.conditions.mining.MinedConditions; /** * Coder and decoder for licensing data, used by {@link MinedConditions} to read diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/AccessCycleConfiguration.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/AccessCycleConfiguration.java index 399ab4e10..c358a2c42 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/AccessCycleConfiguration.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/AccessCycleConfiguration.java @@ -12,19 +12,19 @@ *******************************************************************************/ package org.eclipse.passage.lic.internal.api; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluatorsRegistry; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionPasringRegistry; +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.mining.ConditionTransportRegistry; +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.RuntimeEnvironmentRegistry; import org.eclipse.passage.lic.api.io.HashesRegistry; import org.eclipse.passage.lic.api.io.KeyKeeperRegistry; import org.eclipse.passage.lic.api.io.StreamCodecRegistry; import org.eclipse.passage.lic.api.requirements.ResolvedRequirementsRegistry; import org.eclipse.passage.lic.internal.api.acquire.LicenseAcquisitionServicesRegistry; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluatorsRegistry; -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.api.conditions.evaluation.PermissionEmittersRegistry; -import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransportRegistry; -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.PermissionsExaminationServicesRegistry; /** diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/Passage.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/Passage.java index 773115206..0497d86b0 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/Passage.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/Passage.java @@ -13,8 +13,8 @@ package org.eclipse.passage.lic.internal.api; import org.eclipse.passage.lic.api.access.GrantLockAttempt; +import org.eclipse.passage.lic.api.conditions.Condition; import org.eclipse.passage.lic.api.requirements.Requirement; -import org.eclipse.passage.lic.internal.api.conditions.Condition; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel; diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/acquire/LicenseAcquisitionService.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/acquire/LicenseAcquisitionService.java index e817d2f8e..b7f743346 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/acquire/LicenseAcquisitionService.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/acquire/LicenseAcquisitionService.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.passage.lic.internal.api.acquire; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; import org.eclipse.passage.lic.api.registry.Service; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget; public interface LicenseAcquisitionService extends Service { diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/acquire/LicenseAcquisitionServicesRegistry.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/acquire/LicenseAcquisitionServicesRegistry.java index f5d2753d9..74a086621 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/acquire/LicenseAcquisitionServicesRegistry.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/acquire/LicenseAcquisitionServicesRegistry.java @@ -14,8 +14,8 @@ import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; import org.eclipse.passage.lic.api.registry.Registry; -import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget; public interface LicenseAcquisitionServicesRegistry extends Supplier> { diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/vault/package-info.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/vault/package-info.java deleted file mode 100644 index dd57b628d..000000000 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/vault/package-info.java +++ /dev/null @@ -1,25 +0,0 @@ -/* ***************************************************************************** - * 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 - *******************************************************************************/ -/** - *

- * After the evaluation is done we obtained a Permission we need to - * let others know that the license is currently in use. What for? To support - * different back-end strategies like floating licensing, consumable tokens and - * so on. The abstraction of "vault" is used to implement this behavior. The - * "vault" tracks "acquired" and "released" conditions and decides how to deal - * with it. - *

- * - * @see org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate - */ -package org.eclipse.passage.lic.internal.api.conditions.vault; diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/ExaminationCertificate.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/ExaminationCertificate.java index b13fd6722..8ad8352b3 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/ExaminationCertificate.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/ExaminationCertificate.java @@ -15,8 +15,8 @@ import java.time.ZonedDateTime; import java.util.Collection; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.api.requirements.Requirement; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; /** *

diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/PermissionObservationService.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/PermissionObservationService.java index cb47d50a0..76781f387 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/PermissionObservationService.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/PermissionObservationService.java @@ -14,7 +14,7 @@ import java.util.Collection; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; /** * several permissions for the same feature: keep diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/PermissionsExaminationService.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/PermissionsExaminationService.java index d2f977359..abe810d7a 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/PermissionsExaminationService.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/PermissionsExaminationService.java @@ -14,11 +14,11 @@ import java.util.Collection; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.api.registry.Service; import org.eclipse.passage.lic.api.registry.StringServiceId; import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.LicensedProduct; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; /** *

diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/Restriction.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/Restriction.java index 451fb5819..50bec7364 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/Restriction.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/Restriction.java @@ -12,9 +12,9 @@ *******************************************************************************/ package org.eclipse.passage.lic.internal.api.restrictions; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.LicensedProduct; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.internal.api.diagnostic.TroubleCode; /** diff --git a/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF index e9675b2b8..9c5ae2566 100644 --- a/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF @@ -10,6 +10,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.passage.lic.api;bundle-version="1.0.0";visibility:=reexport, org.apache.logging.log4j;bundle-version="2.8.2" Export-Package: org.eclipse.passage.lic.base.access, + org.eclipse.passage.lic.base.conditions, + org.eclipse.passage.lic.base.conditions.evaluation, + org.eclipse.passage.lic.base.conditions.mining, org.eclipse.passage.lic.base.io, org.eclipse.passage.lic.base.registry, org.eclipse.passage.lic.base.requirements, @@ -30,24 +33,6 @@ Export-Package: org.eclipse.passage.lic.base.access, org.eclipse.passage.seal.demo, org.eclipse.passage.seal.demo.tests", org.eclipse.passage.lic.internal.base.acquire;x-friends:="org.eclipse.passage.lic.floating.model,org.eclipse.passage.lic.equinox,org.eclipse.passage.lic.licenses.model", - org.eclipse.passage.lic.internal.base.conditions; - x-friends:="org.eclipse.passage.lbc.base, - org.eclipse.passage.lic.json, - org.eclipse.passage.lic.hc, - org.eclipse.passage.loc.licenses.core, - org.eclipse.passage.loc.dashboard.ui, - org.eclipse.passage.loc.workbench.emfforms, - org.eclipse.passage.lic.licenses.migration, - org.eclipse.passage.lic.jface", - org.eclipse.passage.lic.internal.base.conditions.evaluation;x-friends:="org.eclipse.passage.lbc.base,org.eclipse.passage.lic.json", - org.eclipse.passage.lic.internal.base.conditions.mining; - x-friends:="org.eclipse.passage.lic.jface, - org.eclipse.passage.lic.hc, - org.eclipse.passage.lbc.base, - org.eclipse.passage.lic.equinox, - org.eclipse.passage.lic.base.tests, - org.eclipse.passage.lic.base, - org.eclipse.passage.seal.demo", org.eclipse.passage.lic.internal.base.diagnostic; x-friends:="org.eclipse.passage.lbc.base, org.eclipse.passage.lic.equinox, diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Conditions.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Conditions.java index 1f83fe9a8..5a50847d3 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Conditions.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Conditions.java @@ -18,16 +18,16 @@ import java.util.function.Function; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; +import org.eclipse.passage.lic.api.conditions.ConditionPack; +import org.eclipse.passage.lic.api.conditions.mining.MinedConditions; import org.eclipse.passage.lic.api.registry.Registry; +import org.eclipse.passage.lic.base.conditions.ConditionsFeatureFilter; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -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.MinedConditions; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; import org.eclipse.passage.lic.internal.base.SumOfCollections; -import org.eclipse.passage.lic.internal.base.conditions.ConditionsFeatureFilter; import org.eclipse.passage.lic.internal.base.diagnostic.code.NoServicesOfType; import org.eclipse.passage.lic.internal.base.i18n.AccessCycleMessages; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Cycle.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Cycle.java index 9ef172a14..76309818b 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Cycle.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Cycle.java @@ -20,11 +20,11 @@ import java.util.Optional; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.ConditionPack; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.Framework; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -import org.eclipse.passage.lic.internal.api.conditions.ConditionPack; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.internal.api.diagnostic.Diagnostic; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/CycleFilter.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/CycleFilter.java index 3c570c5f5..ca6642137 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/CycleFilter.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/CycleFilter.java @@ -15,11 +15,11 @@ import java.util.Collection; import java.util.function.Function; +import org.eclipse.passage.lic.api.conditions.ConditionPack; import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.base.conditions.ConditionsFeatureFilter; import org.eclipse.passage.lic.base.requirements.RequirementsFeatureFilter; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -import org.eclipse.passage.lic.internal.api.conditions.ConditionPack; -import org.eclipse.passage.lic.internal.base.conditions.ConditionsFeatureFilter; final class CycleFilter { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Lock.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Lock.java index f8df7b232..fc9480f17 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Lock.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Lock.java @@ -16,14 +16,14 @@ import java.util.stream.Collectors; import org.eclipse.passage.lic.api.access.GrantLockAttempt; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.Framework; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.api.acquire.GrantAcquisition; 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.Permission; import org.eclipse.passage.lic.internal.api.diagnostic.Diagnostic; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Permissions.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Permissions.java index b0b2649b2..a18381716 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Permissions.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Permissions.java @@ -19,14 +19,14 @@ import java.util.function.BiFunction; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.ConditionPack; +import org.eclipse.passage.lic.api.conditions.evaluation.Emission; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; +import org.eclipse.passage.lic.api.conditions.evaluation.PermissionEmittingService; import org.eclipse.passage.lic.api.registry.Registry; import org.eclipse.passage.lic.api.registry.StringServiceId; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -import org.eclipse.passage.lic.internal.api.conditions.ConditionPack; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Emission; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.PermissionEmittingService; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; import org.eclipse.passage.lic.internal.base.SumOfCollections; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Restrictions.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Restrictions.java index efe56818d..f495be921 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Restrictions.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Restrictions.java @@ -15,12 +15,12 @@ import java.util.Collection; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.api.registry.Registry; import org.eclipse.passage.lic.api.registry.StringServiceId; import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.api.restrictions.PermissionsExaminationService; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/SumOfCertificates.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/SumOfCertificates.java index b93c4482c..368f6b720 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/SumOfCertificates.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/SumOfCertificates.java @@ -17,8 +17,8 @@ import java.util.function.Function; import java.util.stream.Collectors; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.api.requirements.Requirement; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; import org.eclipse.passage.lic.internal.base.SumOfCollections; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseCondition.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseCondition.java similarity index 87% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseCondition.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseCondition.java index fc4fdcb4c..97f9b1e6a 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseCondition.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseCondition.java @@ -10,14 +10,14 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions; +package org.eclipse.passage.lic.base.conditions; import java.util.Objects; +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.internal.api.EvaluationInstructions; -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; public final class BaseCondition implements Condition { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseConditionOrigin.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseConditionOrigin.java similarity index 86% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseConditionOrigin.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseConditionOrigin.java index 1d8d2a6c4..170ab68cc 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseConditionOrigin.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseConditionOrigin.java @@ -10,14 +10,14 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions; +package org.eclipse.passage.lic.base.conditions; import java.util.Objects; import java.util.Optional; -import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget; -import org.eclipse.passage.lic.internal.api.conditions.ConditionOrigin; -import org.eclipse.passage.lic.internal.api.conditions.IssuerSignature; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; +import org.eclipse.passage.lic.api.conditions.ConditionOrigin; +import org.eclipse.passage.lic.api.conditions.IssuerSignature; public final class BaseConditionOrigin implements ConditionOrigin { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseConditionPack.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseConditionPack.java similarity index 79% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseConditionPack.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseConditionPack.java index 8bcac5601..33a318cdf 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseConditionPack.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseConditionPack.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,16 +10,19 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions; +package org.eclipse.passage.lic.base.conditions; import java.util.ArrayList; import java.util.Collection; import java.util.Objects; -import org.eclipse.passage.lic.internal.api.conditions.Condition; -import org.eclipse.passage.lic.internal.api.conditions.ConditionOrigin; -import org.eclipse.passage.lic.internal.api.conditions.ConditionPack; +import org.eclipse.passage.lic.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.ConditionOrigin; +import org.eclipse.passage.lic.api.conditions.ConditionPack; +/** + * @since 1.1 + */ public final class BaseConditionPack implements ConditionPack { private final ConditionOrigin origin; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseEvaluationInstructions.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseEvaluationInstructions.java similarity index 95% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseEvaluationInstructions.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseEvaluationInstructions.java index 94d798b48..be015a328 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseEvaluationInstructions.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseEvaluationInstructions.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions; +package org.eclipse.passage.lic.base.conditions; import java.util.Objects; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseIssuerSignature.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseIssuerSignature.java similarity index 90% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseIssuerSignature.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseIssuerSignature.java index 2cc5d701a..1fcd53ce2 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseIssuerSignature.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseIssuerSignature.java @@ -1,6 +1,5 @@ /******************************************************************************* - * Copyr -ight (c) 2021 ArSysOp + * Copyright (c) 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -11,15 +10,18 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions; +package org.eclipse.passage.lic.base.conditions; import java.util.Collections; import java.util.Map; import java.util.Objects; import java.util.Optional; -import org.eclipse.passage.lic.internal.api.conditions.IssuerSignature; +import org.eclipse.passage.lic.api.conditions.IssuerSignature; +/** + * @since 1.1 + */ public final class BaseIssuerSignature implements IssuerSignature { private final Map attributes; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseValidityPeriodClosed.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseValidityPeriodClosed.java similarity index 89% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseValidityPeriodClosed.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseValidityPeriodClosed.java index 6ef80b587..4f06ef010 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseValidityPeriodClosed.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseValidityPeriodClosed.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,13 +10,16 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions; +package org.eclipse.passage.lic.base.conditions; import java.time.ZonedDateTime; import java.util.Objects; -import org.eclipse.passage.lic.internal.api.conditions.ValidityPeriodClosed; +import org.eclipse.passage.lic.api.conditions.ValidityPeriodClosed; +/** + * @since 1.1 + */ public final class BaseValidityPeriodClosed implements ValidityPeriodClosed { private final ZonedDateTime from; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseVersionMatch.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseVersionMatch.java similarity index 81% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseVersionMatch.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseVersionMatch.java index 96fccf547..ad0537b79 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseVersionMatch.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseVersionMatch.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,13 +10,16 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions; +package org.eclipse.passage.lic.base.conditions; import java.util.Objects; -import org.eclipse.passage.lic.internal.api.conditions.MatchingRule; -import org.eclipse.passage.lic.internal.api.conditions.VersionMatch; +import org.eclipse.passage.lic.api.conditions.MatchingRule; +import org.eclipse.passage.lic.api.conditions.VersionMatch; +/** + * @since 1.1 + */ public final class BaseVersionMatch implements VersionMatch { private final String version; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/ConditionsFeatureFilter.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/ConditionsFeatureFilter.java similarity index 87% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/ConditionsFeatureFilter.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/ConditionsFeatureFilter.java index 4fd866e25..0dc286423 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/ConditionsFeatureFilter.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/ConditionsFeatureFilter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,14 +10,17 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions; +package org.eclipse.passage.lic.base.conditions; import java.util.Optional; import java.util.function.Supplier; -import org.eclipse.passage.lic.internal.api.conditions.ConditionPack; +import org.eclipse.passage.lic.api.conditions.ConditionPack; import org.eclipse.passage.lic.internal.base.FeatureFilter; +/** + * @since 1.1 + */ public final class ConditionsFeatureFilter implements Supplier> { private final String feature; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/FeatureConditionPack.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/FeatureConditionPack.java similarity index 82% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/FeatureConditionPack.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/FeatureConditionPack.java index e119d907c..5cd4ce6c0 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/FeatureConditionPack.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/FeatureConditionPack.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,19 +10,21 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions; +package org.eclipse.passage.lic.base.conditions; import java.util.Collection; import java.util.Objects; import java.util.stream.Collectors; -import org.eclipse.passage.lic.internal.api.conditions.Condition; -import org.eclipse.passage.lic.internal.api.conditions.ConditionOrigin; -import org.eclipse.passage.lic.internal.api.conditions.ConditionPack; +import org.eclipse.passage.lic.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.ConditionOrigin; +import org.eclipse.passage.lic.api.conditions.ConditionPack; /** * Subset of a {@code parent} {@linkplain ConditionPack} contained * {@linkplain Condition}s for single feature. + * + * @since 1.1 */ public final class FeatureConditionPack implements ConditionPack { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/MatchingRuleCompatible.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/MatchingRuleCompatible.java similarity index 94% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/MatchingRuleCompatible.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/MatchingRuleCompatible.java index db83c3637..4faf7c0ea 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/MatchingRuleCompatible.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/MatchingRuleCompatible.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions; +package org.eclipse.passage.lic.base.conditions; /** *

diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/MatchingRuleDefault.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/MatchingRuleDefault.java similarity index 88% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/MatchingRuleDefault.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/MatchingRuleDefault.java index ecef08265..1413dbbfb 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/MatchingRuleDefault.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/MatchingRuleDefault.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,8 +10,11 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions; +package org.eclipse.passage.lic.base.conditions; +/** + * @since 1.1 + */ public final class MatchingRuleDefault extends StrictMatchingRule { private final StrictMatchingRule assignee; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/MatchingRuleEquivalent.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/MatchingRuleEquivalent.java similarity index 94% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/MatchingRuleEquivalent.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/MatchingRuleEquivalent.java index 73f5088ea..41981b044 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/MatchingRuleEquivalent.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/MatchingRuleEquivalent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions; +package org.eclipse.passage.lic.base.conditions; /** *

@@ -36,6 +36,8 @@ *

* {@code default required} always matches to any {@code allowed} version. *

+ * + * @since 1.1 */ public final class MatchingRuleEquivalent extends StrictMatchingRule { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/MatchingRuleForIdentifier.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/MatchingRuleForIdentifier.java similarity index 90% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/MatchingRuleForIdentifier.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/MatchingRuleForIdentifier.java index 7f8d50026..aec80e822 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/MatchingRuleForIdentifier.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/MatchingRuleForIdentifier.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,14 +10,17 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions; +package org.eclipse.passage.lic.base.conditions; import java.util.Objects; import java.util.Optional; import java.util.function.Supplier; -import org.eclipse.passage.lic.internal.api.conditions.MatchingRule; +import org.eclipse.passage.lic.api.conditions.MatchingRule; +/** + * @since 1.1 + */ public final class MatchingRuleForIdentifier implements Supplier { private final String identifier; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/MatchingRuleGreaterOrEqual.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/MatchingRuleGreaterOrEqual.java similarity index 92% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/MatchingRuleGreaterOrEqual.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/MatchingRuleGreaterOrEqual.java index 92f57d9f7..3de8b20b8 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/MatchingRuleGreaterOrEqual.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/MatchingRuleGreaterOrEqual.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions; +package org.eclipse.passage.lic.base.conditions; /** *

@@ -27,6 +27,8 @@ *

* {@code default required} always matches to any {@code allowed} version. *

+ * + * @since 1.1 */ public final class MatchingRuleGreaterOrEqual extends StrictMatchingRule { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/MatchingRulePerfect.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/MatchingRulePerfect.java similarity index 90% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/MatchingRulePerfect.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/MatchingRulePerfect.java index 7429bbf78..d1aeb9923 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/MatchingRulePerfect.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/MatchingRulePerfect.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions; +package org.eclipse.passage.lic.base.conditions; import java.util.Objects; @@ -20,6 +20,7 @@ * {@code allowed}. Comparison is case sensitive. * * @author user + * @since 1.1 * */ public final class MatchingRulePerfect extends StrictMatchingRule { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/RequiredVersionVsAllowedVersion.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/RequiredVersionVsAllowedVersion.java similarity index 96% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/RequiredVersionVsAllowedVersion.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/RequiredVersionVsAllowedVersion.java index 73f6d95b2..b399ee98b 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/RequiredVersionVsAllowedVersion.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/RequiredVersionVsAllowedVersion.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions; +package org.eclipse.passage.lic.base.conditions; import java.util.List; import java.util.Objects; @@ -24,6 +24,8 @@ * Define if the {@code actual} version (that originates in declared * {@linkplain Requirement}s) fits to the {@code expected} version (which comes * from license by means of licensing {@linkplain Condition}s. + * + * @since 1.1 */ public final class RequiredVersionVsAllowedVersion { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/StrictMatchingRule.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/StrictMatchingRule.java similarity index 88% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/StrictMatchingRule.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/StrictMatchingRule.java index 5cd68207d..fa8868acb 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/StrictMatchingRule.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/StrictMatchingRule.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,14 +10,16 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions; +package org.eclipse.passage.lic.base.conditions; import java.util.Objects; -import org.eclipse.passage.lic.internal.api.conditions.MatchingRule; +import org.eclipse.passage.lic.api.conditions.MatchingRule; /** * Does not tolerate {@code null}s as a version for matching. + * + * @since 1.1 */ public abstract class StrictMatchingRule implements MatchingRule { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/UnknownConditionOrigin.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/UnknownConditionOrigin.java similarity index 76% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/UnknownConditionOrigin.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/UnknownConditionOrigin.java index 4c52a3ed9..8fab3ffb1 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/UnknownConditionOrigin.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/UnknownConditionOrigin.java @@ -10,11 +10,11 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions; +package org.eclipse.passage.lic.base.conditions; -import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget; -import org.eclipse.passage.lic.internal.api.conditions.ConditionOrigin; -import org.eclipse.passage.lic.internal.api.conditions.IssuerSignature; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; +import org.eclipse.passage.lic.api.conditions.ConditionOrigin; +import org.eclipse.passage.lic.api.conditions.IssuerSignature; public final class UnknownConditionOrigin implements ConditionOrigin { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/Authentication.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/Authentication.java similarity index 71% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/Authentication.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/Authentication.java index f8319ff99..2f649f13c 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/Authentication.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/Authentication.java @@ -10,21 +10,21 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.evaluation; +package org.eclipse.passage.lic.base.conditions.evaluation; import java.util.Objects; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluationException; +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.ExpressionParsingException; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionPasringRegistry; +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.ParsedExpression; 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.evaluation.ExpressionEvaluationException; -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.ExpressionParsingException; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionPasringRegistry; -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.ParsedExpression; import org.eclipse.passage.lic.internal.base.i18n.ConditionsEvaluationMessages; public final class Authentication { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/BasePermission.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/BasePermission.java similarity index 86% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/BasePermission.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/BasePermission.java index 05c066434..a67b4b1e7 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/BasePermission.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/BasePermission.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,16 +10,19 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.evaluation; +package org.eclipse.passage.lic.base.conditions.evaluation; import java.time.ZonedDateTime; import java.util.Objects; +import org.eclipse.passage.lic.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.ConditionOrigin; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; 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.ConditionOrigin; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; +/** + * @since 1.1 + */ public final class BasePermission implements Permission { private final LicensedProduct product; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/BasePermissionEmittingService.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/BasePermissionEmittingService.java similarity index 84% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/BasePermissionEmittingService.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/BasePermissionEmittingService.java index 9b64a5ab0..63daefad4 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/BasePermissionEmittingService.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/BasePermissionEmittingService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,28 +10,28 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.evaluation; +package org.eclipse.passage.lic.base.conditions.evaluation; import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import org.eclipse.passage.lic.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.ConditionPack; +import org.eclipse.passage.lic.api.conditions.ValidityPeriod; +import org.eclipse.passage.lic.api.conditions.ValidityPeriodClosed; +import org.eclipse.passage.lic.api.conditions.evaluation.Emission; +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.conditions.evaluation.PermissionEmittingService; import org.eclipse.passage.lic.api.registry.StringServiceId; 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.ConditionPack; -import org.eclipse.passage.lic.internal.api.conditions.ValidityPeriod; -import org.eclipse.passage.lic.internal.api.conditions.ValidityPeriodClosed; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Emission; -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.api.conditions.evaluation.PermissionEmittingService; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; import org.eclipse.passage.lic.internal.api.diagnostic.TroubleCode; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/BerlinProtocolExpressionParseService.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/BerlinProtocolExpressionParseService.java similarity index 83% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/BerlinProtocolExpressionParseService.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/BerlinProtocolExpressionParseService.java index 311361ee4..c74186eed 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/BerlinProtocolExpressionParseService.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/BerlinProtocolExpressionParseService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,18 +10,21 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.evaluation; +package org.eclipse.passage.lic.base.conditions.evaluation; import java.util.HashMap; import java.util.Map; import java.util.Objects; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionParsingException; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionParsingService; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionProtocol; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ParsedExpression; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionParsingException; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionParsingService; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionProtocol; +import org.eclipse.passage.lic.api.conditions.evaluation.ParsedExpression; import org.eclipse.passage.lic.internal.base.i18n.ConditionsEvaluationMessages; +/** + * @since 1.1 + */ public final class BerlinProtocolExpressionParseService implements ExpressionParsingService { private final ExpressionProtocol protocol = new ExpressionProtocol.Berlin(); diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/FormalizedExpression.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/FormalizedExpression.java similarity index 84% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/FormalizedExpression.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/FormalizedExpression.java index 12bda0ba7..19970e056 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/FormalizedExpression.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/FormalizedExpression.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,15 +10,15 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.evaluation; +package org.eclipse.passage.lic.base.conditions.evaluation; import java.util.Objects; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionParsingException; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionParsingService; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionProtocol; +import org.eclipse.passage.lic.api.conditions.evaluation.ParsedExpression; import org.eclipse.passage.lic.api.registry.Registry; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionParsingException; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionParsingService; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionProtocol; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ParsedExpression; /** *

diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/SimpleMapExpression.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/SimpleMapExpression.java similarity index 81% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/SimpleMapExpression.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/SimpleMapExpression.java index 08d6d8872..555fa6a4f 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/SimpleMapExpression.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/SimpleMapExpression.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,16 +10,19 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.evaluation; +package org.eclipse.passage.lic.base.conditions.evaluation; import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Objects; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionProtocol; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ParsedExpression; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionProtocol; +import org.eclipse.passage.lic.api.conditions.evaluation.ParsedExpression; +/** + * @since 1.1 + */ public final class SimpleMapExpression implements ParsedExpression { private final Map checks; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/SimpleMapExpressionEvaluationService.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/SimpleMapExpressionEvaluationService.java similarity index 84% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/SimpleMapExpressionEvaluationService.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/SimpleMapExpressionEvaluationService.java index 5d41b1d11..dd684d676 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/SimpleMapExpressionEvaluationService.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/SimpleMapExpressionEvaluationService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,17 +10,20 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.evaluation; +package org.eclipse.passage.lic.base.conditions.evaluation; import java.util.Objects; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluationException; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluationService; -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.ParsedExpression; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluationException; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluationService; +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.ParsedExpression; import org.eclipse.passage.lic.internal.base.i18n.ConditionsEvaluationMessages; +/** + * @since 1.1 + */ public final class SimpleMapExpressionEvaluationService implements ExpressionEvaluationService { private final ExpressionProtocol format = new ExpressionProtocol.Berlin(); diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/SumOfEmissions.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/SumOfEmissions.java similarity index 81% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/SumOfEmissions.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/SumOfEmissions.java index 6c3756e90..8daa23afd 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/evaluation/SumOfEmissions.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/evaluation/SumOfEmissions.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,14 +10,17 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.evaluation; +package org.eclipse.passage.lic.base.conditions.evaluation; import java.util.function.BinaryOperator; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Emission; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; +import org.eclipse.passage.lic.api.conditions.evaluation.Emission; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.internal.base.SumOfCollections; +/** + * @since 1.1 + */ public final class SumOfEmissions implements BinaryOperator { @Override diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/ArmedMiningTool.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/ArmedMiningTool.java similarity index 80% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/ArmedMiningTool.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/ArmedMiningTool.java index d4b415a7e..f0f62f1db 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/ArmedMiningTool.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/ArmedMiningTool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,17 +10,20 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.mining; +package org.eclipse.passage.lic.base.conditions.mining; import java.nio.file.Path; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; +import org.eclipse.passage.lic.api.conditions.mining.ConditionTransport; +import org.eclipse.passage.lic.api.conditions.mining.MiningTool; import org.eclipse.passage.lic.api.io.KeyKeeper; import org.eclipse.passage.lic.api.io.StreamCodec; 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.ConditionTransport; -import org.eclipse.passage.lic.internal.api.conditions.mining.MiningTool; +/** + * @since 1.1 + */ public abstract class ArmedMiningTool implements MiningTool { protected final KeyKeeper key; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/BaseLicenseReadingService.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/BaseLicenseReadingService.java similarity index 79% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/BaseLicenseReadingService.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/BaseLicenseReadingService.java index dda43f854..5645e4a9f 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/BaseLicenseReadingService.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/BaseLicenseReadingService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,19 +10,22 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.mining; +package org.eclipse.passage.lic.base.conditions.mining; import java.nio.file.Path; import java.util.Collection; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; +import org.eclipse.passage.lic.api.conditions.ConditionPack; +import org.eclipse.passage.lic.api.conditions.mining.LicenseReadingService; +import org.eclipse.passage.lic.api.conditions.mining.MiningEquipment; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -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.LicenseReadingService; -import org.eclipse.passage.lic.internal.api.conditions.mining.MiningEquipment; +/** + * @since 1.1 + */ public final class BaseLicenseReadingService implements LicenseReadingService { private final LicensedProduct product; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/DecodedContent.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/DecodedContent.java similarity index 93% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/DecodedContent.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/DecodedContent.java index d010a2c09..07cab94bb 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/DecodedContent.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/DecodedContent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.mining; +package org.eclipse.passage.lic.base.conditions.mining; import java.io.ByteArrayOutputStream; import java.io.FileInputStream; @@ -24,6 +24,9 @@ import org.eclipse.passage.lic.internal.api.LicensingException; import org.eclipse.passage.lic.internal.base.i18n.AccessCycleMessages; +/** + * @since 1.1 + */ public final class DecodedContent { private final Path source; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/LicensingContentType.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/LicensingContentType.java similarity index 83% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/LicensingContentType.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/LicensingContentType.java index ab10c6d34..6aab7a659 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/LicensingContentType.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/LicensingContentType.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,13 +10,16 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.mining; +package org.eclipse.passage.lic.base.conditions.mining; import java.util.function.Function; -import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType; +import org.eclipse.passage.lic.api.conditions.mining.ContentType; import org.eclipse.passage.lic.internal.base.BaseNamedData; +/** + * @since 1.1 + */ public final class LicensingContentType extends BaseNamedData { public LicensingContentType(Function retrieve) { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/LocalConditions.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/LocalConditions.java similarity index 88% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/LocalConditions.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/LocalConditions.java index 928614ee5..0acf2fe5e 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/LocalConditions.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/LocalConditions.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.mining; +package org.eclipse.passage.lic.base.conditions.mining; import java.nio.file.Path; import java.util.Collection; @@ -18,16 +18,16 @@ import java.util.Objects; import java.util.function.Supplier; +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.MinedConditions; +import org.eclipse.passage.lic.api.conditions.mining.MiningEquipment; import org.eclipse.passage.lic.base.io.FileCollection; import org.eclipse.passage.lic.base.io.PassageFileExtension; 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.MinedConditions; -import org.eclipse.passage.lic.internal.api.conditions.mining.MiningEquipment; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; import org.eclipse.passage.lic.internal.base.diagnostic.BaseDiagnostic; @@ -41,6 +41,8 @@ * files, read 'em and retrieve all the licensing {@linkplain Condition}s they * declare. *

+ * + * @since 1.1 */ public abstract class LocalConditions implements MinedConditions { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/PathResidentConditions.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/PathResidentConditions.java similarity index 80% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/PathResidentConditions.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/PathResidentConditions.java index 3f4339c1b..28a4b8979 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/PathResidentConditions.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/PathResidentConditions.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,15 +10,15 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.mining; +package org.eclipse.passage.lic.base.conditions.mining; import java.nio.file.Path; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; +import org.eclipse.passage.lic.api.conditions.mining.MiningEquipment; 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.api.conditions.mining.MiningEquipment; public final class PathResidentConditions extends LocalConditions { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/PersonalLicenseMiningEquipment.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/PersonalLicenseMiningEquipment.java similarity index 81% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/PersonalLicenseMiningEquipment.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/PersonalLicenseMiningEquipment.java index 105ba64f2..6a0300062 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/PersonalLicenseMiningEquipment.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/PersonalLicenseMiningEquipment.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,20 +10,20 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.mining; +package org.eclipse.passage.lic.base.conditions.mining; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; +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.MiningEquipment; +import org.eclipse.passage.lic.api.conditions.mining.MiningTool; import org.eclipse.passage.lic.api.io.KeyKeeper; import org.eclipse.passage.lic.api.io.KeyKeeperRegistry; import org.eclipse.passage.lic.api.io.StreamCodec; import org.eclipse.passage.lic.api.io.StreamCodecRegistry; 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.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.MiningEquipment; -import org.eclipse.passage.lic.internal.api.conditions.mining.MiningTool; import org.eclipse.passage.lic.internal.base.i18n.BaseMessages; public final class PersonalLicenseMiningEquipment implements MiningEquipment { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/PersonalLicenseMiningTool.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/PersonalLicenseMiningTool.java similarity index 84% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/PersonalLicenseMiningTool.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/PersonalLicenseMiningTool.java index 02b27c5e0..ad0af5087 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/PersonalLicenseMiningTool.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/PersonalLicenseMiningTool.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.mining; +package org.eclipse.passage.lic.base.conditions.mining; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -18,21 +18,21 @@ import java.util.Collection; import java.util.Collections; +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.conditions.mining.ConditionTransport.Data; 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.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.conditions.mining.ConditionTransport.Data; import org.eclipse.passage.lic.internal.api.diagnostic.Diagnostic; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; import org.eclipse.passage.lic.internal.base.SumOfCollections; -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.diagnostic.BaseDiagnostic; import org.eclipse.passage.lic.internal.base.diagnostic.code.NoRelevantConditions; import org.eclipse.passage.lic.internal.base.diagnostic.code.ServiceFailedOnMorsel; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/SecurityKeyAlgorithm.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/SecurityKeyAlgorithm.java similarity index 92% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/SecurityKeyAlgorithm.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/SecurityKeyAlgorithm.java index 223b17ce2..52d81f6f6 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/SecurityKeyAlgorithm.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/SecurityKeyAlgorithm.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.mining; +package org.eclipse.passage.lic.base.conditions.mining; import java.util.Map; import java.util.Optional; @@ -19,6 +19,9 @@ import org.eclipse.passage.lic.api.io.EncryptionAlgorithm; import org.eclipse.passage.lic.internal.base.BaseNamedData; +/** + * @since 1.1 + */ public final class SecurityKeyAlgorithm extends BaseNamedData { public SecurityKeyAlgorithm(Function retrieve) { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/SecurityKeySize.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/SecurityKeySize.java similarity index 92% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/SecurityKeySize.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/SecurityKeySize.java index c0a184f83..b19e5df12 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/SecurityKeySize.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/SecurityKeySize.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.mining; +package org.eclipse.passage.lic.base.conditions.mining; import java.util.Map; import java.util.Optional; @@ -19,6 +19,9 @@ import org.eclipse.passage.lic.api.io.EncryptionKeySize; import org.eclipse.passage.lic.internal.base.BaseNamedData; +/** + * @since 1.1 + */ public final class SecurityKeySize extends BaseNamedData { public SecurityKeySize(Function retrieve) { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/UserHomeMiningTarget.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/UserHomeMiningTarget.java similarity index 79% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/UserHomeMiningTarget.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/UserHomeMiningTarget.java index b9067cd78..dc08d80ee 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/UserHomeMiningTarget.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/UserHomeMiningTarget.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,12 +10,15 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.mining; +package org.eclipse.passage.lic.base.conditions.mining; import java.util.function.Supplier; -import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; +/** + * @since 1.1 + */ public final class UserHomeMiningTarget implements Supplier { @Override diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/UserHomeResidentConditions.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/UserHomeResidentConditions.java similarity index 89% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/UserHomeResidentConditions.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/UserHomeResidentConditions.java index c5d418075..acf2b5ed1 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/UserHomeResidentConditions.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/conditions/mining/UserHomeResidentConditions.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,17 +10,17 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.conditions.mining; +package org.eclipse.passage.lic.base.conditions.mining; import java.nio.file.Path; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.mining.MiningEquipment; import org.eclipse.passage.lic.base.io.LicensingFolder; import org.eclipse.passage.lic.base.io.PassageFileExtension; import org.eclipse.passage.lic.base.io.PathFromLicensedProduct; import org.eclipse.passage.lic.base.io.UserHomePath; import org.eclipse.passage.lic.internal.api.LicensedProduct; -import org.eclipse.passage.lic.internal.api.conditions.mining.MiningEquipment; /** * Reads all the conditions containing in license files under diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/BaseFeature.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/BaseFeature.java index 79e53d6a9..5f867465c 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/BaseFeature.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/BaseFeature.java @@ -18,6 +18,8 @@ /** * Base data driven implementation of a {@linkplain Feature} descriptor. + * + * @since 1.1 */ public final class BaseFeature implements Feature { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/BaseRequirement.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/BaseRequirement.java index 7cf35e812..96678207a 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/BaseRequirement.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/BaseRequirement.java @@ -20,6 +20,8 @@ /** * Base data-driven implementation of a {@linkplain Requirement}. + * + * @since 1.1 */ public final class BaseRequirement implements Requirement { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/RequirementsFeatureFilter.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/RequirementsFeatureFilter.java index e6548cd72..11f27e8b6 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/RequirementsFeatureFilter.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/RequirementsFeatureFilter.java @@ -18,6 +18,9 @@ import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.base.FeatureFilter; +/** + * @since 1.1 + */ public final class RequirementsFeatureFilter implements Supplier> { private final String feature; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/UnsatisfiableRequirement.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/UnsatisfiableRequirement.java index 70a4260af..25d41606e 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/UnsatisfiableRequirement.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/UnsatisfiableRequirement.java @@ -31,6 +31,8 @@ * publish either a system failure or a sabotage attempt - to prevent access * cycle from successful completion. *

+ * + * @since 1.1 */ public final class UnsatisfiableRequirement implements Supplier { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/acquire/PathLicenseAcquisitionService.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/acquire/PathLicenseAcquisitionService.java index 37fc4732c..324d292b6 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/acquire/PathLicenseAcquisitionService.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/acquire/PathLicenseAcquisitionService.java @@ -14,7 +14,7 @@ import java.nio.file.Path; -import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; public final class PathLicenseAcquisitionService extends LocalLicenseAcquisitionService { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/acquire/UserHomeLicenseAcquisitionService.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/acquire/UserHomeLicenseAcquisitionService.java index c2440a57a..4dd714668 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/acquire/UserHomeLicenseAcquisitionService.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/acquire/UserHomeLicenseAcquisitionService.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.passage.lic.internal.base.acquire; -import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget; -import org.eclipse.passage.lic.internal.base.conditions.mining.UserHomeMiningTarget; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; +import org.eclipse.passage.lic.base.conditions.mining.UserHomeMiningTarget; public final class UserHomeLicenseAcquisitionService extends LocalLicenseAcquisitionService { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BaseExaminationCertificate.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BaseExaminationCertificate.java index 22f262b8e..2ea5f247e 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BaseExaminationCertificate.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BaseExaminationCertificate.java @@ -18,8 +18,8 @@ import java.util.Map; import java.util.Objects; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.api.requirements.Requirement; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BasePermissionsExaminationService.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BasePermissionsExaminationService.java index c7268fef8..a60b36d9c 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BasePermissionsExaminationService.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BasePermissionsExaminationService.java @@ -18,10 +18,10 @@ import java.util.Objects; import java.util.stream.Collectors; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.api.registry.StringServiceId; import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.LicensedProduct; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.api.restrictions.PermissionsExaminationService; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/ExaminationExplained.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/ExaminationExplained.java index 05c929ab6..9c432ac7e 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/ExaminationExplained.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/ExaminationExplained.java @@ -20,8 +20,8 @@ import java.util.function.Supplier; import java.util.stream.Collectors; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.api.requirements.Requirement; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.internal.api.diagnostic.TroubleCode; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; diff --git a/bundles/org.eclipse.passage.lic.equinox/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.equinox/OSGI-INF/l10n/bundle.properties index 17272a865..1cf897424 100644 --- a/bundles/org.eclipse.passage.lic.equinox/OSGI-INF/l10n/bundle.properties +++ b/bundles/org.eclipse.passage.lic.equinox/OSGI-INF/l10n/bundle.properties @@ -14,7 +14,7 @@ Bundle-Name = Passage LIC Equinox Bundle-Vendor = Eclipse Passage -Bundle-Copyright = Copyright (c) 2018, 2020 ArSysOp and others.\n\ +Bundle-Copyright = Copyright (c) 2018, 2021 ArSysOp and others.\n\ \n\ This program and the accompanying materials are made\n\ available under the terms of the Eclipse Public License 2.0\n\ diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementToCapability.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementToCapability.java index 9d4584559..e892eaafc 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementToCapability.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementToCapability.java @@ -33,7 +33,7 @@ * RequirementToCapability(requirement)).write(target); * * @see NamedData.Writable - * @since 2.0 + * @since 2.1 */ public final class RequirementToCapability implements NamedData { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/LicenseReadingServiceRequest.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/LicenseReadingServiceRequest.java index e0b8d6f35..09bda90cb 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/LicenseReadingServiceRequest.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/LicenseReadingServiceRequest.java @@ -14,10 +14,10 @@ import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.mining.LicenseReadingService; +import org.eclipse.passage.lic.base.conditions.mining.BaseLicenseReadingService; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -import org.eclipse.passage.lic.internal.api.conditions.mining.LicenseReadingService; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; -import org.eclipse.passage.lic.internal.base.conditions.mining.BaseLicenseReadingService; public final class LicenseReadingServiceRequest implements Supplier> { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/acquire/ConfigurationLicenseAcquisitionService.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/acquire/ConfigurationLicenseAcquisitionService.java index 66630f2fa..192eb3932 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/acquire/ConfigurationLicenseAcquisitionService.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/acquire/ConfigurationLicenseAcquisitionService.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.passage.lic.internal.equinox.acquire; -import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; import org.eclipse.passage.lic.internal.base.acquire.LocalLicenseAcquisitionService; import org.eclipse.passage.lic.internal.equinox.conditions.ConfigurationMiningTarget; diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/acquire/InstallationLicenseAcquisitionService.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/acquire/InstallationLicenseAcquisitionService.java index 0a7eff058..79cb8ab1b 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/acquire/InstallationLicenseAcquisitionService.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/acquire/InstallationLicenseAcquisitionService.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.passage.lic.internal.equinox.acquire; -import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; import org.eclipse.passage.lic.internal.base.acquire.LocalLicenseAcquisitionService; import org.eclipse.passage.lic.internal.equinox.conditions.InstallationMiningTarget; diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/conditions/ConfigurationMiningTarget.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/conditions/ConfigurationMiningTarget.java index 031e2fcd5..01c35f88d 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/conditions/ConfigurationMiningTarget.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/conditions/ConfigurationMiningTarget.java @@ -14,7 +14,7 @@ import java.util.function.Supplier; -import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; public final class ConfigurationMiningTarget implements Supplier { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/conditions/ConfigurationResidentConditions.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/conditions/ConfigurationResidentConditions.java index f7847247c..ea5bab0b2 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/conditions/ConfigurationResidentConditions.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/conditions/ConfigurationResidentConditions.java @@ -15,11 +15,11 @@ import java.nio.file.Path; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.mining.MiningEquipment; +import org.eclipse.passage.lic.base.conditions.mining.LocalConditions; import org.eclipse.passage.lic.base.io.LicensingFolder; import org.eclipse.passage.lic.base.io.PathFromLicensedProduct; import org.eclipse.passage.lic.internal.api.LicensedProduct; -import org.eclipse.passage.lic.internal.api.conditions.mining.MiningEquipment; -import org.eclipse.passage.lic.internal.base.conditions.mining.LocalConditions; import org.eclipse.passage.lic.internal.equinox.io.ConfigurationPath; /** diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/conditions/InstallationMiningTarget.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/conditions/InstallationMiningTarget.java index e423b9e3e..6eba3bd95 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/conditions/InstallationMiningTarget.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/conditions/InstallationMiningTarget.java @@ -14,7 +14,7 @@ import java.util.function.Supplier; -import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; public final class InstallationMiningTarget implements Supplier { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/conditions/InstallationResidentConditions.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/conditions/InstallationResidentConditions.java index 692af43ae..c134629b8 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/conditions/InstallationResidentConditions.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/conditions/InstallationResidentConditions.java @@ -15,11 +15,11 @@ import java.nio.file.Path; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.mining.MiningEquipment; +import org.eclipse.passage.lic.base.conditions.mining.LocalConditions; import org.eclipse.passage.lic.base.io.LicensingFolder; import org.eclipse.passage.lic.base.io.PathFromLicensedProduct; import org.eclipse.passage.lic.internal.api.LicensedProduct; -import org.eclipse.passage.lic.internal.api.conditions.mining.MiningEquipment; -import org.eclipse.passage.lic.internal.base.conditions.mining.LocalConditions; import org.eclipse.passage.lic.internal.equinox.io.InstallationPath; /** diff --git a/bundles/org.eclipse.passage.lic.hc/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.hc/META-INF/MANIFEST.MF index 25f4d771d..53eee7a91 100644 --- a/bundles/org.eclipse.passage.lic.hc/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.hc/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.eclipse.passage.lic.hc Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.passage.lic.hc -Bundle-Version: 1.0.200.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright @@ -19,8 +19,8 @@ Require-Bundle: org.apache.httpcomponents.httpcore;bundle-version="0.0.0", org.eclipse.passage.lic.equinox;bundle-version="0.0.0", org.eclipse.passage.lic.net;bundle-version="0.0.0", org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0" -Export-Package: org.eclipse.passage.lic.internal.hc.remote;x-internal:=true, - org.eclipse.passage.lic.internal.hc.remote.impl;x-internal:=true, - org.eclipse.passage.lic.internal.hc.remote.impl.acquire;x-internal:=true, - org.eclipse.passage.lic.internal.hc.remote.impl.mine;x-internal:=true +Export-Package: org.eclipse.passage.lic.hc.remote, + org.eclipse.passage.lic.hc.remote.impl, + org.eclipse.passage.lic.hc.remote.impl.acquire, + org.eclipse.passage.lic.hc.remote.impl.mine Bundle-ActivationPolicy: lazy diff --git a/bundles/org.eclipse.passage.lic.hc/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.hc/OSGI-INF/l10n/bundle.properties index 7250bde05..2e0c7e929 100644 --- a/bundles/org.eclipse.passage.lic.hc/OSGI-INF/l10n/bundle.properties +++ b/bundles/org.eclipse.passage.lic.hc/OSGI-INF/l10n/bundle.properties @@ -14,7 +14,7 @@ Bundle-Name = Passage LIC HC Bundle-Vendor = Eclipse Passage -Bundle-Copyright = Copyright (c) 2019, 2020 ArSysOp and others.\n\ +Bundle-Copyright = Copyright (c) 2019, 2021 ArSysOp and others.\n\ \n\ This program and the accompanying materials are made\n\ available under the terms of the Eclipse Public License 2.0\n\ diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/Client.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/Client.java similarity index 86% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/Client.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/Client.java index baab34c1e..064a75e08 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/Client.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/Client.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,10 +10,13 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote; +package org.eclipse.passage.lic.hc.remote; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; +/** + * @since 1.1 + */ public interface Client { ServiceInvocationResult request(Request request, ResponseHandler handler); diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/Configuration.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/Configuration.java similarity index 84% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/Configuration.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/Configuration.java index 8664493d9..0583e37e8 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/Configuration.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/Configuration.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,8 +10,11 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote; +package org.eclipse.passage.lic.hc.remote; +/** + * @since 1.1 + */ public interface Configuration { C apply(C connection) throws Exception; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/Connection.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/Connection.java similarity index 85% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/Connection.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/Connection.java index 9cc56654c..ec827bb2d 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/Connection.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/Connection.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,11 +10,14 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote; +package org.eclipse.passage.lic.hc.remote; +import org.eclipse.passage.lic.api.conditions.mining.ContentType; import org.eclipse.passage.lic.internal.api.LicensingException; -import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType; +/** + * @since 1.1 + */ public interface Connection { void beGet() throws LicensingException; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/QueryParameters.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/QueryParameters.java similarity index 85% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/QueryParameters.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/QueryParameters.java index a1bdf7b89..e15feaab5 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/QueryParameters.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/QueryParameters.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,10 +10,13 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote; +package org.eclipse.passage.lic.hc.remote; import org.eclipse.passage.lic.internal.api.LicensingException; +/** + * @since 1.1 + */ public interface QueryParameters { String query() throws LicensingException; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/Request.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/Request.java similarity index 88% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/Request.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/Request.java index df7052e3b..68d6391f3 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/Request.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/Request.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,12 +10,15 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote; +package org.eclipse.passage.lic.hc.remote; import java.net.URL; import org.eclipse.passage.lic.internal.api.LicensingException; +/** + * @since 1.1 + */ public interface Request { RequestContext context(); diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/RequestContext.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/RequestContext.java similarity index 92% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/RequestContext.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/RequestContext.java index a8da4d82a..3e2ae42b6 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/RequestContext.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/RequestContext.java @@ -10,12 +10,14 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote; +package org.eclipse.passage.lic.hc.remote; import org.eclipse.passage.lic.internal.api.LicensedProduct; /** * Subset of Request data that are significant for Response handling + * + * @since 1.1 */ public interface RequestContext { diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/ResponseHandler.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/ResponseHandler.java similarity index 79% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/ResponseHandler.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/ResponseHandler.java index fc435d4b2..c6e73ef7f 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/ResponseHandler.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/ResponseHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,11 +10,14 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote; +package org.eclipse.passage.lic.hc.remote; +import org.eclipse.passage.lic.hc.remote.impl.ResultsTransfered; import org.eclipse.passage.lic.internal.api.LicensingException; -import org.eclipse.passage.lic.internal.hc.remote.impl.ResultsTransfered; +/** + * @since 1.1 + */ public interface ResponseHandler { T read(ResultsTransfered result, RequestContext context) throws LicensingException; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/AccessFiles.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/AccessFiles.java similarity index 96% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/AccessFiles.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/AccessFiles.java index bdc9fa028..732cef7ff 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/AccessFiles.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/AccessFiles.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl; +package org.eclipse.passage.lic.hc.remote.impl; import java.nio.file.Path; import java.util.Collection; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/AccessPacks.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/AccessPacks.java similarity index 97% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/AccessPacks.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/AccessPacks.java index 524da165f..ab0224d3c 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/AccessPacks.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/AccessPacks.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl; +package org.eclipse.passage.lic.hc.remote.impl; import java.nio.file.Path; import java.util.ArrayList; @@ -23,6 +23,7 @@ import org.eclipse.passage.lic.api.io.KeyKeeperRegistry; import org.eclipse.passage.lic.api.io.StreamCodec; import org.eclipse.passage.lic.api.io.StreamCodecRegistry; +import org.eclipse.passage.lic.base.conditions.mining.DecodedContent; import org.eclipse.passage.lic.base.io.LicensingFolder; import org.eclipse.passage.lic.base.io.UserHomePath; import org.eclipse.passage.lic.internal.api.LicensedProduct; @@ -30,7 +31,6 @@ import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; -import org.eclipse.passage.lic.internal.base.conditions.mining.DecodedContent; import org.eclipse.passage.lic.internal.base.diagnostic.BaseDiagnostic; import org.eclipse.passage.lic.internal.base.diagnostic.code.ServiceCannotOperate; import org.eclipse.passage.lic.internal.base.diagnostic.code.ServiceFailedOnInfrastructureDenial; @@ -41,6 +41,9 @@ import org.eclipse.passage.lic.licenses.model.meta.LicensesPackage; import org.eclipse.passage.lic.licenses.model.util.LicensesResourceImpl; +/** + * @since 1.1 + */ public final class AccessPacks implements Supplier>> { private final LicensedProduct product; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/BaseConfiguration.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/BaseConfiguration.java similarity index 90% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/BaseConfiguration.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/BaseConfiguration.java index 330933d47..7d87a3e67 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/BaseConfiguration.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/BaseConfiguration.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,16 +10,16 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl; +package org.eclipse.passage.lic.hc.remote.impl; import java.util.Collections; import java.util.Map; import java.util.Objects; +import org.eclipse.passage.lic.api.conditions.mining.ContentType; +import org.eclipse.passage.lic.hc.remote.Configuration; +import org.eclipse.passage.lic.hc.remote.Connection; import org.eclipse.passage.lic.internal.api.LicensingException; -import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType; -import org.eclipse.passage.lic.internal.hc.remote.Configuration; -import org.eclipse.passage.lic.internal.hc.remote.Connection; public abstract class BaseConfiguration implements Configuration { diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/BaseRequestContext.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/BaseRequestContext.java similarity index 88% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/BaseRequestContext.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/BaseRequestContext.java index f7aba4a95..95acf83ee 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/BaseRequestContext.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/BaseRequestContext.java @@ -10,10 +10,10 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl; +package org.eclipse.passage.lic.hc.remote.impl; +import org.eclipse.passage.lic.hc.remote.RequestContext; import org.eclipse.passage.lic.internal.api.LicensedProduct; -import org.eclipse.passage.lic.internal.hc.remote.RequestContext; public final class BaseRequestContext implements RequestContext { diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/EObjectFromXmiResponse.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/EObjectFromXmiResponse.java similarity index 88% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/EObjectFromXmiResponse.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/EObjectFromXmiResponse.java index 1ef9a316a..075fb7db2 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/EObjectFromXmiResponse.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/EObjectFromXmiResponse.java @@ -10,15 +10,15 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl; +package org.eclipse.passage.lic.hc.remote.impl; import org.eclipse.emf.ecore.EObject; +import org.eclipse.passage.lic.api.conditions.mining.ContentType; +import org.eclipse.passage.lic.hc.remote.RequestContext; +import org.eclipse.passage.lic.hc.remote.ResponseHandler; import org.eclipse.passage.lic.internal.api.LicensingException; -import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType; import org.eclipse.passage.lic.internal.emf.EObjectFromBytes; import org.eclipse.passage.lic.internal.hc.i18n.AccessMessages; -import org.eclipse.passage.lic.internal.hc.remote.RequestContext; -import org.eclipse.passage.lic.internal.hc.remote.ResponseHandler; import org.eclipse.passage.lic.internal.net.io.SafePayload; import org.eclipse.passage.lic.licenses.model.util.LicensesResourceImpl; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/Equipment.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/Equipment.java similarity index 88% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/Equipment.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/Equipment.java index 8b6545d9b..4fc002688 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/Equipment.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/Equipment.java @@ -10,8 +10,11 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl; +package org.eclipse.passage.lic.hc.remote.impl; +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.io.Hashes; import org.eclipse.passage.lic.api.io.HashesRegistry; import org.eclipse.passage.lic.api.io.KeyKeeper; @@ -20,11 +23,11 @@ import org.eclipse.passage.lic.api.registry.StringServiceId; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.LicensingException; -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.hc.i18n.MineMessages; +/** + * @since 1.1 + */ public final class Equipment { private final KeyKeeperRegistry keys; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/FloatingServerCoordinates.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/FloatingServerCoordinates.java similarity index 95% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/FloatingServerCoordinates.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/FloatingServerCoordinates.java index cbe5f2b76..87ba49e25 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/FloatingServerCoordinates.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/FloatingServerCoordinates.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl; +package org.eclipse.passage.lic.hc.remote.impl; import org.eclipse.passage.lic.internal.api.LicensingException; import org.eclipse.passage.lic.internal.net.HostPort; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/HttpClient.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/HttpClient.java similarity index 87% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/HttpClient.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/HttpClient.java index 144c289fa..e6300bab3 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/HttpClient.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/HttpClient.java @@ -10,21 +10,21 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl; +package org.eclipse.passage.lic.hc.remote.impl; import java.net.HttpURLConnection; import java.util.Collections; +import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.remote.Request; +import org.eclipse.passage.lic.hc.remote.RequestContext; +import org.eclipse.passage.lic.hc.remote.ResponseHandler; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; import org.eclipse.passage.lic.internal.base.diagnostic.BaseDiagnostic; import org.eclipse.passage.lic.internal.base.diagnostic.code.ServiceFailedOnInfrastructureDenial; import org.eclipse.passage.lic.internal.hc.i18n.AccessMessages; -import org.eclipse.passage.lic.internal.hc.remote.Client; -import org.eclipse.passage.lic.internal.hc.remote.Request; -import org.eclipse.passage.lic.internal.hc.remote.RequestContext; -import org.eclipse.passage.lic.internal.hc.remote.ResponseHandler; public final class HttpClient implements Client { diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/NetConnection.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/NetConnection.java similarity index 93% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/NetConnection.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/NetConnection.java index e67910747..e19936173 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/NetConnection.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/NetConnection.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,16 +10,16 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl; +package org.eclipse.passage.lic.hc.remote.impl; import java.io.InputStream; import java.io.OutputStream; import java.net.HttpURLConnection; import java.util.Optional; +import org.eclipse.passage.lic.api.conditions.mining.ContentType; +import org.eclipse.passage.lic.hc.remote.Connection; import org.eclipse.passage.lic.internal.api.LicensingException; -import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType; -import org.eclipse.passage.lic.internal.hc.remote.Connection; public final class NetConnection implements Connection { diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/RemoteRequest.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/RemoteRequest.java similarity index 88% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/RemoteRequest.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/RemoteRequest.java index 2a6f002c7..02cd9d1d1 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/RemoteRequest.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/RemoteRequest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,18 +10,18 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl; +package org.eclipse.passage.lic.hc.remote.impl; import java.net.MalformedURLException; import java.net.URL; import org.eclipse.passage.lic.api.io.HashesRegistry; +import org.eclipse.passage.lic.hc.remote.Connection; +import org.eclipse.passage.lic.hc.remote.Request; +import org.eclipse.passage.lic.hc.remote.RequestContext; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.LicensingException; import org.eclipse.passage.lic.internal.hc.i18n.AccessMessages; -import org.eclipse.passage.lic.internal.hc.remote.Connection; -import org.eclipse.passage.lic.internal.hc.remote.Request; -import org.eclipse.passage.lic.internal.hc.remote.RequestContext; import org.eclipse.passage.lic.internal.net.HostPort; import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseAccess; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/RemoteServiceData.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/RemoteServiceData.java similarity index 92% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/RemoteServiceData.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/RemoteServiceData.java index 61b9501e4..c947614e8 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/RemoteServiceData.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/RemoteServiceData.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,10 +10,13 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl; +package org.eclipse.passage.lic.hc.remote.impl; import org.eclipse.passage.lic.internal.api.LicensedProduct; +/** + * @since 1.1 + */ public abstract class RemoteServiceData { private final LicensedProduct product; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/RequestParameters.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/RequestParameters.java similarity index 96% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/RequestParameters.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/RequestParameters.java index 0f0cbad87..1eddbeaf6 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/RequestParameters.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/RequestParameters.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl; +package org.eclipse.passage.lic.hc.remote.impl; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -18,6 +18,7 @@ import java.util.List; import java.util.stream.Collectors; +import org.eclipse.passage.lic.hc.remote.QueryParameters; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.LicensingException; import org.eclipse.passage.lic.internal.api.PassageAction; @@ -25,7 +26,6 @@ import org.eclipse.passage.lic.internal.base.ProductIdentifier; import org.eclipse.passage.lic.internal.base.ProductVersion; import org.eclipse.passage.lic.internal.hc.i18n.AccessMessages; -import org.eclipse.passage.lic.internal.hc.remote.QueryParameters; import org.eclipse.passage.lic.internal.net.EncodingAlgorithm; import org.eclipse.passage.lic.internal.net.LicenseUser; import org.eclipse.passage.lic.internal.net.LicensingAction; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/ResultsTransfered.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ResultsTransfered.java similarity index 88% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/ResultsTransfered.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ResultsTransfered.java index 401c2eb29..72de70a28 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/ResultsTransfered.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ResultsTransfered.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,16 +10,16 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl; +package org.eclipse.passage.lic.hc.remote.impl; import java.util.Collections; -import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType; +import org.eclipse.passage.lic.api.conditions.mining.ContentType; +import org.eclipse.passage.lic.hc.remote.Connection; import org.eclipse.passage.lic.internal.api.diagnostic.Diagnostic; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; 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.hc.remote.Connection; public final class ResultsTransfered { diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/ServiceAny.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceAny.java similarity index 92% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/ServiceAny.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceAny.java index be39748d5..e04e2612f 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/ServiceAny.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceAny.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl; +package org.eclipse.passage.lic.hc.remote.impl; import java.nio.file.Path; import java.util.ArrayList; @@ -18,14 +18,14 @@ import java.util.List; import java.util.function.Supplier; +import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.remote.Connection; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.api.diagnostic.Diagnostic; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; import org.eclipse.passage.lic.internal.base.diagnostic.BaseDiagnostic; import org.eclipse.passage.lic.internal.base.diagnostic.NoSevereErrors; import org.eclipse.passage.lic.internal.base.diagnostic.SumOfDiagnostics; -import org.eclipse.passage.lic.internal.hc.remote.Client; -import org.eclipse.passage.lic.internal.hc.remote.Connection; import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseAccess; public abstract class ServiceAny extends ServiceRemote { diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/ServiceEvery.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceEvery.java similarity index 89% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/ServiceEvery.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceEvery.java index f36b7037a..5e725ed58 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/ServiceEvery.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceEvery.java @@ -10,17 +10,17 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl; +package org.eclipse.passage.lic.hc.remote.impl; import java.nio.file.Path; import java.util.Collection; import java.util.function.BinaryOperator; import java.util.function.Supplier; +import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.remote.Connection; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; -import org.eclipse.passage.lic.internal.hc.remote.Client; -import org.eclipse.passage.lic.internal.hc.remote.Connection; import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseAccess; public abstract class ServiceEvery diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/ServiceRemote.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceRemote.java similarity index 93% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/ServiceRemote.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceRemote.java index d0b8eff91..26e70f476 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/ServiceRemote.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceRemote.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl; +package org.eclipse.passage.lic.hc.remote.impl; import java.nio.file.Path; import java.util.Collection; @@ -20,6 +20,9 @@ import org.eclipse.passage.lic.base.io.LicensingFolder; import org.eclipse.passage.lic.base.io.PathFromLicensedProduct; import org.eclipse.passage.lic.base.io.UserHomePath; +import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.remote.Connection; +import org.eclipse.passage.lic.hc.remote.ResponseHandler; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; @@ -28,9 +31,6 @@ import org.eclipse.passage.lic.internal.base.diagnostic.NoSevereErrors; import org.eclipse.passage.lic.internal.base.diagnostic.code.AbsentLicenseAttendantFile; import org.eclipse.passage.lic.internal.hc.i18n.AccessMessages; -import org.eclipse.passage.lic.internal.hc.remote.Client; -import org.eclipse.passage.lic.internal.hc.remote.Connection; -import org.eclipse.passage.lic.internal.hc.remote.ResponseHandler; import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseAccess; public abstract class ServiceRemote { diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/AcquireRequestParameters.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/AcquireRequestParameters.java similarity index 91% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/AcquireRequestParameters.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/AcquireRequestParameters.java index 9695c5371..f209152f8 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/AcquireRequestParameters.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/AcquireRequestParameters.java @@ -10,17 +10,17 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl.acquire; +package org.eclipse.passage.lic.hc.remote.impl.acquire; import java.util.Collections; import java.util.List; +import org.eclipse.passage.lic.hc.remote.impl.RequestParameters; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.LicensingException; import org.eclipse.passage.lic.internal.api.PassageAction; import org.eclipse.passage.lic.internal.base.FeatureIdentifier; import org.eclipse.passage.lic.internal.base.NamedData; -import org.eclipse.passage.lic.internal.hc.remote.impl.RequestParameters; import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseAccess; final class AcquireRequestParameters extends RequestParameters { diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/ReleaseRequestParameters.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/ReleaseRequestParameters.java similarity index 91% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/ReleaseRequestParameters.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/ReleaseRequestParameters.java index bcc295bb0..0d33a99e9 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/ReleaseRequestParameters.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/ReleaseRequestParameters.java @@ -10,17 +10,17 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl.acquire; +package org.eclipse.passage.lic.hc.remote.impl.acquire; import java.util.Collections; import java.util.List; +import org.eclipse.passage.lic.hc.remote.impl.RequestParameters; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.LicensingException; import org.eclipse.passage.lic.internal.api.PassageAction; import org.eclipse.passage.lic.internal.base.FeatureIdentifier; import org.eclipse.passage.lic.internal.base.NamedData; -import org.eclipse.passage.lic.internal.hc.remote.impl.RequestParameters; import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseAccess; final class ReleaseRequestParameters extends RequestParameters { diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/RemoteAcquire.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteAcquire.java similarity index 72% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/RemoteAcquire.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteAcquire.java index 308c8029b..956207bba 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/RemoteAcquire.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteAcquire.java @@ -10,28 +10,28 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl.acquire; +package org.eclipse.passage.lic.hc.remote.impl.acquire; import java.nio.file.Path; import java.util.function.Supplier; import org.eclipse.passage.lic.api.io.HashesRegistry; +import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.remote.Configuration; +import org.eclipse.passage.lic.hc.remote.Connection; +import org.eclipse.passage.lic.hc.remote.RequestContext; +import org.eclipse.passage.lic.hc.remote.ResponseHandler; +import org.eclipse.passage.lic.hc.remote.impl.BaseConfiguration; +import org.eclipse.passage.lic.hc.remote.impl.EObjectFromXmiResponse; +import org.eclipse.passage.lic.hc.remote.impl.Equipment; +import org.eclipse.passage.lic.hc.remote.impl.RemoteRequest; +import org.eclipse.passage.lic.hc.remote.impl.RemoteServiceData; +import org.eclipse.passage.lic.hc.remote.impl.RequestParameters; +import org.eclipse.passage.lic.hc.remote.impl.ResultsTransfered; +import org.eclipse.passage.lic.hc.remote.impl.ServiceAny; +import org.eclipse.passage.lic.hc.remote.impl.RemoteServiceData.OfFeature; import org.eclipse.passage.lic.internal.api.LicensingException; import org.eclipse.passage.lic.internal.api.acquire.GrantAcquisition; -import org.eclipse.passage.lic.internal.hc.remote.Client; -import org.eclipse.passage.lic.internal.hc.remote.Configuration; -import org.eclipse.passage.lic.internal.hc.remote.Connection; -import org.eclipse.passage.lic.internal.hc.remote.RequestContext; -import org.eclipse.passage.lic.internal.hc.remote.ResponseHandler; -import org.eclipse.passage.lic.internal.hc.remote.impl.BaseConfiguration; -import org.eclipse.passage.lic.internal.hc.remote.impl.EObjectFromXmiResponse; -import org.eclipse.passage.lic.internal.hc.remote.impl.Equipment; -import org.eclipse.passage.lic.internal.hc.remote.impl.RemoteRequest; -import org.eclipse.passage.lic.internal.hc.remote.impl.RemoteServiceData; -import org.eclipse.passage.lic.internal.hc.remote.impl.RemoteServiceData.OfFeature; -import org.eclipse.passage.lic.internal.hc.remote.impl.RequestParameters; -import org.eclipse.passage.lic.internal.hc.remote.impl.ResultsTransfered; -import org.eclipse.passage.lic.internal.hc.remote.impl.ServiceAny; import org.eclipse.passage.lic.internal.licenses.convert.PGrantAcquisition; import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseAccess; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/RemoteAcquisitionService.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteAcquisitionService.java similarity index 83% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/RemoteAcquisitionService.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteAcquisitionService.java index 1dc203362..c1332bfca 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/RemoteAcquisitionService.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteAcquisitionService.java @@ -10,23 +10,23 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl.acquire; +package org.eclipse.passage.lic.hc.remote.impl.acquire; import java.nio.file.Path; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; import org.eclipse.passage.lic.base.io.LicensingFolder; import org.eclipse.passage.lic.base.io.UserHomePath; +import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.remote.Connection; +import org.eclipse.passage.lic.hc.remote.impl.Equipment; +import org.eclipse.passage.lic.hc.remote.impl.HttpClient; +import org.eclipse.passage.lic.hc.remote.impl.RemoteServiceData; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.api.acquire.GrantAcquisition; import org.eclipse.passage.lic.internal.api.acquire.LicenseAcquisitionService; -import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget; -import org.eclipse.passage.lic.internal.hc.remote.Client; -import org.eclipse.passage.lic.internal.hc.remote.Connection; -import org.eclipse.passage.lic.internal.hc.remote.impl.Equipment; -import org.eclipse.passage.lic.internal.hc.remote.impl.HttpClient; -import org.eclipse.passage.lic.internal.hc.remote.impl.RemoteServiceData; public final class RemoteAcquisitionService implements LicenseAcquisitionService { diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/RemoteRelease.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteRelease.java similarity index 76% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/RemoteRelease.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteRelease.java index dd9c03097..dd2e47cfd 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/RemoteRelease.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteRelease.java @@ -10,27 +10,27 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl.acquire; +package org.eclipse.passage.lic.hc.remote.impl.acquire; import java.nio.file.Path; import java.util.function.Supplier; import org.eclipse.passage.lic.api.io.HashesRegistry; +import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.remote.Configuration; +import org.eclipse.passage.lic.hc.remote.Connection; +import org.eclipse.passage.lic.hc.remote.RequestContext; +import org.eclipse.passage.lic.hc.remote.ResponseHandler; +import org.eclipse.passage.lic.hc.remote.impl.BaseConfiguration; +import org.eclipse.passage.lic.hc.remote.impl.Equipment; +import org.eclipse.passage.lic.hc.remote.impl.RemoteRequest; +import org.eclipse.passage.lic.hc.remote.impl.RemoteServiceData; +import org.eclipse.passage.lic.hc.remote.impl.RequestParameters; +import org.eclipse.passage.lic.hc.remote.impl.ResultsTransfered; +import org.eclipse.passage.lic.hc.remote.impl.ServiceAny; import org.eclipse.passage.lic.internal.api.LicensingException; import org.eclipse.passage.lic.internal.api.acquire.GrantAcquisition; import org.eclipse.passage.lic.internal.emf.EObjectToBytes; -import org.eclipse.passage.lic.internal.hc.remote.Client; -import org.eclipse.passage.lic.internal.hc.remote.Configuration; -import org.eclipse.passage.lic.internal.hc.remote.Connection; -import org.eclipse.passage.lic.internal.hc.remote.RequestContext; -import org.eclipse.passage.lic.internal.hc.remote.ResponseHandler; -import org.eclipse.passage.lic.internal.hc.remote.impl.BaseConfiguration; -import org.eclipse.passage.lic.internal.hc.remote.impl.Equipment; -import org.eclipse.passage.lic.internal.hc.remote.impl.RemoteRequest; -import org.eclipse.passage.lic.internal.hc.remote.impl.RemoteServiceData; -import org.eclipse.passage.lic.internal.hc.remote.impl.RequestParameters; -import org.eclipse.passage.lic.internal.hc.remote.impl.ResultsTransfered; -import org.eclipse.passage.lic.internal.hc.remote.impl.ServiceAny; import org.eclipse.passage.lic.internal.licenses.convert.EGrantAcquisition; import org.eclipse.passage.lic.internal.net.io.SafePayload; import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseAccess; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/mine/DecryptedConditions.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/DecryptedConditions.java similarity index 75% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/mine/DecryptedConditions.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/DecryptedConditions.java index f9fc202d1..6af60a791 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/mine/DecryptedConditions.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/DecryptedConditions.java @@ -10,25 +10,25 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl.mine; +package org.eclipse.passage.lic.hc.remote.impl.mine; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.Collection; import java.util.Collections; +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.conditions.mining.ConditionTransport.Data; +import org.eclipse.passage.lic.base.conditions.BaseConditionOrigin; +import org.eclipse.passage.lic.base.conditions.BaseConditionPack; +import org.eclipse.passage.lic.hc.remote.RequestContext; +import org.eclipse.passage.lic.hc.remote.ResponseHandler; +import org.eclipse.passage.lic.hc.remote.impl.Equipment; +import org.eclipse.passage.lic.hc.remote.impl.ResultsTransfered; 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.ConditionPack; -import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransport; -import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransport.Data; -import org.eclipse.passage.lic.internal.base.conditions.BaseConditionOrigin; -import org.eclipse.passage.lic.internal.base.conditions.BaseConditionPack; import org.eclipse.passage.lic.internal.hc.i18n.MineMessages; -import org.eclipse.passage.lic.internal.hc.remote.RequestContext; -import org.eclipse.passage.lic.internal.hc.remote.ResponseHandler; -import org.eclipse.passage.lic.internal.hc.remote.impl.Equipment; -import org.eclipse.passage.lic.internal.hc.remote.impl.ResultsTransfered; import org.eclipse.passage.lic.internal.net.io.SafePayload; import org.eclipse.passage.lic.licenses.model.api.FloatingServerConnection; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/mine/MineRequestParameters.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/MineRequestParameters.java similarity index 90% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/mine/MineRequestParameters.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/MineRequestParameters.java index 1c3880dfc..b515a84e7 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/mine/MineRequestParameters.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/MineRequestParameters.java @@ -10,16 +10,16 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl.mine; +package org.eclipse.passage.lic.hc.remote.impl.mine; import java.util.Collections; import java.util.List; +import org.eclipse.passage.lic.hc.remote.impl.RequestParameters; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.LicensingException; import org.eclipse.passage.lic.internal.api.PassageAction; import org.eclipse.passage.lic.internal.base.NamedData; -import org.eclipse.passage.lic.internal.hc.remote.impl.RequestParameters; import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseAccess; final class MineRequestParameters extends RequestParameters { diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/mine/RemoteConditions.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/RemoteConditions.java similarity index 72% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/mine/RemoteConditions.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/RemoteConditions.java index 5836f463b..a190bd9fd 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/mine/RemoteConditions.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/RemoteConditions.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl.mine; +package org.eclipse.passage.lic.hc.remote.impl.mine; import java.nio.file.Path; import java.util.Collection; @@ -18,23 +18,23 @@ import java.util.function.BinaryOperator; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; +import org.eclipse.passage.lic.api.conditions.ConditionPack; +import org.eclipse.passage.lic.api.conditions.mining.MinedConditions; import org.eclipse.passage.lic.base.io.LicensingFolder; import org.eclipse.passage.lic.base.io.UserHomePath; +import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.remote.Connection; +import org.eclipse.passage.lic.hc.remote.ResponseHandler; +import org.eclipse.passage.lic.hc.remote.impl.Equipment; +import org.eclipse.passage.lic.hc.remote.impl.HttpClient; +import org.eclipse.passage.lic.hc.remote.impl.RemoteRequest; +import org.eclipse.passage.lic.hc.remote.impl.RemoteServiceData; +import org.eclipse.passage.lic.hc.remote.impl.ServiceEvery; +import org.eclipse.passage.lic.hc.remote.impl.RemoteServiceData.Bulk; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -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.MinedConditions; import org.eclipse.passage.lic.internal.base.SumOfCollections; -import org.eclipse.passage.lic.internal.hc.remote.Client; -import org.eclipse.passage.lic.internal.hc.remote.Connection; -import org.eclipse.passage.lic.internal.hc.remote.ResponseHandler; -import org.eclipse.passage.lic.internal.hc.remote.impl.Equipment; -import org.eclipse.passage.lic.internal.hc.remote.impl.HttpClient; -import org.eclipse.passage.lic.internal.hc.remote.impl.RemoteRequest; -import org.eclipse.passage.lic.internal.hc.remote.impl.RemoteServiceData; -import org.eclipse.passage.lic.internal.hc.remote.impl.RemoteServiceData.Bulk; -import org.eclipse.passage.lic.internal.hc.remote.impl.ServiceEvery; import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseAccess; public final class RemoteConditions // diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/mine/RemoteConditionsRequest.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/RemoteConditionsRequest.java similarity index 73% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/mine/RemoteConditionsRequest.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/RemoteConditionsRequest.java index f1b744707..deac0fdf4 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/mine/RemoteConditionsRequest.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/RemoteConditionsRequest.java @@ -10,15 +10,15 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.hc.remote.impl.mine; +package org.eclipse.passage.lic.hc.remote.impl.mine; import org.eclipse.passage.lic.api.io.HashesRegistry; +import org.eclipse.passage.lic.hc.remote.Configuration; +import org.eclipse.passage.lic.hc.remote.Connection; +import org.eclipse.passage.lic.hc.remote.impl.BaseConfiguration; +import org.eclipse.passage.lic.hc.remote.impl.RemoteRequest; +import org.eclipse.passage.lic.hc.remote.impl.RequestParameters; import org.eclipse.passage.lic.internal.api.LicensedProduct; -import org.eclipse.passage.lic.internal.hc.remote.Configuration; -import org.eclipse.passage.lic.internal.hc.remote.Connection; -import org.eclipse.passage.lic.internal.hc.remote.impl.BaseConfiguration; -import org.eclipse.passage.lic.internal.hc.remote.impl.RemoteRequest; -import org.eclipse.passage.lic.internal.hc.remote.impl.RequestParameters; import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseAccess; public final class RemoteConditionsRequest extends RemoteRequest { diff --git a/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/dialogs/licensing/ImportLicenseDialog.java b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/dialogs/licensing/ImportLicenseDialog.java index 4fbdca13f..d666f56fe 100644 --- a/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/dialogs/licensing/ImportLicenseDialog.java +++ b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/dialogs/licensing/ImportLicenseDialog.java @@ -21,15 +21,15 @@ import java.util.Optional; import java.util.stream.Collectors; +import org.eclipse.passage.lic.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.ConditionPack; +import org.eclipse.passage.lic.api.conditions.ValidityPeriod; +import org.eclipse.passage.lic.api.conditions.mining.LicenseReadingService; +import org.eclipse.passage.lic.base.conditions.BaseValidityPeriodClosed; import org.eclipse.passage.lic.base.io.ExternalLicense; import org.eclipse.passage.lic.internal.api.LicensedProduct; 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.ConditionPack; -import org.eclipse.passage.lic.internal.api.conditions.ValidityPeriod; -import org.eclipse.passage.lic.internal.api.conditions.mining.LicenseReadingService; import org.eclipse.passage.lic.internal.api.diagnostic.Diagnostic; -import org.eclipse.passage.lic.internal.base.conditions.BaseValidityPeriodClosed; import org.eclipse.passage.lic.internal.equinox.EquinoxPassage; import org.eclipse.passage.lic.internal.equinox.LicenseReadingServiceRequest; import org.eclipse.passage.lic.internal.jface.i18n.ImportLicenseDialogMessages; diff --git a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/AcquiredExaminationCertificate.java b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/AcquiredExaminationCertificate.java index 0546e0d90..19b1d9faa 100644 --- a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/AcquiredExaminationCertificate.java +++ b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/AcquiredExaminationCertificate.java @@ -18,8 +18,8 @@ import java.util.Map; import java.util.Objects; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.api.requirements.Requirement; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; diff --git a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/ConditionDeserializer.java b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/ConditionDeserializer.java index ce9128cfb..43e336aba 100644 --- a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/ConditionDeserializer.java +++ b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/ConditionDeserializer.java @@ -14,7 +14,7 @@ import java.io.IOException; -import org.eclipse.passage.lic.internal.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.Condition; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/ConditionPack.java b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/ConditionPack.java index 1cd8334bc..0c81fd15e 100644 --- a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/ConditionPack.java +++ b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/ConditionPack.java @@ -14,7 +14,7 @@ import java.util.Collection; -import org.eclipse.passage.lic.internal.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.Condition; /** * Cover connection of typed elements as our persistence library requires. diff --git a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/ConditionSerializer.java b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/ConditionSerializer.java index 66e35c5a5..81cb80eda 100644 --- a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/ConditionSerializer.java +++ b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/ConditionSerializer.java @@ -14,8 +14,8 @@ import java.io.IOException; -import org.eclipse.passage.lic.internal.api.conditions.Condition; -import org.eclipse.passage.lic.internal.api.conditions.ValidityPeriodClosed; +import org.eclipse.passage.lic.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.ValidityPeriodClosed; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/Json.java b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/Json.java index 0721653a9..8126fbfbd 100644 --- a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/Json.java +++ b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/Json.java @@ -16,29 +16,29 @@ import java.time.format.DateTimeFormatter; import java.util.function.Function; +import org.eclipse.passage.lic.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; +import org.eclipse.passage.lic.api.conditions.ConditionOrigin; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.api.requirements.Feature; import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.base.conditions.BaseCondition; +import org.eclipse.passage.lic.base.conditions.BaseConditionOrigin; +import org.eclipse.passage.lic.base.conditions.BaseEvaluationInstructions; +import org.eclipse.passage.lic.base.conditions.BaseIssuerSignature; +import org.eclipse.passage.lic.base.conditions.BaseValidityPeriodClosed; +import org.eclipse.passage.lic.base.conditions.BaseVersionMatch; +import org.eclipse.passage.lic.base.conditions.MatchingRuleForIdentifier; +import org.eclipse.passage.lic.base.conditions.evaluation.BasePermission; import org.eclipse.passage.lic.base.requirements.BaseFeature; import org.eclipse.passage.lic.base.requirements.BaseRequirement; import org.eclipse.passage.lic.internal.api.EvaluationType; 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.ConditionMiningTarget; -import org.eclipse.passage.lic.internal.api.conditions.ConditionOrigin; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.internal.api.diagnostic.TroubleCode; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel.Of; import org.eclipse.passage.lic.internal.base.BaseLicensedProduct; -import org.eclipse.passage.lic.internal.base.conditions.BaseCondition; -import org.eclipse.passage.lic.internal.base.conditions.BaseConditionOrigin; -import org.eclipse.passage.lic.internal.base.conditions.BaseEvaluationInstructions; -import org.eclipse.passage.lic.internal.base.conditions.BaseIssuerSignature; -import org.eclipse.passage.lic.internal.base.conditions.BaseValidityPeriodClosed; -import org.eclipse.passage.lic.internal.base.conditions.BaseVersionMatch; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleForIdentifier; -import org.eclipse.passage.lic.internal.base.conditions.evaluation.BasePermission; import org.eclipse.passage.lic.internal.base.restrictions.BaseRestriction; import com.fasterxml.jackson.databind.JsonNode; diff --git a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/JsonConditionTransport.java b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/JsonConditionTransport.java index 47c633b45..890f6cfff 100644 --- a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/JsonConditionTransport.java +++ b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/JsonConditionTransport.java @@ -15,8 +15,8 @@ import java.io.IOException; import java.io.InputStream; -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.api.conditions.mining.ConditionTransport; +import org.eclipse.passage.lic.api.conditions.mining.ContentType; public final class JsonConditionTransport implements ConditionTransport { diff --git a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/JsonObjectMapper.java b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/JsonObjectMapper.java index 9710b28a0..877ae2d23 100644 --- a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/JsonObjectMapper.java +++ b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/JsonObjectMapper.java @@ -16,8 +16,8 @@ import java.util.function.Function; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.Condition; import org.eclipse.passage.lic.api.requirements.Requirement; -import org.eclipse.passage.lic.internal.api.conditions.Condition; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.core.JsonParser; diff --git a/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/convert/EIssuerSignature.java b/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/convert/EIssuerSignature.java index 3c6877af9..75535984e 100644 --- a/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/convert/EIssuerSignature.java +++ b/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/convert/EIssuerSignature.java @@ -16,8 +16,8 @@ import java.util.Objects; import java.util.function.Supplier; -import org.eclipse.passage.lic.internal.api.conditions.IssuerSignature; -import org.eclipse.passage.lic.internal.api.conditions.LicenseSignatureIsEmpty; +import org.eclipse.passage.lic.api.conditions.IssuerSignature; +import org.eclipse.passage.lic.api.conditions.LicenseSignatureIsEmpty; import org.eclipse.passage.lic.licenses.model.api.Signature; import org.eclipse.passage.lic.licenses.model.api.SignatureAttribute; import org.eclipse.passage.lic.licenses.model.meta.LicensesFactory; diff --git a/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/convert/PIssuerSignature.java b/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/convert/PIssuerSignature.java index 174e9367e..203332759 100644 --- a/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/convert/PIssuerSignature.java +++ b/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/convert/PIssuerSignature.java @@ -17,8 +17,8 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import org.eclipse.passage.lic.internal.api.conditions.IssuerSignature; -import org.eclipse.passage.lic.internal.base.conditions.BaseIssuerSignature; +import org.eclipse.passage.lic.api.conditions.IssuerSignature; +import org.eclipse.passage.lic.base.conditions.BaseIssuerSignature; import org.eclipse.passage.lic.licenses.model.api.Signature; import org.eclipse.passage.lic.licenses.model.api.SignatureAttribute; diff --git a/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/convert/PVersionMatch.java b/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/convert/PVersionMatch.java index 163f4bf11..b767b93bd 100644 --- a/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/convert/PVersionMatch.java +++ b/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/convert/PVersionMatch.java @@ -14,11 +14,11 @@ import java.util.function.Supplier; -import org.eclipse.passage.lic.internal.api.conditions.MatchingRule; -import org.eclipse.passage.lic.internal.api.conditions.VersionMatch; -import org.eclipse.passage.lic.internal.base.conditions.BaseVersionMatch; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleDefault; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleForIdentifier; +import org.eclipse.passage.lic.api.conditions.MatchingRule; +import org.eclipse.passage.lic.api.conditions.VersionMatch; +import org.eclipse.passage.lic.base.conditions.BaseVersionMatch; +import org.eclipse.passage.lic.base.conditions.MatchingRuleDefault; +import org.eclipse.passage.lic.base.conditions.MatchingRuleForIdentifier; import org.eclipse.passage.lic.licenses.VersionMatchDescriptor; @SuppressWarnings("restriction") diff --git a/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/model/toberemoved/BaseXmiConditionTransport.java b/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/model/toberemoved/BaseXmiConditionTransport.java index e5da01290..a5f7fe3d4 100644 --- a/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/model/toberemoved/BaseXmiConditionTransport.java +++ b/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/model/toberemoved/BaseXmiConditionTransport.java @@ -26,14 +26,14 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.xmi.XMLResource; +import org.eclipse.passage.lic.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.IssuerSignature; +import org.eclipse.passage.lic.api.conditions.mining.ConditionTransport; +import org.eclipse.passage.lic.api.conditions.mining.ContentType; +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.EvaluationType; -import org.eclipse.passage.lic.internal.api.conditions.Condition; -import org.eclipse.passage.lic.internal.api.conditions.IssuerSignature; -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.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.PIssuerSignature; import org.eclipse.passage.lic.internal.licenses.convert.PVersionMatch; import org.eclipse.passage.lic.internal.licenses.model.migration.LicensesResourceHandler; diff --git a/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/api/handle/NetResponse.java b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/api/handle/NetResponse.java index b10dc2b0b..0a00a02ea 100644 --- a/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/api/handle/NetResponse.java +++ b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/api/handle/NetResponse.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.passage.lic.internal.net.api.handle; +import org.eclipse.passage.lic.api.conditions.mining.ContentType; import org.eclipse.passage.lic.internal.api.LicensingException; -import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType; /** * @since 1.0 diff --git a/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/handle/EObjectTransfer.java b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/handle/EObjectTransfer.java index 25a39c75d..904670dab 100644 --- a/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/handle/EObjectTransfer.java +++ b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/handle/EObjectTransfer.java @@ -14,10 +14,10 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; +import org.eclipse.passage.lic.api.conditions.mining.ContentType; import org.eclipse.passage.lic.api.io.Hashes; import org.eclipse.passage.lic.api.io.KeyKeeper; import org.eclipse.passage.lic.internal.api.LicensingException; -import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType; import org.eclipse.passage.lic.internal.emf.EObjectToBytes; import org.eclipse.passage.lic.internal.net.api.handle.NetResponse; import org.eclipse.passage.lic.internal.net.io.SafePayload; diff --git a/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/handle/Failure.java b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/handle/Failure.java index 03c7851ee..13978dfe5 100644 --- a/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/handle/Failure.java +++ b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/handle/Failure.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.passage.lic.internal.net.handle; +import org.eclipse.passage.lic.api.conditions.mining.ContentType; import org.eclipse.passage.lic.internal.api.LicensedProduct; -import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType; import org.eclipse.passage.lic.internal.net.api.handle.NetResponse; public abstract class Failure implements NetResponse { diff --git a/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/handle/PlainSuceess.java b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/handle/PlainSuceess.java index 9bd072bb9..d69b770e9 100644 --- a/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/handle/PlainSuceess.java +++ b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/handle/PlainSuceess.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.passage.lic.internal.net.handle; -import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType; +import org.eclipse.passage.lic.api.conditions.mining.ContentType; import org.eclipse.passage.lic.internal.net.api.handle.NetResponse; public final class PlainSuceess implements NetResponse { diff --git a/bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/oshi/HardwareAssessmentService.java b/bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/oshi/HardwareAssessmentService.java index 7d74ff1c6..18ea2b6d2 100644 --- a/bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/oshi/HardwareAssessmentService.java +++ b/bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/oshi/HardwareAssessmentService.java @@ -12,12 +12,12 @@ *******************************************************************************/ package org.eclipse.passage.lic.oshi; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluationException; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionTokenAssessmentService; import org.eclipse.passage.lic.api.inspection.RuntimeEnvironment; import org.eclipse.passage.lic.api.inspection.RuntimeEnvironmentRegistry; import org.eclipse.passage.lic.internal.api.EvaluationType; 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.ExpressionTokenAssessmentService; import org.eclipse.passage.lic.internal.base.inspection.BaseEnvironmentProperty; import org.eclipse.passage.lic.internal.oshi.i18n.AssessmentMessages; diff --git a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/FloatingLicensePackFromRequest.java b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/FloatingLicensePackFromRequest.java index c9a1ae84e..3a6eba530 100644 --- a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/FloatingLicensePackFromRequest.java +++ b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/FloatingLicensePackFromRequest.java @@ -21,8 +21,8 @@ import java.util.stream.Collectors; import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.passage.lic.base.conditions.MatchingRuleForIdentifier; import org.eclipse.passage.lic.internal.api.EvaluationType; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleForIdentifier; import org.eclipse.passage.lic.internal.base.inspection.hardware.Disk; import org.eclipse.passage.lic.internal.licenses.model.EmptyFeatureGrant; import org.eclipse.passage.lic.licenses.LicensePlanDescriptor; diff --git a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseSignature.java b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseSignature.java index 60cdcb692..5d9a2573a 100644 --- a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseSignature.java +++ b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseSignature.java @@ -17,11 +17,11 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.eclipse.passage.lic.api.conditions.ConditionOrigin; import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.Framework; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -import org.eclipse.passage.lic.internal.api.conditions.ConditionOrigin; import org.eclipse.passage.lic.internal.api.diagnostic.Diagnostic; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; diff --git a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/issue/ClosedValidityPeriodReduction.java b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/issue/ClosedValidityPeriodReduction.java index f63c64582..99a64a8c2 100644 --- a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/issue/ClosedValidityPeriodReduction.java +++ b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/issue/ClosedValidityPeriodReduction.java @@ -20,8 +20,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.eclipse.passage.lic.internal.api.conditions.ValidityPeriodClosed; -import org.eclipse.passage.lic.internal.base.conditions.BaseValidityPeriodClosed; +import org.eclipse.passage.lic.api.conditions.ValidityPeriodClosed; +import org.eclipse.passage.lic.base.conditions.BaseValidityPeriodClosed; import org.eclipse.passage.loc.internal.licenses.core.i18n.ReductionMessages; final class ClosedValidityPeriodReduction implements Reduction { diff --git a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/issue/FloatingLicenseIssuingProtection.java b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/issue/FloatingLicenseIssuingProtection.java index 435d398dd..7d876cf00 100644 --- a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/issue/FloatingLicenseIssuingProtection.java +++ b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/issue/FloatingLicenseIssuingProtection.java @@ -20,7 +20,7 @@ import java.util.Optional; import java.util.function.Consumer; -import org.eclipse.passage.lic.internal.base.conditions.BaseValidityPeriodClosed; +import org.eclipse.passage.lic.base.conditions.BaseValidityPeriodClosed; import org.eclipse.passage.lic.internal.equinox.EquinoxPassage; import org.eclipse.passage.lic.licenses.model.api.FeatureGrant; import org.eclipse.passage.lic.licenses.model.api.FloatingLicensePack; @@ -71,17 +71,17 @@ private void diminishGrant(FeatureGrant grant) { featureReductions.forEach(r -> r.accept(grant)); } - private Optional validGet( + private Optional validGet( FloatingLicensePack lic) { return validGet(lic.getLicense().getValid()); } - private Optional validGet( + private Optional validGet( FeatureGrant grant) { return validGet(grant.getValid()); } - private Optional validGet( + private Optional validGet( ValidityPeriod period) { if (!(period instanceof ValidityPeriodClosed)) { return Optional.empty(); // nothing we can reduce for now @@ -91,16 +91,16 @@ private Optional diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ConditionTransportServicesRegitryTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ConditionTransportServicesRegitryTest.java index b71351494..69eeeac70 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ConditionTransportServicesRegitryTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ConditionTransportServicesRegitryTest.java @@ -16,9 +16,9 @@ import java.util.Optional; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.mining.ConditionTransport; import org.eclipse.passage.lic.api.tests.fakes.io.FakeConditionTransport; import org.eclipse.passage.lic.internal.api.Framework; -import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransport; /** *

diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionEvaluationServicesRegitryTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionEvaluationServicesRegitryTest.java index de0e12464..7730b3816 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionEvaluationServicesRegitryTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionEvaluationServicesRegitryTest.java @@ -16,9 +16,9 @@ import java.util.Optional; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluationService; import org.eclipse.passage.lic.api.tests.fakes.conditions.evaluation.FakeExpressionEvaluationService; import org.eclipse.passage.lic.internal.api.Framework; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluationService; /** *

diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionParsingServicesRegitryTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionParsingServicesRegitryTest.java index cefd4ae4c..6d6da6da3 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionParsingServicesRegitryTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionParsingServicesRegitryTest.java @@ -16,9 +16,9 @@ import java.util.Optional; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionParsingService; import org.eclipse.passage.lic.api.tests.fakes.conditions.evaluation.FakeExpressionParsingService; import org.eclipse.passage.lic.internal.api.Framework; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionParsingService; /** *

diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionTokenAssessmentServicesRegitryTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionTokenAssessmentServicesRegitryTest.java index dc102267e..659e2bb14 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionTokenAssessmentServicesRegitryTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionTokenAssessmentServicesRegitryTest.java @@ -16,9 +16,9 @@ import java.util.Optional; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionTokenAssessmentService; import org.eclipse.passage.lic.api.tests.fakes.conditions.evaluation.FakeExpressionTokenAssessmentService; import org.eclipse.passage.lic.internal.api.Framework; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionTokenAssessmentService; /** *

diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/FrameworkContractTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/FrameworkContractTest.java index 6c1dc8d34..cb9c5a013 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/FrameworkContractTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/FrameworkContractTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -17,15 +17,15 @@ import java.util.Optional; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionProtocol; +import org.eclipse.passage.lic.api.conditions.mining.ContentType; +import org.eclipse.passage.lic.api.conditions.mining.MinedConditions; import org.eclipse.passage.lic.api.inspection.RuntimeEnvironmentRegistry; import org.eclipse.passage.lic.api.registry.Registry; import org.eclipse.passage.lic.api.registry.Service; import org.eclipse.passage.lic.api.registry.ServiceId; import org.eclipse.passage.lic.internal.api.AccessCycleConfiguration; import org.eclipse.passage.lic.internal.api.Framework; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionProtocol; -import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType; -import org.eclipse.passage.lic.internal.api.conditions.mining.MinedConditions; import org.junit.Test; /** diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/PermissionEmittingServicesRegitryTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/PermissionEmittingServicesRegitryTest.java index e03aaed38..bd479cc5e 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/PermissionEmittingServicesRegitryTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/PermissionEmittingServicesRegitryTest.java @@ -16,9 +16,9 @@ import java.util.Optional; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.evaluation.PermissionEmittingService; import org.eclipse.passage.lic.api.tests.fakes.conditions.evaluation.FakePermissionEmittingService; import org.eclipse.passage.lic.internal.api.Framework; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.PermissionEmittingService; /** *

diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ReadOnlyCollectionTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ReadOnlyCollectionTest.java index 517f2b8e1..75c8821e8 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ReadOnlyCollectionTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ReadOnlyCollectionTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/RequirementResolutionServicesRegitryTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/RequirementResolutionServicesRegitryTest.java index 4a22de51c..f8f031644 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/RequirementResolutionServicesRegitryTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/RequirementResolutionServicesRegitryTest.java @@ -16,9 +16,9 @@ import java.util.Optional; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.evaluation.PermissionEmittingService; import org.eclipse.passage.lic.api.tests.fakes.conditions.evaluation.FakePermissionEmittingService; import org.eclipse.passage.lic.internal.api.Framework; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.PermissionEmittingService; /** *

diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ResolvedRequirementsContractTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ResolvedRequirementsContractTest.java index b38305d27..b016568de 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ResolvedRequirementsContractTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ResolvedRequirementsContractTest.java @@ -22,7 +22,6 @@ /** * Each requirement resolution service must follow the contract. */ -@SuppressWarnings("restriction") public abstract class ResolvedRequirementsContractTest extends ReadOnlyCollectionTest { @Override diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/MatchingRuleContractTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/MatchingRuleContractTest.java index e7c87d791..c23f9591e 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/MatchingRuleContractTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/MatchingRuleContractTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -15,10 +15,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.eclipse.passage.lic.internal.api.conditions.MatchingRule; +import org.eclipse.passage.lic.api.conditions.MatchingRule; import org.junit.Test; -@SuppressWarnings("restriction") public abstract class MatchingRuleContractTest { @Test diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/ValidityPeriodClosedContractTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/ValidityPeriodClosedContractTest.java index 70737f3e2..0de26c5c9 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/ValidityPeriodClosedContractTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/ValidityPeriodClosedContractTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -16,7 +16,7 @@ import java.time.ZonedDateTime; -import org.eclipse.passage.lic.internal.api.conditions.ValidityPeriodClosed; +import org.eclipse.passage.lic.api.conditions.ValidityPeriodClosed; import org.junit.Test; /** @@ -29,7 +29,6 @@ * Successfully created period is always valid. *

*/ -@SuppressWarnings("restriction") public abstract class ValidityPeriodClosedContractTest extends ValidityPeriodOpenContractTest { /** diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/ValidityPeriodContractTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/ValidityPeriodContractTest.java index d5de473e1..028704f54 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/ValidityPeriodContractTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/ValidityPeriodContractTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -17,10 +17,9 @@ import java.time.ZonedDateTime; -import org.eclipse.passage.lic.internal.api.conditions.ValidityPeriod; +import org.eclipse.passage.lic.api.conditions.ValidityPeriod; import org.junit.Test; -@SuppressWarnings("restriction") public abstract class ValidityPeriodContractTest { @Test diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/ValidityPeriodOpenContractTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/ValidityPeriodOpenContractTest.java index 8858d5b7d..e45a51c20 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/ValidityPeriodOpenContractTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/ValidityPeriodOpenContractTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -17,7 +17,7 @@ import java.time.ZonedDateTime; import java.util.function.Function; -import org.eclipse.passage.lic.internal.api.conditions.ValidityPeriodOpen; +import org.eclipse.passage.lic.api.conditions.ValidityPeriodOpen; import org.junit.Test; /** @@ -30,7 +30,6 @@ * Successfully created period is always consistent. *

*/ -@SuppressWarnings("restriction") public abstract class ValidityPeriodOpenContractTest extends ValidityPeriodContractTest { diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/evaluation/EmissionTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/evaluation/EmissionTest.java index e35901044..db732b2a0 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/evaluation/EmissionTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/evaluation/EmissionTest.java @@ -17,10 +17,10 @@ import java.util.Collection; +import org.eclipse.passage.lic.api.conditions.evaluation.Emission; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.api.tests.fakes.conditions.FakeConditionPack; import org.eclipse.passage.lic.api.tests.fakes.conditions.evaluation.FakePermission; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Emission; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; import org.junit.Test; public final class EmissionTest { diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/evaluation/ExpressionEvaluationServiceContractTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/evaluation/ExpressionEvaluationServiceContractTest.java index 0a0f775af..a1c755d40 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/evaluation/ExpressionEvaluationServiceContractTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/evaluation/ExpressionEvaluationServiceContractTest.java @@ -14,12 +14,12 @@ import static org.junit.Assert.fail; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluationException; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluationService; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionTokenAssessmentService; +import org.eclipse.passage.lic.api.conditions.evaluation.ParsedExpression; import org.eclipse.passage.lic.api.tests.fakes.conditions.evaluation.FakeExpressionTokenAssessmentService; import org.eclipse.passage.lic.api.tests.fakes.conditions.evaluation.FakeParsedExpression; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluationException; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluationService; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionTokenAssessmentService; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ParsedExpression; import org.junit.Test; public abstract class ExpressionEvaluationServiceContractTest { diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/evaluation/ExpressionFormatContractTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/evaluation/ExpressionFormatContractTest.java index d8b77967b..aa605344f 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/evaluation/ExpressionFormatContractTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/evaluation/ExpressionFormatContractTest.java @@ -12,9 +12,9 @@ *******************************************************************************/ package org.eclipse.passage.lic.api.tests.conditions.evaluation; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionProtocol; import org.eclipse.passage.lic.api.registry.ServiceId; import org.eclipse.passage.lic.api.tests.registry.ServiceIdContractTest; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionProtocol; public class ExpressionFormatContractTest extends ServiceIdContractTest { diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/evaluation/ExpressionParsingServiceContractTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/evaluation/ExpressionParsingServiceContractTest.java index 76bb59686..052d2742f 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/evaluation/ExpressionParsingServiceContractTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/evaluation/ExpressionParsingServiceContractTest.java @@ -16,9 +16,9 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionParsingException; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionParsingService; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ParsedExpression; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionParsingException; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionParsingService; +import org.eclipse.passage.lic.api.conditions.evaluation.ParsedExpression; import org.junit.Test; public abstract class ExpressionParsingServiceContractTest { diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/mining/ConditionTransportContractTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/mining/ConditionTransportContractTest.java index 4b82d2574..f4a76b09b 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/mining/ConditionTransportContractTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/mining/ConditionTransportContractTest.java @@ -23,12 +23,11 @@ import java.util.Set; import java.util.stream.Collectors; -import org.eclipse.passage.lic.internal.api.conditions.Condition; -import org.eclipse.passage.lic.internal.api.conditions.ValidityPeriodClosed; -import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransport; +import org.eclipse.passage.lic.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.ValidityPeriodClosed; +import org.eclipse.passage.lic.api.conditions.mining.ConditionTransport; import org.junit.Test; -@SuppressWarnings("restriction") public abstract class ConditionTransportContractTest { @Test diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/mining/ContentTypeTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/mining/ContentTypeTest.java index 70c8662b5..c680f8058 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/mining/ContentTypeTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/conditions/mining/ContentTypeTest.java @@ -12,9 +12,9 @@ *******************************************************************************/ package org.eclipse.passage.lic.api.tests.conditions.mining; +import org.eclipse.passage.lic.api.conditions.mining.ContentType; import org.eclipse.passage.lic.api.registry.ServiceId; import org.eclipse.passage.lic.api.tests.registry.ServiceIdContractTest; -import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType; import org.junit.Test; public final class ContentTypeTest extends ServiceIdContractTest { diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/FakeCondition.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/FakeCondition.java index f13ca5490..09147285a 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/FakeCondition.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/FakeCondition.java @@ -14,12 +14,11 @@ import java.util.Optional; +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.internal.api.EvaluationInstructions; -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; -@SuppressWarnings("restriction") public final class FakeCondition implements Condition { private Optional identifier = Optional.empty(); diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/FakeConditionPack.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/FakeConditionPack.java index 88d65f32f..b338bd7df 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/FakeConditionPack.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/FakeConditionPack.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -14,11 +14,10 @@ import java.util.Collection; -import org.eclipse.passage.lic.internal.api.conditions.Condition; -import org.eclipse.passage.lic.internal.api.conditions.ConditionOrigin; -import org.eclipse.passage.lic.internal.api.conditions.ConditionPack; +import org.eclipse.passage.lic.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.ConditionOrigin; +import org.eclipse.passage.lic.api.conditions.ConditionPack; -@SuppressWarnings("restriction") public final class FakeConditionPack implements ConditionPack { @Override diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakeExpressionEvaluationService.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakeExpressionEvaluationService.java index 6831ad7cd..615082bb3 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakeExpressionEvaluationService.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakeExpressionEvaluationService.java @@ -12,11 +12,11 @@ *******************************************************************************/ package org.eclipse.passage.lic.api.tests.fakes.conditions.evaluation; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluationException; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluationService; -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.ParsedExpression; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluationException; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluationService; +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.ParsedExpression; public class FakeExpressionEvaluationService implements ExpressionEvaluationService { diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakeExpressionParsingService.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakeExpressionParsingService.java index 431c11694..6c2674ea8 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakeExpressionParsingService.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakeExpressionParsingService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020, 20201 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.passage.lic.api.tests.fakes.conditions.evaluation; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionParsingException; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionParsingService; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionProtocol; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ParsedExpression; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionParsingException; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionParsingService; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionProtocol; +import org.eclipse.passage.lic.api.conditions.evaluation.ParsedExpression; public final class FakeExpressionParsingService implements ExpressionParsingService { diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakeExpressionTokenAssessmentService.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakeExpressionTokenAssessmentService.java index d807b9a89..3cdeab1b9 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakeExpressionTokenAssessmentService.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakeExpressionTokenAssessmentService.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.passage.lic.api.tests.fakes.conditions.evaluation; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionTokenAssessmentService; import org.eclipse.passage.lic.internal.api.EvaluationType; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionTokenAssessmentService; public final class FakeExpressionTokenAssessmentService implements ExpressionTokenAssessmentService { diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakeParsedExpression.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakeParsedExpression.java index b7e7d668b..410ea6f06 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakeParsedExpression.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakeParsedExpression.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.passage.lic.api.tests.fakes.conditions.evaluation; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionProtocol; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ParsedExpression; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionProtocol; +import org.eclipse.passage.lic.api.conditions.evaluation.ParsedExpression; public final class FakeParsedExpression implements ParsedExpression { diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakePermission.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakePermission.java index c5d776a5d..c8e052b73 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakePermission.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakePermission.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -14,12 +14,11 @@ import java.time.ZonedDateTime; +import org.eclipse.passage.lic.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.ConditionOrigin; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; 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.ConditionOrigin; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; -@SuppressWarnings("restriction") public final class FakePermission implements Permission { @Override diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakePermissionEmittingService.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakePermissionEmittingService.java index 4c5da8497..1093d8f35 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakePermissionEmittingService.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/evaluation/FakePermissionEmittingService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -14,14 +14,13 @@ import java.util.Collection; +import org.eclipse.passage.lic.api.conditions.ConditionPack; +import org.eclipse.passage.lic.api.conditions.evaluation.Emission; +import org.eclipse.passage.lic.api.conditions.evaluation.PermissionEmittingService; import org.eclipse.passage.lic.api.registry.StringServiceId; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -import org.eclipse.passage.lic.internal.api.conditions.ConditionPack; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Emission; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.PermissionEmittingService; -@SuppressWarnings("restriction") public final class FakePermissionEmittingService implements PermissionEmittingService { @Override diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/mining/FakeMinedConditions.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/mining/FakeMinedConditions.java index ea12ca32c..395348241 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/mining/FakeMinedConditions.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/conditions/mining/FakeMinedConditions.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -14,13 +14,12 @@ import java.util.Collection; +import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; +import org.eclipse.passage.lic.api.conditions.ConditionPack; +import org.eclipse.passage.lic.api.conditions.mining.MinedConditions; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -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.MinedConditions; -@SuppressWarnings("restriction") public final class FakeMinedConditions implements MinedConditions { @Override diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/io/FakeConditionTransport.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/io/FakeConditionTransport.java index 70fa4e174..4fab0668c 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/io/FakeConditionTransport.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/io/FakeConditionTransport.java @@ -15,8 +15,8 @@ import java.io.IOException; import java.io.InputStream; -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.api.conditions.mining.ConditionTransport; +import org.eclipse.passage.lic.api.conditions.mining.ContentType; public final class FakeConditionTransport implements ConditionTransport { diff --git a/tests/org.eclipse.passage.lic.base.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.passage.lic.base.tests/OSGI-INF/l10n/bundle.properties index 69ce3b942..4183fe602 100644 --- a/tests/org.eclipse.passage.lic.base.tests/OSGI-INF/l10n/bundle.properties +++ b/tests/org.eclipse.passage.lic.base.tests/OSGI-INF/l10n/bundle.properties @@ -14,7 +14,7 @@ Bundle-Name = Passage LIC Base Tests Bundle-Vendor = Eclipse Passage -Bundle-Copyright = Copyright (c) 2018, 2020 ArSysOp and others.\n\ +Bundle-Copyright = Copyright (c) 2018, 2021 ArSysOp and others.\n\ \n\ This program and the accompanying materials are made\n\ available under the terms of the Eclipse Public License 2.0\n\ diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/BaseConditionTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/BaseConditionTest.java index 0a0da9880..4e5e39014 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/BaseConditionTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/BaseConditionTest.java @@ -17,16 +17,16 @@ import java.time.ZonedDateTime; +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.base.conditions.BaseVersionMatch; +import org.eclipse.passage.lic.base.conditions.MatchingRulePerfect; import org.eclipse.passage.lic.internal.api.EvaluationInstructions; import org.eclipse.passage.lic.internal.api.EvaluationType; -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.base.conditions.BaseVersionMatch; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRulePerfect; import org.junit.Test; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/BaseEvaluationInstructionsTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/BaseEvaluationInstructionsTest.java index 236ca2aed..384cc2f0a 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/BaseEvaluationInstructionsTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/BaseEvaluationInstructionsTest.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.passage.lic.internal.base.tests.conditions; +import org.eclipse.passage.lic.base.conditions.BaseEvaluationInstructions; import org.eclipse.passage.lic.internal.api.EvaluationType; -import org.eclipse.passage.lic.internal.base.conditions.BaseEvaluationInstructions; import org.junit.Test; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/BaseValidityPeriodClosedTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/BaseValidityPeriodClosedTest.java index 6eb741744..5b506a36d 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/BaseValidityPeriodClosedTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/BaseValidityPeriodClosedTest.java @@ -14,7 +14,7 @@ import java.time.ZonedDateTime; -import org.eclipse.passage.lic.internal.base.conditions.BaseValidityPeriodClosed; +import org.eclipse.passage.lic.base.conditions.BaseValidityPeriodClosed; import org.junit.Test; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRuleCompatibleTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRuleCompatibleTest.java index 266a4e778..9231dc146 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRuleCompatibleTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRuleCompatibleTest.java @@ -16,8 +16,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.eclipse.passage.lic.internal.api.conditions.MatchingRule; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleCompatible; +import org.eclipse.passage.lic.api.conditions.MatchingRule; +import org.eclipse.passage.lic.base.conditions.MatchingRuleCompatible; import org.junit.Test; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRuleEquivalentTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRuleEquivalentTest.java index db5eea174..317710318 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRuleEquivalentTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRuleEquivalentTest.java @@ -16,8 +16,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.eclipse.passage.lic.internal.api.conditions.MatchingRule; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleEquivalent; +import org.eclipse.passage.lic.api.conditions.MatchingRule; +import org.eclipse.passage.lic.base.conditions.MatchingRuleEquivalent; import org.junit.Test; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRuleForIdentifierTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRuleForIdentifierTest.java index fd4badca7..ed20c988e 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRuleForIdentifierTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRuleForIdentifierTest.java @@ -14,13 +14,13 @@ import static org.junit.Assert.assertEquals; -import org.eclipse.passage.lic.internal.api.conditions.MatchingRule; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleCompatible; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleDefault; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleEquivalent; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleForIdentifier; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleGreaterOrEqual; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRulePerfect; +import org.eclipse.passage.lic.api.conditions.MatchingRule; +import org.eclipse.passage.lic.base.conditions.MatchingRuleCompatible; +import org.eclipse.passage.lic.base.conditions.MatchingRuleDefault; +import org.eclipse.passage.lic.base.conditions.MatchingRuleEquivalent; +import org.eclipse.passage.lic.base.conditions.MatchingRuleForIdentifier; +import org.eclipse.passage.lic.base.conditions.MatchingRuleGreaterOrEqual; +import org.eclipse.passage.lic.base.conditions.MatchingRulePerfect; import org.junit.Test; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRuleGreaterOrEqualTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRuleGreaterOrEqualTest.java index c7351a78f..cefbb6e0d 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRuleGreaterOrEqualTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRuleGreaterOrEqualTest.java @@ -16,8 +16,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.eclipse.passage.lic.internal.api.conditions.MatchingRule; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleGreaterOrEqual; +import org.eclipse.passage.lic.api.conditions.MatchingRule; +import org.eclipse.passage.lic.base.conditions.MatchingRuleGreaterOrEqual; import org.junit.Test; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRulePerfectTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRulePerfectTest.java index 52e112b0c..31dc09f64 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRulePerfectTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/MatchingRulePerfectTest.java @@ -15,8 +15,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import org.eclipse.passage.lic.internal.api.conditions.MatchingRule; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRulePerfect; +import org.eclipse.passage.lic.api.conditions.MatchingRule; +import org.eclipse.passage.lic.base.conditions.MatchingRulePerfect; import org.junit.Test; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/BaseValidityPeriodContractTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/BaseValidityPeriodContractTest.java index 6c4329837..e7912a93b 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/BaseValidityPeriodContractTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/BaseValidityPeriodContractTest.java @@ -14,9 +14,9 @@ import java.time.ZonedDateTime; +import org.eclipse.passage.lic.api.conditions.ValidityPeriodClosed; import org.eclipse.passage.lic.api.tests.conditions.ValidityPeriodClosedContractTest; -import org.eclipse.passage.lic.internal.api.conditions.ValidityPeriodClosed; -import org.eclipse.passage.lic.internal.base.conditions.BaseValidityPeriodClosed; +import org.eclipse.passage.lic.base.conditions.BaseValidityPeriodClosed; @SuppressWarnings("restriction") public final class BaseValidityPeriodContractTest extends ValidityPeriodClosedContractTest { diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRuleCompatibleContractTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRuleCompatibleContractTest.java index 0291b41f0..e9f1ec58b 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRuleCompatibleContractTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRuleCompatibleContractTest.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.passage.lic.internal.base.tests.conditions.contract; -import org.eclipse.passage.lic.internal.api.conditions.MatchingRule; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleCompatible; +import org.eclipse.passage.lic.api.conditions.MatchingRule; +import org.eclipse.passage.lic.base.conditions.MatchingRuleCompatible; @SuppressWarnings("restriction") public final class MatchingRuleCompatibleContractTest extends ComparingMatchingRuleContractTest { diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRuleDefaultContractTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRuleDefaultContractTest.java index 9bb896100..adaa99619 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRuleDefaultContractTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRuleDefaultContractTest.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.passage.lic.internal.base.tests.conditions.contract; -import org.eclipse.passage.lic.internal.api.conditions.MatchingRule; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleDefault; +import org.eclipse.passage.lic.api.conditions.MatchingRule; +import org.eclipse.passage.lic.base.conditions.MatchingRuleDefault; @SuppressWarnings("restriction") public final class MatchingRuleDefaultContractTest extends BaseMatchingRuleContractTest { diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRuleEquivalentContractTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRuleEquivalentContractTest.java index 4b9ae727c..966d01993 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRuleEquivalentContractTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRuleEquivalentContractTest.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.passage.lic.internal.base.tests.conditions.contract; -import org.eclipse.passage.lic.internal.api.conditions.MatchingRule; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleEquivalent; +import org.eclipse.passage.lic.api.conditions.MatchingRule; +import org.eclipse.passage.lic.base.conditions.MatchingRuleEquivalent; @SuppressWarnings("restriction") public final class MatchingRuleEquivalentContractTest extends ComparingMatchingRuleContractTest { diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRuleGreaterOrEqualContractTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRuleGreaterOrEqualContractTest.java index f0f11094d..120b2484e 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRuleGreaterOrEqualContractTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRuleGreaterOrEqualContractTest.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.passage.lic.internal.base.tests.conditions.contract; -import org.eclipse.passage.lic.internal.api.conditions.MatchingRule; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleGreaterOrEqual; +import org.eclipse.passage.lic.api.conditions.MatchingRule; +import org.eclipse.passage.lic.base.conditions.MatchingRuleGreaterOrEqual; @SuppressWarnings("restriction") public final class MatchingRuleGreaterOrEqualContractTest extends ComparingMatchingRuleContractTest { diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRulePerfectContractTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRulePerfectContractTest.java index fbf7c2794..ba6f678ac 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRulePerfectContractTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/contract/MatchingRulePerfectContractTest.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.passage.lic.internal.base.tests.conditions.contract; -import org.eclipse.passage.lic.internal.api.conditions.MatchingRule; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRulePerfect; +import org.eclipse.passage.lic.api.conditions.MatchingRule; +import org.eclipse.passage.lic.base.conditions.MatchingRulePerfect; @SuppressWarnings("restriction") public final class MatchingRulePerfectContractTest extends BaseMatchingRuleContractTest { diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/BasePermissionEmittingServiceTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/BasePermissionEmittingServiceTest.java index 79fa2190d..78f109416 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/BasePermissionEmittingServiceTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/BasePermissionEmittingServiceTest.java @@ -21,29 +21,29 @@ import java.util.Collection; import java.util.Collections; +import org.eclipse.passage.lic.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.ConditionPack; +import org.eclipse.passage.lic.api.conditions.ValidityPeriod; +import org.eclipse.passage.lic.api.conditions.evaluation.Emission; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluatorsRegistry; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionPasringRegistry; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionTokenAssessorsRegistry; +import org.eclipse.passage.lic.api.conditions.evaluation.PermissionEmittingService; import org.eclipse.passage.lic.api.tests.fakes.conditions.FakeCondition; import org.eclipse.passage.lic.api.tests.fakes.conditions.evaluation.FakeExpressionTokenAssessmentService; +import org.eclipse.passage.lic.base.conditions.BaseConditionPack; +import org.eclipse.passage.lic.base.conditions.BaseEvaluationInstructions; +import org.eclipse.passage.lic.base.conditions.BaseValidityPeriodClosed; +import org.eclipse.passage.lic.base.conditions.UnknownConditionOrigin; +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.registry.ReadOnlyRegistry; import org.eclipse.passage.lic.internal.api.EvaluationType; import org.eclipse.passage.lic.internal.api.LicensedProduct; 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.ConditionPack; -import org.eclipse.passage.lic.internal.api.conditions.ValidityPeriod; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Emission; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluatorsRegistry; -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.api.conditions.evaluation.PermissionEmittingService; import org.eclipse.passage.lic.internal.api.diagnostic.TroubleCode; import org.eclipse.passage.lic.internal.base.BaseLicensedProduct; -import org.eclipse.passage.lic.internal.base.conditions.BaseConditionPack; -import org.eclipse.passage.lic.internal.base.conditions.BaseEvaluationInstructions; -import org.eclipse.passage.lic.internal.base.conditions.BaseValidityPeriodClosed; -import org.eclipse.passage.lic.internal.base.conditions.UnknownConditionOrigin; -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.diagnostic.code.LicenseDoesNotMatch; import org.eclipse.passage.lic.internal.base.diagnostic.code.LicenseInvalid; import org.junit.Test; diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/BasePermissionTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/BasePermissionTest.java index a2d0aa154..4637fe0d1 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/BasePermissionTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/BasePermissionTest.java @@ -14,12 +14,12 @@ import java.time.ZonedDateTime; +import org.eclipse.passage.lic.api.conditions.Condition; import org.eclipse.passage.lic.api.tests.fakes.conditions.FakeCondition; +import org.eclipse.passage.lic.base.conditions.UnknownConditionOrigin; +import org.eclipse.passage.lic.base.conditions.evaluation.BasePermission; import org.eclipse.passage.lic.internal.api.LicensedProduct; -import org.eclipse.passage.lic.internal.api.conditions.Condition; import org.eclipse.passage.lic.internal.base.BaseLicensedProduct; -import org.eclipse.passage.lic.internal.base.conditions.UnknownConditionOrigin; -import org.eclipse.passage.lic.internal.base.conditions.evaluation.BasePermission; import org.junit.Test; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/BerlinProtocolExpressionParseServiceTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/BerlinProtocolExpressionParseServiceTest.java index 47673d11a..bec6fe237 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/BerlinProtocolExpressionParseServiceTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/BerlinProtocolExpressionParseServiceTest.java @@ -15,12 +15,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionParsingException; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionParsingService; +import org.eclipse.passage.lic.api.conditions.evaluation.ParsedExpression; import org.eclipse.passage.lic.api.tests.conditions.evaluation.ExpressionParsingServiceContractTest; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionParsingException; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionParsingService; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ParsedExpression; -import org.eclipse.passage.lic.internal.base.conditions.evaluation.BerlinProtocolExpressionParseService; -import org.eclipse.passage.lic.internal.base.conditions.evaluation.SimpleMapExpression; +import org.eclipse.passage.lic.base.conditions.evaluation.BerlinProtocolExpressionParseService; +import org.eclipse.passage.lic.base.conditions.evaluation.SimpleMapExpression; import org.junit.Test; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/BiasedAssessor.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/BiasedAssessor.java index 7a8fd4d40..b100257e6 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/BiasedAssessor.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/BiasedAssessor.java @@ -17,9 +17,9 @@ import java.util.Map; import java.util.Set; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluationException; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionTokenAssessmentService; import org.eclipse.passage.lic.internal.api.EvaluationType; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluationException; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionTokenAssessmentService; @SuppressWarnings("restriction") final class BiasedAssessor implements ExpressionTokenAssessmentService { diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/SimpleMapExpressionEvaluationServiceTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/SimpleMapExpressionEvaluationServiceTest.java index 127fa96f0..3cfea0337 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/SimpleMapExpressionEvaluationServiceTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/SimpleMapExpressionEvaluationServiceTest.java @@ -19,14 +19,14 @@ import java.util.Arrays; import java.util.stream.Collectors; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluationException; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluationService; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionProtocol; import org.eclipse.passage.lic.api.tests.conditions.evaluation.ExpressionEvaluationServiceContractTest; import org.eclipse.passage.lic.api.tests.fakes.conditions.evaluation.FakeExpressionTokenAssessmentService; import org.eclipse.passage.lic.api.tests.fakes.conditions.evaluation.FakeParsedExpression; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluationException; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluationService; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionProtocol; -import org.eclipse.passage.lic.internal.base.conditions.evaluation.SimpleMapExpression; -import org.eclipse.passage.lic.internal.base.conditions.evaluation.SimpleMapExpressionEvaluationService; +import org.eclipse.passage.lic.base.conditions.evaluation.SimpleMapExpression; +import org.eclipse.passage.lic.base.conditions.evaluation.SimpleMapExpressionEvaluationService; import org.junit.Test; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/SumOfEmissionsTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/SumOfEmissionsTest.java index 0cf5edeff..2f17275e5 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/SumOfEmissionsTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/evaluation/SumOfEmissionsTest.java @@ -16,11 +16,11 @@ import java.util.Collections; +import org.eclipse.passage.lic.api.conditions.ConditionPack; +import org.eclipse.passage.lic.api.conditions.evaluation.Emission; import org.eclipse.passage.lic.api.tests.fakes.conditions.FakeConditionPack; import org.eclipse.passage.lic.api.tests.fakes.conditions.evaluation.FakePermission; -import org.eclipse.passage.lic.internal.api.conditions.ConditionPack; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Emission; -import org.eclipse.passage.lic.internal.base.conditions.evaluation.SumOfEmissions; +import org.eclipse.passage.lic.base.conditions.evaluation.SumOfEmissions; import org.junit.Test; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/mining/HeadOnlyTransport.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/mining/HeadOnlyTransport.java index 8d089957f..a4af338d6 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/mining/HeadOnlyTransport.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/mining/HeadOnlyTransport.java @@ -20,18 +20,18 @@ import java.util.ArrayList; import java.util.Collection; +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.api.conditions.mining.ConditionTransport; +import org.eclipse.passage.lic.api.conditions.mining.ContentType; +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.base.conditions.BaseVersionMatch; +import org.eclipse.passage.lic.base.conditions.MatchingRuleDefault; import org.eclipse.passage.lic.internal.api.EvaluationInstructions; import org.eclipse.passage.lic.internal.api.EvaluationType; -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.api.conditions.mining.ConditionTransport; -import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType; -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.base.conditions.BaseVersionMatch; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleDefault; import org.eclipse.passage.lic.internal.base.tests.conditions.mining.LocalConditionsTest.Spy; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/mining/LocalConditionsTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/mining/LocalConditionsTest.java index eee606841..23b9e3260 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/mining/LocalConditionsTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/conditions/mining/LocalConditionsTest.java @@ -26,15 +26,15 @@ import java.util.List; import java.util.stream.Collectors; +import org.eclipse.passage.lic.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.ConditionPack; +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.PassageFileExtension; import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry; import org.eclipse.passage.lic.internal.api.LicensedProduct; 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.ConditionPack; import org.eclipse.passage.lic.internal.base.BaseLicensedProduct; -import org.eclipse.passage.lic.internal.base.conditions.mining.PathResidentConditions; -import org.eclipse.passage.lic.internal.base.conditions.mining.PersonalLicenseMiningEquipment; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/requirements/SabotagedFramework.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/requirements/SabotagedFramework.java index e090ac17e..70acd6cd6 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/requirements/SabotagedFramework.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/requirements/SabotagedFramework.java @@ -14,6 +14,13 @@ import java.util.ArrayList; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluatorsRegistry; +import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionPasringRegistry; +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.mining.ConditionTransportRegistry; +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.RuntimeEnvironmentRegistry; import org.eclipse.passage.lic.api.io.HashesRegistry; import org.eclipse.passage.lic.api.io.KeyKeeperRegistry; @@ -27,13 +34,6 @@ import org.eclipse.passage.lic.internal.api.Framework; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.acquire.LicenseAcquisitionServicesRegistry; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluatorsRegistry; -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.api.conditions.evaluation.PermissionEmittersRegistry; -import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransportRegistry; -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.PermissionsExaminationServicesRegistry; import org.eclipse.passage.lic.internal.base.BaseLicensedProduct; diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/BasePermissionsExaminationServiceTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/BasePermissionsExaminationServiceTest.java index c38685131..8333d3405 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/BasePermissionsExaminationServiceTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/BasePermissionsExaminationServiceTest.java @@ -21,11 +21,11 @@ import java.util.Collections; import java.util.Optional; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.api.tests.fakes.conditions.FakeLicensedProduct; import org.eclipse.passage.lic.api.tests.resrictions.PermissionsExaminationServiceContractTest; import org.eclipse.passage.lic.internal.api.LicensedProduct; -import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.api.restrictions.PermissionsExaminationService; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/ExaminationExplainedTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/ExaminationExplainedTest.java index a30a1ce27..8d08d5c40 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/ExaminationExplainedTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/ExaminationExplainedTest.java @@ -18,6 +18,13 @@ import java.time.ZonedDateTime; import java.util.Collections; +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.base.conditions.BaseVersionMatch; +import org.eclipse.passage.lic.base.conditions.MatchingRuleCompatible; +import org.eclipse.passage.lic.base.conditions.UnknownConditionOrigin; +import org.eclipse.passage.lic.base.conditions.evaluation.BasePermission; import org.eclipse.passage.lic.base.requirements.BaseFeature; import org.eclipse.passage.lic.base.requirements.BaseRequirement; import org.eclipse.passage.lic.internal.api.EvaluationType; @@ -26,13 +33,6 @@ import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel; import org.eclipse.passage.lic.internal.base.BaseLicensedProduct; -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.base.conditions.BaseVersionMatch; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleCompatible; -import org.eclipse.passage.lic.internal.base.conditions.UnknownConditionOrigin; -import org.eclipse.passage.lic.internal.base.conditions.evaluation.BasePermission; import org.eclipse.passage.lic.internal.base.restrictions.BaseExaminationCertificate; import org.eclipse.passage.lic.internal.base.restrictions.BaseRestriction; import org.eclipse.passage.lic.internal.base.restrictions.ExaminationExplained; diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/TestState.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/TestState.java index adeac0b79..3e3c49265 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/TestState.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/TestState.java @@ -14,24 +14,24 @@ import java.time.ZonedDateTime; +import org.eclipse.passage.lic.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.api.requirements.Feature; import org.eclipse.passage.lic.api.requirements.Requirement; +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.base.conditions.BaseVersionMatch; +import org.eclipse.passage.lic.base.conditions.MatchingRuleCompatible; +import org.eclipse.passage.lic.base.conditions.MatchingRuleEquivalent; +import org.eclipse.passage.lic.base.conditions.UnknownConditionOrigin; +import org.eclipse.passage.lic.base.conditions.evaluation.BasePermission; import org.eclipse.passage.lic.base.requirements.BaseFeature; import org.eclipse.passage.lic.base.requirements.BaseRequirement; import org.eclipse.passage.lic.internal.api.EvaluationType; 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.evaluation.Permission; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel; import org.eclipse.passage.lic.internal.base.BaseLicensedProduct; -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.base.conditions.BaseVersionMatch; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleCompatible; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleEquivalent; -import org.eclipse.passage.lic.internal.base.conditions.UnknownConditionOrigin; -import org.eclipse.passage.lic.internal.base.conditions.evaluation.BasePermission; @SuppressWarnings("restriction") final class TestState { diff --git a/tests/org.eclipse.passage.lic.equinox.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.passage.lic.equinox.tests/OSGI-INF/l10n/bundle.properties index 6f6ab5a23..4c386f02f 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/OSGI-INF/l10n/bundle.properties +++ b/tests/org.eclipse.passage.lic.equinox.tests/OSGI-INF/l10n/bundle.properties @@ -14,7 +14,7 @@ Bundle-Name = Passage LIC Equinox Tests Bundle-Vendor = Eclipse Passage -Bundle-Copyright = Copyright (c) 2018, 2020 ArSysOp and others.\n\ +Bundle-Copyright = Copyright (c) 2018, 2021 ArSysOp and others.\n\ \n\ This program and the accompanying materials are made\n\ available under the terms of the Eclipse Public License 2.0\n\ diff --git a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/RemoteConditionsRequestTest.java b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/RemoteConditionsRequestTest.java index 02c9d064c..ec20b64c1 100644 --- a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/RemoteConditionsRequestTest.java +++ b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/RemoteConditionsRequestTest.java @@ -25,13 +25,13 @@ import org.eclipse.passage.lic.api.registry.StringServiceId; import org.eclipse.passage.lic.base.io.MD5Hashes; import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry; +import org.eclipse.passage.lic.hc.remote.impl.mine.RemoteConditionsRequest; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.LicensingException; import org.eclipse.passage.lic.internal.api.PassageAction; import org.eclipse.passage.lic.internal.base.BaseLicensedProduct; import org.eclipse.passage.lic.internal.base.ProductIdentifier; import org.eclipse.passage.lic.internal.base.ProductVersion; -import org.eclipse.passage.lic.internal.hc.remote.impl.mine.RemoteConditionsRequest; import org.eclipse.passage.lic.internal.net.LicenseUser; import org.eclipse.passage.lic.internal.net.LicensingAction; import org.eclipse.passage.lic.internal.net.ServerAuthenticationExpression; diff --git a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/AcquireTest.java b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/AcquireTest.java index 3d12a5eaf..368e95aec 100644 --- a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/AcquireTest.java +++ b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/AcquireTest.java @@ -22,12 +22,12 @@ import org.eclipse.passage.lbc.internal.base.acquire.Acquisition; import org.eclipse.passage.lbc.internal.base.api.FloatingState; import org.eclipse.passage.lbc.internal.base.api.RawRequest; +import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.remote.impl.acquire.RemoteAcquisitionService; import org.eclipse.passage.lic.internal.api.LicensingException; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.api.acquire.GrantAcquisition; import org.eclipse.passage.lic.internal.base.diagnostic.DiagnosticExplained; -import org.eclipse.passage.lic.internal.hc.remote.Client; -import org.eclipse.passage.lic.internal.hc.remote.impl.acquire.RemoteAcquisitionService; import org.eclipse.passage.lic.internal.net.api.handle.NetResponse; import org.eclipse.passage.lic.internal.net.handle.ProductUserRequest; import org.junit.Test; diff --git a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/MineTest.java b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/MineTest.java index 4e64987d3..e0cfcb34b 100644 --- a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/MineTest.java +++ b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/MineTest.java @@ -24,12 +24,12 @@ import org.eclipse.passage.lbc.internal.base.api.FloatingState; import org.eclipse.passage.lbc.internal.base.api.RawRequest; import org.eclipse.passage.lbc.internal.base.mine.Conditions; +import org.eclipse.passage.lic.api.conditions.ConditionPack; +import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.remote.impl.mine.RemoteConditions; import org.eclipse.passage.lic.internal.api.LicensingException; 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.hc.remote.Client; -import org.eclipse.passage.lic.internal.hc.remote.impl.mine.RemoteConditions; import org.eclipse.passage.lic.internal.net.api.handle.NetResponse; import org.eclipse.passage.lic.internal.net.handle.ProductUserRequest; import org.junit.Test; diff --git a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/ShortcutClient.java b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/ShortcutClient.java index c9a677215..690191f25 100644 --- a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/ShortcutClient.java +++ b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/ShortcutClient.java @@ -19,13 +19,13 @@ import org.eclipse.passage.lbc.internal.base.EagerFloatingState; import org.eclipse.passage.lbc.internal.base.api.FloatingState; import org.eclipse.passage.lbc.internal.base.api.RawRequest; +import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.remote.Request; +import org.eclipse.passage.lic.hc.remote.ResponseHandler; +import org.eclipse.passage.lic.hc.remote.impl.ResultsTransfered; import org.eclipse.passage.lic.internal.api.LicensingException; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; -import org.eclipse.passage.lic.internal.hc.remote.Client; -import org.eclipse.passage.lic.internal.hc.remote.Request; -import org.eclipse.passage.lic.internal.hc.remote.ResponseHandler; -import org.eclipse.passage.lic.internal.hc.remote.impl.ResultsTransfered; import org.eclipse.passage.lic.internal.net.api.handle.NetResponse; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/ShortcutConnection.java b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/ShortcutConnection.java index 912eee835..f99d5602a 100644 --- a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/ShortcutConnection.java +++ b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/ShortcutConnection.java @@ -16,10 +16,10 @@ import java.util.HashMap; import java.util.Map; +import org.eclipse.passage.lic.api.conditions.mining.ContentType; +import org.eclipse.passage.lic.hc.remote.Connection; +import org.eclipse.passage.lic.hc.remote.QueryParameters; import org.eclipse.passage.lic.internal.api.LicensingException; -import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType; -import org.eclipse.passage.lic.internal.hc.remote.Connection; -import org.eclipse.passage.lic.internal.hc.remote.QueryParameters; import org.eclipse.passage.lic.internal.net.api.handle.NetResponse; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/TestEquipment.java b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/TestEquipment.java index 063d0db61..4259113fa 100644 --- a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/TestEquipment.java +++ b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/TestEquipment.java @@ -15,6 +15,7 @@ import java.nio.file.Path; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.mining.ConditionTransportRegistry; import org.eclipse.passage.lic.api.io.Hashes; import org.eclipse.passage.lic.api.io.HashesRegistry; import org.eclipse.passage.lic.api.io.KeyKeeperRegistry; @@ -24,9 +25,8 @@ import org.eclipse.passage.lic.base.io.PathKeyKeeper; import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry; import org.eclipse.passage.lic.bc.BcStreamCodec; +import org.eclipse.passage.lic.hc.remote.impl.Equipment; import org.eclipse.passage.lic.internal.api.LicensedProduct; -import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransportRegistry; -import org.eclipse.passage.lic.internal.hc.remote.impl.Equipment; import org.eclipse.passage.lic.internal.licenses.model.toberemoved.XmiConditionTransport; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/TestRequestContext.java b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/TestRequestContext.java index e63e6e72d..34d8d1b3d 100644 --- a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/TestRequestContext.java +++ b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/TestRequestContext.java @@ -16,8 +16,8 @@ import java.util.function.Supplier; import org.eclipse.passage.lbc.base.tests.TestData; -import org.eclipse.passage.lic.internal.hc.remote.RequestContext; -import org.eclipse.passage.lic.internal.hc.remote.impl.BaseRequestContext; +import org.eclipse.passage.lic.hc.remote.RequestContext; +import org.eclipse.passage.lic.hc.remote.impl.BaseRequestContext; class TestRequestContext implements Supplier { diff --git a/tests/org.eclipse.passage.lic.json.tests/src/org/eclipse/passage/lic/json/tests/JsonConditionTransportTest.java b/tests/org.eclipse.passage.lic.json.tests/src/org/eclipse/passage/lic/json/tests/JsonConditionTransportTest.java index 1aef15c67..f25872b83 100644 --- a/tests/org.eclipse.passage.lic.json.tests/src/org/eclipse/passage/lic/json/tests/JsonConditionTransportTest.java +++ b/tests/org.eclipse.passage.lic.json.tests/src/org/eclipse/passage/lic/json/tests/JsonConditionTransportTest.java @@ -14,9 +14,9 @@ import java.util.Collection; +import org.eclipse.passage.lic.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.mining.ConditionTransport; import org.eclipse.passage.lic.api.tests.conditions.mining.ConditionTransportContractTest; -import org.eclipse.passage.lic.internal.api.conditions.Condition; -import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransport; import org.eclipse.passage.lic.internal.json.JsonConditionTransport; public final class JsonConditionTransportTest extends ConditionTransportContractTest { diff --git a/tests/org.eclipse.passage.lic.json.tests/src/org/eclipse/passage/lic/json/tests/TestConditions.java b/tests/org.eclipse.passage.lic.json.tests/src/org/eclipse/passage/lic/json/tests/TestConditions.java index 40d4cbd9a..0dc3e4c1c 100644 --- a/tests/org.eclipse.passage.lic.json.tests/src/org/eclipse/passage/lic/json/tests/TestConditions.java +++ b/tests/org.eclipse.passage.lic.json.tests/src/org/eclipse/passage/lic/json/tests/TestConditions.java @@ -22,15 +22,15 @@ import java.util.Collection; import java.util.List; +import org.eclipse.passage.lic.api.conditions.Condition; +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.base.conditions.BaseVersionMatch; +import org.eclipse.passage.lic.base.conditions.MatchingRuleCompatible; +import org.eclipse.passage.lic.base.conditions.MatchingRuleEquivalent; +import org.eclipse.passage.lic.base.conditions.MatchingRulePerfect; import org.eclipse.passage.lic.internal.api.EvaluationType; -import org.eclipse.passage.lic.internal.api.conditions.Condition; -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.base.conditions.BaseVersionMatch; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleCompatible; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleEquivalent; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRulePerfect; import org.eclipse.passage.lic.internal.json.ConditionPack; import org.eclipse.passage.lic.internal.json.JsonObjectMapper; diff --git a/tests/org.eclipse.passage.lic.licenses.model.tests/src/org/eclipse/passage/lic/internal/licenses/model/migration/tests/XmiLicensingConditionExtractorTest.java b/tests/org.eclipse.passage.lic.licenses.model.tests/src/org/eclipse/passage/lic/internal/licenses/model/migration/tests/XmiLicensingConditionExtractorTest.java index 493f524aa..d5c09f1cf 100644 --- a/tests/org.eclipse.passage.lic.licenses.model.tests/src/org/eclipse/passage/lic/internal/licenses/model/migration/tests/XmiLicensingConditionExtractorTest.java +++ b/tests/org.eclipse.passage.lic.licenses.model.tests/src/org/eclipse/passage/lic/internal/licenses/model/migration/tests/XmiLicensingConditionExtractorTest.java @@ -24,7 +24,7 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.passage.lic.internal.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.Condition; import org.eclipse.passage.lic.internal.licenses.model.EmptyPersonalFeatureGrant; import org.eclipse.passage.lic.internal.licenses.model.EmptyPersonalLicensePack; import org.eclipse.passage.lic.internal.licenses.model.toberemoved.XmiConditionTransport; diff --git a/tests/org.eclipse.passage.lic.licenses.model.tests/src/org/eclipse/passage/lic/internal/licenses/model/toberemoved/tests/XmiConditionTransportTest.java b/tests/org.eclipse.passage.lic.licenses.model.tests/src/org/eclipse/passage/lic/internal/licenses/model/toberemoved/tests/XmiConditionTransportTest.java index 70ae6dd51..c42dcbf31 100644 --- a/tests/org.eclipse.passage.lic.licenses.model.tests/src/org/eclipse/passage/lic/internal/licenses/model/toberemoved/tests/XmiConditionTransportTest.java +++ b/tests/org.eclipse.passage.lic.licenses.model.tests/src/org/eclipse/passage/lic/internal/licenses/model/toberemoved/tests/XmiConditionTransportTest.java @@ -16,15 +16,15 @@ import java.util.Collection; import java.util.Collections; +import org.eclipse.passage.lic.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.mining.ConditionTransport; import org.eclipse.passage.lic.api.tests.conditions.mining.ConditionTransportContractTest; +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.base.conditions.BaseVersionMatch; +import org.eclipse.passage.lic.base.conditions.MatchingRuleDefault; import org.eclipse.passage.lic.internal.api.EvaluationType; -import org.eclipse.passage.lic.internal.api.conditions.Condition; -import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransport; -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.base.conditions.BaseVersionMatch; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleDefault; import org.eclipse.passage.lic.internal.licenses.model.toberemoved.XmiConditionTransport; import org.junit.Ignore; diff --git a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/condition/mining/BaseLicenseReadingServiceTest.java b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/condition/mining/BaseLicenseReadingServiceTest.java index cba4fb4c9..fb867957e 100644 --- a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/condition/mining/BaseLicenseReadingServiceTest.java +++ b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/condition/mining/BaseLicenseReadingServiceTest.java @@ -33,8 +33,16 @@ import java.util.Date; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.conditions.Condition; +import org.eclipse.passage.lic.api.conditions.ConditionPack; +import org.eclipse.passage.lic.api.conditions.ValidityPeriodClosed; +import org.eclipse.passage.lic.api.conditions.mining.ConditionTransportRegistry; +import org.eclipse.passage.lic.api.conditions.mining.LicenseReadingService; import org.eclipse.passage.lic.api.io.KeyKeeperRegistry; import org.eclipse.passage.lic.api.io.StreamCodecRegistry; +import org.eclipse.passage.lic.base.conditions.MatchingRuleCompatible; +import org.eclipse.passage.lic.base.conditions.mining.BaseLicenseReadingService; +import org.eclipse.passage.lic.base.conditions.mining.PersonalLicenseMiningEquipment; import org.eclipse.passage.lic.base.io.PathFromLicensedProduct; import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry; import org.eclipse.passage.lic.bc.BcStreamCodec; @@ -42,15 +50,7 @@ import org.eclipse.passage.lic.internal.api.EvaluationType; import org.eclipse.passage.lic.internal.api.LicensedProduct; 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.ConditionPack; -import org.eclipse.passage.lic.internal.api.conditions.ValidityPeriodClosed; -import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransportRegistry; -import org.eclipse.passage.lic.internal.api.conditions.mining.LicenseReadingService; import org.eclipse.passage.lic.internal.base.BaseLicensedProduct; -import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleCompatible; -import org.eclipse.passage.lic.internal.base.conditions.mining.BaseLicenseReadingService; -import org.eclipse.passage.lic.internal.base.conditions.mining.PersonalLicenseMiningEquipment; import org.eclipse.passage.lic.internal.licenses.model.toberemoved.XmiConditionTransport; import org.junit.Rule; import org.junit.Test;