Skip to content

The Unified and Autonomous Development Platform

RESTful api improvements

Robin Shenf139580e7696
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 8108cc8230..5dd5b8e4d2 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
@@ -45,8 +45,8 @@ import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import javax.validation.Validator;
-import org.apache.commons.collections4.map.ReferenceMap;
import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
+import org.apache.commons.collections4.map.ReferenceMap;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.shiro.authz.Permission;
import org.apache.tika.mime.MediaType;
@@ -80,6 +80,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
@@ -105,6 +106,7 @@ import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.PullRequestQueryPersonalizationManager;
import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.git.BlameBlock;
import io.onedev.server.git.Blob;
@@ -2058,4 +2060,14 @@ public class Project extends AbstractEntity {
return projects;
}
+ @JsonProperty
+ public String getHttpCloneUrl() {
+ return OneDev.getInstance(UrlManager.class).cloneUrlFor(this, false);
+ }
+
+ @JsonProperty
+ public String getSshCloneUrl() {
+ return OneDev.getInstance(UrlManager.class).cloneUrlFor(this, true);
+ }
+
}
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 d61a6b8a92..9880dc0d09 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
@@ -242,7 +242,7 @@ public class ProjectResource {
throw new ExplicitException("Can not use current or descendant project as parent");
Project projectWithSameName = projectManager.find(parent, project.getName());
- if (projectWithSameName != null) {
+ if (projectWithSameName != null && !projectWithSameName.equals(project)) {
if (parent != null) {
throw new ExplicitException("Name '" + project.getName() + "' is already used by another project under '"
+ parent.getPath() + "'");