From b82a6e4dc3719180249ee8881a1483397a69c2c3 Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Wed, 14 Jul 2021 19:23:20 +0300 Subject: [PATCH 1/5] Bug 574848 Extract plain Passage implementation out of PassageEquinox BasePassage is invited built over framework retrieved by client Signed-off-by: eparovyshnaya --- .../eclipse/passage/lic/base/BasePassage.java | 58 +++++++++++++++++++ .../passage/lic/base/FrameworkAware.java | 30 ++++++++++ ...kAware.java => EquinoxFrameworkAware.java} | 9 ++- .../passage/lic/equinox/EquinoxPassage.java | 20 +++---- 4 files changed, 104 insertions(+), 13 deletions(-) create mode 100644 bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BasePassage.java create mode 100644 bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/FrameworkAware.java rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/{FrameworkAware.java => EquinoxFrameworkAware.java} (93%) diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BasePassage.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BasePassage.java new file mode 100644 index 000000000..a1fe024a3 --- /dev/null +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/BasePassage.java @@ -0,0 +1,58 @@ +/******************************************************************************* + * 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 + * https://www.eclipse.org/legal/epl-2.0/. + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * ArSysOp - initial API and implementation + *******************************************************************************/ +package org.eclipse.passage.lic.base; + +import org.eclipse.passage.lic.api.LicensedProduct; +import org.eclipse.passage.lic.api.Passage; +import org.eclipse.passage.lic.api.ServiceInvocationResult; +import org.eclipse.passage.lic.api.access.GrantLockAttempt; +import org.eclipse.passage.lic.api.restrictions.ExaminationCertificate; +import org.eclipse.passage.lic.base.access.Access; + +/** + * @since 1.1 + */ +public final class BasePassage implements Passage { + + private final FrameworkAware delegate; + + public BasePassage(FrameworkAware delegate) { + this.delegate = delegate; + } + + @Override + public boolean canUse(String feature) { + return delegate.withFramework(framework -> new Access(framework).canUse(feature)).orElse(Boolean.FALSE); + } + + @Override + public ServiceInvocationResult assess() { + return delegate.withFrameworkService(framework -> new Access(framework).assess()); + } + + @Override + public ServiceInvocationResult acquireLicense(String feature) { + return delegate.withFrameworkService(framework -> new Access(framework).acquire(feature)); + } + + @Override + public ServiceInvocationResult releaseLicense(GrantLockAttempt lock) { + return delegate.withFrameworkService(framework -> new Access(framework).release(lock)); + } + + @Override + public ServiceInvocationResult product() { + return delegate.withFrameworkService(framework -> new BaseServiceInvocationResult<>(framework.product())); + } + +} diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/FrameworkAware.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/FrameworkAware.java new file mode 100644 index 000000000..027fc1f25 --- /dev/null +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/FrameworkAware.java @@ -0,0 +1,30 @@ +/******************************************************************************* + * 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 + * https://www.eclipse.org/legal/epl-2.0/. + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * ArSysOp - initial API and implementation + *******************************************************************************/ +package org.eclipse.passage.lic.base; + +import java.util.Optional; +import java.util.function.Function; + +import org.eclipse.passage.lic.api.Framework; +import org.eclipse.passage.lic.api.ServiceInvocationResult; + +/** + * @since 1.1 + */ +public interface FrameworkAware { + + ServiceInvocationResult withFrameworkService(Function> invoke); + + Optional withFramework(Function invoke); + +} diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/FrameworkAware.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/EquinoxFrameworkAware.java similarity index 93% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/FrameworkAware.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/EquinoxFrameworkAware.java index 2edf4a788..6c4753e4c 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/FrameworkAware.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/EquinoxFrameworkAware.java @@ -23,6 +23,7 @@ import org.eclipse.passage.lic.api.ServiceInvocationResult; import org.eclipse.passage.lic.api.diagnostic.Trouble; import org.eclipse.passage.lic.base.BaseServiceInvocationResult; +import org.eclipse.passage.lic.base.FrameworkAware; import org.eclipse.passage.lic.base.diagnostic.BaseDiagnostic; import org.eclipse.passage.lic.base.diagnostic.code.NoFramework; import org.eclipse.passage.lic.base.diagnostic.code.SeveralFrameworks; @@ -42,19 +43,20 @@ * * @since 2.1 */ -public abstract class FrameworkAware { +public abstract class EquinoxFrameworkAware implements FrameworkAware { private final BundleContext context; private final Class component; private final Function> constructor; - protected FrameworkAware(Class cls, Function> constructor) { + protected EquinoxFrameworkAware(Class cls, Function> constructor) { // get this exact bundle, not a bundle of an ancestor class - this.context = FrameworkUtil.getBundle(FrameworkAware.class).getBundleContext(); + this.context = FrameworkUtil.getBundle(EquinoxFrameworkAware.class).getBundleContext(); this.component = cls; this.constructor = constructor; } + @Override public final ServiceInvocationResult withFrameworkService( Function> invoke) { return withReference(// @@ -67,6 +69,7 @@ public final ServiceInvocationResult withFrameworkService( this::severalFrameworks); } + @Override public final Optional withFramework(Function invoke) { return withReference(// reference -> // diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/EquinoxPassage.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/EquinoxPassage.java index 8fd871617..49c3596db 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/EquinoxPassage.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/EquinoxPassage.java @@ -17,47 +17,47 @@ import org.eclipse.passage.lic.api.ServiceInvocationResult; import org.eclipse.passage.lic.api.access.GrantLockAttempt; import org.eclipse.passage.lic.api.restrictions.ExaminationCertificate; -import org.eclipse.passage.lic.base.BaseServiceInvocationResult; -import org.eclipse.passage.lic.base.access.Access; +import org.eclipse.passage.lic.base.BasePassage; +import org.eclipse.passage.lic.base.FrameworkAware; /** * @since 2.1 */ public final class EquinoxPassage implements Passage { - private final FrameworkAware delegate; + private final BasePassage delegate; public EquinoxPassage() { this(new SuppliedFrameworkAware()); } - public EquinoxPassage(FrameworkAware delegate) { - this.delegate = delegate; + public EquinoxPassage(FrameworkAware delegate) { + this.delegate = new BasePassage(delegate); } @Override public boolean canUse(String feature) { - return delegate.withFramework(framework -> new Access(framework).canUse(feature)).orElse(Boolean.FALSE); + return delegate.canUse(feature); } @Override public ServiceInvocationResult assess() { - return delegate.withFrameworkService(framework -> new Access(framework).assess()); + return delegate.assess(); } @Override public ServiceInvocationResult acquireLicense(String feature) { - return delegate.withFrameworkService(framework -> new Access(framework).acquire(feature)); + return delegate.acquireLicense(feature); } @Override public ServiceInvocationResult releaseLicense(GrantLockAttempt lock) { - return delegate.withFrameworkService(framework -> new Access(framework).release(lock)); + return delegate.releaseLicense(lock); } @Override public ServiceInvocationResult product() { - return delegate.withFrameworkService(framework -> new BaseServiceInvocationResult<>(framework.product())); + return delegate.product(); } } From e94d8d9fd5cbf8f1b59ae82b57f95d0e5149a346 Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Wed, 14 Jul 2021 19:37:03 +0300 Subject: [PATCH 2/5] Bug 572897 lic api goes out from the shadows wipe unused @SuppressWarnings("restriction") Signed-off-by: eparovyshnaya --- .../passage/lac/internal/gear/RuntimeFramework.java | 1 - .../lbc/internal/fls/seal/FlsFrameworkSupplier.java | 3 +-- .../pde/core/templates/DefaultProductRequirement.java | 1 - .../ui/templates/e3/LicensedE3ProductTemplateSection.java | 1 - .../ui/templates/e4/LicensedE4ProductTemplateSection.java | 1 - .../fullfeather/AntimagicShieldFeatureLicRequirement.java | 1 - .../LicensedE4FullFeatherProductTemplateSection.java | 1 - .../OSGI-INF/l10n/bundle.properties | 4 ++-- .../lic/internal/e4/core/commands/ExecuteCommand.java | 3 +-- .../passage/lic/emf/resource/ResourceLoadFailed.java | 1 - .../passage/lic/emf/resource/ResourceSaveFailed.java | 1 - .../src/org/eclipse/passage/lic/equinox/Environments.java | 4 ++-- .../passage/lic/equinox/EquinoxPassageLicenseCoverage.java | 4 ++-- .../passage/lic/equinox/LicenseReadingServiceRequest.java | 4 ++-- .../passage/lic/equinox/SuppliedFrameworkAware.java | 2 +- .../lic/internal/licenses/convert/EIssuerSignature.java | 1 - .../lic/internal/licenses/convert/PIssuerSignature.java | 1 - .../lic/internal/licenses/convert/PVersionMatch.java | 1 - .../internal/licenses/model/signature/SignatureData.java | 1 - .../model/toberemoved/BaseXmiConditionTransport.java | 1 - .../passage/lic/internal/net/NetFrameworkAware.java | 4 ++-- .../licenses/core/LicensingOperatorRequirement.java | 1 - .../loc/internal/licenses/core/PersistedEncoded.java | 1 - .../loc/operator/seal/OperatorFrameworkSupplier.java | 1 - .../loc/internal/products/core/KeyPairGeneraged.java | 1 - .../internal/workbench/wizards/InnerClassifierWizard.java | 1 - .../internal/workbench/wizards/RootClassifierWizard.java | 1 - .../eclipse/passage/loc/workspace/DomainFileExtension.java | 1 - .../org/eclipse/passage/loc/workspace/HomeBasedKeys.java | 1 - .../internal/demo/DirectedAccessCycleConfiguration.java | 1 - .../passage/seal/internal/demo/FloatingLicensing.java | 1 - .../internal/demo/FocusedAccessCycleConfiguration.java | 1 - .../passage/seal/internal/demo/LicensingDirection.java | 1 - .../lic/api/tests/fakes/requirements/FakeFeature.java | 1 - .../lic/api/tests/fakes/requirements/FakeRequirement.java | 1 - .../tests/fakes/requirements/FakeResolvedRequirements.java | 1 - .../PermissionsExaminationServiceContractTest.java | 1 - .../internal/base/tests/conditions/BaseConditionTest.java | 1 - .../tests/conditions/BaseEvaluationInstructionsTest.java | 1 - .../tests/conditions/BaseValidityPeriodClosedTest.java | 1 - .../base/tests/conditions/MatchingRuleCompatibleTest.java | 3 +-- .../base/tests/conditions/MatchingRuleEquivalentTest.java | 3 +-- .../tests/conditions/MatchingRuleForIdentifierTest.java | 3 +-- .../tests/conditions/MatchingRuleGreaterOrEqualTest.java | 3 +-- .../base/tests/conditions/MatchingRulePerfectTest.java | 3 +-- .../contract/MatchingRuleCompatibleContractTest.java | 3 +-- .../contract/MatchingRuleDefaultContractTest.java | 3 +-- .../contract/MatchingRuleEquivalentContractTest.java | 3 +-- .../contract/MatchingRuleGreaterOrEqualContractTest.java | 3 +-- .../contract/MatchingRulePerfectContractTest.java | 3 +-- .../base/tests/conditions/evaluation/BiasedAssessor.java | 1 - .../base/tests/conditions/mining/HeadOnlyTransport.java | 1 - .../base/tests/conditions/mining/LocalConditionsTest.java | 1 - .../base/tests/diagnostic/DiagnosticExplainedTest.java | 1 - .../base/tests/requirements/SabotagedFramework.java | 1 - .../base/tests/restrictions/ExaminationExplainedTest.java | 1 - .../lic/internal/base/tests/restrictions/TestState.java | 1 - .../lic/internal/base/tests/version/SafeVersionTest.java | 1 - .../OSGI-INF/l10n/bundle.properties | 4 ++-- .../passage/lic/internal/bc/tests/BcStreamCodecTest.java | 1 - .../lic/internal/bc/tests/KeyPairGenerationTest.java | 1 - .../eclipse/passage/lic/internal/bc/tests/PairContent.java | 3 +-- .../passage/lic/internal/bc/tests/StreamDecodingTest.java | 1 - .../passage/lic/internal/bc/tests/StreamEncodingTest.java | 1 - .../org/eclipse/passage/lic/internal/bc/tests/TmpFile.java | 3 +-- .../equinox/requirements/CapabilityLicFeatureIdTest.java | 2 -- .../equinox/requirements/CapabilityLicFeatureInfoTest.java | 1 - .../equinox/requirements/CapabilityLicFeatureNameTest.java | 2 -- .../requirements/CapabilityLicFeatureProviderTest.java | 2 -- .../requirements/CapabilityLicFeatureRestrictionTest.java | 2 -- .../requirements/CapabilityLicFeatureVersionTest.java | 2 -- .../passage/lic/equinox/requirements/DataBundle.java | 2 -- .../LicensingFeatureCapabilitiesFromBundleTest.java | 3 --- .../lic/equinox/requirements/WriteLicCapablitiesTest.java | 2 -- .../lic/internal/hc/tests/RemoteConditionsRequestTest.java | 1 - .../tests/XmiLicensingConditionExtractorTest.java | 1 - .../passage/seal/demo/tests/DemoFrameworkContentTest.java | 7 +++---- 77 files changed, 30 insertions(+), 109 deletions(-) diff --git a/bundles/org.eclipse.passage.lac.gear/src/org/eclipse/passage/lac/internal/gear/RuntimeFramework.java b/bundles/org.eclipse.passage.lac.gear/src/org/eclipse/passage/lac/internal/gear/RuntimeFramework.java index fa93d9960..fbefb3f65 100644 --- a/bundles/org.eclipse.passage.lac.gear/src/org/eclipse/passage/lac/internal/gear/RuntimeFramework.java +++ b/bundles/org.eclipse.passage.lac.gear/src/org/eclipse/passage/lac/internal/gear/RuntimeFramework.java @@ -19,7 +19,6 @@ import org.eclipse.passage.lic.internal.net.api.handle.NetRequest; import org.eclipse.passage.lic.internal.net.handle.ProductUserRequest; -@SuppressWarnings("restriction") final class RuntimeFramework implements Framework { private final ProductUserRequest request; diff --git a/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/FlsFrameworkSupplier.java b/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/FlsFrameworkSupplier.java index c377614f7..b6e4203bf 100644 --- a/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/FlsFrameworkSupplier.java +++ b/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/FlsFrameworkSupplier.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 @@ -18,7 +18,6 @@ import org.eclipse.passage.lic.api.FrameworkSupplier; import org.osgi.service.component.annotations.Component; -@SuppressWarnings("restriction") @Component public final class FlsFrameworkSupplier implements FrameworkSupplier { diff --git a/bundles/org.eclipse.passage.ldc.pde.core.templates/src/org/eclipse/passage/ldc/internal/pde/core/templates/DefaultProductRequirement.java b/bundles/org.eclipse.passage.ldc.pde.core.templates/src/org/eclipse/passage/ldc/internal/pde/core/templates/DefaultProductRequirement.java index cd14a8bb9..7eff2887f 100644 --- a/bundles/org.eclipse.passage.ldc.pde.core.templates/src/org/eclipse/passage/ldc/internal/pde/core/templates/DefaultProductRequirement.java +++ b/bundles/org.eclipse.passage.ldc.pde.core.templates/src/org/eclipse/passage/ldc/internal/pde/core/templates/DefaultProductRequirement.java @@ -19,7 +19,6 @@ import org.eclipse.passage.lic.base.requirements.BaseFeature; import org.eclipse.passage.lic.base.requirements.BaseRequirement; -@SuppressWarnings("restriction") public final class DefaultProductRequirement implements Supplier { private final Supplier product; diff --git a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/e3/LicensedE3ProductTemplateSection.java b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/e3/LicensedE3ProductTemplateSection.java index 96dde50f4..87493c851 100644 --- a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/e3/LicensedE3ProductTemplateSection.java +++ b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/e3/LicensedE3ProductTemplateSection.java @@ -31,7 +31,6 @@ import org.eclipse.pde.core.plugin.IPluginExtension; import org.eclipse.pde.core.plugin.IPluginReference; -@SuppressWarnings("restriction") public class LicensedE3ProductTemplateSection extends BaseLicensedProductSection { private static final String LICENSED_E3_PRODUCT = "LicensedE3Product"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/e4/LicensedE4ProductTemplateSection.java b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/e4/LicensedE4ProductTemplateSection.java index 671e8e200..711ec24e3 100644 --- a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/e4/LicensedE4ProductTemplateSection.java +++ b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/e4/LicensedE4ProductTemplateSection.java @@ -31,7 +31,6 @@ import org.eclipse.pde.core.plugin.IPluginExtension; import org.eclipse.pde.core.plugin.IPluginReference; -@SuppressWarnings("restriction") @Deprecated public class LicensedE4ProductTemplateSection extends BaseLicensedProductSection { diff --git a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/fullfeather/AntimagicShieldFeatureLicRequirement.java b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/fullfeather/AntimagicShieldFeatureLicRequirement.java index c842cc9d6..40aab1c5d 100644 --- a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/fullfeather/AntimagicShieldFeatureLicRequirement.java +++ b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/fullfeather/AntimagicShieldFeatureLicRequirement.java @@ -19,7 +19,6 @@ import org.eclipse.passage.lic.base.requirements.BaseFeature; import org.eclipse.passage.lic.base.requirements.BaseRequirement; -@SuppressWarnings("restriction") public final class AntimagicShieldFeatureLicRequirement implements Supplier { @Override diff --git a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/fullfeather/LicensedE4FullFeatherProductTemplateSection.java b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/fullfeather/LicensedE4FullFeatherProductTemplateSection.java index 87c53c768..bc6d1a0af 100644 --- a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/fullfeather/LicensedE4FullFeatherProductTemplateSection.java +++ b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/fullfeather/LicensedE4FullFeatherProductTemplateSection.java @@ -32,7 +32,6 @@ import org.eclipse.pde.core.plugin.IPluginExtension; import org.eclipse.pde.core.plugin.IPluginReference; -@SuppressWarnings("restriction") public final class LicensedE4FullFeatherProductTemplateSection extends BaseLicensedProductSection { public LicensedE4FullFeatherProductTemplateSection() { diff --git a/bundles/org.eclipse.passage.lic.e4.core/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.e4.core/OSGI-INF/l10n/bundle.properties index 30f802f21..e3d9c210a 100644 --- a/bundles/org.eclipse.passage.lic.e4.core/OSGI-INF/l10n/bundle.properties +++ b/bundles/org.eclipse.passage.lic.e4.core/OSGI-INF/l10n/bundle.properties @@ -1,6 +1,6 @@ #Properties file for org.eclipse.passage.lic.e4.core ############################################################################### -# Copyright (c) 2019, 2020 ArSysOp and others +# Copyright (c) 2019, 2021 ArSysOp and others # # This program and the accompanying materials are made available under the # terms of the Eclipse Public License 2.0 which is available at @@ -14,7 +14,7 @@ Bundle-Name = Passage LIC E4 Core 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.e4.core/src/org/eclipse/passage/lic/internal/e4/core/commands/ExecuteCommand.java b/bundles/org.eclipse.passage.lic.e4.core/src/org/eclipse/passage/lic/internal/e4/core/commands/ExecuteCommand.java index 2be8f05ee..0042b7c39 100644 --- a/bundles/org.eclipse.passage.lic.e4.core/src/org/eclipse/passage/lic/internal/e4/core/commands/ExecuteCommand.java +++ b/bundles/org.eclipse.passage.lic.e4.core/src/org/eclipse/passage/lic/internal/e4/core/commands/ExecuteCommand.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,7 +24,6 @@ * Execute the command with the given id and parameters using the given context * */ -@SuppressWarnings("restriction") public class ExecuteCommand implements Function, Object> { private String id; diff --git a/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/resource/ResourceLoadFailed.java b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/resource/ResourceLoadFailed.java index d18b7641f..686e2f59d 100644 --- a/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/resource/ResourceLoadFailed.java +++ b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/resource/ResourceLoadFailed.java @@ -18,7 +18,6 @@ /** * @since 2.0 */ -@SuppressWarnings("restriction") public final class ResourceLoadFailed extends TroubleCode { public ResourceLoadFailed() { diff --git a/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/resource/ResourceSaveFailed.java b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/resource/ResourceSaveFailed.java index 333791bd0..62cc7c4f4 100644 --- a/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/resource/ResourceSaveFailed.java +++ b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/resource/ResourceSaveFailed.java @@ -18,7 +18,6 @@ /** * @since 2.0 */ -@SuppressWarnings("restriction") public final class ResourceSaveFailed extends TroubleCode { public ResourceSaveFailed() { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/Environments.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/Environments.java index 56b8f21cf..8b9d51b5e 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/Environments.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/Environments.java @@ -24,13 +24,13 @@ */ public final class Environments implements Supplier> { - private final FrameworkAware delegate; + private final EquinoxFrameworkAware delegate; public Environments() { this(new SuppliedFrameworkAware()); } - public Environments(FrameworkAware delegate) { + public Environments(EquinoxFrameworkAware delegate) { this.delegate = delegate; } diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/EquinoxPassageLicenseCoverage.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/EquinoxPassageLicenseCoverage.java index ad1a7e997..1bdd0e9dc 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/EquinoxPassageLicenseCoverage.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/EquinoxPassageLicenseCoverage.java @@ -22,13 +22,13 @@ */ public final class EquinoxPassageLicenseCoverage implements PassageLicenseCoverage { - private final FrameworkAware delegate; + private final EquinoxFrameworkAware delegate; public EquinoxPassageLicenseCoverage() { this(new SuppliedFrameworkAware()); } - public EquinoxPassageLicenseCoverage(FrameworkAware delegate) { + public EquinoxPassageLicenseCoverage(EquinoxFrameworkAware delegate) { this.delegate = delegate; } diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/LicenseReadingServiceRequest.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/LicenseReadingServiceRequest.java index b87657654..383f0d773 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/LicenseReadingServiceRequest.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/LicenseReadingServiceRequest.java @@ -24,13 +24,13 @@ */ public final class LicenseReadingServiceRequest implements Supplier> { - private final FrameworkAware delegate; + private final EquinoxFrameworkAware delegate; public LicenseReadingServiceRequest() { this(new SuppliedFrameworkAware()); } - public LicenseReadingServiceRequest(FrameworkAware delegate) { + public LicenseReadingServiceRequest(EquinoxFrameworkAware delegate) { this.delegate = delegate; } diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/SuppliedFrameworkAware.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/SuppliedFrameworkAware.java index 2b8f01359..f24b2f7d7 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/SuppliedFrameworkAware.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/SuppliedFrameworkAware.java @@ -24,7 +24,7 @@ * * @since 2.1 */ -public final class SuppliedFrameworkAware extends FrameworkAware { +public final class SuppliedFrameworkAware extends EquinoxFrameworkAware { public SuppliedFrameworkAware() { super(FrameworkSupplier.class, FrameworkSupplier::get); 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 75535984e..0cd507dd2 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 @@ -22,7 +22,6 @@ import org.eclipse.passage.lic.licenses.model.api.SignatureAttribute; import org.eclipse.passage.lic.licenses.model.meta.LicensesFactory; -@SuppressWarnings("restriction") public final class EIssuerSignature implements Supplier { private final IssuerSignature signature; 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 203332759..2d9d13868 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 @@ -22,7 +22,6 @@ import org.eclipse.passage.lic.licenses.model.api.Signature; import org.eclipse.passage.lic.licenses.model.api.SignatureAttribute; -@SuppressWarnings("restriction") public final class PIssuerSignature implements Supplier { private final Signature signature; 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 b767b93bd..75ddfbee6 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 @@ -21,7 +21,6 @@ import org.eclipse.passage.lic.base.conditions.MatchingRuleForIdentifier; import org.eclipse.passage.lic.licenses.VersionMatchDescriptor; -@SuppressWarnings("restriction") public final class PVersionMatch implements Supplier { private final VersionMatchDescriptor descriptor; diff --git a/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/model/signature/SignatureData.java b/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/model/signature/SignatureData.java index c736bc8c5..90c8263d2 100644 --- a/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/model/signature/SignatureData.java +++ b/bundles/org.eclipse.passage.lic.licenses.model/src/org/eclipse/passage/lic/internal/licenses/model/signature/SignatureData.java @@ -22,7 +22,6 @@ /** * @since 2.0 */ -@SuppressWarnings("restriction") public abstract class SignatureData implements NamedData { private final Signature signature; 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 c69ae46fb..860d43a1e 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 @@ -43,7 +43,6 @@ import org.eclipse.passage.lic.licenses.model.meta.LicensesPackage; import org.eclipse.passage.lic.licenses.model.util.LicensesResourceImpl; -@SuppressWarnings("restriction") abstract class BaseXmiConditionTransport implements ConditionTransport { private final ContentType type = new ContentType.Xml(); diff --git a/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/NetFrameworkAware.java b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/NetFrameworkAware.java index 0470e617e..54cef9a3c 100644 --- a/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/NetFrameworkAware.java +++ b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/internal/net/NetFrameworkAware.java @@ -14,12 +14,12 @@ import java.util.Optional; -import org.eclipse.passage.lic.equinox.FrameworkAware; +import org.eclipse.passage.lic.equinox.EquinoxFrameworkAware; import org.eclipse.passage.lic.internal.net.api.FrameworkConstructor; import org.eclipse.passage.lic.internal.net.api.handle.NetRequest; import org.eclipse.passage.lic.internal.net.handle.ProductUserRequest; -public final class NetFrameworkAware extends FrameworkAware { +public final class NetFrameworkAware extends EquinoxFrameworkAware { public NetFrameworkAware(ProductUserRequest request) { super(FrameworkConstructor.class, ctor -> Optional.of(ctor.forRequest(request))); diff --git a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicensingOperatorRequirement.java b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicensingOperatorRequirement.java index 8bb9903a3..ce359bc34 100644 --- a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicensingOperatorRequirement.java +++ b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicensingOperatorRequirement.java @@ -20,7 +20,6 @@ import org.eclipse.passage.lic.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.api.restrictions.Restriction; -@SuppressWarnings("restriction") final class LicensingOperatorRequirement implements Supplier> { private final ExaminationCertificate certificate; diff --git a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/PersistedEncoded.java b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/PersistedEncoded.java index af26ee2e4..f77544b0d 100644 --- a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/PersistedEncoded.java +++ b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/PersistedEncoded.java @@ -58,7 +58,6 @@ private InputStream key() throws LicensingException { return new ProductKeys(product).scrStream(); } - @SuppressWarnings("restriction") private StreamCodec codec() throws LicensingException { Optional codec = new OperatorGearAware().withGear(gear -> gear.codec(product)); if (!codec.isPresent()) { diff --git a/bundles/org.eclipse.passage.loc.operator.seal/src/org/eclipse/passage/loc/operator/seal/OperatorFrameworkSupplier.java b/bundles/org.eclipse.passage.loc.operator.seal/src/org/eclipse/passage/loc/operator/seal/OperatorFrameworkSupplier.java index fd940db24..ea3db3ef2 100644 --- a/bundles/org.eclipse.passage.loc.operator.seal/src/org/eclipse/passage/loc/operator/seal/OperatorFrameworkSupplier.java +++ b/bundles/org.eclipse.passage.loc.operator.seal/src/org/eclipse/passage/loc/operator/seal/OperatorFrameworkSupplier.java @@ -18,7 +18,6 @@ import org.eclipse.passage.lic.api.FrameworkSupplier; import org.osgi.service.component.annotations.Component; -@SuppressWarnings("restriction") @Component public final class OperatorFrameworkSupplier implements FrameworkSupplier { diff --git a/bundles/org.eclipse.passage.loc.products.core/src/org/eclipse/passage/loc/internal/products/core/KeyPairGeneraged.java b/bundles/org.eclipse.passage.loc.products.core/src/org/eclipse/passage/loc/internal/products/core/KeyPairGeneraged.java index 68cff3131..fcea5a149 100644 --- a/bundles/org.eclipse.passage.loc.products.core/src/org/eclipse/passage/loc/internal/products/core/KeyPairGeneraged.java +++ b/bundles/org.eclipse.passage.loc.products.core/src/org/eclipse/passage/loc/internal/products/core/KeyPairGeneraged.java @@ -42,7 +42,6 @@ public KeyPair get() { return pair; } - @SuppressWarnings("restriction") private ProductRef product() { ProductRef product = KeysFactory.eINSTANCE.createProductRef(); product.setIdentifier(author.id().identifier()); diff --git a/bundles/org.eclipse.passage.loc.workbench/src/org/eclipse/passage/loc/internal/workbench/wizards/InnerClassifierWizard.java b/bundles/org.eclipse.passage.loc.workbench/src/org/eclipse/passage/loc/internal/workbench/wizards/InnerClassifierWizard.java index 9bbe8d428..6a8fda844 100644 --- a/bundles/org.eclipse.passage.loc.workbench/src/org/eclipse/passage/loc/internal/workbench/wizards/InnerClassifierWizard.java +++ b/bundles/org.eclipse.passage.loc.workbench/src/org/eclipse/passage/loc/internal/workbench/wizards/InnerClassifierWizard.java @@ -40,7 +40,6 @@ * @param root classifier to store created if not present * */ -@SuppressWarnings("restriction") public final class InnerClassifierWizard extends BaseClassifierWizard> { private final Class clazz; diff --git a/bundles/org.eclipse.passage.loc.workbench/src/org/eclipse/passage/loc/internal/workbench/wizards/RootClassifierWizard.java b/bundles/org.eclipse.passage.loc.workbench/src/org/eclipse/passage/loc/internal/workbench/wizards/RootClassifierWizard.java index 8dc2e7b45..09ed9bf33 100644 --- a/bundles/org.eclipse.passage.loc.workbench/src/org/eclipse/passage/loc/internal/workbench/wizards/RootClassifierWizard.java +++ b/bundles/org.eclipse.passage.loc.workbench/src/org/eclipse/passage/loc/internal/workbench/wizards/RootClassifierWizard.java @@ -32,7 +32,6 @@ * instance. * */ -@SuppressWarnings("restriction") public final class RootClassifierWizard extends BaseClassifierWizard { /** diff --git a/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/DomainFileExtension.java b/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/DomainFileExtension.java index 7216fad65..a9e73d093 100644 --- a/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/DomainFileExtension.java +++ b/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/DomainFileExtension.java @@ -14,7 +14,6 @@ import org.eclipse.passage.lic.base.io.PassageFileExtension; -@SuppressWarnings("restriction") interface DomainFileExtension { public static final class Keys extends PassageFileExtension { diff --git a/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/HomeBasedKeys.java b/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/HomeBasedKeys.java index 9cc465b45..8f98969bf 100644 --- a/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/HomeBasedKeys.java +++ b/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/HomeBasedKeys.java @@ -24,7 +24,6 @@ import org.eclipse.passage.loc.internal.api.workspace.Keys; import org.eclipse.passage.loc.internal.api.workspace.ResourceHandle; -@SuppressWarnings("restriction") final class HomeBasedKeys implements Keys { private final Path residence; diff --git a/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/DirectedAccessCycleConfiguration.java b/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/DirectedAccessCycleConfiguration.java index 31bf5026a..8fb14ef68 100644 --- a/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/DirectedAccessCycleConfiguration.java +++ b/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/DirectedAccessCycleConfiguration.java @@ -30,7 +30,6 @@ import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry; import org.osgi.framework.Bundle; -@SuppressWarnings("restriction") public final class DirectedAccessCycleConfiguration extends BaseAccessCycleConfiguration { private final Registry conditions; diff --git a/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/FloatingLicensing.java b/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/FloatingLicensing.java index b1a442585..5939057d0 100644 --- a/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/FloatingLicensing.java +++ b/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/FloatingLicensing.java @@ -31,7 +31,6 @@ import org.eclipse.passage.lic.hc.remote.impl.acquire.RemoteAcquisitionService; import org.eclipse.passage.lic.hc.remote.impl.mine.RemoteConditions; -@SuppressWarnings("restriction") final class FloatingLicensing implements LicensingDirection { private final Registry conditions; diff --git a/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/FocusedAccessCycleConfiguration.java b/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/FocusedAccessCycleConfiguration.java index 5adc00d94..b50e2586a 100644 --- a/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/FocusedAccessCycleConfiguration.java +++ b/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/FocusedAccessCycleConfiguration.java @@ -20,7 +20,6 @@ import org.eclipse.passage.lic.api.io.HashesRegistry; import org.osgi.framework.FrameworkUtil; -@SuppressWarnings("restriction") abstract class FocusedAccessCycleConfiguration extends BaseAccessCycleConfiguration { protected LicensingDirection delegate; // lateinit, practically final and not null diff --git a/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/LicensingDirection.java b/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/LicensingDirection.java index 95aadccc4..41d91bcea 100644 --- a/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/LicensingDirection.java +++ b/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/LicensingDirection.java @@ -27,7 +27,6 @@ import org.eclipse.passage.lic.base.registry.JointRegistry; import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry; -@SuppressWarnings("restriction") interface LicensingDirection { public MinedConditionsRegistry conditionMiners(); diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeFeature.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeFeature.java index bbe27693a..8432fc988 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeFeature.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeFeature.java @@ -14,7 +14,6 @@ import org.eclipse.passage.lic.api.requirements.Feature; -@SuppressWarnings("restriction") public final class FakeFeature implements Feature { private final String identity; diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeRequirement.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeRequirement.java index 2ee066feb..91073eca7 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeRequirement.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeRequirement.java @@ -16,7 +16,6 @@ import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.api.restrictions.RestrictionLevel; -@SuppressWarnings("restriction") public final class FakeRequirement implements Requirement { private final Feature feature; diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeResolvedRequirements.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeResolvedRequirements.java index 7faa7ae59..c936bc2bc 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeResolvedRequirements.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeResolvedRequirements.java @@ -21,7 +21,6 @@ import org.eclipse.passage.lic.api.requirements.ResolvedRequirements; import org.eclipse.passage.lic.api.tests.fakes.FakeServiceInvocationResult; -@SuppressWarnings("restriction") public final class FakeResolvedRequirements implements ResolvedRequirements { private final Collection requirements; diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/resrictions/PermissionsExaminationServiceContractTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/resrictions/PermissionsExaminationServiceContractTest.java index 2b866bebb..f44714851 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/resrictions/PermissionsExaminationServiceContractTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/resrictions/PermissionsExaminationServiceContractTest.java @@ -20,7 +20,6 @@ import org.eclipse.passage.lic.api.tests.fakes.requirements.FakeRequirement; import org.junit.Test; -@SuppressWarnings("restriction") public abstract class PermissionsExaminationServiceContractTest { @Test(expected = NullPointerException.class) 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 0946fa8a4..925eafbff 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 @@ -29,7 +29,6 @@ import org.eclipse.passage.lic.base.conditions.MatchingRulePerfect; import org.junit.Test; -@SuppressWarnings("restriction") public final class BaseConditionTest { /** 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 d3cbe30ae..592c745bf 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 @@ -16,7 +16,6 @@ import org.eclipse.passage.lic.base.conditions.BaseEvaluationInstructions; import org.junit.Test; -@SuppressWarnings("restriction") public final class BaseEvaluationInstructionsTest { @Test(expected = NullPointerException.class) 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 5b506a36d..ebba15b67 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 @@ -17,7 +17,6 @@ import org.eclipse.passage.lic.base.conditions.BaseValidityPeriodClosed; import org.junit.Test; -@SuppressWarnings("restriction") public final class BaseValidityPeriodClosedTest { @Test(expected = NullPointerException.class) 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 9231dc146..96d558646 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 @@ -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 @@ -20,7 +20,6 @@ import org.eclipse.passage.lic.base.conditions.MatchingRuleCompatible; import org.junit.Test; -@SuppressWarnings("restriction") public final class MatchingRuleCompatibleTest { @Test 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 317710318..5f6c602d6 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 @@ -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 @@ -20,7 +20,6 @@ import org.eclipse.passage.lic.base.conditions.MatchingRuleEquivalent; import org.junit.Test; -@SuppressWarnings("restriction") public final class MatchingRuleEquivalentTest { @Test 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 ed20c988e..e503bd576 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 @@ -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 @@ -23,7 +23,6 @@ import org.eclipse.passage.lic.base.conditions.MatchingRulePerfect; import org.junit.Test; -@SuppressWarnings("restriction") public final class MatchingRuleForIdentifierTest { @Test(expected = NullPointerException.class) 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 cefbb6e0d..4be7327d2 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 @@ -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 @@ -20,7 +20,6 @@ import org.eclipse.passage.lic.base.conditions.MatchingRuleGreaterOrEqual; import org.junit.Test; -@SuppressWarnings("restriction") public final class MatchingRuleGreaterOrEqualTest { @Test 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 31dc09f64..151773a97 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 @@ -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 @@ -19,7 +19,6 @@ import org.eclipse.passage.lic.base.conditions.MatchingRulePerfect; import org.junit.Test; -@SuppressWarnings("restriction") public final class MatchingRulePerfectTest { @Test 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 e9f1ec58b..f637a765f 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 @@ -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,7 +15,6 @@ import org.eclipse.passage.lic.api.conditions.MatchingRule; import org.eclipse.passage.lic.base.conditions.MatchingRuleCompatible; -@SuppressWarnings("restriction") public final class MatchingRuleCompatibleContractTest extends ComparingMatchingRuleContractTest { @Override 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 adaa99619..7280c1915 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 @@ -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,7 +15,6 @@ import org.eclipse.passage.lic.api.conditions.MatchingRule; import org.eclipse.passage.lic.base.conditions.MatchingRuleDefault; -@SuppressWarnings("restriction") public final class MatchingRuleDefaultContractTest extends BaseMatchingRuleContractTest { @Override 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 966d01993..dcee82167 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 @@ -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,7 +15,6 @@ import org.eclipse.passage.lic.api.conditions.MatchingRule; import org.eclipse.passage.lic.base.conditions.MatchingRuleEquivalent; -@SuppressWarnings("restriction") public final class MatchingRuleEquivalentContractTest extends ComparingMatchingRuleContractTest { @Override 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 120b2484e..1fb287c8a 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 @@ -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,7 +15,6 @@ import org.eclipse.passage.lic.api.conditions.MatchingRule; import org.eclipse.passage.lic.base.conditions.MatchingRuleGreaterOrEqual; -@SuppressWarnings("restriction") public final class MatchingRuleGreaterOrEqualContractTest extends ComparingMatchingRuleContractTest { @Override 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 ba6f678ac..24fc17ebc 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 @@ -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,7 +15,6 @@ import org.eclipse.passage.lic.api.conditions.MatchingRule; import org.eclipse.passage.lic.base.conditions.MatchingRulePerfect; -@SuppressWarnings("restriction") public final class MatchingRulePerfectContractTest extends BaseMatchingRuleContractTest { @Override 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 131410e43..81bf04a89 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 @@ -21,7 +21,6 @@ import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionEvaluationException; import org.eclipse.passage.lic.api.conditions.evaluation.ExpressionTokenAssessmentService; -@SuppressWarnings("restriction") final class BiasedAssessor implements ExpressionTokenAssessmentService { private final Map answers = new HashMap<>(); 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 24a9cab30..bb8d3699f 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 @@ -34,7 +34,6 @@ import org.eclipse.passage.lic.base.conditions.MatchingRuleDefault; import org.eclipse.passage.lic.internal.base.tests.conditions.mining.LocalConditionsTest.Spy; -@SuppressWarnings("restriction") final class HeadOnlyTransport implements ConditionTransport { private final Spy spy; 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 9d99b009f..84cf4a2f6 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 @@ -39,7 +39,6 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; -@SuppressWarnings("restriction") public final class LocalConditionsTest { @Rule diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/diagnostic/DiagnosticExplainedTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/diagnostic/DiagnosticExplainedTest.java index 71fd45c33..4d33f8d6c 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/diagnostic/DiagnosticExplainedTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/diagnostic/DiagnosticExplainedTest.java @@ -23,7 +23,6 @@ import org.eclipse.passage.lic.base.diagnostic.DiagnosticExplained; import org.junit.Test; -@SuppressWarnings("restriction") public final class DiagnosticExplainedTest { @Test(expected = NullPointerException.class) 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 91074efc5..625bdeeee 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 @@ -37,7 +37,6 @@ import org.eclipse.passage.lic.base.BaseLicensedProduct; import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry; -@SuppressWarnings("restriction") final class SabotagedFramework implements Framework { private final AccessCycleConfiguration config = new SabotagedAccessCycleConfiguration(); 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 eaba359c8..a8b6ed8ef 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 @@ -38,7 +38,6 @@ import org.eclipse.passage.lic.base.restrictions.ExaminationExplained; import org.junit.Test; -@SuppressWarnings("restriction") public final class ExaminationExplainedTest { @Test(expected = NullPointerException.class) 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 146cdd186..aa30cd37b 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 @@ -33,7 +33,6 @@ import org.eclipse.passage.lic.base.requirements.BaseFeature; import org.eclipse.passage.lic.base.requirements.BaseRequirement; -@SuppressWarnings("restriction") final class TestState { private final LicensedProduct product; diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/version/SafeVersionTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/version/SafeVersionTest.java index e04179624..d44ea6ae1 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/version/SafeVersionTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/version/SafeVersionTest.java @@ -19,7 +19,6 @@ import org.junit.Test; // reflects requirements of LicensingVersion::testToVersionValue -@SuppressWarnings("restriction") public final class SafeVersionTest { @Test diff --git a/tests/org.eclipse.passage.lic.bc.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.passage.lic.bc.tests/OSGI-INF/l10n/bundle.properties index 5d16df2cd..9f844cf01 100644 --- a/tests/org.eclipse.passage.lic.bc.tests/OSGI-INF/l10n/bundle.properties +++ b/tests/org.eclipse.passage.lic.bc.tests/OSGI-INF/l10n/bundle.properties @@ -1,6 +1,6 @@ #Properties file for org.eclipse.passage.lic.bc.tests ############################################################################### -# Copyright (c) 2018, 2020 ArSysOp and others +# Copyright (c) 2018, 2021 ArSysOp and others # # This program and the accompanying materials are made available under the # terms of the Eclipse Public License 2.0 which is available at @@ -14,7 +14,7 @@ Bundle-Name = Passage LIC BC 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.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/BcStreamCodecTest.java b/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/BcStreamCodecTest.java index 30e3e531c..af0c8033c 100644 --- a/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/BcStreamCodecTest.java +++ b/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/BcStreamCodecTest.java @@ -32,7 +32,6 @@ import org.junit.Rule; import org.junit.rules.TemporaryFolder; -@SuppressWarnings("restriction") abstract class BcStreamCodecTest { @Rule diff --git a/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/KeyPairGenerationTest.java b/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/KeyPairGenerationTest.java index f3ebc6bd1..b12d91e8b 100644 --- a/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/KeyPairGenerationTest.java +++ b/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/KeyPairGenerationTest.java @@ -33,7 +33,6 @@ import org.eclipse.passage.lic.bc.BcStreamCodec; import org.junit.Test; -@SuppressWarnings("restriction") public final class KeyPairGenerationTest extends BcStreamCodecTest { @Test diff --git a/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/PairContent.java b/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/PairContent.java index 102b5bb1d..da8005981 100644 --- a/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/PairContent.java +++ b/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/PairContent.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,6 @@ import org.eclipse.passage.lic.base.io.FileContent; -@SuppressWarnings("restriction") final class PairContent extends PairInfo { PairContent(Path first, Path second) throws IOException { diff --git a/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/StreamDecodingTest.java b/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/StreamDecodingTest.java index 63412f31a..327dceca0 100644 --- a/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/StreamDecodingTest.java +++ b/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/StreamDecodingTest.java @@ -35,7 +35,6 @@ import org.eclipse.passage.lic.bc.BcStreamCodec; import org.junit.Test; -@SuppressWarnings("restriction") public final class StreamDecodingTest extends BcStreamCodecTest { @Test diff --git a/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/StreamEncodingTest.java b/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/StreamEncodingTest.java index 8ce1d5c77..decf5c5c9 100644 --- a/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/StreamEncodingTest.java +++ b/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/StreamEncodingTest.java @@ -33,7 +33,6 @@ import org.eclipse.passage.lic.bc.BcStreamCodec; import org.junit.Test; -@SuppressWarnings("restriction") public final class StreamEncodingTest extends BcStreamCodecTest { @Test diff --git a/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/TmpFile.java b/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/TmpFile.java index 6a73f4fdb..ddb6f64ae 100644 --- a/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/TmpFile.java +++ b/tests/org.eclipse.passage.lic.bc.tests/src/org/eclipse/passage/lic/internal/bc/tests/TmpFile.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 @@ -20,7 +20,6 @@ import org.eclipse.passage.lic.base.io.PassageFileExtension; import org.junit.rules.TemporaryFolder; -@SuppressWarnings("restriction") final class TmpFile { private final TemporaryFolder folder; diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureIdTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureIdTest.java index c105f81d9..2fd8023e4 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureIdTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureIdTest.java @@ -18,9 +18,7 @@ import java.util.Set; import org.eclipse.passage.lic.base.StringNamedData; -import org.eclipse.passage.lic.equinox.requirements.CapabilityLicFeatureId; -@SuppressWarnings("restriction") public final class CapabilityLicFeatureIdTest extends CapabilityLicFeatureInfoTest { @Override diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureInfoTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureInfoTest.java index 33a381460..3a8d2e52d 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureInfoTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureInfoTest.java @@ -25,7 +25,6 @@ import org.junit.Test; import org.osgi.framework.wiring.BundleCapability; -@SuppressWarnings("restriction") abstract class CapabilityLicFeatureInfoTest { @Test diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureNameTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureNameTest.java index b8a2b09c9..498aa4f88 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureNameTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureNameTest.java @@ -18,9 +18,7 @@ import java.util.Set; import org.eclipse.passage.lic.base.StringNamedData; -import org.eclipse.passage.lic.equinox.requirements.CapabilityLicFeatureName; -@SuppressWarnings("restriction") public final class CapabilityLicFeatureNameTest extends CapabilityLicFeatureInfoTest { @Override diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureProviderTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureProviderTest.java index fab169b4d..541afdddf 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureProviderTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureProviderTest.java @@ -17,9 +17,7 @@ import java.util.Set; import org.eclipse.passage.lic.base.StringNamedData; -import org.eclipse.passage.lic.equinox.requirements.CapabilityLicFeatureProvider; -@SuppressWarnings("restriction") public final class CapabilityLicFeatureProviderTest extends CapabilityLicFeatureInfoTest { @Override diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureRestrictionTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureRestrictionTest.java index 66e861e5d..2c9a5d796 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureRestrictionTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureRestrictionTest.java @@ -18,9 +18,7 @@ import java.util.Set; import org.eclipse.passage.lic.base.StringNamedData; -import org.eclipse.passage.lic.equinox.requirements.CapabilityLicFeatureLevel; -@SuppressWarnings("restriction") public final class CapabilityLicFeatureRestrictionTest extends CapabilityLicFeatureInfoTest { @Override diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureVersionTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureVersionTest.java index 2c564d90a..2aa732fdc 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureVersionTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureVersionTest.java @@ -18,9 +18,7 @@ import java.util.Set; import org.eclipse.passage.lic.base.StringNamedData; -import org.eclipse.passage.lic.equinox.requirements.CapabilityLicFeatureVersion; -@SuppressWarnings("restriction") public final class CapabilityLicFeatureVersionTest extends CapabilityLicFeatureInfoTest { @Override diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/DataBundle.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/DataBundle.java index 631956587..f40d0aded 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/DataBundle.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/DataBundle.java @@ -22,13 +22,11 @@ import org.eclipse.passage.lic.api.restrictions.RestrictionLevel; import org.eclipse.passage.lic.base.requirements.BaseFeature; import org.eclipse.passage.lic.base.requirements.BaseRequirement; -import org.eclipse.passage.lic.equinox.requirements.LicensingFeatureCapabilitiesFromBundle; import org.eclipse.passage.lic.internal.base.Cached; import org.osgi.framework.Bundle; import org.osgi.framework.wiring.BundleCapability; import org.osgi.framework.wiring.BundleWiring; -@SuppressWarnings("restriction") final class DataBundle { private final String id = "org.eclipse.passage.lic.equinox.tests.data.requirements"; //$NON-NLS-1$ diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/LicensingFeatureCapabilitiesFromBundleTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/LicensingFeatureCapabilitiesFromBundleTest.java index a2d9dbb51..95c53157b 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/LicensingFeatureCapabilitiesFromBundleTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/LicensingFeatureCapabilitiesFromBundleTest.java @@ -22,12 +22,9 @@ import java.util.Optional; import java.util.stream.Collectors; -import org.eclipse.passage.lic.equinox.requirements.CapabilityLicFeatureId; -import org.eclipse.passage.lic.equinox.requirements.LicensingFeatureCapabilitiesFromBundle; import org.junit.Test; import org.osgi.framework.wiring.BundleCapability; -@SuppressWarnings("restriction") public final class LicensingFeatureCapabilitiesFromBundleTest { @Test diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/WriteLicCapablitiesTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/WriteLicCapablitiesTest.java index 1e590b311..bdca28ebc 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/WriteLicCapablitiesTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/WriteLicCapablitiesTest.java @@ -19,10 +19,8 @@ import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.base.NamedData; -import org.eclipse.passage.lic.equinox.requirements.RequirementsToBundle; import org.junit.Test; -@SuppressWarnings("restriction") public final class WriteLicCapablitiesTest { private final String expectation = "Provide-Capability: " //$NON-NLS-1$ + "licensing.feature;licensing.feature=\"E\";name=\"Euler number\";version=\"2.71.82\";provider=\"Euler\";level=\"info\"," //$NON-NLS-1$ 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 bcefba1f8..2f7ce28df 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 @@ -44,7 +44,6 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; -@SuppressWarnings("restriction") public final class RemoteConditionsRequestTest { private final String host = "fake.licensing.server"; //$NON-NLS-1$ 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 d5c09f1cf..c0c3464c3 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 @@ -36,7 +36,6 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; -@SuppressWarnings("restriction") public class XmiLicensingConditionExtractorTest { private static final String COND1_FEATURE_ID = "loc.workbench"; //$NON-NLS-1$ diff --git a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/DemoFrameworkContentTest.java b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/DemoFrameworkContentTest.java index e05903c36..9d5ba0b5b 100644 --- a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/DemoFrameworkContentTest.java +++ b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/DemoFrameworkContentTest.java @@ -31,9 +31,8 @@ import org.eclipse.passage.seal.internal.demo.DemoFrameworkSupplier; import org.junit.Test; -@SuppressWarnings("restriction") public final class DemoFrameworkContentTest { - + @Test public void providesBothEquinoxRequirementServices() { Registry registry = registry(); @@ -54,11 +53,11 @@ private Registry registry() { assumeTrue(registry.isPresent()); return registry.get().get(); } - + private Framework framework() { Optional framework = new DemoFrameworkSupplier().get(); assumeTrue(framework.isPresent()); return framework.get(); } - + } From dcced5c080b68bd1996608242287e5a09a7c1e8c Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Wed, 14 Jul 2021 19:58:33 +0300 Subject: [PATCH 3/5] Bug 572897 lic api goes out from the shadows wipe unused imports Signed-off-by: Alexander Fedorov --- .../passage/lic/equinox/requirements/BundleManifestTest.java | 1 - .../passage/lic/equinox/requirements/BundleNameTest.java | 1 - .../lic/equinox/requirements/BundleRequirementsTest.java | 1 - .../passage/lic/equinox/requirements/BundleVendorTest.java | 1 - .../lic/equinox/requirements/ComponentRequirementsTest.java | 1 - .../LicCapabilityAttributesFromDeclarationTest.java | 1 - .../requirements/ProvidedCapabilitiesFromManifestTest.java | 2 -- .../lic/equinox/requirements/RequirementsFromManifestTest.java | 1 - 8 files changed, 9 deletions(-) diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleManifestTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleManifestTest.java index db399a26c..eabcd535f 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleManifestTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleManifestTest.java @@ -16,7 +16,6 @@ import static org.junit.Assert.fail; import org.eclipse.passage.lic.api.LicensingException; -import org.eclipse.passage.lic.equinox.requirements.BundleManifest; import org.junit.Test; import org.osgi.framework.Bundle; import org.osgi.framework.FrameworkUtil; diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleNameTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleNameTest.java index 2e5748616..0040b4003 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleNameTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleNameTest.java @@ -14,7 +14,6 @@ import static org.junit.Assert.assertEquals; -import org.eclipse.passage.lic.equinox.requirements.BundleName; import org.junit.Test; public final class BundleNameTest { diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleRequirementsTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleRequirementsTest.java index 8937cc1cc..c0143eae8 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleRequirementsTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleRequirementsTest.java @@ -16,7 +16,6 @@ import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.api.requirements.ResolvedRequirements; -import org.eclipse.passage.lic.equinox.requirements.BundleRequirements; /** * Integration test: requires OSGi running diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleVendorTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleVendorTest.java index 0e1383bca..90063cfdd 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleVendorTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleVendorTest.java @@ -14,7 +14,6 @@ import static org.junit.Assert.assertEquals; -import org.eclipse.passage.lic.equinox.requirements.BundleVendor; import org.junit.Test; public final class BundleVendorTest { diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/ComponentRequirementsTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/ComponentRequirementsTest.java index edeacc01c..a18d3e298 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/ComponentRequirementsTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/ComponentRequirementsTest.java @@ -16,7 +16,6 @@ import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.api.requirements.ResolvedRequirements; -import org.eclipse.passage.lic.equinox.requirements.ComponentRequirements; /** * Integration test: requires OSGi running diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/LicCapabilityAttributesFromDeclarationTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/LicCapabilityAttributesFromDeclarationTest.java index da98c1de4..947783874 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/LicCapabilityAttributesFromDeclarationTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/LicCapabilityAttributesFromDeclarationTest.java @@ -22,7 +22,6 @@ import java.util.Optional; import org.eclipse.passage.lic.api.LicensingException; -import org.eclipse.passage.lic.equinox.requirements.LicCapabilityAttributesFromDeclaration; import org.junit.Test; public final class LicCapabilityAttributesFromDeclarationTest { diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/ProvidedCapabilitiesFromManifestTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/ProvidedCapabilitiesFromManifestTest.java index 4c51322d2..93c9744ae 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/ProvidedCapabilitiesFromManifestTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/ProvidedCapabilitiesFromManifestTest.java @@ -19,8 +19,6 @@ import java.util.Optional; import org.eclipse.passage.lic.api.LicensingException; -import org.eclipse.passage.lic.equinox.requirements.BundleManifest; -import org.eclipse.passage.lic.equinox.requirements.ProvidedCapabilitiesFromManifest; import org.junit.Test; public final class ProvidedCapabilitiesFromManifestTest { diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/RequirementsFromManifestTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/RequirementsFromManifestTest.java index 767072886..aa03ebd87 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/RequirementsFromManifestTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/RequirementsFromManifestTest.java @@ -21,7 +21,6 @@ import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.base.diagnostic.NoErrors; import org.eclipse.passage.lic.base.diagnostic.NoSevereErrors; -import org.eclipse.passage.lic.equinox.requirements.RequirementsFromManifest; import org.junit.Test; import org.osgi.framework.FrameworkUtil; From ced9d54419e0f13dbdfef6e0c5215d70fb982886 Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Wed, 14 Jul 2021 19:58:56 +0300 Subject: [PATCH 4/5] Bug 572897 lic api goes out from the shadows increment version for LIC E4 UI Signed-off-by: Alexander Fedorov --- bundles/org.eclipse.passage.lic.e4.ui/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.passage.lic.e4.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.e4.ui/META-INF/MANIFEST.MF index af80aeaea..4605b334a 100644 --- a/bundles/org.eclipse.passage.lic.e4.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.e4.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.passage.lic.e4.ui Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.passage.lic.e4.ui -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.0.200.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright Bundle-RequiredExecutionEnvironment: JavaSE-1.8 From 5bf8f8551edcd6c08716c101ddc779e6ec099eff Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Wed, 14 Jul 2021 20:06:25 +0300 Subject: [PATCH 5/5] Bug 572897 lic api goes out from the shadows increment version for LIC E4 Core Signed-off-by: Alexander Fedorov --- bundles/org.eclipse.passage.lic.e4.core/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.passage.lic.e4.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.e4.core/META-INF/MANIFEST.MF index b659a06d2..363f67719 100644 --- a/bundles/org.eclipse.passage.lic.e4.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.e4.core/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.passage.lic.e4.core Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.passage.lic.e4.core -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.0.200.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright Bundle-RequiredExecutionEnvironment: JavaSE-1.8