GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Error page (dev mode): display filename & partial content (#133) · voidframework/voidframework@365d7b0

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

voidframework-web/src/main/java/dev/voidframework/web/http/errorhandler
- DefaultErrorHandler.java
- errorpage
  - DevMode500InternalServerError.java

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎voidframework-web/src/main/java/dev/voidframework/web/http/errorhandler/DefaultErrorHandler.java‎`

Copy file name to clipboardExpand all lines: voidframework-web/src/main/java/dev/voidframework/web/http/errorhandler/DefaultErrorHandler.java

+44-6Lines changed: 44 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public Result onServerError(final Context context, final Throwable throwable) {`
`94`	`94`
`95`	`95`	`final String subHeaderError;`
`96`	`96`	`final int lineNumberFromZero;`
`97`		`- final List<FileLine> fileLineList;`
	`97`	`+ final PartialFileContent partialFileContent;`
`98`	`98`	`if (throwable.getClass() == TemplateException.RenderingFailure.class) {`
`99`	`99`	`// Template rendering error`
`100`	`100`	`final TemplateException.RenderingFailure renderingFailure = (TemplateException.RenderingFailure) throwable;`
`@@ -104,7 +104,11 @@ public Result onServerError(final Context context, final Throwable throwable) {`
`104`	`104`	`subHeaderError = javaFilepathOptional.map(Path::toString).orElse(renderingFailure.getTemplateName())`
`105`	`105`	`+ StringConstants.COLON`
`106`	`106`	`+ lineNumberFromZero;`
`107`		`- fileLineList = javaFilepathOptional.map(path -> retrievePartialFileContent(path, lineNumberFromZero)).orElseGet(ArrayList::new);`
	`107`	`+`
	`108`	`+ final List<FileLine> fileLineList = javaFilepathOptional`
	`109`	`+ .map(path -> retrievePartialFileContent(path, lineNumberFromZero))`
	`110`	`+ .orElseGet(ArrayList::new);`
	`111`	`+ partialFileContent = new PartialFileContent(renderingFailure.getTemplateName(), fileLineList);`
`108`	`112`
`109`	`113`	`if (cause.getCause() != null) {`
`110`	`114`	`cause = cause.getCause();`
`@@ -115,22 +119,46 @@ public Result onServerError(final Context context, final Throwable throwable) {`
`115`	`119`	`subHeaderError = stackTraceElement.toString();`
`116`	`120`	`lineNumberFromZero = stackTraceElement.getLineNumber() - 1;`
`117`	`121`
`118`		`- final String javaFileName = stackTraceElement.getClassName().replace(StringConstants.DOT, File.separator).split("\\$", 2)[0] + ".java";`
`119`		`- final Optional<Path> javaFilepathOptional = resolvePossibleJavaFileLocation(javaFileName);`
`120`		`- fileLineList = javaFilepathOptional.map(path -> retrievePartialFileContent(path, lineNumberFromZero)).orElseGet(ArrayList::new);`
	`122`	`+ partialFileContent = extractPartialContentFromFirstAccessibleJavaFile(cause);`
`121`	`123`	`}`
`122`	`124`
`123`	`125`	`return Result.internalServerError(`
`124`	`126`	`DevMode500InternalServerError.render(`
`125`	`127`	`cause.getMessage() != null ? cause.getMessage() : "Oops, something goes wrong",`
`126`	`128`	`subHeaderError,`
`127`	`129`	`lineNumberFromZero,`
`128`		`- fileLineList));`
	`130`	`+ partialFileContent));`
`129`	`131`	`}`
`130`	`132`
`131`	`133`	`return Result.internalServerError("500 Internal Server Error");`
`132`	`134`	`}`
`133`	`135`
	`136`	`+ /**`
	`137`	`+ * Extract partial content from the first accessible Java file retrieved from the throwable.`
	`138`	`+ *`
	`139`	`+ * @param throwable The throwable to use`
	`140`	`+ * @return Extracted partial file content`
	`141`	`+ * @since 1.12.0`
	`142`	`+ */`
	`143`	`+ private PartialFileContent extractPartialContentFromFirstAccessibleJavaFile(final Throwable throwable) {`
	`144`	`+`
	`145`	`+ for (final StackTraceElement stackTraceElement : throwable.getStackTrace()) {`
	`146`	`+ final String javaFileName = stackTraceElement.getClassName()`
	`147`	`+ .replace(StringConstants.DOT, File.separator)`
	`148`	`+ .split("\\$", 2)[0] + ".java";`
	`149`	`+`
	`150`	`+ final Optional<Path> pathOptional = resolvePossibleJavaFileLocation(javaFileName);`
	`151`	`+ if (pathOptional.isPresent()) {`
	`152`	`+ final List<FileLine> fileLineList = retrievePartialFileContent(`
	`153`	`+ pathOptional.get(),`
	`154`	`+ stackTraceElement.getLineNumber() - 1);`
	`155`	`+ return new PartialFileContent(javaFileName, fileLineList);`
	`156`	`+ }`
	`157`	`+ }`
	`158`	`+`
	`159`	`+ return null;`
	`160`	`+ }`
	`161`	`+`
`134`	`162`	`/**`
`135`	`163`	`* Resolve possible Java file location.`
`136`	`164`	`*`
`@@ -216,6 +244,16 @@ private List<FileLine> retrievePartialFileContent(final Path javaFilePath,`
`216`	`244`	`return fileLineList;`
`217`	`245`	`}`
`218`	`246`
	`247`	`+ /**`
	`248`	`+ * Represents a partial file content.`
	`249`	`+ *`
	`250`	`+ * @param filename The filename`
	`251`	`+ * @param fileLineList The lines`
	`252`	`+ * @since 1.12.0`
	`253`	`+ */`
	`254`	`+ public record PartialFileContent(String filename, List<FileLine> fileLineList) {`
	`255`	`+ }`
	`256`	`+`
`219`	`257`	`/**`
`220`	`258`	`* Represents a single content line.`
`221`	`259`	`*`

Collapse file

`‎voidframework-web/src/main/java/dev/voidframework/web/http/errorhandler/errorpage/DevMode500InternalServerError.java‎`

Copy file name to clipboardExpand all lines: voidframework-web/src/main/java/dev/voidframework/web/http/errorhandler/errorpage/DevMode500InternalServerError.java

+19-15Lines changed: 19 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`	`1`	`package dev.voidframework.web.http.errorhandler.errorpage;`
`2`	`2`
	`3`	`+import dev.voidframework.core.constant.StringConstants;`
`3`	`4`	`import dev.voidframework.web.http.errorhandler.DefaultErrorHandler;`
`4`	`5`
`5`		`-import java.util.List;`
`6`		`-`
`7`	`6`	`/**`
`8`	`7`	`* Generates a "500 Internal Server Error" page when development mode is enabled. The`
`9`	`8`	`* template engine is not used, as it is not guaranteed to be available or compatible.`
`@@ -79,7 +78,7 @@ public final class DevMode500InternalServerError {`
`79`	`78`	`<code>At %s</code>`
`80`	`79`	`</div>`
`81`	`80`	`<div class="description">`
`82`		`- <h2></h2>`
	`81`	`+ <h2>%s</h2>`
`83`	`82`	`<table>`
`84`	`83`	`%s`
`85`	`84`	`</table>`
`@@ -110,26 +109,31 @@ private DevMode500InternalServerError() {`
`110`	`109`	`/**`
`111`	`110`	`* Render template.`
`112`	`111`	`*`
`113`		`- * @param errorMessage The error message`
`114`		`- * @param errorLocation Where the error occur`
`115`		`- * @param errorLineNumber Line number (from zero) where is located the error`
`116`		`- * @param fileLineList Partial file line content`
	`112`	`+ * @param errorMessage The error message`
	`113`	`+ * @param errorLocation Where the error occur`
	`114`	`+ * @param errorLineNumber Line number (from zero) where is located the error`
	`115`	`+ * @param partialFileContent Partial file content`
`117`	`116`	`* @return The rendered template`
`118`		`- * @since 1.0.0`
	`117`	`+ * @since 1.12.0`
`119`	`118`	`*/`
`120`	`119`	`public static String render(final String errorMessage,`
`121`	`120`	`final String errorLocation,`
`122`	`121`	`final int errorLineNumber,`
`123`		`- final List<DefaultErrorHandler.FileLine> fileLineList) {`
	`122`	`+ final DefaultErrorHandler.PartialFileContent partialFileContent) {`
	`123`	`+`
	`124`	`+ String partialContentFileName = StringConstants.EMPTY;`
`124`	`125`
`125`	`126`	`final StringBuilder fileSnippedBuilder = new StringBuilder();`
`126`		`- for (final DefaultErrorHandler.FileLine fileLine : fileLineList) {`
`127`		`- fileSnippedBuilder.append(FILE_PATTERN_ENTRY.formatted(`
`128`		`- errorLineNumber == fileLine.number() ? CLASS_ERROR : "",`
`129`		`- fileLine.number(),`
`130`		`- fileLine.content().replace("<", "<")));`
	`127`	`+ if (partialFileContent != null && partialFileContent.fileLineList() != null) {`
	`128`	`+ partialContentFileName = partialFileContent.filename();`
	`129`	`+ for (final DefaultErrorHandler.FileLine fileLine : partialFileContent.fileLineList()) {`
	`130`	`+ fileSnippedBuilder.append(FILE_PATTERN_ENTRY.formatted(`
	`131`	`+ errorLineNumber == fileLine.number() ? CLASS_ERROR : "",`
	`132`	`+ fileLine.number(),`
	`133`	`+ fileLine.content().replace("<", "<")));`
	`134`	`+ }`
`131`	`135`	`}`
`132`	`136`
`133`		`- return CONTENT.formatted(errorMessage, errorLocation, fileSnippedBuilder.toString());`
	`137`	`+ return CONTENT.formatted(errorMessage, errorLocation, partialContentFileName, fileSnippedBuilder.toString());`
`134`	`138`	`}`
`135`	`139`	`}`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.