Skip to content

The Unified and Autonomous Development Platform

feat: Enhance exception handling and improve error messages

Robin Shen0f682882c30e
diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/EofExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/EofExceptionHandler.java
index c33fde1e9c..ef31f2f587 100644
--- a/server-core/src/main/java/io/onedev/server/exception/handler/EofExceptionHandler.java
+++ b/server-core/src/main/java/io/onedev/server/exception/handler/EofExceptionHandler.java
@@ -10,10 +10,10 @@ public class EofExceptionHandler extends AbstractExceptionHandler<EofException>
@Override
public HttpResponse getResponse(EofException exception) {
- if (exception.getMessage() != null)
- return new HttpResponse(499, exception.getMessage());
- else
- return null;
+ var message = exception.getMessage();
+ if (message == null)
+ message = "Unexpected end of stream";
+ return new HttpResponse(499, message);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/MissingObjectExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/MissingObjectExceptionHandler.java
new file mode 100644
index 0000000000..758bc76f7c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/exception/handler/MissingObjectExceptionHandler.java
@@ -0,0 +1,18 @@
+package io.onedev.server.exception.handler;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.eclipse.jgit.errors.MissingObjectException;
+
+import io.onedev.server.exception.HttpResponse;
+
+public class MissingObjectExceptionHandler extends AbstractExceptionHandler<MissingObjectException> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public HttpResponse getResponse(MissingObjectException exception) {
+ return new HttpResponse(HttpServletResponse.SC_NOT_FOUND, exception.getMessage());
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java b/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java
index c21e9e0a21..78ebf2ceca 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java
@@ -55,7 +55,7 @@ public class FileQueryOption implements QueryOption {
}
}
if (tooGeneral)
- throw new TooGeneralQueryException();
+ throw new TooGeneralQueryException("File query is too general: " + term);
builder.add(new WildcardQuery(new Term(BLOB_NAME.name(), term.toLowerCase())), BooleanClause.Occur.MUST);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java
index 462767afaf..003b0ca5a3 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java
@@ -121,7 +121,7 @@ public class SymbolQueryOption implements QueryOption {
}
}
if (tooGeneral)
- throw new TooGeneralQueryException();
+ throw new TooGeneralQueryException("Symbol query is too general: " + term);
if (primary != null) {
String fieldName;
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.java b/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.java
index 0c5a143830..9588217938 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.java
@@ -206,7 +206,7 @@ public class TextQueryOption implements QueryOption {
else if (term.length() >= NGRAM_SIZE)
builder.add(new NGramLuceneQuery(BLOB_TEXT.name(), term, NGRAM_SIZE), BooleanClause.Occur.MUST);
else
- throw new TooGeneralQueryException();
+ throw new TooGeneralQueryException("Text query is too general: " + term);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/TooGeneralQueryException.java b/server-core/src/main/java/io/onedev/server/search/code/query/TooGeneralQueryException.java
index 809cf86459..0d1c6c17e1 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/TooGeneralQueryException.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/TooGeneralQueryException.java
@@ -1,7 +1,13 @@
package io.onedev.server.search.code.query;
-public class TooGeneralQueryException extends RuntimeException {
+import io.onedev.server.exception.NotAcceptableException;
+
+public class TooGeneralQueryException extends NotAcceptableException {
private static final long serialVersionUID = 1L;
+
+ public TooGeneralQueryException(String message) {
+ super(message);
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/regex/RegexLiterals.java b/server-core/src/main/java/io/onedev/server/search/code/query/regex/RegexLiterals.java
index bfd22ac7a4..fc3cab83bb 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/regex/RegexLiterals.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/regex/RegexLiterals.java
@@ -25,9 +25,12 @@ public class RegexLiterals {
private static final Logger logger = LoggerFactory.getLogger(RegexLiterals.class);
+ private final String regex;
+
private final List<List<LeafLiterals>> rows;
public RegexLiterals(String regex) {
+ this.regex = regex;
CharStream stream = CharStreams.fromString(regex);
PCRELexer lexer = new PCRELexer(stream);
lexer.removeErrorListeners();
@@ -64,7 +67,7 @@ public class RegexLiterals {
if (orQuery.clauses().size() != 0)
return orQuery;
else
- throw new TooGeneralQueryException();
+ throw new TooGeneralQueryException("Regex query is too general: " + regex);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java
index 285125fbce..2875b7134e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java
@@ -21,6 +21,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
import io.onedev.server.data.migration.VersionedXmlDoc;
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.service.SettingService;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
@@ -55,7 +56,7 @@ public class ContributedAdministrationSettingPage extends AdministrationPage {
}
if (settingClass == null)
- throw new RuntimeException(MessageFormat.format(_T("Unexpected setting: {0}"), settingName));
+ throw new NotAcceptableException(MessageFormat.format(_T("Unexpected setting: {0}"), settingName));
}
private SettingService getSettingService() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java
index 53ccdbfc67..6b8554757d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java
@@ -2,9 +2,10 @@ package io.onedev.server.web.page.project.setting.pluginsettings;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
-import org.jspecify.annotations.Nullable;
import javax.validation.Validator;
+import static io.onedev.server.web.translation.Translation._T;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -17,12 +18,14 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.jspecify.annotations.Nullable;
import io.onedev.server.OneDev;
import io.onedev.server.data.migration.VersionedXmlDoc;
-import io.onedev.server.service.ProjectService;
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.ProjectService;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
@@ -59,7 +62,7 @@ public class ContributedProjectSettingPage extends ProjectSettingPage {
}
if (settingClass == null)
- throw new RuntimeException("Unexpected setting: " + settingName);
+ throw new NotAcceptableException(MessageFormat.format(_T("Unexpected setting: {0}"), settingName));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java
index 2cd9e5a141..2726fd2c04 100644
--- a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java
@@ -16,7 +16,7 @@
*/
package io.onedev.server.web.websocket;
-import java.io.IOException;
+import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import org.apache.shiro.subject.Subject;
import org.apache.shiro.util.ThreadContext;
@@ -29,8 +29,8 @@ import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.server.OneDev;
+import io.onedev.server.exception.ExceptionUtils;
import io.onedev.server.persistence.SessionService;
/**
@@ -97,10 +97,8 @@ public class WebSocketProcessor extends AbstractWebSocketProcessor implements We
@Override
public void onWebSocketError(Throwable throwable) {
- IOException ioException = ExceptionUtils.find(throwable, IOException.class);
- if (ioException != null && "Broken pipe".equals(ioException.getMessage()))
- logger.debug("WebSocket closed", throwable);
- else
+ var response = ExceptionUtils.buildResponse(throwable);
+ if (response == null || response.getStatus() >= SC_INTERNAL_SERVER_ERROR)
logger.error("An error occurred when using WebSocket.", throwable);
}