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

Add support for repository tags #6116

Merged
merged 13 commits into from
Jun 21, 2024
Merged

Add support for repository tags #6116

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
52af186
allow tagging of repositories
chrisrueger May 8, 2024
ea7740d
use Set
chrisrueger May 8, 2024
359a405
add tagged support to more repos and edit dialog
chrisrueger May 8, 2024
dd36fe1
allow to use tag in -runrepos in .bndrun
chrisrueger May 8, 2024
b9a574f
rework - repos now have 'resolve' tag by default
chrisrueger May 10, 2024
34091a8
Merge remote-tracking branch 'upstream/master' into add-repository-tags
chrisrueger May 17, 2024
c08cce3
implement suggestions
chrisrueger May 17, 2024
e990f07
move matchesTags back to Tagged
chrisrueger May 17, 2024
7857d51
Tags implement Set using an internal sorted set
chrisrueger May 20, 2024
53cb0dc
improve tag matching
chrisrueger May 21, 2024
e46fd43
mention <<EMPTY>> placeholderin repo plugin UI
chrisrueger May 21, 2024
7f04909
make tags a combobox in Plugins UI
chrisrueger May 21, 2024
7313fbc
rename to Tags.includesAny
chrisrueger May 21, 2024
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
Prev Previous commit
Next Next commit
use Set 
Signed-off-by: Christoph Rueger <chrisrueger@gmail.com>
  • Loading branch information
@chrisrueger
chrisrueger committed May 8, 2024
commit ea7740d6139c4cc88d55ecd07ccd958cf1d32e1c
4 changes: 2 additions & 2 deletions biz.aQute.bndlib/src/aQute/bnd/osgi/repository/BaseRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public abstract class BaseRepository implements Repository, Tagged {
PromiseFactory.inlineExecutor());

private static final String DEFAULT_TAG = "all";
private static final List<String> DEFAULT_TAGS = List.of(DEFAULT_TAG);
private static final Set<String> DEFAULT_TAGS = Set.of(DEFAULT_TAG);

static {
Requirement requireAll = ResourceUtils.createWildcardRequirement();
Expand Down Expand Up @@ -249,7 +249,7 @@ public RequirementBuilder addAttribute(String name, Object value) {
}

@Override
public List<String> getTags() {
public Set<String> getTags() {
return DEFAULT_TAGS;
}
}
12 changes: 7 additions & 5 deletions biz.aQute.bndlib/src/aQute/bnd/service/Tagged.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package aQute.bnd.service;

import java.util.Arrays;
import java.util.List;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.stream.Collectors;

/**
* Allows to add tags to implementing classes. Originally intended for tagging
Expand All @@ -12,16 +14,16 @@ public interface Tagged {
/**
* @return a non-null list of tags.
*/
List<String> getTags();
Set<String> getTags();

static List<String> toTags(String csvTags) {
static Set<String> toTags(String csvTags) {
if (csvTags == null || csvTags.isBlank()) {
return List.of("all"); // default
return Set.of("all"); // default
}

return Arrays.stream(csvTags.split(","))
.map(String::trim)
.toList();
.collect(Collectors.toCollection(LinkedHashSet::new));
}

}
2 changes: 1 addition & 1 deletion biz.aQute.repository/src/aQute/bnd/repository/maven/provider/MavenBndRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,7 +1077,7 @@ public boolean isRemote() {
}

@Override
public List<String> getTags() {
public Set<String> getTags() {
return Tagged.toTags(configuration.tags());
}
}