Skip to content

The Unified and Autonomous Development Platform

feat: restful api to manage label specs and assign project/build/pull request labels (#1394)

Robin Shen98a22fc621ea
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index 444595956a..ee9825a2fc 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -284,7 +284,7 @@ public class CoreModule extends AbstractPluginModule {
bind(DashboardUserShareManager.class).to(DefaultDashboardUserShareManager.class);
bind(DashboardGroupShareManager.class).to(DefaultDashboardGroupShareManager.class);
bind(DashboardVisitManager.class).to(DefaultDashboardVisitManager.class);
- bind(LabelManager.class).to(DefaultLabelManager.class);
+ bind(LabelSpecManager.class).to(DefaultLabelSpecManager.class);
bind(ProjectLabelManager.class).to(DefaultProjectLabelManager.class);
bind(BuildLabelManager.class).to(DefaultBuildLabelManager.class);
bind(PullRequestLabelManager.class).to(DefaultPullRequestLabelManager.class);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildLabelManager.java
index 2bba358d1a..9d8e6e7160 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildLabelManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildLabelManager.java
@@ -1,7 +1,10 @@
package io.onedev.server.entitymanager;
import io.onedev.server.model.BuildLabel;
+import io.onedev.server.model.ProjectLabel;
public interface BuildLabelManager extends EntityLabelManager<BuildLabel> {
+
+ void create(BuildLabel buildLabel);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/LabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/LabelSpecManager.java
similarity index 66%
rename from server-core/src/main/java/io/onedev/server/entitymanager/LabelManager.java
rename to server-core/src/main/java/io/onedev/server/entitymanager/LabelSpecManager.java
index 50d2219d6a..a1201bf5cd 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/LabelManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/LabelSpecManager.java
@@ -7,7 +7,7 @@ import javax.annotation.Nullable;
import io.onedev.server.model.LabelSpec;
import io.onedev.server.persistence.dao.EntityManager;
-public interface LabelManager extends EntityManager<LabelSpec> {
+public interface LabelSpecManager extends EntityManager<LabelSpec> {
@Nullable
LabelSpec find(String name);
@@ -16,6 +16,10 @@ public interface LabelManager extends EntityManager<LabelSpec> {
List<LabelSpec> query(@Nullable String term, int firstResult, int maxResults);
- void sync(List<LabelSpec> labels);
+ void sync(List<LabelSpec> labelSpecs);
+
+ void create(LabelSpec labelSpec);
+
+ void update(LabelSpec labelSpec);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectLabelManager.java
index 6fb60ba615..bf27cc00d1 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectLabelManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectLabelManager.java
@@ -4,4 +4,6 @@ import io.onedev.server.model.ProjectLabel;
public interface ProjectLabelManager extends EntityLabelManager<ProjectLabel> {
+ void create(ProjectLabel projectLabel);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestLabelManager.java
index d253dfde2d..ce3c08beb8 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestLabelManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestLabelManager.java
@@ -3,5 +3,7 @@ package io.onedev.server.entitymanager;
import io.onedev.server.model.PullRequestLabel;
public interface PullRequestLabelManager extends EntityLabelManager<PullRequestLabel> {
+
+ void create(PullRequestLabel pullRequestLabel);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/BaseEntityLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/BaseEntityLabelManager.java
index 06b9ba8a7d..92874b359a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/BaseEntityLabelManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/BaseEntityLabelManager.java
@@ -1,6 +1,6 @@
package io.onedev.server.entitymanager.impl;
-import io.onedev.server.entitymanager.LabelManager;
+import io.onedev.server.entitymanager.LabelSpecManager;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.LabelSpec;
import io.onedev.server.model.support.EntityLabel;
@@ -16,12 +16,12 @@ import java.util.stream.Collectors;
public abstract class BaseEntityLabelManager<T extends EntityLabel> extends BaseEntityManager<T> {
- private final LabelManager labelManager;
+ private final LabelSpecManager labelSpecManager;
@Inject
- public BaseEntityLabelManager(Dao dao, LabelManager labelManager) {
+ public BaseEntityLabelManager(Dao dao, LabelSpecManager labelSpecManager) {
super(dao);
- this.labelManager = labelManager;
+ this.labelSpecManager = labelSpecManager;
}
@Transactional
@@ -36,7 +36,7 @@ public abstract class BaseEntityLabelManager<T extends EntityLabel> extends Base
.map(it->it.getSpec().getName())
.collect(Collectors.toSet());
labelNames.stream().filter(it->!existingLabelNames.contains(it)).forEach(it-> {
- var label = newEntityLabel((AbstractEntity) entity, labelManager.find(it));
+ var label = newEntityLabel((AbstractEntity) entity, labelSpecManager.find(it));
dao.persist(label);
entity.getLabels().add(label);
});
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildLabelManager.java
index 1e35427385..c061d4c597 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildLabelManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildLabelManager.java
@@ -1,30 +1,37 @@
-package io.onedev.server.entitymanager.impl;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import io.onedev.server.entitymanager.BuildLabelManager;
-import io.onedev.server.entitymanager.LabelManager;
-import io.onedev.server.model.AbstractEntity;
-import io.onedev.server.model.Build;
-import io.onedev.server.model.BuildLabel;
-import io.onedev.server.model.LabelSpec;
-import io.onedev.server.persistence.dao.Dao;
-
-@Singleton
-public class DefaultBuildLabelManager extends BaseEntityLabelManager<BuildLabel> implements BuildLabelManager {
-
- @Inject
- public DefaultBuildLabelManager(Dao dao, LabelManager labelManager) {
- super(dao, labelManager);
- }
-
- @Override
- protected BuildLabel newEntityLabel(AbstractEntity entity, LabelSpec spec) {
- var label = new BuildLabel();
- label.setBuild((Build) entity);
- label.setSpec(spec);
- return label;
- }
-
+package io.onedev.server.entitymanager.impl;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import com.google.common.base.Preconditions;
+import io.onedev.server.entitymanager.BuildLabelManager;
+import io.onedev.server.entitymanager.LabelSpecManager;
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.BuildLabel;
+import io.onedev.server.model.LabelSpec;
+import io.onedev.server.persistence.dao.Dao;
+
+@Singleton
+public class DefaultBuildLabelManager extends BaseEntityLabelManager<BuildLabel> implements BuildLabelManager {
+
+ @Inject
+ public DefaultBuildLabelManager(Dao dao, LabelSpecManager labelSpecManager) {
+ super(dao, labelSpecManager);
+ }
+
+ @Override
+ protected BuildLabel newEntityLabel(AbstractEntity entity, LabelSpec spec) {
+ var label = new BuildLabel();
+ label.setBuild((Build) entity);
+ label.setSpec(spec);
+ return label;
+ }
+
+ @Override
+ public void create(BuildLabel buildLabel) {
+ Preconditions.checkState(buildLabel.isNew());
+ dao.persist(buildLabel);
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLabelSpecManager.java
similarity index 71%
rename from server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLabelManager.java
rename to server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLabelSpecManager.java
index 77e98f9643..63aa025fa1 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLabelManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLabelSpecManager.java
@@ -6,11 +6,12 @@ import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.base.Preconditions;
import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
-import io.onedev.server.entitymanager.LabelManager;
+import io.onedev.server.entitymanager.LabelSpecManager;
import io.onedev.server.model.LabelSpec;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
@@ -19,10 +20,10 @@ import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
@Singleton
-public class DefaultLabelManager extends BaseEntityManager<LabelSpec> implements LabelManager {
+public class DefaultLabelSpecManager extends BaseEntityManager<LabelSpec> implements LabelSpecManager {
@Inject
- public DefaultLabelManager(Dao dao) {
+ public DefaultLabelSpecManager(Dao dao) {
super(dao);
}
@@ -58,13 +59,26 @@ public class DefaultLabelManager extends BaseEntityManager<LabelSpec> implements
@Transactional
@Override
- public void sync(List<LabelSpec> labels) {
- for (var label: labels)
+ public void sync(List<LabelSpec> labelSpecs) {
+ for (var label: labelSpecs)
dao.persist(label);
for (var existingLabel: query()) {
- if (!labels.contains(existingLabel))
+ if (!labelSpecs.contains(existingLabel))
delete(existingLabel);
}
}
-
+
+ @Transactional
+ @Override
+ public void create(LabelSpec labelSpec) {
+ Preconditions.checkState(labelSpec.isNew());
+ dao.persist(labelSpec);
+ }
+
+ @Transactional
+ @Override
+ public void update(LabelSpec labelSpec) {
+ Preconditions.checkState(!labelSpec.isNew());
+ dao.persist(labelSpec);
+ }
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectLabelManager.java
index 24ea711124..5a01f773da 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectLabelManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectLabelManager.java
@@ -1,30 +1,37 @@
-package io.onedev.server.entitymanager.impl;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import io.onedev.server.entitymanager.LabelManager;
-import io.onedev.server.entitymanager.ProjectLabelManager;
-import io.onedev.server.model.AbstractEntity;
-import io.onedev.server.model.LabelSpec;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.ProjectLabel;
-import io.onedev.server.persistence.dao.Dao;
-
-@Singleton
-public class DefaultProjectLabelManager extends BaseEntityLabelManager<ProjectLabel> implements ProjectLabelManager {
-
- @Inject
- public DefaultProjectLabelManager(Dao dao, LabelManager labelManager) {
- super(dao, labelManager);
- }
-
- @Override
- protected ProjectLabel newEntityLabel(AbstractEntity entity, LabelSpec spec) {
- var label = new ProjectLabel();
- label.setProject((Project) entity);
- label.setSpec(spec);
- return label;
- }
-
+package io.onedev.server.entitymanager.impl;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import com.google.common.base.Preconditions;
+import io.onedev.server.entitymanager.LabelSpecManager;
+import io.onedev.server.entitymanager.ProjectLabelManager;
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.model.LabelSpec;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.ProjectLabel;
+import io.onedev.server.persistence.dao.Dao;
+
+@Singleton
+public class DefaultProjectLabelManager extends BaseEntityLabelManager<ProjectLabel> implements ProjectLabelManager {
+
+ @Inject
+ public DefaultProjectLabelManager(Dao dao, LabelSpecManager labelSpecManager) {
+ super(dao, labelSpecManager);
+ }
+
+ @Override
+ protected ProjectLabel newEntityLabel(AbstractEntity entity, LabelSpec spec) {
+ var label = new ProjectLabel();
+ label.setProject((Project) entity);
+ label.setSpec(spec);
+ return label;
+ }
+
+ @Override
+ public void create(ProjectLabel projectLabel) {
+ Preconditions.checkState(projectLabel.isNew());
+ dao.persist(projectLabel);
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestLabelManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestLabelManager.java
index 81b5bd794c..fe01f6e591 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestLabelManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestLabelManager.java
@@ -1,31 +1,35 @@
-package io.onedev.server.entitymanager.impl;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import io.onedev.server.entitymanager.LabelManager;
-import io.onedev.server.entitymanager.PullRequestLabelManager;
-import io.onedev.server.model.AbstractEntity;
-import io.onedev.server.model.LabelSpec;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestLabel;
-import io.onedev.server.persistence.dao.Dao;
-
-@Singleton
-public class DefaultPullRequestLabelManager extends BaseEntityLabelManager<PullRequestLabel>
- implements PullRequestLabelManager {
-
- @Inject
- public DefaultPullRequestLabelManager(Dao dao, LabelManager labelManager) {
- super(dao, labelManager);
- }
-
- @Override
- protected PullRequestLabel newEntityLabel(AbstractEntity entity, LabelSpec spec) {
- var label = new PullRequestLabel();
- label.setRequest((PullRequest) entity);
- label.setSpec(spec);
- return label;
- }
-
+package io.onedev.server.entitymanager.impl;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import com.google.common.base.Preconditions;
+import io.onedev.server.entitymanager.LabelSpecManager;
+import io.onedev.server.entitymanager.PullRequestLabelManager;
+import io.onedev.server.model.*;
+import io.onedev.server.persistence.dao.Dao;
+
+@Singleton
+public class DefaultPullRequestLabelManager extends BaseEntityLabelManager<PullRequestLabel>
+ implements PullRequestLabelManager {
+
+ @Inject
+ public DefaultPullRequestLabelManager(Dao dao, LabelSpecManager labelSpecManager) {
+ super(dao, labelSpecManager);
+ }
+
+ @Override
+ protected PullRequestLabel newEntityLabel(AbstractEntity entity, LabelSpec spec) {
+ var label = new PullRequestLabel();
+ label.setRequest((PullRequest) entity);
+ label.setSpec(spec);
+ return label;
+ }
+
+ @Override
+ public void create(PullRequestLabel pullRequestLabel) {
+ Preconditions.checkState(pullRequestLabel.isNew());
+ dao.persist(pullRequestLabel);
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/model/BuildLabel.java b/server-core/src/main/java/io/onedev/server/model/BuildLabel.java
index fe34a96850..489441978e 100644
--- a/server-core/src/main/java/io/onedev/server/model/BuildLabel.java
+++ b/server-core/src/main/java/io/onedev/server/model/BuildLabel.java
@@ -9,6 +9,7 @@ import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import io.onedev.server.model.support.EntityLabel;
+import io.onedev.server.rest.annotation.Api;
@Entity
@Table(
@@ -25,10 +26,12 @@ public class BuildLabel extends EntityLabel {
@ManyToOne
@JoinColumn(nullable=false)
+ @Api(description = "id of <a href='/~help/api/io.onedev.server.rest.BuildResource'>build</a>")
private Build build;
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
+ @Api(description = "id of <a href='/~help/api/io.onedev.server.rest.LabelSpecResource'>label spec</a>")
private LabelSpec spec;
public Build getBuild() {
diff --git a/server-core/src/main/java/io/onedev/server/model/LabelSpec.java b/server-core/src/main/java/io/onedev/server/model/LabelSpec.java
index b208735a45..02026e0943 100644
--- a/server-core/src/main/java/io/onedev/server/model/LabelSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/LabelSpec.java
@@ -13,6 +13,7 @@ import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.validation.constraints.NotEmpty;
+import io.onedev.server.rest.annotation.Api;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -33,6 +34,7 @@ public class LabelSpec extends AbstractEntity {
private String name;
@Column(nullable=false)
+ @Api(example = "#0d87e9")
private String color = "#0d87e9";
@OneToMany(mappedBy="spec", cascade=CascadeType.REMOVE)
diff --git a/server-core/src/main/java/io/onedev/server/model/ProjectLabel.java b/server-core/src/main/java/io/onedev/server/model/ProjectLabel.java
index e1479cc24b..b4bfec349e 100644
--- a/server-core/src/main/java/io/onedev/server/model/ProjectLabel.java
+++ b/server-core/src/main/java/io/onedev/server/model/ProjectLabel.java
@@ -9,6 +9,7 @@ import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import io.onedev.server.model.support.EntityLabel;
+import io.onedev.server.rest.annotation.Api;
@Entity
@Table(
@@ -25,10 +26,12 @@ public class ProjectLabel extends EntityLabel {
@ManyToOne
@JoinColumn(nullable=false)
+ @Api(description = "id of <a href='/~help/api/io.onedev.server.rest.ProjectResource'>project</a>")
private Project project;
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
+ @Api(description = "id of <a href='/~help/api/io.onedev.server.rest.LabelSpecResource'>label spec</a>")
private LabelSpec spec;
public Project getProject() {
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestLabel.java b/server-core/src/main/java/io/onedev/server/model/PullRequestLabel.java
index 05b7a1bdc1..cf5bc1e109 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequestLabel.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestLabel.java
@@ -9,6 +9,7 @@ import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import io.onedev.server.model.support.EntityLabel;
+import io.onedev.server.rest.annotation.Api;
@Entity
@Table(
@@ -25,10 +26,12 @@ public class PullRequestLabel extends EntityLabel {
@ManyToOne
@JoinColumn(nullable=false)
+ @Api(description = "id of <a href='/~help/api/io.onedev.server.rest.PullRequestResource'>pull request</a>")
private PullRequest request;
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
+ @Api(description = "id of <a href='/~help/api/io.onedev.server.rest.LabelSpecResource'>label spec</a>")
private LabelSpec spec;
public PullRequest getRequest() {
diff --git a/server-core/src/main/java/io/onedev/server/rest/BuildLabelResource.java b/server-core/src/main/java/io/onedev/server/rest/BuildLabelResource.java
new file mode 100644
index 0000000000..9edd6c72a1
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/rest/BuildLabelResource.java
@@ -0,0 +1,50 @@
+package io.onedev.server.rest;
+
+import io.onedev.server.entitymanager.BuildLabelManager;
+import io.onedev.server.model.BuildLabel;
+import io.onedev.server.rest.annotation.Api;
+import io.onedev.server.security.SecurityUtils;
+import org.apache.shiro.authz.UnauthorizedException;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+@Api(order=10400)
+@Path("/build-labels")
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+@Singleton
+public class BuildLabelResource {
+
+ private final BuildLabelManager buildLabelManager;
+
+ @Inject
+ public BuildLabelResource(BuildLabelManager buildLabelManager) {
+ this.buildLabelManager = buildLabelManager;
+ }
+
+ @Api(order=200, description="Create build label")
+ @POST
+ public Long create(@NotNull BuildLabel buildLabel) {
+ if (!SecurityUtils.canManage(buildLabel.getBuild()))
+ throw new UnauthorizedException();
+ buildLabelManager.create(buildLabel);
+ return buildLabel.getId();
+ }
+
+ @Api(order=300)
+ @Path("/{buildLabelId}")
+ @DELETE
+ public Response delete(@PathParam("buildLabelId") Long buildLabelId) {
+ BuildLabel buildLabel = buildLabelManager.load(buildLabelId);
+ if (!SecurityUtils.canManage(buildLabel.getBuild()))
+ throw new UnauthorizedException();
+ buildLabelManager.delete(buildLabel);
+ return Response.ok().build();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/rest/BuildResource.java b/server-core/src/main/java/io/onedev/server/rest/BuildResource.java
index f4b3da1694..4538d702f6 100644
--- a/server-core/src/main/java/io/onedev/server/rest/BuildResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/BuildResource.java
@@ -17,6 +17,7 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import io.onedev.server.model.BuildLabel;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.shiro.authz.UnauthorizedException;
@@ -58,6 +59,16 @@ public class BuildResource {
return build;
}
+ @Api(order=150, description = "Get list of <a href='/~help/api/io.onedev.server.rest.BuildLabelResource'>labels</a>")
+ @Path("/{buildId}/labels")
+ @GET
+ public Collection<BuildLabel> getLabels(@PathParam("buildId") Long buildId) {
+ Build build = buildManager.load(buildId);
+ if (!SecurityUtils.canAccess(build))
+ throw new UnauthorizedException();
+ return build.getLabels();
+ }
+
@Api(order=200)
@Path("/{buildId}/params")
@GET
@@ -108,7 +119,7 @@ public class BuildResource {
@Api(order=600)
@GET
public List<Build> queryBasicInfo(
- @QueryParam("query") @Api(description="Syntax of this query is the same as query box in <a href='/builds'>builds page</a>", example="\"Number\" is \"projectName#100\"") String query,
+ @QueryParam("query") @Api(description="Syntax of this query is the same as query box in <a href='/~builds'>builds page</a>", example="\"Number\" is \"projectName#100\"") String query,
@QueryParam("offset") @Api(example="0") int offset,
@QueryParam("count") @Api(example="100") int count) {
diff --git a/server-core/src/main/java/io/onedev/server/rest/IssueResource.java b/server-core/src/main/java/io/onedev/server/rest/IssueResource.java
index 0d6835bbc8..bc7af765d6 100644
--- a/server-core/src/main/java/io/onedev/server/rest/IssueResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/IssueResource.java
@@ -184,7 +184,7 @@ public class IssueResource {
@Api(order=900)
@GET
public List<Issue> queryBasicInfo(
- @QueryParam("query") @Api(description="Syntax of this query is the same as query box in <a href='/issues'>issues page</a>", example="\"Number\" is \"projectName#100\"") String query,
+ @QueryParam("query") @Api(description="Syntax of this query is the same as query box in <a href='/~issues'>issues page</a>", example="\"Number\" is \"projectName#100\"") String query,
@QueryParam("offset") @Api(example="0") int offset,
@QueryParam("count") @Api(example="100") int count) {
diff --git a/server-core/src/main/java/io/onedev/server/rest/LabelSpecResource.java b/server-core/src/main/java/io/onedev/server/rest/LabelSpecResource.java
new file mode 100644
index 0000000000..f1b5a67f13
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/rest/LabelSpecResource.java
@@ -0,0 +1,93 @@
+package io.onedev.server.rest;
+
+import io.onedev.server.entitymanager.LabelSpecManager;
+import io.onedev.server.model.LabelSpec;
+import io.onedev.server.persistence.dao.EntityCriteria;
+import io.onedev.server.rest.annotation.Api;
+import io.onedev.server.rest.exception.InvalidParamException;
+import io.onedev.server.rest.support.RestConstants;
+import io.onedev.server.security.SecurityUtils;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.hibernate.criterion.MatchMode;
+import org.hibernate.criterion.Restrictions;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.List;
+
+@Api(order=10200)
+@Path("/label-specs")
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+@Singleton
+public class LabelSpecResource {
+
+ private final LabelSpecManager labelSpecManager;
+
+ @Inject
+ public LabelSpecResource(LabelSpecManager labelSpecManager) {
+ this.labelSpecManager = labelSpecManager;
+ }
+
+ @Api(order=100)
+ @Path("/{labelSpecId}")
+ @GET
+ public LabelSpec get(@PathParam("labelSpecId") Long labelSpecId) {
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+ return labelSpecManager.load(labelSpecId);
+ }
+
+ @Api(order=400)
+ @GET
+ public List<LabelSpec> query(@QueryParam("name") String name,
+ @QueryParam("offset") @Api(example="0") int offset,
+ @QueryParam("count") @Api(example="100") int count) {
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+
+ if (count > RestConstants.MAX_PAGE_SIZE)
+ throw new InvalidParamException("Count should not be greater than " + RestConstants.MAX_PAGE_SIZE);
+
+ EntityCriteria<LabelSpec> criteria = EntityCriteria.of(LabelSpec.class);
+ if (name != null)
+ criteria.add(Restrictions.ilike("name", name.replace('*', '%'), MatchMode.EXACT));
+
+ return labelSpecManager.query(criteria, offset, count);
+ }
+
+ @Api(order=500, description="Create new label spec")
+ @POST
+ public Long create(@NotNull LabelSpec labelSpec) {
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+
+ labelSpecManager.create(labelSpec);
+ return labelSpec.getId();
+ }
+
+ @Api(order=550, description="Update label spec of specified id")
+ @Path("/{labelSpecId}")
+ @POST
+ public Response update(@PathParam("labelSpecId") Long labelSpecId, @NotNull LabelSpec labelSpec) {
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+ labelSpecManager.update(labelSpec);
+ return Response.ok().build();
+ }
+
+ @Api(order=600)
+ @Path("/{labelSpecId}")
+ @DELETE
+ public Response delete(@PathParam("labelSpecId") Long labelSpecId) {
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+ labelSpecManager.delete(labelSpecManager.load(labelSpecId));
+ return Response.ok().build();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/rest/ProjectLabelResource.java b/server-core/src/main/java/io/onedev/server/rest/ProjectLabelResource.java
new file mode 100644
index 0000000000..7309870b0e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/rest/ProjectLabelResource.java
@@ -0,0 +1,50 @@
+package io.onedev.server.rest;
+
+import io.onedev.server.entitymanager.ProjectLabelManager;
+import io.onedev.server.model.ProjectLabel;
+import io.onedev.server.rest.annotation.Api;
+import io.onedev.server.security.SecurityUtils;
+import org.apache.shiro.authz.UnauthorizedException;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+@Api(order=10300)
+@Path("/project-labels")
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+@Singleton
+public class ProjectLabelResource {
+
+ private final ProjectLabelManager projectLabelManager;
+
+ @Inject
+ public ProjectLabelResource(ProjectLabelManager projectLabelManager) {
+ this.projectLabelManager = projectLabelManager;
+ }
+
+ @Api(order=200, description="Create project label")
+ @POST
+ public Long create(@NotNull ProjectLabel projectLabel) {
+ if (!SecurityUtils.canManage(projectLabel.getProject()))
+ throw new UnauthorizedException();
+ projectLabelManager.create(projectLabel);
+ return projectLabel.getId();
+ }
+
+ @Api(order=300)
+ @Path("/{projectLabelId}")
+ @DELETE
+ public Response delete(@PathParam("projectLabelId") Long projectLabelId) {
+ ProjectLabel projectLabel = projectLabelManager.load(projectLabelId);
+ if (!SecurityUtils.canManage(projectLabel.getProject()))
+ throw new UnauthorizedException();
+ projectLabelManager.delete(projectLabel);
+ return Response.ok().build();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
index 894e763452..6bdaf481a2 100644
--- a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
@@ -25,6 +25,7 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import io.onedev.server.model.*;
import org.apache.shiro.authz.UnauthorizedException;
import org.hibernate.criterion.Restrictions;
@@ -35,10 +36,6 @@ import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.git.GitContribution;
import io.onedev.server.git.GitContributor;
import io.onedev.server.infomanager.CommitInfoManager;
-import io.onedev.server.model.GroupAuthorization;
-import io.onedev.server.model.Milestone;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.UserAuthorization;
import io.onedev.server.model.support.code.BranchProtection;
import io.onedev.server.model.support.NamedCodeCommentQuery;
import io.onedev.server.model.support.NamedCommitQuery;
@@ -167,11 +164,21 @@ public class ProjectResource {
throw new UnauthorizedException();
return project.getUserAuthorizations();
}
+
+ @Api(order=600, description = "Get list of <a href='/~help/api/io.onedev.server.rest.ProjectLabelResource'>labels</a>")
+ @Path("/{projectId}/labels")
+ @GET
+ public Collection<ProjectLabel> getLabels(@PathParam("projectId") Long projectId) {
+ Project project = projectManager.load(projectId);
+ if (!SecurityUtils.canAccess(project))
+ throw new UnauthorizedException();
+ return project.getLabels();
+ }
@Api(order=700)
@GET
public List<Project> queryBasicInfo(
- @QueryParam("query") @Api(description="Syntax of this query is the same as query box in <a href='/projects'>projects page</a>", example="\"Name\" is \"projectName\"") String query,
+ @QueryParam("query") @Api(description="Syntax of this query is the same as query box in <a href='/~projects'>projects page</a>", example="\"Name\" is \"projectName\"") String query,
@QueryParam("offset") @Api(example="0") int offset,
@QueryParam("count") @Api(example="100") int count) {
diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestLabelResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestLabelResource.java
new file mode 100644
index 0000000000..8715f5fb8d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestLabelResource.java
@@ -0,0 +1,50 @@
+package io.onedev.server.rest;
+
+import io.onedev.server.entitymanager.PullRequestLabelManager;
+import io.onedev.server.model.PullRequestLabel;
+import io.onedev.server.rest.annotation.Api;
+import io.onedev.server.security.SecurityUtils;
+import org.apache.shiro.authz.UnauthorizedException;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+@Api(order=10500)
+@Path("/pull-request-labels")
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+@Singleton
+public class PullRequestLabelResource {
+
+ private final PullRequestLabelManager pullRequestLabelManager;
+
+ @Inject
+ public PullRequestLabelResource(PullRequestLabelManager pullRequestLabelManager) {
+ this.pullRequestLabelManager = pullRequestLabelManager;
+ }
+
+ @Api(order=200, description="Create pull request label")
+ @POST
+ public Long create(@NotNull PullRequestLabel pullRequestLabel) {
+ if (!SecurityUtils.canModify(pullRequestLabel.getRequest()))
+ throw new UnauthorizedException();
+ pullRequestLabelManager.create(pullRequestLabel);
+ return pullRequestLabel.getId();
+ }
+
+ @Api(order=300)
+ @Path("/{pullRequestLabelId}")
+ @DELETE
+ public Response delete(@PathParam("pullRequestLabelId") Long pullRequestLabelId) {
+ PullRequestLabel pullRequestLabel = pullRequestLabelManager.load(pullRequestLabelId);
+ if (!SecurityUtils.canModify(pullRequestLabel.getRequest()))
+ throw new UnauthorizedException();
+ pullRequestLabelManager.delete(pullRequestLabel);
+ return Response.ok().build();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java
index acf022dd3e..244aa220a0 100644
--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java
@@ -70,6 +70,16 @@ public class PullRequestResource {
return pullRequest;
}
+ @Api(order=150, description = "Get list of <a href='/~help/api/io.onedev.server.rest.PullRequestLabelResource'>labels</a>")
+ @Path("/{requestId}/labels")
+ @GET
+ public Collection<PullRequestLabel> getLabels(@PathParam("requestId") Long requestId) {
+ PullRequest pullRequest = pullRequestManager.load(requestId);
+ if (!SecurityUtils.canReadCode(pullRequest.getProject()))
+ throw new UnauthorizedException();
+ return pullRequest.getLabels();
+ }
+
@Api(order=200)
@Path("/{requestId}/merge-preview")
@GET
@@ -165,7 +175,7 @@ public class PullRequestResource {
@Api(order=1100)
@GET
public List<PullRequest> queryBasicInfo(
- @QueryParam("query") @Api(description="Syntax of this query is the same as query box in <a href='/pulls'>pull requests page</a>", example="\"Number\" is \"projectName#100\"") String query,
+ @QueryParam("query") @Api(description="Syntax of this query is the same as query box in <a href='/~pulls'>pull requests page</a>", example="\"Number\" is \"projectName#100\"") String query,
@QueryParam("offset") @Api(example="0") int offset,
@QueryParam("count") @Api(example="100") int count) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
index 296178938f..beed317faf 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
@@ -17,8 +17,7 @@ import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.IssueManager;
-import io.onedev.server.entitymanager.LabelManager;
-import io.onedev.server.entitymanager.LinkSpecManager;
+import io.onedev.server.entitymanager.LabelSpecManager;
import io.onedev.server.entitymanager.MilestoneManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.PullRequestManager;
@@ -27,7 +26,6 @@ import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.LabelSpec;
-import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
@@ -61,7 +59,7 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializa
}
public static LabelSpec getLabelSpec(String labelName) {
- var labelSpec = OneDev.getInstance(LabelManager.class).find(labelName);
+ var labelSpec = OneDev.getInstance(LabelSpecManager.class).find(labelName);
if (labelSpec != null)
return labelSpec;
else
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/labelmanagement/LabelManagementPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/labelmanagement/LabelManagementPage.java
index 57fafa1f9b..ffd5d0cf64 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/labelmanagement/LabelManagementPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/labelmanagement/LabelManagementPage.java
@@ -8,7 +8,7 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.LabelManager;
+import io.onedev.server.entitymanager.LabelSpecManager;
import io.onedev.server.model.LabelSpec;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.admin.AdministrationPage;
@@ -20,8 +20,8 @@ public class LabelManagementPage extends AdministrationPage {
super(params);
}
- private LabelManager getLabelManager() {
- return OneDev.getInstance(LabelManager.class);
+ private LabelSpecManager getLabelManager() {
+ return OneDev.getInstance(LabelSpecManager.class);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java
index 623a3df498..85bdb638af 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java
@@ -111,7 +111,7 @@ public class MethodDetailPage extends ApiHelpPage {
add(new Label("title", getMethodTitle(getResourceMethod())));
String description = getMethodDescription(method);
- add(new Label("description", description).setVisible(description!=null));
+ add(new Label("description", description).setEscapeModelStrings(false).setVisible(description!=null));
String httpMethod = getHttpMethod(method);
add(new Label("method", httpMethod));
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 71fd4ab807..f9a20180dd 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
@@ -52,7 +52,7 @@ public class SuggestionUtils {
}
public static List<InputSuggestion> suggestLabels(String matchWith) {
- var labelNames = OneDev.getInstance(LabelManager.class).query().stream()
+ var labelNames = OneDev.getInstance(LabelSpecManager.class).query().stream()
.map(it->it.getName())
.sorted()
.collect(Collectors.toList());
diff --git a/server-core/src/main/java/io/onedev/server/web/util/editablebean/LabelsBean.java b/server-core/src/main/java/io/onedev/server/web/util/editablebean/LabelsBean.java
index 026a954440..7fb1972735 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/editablebean/LabelsBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/editablebean/LabelsBean.java
@@ -6,7 +6,7 @@ import java.util.List;
import java.util.stream.Collectors;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.LabelManager;
+import io.onedev.server.entitymanager.LabelSpecManager;
import io.onedev.server.model.support.LabelSupport;
import io.onedev.server.annotation.ChoiceProvider;
import io.onedev.server.annotation.Editable;
@@ -30,7 +30,7 @@ public class LabelsBean implements Serializable {
@SuppressWarnings("unused")
private static List<String> getLabelChoices() {
- var labels = OneDev.getInstance(LabelManager.class).query();
+ var labels = OneDev.getInstance(LabelSpecManager.class).query();
return labels.stream().map(it->it.getName()).sorted().collect(Collectors.toList());
}