Add name constraint for Team and Project.

This commit is contained in:
robin shine 2013-10-15 08:46:32 +08:00
parent b5c4d3118c
commit cccd09195e
2 changed files with 6 additions and 0 deletions

View File

@ -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.ProtectedObject;
import com.pmease.gitop.core.permission.object.UserBelonging; import com.pmease.gitop.core.permission.object.UserBelonging;
import com.pmease.gitop.core.permission.operation.GeneralOperation; import com.pmease.gitop.core.permission.operation.GeneralOperation;
import com.pmease.gitop.core.validation.ProjectName;
@Entity @Entity
@Table(uniqueConstraints={ @Table(uniqueConstraints={
@ -69,6 +70,7 @@ public class Project extends AbstractEntity implements UserBelonging {
@Editable(description= @Editable(description=
"Specify name of the project. It will be used to identify the project when accessing via Git.") "Specify name of the project. It will be used to identify the project when accessing via Git.")
@NotEmpty @NotEmpty
@ProjectName
public String getName() { public String getName() {
return name; return name;
} }

View File

@ -13,9 +13,11 @@ import javax.persistence.Table;
import javax.persistence.UniqueConstraint; import javax.persistence.UniqueConstraint;
import org.apache.shiro.authz.Permission; import org.apache.shiro.authz.Permission;
import org.hibernate.validator.constraints.NotEmpty;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import com.pmease.commons.hibernate.AbstractEntity; 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.ObjectPermission;
import com.pmease.gitop.core.permission.operation.GeneralOperation; import com.pmease.gitop.core.permission.operation.GeneralOperation;
@ -52,6 +54,8 @@ public class Team extends AbstractEntity implements Permission {
this.owner = owner; this.owner = owner;
} }
@Name
@NotEmpty
public String getName() { public String getName() {
return name; return name;
} }