Skip to content

The Unified and Autonomous Development Platform

WIP: RESTful api

Robin Shena5e8894e5dec
diff --git a/pom.xml b/pom.xml
index 86b110e261..c3a988df01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -540,10 +540,10 @@
<version>${jgit.version}</version>
</dependency>
<dependency>
- <groupId>net.i2p.crypto</groupId>
- <artifactId>eddsa</artifactId>
- <version>0.3.0</version>
- </dependency>
+ <groupId>net.i2p.crypto</groupId>
+ <artifactId>eddsa</artifactId>
+ <version>0.3.0</version>
+ </dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
@@ -554,7 +554,37 @@
<artifactId>json</artifactId>
<version>20090211</version>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ </dependencies>
</dependencyManagement>
<repositories>
<repository>
@@ -574,7 +604,7 @@
</repositories>
<properties>
<commons.version>2.0.8</commons.version>
- <k8shelper.version>2.1.1</k8shelper.version>
+ <k8shelper.version>2.1.2</k8shelper.version>
<slf4j.version>1.7.5</slf4j.version>
<logback.version>1.0.11</logback.version>
<antlr.version>4.7.2</antlr.version>
@@ -589,5 +619,6 @@
<flexmark.version>0.18.3</flexmark.version>
<groovy.version>3.0.7</groovy.version>
<servlet.version>3.1.0</servlet.version>
+ <jackson.version>2.12.1</jackson.version>
</properties>
</project>
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 2375ed4715..9829eef619 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -560,7 +560,7 @@ public class CoreModule extends AbstractPluginModule {
@Override
public void configure(FilterChainManager filterChainManager) {
- filterChainManager.createChain("/rest/**", "noSessionCreation, authcBasic");
+ filterChainManager.createChain("/api/**", "noSessionCreation, authcBasic");
}
});
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
index 72e3e75e28..40623606af 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
@@ -5,7 +5,6 @@ import java.io.ObjectStreamException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -144,7 +143,7 @@ public class DefaultDataManager implements DataManager, Serializable {
systemSetting = (SystemSetting) setting.getValue();
}
if (systemSetting != null) {
- Collection<String> excludedProps = new HashSet<>();
+ Collection<String> excludedProps = Sets.newHashSet("gravatarEnabled");
if (Bootstrap.isInDocker()) {
excludedProps.add("gitConfig");
excludedProps.add("curlConfig");
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index 8a156f6923..4075f66a0b 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -2460,4 +2460,18 @@ public class DataMigrator {
}
}
+ private void migrate55(File dataDir, Stack<Integer> versions) {
+ for (File file: dataDir.listFiles()) {
+ if (file.getName().startsWith("Projects.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ Element ownerElement = element.element("owner");
+ if (ownerElement != null)
+ ownerElement.detach();
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java b/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java
index 090643fd81..8347d05c53 100644
--- a/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java
+++ b/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java
@@ -24,6 +24,8 @@ public abstract class AbstractEntity implements Serializable, Comparable<Abstrac
private static final long serialVersionUID = 1L;
+ private transient Object customData;
+
@Id
@GenericGenerator(name="entity_id", strategy="io.onedev.server.persistence.IdGenerator")
@GeneratedValue(generator="entity_id")
@@ -91,6 +93,14 @@ public abstract class AbstractEntity implements Serializable, Comparable<Abstrac
}
}
+ public Object getCustomData() {
+ return customData;
+ }
+
+ public void setCustomData(Object customData) {
+ this.customData = customData;
+ }
+
public boolean isNew() {
return getId() == null;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/BuildParam.java b/server-core/src/main/java/io/onedev/server/model/BuildParam.java
index 73d3681757..0a0fa3b715 100644
--- a/server-core/src/main/java/io/onedev/server/model/BuildParam.java
+++ b/server-core/src/main/java/io/onedev/server/model/BuildParam.java
@@ -13,10 +13,6 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import com.fasterxml.jackson.annotation.JsonView;
-
-import io.onedev.server.util.jackson.DefaultView;
-
/**
* @author robin
*
@@ -43,7 +39,6 @@ public class BuildParam extends AbstractEntity {
@Column(nullable=false)
private String type;
- @JsonView(DefaultView.class)
private String value;
public Build getBuild() {
diff --git a/server-core/src/main/java/io/onedev/server/model/Group.java b/server-core/src/main/java/io/onedev/server/model/Group.java
index a4617364ab..eb2f444a50 100644
--- a/server-core/src/main/java/io/onedev/server/model/Group.java
+++ b/server-core/src/main/java/io/onedev/server/model/Group.java
@@ -14,12 +14,13 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.NameAware;
import io.onedev.server.web.editable.annotation.Editable;
@Entity
@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
@Editable
-public class Group extends AbstractEntity {
+public class Group extends AbstractEntity implements NameAware {
private static final long serialVersionUID = 1L;
@@ -42,6 +43,7 @@ public class Group extends AbstractEntity {
@Editable(order=100)
@NotEmpty
+ @Override
public String getName() {
return name;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index 291b90b123..dac26d89b7 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -42,7 +42,7 @@ import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
import org.hibernate.annotations.DynamicUpdate;
-import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -67,7 +67,6 @@ import io.onedev.server.util.Input;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.Referenceable;
import io.onedev.server.util.facade.IssueFacade;
-import io.onedev.server.util.jackson.DefaultView;
import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.annotation.Editable;
@@ -205,7 +204,7 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
// used for title search in markdown editor
@Column(nullable=false)
- @JsonView(DefaultView.class)
+ @JsonIgnore
private String noSpaceTitle;
@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index a4f184723b..5598b04a5f 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -59,7 +59,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.validator.constraints.NotEmpty;
-import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
@@ -111,9 +111,9 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.storage.StorageManager;
import io.onedev.server.util.CollectionUtils;
import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.NameAware;
import io.onedev.server.util.StatusInfo;
import io.onedev.server.util.diff.WhitespaceOption;
-import io.onedev.server.util.jackson.DefaultView;
import io.onedev.server.util.match.Matcher;
import io.onedev.server.util.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
@@ -132,7 +132,7 @@ import io.onedev.server.web.util.WicketUtils;
//use dynamic update in order not to overwrite other edits while background threads change update date
@DynamicUpdate
@Editable
-public class Project extends AbstractEntity {
+public class Project extends AbstractEntity implements NameAware {
private static final long serialVersionUID = 1L;
@@ -188,10 +188,6 @@ public class Project extends AbstractEntity {
@JoinColumn(nullable=true)
private Project forkedFrom;
- @ManyToOne(fetch=FetchType.LAZY)
- @JoinColumn
- private User owner;
-
@Column(nullable=false, unique=true)
private String name;
@@ -201,14 +197,14 @@ public class Project extends AbstractEntity {
@OneToMany(mappedBy="project")
private Collection<Build> builds = new ArrayList<>();
+ @JsonIgnore
@Lob
@Column(nullable=false, length=65535)
- @JsonView(DefaultView.class)
private ArrayList<BranchProtection> branchProtections = new ArrayList<>();
+ @JsonIgnore
@Lob
@Column(nullable=false, length=65535)
- @JsonView(DefaultView.class)
private ArrayList<TagProtection> tagProtections = new ArrayList<>();
@Column(nullable=false)
@@ -265,34 +261,34 @@ public class Project extends AbstractEntity {
private boolean issueManagementEnabled = true;
+ @JsonIgnore
@Lob
@Column(length=65535, nullable=false)
- @JsonView(DefaultView.class)
private ProjectIssueSetting issueSetting = new ProjectIssueSetting();
+ @JsonIgnore
@Lob
@Column(length=65535, nullable=false)
- @JsonView(DefaultView.class)
private ProjectBuildSetting buildSetting = new ProjectBuildSetting();
+ @JsonIgnore
@Lob
@Column(length=65535, nullable=false)
- @JsonView(DefaultView.class)
private ProjectPullRequestSetting pullRequestSetting = new ProjectPullRequestSetting();
+ @JsonIgnore
@Lob
@Column(length=65535)
- @JsonView(DefaultView.class)
private ArrayList<NamedCommitQuery> namedCommitQueries;
+ @JsonIgnore
@Lob
@Column(length=65535)
- @JsonView(DefaultView.class)
private ArrayList<NamedCodeCommentQuery> namedCodeCommentQueries;
+ @JsonIgnore
@Lob
@Column(length=65535, nullable=false)
- @JsonView(DefaultView.class)
private ArrayList<WebHook> webHooks = new ArrayList<>();
private transient Repository repository;
@@ -328,6 +324,7 @@ public class Project extends AbstractEntity {
@Editable(order=100)
@ProjectName
@NotEmpty
+ @Override
public String getName() {
return name;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index 66a48805a1..1534734113 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -49,7 +49,7 @@ import org.hibernate.annotations.OptimisticLock;
import org.hibernate.criterion.Criterion;
import org.hibernate.criterion.Restrictions;
-import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
@@ -72,8 +72,6 @@ import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.Referenceable;
-import io.onedev.server.util.jackson.DefaultView;
-import io.onedev.server.util.jackson.RestView;
import io.onedev.server.web.util.PullRequestAware;
import io.onedev.server.web.util.WicketUtils;
@@ -249,7 +247,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
// used for title search in markdown editor
@Column(nullable=false)
- @JsonView(DefaultView.class)
+ @JsonIgnore
@OptimisticLock(excluded=true)
private String noSpaceTitle;
@@ -559,7 +557,6 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
* it will trigger a re-calculation, and client should call this method later
* to get the calculated result
*/
- @JsonView(RestView.class)
@Nullable
public MergePreview getMergePreview() {
if (isOpen()) {
@@ -614,24 +611,20 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
this.mergeStrategy = mergeStrategy;
}
- @JsonView(RestView.class)
public PullRequestUpdate getLatestUpdate() {
return getSortedUpdates().get(getSortedUpdates().size()-1);
}
- @JsonView(RestView.class)
public String getBaseRef() {
Preconditions.checkNotNull(getId());
return PullRequest.REFS_PREFIX + getNumber() + "/base";
}
- @JsonView(RestView.class)
public String getMergeRef() {
Preconditions.checkNotNull(getId());
return PullRequest.REFS_PREFIX + getNumber() + "/merge";
}
- @JsonView(RestView.class)
public String getHeadRef() {
Preconditions.checkNotNull(getId());
return PullRequest.REFS_PREFIX + getNumber() + "/head";
diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.java
index ddc0e1d147..33c887be75 100644
--- a/server-core/src/main/java/io/onedev/server/model/Role.java
+++ b/server-core/src/main/java/io/onedev/server/model/Role.java
@@ -44,6 +44,7 @@ import io.onedev.server.security.permission.RunJob;
import io.onedev.server.security.permission.ScheduleIssues;
import io.onedev.server.security.permission.WriteCode;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.NameAware;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.ShowCondition;
@@ -55,7 +56,7 @@ import io.onedev.server.web.editable.annotation.ShowCondition;
@Table(indexes={@Index(columnList="name")})
@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
@Editable
-public class Role extends AbstractEntity implements Permission {
+public class Role extends AbstractEntity implements Permission, NameAware {
private static final long serialVersionUID = 1L;
@@ -99,6 +100,7 @@ public class Role extends AbstractEntity implements Permission {
+ "Permission to view issues will be granted implicitly even if no other permissions "
+ "are specified here")
@NotEmpty
+ @Override
public String getName() {
return name;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.java
index 6678dd697b..68ec8d4f16 100644
--- a/server-core/src/main/java/io/onedev/server/model/User.java
+++ b/server-core/src/main/java/io/onedev/server/model/User.java
@@ -1,9 +1,9 @@
package io.onedev.server.model;
+import static io.onedev.server.model.User.PROP_ACCESS_TOKEN;
import static io.onedev.server.model.User.PROP_EMAIL;
import static io.onedev.server.model.User.PROP_FULL_NAME;
import static io.onedev.server.model.User.PROP_NAME;
-import static io.onedev.server.model.User.PROP_ACCESS_TOKEN;
import java.util.ArrayList;
import java.util.Collection;
@@ -34,7 +34,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.validator.constraints.Email;
import org.hibernate.validator.constraints.NotEmpty;
-import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.google.common.base.MoreObjects;
import io.onedev.server.OneDev;
@@ -48,7 +48,7 @@ import io.onedev.server.model.support.build.NamedBuildQuery;
import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.jackson.DefaultView;
+import io.onedev.server.util.NameAware;
import io.onedev.server.util.match.MatchScoreUtils;
import io.onedev.server.util.validation.annotation.UserName;
import io.onedev.server.util.watch.QuerySubscriptionSupport;
@@ -64,7 +64,7 @@ import io.onedev.server.web.editable.annotation.Password;
uniqueConstraints={@UniqueConstraint(columnNames={SsoInfo.COLUMN_CONNECTOR, SsoInfo.COLUMN_SUBJECT})})
@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
@Editable
-public class User extends AbstractEntity implements AuthenticationInfo {
+public class User extends AbstractEntity implements AuthenticationInfo, NameAware {
private static final long serialVersionUID = 1L;
@@ -107,12 +107,12 @@ public class User extends AbstractEntity implements AuthenticationInfo {
private String name;
@Column(length=1024, nullable=false)
- @JsonView(DefaultView.class)
+ @JsonIgnore
private String password;
private String fullName;
-
- @JsonView(DefaultView.class)
+
+ @JsonIgnore
@Embedded
private SsoInfo ssoInfo = new SsoInfo();
@@ -120,7 +120,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {
private String email;
@Column(unique=true, nullable=false)
- @JsonView(DefaultView.class)
private String accessToken = RandomStringUtils.randomAlphanumeric(ACCESS_TOKEN_LEN);
@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)
@@ -164,43 +163,53 @@ public class User extends AbstractEntity implements AuthenticationInfo {
@OneToMany(mappedBy="owner", cascade=CascadeType.REMOVE)
@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
private Collection<SshKey> sshKeys = new ArrayList<>();
-
+
+ @JsonIgnore
@Lob
@Column(nullable=false, length=65535)
private ArrayList<NamedProjectQuery> userProjectQueries = new ArrayList<>();
+ @JsonIgnore
@Lob
@Column(nullable=false, length=65535)
private ArrayList<NamedIssueQuery> userIssueQueries = new ArrayList<>();
+ @JsonIgnore
@Lob
@Column(nullable=false, length=65535)
private LinkedHashMap<String, Boolean> userIssueQueryWatches = new LinkedHashMap<>();
+ @JsonIgnore
@Lob
@Column(nullable=false, length=65535)
private LinkedHashMap<String, Boolean> issueQueryWatches = new LinkedHashMap<>();
+ @JsonIgnore
@Lob
@Column(nullable=false, length=65535)
private ArrayList<NamedPullRequestQuery> userPullRequestQueries = new ArrayList<>();
+ @JsonIgnore
@Lob
@Column(nullable=false, length=65535)
private LinkedHashMap<String, Boolean> userPullRequestQueryWatches = new LinkedHashMap<>();
+ @JsonIgnore
@Lob
@Column(nullable=false, length=65535)
private LinkedHashMap<String, Boolean> pullRequestQueryWatches = new LinkedHashMap<>();
+ @JsonIgnore
@Lob
@Column(nullable=false, length=65535)
private ArrayList<NamedBuildQuery> userBuildQueries = new ArrayList<>();
+ @JsonIgnore
@Lob
@Column(nullable=false, length=65535)
private LinkedHashSet<String> userBuildQuerySubscriptions = new LinkedHashSet<>();
+ @JsonIgnore
@Lob
@Column(nullable=false, length=65535)
private LinkedHashSet<String> buildQuerySubscriptions = new LinkedHashSet<>();
@@ -404,6 +413,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {
@Editable(name="Login Name", order=100)
@UserName
@NotEmpty
+ @Override
public String getName() {
return name;
}
@@ -611,5 +621,165 @@ public class User extends AbstractEntity implements AuthenticationInfo {
return AUTH_SOURCE_BUILTIN_USER_STORE;
}
}
+
+ public Collection<PullRequestReview> getPullRequestReviews() {
+ return pullRequestReviews;
+ }
+
+ public void setPullRequestReviews(Collection<PullRequestReview> pullRequestReviews) {
+ this.pullRequestReviews = pullRequestReviews;
+ }
+
+ public Collection<PullRequestAssignment> getPullRequestAssignments() {
+ return pullRequestAssignments;
+ }
+
+ public void setPullRequestAssignments(Collection<PullRequestAssignment> pullRequestAssignments) {
+ this.pullRequestAssignments = pullRequestAssignments;
+ }
+
+ public Collection<PullRequestWatch> getPullRequestWatches() {
+ return pullRequestWatches;
+ }
+
+ public void setPullRequestWatches(Collection<PullRequestWatch> pullRequestWatches) {
+ this.pullRequestWatches = pullRequestWatches;
+ }
+
+ public Collection<IssueWatch> getIssueWatches() {
+ return issueWatches;
+ }
+
+ public void setIssueWatches(Collection<IssueWatch> issueWatches) {
+ this.issueWatches = issueWatches;
+ }
+
+ public Collection<IssueVote> getIssueVotes() {
+ return issueVotes;
+ }
+
+ public void setIssueVotes(Collection<IssueVote> issueVotes) {
+ this.issueVotes = issueVotes;
+ }
+
+ public Collection<IssueQuerySetting> getProjectIssueQuerySettings() {
+ return projectIssueQuerySettings;
+ }
+
+ public void setProjectIssueQuerySettings(Collection<IssueQuerySetting> projectIssueQuerySettings) {
+ this.projectIssueQuerySettings = projectIssueQuerySettings;
+ }
+
+ public Collection<BuildQuerySetting> getProjectBuildQuerySettings() {
+ return projectBuildQuerySettings;
+ }
+
+ public void setProjectBuildQuerySettings(Collection<BuildQuerySetting> projectBuildQuerySettings) {
+ this.projectBuildQuerySettings = projectBuildQuerySettings;
+ }
+
+ public Collection<PullRequestQuerySetting> getProjectPullRequestQuerySettings() {
+ return projectPullRequestQuerySettings;
+ }
+
+ public void setProjectPullRequestQuerySettings(Collection<PullRequestQuerySetting> projectPullRequestQuerySettings) {
+ this.projectPullRequestQuerySettings = projectPullRequestQuerySettings;
+ }
+
+ public Collection<CommitQuerySetting> getProjectCommitQuerySettings() {
+ return projectCommitQuerySettings;
+ }
+
+ public void setProjectCommitQuerySettings(Collection<CommitQuerySetting> projectCommitQuerySettings) {
+ this.projectCommitQuerySettings = projectCommitQuerySettings;
+ }
+
+ public Collection<CodeCommentQuerySetting> getProjectCodeCommentQuerySettings() {
+ return projectCodeCommentQuerySettings;
+ }
+
+ public void setProjectCodeCommentQuerySettings(Collection<CodeCommentQuerySetting> projectCodeCommentQuerySettings) {
+ this.projectCodeCommentQuerySettings = projectCodeCommentQuerySettings;
+ }
+
+ public ArrayList<NamedProjectQuery> getUserProjectQueries() {
+ return userProjectQueries;
+ }
+
+ public void setUserProjectQueries(ArrayList<NamedProjectQuery> userProjectQueries) {
+ this.userProjectQueries = userProjectQueries;
+ }
+
+ public ArrayList<NamedIssueQuery> getUserIssueQueries() {
+ return userIssueQueries;
+ }
+
+ public void setUserIssueQueries(ArrayList<NamedIssueQuery> userIssueQueries) {
+ this.userIssueQueries = userIssueQueries;
+ }
+
+ public LinkedHashMap<String, Boolean> getUserIssueQueryWatches() {
+ return userIssueQueryWatches;
+ }
+
+ public void setUserIssueQueryWatches(LinkedHashMap<String, Boolean> userIssueQueryWatches) {
+ this.userIssueQueryWatches = userIssueQueryWatches;
+ }
+
+ public LinkedHashMap<String, Boolean> getIssueQueryWatches() {
+ return issueQueryWatches;
+ }
+
+ public void setIssueQueryWatches(LinkedHashMap<String, Boolean> issueQueryWatches) {
+ this.issueQueryWatches = issueQueryWatches;
+ }
+
+ public ArrayList<NamedPullRequestQuery> getUserPullRequestQueries() {
+ return userPullRequestQueries;
+ }
+
+ public void setUserPullRequestQueries(ArrayList<NamedPullRequestQuery> userPullRequestQueries) {
+ this.userPullRequestQueries = userPullRequestQueries;
+ }
+
+ public LinkedHashMap<String, Boolean> getUserPullRequestQueryWatches() {
+ return userPullRequestQueryWatches;
+ }
+
+ public void setUserPullRequestQueryWatches(LinkedHashMap<String, Boolean> userPullRequestQueryWatches) {
+ this.userPullRequestQueryWatches = userPullRequestQueryWatches;
+ }
+
+ public LinkedHashMap<String, Boolean> getPullRequestQueryWatches() {
+ return pullRequestQueryWatches;
+ }
+
+ public void setPullRequestQueryWatches(LinkedHashMap<String, Boolean> pullRequestQueryWatches) {
+ this.pullRequestQueryWatches = pullRequestQueryWatches;
+ }
+
+ public ArrayList<NamedBuildQuery> getUserBuildQueries() {
+ return userBuildQueries;
+ }
+
+ public void setUserBuildQueries(ArrayList<NamedBuildQuery> userBuildQueries) {
+ this.userBuildQueries = userBuildQueries;
+ }
+
+ public LinkedHashSet<String> getUserBuildQuerySubscriptions() {
+ return userBuildQuerySubscriptions;
+ }
+
+ public void setUserBuildQuerySubscriptions(LinkedHashSet<String> userBuildQuerySubscriptions) {
+ this.userBuildQuerySubscriptions = userBuildQuerySubscriptions;
+ }
+
+ public LinkedHashSet<String> getBuildQuerySubscriptions() {
+ return buildQuerySubscriptions;
+ }
+
+ public void setBuildQuerySubscriptions(LinkedHashSet<String> buildQuerySubscriptions) {
+ this.buildQuerySubscriptions = buildQuerySubscriptions;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
index 03b043826f..176a369f12 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
@@ -26,7 +26,7 @@ public class SystemSetting implements Serializable, Validatable {
private CurlConfig curlConfig = new SystemCurl();
- private boolean gravatarEnabled = true;
+ private boolean gravatarEnabled;
@Editable(name="Server URL", order=90, description="Specify root URL to access this server. Build jobs "
+ "running in Kubernetes cluster will access this url to download source and artifacts")
diff --git a/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java b/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java
index 1b4895a7a2..e69a45313b 100644
--- a/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java
@@ -27,7 +27,6 @@ import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.model.support.WebHook;
import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.util.jackson.RestView;
@Singleton
public class WebHookManager {
@@ -42,8 +41,7 @@ public class WebHookManager {
@Inject
public WebHookManager(ObjectMapper mapper, ExecutorService executor) {
- this.mapper = mapper.copy();
- this.mapper.setConfig(this.mapper.getSerializationConfig().withView(RestView.class));
+ this.mapper = mapper;
this.executor = executor;
}
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
deleted file mode 100644
index eefdec67f6..0000000000
--- a/server-core/src/main/java/io/onedev/server/rest/BuildResource.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package io.onedev.server.rest;
-
-import java.util.Collection;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
-import org.apache.shiro.authz.UnauthorizedException;
-import org.hibernate.criterion.Restrictions;
-
-import io.onedev.server.entitymanager.BuildManager;
-import io.onedev.server.model.Build;
-import io.onedev.server.persistence.dao.EntityCriteria;
-import io.onedev.server.rest.jersey.ValidQueryParams;
-import io.onedev.server.security.SecurityUtils;
-
-@Path("/builds")
-@Consumes(MediaType.WILDCARD)
-@Produces(MediaType.APPLICATION_JSON)
-@Singleton
-public class BuildResource {
-
- private final BuildManager buildManager;
-
- @Inject
- public BuildResource(BuildManager buildManager) {
- this.buildManager = buildManager;
- }
-
- @ValidQueryParams
- @GET
- public Response query(@QueryParam("job") String jobName, @QueryParam("commit") String commit,
- @QueryParam("number") Long number, @QueryParam("offset") Integer offset,
- @QueryParam("count") Integer count, @Context UriInfo uriInfo) {
-
- EntityCriteria<Build> criteria = buildManager.newCriteria();
- if (jobName != null)
- criteria.add(Restrictions.eq("jobName", jobName));
- if (commit != null)
- criteria.add(Restrictions.eq("commit", commit));
- if (number != null)
- criteria.add(Restrictions.eq("number", number));
-
- if (offset == null)
- offset = 0;
-
- if (count == null || count > RestConstants.PAGE_SIZE)
- count = RestConstants.PAGE_SIZE;
-
- Collection<Build> builds = buildManager.query(criteria, offset, count);
- for (Build build: builds) {
- if (!SecurityUtils.canAccess(build.getProject()))
- throw new UnauthorizedException("Unable to access project '" + build.getProject().getName() + "'");
- }
-
- return Response.ok(builds, RestConstants.JSON_UTF8).build();
-
- }
-
- @Path("/{buildId}")
- @GET
- public Build get(@PathParam("buildId") Long buildId) {
- Build build = buildManager.load(buildId);
- if (!SecurityUtils.canAccess(build.getProject()))
- throw new UnauthorizedException("Unauthorized access to project " + build.getProject().getName());
- else
- return build;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/rest/PageUtils.java b/server-core/src/main/java/io/onedev/server/rest/PageUtils.java
deleted file mode 100644
index 34b6e7f405..0000000000
--- a/server-core/src/main/java/io/onedev/server/rest/PageUtils.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package io.onedev.server.rest;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.ws.rs.core.Link;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
-
-public class PageUtils {
-
- public static final String PARAM_PER_PAGE = "per_page";
-
- public static final String PARAM_PAGE = "page";
-
- public static int getLastPage(int totalCount, int pageSize) {
- if (totalCount % pageSize == 0)
- return totalCount / pageSize;
- else
- return totalCount / pageSize + 1;
- }
-
- public static Link[] getNavLinks(UriInfo uriInfo, int totalCount, int pageSize, int currentPage) {
- int lastPage = getLastPage(totalCount, pageSize);
-
- List<Link> links = new ArrayList<>();
- if (currentPage > 1 && lastPage != 0) {
- UriBuilder uriBuilder = uriInfo.getAbsolutePathBuilder()
- .queryParam(PARAM_PAGE, 1)
- .queryParam(PARAM_PER_PAGE, pageSize);
- links.add(Link.fromUriBuilder(uriBuilder).rel("first").type("GET").build());
- }
- int prevPage = currentPage - 1;
- if (prevPage > lastPage)
- prevPage = lastPage;
- if (prevPage >= 1) {
- UriBuilder uriBuilder = uriInfo.getAbsolutePathBuilder()
- .queryParam(PARAM_PAGE, prevPage)
- .queryParam(PARAM_PER_PAGE, pageSize);
- links.add(Link.fromUriBuilder(uriBuilder).rel("prev").type("GET").build());
- }
- if (currentPage < lastPage && lastPage != 0) {
- UriBuilder uriBuilder = uriInfo.getAbsolutePathBuilder()
- .queryParam(PARAM_PAGE, lastPage)
- .queryParam(PARAM_PER_PAGE, pageSize);
- links.add(Link.fromUriBuilder(uriBuilder).rel("last").type("GET").build());
- }
- int nextPage = currentPage + 1;
- if (nextPage < 1)
- nextPage = 1;
- if (nextPage <= lastPage) {
- UriBuilder uriBuilder = uriInfo.getAbsolutePathBuilder()
- .queryParam(PARAM_PAGE, nextPage)
- .queryParam(PARAM_PER_PAGE, pageSize);
- links.add(Link.fromUriBuilder(uriBuilder).rel("next").type("GET").build());
- }
-
- return links.toArray(new Link[links.size()]);
- }
-
-}
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 51f3c20517..c12813f5cf 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
@@ -1,31 +1,42 @@
package io.onedev.server.rest;
-import java.util.Collection;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
import javax.inject.Inject;
import javax.inject.Singleton;
+import javax.validation.constraints.NotNull;
import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
+import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import org.apache.shiro.authz.UnauthenticatedException;
import org.apache.shiro.authz.UnauthorizedException;
-import org.hibernate.criterion.Restrictions;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
-import io.onedev.server.persistence.dao.EntityCriteria;
-import io.onedev.server.rest.jersey.ValidQueryParams;
+import io.onedev.server.model.support.BranchProtection;
+import io.onedev.server.model.support.NamedCodeCommentQuery;
+import io.onedev.server.model.support.NamedCommitQuery;
+import io.onedev.server.model.support.TagProtection;
+import io.onedev.server.model.support.WebHook;
+import io.onedev.server.model.support.build.ProjectBuildSetting;
+import io.onedev.server.model.support.issue.ProjectIssueSetting;
+import io.onedev.server.model.support.pullrequest.ProjectPullRequestSetting;
+import io.onedev.server.rest.jersey.InvalidParamException;
+import io.onedev.server.search.entity.project.ProjectQuery;
import io.onedev.server.security.SecurityUtils;
@Path("/projects")
-@Consumes(MediaType.WILDCARD)
+@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
@Singleton
public class ProjectResource {
@@ -36,38 +47,119 @@ public class ProjectResource {
public ProjectResource(ProjectManager projectManager) {
this.projectManager = projectManager;
}
+
+ @Path("/{projectId}")
+ @GET
+ public Project get(@PathParam("projectId") Long projectId) {
+ Project project = projectManager.load(projectId);
+ if (!SecurityUtils.canAccess(project))
+ throw new UnauthorizedException();
+ return project;
+ }
+
+ @Path("/{projectId}/setting")
+ @GET
+ public ProjectSetting getSetting(@PathParam("projectId") Long projectId) {
+ Project project = projectManager.load(projectId);
+ if (!SecurityUtils.canManage(project))
+ throw new UnauthorizedException();
+ ProjectSetting setting = new ProjectSetting();
+ setting.branchProtections = project.getBranchProtections();
+ setting.tagProtections = project.getTagProtections();
+ setting.buildSetting = project.getBuildSetting();
+ setting.issueSetting = project.getIssueSetting();
+ setting.namedCodeCommentQueries = project.getNamedCodeCommentQueries();
+ setting.namedCommitQueries = project.getNamedCommitQueries();
+ setting.pullRequestSetting = project.getPullRequestSetting();
+ setting.webHooks = project.getWebHooks();
+ return setting;
+ }
- @ValidQueryParams
@GET
- public Response query(@QueryParam("name") String projectName, @QueryParam("offset") Integer offset,
- @QueryParam("count") Integer count, @Context UriInfo uriInfo) {
- EntityCriteria<Project> criteria = projectManager.newCriteria();
- if (projectName != null)
- criteria.add(Restrictions.eq("name", projectName));
+ public List<Project> query(@QueryParam("query") String query, @QueryParam("offset") Integer offset,
+ @QueryParam("count") Integer count) {
if (offset == null)
offset = 0;
- if (count == null || count > RestConstants.PAGE_SIZE)
+ if (count == null)
count = RestConstants.PAGE_SIZE;
+ else if (count > RestConstants.PAGE_SIZE)
+ throw new InvalidParamException("Count should be less than " + RestConstants.PAGE_SIZE);
- Collection<Project> projects = projectManager.query(criteria, offset, count);
- for (Project project: projects) {
- if (!SecurityUtils.canAccess(project))
- throw new UnauthorizedException("Unable to access project '" + project.getName() + "'");
+ ProjectQuery parsedQuery;
+ try {
+ parsedQuery = ProjectQuery.parse(query);
+ } catch (Exception e) {
+ throw new InvalidParamException("Error parsing query", e);
}
-
- return Response.ok(projects, RestConstants.JSON_UTF8).build();
+
+ return projectManager.query(parsedQuery, offset, count);
}
-
+
+ @POST
+ public Long save(@NotNull Project project) {
+ if (project.isNew()) {
+ if (SecurityUtils.getUser() == null)
+ throw new UnauthenticatedException();
+ else
+ projectManager.create(project);
+ } else {
+ if (!SecurityUtils.canManage(project))
+ throw new UnauthorizedException();
+ else
+ projectManager.save(project, (String) project.getCustomData());
+ }
+ return project.getId();
+ }
+
+ @Path("/{projectId}/setting")
+ @POST
+ public Response saveSetting(@PathParam("projectId") Long projectId, @NotNull ProjectSetting setting) {
+ Project project = projectManager.load(projectId);
+ if (!SecurityUtils.canManage(project))
+ throw new UnauthorizedException();
+ project.setBranchProtections(setting.branchProtections);
+ project.setTagProtections(setting.tagProtections);
+ project.setBuildSetting(setting.buildSetting);
+ project.setIssueSetting(setting.issueSetting);
+ project.setNamedCodeCommentQueries(setting.namedCodeCommentQueries);
+ project.setNamedCommitQueries(setting.namedCommitQueries);
+ project.setPullRequestSetting(setting.pullRequestSetting);
+ project.setWebHooks(setting.webHooks);
+ projectManager.save(project);
+ return Response.ok().build();
+ }
+
@Path("/{projectId}")
- @GET
- public Project get(@PathParam("projectId") Long projectId) {
+ @DELETE
+ public Response delete(@PathParam("projectId") Long projectId) {
Project project = projectManager.load(projectId);
- if (!SecurityUtils.canAccess(project))
- throw new UnauthorizedException("Unauthorized access to project " + project.getName());
- else
- return project;
+ if (!SecurityUtils.canManage(project))
+ throw new UnauthorizedException();
+ projectManager.delete(project);
+ return Response.ok().build();
}
+ public static class ProjectSetting implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ ArrayList<BranchProtection> branchProtections;
+
+ ArrayList<TagProtection> tagProtections;
+
+ ProjectIssueSetting issueSetting;
+
+ ProjectBuildSetting buildSetting;
+
+ ProjectPullRequestSetting pullRequestSetting;
+
+ ArrayList<NamedCommitQuery> namedCommitQueries;
+
+ ArrayList<NamedCodeCommentQuery> namedCodeCommentQueries;
+
+ ArrayList<WebHook> webHooks;
+
+ }
}
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
deleted file mode 100644
index 7cfb4bfa0b..0000000000
--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package io.onedev.server.rest;
-
-import java.util.Collection;
-import java.util.Date;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
-import org.apache.shiro.authz.UnauthorizedException;
-import org.hibernate.criterion.Restrictions;
-
-import io.onedev.server.entitymanager.PullRequestManager;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.support.pullrequest.CloseInfo;
-import io.onedev.server.persistence.dao.EntityCriteria;
-import io.onedev.server.rest.jersey.ValidQueryParams;
-import io.onedev.server.security.SecurityUtils;
-
-@Path("/pulls")
-@Consumes(MediaType.WILDCARD)
-@Produces(MediaType.APPLICATION_JSON)
-@Singleton
-public class PullRequestResource {
-
- private final PullRequestManager pullRequestManager;
-
- @Inject
- public PullRequestResource(PullRequestManager pullRequestManager) {
- this.pullRequestManager = pullRequestManager;
- }
-
- @Path("/{pullRequestId}")
- @GET
- public PullRequest get(@PathParam("pullRequestId") Long pullRequestId) {
- PullRequest request = pullRequestManager.load(pullRequestId);
- if (!SecurityUtils.canReadCode(request.getTargetProject()))
- throw new UnauthorizedException();
- return request;
- }
-
- @ValidQueryParams
- @GET
- public Response query(
- @QueryParam("targetProject") Long targetProjectId, @QueryParam("targetBranch") String targetBranch,
- @QueryParam("sourceProject") Long sourceProjectId, @QueryParam("sourceBranch") String sourceBranch,
- @QueryParam("number") Long number, @QueryParam("submitter") String submitterId,
- @QueryParam("submittedBefore") Date submittedBefore, @QueryParam("submittedAfter") Date submittedAfter,
- @QueryParam("status") String status, @QueryParam("closeUser") Long closeUserId,
- @QueryParam("closedBefore") Date closedBefore, @QueryParam("closedAfter") Date closedAfter,
- @QueryParam("offset") Integer offset, @QueryParam("count") Integer count, @Context UriInfo uriInfo) {
-
- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);
-
- if (targetProjectId != null)
- criteria.add(Restrictions.eq("targetProject.id", targetProjectId));
- if (targetBranch != null)
- criteria.add(Restrictions.eq("targetBranch", targetBranch));
-
- if (sourceProjectId != null)
- criteria.add(Restrictions.eq("sourceProject.id", targetProjectId));
- if (sourceBranch != null)
- criteria.add(Restrictions.eq("sourceBranch", sourceBranch));
-
- if (number != null)
- criteria.add(Restrictions.eq("number", number));
-
- if (submitterId != null)
- criteria.add(Restrictions.eq("submitter.id", submitterId));
- if (submittedBefore != null)
- criteria.add(Restrictions.le("submitDate", submittedBefore));
- if (submittedAfter != null)
- criteria.add(Restrictions.ge("submitDate", submittedAfter));
-
- if (status != null) {
- if ("OPEN".equals(status))
- criteria.add(Restrictions.isNull("closeInfo"));
- else
- criteria.add(Restrictions.eq("closeInfo.status", CloseInfo.Status.valueOf(status)));
- }
- if (closeUserId != null)
- criteria.add(Restrictions.eq("closeInfo.user.id", closeUserId));
- if (closedBefore != null)
- criteria.add(Restrictions.le("closeInfo.date", closedBefore));
- if (closedAfter != null)
- criteria.add(Restrictions.ge("closeInfo.date", closedAfter));
-
- if (offset == null)
- offset = 0;
-
- if (count == null || count > RestConstants.PAGE_SIZE)
- count = RestConstants.PAGE_SIZE;
-
- Collection<PullRequest> requests = pullRequestManager.query(criteria, offset, count);
- for (PullRequest request: requests) {
- if (!SecurityUtils.canReadCode(request.getTargetProject())) {
- throw new UnauthorizedException("Unable to access pull requests of project '"
- + request.getTargetProject() + "'");
- }
- }
-
- return Response.ok(requests, RestConstants.JSON_UTF8).build();
- }
-
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/rest/RestConstants.java b/server-core/src/main/java/io/onedev/server/rest/RestConstants.java
index 2de65027c8..501b449b4b 100644
--- a/server-core/src/main/java/io/onedev/server/rest/RestConstants.java
+++ b/server-core/src/main/java/io/onedev/server/rest/RestConstants.java
@@ -1,13 +1,9 @@
package io.onedev.server.rest;
-import javax.ws.rs.core.MediaType;
-
public class RestConstants {
public static final int PAGE_SIZE = 100;
- public static final String JSON_UTF8 = MediaType.APPLICATION_JSON + ";charset=utf-8";
-
public static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/UserResource.java b/server-core/src/main/java/io/onedev/server/rest/UserResource.java
new file mode 100644
index 0000000000..3d7c8c574e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/rest/UserResource.java
@@ -0,0 +1,234 @@
+package io.onedev.server.rest;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.shiro.authc.credential.PasswordService;
+import org.apache.shiro.authz.UnauthenticatedException;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.hibernate.criterion.MatchMode;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.NamedProjectQuery;
+import io.onedev.server.model.support.SsoInfo;
+import io.onedev.server.model.support.build.NamedBuildQuery;
+import io.onedev.server.model.support.issue.NamedIssueQuery;
+import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
+import io.onedev.server.persistence.dao.EntityCriteria;
+import io.onedev.server.rest.jersey.InvalidParamException;
+import io.onedev.server.security.SecurityUtils;
+
+@Path("/users")
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+@Singleton
+public class UserResource {
+
+ private final UserManager userManager;
+
+ private final PasswordService passwordService;
+
+ @Inject
+ public UserResource(UserManager userManager, PasswordService passwordService) {
+ this.userManager = userManager;
+ this.passwordService = passwordService;
+ }
+
+ @Path("/{userId}")
+ @GET
+ public User get(@PathParam("userId") Long userId) {
+ User user = userManager.load(userId);
+ if (!SecurityUtils.isAdministrator() && !user.equals(SecurityUtils.getUser()))
+ throw new UnauthorizedException();
+ return user;
+ }
+
+ @Path("/{userId}/sso-info")
+ @GET
+ public SsoInfo getSsoInfo(@PathParam("userId") Long userId) {
+ User user = userManager.load(userId);
+ if (!SecurityUtils.isAdministrator() && !user.equals(SecurityUtils.getUser()))
+ throw new UnauthorizedException();
+ return user.getSsoInfo();
+ }
+
+ @Path("/{userId}/queries-and-watches")
+ @GET
+ public QueriesAndWatches getQueriesAndWatches(@PathParam("userId") Long userId) {
+ User user = userManager.load(userId);
+ if (!SecurityUtils.isAdministrator() && !user.equals(SecurityUtils.getUser()))
+ throw new UnauthorizedException();
+ QueriesAndWatches queriesAndWatches = new QueriesAndWatches();
+ queriesAndWatches.buildQuerySubscriptions = user.getBuildQuerySubscriptions();
+ queriesAndWatches.issueQueryWatches = user.getIssueQueryWatches();
+ queriesAndWatches.pullRequestQueryWatches = user.getPullRequestQueryWatches();
+ queriesAndWatches.userBuildQueries = user.getUserBuildQueries();
+ queriesAndWatches.userBuildQuerySubscriptions = user.getUserBuildQuerySubscriptions();
+ queriesAndWatches.userIssueQueries = user.getUserIssueQueries();
+ queriesAndWatches.userIssueQueryWatches = user.getUserIssueQueryWatches();
+ queriesAndWatches.userProjectQueries = user.getUserProjectQueries();
+ queriesAndWatches.userPullRequestQueries = user.getUserPullRequestQueries();
+ queriesAndWatches.userPullRequestQueryWatches = user.getUserPullRequestQueryWatches();
+ return queriesAndWatches;
+ }
+
+ @GET
+ public List<User> query(@QueryParam("name") String name, @QueryParam("fullName") String fullName,
+ @QueryParam("email") String email, @QueryParam("offset") Integer offset,
+ @QueryParam("count") Integer count) {
+
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+
+ if (offset == null)
+ offset = 0;
+
+ if (count == null)
+ count = RestConstants.PAGE_SIZE;
+ else if (count > RestConstants.PAGE_SIZE)
+ throw new InvalidParamException("Count should be less than " + RestConstants.PAGE_SIZE);
+
+ EntityCriteria<User> criteria = EntityCriteria.of(User.class);
+ criteria.add(Restrictions.not(Restrictions.eq("id", User.SYSTEM_ID)));
+ if (name != null)
+ criteria.add(Restrictions.ilike("name", name.replace('*', '%'), MatchMode.EXACT));
+ if (fullName != null)
+ criteria.add(Restrictions.ilike("fullName", fullName.replace('*', '%'), MatchMode.EXACT));
+ if (email != null)
+ criteria.add(Restrictions.ilike("email", email.replace('*', '%'), MatchMode.EXACT));
+
+ return userManager.query(criteria, offset, count);
+ }
+
+ @POST
+ public Long save(@NotNull User user) {
+ if (user.isNew()) {
+ if (!SecurityUtils.isAdministrator()) {
+ throw new UnauthenticatedException();
+ } else {
+ user.setPassword("12345");
+ userManager.save(user);
+ }
+ } else {
+ if (!SecurityUtils.isAdministrator() && !user.equals(SecurityUtils.getUser()))
+ throw new UnauthorizedException();
+ else
+ userManager.save(user, (String) user.getCustomData());
+ }
+ return user.getId();
+ }
+
+ @Path("/{userId}/password")
+ @POST
+ public Response savePassword(@PathParam("userId") Long userId, @NotEmpty String password) {
+ User user = userManager.load(userId);
+ if (!SecurityUtils.isAdministrator() && !user.equals(SecurityUtils.getUser())) {
+ throw new UnauthorizedException();
+ } else if (user.getPassword().equals(User.EXTERNAL_MANAGED)) {
+ if (user.getSsoInfo().getConnector() != null) {
+ throw new ExplicitException("The user is currently authenticated via SSO provider '"
+ + user.getSsoInfo().getConnector() + "', please change password there instead");
+ } else {
+ throw new ExplicitException("The user is currently authenticated via external system, "
+ + "please change password there instead");
+ }
+ } else {
+ user.setPassword(passwordService.encryptPassword(password));
+ userManager.save(user);
+ return Response.ok().build();
+ }
+ }
+
+ @Path("/{userId}/sso-info")
+ @POST
+ public Response saveSsoInfo(@PathParam("userId") Long userId, @NotNull SsoInfo ssoInfo) {
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+ User user = userManager.load(userId);
+ user.setSsoInfo(ssoInfo);
+ userManager.save(user);
+ return Response.ok().build();
+ }
+
+ @Path("/{userId}/queries-and-watches")
+ @POST
+ public Response saveQueriesAndWatches(@PathParam("userId") Long userId, @NotNull QueriesAndWatches queriesAndWatches) {
+ User user = userManager.load(userId);
+ if (!SecurityUtils.isAdministrator() && !user.equals(SecurityUtils.getUser()))
+ throw new UnauthorizedException();
+ user.setBuildQuerySubscriptions(queriesAndWatches.buildQuerySubscriptions);
+ user.setIssueQueryWatches(queriesAndWatches.issueQueryWatches);
+ user.setPullRequestQueryWatches(queriesAndWatches.pullRequestQueryWatches);
+ user.setUserBuildQueries(queriesAndWatches.userBuildQueries);
+ user.setUserBuildQuerySubscriptions(queriesAndWatches.userBuildQuerySubscriptions);
+ user.setUserIssueQueries(queriesAndWatches.userIssueQueries);
+ user.setUserIssueQueryWatches(queriesAndWatches.userIssueQueryWatches);
+ user.setUserProjectQueries(queriesAndWatches.userProjectQueries);
+ user.setUserPullRequestQueries(queriesAndWatches.userPullRequestQueries);
+ user.setUserPullRequestQueryWatches(queriesAndWatches.userPullRequestQueryWatches);
+ userManager.save(user);
+ return Response.ok().build();
+ }
+
+ @Path("/{userId}")
+ @DELETE
+ public Response delete(@PathParam("userId") Long userId) {
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+ User user = userManager.load(userId);
+ if (user.isRoot())
+ throw new ExplicitException("Root user can not be deleted");
+ else if (user.equals(SecurityUtils.getUser()))
+ throw new ExplicitException("Can not delete yourself");
+ else
+ userManager.delete(user);
+ return Response.ok().build();
+ }
+
+ public static class QueriesAndWatches implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ ArrayList<NamedProjectQuery> userProjectQueries;
+
+ ArrayList<NamedIssueQuery> userIssueQueries;
+
+ LinkedHashMap<String, Boolean> userIssueQueryWatches;
+
+ LinkedHashMap<String, Boolean> issueQueryWatches;
+
+ ArrayList<NamedPullRequestQuery> userPullRequestQueries;
+
+ LinkedHashMap<String, Boolean> userPullRequestQueryWatches;
+
+ LinkedHashMap<String, Boolean> pullRequestQueryWatches;
+
+ ArrayList<NamedBuildQuery> userBuildQueries;
+
+ LinkedHashSet<String> userBuildQuerySubscriptions;
+
+ LinkedHashSet<String> buildQuerySubscriptions;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/rest/jersey/CatchAllExceptionMapper.java b/server-core/src/main/java/io/onedev/server/rest/jersey/CatchAllExceptionMapper.java
index fc826afb8e..0700a9e7e3 100644
--- a/server-core/src/main/java/io/onedev/server/rest/jersey/CatchAllExceptionMapper.java
+++ b/server-core/src/main/java/io/onedev/server/rest/jersey/CatchAllExceptionMapper.java
@@ -9,6 +9,8 @@ import javax.ws.rs.ext.Provider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import io.onedev.server.util.ExceptionUtils;
+
@Provider
public class CatchAllExceptionMapper implements ExceptionMapper<Throwable> {
@@ -18,12 +20,17 @@ public class CatchAllExceptionMapper implements ExceptionMapper<Throwable> {
if (t instanceof WebApplicationException) {
return ((WebApplicationException)t).getResponse();
} else {
- logger.error("Uncaught exception thrown by RESTful service", t);
-
- return Response.status(Response.Status.INTERNAL_SERVER_ERROR)
- .entity("Http response code 500: internal server error: check server log for details")
- .type(MediaType.TEXT_PLAIN)
- .build();
+ String errorMessage = ExceptionUtils.getExpectedError(t);
+ if (errorMessage != null) {
+ return Response.status(Response.Status.INTERNAL_SERVER_ERROR)
+ .entity(errorMessage).type(MediaType.TEXT_PLAIN).build();
+ } else {
+ logger.error("Error handling restful service", t);
+ return Response.status(Response.Status.INTERNAL_SERVER_ERROR)
+ .entity("Http response code 500: internal server error: check server log for details")
+ .type(MediaType.TEXT_PLAIN)
+ .build();
+ }
}
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/rest/jersey/IllegalArgumentExceptionMapper.java b/server-core/src/main/java/io/onedev/server/rest/jersey/IllegalArgumentExceptionMapper.java
deleted file mode 100644
index 14ab9d355c..0000000000
--- a/server-core/src/main/java/io/onedev/server/rest/jersey/IllegalArgumentExceptionMapper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.onedev.server.rest.jersey;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Provider
-public class IllegalArgumentExceptionMapper implements ExceptionMapper<IllegalArgumentException> {
-
- private static final Logger logger = LoggerFactory.getLogger(IllegalArgumentException.class);
-
- @Override
- public Response toResponse(IllegalArgumentException exception) {
- logger.error("Error serving rest request", exception);
-
- ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST);
- if (exception.getMessage() != null)
- builder = builder.entity("Illegal argument: " + exception.getMessage()).type("text/plain");
- else
- builder = builder.entity("Illegal argument").type("text/plain");
-
- return builder.build();
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/rest/jersey/InvalidParamException.java b/server-core/src/main/java/io/onedev/server/rest/jersey/InvalidParamException.java
new file mode 100644
index 0000000000..61bddbae82
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/rest/jersey/InvalidParamException.java
@@ -0,0 +1,17 @@
+package io.onedev.server.rest.jersey;
+
+import io.onedev.commons.utils.ExplicitException;
+
+public class InvalidParamException extends ExplicitException {
+
+ private static final long serialVersionUID = 1L;
+
+ public InvalidParamException(String message) {
+ super(message);
+ }
+
+ public InvalidParamException(String message, Exception cause) {
+ super(message, cause);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/rest/jersey/InvalidParamExceptionMapper.java b/server-core/src/main/java/io/onedev/server/rest/jersey/InvalidParamExceptionMapper.java
new file mode 100644
index 0000000000..d91993c487
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/rest/jersey/InvalidParamExceptionMapper.java
@@ -0,0 +1,18 @@
+package io.onedev.server.rest.jersey;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class InvalidParamExceptionMapper implements ExceptionMapper<InvalidParamException> {
+
+ @Override
+ public Response toResponse(InvalidParamException exception) {
+ ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST);
+ builder = builder.entity(exception.getMessage()).type("text/plain");
+ return builder.build();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/rest/jersey/JacksonContextResolver.java b/server-core/src/main/java/io/onedev/server/rest/jersey/JacksonContextResolver.java
index fb012cf72f..f15dc95744 100644
--- a/server-core/src/main/java/io/onedev/server/rest/jersey/JacksonContextResolver.java
+++ b/server-core/src/main/java/io/onedev/server/rest/jersey/JacksonContextResolver.java
@@ -6,8 +6,6 @@ import javax.ws.rs.ext.Provider;
import com.fasterxml.jackson.databind.ObjectMapper;
-import io.onedev.server.util.jackson.RestView;
-
@Provider
public class JacksonContextResolver implements ContextResolver<ObjectMapper> {
@@ -15,8 +13,7 @@ public class JacksonContextResolver implements ContextResolver<ObjectMapper> {
@Inject
public JacksonContextResolver(ObjectMapper objectMapper) {
- this.objectMapper = objectMapper.copy();
- this.objectMapper.setConfig(this.objectMapper.getSerializationConfig().withView(RestView.class));
+ this.objectMapper = objectMapper;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/rest/jersey/JerseyApplication.java b/server-core/src/main/java/io/onedev/server/rest/jersey/JerseyApplication.java
index 33bbbc3d9f..3676c70717 100644
--- a/server-core/src/main/java/io/onedev/server/rest/jersey/JerseyApplication.java
+++ b/server-core/src/main/java/io/onedev/server/rest/jersey/JerseyApplication.java
@@ -30,7 +30,7 @@ public class JerseyApplication extends ResourceConfig {
// add the default Jackson exception mappers
register(JacksonFeature.class);
- packages(JerseyApplication.class.getPackage().getName());
+ packages(JerseyApplication.class.getPackage().getName(), "io.swagger.v3.jaxrs2.integration.resources");
for (JerseyConfigurator configurator: AppLoader.getExtensions(JerseyConfigurator.class)) {
configurator.configure(this);
diff --git a/server-core/src/main/java/io/onedev/server/rest/jersey/ResourceParamFilter.java b/server-core/src/main/java/io/onedev/server/rest/jersey/ResourceParamFilter.java
new file mode 100644
index 0000000000..a7ed22c8d7
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/rest/jersey/ResourceParamFilter.java
@@ -0,0 +1,56 @@
+package io.onedev.server.rest.jersey;
+
+import java.io.IOException;
+import java.lang.reflect.Parameter;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+import javax.ws.rs.ext.Provider;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+@Provider
+public class ResourceParamFilter implements ContainerRequestFilter {
+
+ @Context
+ private ResourceInfo resourceInfo;
+
+ @Context
+ private UriInfo uriInfo;
+
+ @Override
+ public void filter(ContainerRequestContext requestContext) throws IOException {
+ Set<String> definedQueryParams = new HashSet<>();
+ Set<String> requiredQueryParams = new HashSet<>();
+ for (Parameter param: resourceInfo.getResourceMethod().getParameters()) {
+ QueryParam queryParam = param.getAnnotation(QueryParam.class);
+ if (queryParam != null) {
+ definedQueryParams.add(queryParam.value());
+ if (param.getType().isPrimitive()
+ || param.getAnnotation(NotNull.class) != null
+ || param.getAnnotation(NotEmpty.class) != null
+ || param.getAnnotation(Size.class)!=null && param.getAnnotation(Size.class).min()>0) {
+ requiredQueryParams.add(queryParam.value());
+ }
+ }
+ }
+
+ Set<String> suppliedQueryParams = new HashSet<>(uriInfo.getQueryParameters().keySet());
+ suppliedQueryParams.removeAll(definedQueryParams);
+ if (!suppliedQueryParams.isEmpty())
+ throw new InvalidParamException("Unexpected query params: " + suppliedQueryParams);
+
+ requiredQueryParams.removeAll(uriInfo.getQueryParameters().keySet());
+ if (!requiredQueryParams.isEmpty())
+ throw new InvalidParamException("Missing query params: " + requiredQueryParams);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/rest/jersey/UnauthenticatedExceptionMapper.java b/server-core/src/main/java/io/onedev/server/rest/jersey/UnauthenticatedExceptionMapper.java
index bef049f60e..84b688c7c1 100644
--- a/server-core/src/main/java/io/onedev/server/rest/jersey/UnauthenticatedExceptionMapper.java
+++ b/server-core/src/main/java/io/onedev/server/rest/jersey/UnauthenticatedExceptionMapper.java
@@ -21,6 +21,8 @@ public class UnauthenticatedExceptionMapper implements ExceptionMapper<Unauthent
builder.header("WWW-Authenticate", HttpServletRequest.BASIC_AUTH + " realm=\"" + appName + "\"");
if (exception.getMessage() != null)
builder = builder.entity(exception.getMessage()).type("text/plain");
+ else
+ builder = builder.entity("Not authenticated").type("text/plain");
return builder.build();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/jersey/UnauthorizedExceptionMapper.java b/server-core/src/main/java/io/onedev/server/rest/jersey/UnauthorizedExceptionMapper.java
index fe2d857c3f..c1fb9d8a72 100644
--- a/server-core/src/main/java/io/onedev/server/rest/jersey/UnauthorizedExceptionMapper.java
+++ b/server-core/src/main/java/io/onedev/server/rest/jersey/UnauthorizedExceptionMapper.java
@@ -27,6 +27,8 @@ public class UnauthorizedExceptionMapper implements ExceptionMapper<Unauthorized
}
if (exception.getMessage() != null)
builder = builder.entity(exception.getMessage()).type("text/plain");
+ else
+ builder = builder.entity("Permission denied").type("text/plain");
return builder.build();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/jersey/ValidQueryParams.java b/server-core/src/main/java/io/onedev/server/rest/jersey/ValidQueryParams.java
deleted file mode 100644
index 9b9e0fef67..0000000000
--- a/server-core/src/main/java/io/onedev/server/rest/jersey/ValidQueryParams.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.onedev.server.rest.jersey;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
-@Constraint(validatedBy = ValidQueryParamsValidator.class)
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface ValidQueryParams {
- String message() default "{org.hibernate.validator.referenceguide.chapter06." +
- "crossparameter.ConsistentDateParameters.message}";
-
- Class<?>[] groups() default { };
-
- Class<? extends Payload>[] payload() default { };
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/rest/jersey/ValidQueryParamsValidator.java b/server-core/src/main/java/io/onedev/server/rest/jersey/ValidQueryParamsValidator.java
deleted file mode 100644
index 856c2f9cb0..0000000000
--- a/server-core/src/main/java/io/onedev/server/rest/jersey/ValidQueryParamsValidator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.onedev.server.rest.jersey;
-
-import java.lang.annotation.Annotation;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraintvalidation.SupportedValidationTarget;
-import javax.validation.constraintvalidation.ValidationTarget;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.container.ResourceInfo;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.UriInfo;
-
-@SupportedValidationTarget(ValidationTarget.PARAMETERS)
-public class ValidQueryParamsValidator implements ConstraintValidator<ValidQueryParams, Object[]> {
-
- @Context
- private ResourceInfo resourceInfo;
-
- @Context
- private UriInfo uriInfo;
-
- @Override
- public void initialize(ValidQueryParams constraintAnnotation) {
- }
-
- @Override
- public boolean isValid(Object[] value, ConstraintValidatorContext context) {
- Set<String> expectedParams = new HashSet<>();
- for (Annotation[] annotations: resourceInfo.getResourceMethod().getParameterAnnotations()) {
- for (Annotation annotation: annotations) {
- if (annotation instanceof QueryParam) {
- QueryParam param = (QueryParam) annotation;
- expectedParams.add(param.value());
- }
- }
- }
-
- Set<String> actualParams = new HashSet<>(uriInfo.getQueryParameters().keySet());
- actualParams.removeAll(expectedParams);
- if (actualParams.isEmpty()) {
- return true;
- } else {
- context.disableDefaultConstraintViolation();
- context.buildConstraintViolationWithTemplate("Unexpected query params: " + actualParams).addConstraintViolation();
- return false;
- }
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/ExceptionUtils.java b/server-core/src/main/java/io/onedev/server/util/ExceptionUtils.java
index 7cdc7b7910..694a628136 100644
--- a/server-core/src/main/java/io/onedev/server/util/ExceptionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/ExceptionUtils.java
@@ -52,7 +52,7 @@ public class ExceptionUtils extends io.onedev.commons.utils.ExceptionUtils {
}
@Nullable
- public static String getExpectedError(Exception exception) {
+ public static String getExpectedError(Throwable exception) {
for (ExpectedExceptionContribution contribution: OneDev.getExtensions(ExpectedExceptionContribution.class)) {
for (Class<? extends Exception> expectedExceptionClass: contribution.getExpectedExceptionClasses()) {
Exception expectedException = ExceptionUtils.find(exception, expectedExceptionClass);
diff --git a/server-core/src/main/java/io/onedev/server/util/NameAware.java b/server-core/src/main/java/io/onedev/server/util/NameAware.java
new file mode 100644
index 0000000000..84757dc781
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/NameAware.java
@@ -0,0 +1,9 @@
+package io.onedev.server.util;
+
+import java.io.Serializable;
+
+public interface NameAware extends Serializable {
+
+ String getName();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/DefaultView.java b/server-core/src/main/java/io/onedev/server/util/jackson/DefaultView.java
deleted file mode 100644
index ae1bd2d277..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/jackson/DefaultView.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package io.onedev.server.util.jackson;
-
-public class DefaultView {
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperConfigurator.java b/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperConfigurator.java
index 3ba6a82dd9..f7306e8141 100644
--- a/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperConfigurator.java
+++ b/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperConfigurator.java
@@ -3,5 +3,7 @@ package io.onedev.server.util.jackson;
import com.fasterxml.jackson.databind.ObjectMapper;
public interface ObjectMapperConfigurator {
+
void configure(ObjectMapper objectMapper);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperProvider.java b/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperProvider.java
index 4a322f81a5..83a7ef734d 100644
--- a/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperProvider.java
+++ b/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperProvider.java
@@ -36,7 +36,6 @@ public class ObjectMapperProvider implements Provider<ObjectMapper> {
@Override
public ObjectMapper get() {
ObjectMapper mapper = new ObjectMapper();
-
TypeResolverBuilder<?> typer = new StdTypeResolverBuilder() {
@Override
@@ -55,7 +54,7 @@ public class ObjectMapperProvider implements Provider<ObjectMapper> {
return !Collection.class.isAssignableFrom(t.getRawClass())
&& !Map.class.isAssignableFrom(t.getRawClass())
&& t.getRawClass() != JsonNode.class
- && (t.getRawClass() == Object.class || !t.isConcrete());
+ && !t.isConcrete();
}
};
@@ -72,8 +71,6 @@ public class ObjectMapperProvider implements Provider<ObjectMapper> {
for (ObjectMapperConfigurator each: configurators)
each.configure(mapper);
- mapper.setConfig(mapper.getSerializationConfig().withView(DefaultView.class));
-
return mapper;
}
diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/RestView.java b/server-core/src/main/java/io/onedev/server/util/jackson/RestView.java
deleted file mode 100644
index 6db5465299..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/jackson/RestView.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package io.onedev.server.util.jackson;
-
-public class RestView {
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java
index d02292c2bd..b3c6c49245 100644
--- a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java
+++ b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java
@@ -16,6 +16,7 @@ import com.google.common.base.Preconditions;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.util.NameAware;
@SuppressWarnings("serial")
public class EntityDeserializer extends BeanDeserializer {
@@ -24,17 +25,17 @@ public class EntityDeserializer extends BeanDeserializer {
private final BeanDeserializer defaultDeserializer;
- private final Dao generalDao;
+ private final Dao dao;
public EntityDeserializer(
Class<? extends AbstractEntity> entityClass,
BeanDeserializer defaultDeserializer,
- Dao generalDao) {
+ Dao dao) {
super(defaultDeserializer);
this.entityClass = entityClass;
this.defaultDeserializer = defaultDeserializer;
- this.generalDao = generalDao;
+ this.dao = dao;
}
@Override
@@ -52,7 +53,11 @@ public class EntityDeserializer extends BeanDeserializer {
Object value = property.deserialize(jp, ctxt);
if (property.getName().equals("id") && value != null) {
jp.nextToken();
- AbstractEntity entity = generalDao.load(entityClass, (Long)value);
+ AbstractEntity entity = dao.load(entityClass, (Long)value);
+ if (entity instanceof NameAware) {
+ String oldName = ((NameAware) entity).getName();
+ entity.setCustomData(oldName);
+ }
Object bean;
if (entity instanceof HibernateProxy)
bean = ((HibernateProxy) entity).getHibernateLazyInitializer().getImplementation();
diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java
index b5d08c471e..7ddbb38757 100644
--- a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java
+++ b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java
@@ -1,11 +1,14 @@
package io.onedev.server.util.jackson.hibernate;
+import java.lang.reflect.Field;
+
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Transient;
import com.fasterxml.jackson.core.Version;
import com.fasterxml.jackson.databind.AnnotationIntrospector;
+import com.fasterxml.jackson.databind.PropertyName;
import com.fasterxml.jackson.databind.introspect.Annotated;
import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
@@ -24,13 +27,29 @@ public class HibernateAnnotationIntrospector extends AnnotationIntrospector {
return m.hasAnnotation(Transient.class) || m.hasAnnotation(OneToMany.class);
}
+ @Override
+ public PropertyName findNameForSerialization(Annotated annotation) {
+ if (annotation.hasAnnotation(ManyToOne.class))
+ return new PropertyName(((Field)annotation.getAnnotated()).getName() + "Id");
+ else
+ return super.findNameForSerialization(annotation);
+ }
+
+ @Override
+ public PropertyName findNameForDeserialization(Annotated annotation) {
+ if (annotation.hasAnnotation(ManyToOne.class))
+ return new PropertyName(((Field)annotation.getAnnotated()).getName() + "Id");
+ else
+ return super.findNameForDeserialization(annotation);
+ }
+
@SuppressWarnings("unchecked")
@Override
- public Object findSerializer(Annotated am) {
- if (am.hasAnnotation(ManyToOne.class)) {
- return new ManyToOneSerializer((Class<AbstractEntity>) am.getRawType());
+ public Object findSerializer(Annotated annotation) {
+ if (annotation.hasAnnotation(ManyToOne.class)) {
+ return new ManyToOneSerializer((Class<AbstractEntity>) annotation.getRawType());
} else {
- return super.findDeserializer(am);
+ return super.findSerializer(annotation);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateObjectMapperModule.java b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateObjectMapperModule.java
index c65f596312..dda230b8b2 100644
--- a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateObjectMapperModule.java
+++ b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateObjectMapperModule.java
@@ -67,6 +67,7 @@ public class HibernateObjectMapperModule extends Module {
}
}
+ @SuppressWarnings("deprecation")
@Override
public JsonSerializer<?> findMapSerializer(SerializationConfig config, MapType type,
BeanDescription beanDesc, JsonSerializer<Object> keySerializer,
diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneSerializer.java b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneSerializer.java
index 46c9fd6cd2..2df927c448 100644
--- a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneSerializer.java
+++ b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneSerializer.java
@@ -5,6 +5,7 @@ import java.io.IOException;
import com.fasterxml.jackson.core.JsonGenerationException;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
import io.onedev.server.model.AbstractEntity;
@@ -17,6 +18,13 @@ public final class ManyToOneSerializer extends StdSerializer<AbstractEntity> {
super(entityClass);
}
+ @Override
+ public void serializeWithType(AbstractEntity value, JsonGenerator gen, SerializerProvider serializers,
+ TypeSerializer typeSer) throws IOException {
+ // TODO Auto-generated method stub
+ super.serializeWithType(value, gen, serializers, typeSer);
+ }
+
@Override
public void serialize(AbstractEntity value, JsonGenerator jgen,
SerializerProvider provider) throws IOException,
diff --git a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
index a9648ee4bc..5dce9b5272 100644
--- a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
+++ b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
@@ -44,7 +44,7 @@ public class ProductServletConfigurator implements ServletConfigurator {
private final WicketServlet wicketServlet;
private final ServletContainer jerseyServlet;
-
+
private final WebSocketManager webSocketManager;
@Inject
@@ -107,7 +107,7 @@ public class ProductServletConfigurator implements ServletConfigurator {
context.addServlet(fileServletHolder, "/site/*");
context.addServlet(fileServletHolder, "/robots.txt");
- context.addServlet(new ServletHolder(jerseyServlet), "/rest/*");
+ context.addServlet(new ServletHolder(jerseyServlet), "/api/*");
}
}