Skip to content

The Unified and Autonomous Development Platform

Simplify BuildManager.getBuildVersions

Robin Shen7ba002f5a951
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
index 5060306d84..da57b509b5 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
@@ -53,8 +53,7 @@ public interface BuildManager extends EntityManager<Build> {
Collection<String> getJobNames(@Nullable Project project);
- Collection<String> getBuildVersions(@Nullable Project project);
+ Collection<String> getBuildVersions(Project project);
Map<Project, Collection<String>> getAccessibleJobNames(@Nullable Project project, @Nullable User user);
-
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
index c27c9141a6..5e0c05a4f8 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
@@ -732,15 +732,14 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
}
@Override
- public Collection<String> getBuildVersions(@Nullable Project project) {
+ public Collection<String> getBuildVersions(Project project) {
buildVersionsLock.readLock().lock();
try {
- Collection<String> buildVersions = new HashSet<>();
- for (Map.Entry<Long, Collection<String>> entry: this.buildVersions.entrySet()) {
- if (project == null || project.getId().equals(entry.getKey()))
- buildVersions.addAll(entry.getValue());
- }
- return buildVersions;
+ Collection<String> buildVersionsOfProject = buildVersions.get(project.getId());
+ if (buildVersionsOfProject != null)
+ return new HashSet<>(buildVersionsOfProject);
+ else
+ return new HashSet<>();
} finally {
buildVersionsLock.readLock().unlock();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index f246e46b9b..e514fd7aca 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -330,7 +330,7 @@ public class SuggestionUtils {
return suggestions;
}
- public static List<InputSuggestion> suggestBuildVersions(@Nullable Project project, String matchWith) {
+ public static List<InputSuggestion> suggestBuildVersions(Project project, String matchWith) {
Collection<String> buildVersions = OneDev.getInstance(BuildManager.class).getBuildVersions(project);
List<InputSuggestion> suggestions = new ArrayList<>();
for (String buildVersion: buildVersions) {