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

Jump to bottom

Correctly consider cardinality based on the directives #474

Merged
merged 1 commit into from
Apr 29, 2024
Merged

Correctly consider cardinality based on the directives #474

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
33 changes: 25 additions & 8 deletions ...inox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,10 +398,10 @@ protected void addRequirement(List<IRequirement> reqsDeps, GenericSpecification
Map<String, String> directives = req.getDirectives();

String capFilter = directives.get(Namespace.REQUIREMENT_FILTER_DIRECTIVE);
boolean optional = directives.get(Namespace.REQUIREMENT_RESOLUTION_DIRECTIVE) == Namespace.RESOLUTION_OPTIONAL;
boolean greedy = optional ? INSTALLATION_GREEDY.equals(directives.get(INSTALLATION_DIRECTIVE)) : true;

IRequirement requireCap = MetadataFactory.createRequirement(namespace, capFilter, null, optional ? 0 : 1, 1,
boolean greedy = isGreedy(directives);
int minCard = getMinCardinality(directives);
int maxCard = getMaxCardinality(directives);
IRequirement requireCap = MetadataFactory.createRequirement(namespace, capFilter, null, minCard, maxCard,
greedy);
reqsDeps.add(requireCap);
}
Expand All @@ -414,14 +414,31 @@ protected void addRequirement(List<IRequirement> reqsDeps, GenericSpecification
Map<String, String> directives = req.getDirectives();

String capFilter = directives.get(Namespace.REQUIREMENT_FILTER_DIRECTIVE);
boolean optional = directives.get(Namespace.REQUIREMENT_RESOLUTION_DIRECTIVE) == Namespace.RESOLUTION_OPTIONAL;
boolean greedy = optional ? INSTALLATION_GREEDY.equals(directives.get(INSTALLATION_DIRECTIVE)) : true;

IRequirement requireCap = MetadataFactory.createRequirement(namespace, capFilter, null, optional ? 0 : 1, 1,
boolean greedy = isGreedy(directives);
int minCard = getMinCardinality(directives);
int maxCard = getMaxCardinality(directives);
IRequirement requireCap = MetadataFactory.createRequirement(namespace, capFilter, null, minCard, maxCard,
greedy, bd.getSymbolicName());
reqsDeps.add(requireCap);
}

protected int getMinCardinality(Map<String, String> directives) {
return Namespace.RESOLUTION_OPTIONAL.equals(directives.get(Namespace.REQUIREMENT_RESOLUTION_DIRECTIVE)) ? 0 : 1;
}

protected int getMaxCardinality(Map<String, String> directives) {
return Namespace.CARDINALITY_MULTIPLE.equals(directives.get(Namespace.REQUIREMENT_CARDINALITY_DIRECTIVE))
? Integer.MAX_VALUE
: 1;
}

protected boolean isGreedy(Map<String, String> directives) {
if (getMinCardinality(directives) == 0) {
return INSTALLATION_GREEDY.equals(directives.get(INSTALLATION_DIRECTIVE));
}
return true;
}

protected void addCapability(List<IProvidedCapability> caps, GenericDescription provideCapDesc,
InstallableUnitDescription iu, int capNo) {
// Convert the values to String, Version, List of String or Version
Expand Down
22 changes: 22 additions & 0 deletions ...quinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/BundlesActionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import org.eclipse.equinox.internal.p2.metadata.ArtifactKey;
import org.eclipse.equinox.internal.p2.metadata.OSGiVersion;
import org.eclipse.equinox.internal.p2.metadata.RequiredCapability;
import org.eclipse.equinox.internal.p2.metadata.RequiredPropertiesMatch;
import org.eclipse.equinox.internal.p2.metadata.TranslationSupport;
import org.eclipse.equinox.p2.metadata.IArtifactKey;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
Expand Down Expand Up @@ -515,6 +516,27 @@ public void testPublishBundlesWhereOneBundleIsInvalid() throws Exception {
assertThat(ius.size(), is(1));
}

public void testMultiRequired() throws Exception {
File testData = new File(TestActivator.getTestDataFolder(), "requireMultiple");
IInstallableUnit iu = BundlesAction.createBundleIU(BundlesAction.createBundleDescription(testData), null,
new PublisherInfo());
Map<String, List<RequiredPropertiesMatch>> map = iu.getRequirements().stream()
.filter(RequiredPropertiesMatch.class::isInstance)
.map(RequiredPropertiesMatch.class::cast)
.collect(Collectors.groupingBy(m -> RequiredPropertiesMatch.extractNamespace(m.getMatches())));
assertCardinality(map.get("single.required"), 1, 1);
assertCardinality(map.get("single.optional"), 0, 1);
assertCardinality(map.get("multiple.required"), 1, Integer.MAX_VALUE);
assertCardinality(map.get("multiple.optional"), 0, Integer.MAX_VALUE);
}

protected void assertCardinality(List<RequiredPropertiesMatch> matches, int min, int max) {
assertNotNull(matches);
assertEquals(1, matches.size());
assertEquals(min, matches.get(0).getMin());
assertEquals(max, matches.get(0).getMax());
}

public void testMultiVersionCapability() throws Exception {
File testData = getTestData("dymamicImport", "testData/multiVersionCapability/bundle1");
IInstallableUnit iu = BundlesAction.createBundleIU(BundlesAction.createBundleDescription(testData), null,
Expand Down
9 changes: 9 additions & 0 deletions bundles/org.eclipse.equinox.p2.tests/testData/requireMultiple/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: require.multiple
Bundle-SymbolicName: require.multiple
Bundle-Version: 1.0.0
Require-Capability: single.required;filter:="(objectClass=testme)",
single.optional;filter:="(objectClass=testme)";resolution:=optional,
multiple.required;filter:="(objectClass=testme)";cardinality:=multiple,
multiple.optional;filter:="(objectClass=testme)";cardinality:=multiple;resolution:=optional
Loading