The Unified and Autonomous Development Platform
Minor changes for valiations and table constraints
Robin Shen4740001d724c
diff --git a/server-core/src/main/java/io/onedev/server/model/SshKey.java b/server-core/src/main/java/io/onedev/server/model/SshKey.javaindex 356824fa44..046f4ab7ab 100644--- a/server-core/src/main/java/io/onedev/server/model/SshKey.java+++ b/server-core/src/main/java/io/onedev/server/model/SshKey.java@@ -1,19 +1,22 @@package io.onedev.server.model;-import java.io.IOException;-import java.security.GeneralSecurityException;import java.security.PublicKey;import java.time.LocalDateTime;+import javax.persistence.Column;import javax.persistence.Entity;import javax.persistence.FetchType;+import javax.persistence.Index;import javax.persistence.JoinColumn;import javax.persistence.ManyToOne;import javax.persistence.Table;+import javax.persistence.UniqueConstraint;import javax.validation.ConstraintValidatorContext;+import org.apache.sshd.common.config.keys.KeyUtils;import org.apache.wicket.util.string.Strings;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SshKeyManager;import io.onedev.server.git.ssh.SshKeyUtils;@@ -25,15 +28,16 @@ import io.onedev.server.web.editable.annotation.Multiline;@Editable@ClassValidating@Entity-@Table+@Table(+ indexes={@Index(columnList="o_owner_id"), @Index(columnList="name"), @Index(columnList="digest")},+ uniqueConstraints={+ @UniqueConstraint(columnNames={"o_owner_id", "name"}),+ @UniqueConstraint(columnNames={"digest"})}+)public class SshKey extends AbstractEntity implements Validatable {- /**- *- */private static final long serialVersionUID = 1L;- @NotEmpty@Column(nullable=false)private String name;diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.javaindex 9d10bb6117..6c7cf2dd84 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.java@@ -4,14 +4,14 @@ import java.io.IOException;import java.security.GeneralSecurityException;import java.security.PublicKey;import java.time.LocalDateTime;-import java.util.Collection;-import java.util.HashSet;+import org.apache.sshd.common.config.keys.KeyUtils;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SshKeyManager;import io.onedev.server.git.ssh.SshKeyUtils;