From cccd09195e2a8e886fea482eded25c58935b9a7a Mon Sep 17 00:00:00 2001
From: robin shine <robin@pmease.com>
Date: Tue, 15 Oct 2013 08:46:32 +0800
Subject: [PATCH] Add name constraint for Team and Project.

---
 .../src/main/java/com/pmease/gitop/core/model/Project.java    | 2 ++
 .../src/main/java/com/pmease/gitop/core/model/Team.java       | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/gitop.core/src/main/java/com/pmease/gitop/core/model/Project.java b/gitop.core/src/main/java/com/pmease/gitop/core/model/Project.java
index 11620d8e74..773758e250 100644
--- a/gitop.core/src/main/java/com/pmease/gitop/core/model/Project.java
+++ b/gitop.core/src/main/java/com/pmease/gitop/core/model/Project.java
@@ -27,6 +27,7 @@ import com.pmease.gitop.core.permission.ObjectPermission;
 import com.pmease.gitop.core.permission.object.ProtectedObject;
 import com.pmease.gitop.core.permission.object.UserBelonging;
 import com.pmease.gitop.core.permission.operation.GeneralOperation;
+import com.pmease.gitop.core.validation.ProjectName;
 
 @Entity
 @Table(uniqueConstraints={
@@ -69,6 +70,7 @@ public class Project extends AbstractEntity implements UserBelonging {
 	@Editable(description=
 			"Specify name of the project. It will be used to identify the project when accessing via Git.")
 	@NotEmpty
+	@ProjectName
 	public String getName() {
 		return name;
 	}
diff --git a/gitop.core/src/main/java/com/pmease/gitop/core/model/Team.java b/gitop.core/src/main/java/com/pmease/gitop/core/model/Team.java
index 837306de4f..260a92f91f 100644
--- a/gitop.core/src/main/java/com/pmease/gitop/core/model/Team.java
+++ b/gitop.core/src/main/java/com/pmease/gitop/core/model/Team.java
@@ -13,9 +13,11 @@ import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
 
 import org.apache.shiro.authz.Permission;
+import org.hibernate.validator.constraints.NotEmpty;
 
 import com.google.common.base.Objects;
 import com.pmease.commons.hibernate.AbstractEntity;
+import com.pmease.commons.validation.Name;
 import com.pmease.gitop.core.permission.ObjectPermission;
 import com.pmease.gitop.core.permission.operation.GeneralOperation;
 
@@ -52,6 +54,8 @@ public class Team extends AbstractEntity implements Permission {
 		this.owner = owner;
 	}
 
+	@Name
+	@NotEmpty
 	public String getName() {
 		return name;
 	}