Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 573488 evolve licenses and customers reporting #780

Merged
merged 1 commit into from
May 17, 2021
Merged

Bug 573488 evolve licenses and customers reporting #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...pse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/LicenseGrantDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ public interface LicenseGrantDescriptor {
* Returns the containing license pack of this license grant.
*
* @return the license pack
* @since 2.0
*/
PersonalLicensePackDescriptor getLicensePack();

Expand Down
8 changes: 4 additions & 4 deletions ...sage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/LicenseRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018, 2020 ArSysOp
* Copyright (c) 2018, 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
Expand All @@ -12,16 +12,16 @@
*******************************************************************************/
package org.eclipse.passage.loc.internal.licenses;

import java.util.Collection;

import org.eclipse.passage.lic.licenses.LicensePlanDescriptor;

/**
*
* @since 0.4.0
*
*/
public interface LicenseRegistry {

Iterable<? extends LicensePlanDescriptor> getLicensePlans();
Collection<? extends LicensePlanDescriptor> getLicensePlans();

LicensePlanDescriptor getLicensePlan(String licensePlanId);

Expand Down
3 changes: 2 additions & 1 deletion ...censes.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseDomainRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;

Expand Down Expand Up @@ -90,7 +91,7 @@ public String resolveIdentifier(LicensePlanDescriptor content) {
}

@Override
public Iterable<LicensePlanDescriptor> getLicensePlans() {
public Collection<LicensePlanDescriptor> getLicensePlans() {
return new ArrayList<>(licensePlanIndex.values());
}

Expand Down
1 change: 1 addition & 0 deletions ....loc.report.core/OSGI-INF/org.eclipse.passage.loc.report.internal.core.user.Customers.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<service>
<provide interface="org.eclipse.passage.loc.report.internal.core.user.CustomerStorage"/>
</service>
<reference bind="installLicensesRegistry" interface="org.eclipse.passage.loc.internal.licenses.LicenseRegistry" name="installLicensesRegistry"/>
<reference bind="installUserRegistry" interface="org.eclipse.passage.loc.internal.users.UserRegistry" name="installUserRegistry"/>
<implementation class="org.eclipse.passage.loc.report.internal.core.user.Customers"/>
</scr:component>
50 changes: 47 additions & 3 deletions ...sage.loc.report.core/src/org/eclipse/passage/loc/report/internal/core/user/Customers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@
*******************************************************************************/
package org.eclipse.passage.loc.report.internal.core.user;

import java.util.Collections;
import java.util.Collection;
import java.util.Set;
import java.util.stream.Collectors;

import org.eclipse.passage.lic.licenses.LicensePlanDescriptor;
import org.eclipse.passage.lic.licenses.PersonalLicensePackDescriptor;
import org.eclipse.passage.lic.users.UserDescriptor;
import org.eclipse.passage.loc.internal.licenses.LicenseRegistry;
import org.eclipse.passage.loc.internal.users.UserRegistry;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
Expand All @@ -38,15 +42,26 @@
public final class Customers implements CustomerStorage {

private UserRegistry users;
private LicenseRegistry licenses;

@Override
public Set<UserDescriptor> forProducts(Set<String> products) {
return Collections.emptySet(); // TODO: fix after LicensePlanDescriptor gains 'personal' licenses
return licenses.getLicensePlans().stream() //
.map(plan -> productLicenses(plan, products))//
.flatMap(Collection::stream)//
.map(this::user)//
.distinct()//
.map(users::getUser)//
.collect(Collectors.toSet());
}

@Override
public Set<String> products() {
return Collections.emptySet(); // TODO:
return licenses.getLicensePlans().stream()//
.map(LicensePlanDescriptor::getPersonal)//
.flatMap(Collection::stream)//
.map(this::product)//
.collect(Collectors.toSet());
}

/**
Expand All @@ -60,4 +75,33 @@ public void installUserRegistry(UserRegistry registry) {
this.users = registry;
}

/**
* It is required to install {@code LIC} {@linkplain LicensesRegistry} as it is
* the source of information provided.
*
* @since 0.1
*/
@Reference
public void installLicensesRegistry(LicenseRegistry registry) {
this.licenses = registry;
}

private Set<PersonalLicensePackDescriptor> productLicenses(LicensePlanDescriptor plan, Set<String> products) {
return plan.getPersonal().stream()//
.filter(lic -> forProduct(lic, products))//
.collect(Collectors.toSet());
}

private boolean forProduct(PersonalLicensePackDescriptor lic, Set<String> products) {
return products.contains(lic.getLicense().getProduct().getIdentifier());
}

private String user(PersonalLicensePackDescriptor pack) {
return pack.getLicense().getUser().getIdentifier();
}

private String product(PersonalLicensePackDescriptor pack) {
return pack.getLicense().getProduct().getIdentifier();
}

}
2 changes: 2 additions & 0 deletions ...t.ui/src/org/eclipse/passage/loc/report/internal/ui/jface/user/ExportCustomersWizard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.eclipse.passage.loc.internal.products.ProductRegistry;
import org.eclipse.passage.loc.report.internal.core.user.CustomerExportService;
import org.eclipse.passage.loc.report.internal.core.user.CustomerStorage;
import org.eclipse.passage.loc.report.internal.ui.i18n.ExportCustomersWizardMessages;
import org.eclipse.passage.loc.report.internal.ui.i18n.ExportWizardMessages;
import org.eclipse.passage.loc.report.internal.ui.jface.FileForExport;
import org.eclipse.passage.loc.report.internal.ui.jface.TargetPage;
Expand All @@ -43,6 +44,7 @@ public ExportCustomersWizard(ProductRegistry products, CustomerStorage customers
this.preview = new PreviewPage(customers, data);
this.scope = new ScopePage(new Products(products, customers), preview);
this.target = new TargetPage(preview);
setWindowTitle(ExportCustomersWizardMessages.ExposedExportCustomersWizard_dialogTitle);
}

@Override
Expand Down
2 changes: 0 additions & 2 deletions ...c/org/eclipse/passage/loc/report/internal/ui/jface/user/ExposedExportCustomersWizard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import org.eclipse.passage.loc.internal.products.ProductRegistry;
import org.eclipse.passage.loc.report.internal.core.user.CustomerExportService;
import org.eclipse.passage.loc.report.internal.core.user.CustomerStorage;
import org.eclipse.passage.loc.report.internal.ui.i18n.ExportCustomersWizardMessages;
import org.eclipse.swt.widgets.Shell;

/**
Expand All @@ -43,7 +42,6 @@ public void accept(Shell shell) {
shell, //
new ExportCustomersWizard(products, customers, export)//
);
dialog.setTitle(ExportCustomersWizardMessages.ExposedExportCustomersWizard_dialogTitle);
dialog.setPageSize(700, 400);
dialog.open();
}
Expand Down
5 changes: 3 additions & 2 deletions ...port.core.tests/src/org/eclipse/passage/loc/report/internal/core/FakeLicenseRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -12,6 +12,7 @@
*******************************************************************************/
package org.eclipse.passage.loc.report.internal.core;

import java.util.Collection;
import java.util.List;

import org.eclipse.passage.lic.licenses.LicensePlanDescriptor;
Expand All @@ -26,7 +27,7 @@ public FakeLicenseRegistry(List<LicensePlanDescriptor> plans) {
}

@Override
public Iterable<? extends LicensePlanDescriptor> getLicensePlans() {
public Collection<LicensePlanDescriptor> getLicensePlans() {
return plans;
}

Expand Down