Skip to content

The Unified and Autonomous Development Platform

chore: Refactorings

Robin Shenbb30b7c7d454
diff --git a/server-core/src/main/java/io/onedev/server/annotation/Editable.java b/server-core/src/main/java/io/onedev/server/annotation/Editable.java
index 8310e31181..cdd257edc5 100644
--- a/server-core/src/main/java/io/onedev/server/annotation/Editable.java
+++ b/server-core/src/main/java/io/onedev/server/annotation/Editable.java
@@ -24,6 +24,8 @@ public @interface Editable {
String rootPlaceholderProvider() default "";
boolean displayPlaceholderAsValue() default false;
+
+ String autocomplete() default "";
int order() default 0;
diff --git a/server-core/src/main/java/io/onedev/server/annotation/Password.java b/server-core/src/main/java/io/onedev/server/annotation/Password.java
index 4715eecf1c..569a4b5766 100644
--- a/server-core/src/main/java/io/onedev/server/annotation/Password.java
+++ b/server-core/src/main/java/io/onedev/server/annotation/Password.java
@@ -23,6 +23,6 @@ public @interface Password {
boolean checkPolicy() default false;
- String autoComplete() default "";
+ String autocomplete() default "";
}
diff --git a/server-core/src/main/java/io/onedev/server/jetty/AssetServlet.java b/server-core/src/main/java/io/onedev/server/jetty/AssetServlet.java
index a7d6bd74a2..e09fd9b45f 100644
--- a/server-core/src/main/java/io/onedev/server/jetty/AssetServlet.java
+++ b/server-core/src/main/java/io/onedev/server/jetty/AssetServlet.java
@@ -39,7 +39,7 @@ public abstract class AssetServlet extends DefaultServlet {
@Override
protected void putHeaders(HttpServletResponse response, HttpContent content, long contentLength) {
super.putHeaders(response, content, contentLength);
-
+
HttpFields fields;
if (response instanceof Response)
fields = ((Response) response).getHttpFields();
@@ -58,6 +58,8 @@ public abstract class AssetServlet extends DefaultServlet {
* page request.
*/
fields.put(HttpHeader.CACHE_CONTROL, "max-age=86400,public");
+ } else if (requestHolder.get().getRequestURI().equals("/prefetch.json")) {
+ fields.put(HttpHeader.CONTENT_TYPE, "application/speculationrules+json");
}
}
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 ca5dc2a8e2..5878e2ff54 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
@@ -588,7 +588,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {
this.disabled = disabled;
}
- @Editable(name="Login Name", order=100)
+ @Editable(name="Login Name", order=100, autocomplete="off")
@UserName
@NotEmpty
public String getName() {
@@ -606,7 +606,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {
*/
@Editable(order=150)
@DependsOn(property="type", value="ORDINARY")
- @Password(checkPolicy=true, autoComplete="new-password")
+ @Password(checkPolicy=true, autocomplete="new-password")
@NotEmpty
@Nullable
public String getPassword() {
diff --git a/server-core/src/main/java/io/onedev/server/web/DefaultWicketServlet.java b/server-core/src/main/java/io/onedev/server/web/DefaultWicketServlet.java
index cfba3c33be..8128a2b9c9 100644
--- a/server-core/src/main/java/io/onedev/server/web/DefaultWicketServlet.java
+++ b/server-core/src/main/java/io/onedev/server/web/DefaultWicketServlet.java
@@ -43,7 +43,7 @@ public class DefaultWicketServlet extends WicketServlet {
var httpRes = (HttpServletResponse) res;
httpRes.setHeader("X-FRAME-OPTIONS", "SAMEORIGIN");
// Disable cloudflare suggested prefetch to fix OD-2120
- httpRes.setHeader("Speculation-Rules", "/prefetch.json");
+ httpRes.setHeader("Speculation-Rules", "\"/prefetch.json\"");
try {
super.service(req, res);
} catch (ServletException | IOException e) {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
index f92627d49f..18dd63a0cb 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
@@ -5,7 +5,6 @@ import static io.onedev.server.web.translation.Translation._T;
import java.lang.reflect.Method;
import java.util.Set;
-import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
@@ -20,6 +19,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.util.visit.IVisitor;
import org.apache.wicket.validation.INullAcceptingValidator;
+import org.jspecify.annotations.Nullable;
import io.onedev.commons.loader.AppLoader;
import io.onedev.server.annotation.OmitName;
@@ -143,4 +143,5 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {
});
}
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java
index 216d6f3225..2365a18750 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java
@@ -42,7 +42,7 @@ public class ConfirmativePasswordPropertyEditor extends PropertyEditor<String> {
add(inputAgain);
Password password = getDescriptor().getPropertyGetter().getAnnotation(Password.class);
- String autoComplete = password.autoComplete();
+ String autoComplete = password.autocomplete();
if (StringUtils.isNotBlank(autoComplete)) {
input.add(AttributeAppender.replace("autocomplete", autoComplete));
inputAgain.add(AttributeAppender.replace("autocomplete", autoComplete));
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java
index f61ce5becf..befbce6dc2 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java
@@ -34,7 +34,7 @@ public class PasswordPropertyEditor extends PropertyEditor<String> {
add(input);
Password password = getDescriptor().getPropertyGetter().getAnnotation(Password.class);
- String autoComplete = password.autoComplete();
+ String autoComplete = password.autocomplete();
if (StringUtils.isNotBlank(autoComplete))
input.add(AttributeModifier.replace("autocomplete", autoComplete));
input.add(new OnTypingDoneBehavior() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java
index e6e505f660..a9869909ed 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java
@@ -1,10 +1,9 @@
package io.onedev.server.web.editable.string;
-import io.onedev.server.annotation.Multiline;
-import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
-import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.web.editable.PropertyEditor;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.lang.reflect.Method;
+
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.FormComponent;
@@ -15,9 +14,12 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import static io.onedev.server.web.translation.Translation._T;
-
-import java.lang.reflect.Method;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Multiline;
+import io.onedev.server.web.behavior.OnTypingDoneBehavior;
+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
public class StringPropertyEditor extends PropertyEditor<String> {
@@ -57,6 +59,7 @@ public class StringPropertyEditor extends PropertyEditor<String> {
input.setType(getDescriptor().getPropertyClass());
add(fragment);
}
+
input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));
if (inputAssist != null) {
@@ -65,6 +68,10 @@ public class StringPropertyEditor extends PropertyEditor<String> {
input.add(AttributeAppender.append("autocomplete", "off"));
if (!getDescriptor().isPropertyRequired())
input.add(AttributeAppender.append("class", "no-autofocus"));
+ } else {
+ var autocomplete = getDescriptor().getPropertyGetter().getAnnotation(Editable.class).autocomplete();
+ if (autocomplete.length() != 0)
+ input.add(AttributeAppender.replace("autocomplete", autocomplete));
}
input.add(new OnTypingDoneBehavior() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
index 07bda74871..ec12bb41c9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
@@ -299,7 +299,7 @@ onedev.server = {
onedev.server.focus.doFocus($(document));
- $(document).on("afterElementReplace", function(event, componentId) {
+ $(document).on("afterElementReplace", function(event, componentId) {
if (onedev.server.focus.$components != null)
onedev.server.focus.$components = onedev.server.focus.$components.add("#" + componentId);
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/LinkUserBean.java b/server-core/src/main/java/io/onedev/server/web/page/security/LinkUserBean.java
index d86b8bedd6..a6314dddcb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/security/LinkUserBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/security/LinkUserBean.java
@@ -35,7 +35,7 @@ public class LinkUserBean implements Serializable {
}
@Editable(order=200, description="Password of the user")
- @Password(autoComplete="current-password")
+ @Password(autocomplete="current-password")
@NotEmpty
public String getPassword() {
return password;
diff --git a/server-plugin/server-plugin-mail-smtpimap/src/main/java/io/onedev/server/plugin/mail/smtpimap/InboxPollSetting.java b/server-plugin/server-plugin-mail-smtpimap/src/main/java/io/onedev/server/plugin/mail/smtpimap/InboxPollSetting.java
index 31ccec6d4e..1482a8bb42 100644
--- a/server-plugin/server-plugin-mail-smtpimap/src/main/java/io/onedev/server/plugin/mail/smtpimap/InboxPollSetting.java
+++ b/server-plugin/server-plugin-mail-smtpimap/src/main/java/io/onedev/server/plugin/mail/smtpimap/InboxPollSetting.java
@@ -58,7 +58,7 @@ public class InboxPollSetting implements Serializable {
}
@Editable(order=400, name="IMAP Password")
- @Password(autoComplete="new-password")
+ @Password(autocomplete="new-password")
@NotEmpty
public String getImapPassword() {
return imapPassword;
diff --git a/server-plugin/server-plugin-mail-smtpimap/src/main/java/io/onedev/server/plugin/mail/smtpimap/SmtpImapConnector.java b/server-plugin/server-plugin-mail-smtpimap/src/main/java/io/onedev/server/plugin/mail/smtpimap/SmtpImapConnector.java
index 77da09ff86..c031ab72bb 100644
--- a/server-plugin/server-plugin-mail-smtpimap/src/main/java/io/onedev/server/plugin/mail/smtpimap/SmtpImapConnector.java
+++ b/server-plugin/server-plugin-mail-smtpimap/src/main/java/io/onedev/server/plugin/mail/smtpimap/SmtpImapConnector.java
@@ -69,7 +69,7 @@ public class SmtpImapConnector implements MailConnector {
}
@Editable(order=400, name="SMTP Password")
- @Password(autoComplete="new-password")
+ @Password(autocomplete="new-password")
public String getSmtpPassword() {
return smtpPassword;
}