Skip to content

Commit

Permalink
Bug 547799 LicensePack should have information about Licensing Operator
Browse files Browse the repository at this point in the history 
Rename public structures properly

Signed-off-by: eparovyshnaya <[email protected]>
  • Loading branch information
@eparovyshnaya
eparovyshnaya committed May 25, 2021
1 parent b53ada3 commit b2f5493
Show file tree
Hide file tree
Showing 12 changed files with 55 additions and 55 deletions.
2 changes: 1 addition & 1 deletion ....passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/ConditionOrigin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ public interface ConditionOrigin {

String coordinates();

LicenseSignature signature();
IssuerSignature signature();

}
4 changes: 2 additions & 2 deletions ...rnal/api/conditions/LicenseSignature.java → ...ernal/api/conditions/IssuerSignature.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
import java.util.Map;
import java.util.Optional;

public interface LicenseSignature {
public interface IssuerSignature {

Map<String, String> attributes();

Optional<LicenseSignature> parent();
Optional<IssuerSignature> parent();

}
4 changes: 2 additions & 2 deletions ....lic.api/src/org/eclipse/passage/lic/internal/api/conditions/LicenseSignatureIsEmpty.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

import java.util.function.Predicate;

public final class LicenseSignatureIsEmpty implements Predicate<LicenseSignature> {
public final class LicenseSignatureIsEmpty implements Predicate<IssuerSignature> {

@Override
public boolean test(LicenseSignature signature) {
public boolean test(IssuerSignature signature) {
return signature.attributes().isEmpty() && !signature.parent().isPresent();
}

Expand Down
8 changes: 4 additions & 4 deletions ...ic.api/src/org/eclipse/passage/lic/internal/api/conditions/mining/ConditionTransport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import java.util.Optional;

import org.eclipse.passage.lic.internal.api.conditions.Condition;
import org.eclipse.passage.lic.internal.api.conditions.LicenseSignature;
import org.eclipse.passage.lic.internal.api.conditions.IssuerSignature;
import org.eclipse.passage.lic.internal.api.registry.Service;

/**
Expand All @@ -37,7 +37,7 @@ public interface ConditionTransport extends Service<ContentType> {
public static final class Data {

private final Collection<Condition> conditions;
private final Optional<LicenseSignature> signature;
private final Optional<IssuerSignature> signature;

public Data() {
this(Collections.emptyList(), Optional.empty());
Expand All @@ -47,7 +47,7 @@ public Data(Collection<Condition> conditions) {
this(conditions, Optional.empty());
}

public Data(Collection<Condition> conditions, Optional<LicenseSignature> signature) {
public Data(Collection<Condition> conditions, Optional<IssuerSignature> signature) {
this.conditions = conditions;
this.signature = signature;
}
Expand All @@ -56,7 +56,7 @@ public Collection<Condition> conditions() {
return conditions;
}

public Optional<LicenseSignature> signature() {
public Optional<IssuerSignature> signature() {
return signature;
}

Expand Down
14 changes: 7 additions & 7 deletions ...ge.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/BaseConditionOrigin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@

import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget;
import org.eclipse.passage.lic.internal.api.conditions.ConditionOrigin;
import org.eclipse.passage.lic.internal.api.conditions.LicenseSignature;
import org.eclipse.passage.lic.internal.api.conditions.IssuerSignature;

public final class BaseConditionOrigin implements ConditionOrigin {

private final ConditionMiningTarget miner;
private final String coordinates;
private final LicenseSignature signature;
private final IssuerSignature signature;

public BaseConditionOrigin(ConditionMiningTarget miner, String coordinates) {
this(miner, coordinates, new BaseLicenseSignature());
this(miner, coordinates, new BaseIssuerSignature());
}

public BaseConditionOrigin(ConditionMiningTarget miner, String coordinates, Optional<LicenseSignature> signature) {
this(miner, coordinates, signature.orElse(new BaseLicenseSignature()));
public BaseConditionOrigin(ConditionMiningTarget miner, String coordinates, Optional<IssuerSignature> signature) {
this(miner, coordinates, signature.orElse(new BaseIssuerSignature()));
}

public BaseConditionOrigin(ConditionMiningTarget miner, String coordinates, LicenseSignature signature) {
public BaseConditionOrigin(ConditionMiningTarget miner, String coordinates, IssuerSignature signature) {
Objects.requireNonNull(miner, "BaseConditionOrigin::miner"); //$NON-NLS-1$
Objects.requireNonNull(coordinates, "BaseConditionOrigin::coordinates"); //$NON-NLS-1$
Objects.requireNonNull(signature, "BaseConditionOrigin::signature"); //$NON-NLS-1$
Expand All @@ -53,7 +53,7 @@ public String coordinates() {
}

@Override
public LicenseSignature signature() {
public IssuerSignature signature() {
return signature;
}

Expand Down
16 changes: 8 additions & 8 deletions ...base/conditions/BaseLicenseSignature.java → .../base/conditions/BaseIssuerSignature.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,26 @@
import java.util.Objects;
import java.util.Optional;

import org.eclipse.passage.lic.internal.api.conditions.LicenseSignature;
import org.eclipse.passage.lic.internal.api.conditions.IssuerSignature;

public final class BaseLicenseSignature implements LicenseSignature {
public final class BaseIssuerSignature implements IssuerSignature {

private final Map<String, String> attributes;
private final Optional<LicenseSignature> parent;
private final Optional<IssuerSignature> parent;

public BaseLicenseSignature(Map<String, String> attributes, LicenseSignature parent) {
public BaseIssuerSignature(Map<String, String> attributes, IssuerSignature parent) {
this(attributes, Optional.of(parent));
}

public BaseLicenseSignature(Map<String, String> attributes) {
public BaseIssuerSignature(Map<String, String> attributes) {
this(attributes, Optional.empty());
}

public BaseLicenseSignature() {
public BaseIssuerSignature() {
this(Collections.emptyMap());
}

public BaseLicenseSignature(Map<String, String> attributes, Optional<LicenseSignature> parent) {
public BaseIssuerSignature(Map<String, String> attributes, Optional<IssuerSignature> parent) {
Objects.requireNonNull(attributes, "BaseLicenseSignature::attributes"); //$NON-NLS-1$
Objects.requireNonNull(parent, "BaseLicenseSignature::parent"); //$NON-NLS-1$
this.attributes = attributes;
Expand All @@ -50,7 +50,7 @@ public Map<String, String> attributes() {
}

@Override
public Optional<LicenseSignature> parent() {
public Optional<IssuerSignature> parent() {
return parent;
}

Expand Down
6 changes: 3 additions & 3 deletions ...lic.base/src/org/eclipse/passage/lic/internal/base/conditions/UnknownConditionOrigin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget;
import org.eclipse.passage.lic.internal.api.conditions.ConditionOrigin;
import org.eclipse.passage.lic.internal.api.conditions.LicenseSignature;
import org.eclipse.passage.lic.internal.api.conditions.IssuerSignature;

public final class UnknownConditionOrigin implements ConditionOrigin {

Expand All @@ -31,8 +31,8 @@ public String coordinates() {
}

@Override
public LicenseSignature signature() {
return new BaseLicenseSignature();
public IssuerSignature signature() {
return new BaseIssuerSignature();
}

}
4 changes: 2 additions & 2 deletions bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/Json.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import org.eclipse.passage.lic.internal.base.conditions.BaseCondition;
import org.eclipse.passage.lic.internal.base.conditions.BaseConditionOrigin;
import org.eclipse.passage.lic.internal.base.conditions.BaseEvaluationInstructions;
import org.eclipse.passage.lic.internal.base.conditions.BaseLicenseSignature;
import org.eclipse.passage.lic.internal.base.conditions.BaseIssuerSignature;
import org.eclipse.passage.lic.internal.base.conditions.BaseValidityPeriodClosed;
import org.eclipse.passage.lic.internal.base.conditions.BaseVersionMatch;
import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleForIdentifier;
Expand Down Expand Up @@ -98,7 +98,7 @@ public ConditionOrigin apply(JsonNode node) {
return new BaseConditionOrigin(//
new ConditionMiningTarget.Of(node.get("miner").textValue()), //$NON-NLS-1$
node.get("coordinates").textValue(), //$NON-NLS-1$
new BaseLicenseSignature()); // TODO:
new BaseIssuerSignature()); // TODO:
}

}
Expand Down
6 changes: 3 additions & 3 deletions ...censes.model/src/org/eclipse/passage/lic/internal/licenses/convert/ELicenseSignature.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import java.util.Objects;
import java.util.function.Supplier;

import org.eclipse.passage.lic.internal.api.conditions.LicenseSignature;
import org.eclipse.passage.lic.internal.api.conditions.IssuerSignature;
import org.eclipse.passage.lic.internal.api.conditions.LicenseSignatureIsEmpty;
import org.eclipse.passage.lic.licenses.model.api.Signature;
import org.eclipse.passage.lic.licenses.model.api.SignatureAttribute;
Expand All @@ -25,9 +25,9 @@
@SuppressWarnings("restriction")
public final class ELicenseSignature implements Supplier<Signature> {

private final LicenseSignature signature;
private final IssuerSignature signature;

public ELicenseSignature(LicenseSignature signature) {
public ELicenseSignature(IssuerSignature signature) {
Objects.requireNonNull(signature, "ELicenseSignature::signature"); //$NON-NLS-1$
this.signature = signature;
}
Expand Down
12 changes: 6 additions & 6 deletions ...censes.model/src/org/eclipse/passage/lic/internal/licenses/convert/PLicenseSignature.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
import java.util.function.Supplier;
import java.util.stream.Collectors;

import org.eclipse.passage.lic.internal.api.conditions.LicenseSignature;
import org.eclipse.passage.lic.internal.base.conditions.BaseLicenseSignature;
import org.eclipse.passage.lic.internal.api.conditions.IssuerSignature;
import org.eclipse.passage.lic.internal.base.conditions.BaseIssuerSignature;
import org.eclipse.passage.lic.licenses.model.api.Signature;
import org.eclipse.passage.lic.licenses.model.api.SignatureAttribute;

@SuppressWarnings("restriction")
public final class PLicenseSignature implements Supplier<LicenseSignature> {
public final class PLicenseSignature implements Supplier<IssuerSignature> {

private final Signature signature;

Expand All @@ -32,8 +32,8 @@ public PLicenseSignature(Signature signature) {
}

@Override
public LicenseSignature get() {
return new BaseLicenseSignature(attributes(), parent());
public IssuerSignature get() {
return new BaseIssuerSignature(attributes(), parent());
}

private Map<String, String> attributes() {
Expand All @@ -43,7 +43,7 @@ private Map<String, String> attributes() {
SignatureAttribute::getValue));
}

private Optional<LicenseSignature> parent() {
private Optional<IssuerSignature> parent() {
Signature parent = signature.getParent();
return parent == null //
? Optional.empty() //
Expand Down
30 changes: 15 additions & 15 deletions ...es.model/src/org/eclipse/passage/lic/internal/licenses/model/signature/SignatureData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,20 @@ public LicensingOperatorName(Signature signature) {

@Override
public String key() {
return "lic.operator.name"; //$NON-NLS-1$
return "issuer.name"; //$NON-NLS-1$
}

}

public static final class LicensingOperatorVersion extends SignatureData {

public LicensingOperatorVersion(Signature signature) {
super(signature);
}

@Override
public String key() {
return "issuer.version"; //$NON-NLS-1$
}

}
Expand All @@ -73,7 +86,7 @@ public OperatorLicensingStatus(Signature signature) {

@Override
public String key() {
return "lic.operator.licensing_status"; //$NON-NLS-1$
return "issuer.licensing_status"; //$NON-NLS-1$
}

public void notRequired() {
Expand All @@ -89,19 +102,6 @@ public void insufficient() {
}
}

public static final class LicensingOperatorVersion extends SignatureData {

public LicensingOperatorVersion(Signature signature) {
super(signature);
}

@Override
public String key() {
return "lic.operator.version"; //$NON-NLS-1$
}

}

public static final class Of extends SignatureData {

private final String name;
Expand Down
4 changes: 2 additions & 2 deletions ...rg/eclipse/passage/lic/internal/licenses/model/toberemoved/BaseXmiConditionTransport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.eclipse.emf.ecore.xmi.XMLResource;
import org.eclipse.passage.lic.internal.api.EvaluationType;
import org.eclipse.passage.lic.internal.api.conditions.Condition;
import org.eclipse.passage.lic.internal.api.conditions.LicenseSignature;
import org.eclipse.passage.lic.internal.api.conditions.IssuerSignature;
import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransport;
import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType;
import org.eclipse.passage.lic.internal.base.conditions.BaseCondition;
Expand Down Expand Up @@ -78,7 +78,7 @@ public Data read(InputStream input) throws IOException {
return new Data(conditions(license.get()), signature(license.get()));
}

private Optional<LicenseSignature> signature(PersonalLicensePack pack) {
private Optional<IssuerSignature> signature(PersonalLicensePack pack) {
if (pack.getLicense().getSignature() == null) {
return Optional.empty();
}
Expand Down

0 comments on commit b2f5493

Please sign in to comment.