-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1057 from eclipse-passage/1054
1054 LIC: library-licensed-separately: support license import
- Loading branch information
Showing
28 changed files
with
749 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
...pse.passage.lic.base/src/org/eclipse/passage/lic/base/diagnostic/code/ForeignLicense.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2022 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.diagnostic.code; | ||
|
|
||
| import org.eclipse.passage.lic.api.diagnostic.TroubleCode; | ||
| import org.eclipse.passage.lic.internal.base.i18n.DiagnosticCodeMessages; | ||
|
|
||
| /** | ||
| * | ||
| * @since 2.3 | ||
| */ | ||
| public final class ForeignLicense extends TroubleCode { | ||
|
|
||
| public ForeignLicense() { | ||
| super(413, DiagnosticCodeMessages.getString("ForeignLicense.explanation")); //$NON-NLS-1$ | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 0 additions & 40 deletions
40
....lic.base/src/org/eclipse/passage/lic/internal/base/access/DelegatedLicensingService.java
This file was deleted.
Oops, something went wrong.
101 changes: 101 additions & 0 deletions
101
....eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/access/Libraries.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2022 ArSysOp | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License 2.0 which is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * ArSysOp - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.passage.lic.internal.base.access; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.file.Path; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
| import java.util.function.BinaryOperator; | ||
| import java.util.function.Supplier; | ||
|
|
||
| import org.eclipse.passage.lic.api.LicensedProduct; | ||
| import org.eclipse.passage.lic.api.ServiceInvocationResult; | ||
| import org.eclipse.passage.lic.api.agreements.AgreementAcceptanceService; | ||
| import org.eclipse.passage.lic.api.agreements.AgreementToAccept; | ||
| import org.eclipse.passage.lic.api.conditions.mining.LicenseReadingService; | ||
| import org.eclipse.passage.lic.api.restrictions.ExaminationCertificate; | ||
| import org.eclipse.passage.lic.base.BaseServiceInvocationResult; | ||
| import org.eclipse.passage.lic.base.BaseServiceInvocationResult.Sum; | ||
| import org.eclipse.passage.lic.base.access.SumOfCertificates; | ||
| import org.eclipse.passage.lic.base.diagnostic.SumOfLists; | ||
|
|
||
| /** | ||
| * Set of libraries registered for the the product | ||
| * | ||
| * @see Library | ||
| */ | ||
| public final class Libraries { | ||
|
|
||
| private final List<Library> libraries; | ||
| private final Supplier<LicensedProduct> owner; | ||
|
|
||
| public Libraries(Supplier<List<Library>> libraries, Supplier<LicensedProduct> owner) { | ||
| this(libraries.get(), owner); | ||
| } | ||
|
|
||
| public Libraries(List<Library> libraries, Supplier<LicensedProduct> owner) { | ||
| this.libraries = libraries; | ||
| this.owner = owner; | ||
| } | ||
|
|
||
| public boolean empty() { | ||
| return libraries.isEmpty(); | ||
| } | ||
|
|
||
| public LicensedProduct product() { | ||
| return owner.get(); | ||
| } | ||
|
|
||
| public Optional<ServiceInvocationResult<ExaminationCertificate>> assess() { | ||
| return libraries.stream()// | ||
| .map(Library::assess).reduce(new BaseServiceInvocationResult.Sum<>(new SumOfCertificates())); | ||
| } | ||
|
|
||
| public Optional<ServiceInvocationResult<List<AgreementAcceptanceService>>> agreementsServices( | ||
| AgreementToAccept agreement) { | ||
| return libraries.stream()// | ||
| .map(library -> library.agreementsService(agreement))// | ||
| .map(this::enlisted)// | ||
| .reduce(sum()); | ||
| } | ||
|
|
||
| public Optional<ServiceInvocationResult<List<LicenseReadingService>>> licenseReadingServices() { | ||
| return libraries.stream()// | ||
| .map(Library::licenseReadingService)// | ||
| .map(this::enlisted)// | ||
| .reduce(sum()); | ||
| } | ||
|
|
||
| public Optional<ServiceInvocationResult<Boolean>> installLicense(Path license) throws IOException { | ||
| return libraries.stream()// | ||
| .map(library -> library.installLicense(license))// | ||
| .reduce(new Sum<Boolean>(or())); | ||
| } | ||
|
|
||
| private <T> ServiceInvocationResult<List<T>> enlisted(ServiceInvocationResult<T> origin) { | ||
| List<T> data = origin.data().isPresent() ? Arrays.asList(origin.data().get()) : Collections.emptyList(); | ||
| return new BaseServiceInvocationResult<List<T>>(origin.diagnostic(), data); | ||
| } | ||
|
|
||
| private <T> Sum<List<T>> sum() { | ||
| return new Sum<List<T>>(new SumOfLists<T>()); | ||
| } | ||
|
|
||
| private BinaryOperator<Boolean> or() { | ||
| return (first, second) -> first || second; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.