").html(t.replace(s,"")).find(a):t),f&&f.apply(i,arguments)},e.ajax(u),this};var N=encodeURIComponent;e.param=function(t,n){var r=[];return r.add=function(t,n){e.isFunction(n)&&(n=n()),null==n&&(n=""),this.push(N(t)+"="+N(n))},O(r,t,n),r.join("&").replace(/%20/g,"+")}}(e),function(t){t.fn.serializeArray=function(){var e,n,r=[],i=function(t){return t.forEach?t.forEach(i):void r.push({name:e,value:t})};return this[0]&&t.each(this[0].elements,function(r,o){n=o.type,e=o.name,e&&"fieldset"!=o.nodeName.toLowerCase()&&!o.disabled&&"submit"!=n&&"reset"!=n&&"button"!=n&&"file"!=n&&("radio"!=n&&"checkbox"!=n||o.checked)&&i(t(o).val())}),r},t.fn.serialize=function(){var t=[];return this.serializeArray().forEach(function(e){t.push(encodeURIComponent(e.name)+"="+encodeURIComponent(e.value))}),t.join("&")},t.fn.submit=function(e){if(0 in arguments)this.bind("submit",e);else if(this.length){var n=t.Event("submit");this.eq(0).trigger(n),n.isDefaultPrevented()||this.get(0).submit()}return this}}(e),function(){try{getComputedStyle(void 0)}catch(e){var n=getComputedStyle;t.getComputedStyle=function(t,e){try{return n(t,e)}catch(r){return null}}}}(),e}); \ No newline at end of file diff --git a/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/env_details.html b/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/env_details.html index 16b82be0c3..4c58bd1137 100644 --- a/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/env_details.html +++ b/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/env_details.html @@ -1,30 +1,39 @@

Environment & details:

{% for scope in env %} -

- {% if scope is not empty %} - {{scope.key}} - - - - - - - - {% for data in scope.value %} - - - - - {% endfor %} -

Key	Value
{{data.key}}	{{data.value}}

- {% else %} - {{scope.key}} - empty - {% endif %} -

+ {% if scope.value is not empty %} + {{ scope.key | escape }} + + + + + + + + {% for data in scope.value %} + + + + + {% endfor %} +

Key	Value
{{ data.key \| escape }}	{{ data.value \| escape }}

+ {% else %} + {{ scope.key | escape }} + empty + {% endif %} +

+ {% endfor %} +

+ +

+ Registered Handlers + {% for h in handlers %} +

+ {{ loop.index + 1 }}. {{ h | escape }} +

{% endfor %}

diff --git a/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/frame_code.html b/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/frame_code.html index ff27399427..7b49e7ca38 100644 --- a/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/frame_code.html +++ b/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/frame_code.html @@ -1,40 +1,34 @@ -

- {% for frame in frames %} -

- {% if frame.open %} - - Open: - {{frame.fileName}} - - {% else %} - {{frame.fileName}} - {% endif %} -

- {% if frame.source != null %} -

{{frame.source}}

- {% endif %} - {% if frame.args != null %} -

- Arguments -

-              {{frame.args}}
-          

- {% endif %} -

- {% for comment in frame.comments %} -

- {{comment.class.name}} - {{comment.message}} -

- {% endfor %} -

+ {% for frame in frames %} +

+ {% if frame.open %} + + Open: + {{ frame.fileName | escape }} + + {% else %} + {{ frame.fileName | escape }} + {% endif %} +

+ + {% if frame.hasSource %} +

{{ frame.source | escape }}

+ {% endif %} + +

+ {% for comment in frame.comments %} +

+ {{ comment.class.name | escape }} + {{ comment.message | escape }}

+ {% endfor %} +

+ +

{% endfor %}

- diff --git a/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/frame_list.html b/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/frame_list.html index dd52e05f43..f289145f4c 100644 --- a/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/frame_list.html +++ b/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/frame_list.html @@ -1,13 +1,14 @@ {% for frame in frames %} -

- {{ loop.length - loop.index - 1 }} -

- {{frame.className}} - {{frame.method}} -

- {{frame.location}}{{frame.line}} -

+ {# loop.revindex is 1-indexed, subtracting 1 matches the 0-indexed PHP count logic #} + {{ loop.revindex - 1 }} +

+ {{ frame.className | escape }} + {{ frame.methodName | escape }}

+ +

+ {{ frame.location | default('<#unknown>') | escape }}:{{ frame.line }} +

{% endfor %} diff --git a/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/frames_container.html b/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/frames_container.html index 7fa575ef5e..37f5193a31 100644 --- a/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/frames_container.html +++ b/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/frames_container.html @@ -1,3 +1,3 @@ -

{% include "frame_list" %}

diff --git a/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/frames_description.html b/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/frames_description.html index 46a6551fb6..78afa570df 100644 --- a/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/frames_description.html +++ b/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/frames_description.html @@ -1,14 +1,14 @@ -

{% if hasFrameTabs %} - - Application frames (countIsApplication() ?>) - - - All frames ({{frames.size}}) - + + Application frames ({{ appFramesCount }}) + + + All frames ({{ frames | length }}) + {% else %} - - Stack frames ({{frames.size}}) + + Stack frames ({{ frames | length }}) {% endif %}

diff --git a/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/header.html b/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/header.html index 308e40c196..df21f95657 100644 --- a/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/header.html +++ b/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/header.html @@ -1,40 +1,32 @@

- {% for name in causeName %} - {% if loop.index == causeName.size - 1 %} - {{name}} - {% else %} - {{name}}. - {% endif %} - {% endfor %} - {%if code != null %} - : {{code}} + {% for name in causeName %} {% if loop.index == causeName.size - 1 %} + {{name}} + {% else %} {{name}}. {% endif %} {% endfor %} {%if code != null %} + : {{code}} {% endif %}

{% if cause.message != null %} - {{cause.message}} - {% if previousMessages is not empty %} -

- Previous exceptions -

- {{previousMessage}} - () -

- {% endif %} - {% else %} - No message - {% endif %} - + + {{cause.message}} + + {% if previousMessages is not empty %} +

+ Previous exceptions +

+ {{previousMessage}} + () +

+ {% endif %} {% else %} + No message + {% endif %} {{stacktrace}} - - +

diff --git a/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/layout.html b/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/layout.html index 9a83882bec..767dff4f97 100644 --- a/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/layout.html +++ b/modules/jooby-whoops/src/main/resources/io/jooby/whoops/views/layout.html @@ -6,7 +6,7 @@ {{title}} - +

@@ -15,7 +15,7 @@ {% include "panel_details_outer" %}

- + diff --git a/modules/jooby-whoops/src/test/java/generator/GenerateHTML.java b/modules/jooby-whoops/src/test/java/generator/GenerateHTML.java deleted file mode 100644 index 9c18cb63af..0000000000 --- a/modules/jooby-whoops/src/test/java/generator/GenerateHTML.java +++ /dev/null @@ -1,447 +0,0 @@ -/* - * Jooby https://jooby.io - * Apache License Version 2.0 https://jooby.io/LICENSE.txt - * Copyright 2014 Edgar Espina - */ -package generator; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.jsoup.Jsoup; -import org.jsoup.nodes.Document; - -import io.jooby.SneakyThrows; - -public class GenerateHTML { - private Path basedir; - private Path output; - - public GenerateHTML(Path basedir, Path output) { - this.basedir = basedir; - this.output = output; - } - - public Path doEnvDetails() throws IOException { - String filename = "env_details.html"; - Path output = output(filename, basedir); - StringBuilder lines = new StringBuilder(); - for (String line : phpFile(filename)) { - line = - line.replace("", "") - .replace(" $data): ?>", "{% for scope in env %}") - .replace("escape($tpl->slug($label)) ?>", "{{scope.key}}") - .replace("", "{% if scope is not empty %}") - .replace("escape($label) ?>", "{{scope.key}}") - .replace(" $value): ?>", "{% for data in scope.value %}") - .replace("escape($k) ?>", "{{data.key}}") - .replace("dump($value) ?>", "{{data.value}}") - .replace("", "{% endfor %}") - .replace("", "{% else %}") - .replace("escape($label) ?>", "{{scope.key}}") - .replace("", "{% endif %}") - .replace("", "{% endfor %}") - // TODO - .replace( - "", - "") - .replace(" $h): ?>", "{% for h in handlers %}") - .replace("", "") - .replace(". escape(get_class($h)) ?>", "{{h}}") - .replace("", "{% endfor %}"); - if (line.trim().length() > 0) { - lines.append(line).append(System.getProperty("line.separator")); - } - } - Document doc = Jsoup.parse(lines.toString()); - doc.select("#handlers").remove(); - Document.OutputSettings settings = new Document.OutputSettings(); - settings.prettyPrint(false); - settings.indentAmount(2); - settings.outline(true); - Files.write(output, Arrays.asList(doc.outputSettings(settings).body().children().toString())); - return output; - } - - public Path doFrameCode() throws IOException { - String filename = "frame_code.html"; - Path output = output(filename, basedir); - StringBuilder lines = new StringBuilder(); - for (String line : phpFile(filename)) { - line = - line.replace("", "") - .replace( - "", - "{% if frames.empty %}empty{% endif %}") - .replace("foreach ($frames as $i => $frame):", "{% for frame in frames %}") - .replace("$line = $frame->getLine();", "") - .replace( - "\" id=\"frame-code-", - "{% if loop.index == 0 %}active{% endif %}\" id=\"frame-code-{{loop.index}}") - .replace( - "echo ($handler->getEditorAjax($filePath, (int) $line) ? ' data-ajax' : '')", "") - .replace("getFile(); ?>", "{% if frame.open %}") - .replace( - "getEditorHref($filePath, (int)" - + " $line)): ?>", - "") - .replace("", "{% else %}") - .replace( - "breakOnDelimiter('/', $tpl->escape($filePath ?: '<#unknown>'))" - + " ?>", - "{{frame.fileName}}") - .replace("", "{% endif %}") - // .replace("getFileLines($line - 20, 40);", "") - .replace("// getFileLines can return null if there is no source code", "") - .replace("if ($range):", "") - .replace( - "$range = array_map(function ($line) { return empty($line) ? ' ' : $line;}," - + " $range);", - "") - .replace("$start = key($range) + 1;", "") - .replace("$code = join(\"\\n\", $range);", "") - // .replace("?>", "") - .replace("", "{{loop.index}}") - .replace("", "{{frame.lineStart}}") - .replace("escape($code) ?>", "{{frame.source}}") - .replace("dumpArgs($frame); ?>", "") - .replace("", "{% if frame.args != null %}") - .replace("", "{{frame.args}}") - .replace("// Append comments for this frame", "") - .replace("$comments = $frame->getComments();", "") - .replace( - "", - "{% if frame.comments.size == 0 %}empty{% endif %}") - .replace( - " $comment): ?>", - "{% for comment in frame.comments %}") - .replace("", "") - .replace("", "{{loop.index}}") - .replace("escape($context) ?>", "{{comment.class.name}}") - .replace("escapeButPreserveUris($comment) ?>", "{{comment.message}}") - .replace("", "{% endfor %}") - .replace("", ""); - if (line.trim().length() > 0) { - lines.append(line).append(System.getProperty("line.separator")); - } - } - Files.write( - output, - Arrays.asList( - lines - .toString() - .replace( - "{% endif %}\n" + " {% if frame.args != null %}", - "{% if frame.args != null %}"))); - return output; - } - - public Path doFrameList() throws IOException { - String filename = "frame_list.html"; - Path output = output(filename, basedir); - List lines = new ArrayList<>(); - for (String line : phpFile(filename)) { - line = - line.replace("", "") - .replace(" $frame): ?>", "{% for frame in frames %}") - .replace( - " isApplication() ?" - + " 'frame-application' : '') ?>\" id=\"frame-line-\"", - "{% if loop.index == 0 %}active{% endif %}{% if frame.source != null %} source{%" - + " endif %}\" id=\"frame-line-{{loop.index}}\"") - .replace( - "", "{{ loop.length - loop.index - 1 }}") - .replace( - "breakOnDelimiter('\\\\', $tpl->escape($frame->getClass() ?:" - + " '')) ?>", - "{{frame.className}}") - .replace( - "breakOnDelimiter('\\\\', $tpl->escape($frame->getFunction() ?:" - + " '')) ?>", - "{{frame.method}}") - .replace( - "getFile() ? $tpl->breakOnDelimiter('/'," - + " $tpl->shorten($tpl->escape($frame->getFile()))) : '<#unknown>' ?>", - "{{frame.location}}") - .replace("getLine() ?>", "{{frame.line}}") - .replace(" 0) { - lines.add(line); - } - } - Files.write(output, lines); - return output; - } - - public Path doFramesContainer() throws IOException { - String filename = "frames_container.html"; - Path output = output(filename, basedir); - List lines = new ArrayList<>(); - for (String line : phpFile(filename)) { - line = - line.replace( - "", - "{{activeFramesTab}}") - .replace("render($frame_list) ?>", "{% include \"frame_list\" %}"); - if (line.trim().length() > 0) { - lines.add(line); - } - } - Files.write(output, lines); - return output; - } - - public Path doFramesDescription() throws IOException { - String filename = "frames_description.html"; - Path output = output(filename, basedir); - List lines = new ArrayList<>(); - for (String line : phpFile(filename)) { - line = - line.replace( - "", - "{{framesDescriptionTab}}") - .replace("", "{% if hasFrameTabs %}") - .replace( - "", - "{{activeFramesTab}}") - .replace( - "", - "{{activeFramesTab}}") - .replace("", "{{frames.size}}") - .replace("", "{% else %}") - .replace("", "{% endif %}"); - if (line.trim().length() > 0) { - lines.add(line); - } - } - Files.write(output, lines); - return output; - } - - public Path doHeader() throws IOException { - String filename = "header.html"; - Path output = output(filename, basedir); - StringBuilder lines = new StringBuilder(); - for (String line : phpFile(filename)) { - line = - line.replace( - " $nameSection): ?>", "{% for name in causeName %}") - .replace( - "", - "{% if loop.index == causeName.size - 1 %}") - .replace("escape($nameSection) ?>", "{{name}}") - .replace("", "{% else %}") - .replace("escape($nameSection) . ' \\\\' ?>", "{{name}}.") - .replace("", "{% endif %}") - .replace("", "{% endfor %}") - .replace("", "{%if code != null %}") - .replace("(escape($code) ?>)", ": {{code}}") - .replace("", "{% if cause.message != null %}") - .replace("escape($message) ?>", "{{cause.message}}") - .replace( - "", - "{% if previousMessages is not empty %}") - .replace( - " $previousMessage): ?>", - "{% for previousMessage in previousMessages %}") - .replace("escape($previousMessage) ?>", "{{previousMessage}}") - .replace("", "") - .replace("", "{% endfor %}") - .replace("", "{% if docref_url != null %}") - .replace("escape($plain_exception) ?>", "{{stacktrace}}") - .replace("", ""); - - if (line.trim().length() > 0) { - lines.append(line).append(System.getProperty("line.separator")); - } - } - String html = lines.toString(); - Document doc = Jsoup.parse(html); - doc.select(".search-for-help").remove(); - doc.select("#hide-error").remove(); - Document.OutputSettings settings = new Document.OutputSettings(); - settings.prettyPrint(false); - settings.indentAmount(2); - settings.outline(true); - Files.write(output, Arrays.asList(doc.outputSettings(settings).body().children().toString())); - return output; - } - - public Path doHeaderOuter() throws IOException { - String filename = "header_outer.html"; - Path output = output(filename, basedir); - List lines = new ArrayList<>(); - for (String line : phpFile(filename)) { - line = line.replace("render($header) ?>", "{% include \"header\" %}"); - if (line.trim().length() > 0) { - lines.add(line); - } - } - Files.write(output, lines); - return output; - } - - public Path doLayout() throws IOException { - String filename = "layout.html"; - Path output = output(filename, basedir); - List lines = new ArrayList<>(); - for (String line : phpFile(filename)) { - line = - line.replace("", "") - .replace("escape($page_title) ?>", "{{title}}") - .replace( - "", - "") - .replace( - "render($panel_left_outer) ?>", "{% include\"panel_left_outer\" %}") - .replace( - "render($panel_details_outer) ?>", - "{% include \"panel_details_outer\" %}") - .replace( - "", - "") - .replace( - "", "") - .replace( - "", - "") - .replace( - "", - "") - .replace("", ""); - if (line.trim().length() > 0) { - lines.add(line); - } - } - Files.write(output, lines); - return output; - } - - public Path doPanelDetails() throws IOException { - String filename = "panel_details.html"; - Path output = output(filename, basedir); - List lines = new ArrayList<>(); - for (String line : phpFile(filename)) { - line = - line.replace("render($frame_code) ?>", "{% include \"frame_code\" %}") - .replace("render($env_details) ?>", "{% include \"env_details\" %}"); - if (line.trim().length() > 0) { - lines.add(line); - } - } - Files.write(output, lines); - return output; - } - - public Path doPanelDetailsOuter() throws IOException { - String filename = "panel_details_outer.html"; - Path output = output(filename, basedir); - List lines = new ArrayList<>(); - for (String line : phpFile(filename)) { - line = - line.replace("render($panel_details) ?>", "{% include \"panel_details\" %}"); - if (line.trim().length() > 0) { - lines.add(line); - } - } - Files.write(output, lines); - return output; - } - - public Path doPanelLeft() throws IOException { - String filename = "panel_left.html"; - Path output = output(filename, basedir); - List lines = new ArrayList<>(); - for (String line : phpFile(filename)) { - line = - line.replace("render($header_outer);", "{% include \"header_outer\" %}") - .replace("$tpl->render($frames_description);", "{% include \"frames_description\" %}") - .replace("$tpl->render($frames_container);", "{% include \"frames_container\" %}"); - if (line.trim().length() > 0) { - lines.add(line); - } - } - Files.write(output, lines); - return output; - } - - public Path doPanelLeftOuter() throws IOException { - String filename = "panel_left_outer.html"; - Path output = output(filename, basedir); - List lines = new ArrayList<>(); - for (String line : phpFile(filename)) { - line = line.replace("render($panel_left) ?>", "{% include \"panel_left\" %}"); - if (line.trim().length() > 0) { - lines.add(line); - } - } - Files.write(output, lines); - return output; - } - - public void generate() { - try { - doEnvDetails(); - doFrameCode(); - doFrameList(); - doFramesContainer(); - doFramesDescription(); - doHeader(); - doHeaderOuter(); - doLayout(); - doPanelDetails(); - doPanelDetailsOuter(); - doPanelLeft(); - doPanelLeftOuter(); - } catch (Exception x) { - throw SneakyThrows.propagate(x); - } - } - - public static void main(String[] args) { - create().generate(); - } - - public static GenerateHTML create() { - return new GenerateHTML( - Paths.get(basedir(), "src", "test", "resources", "whoops", "views"), - Paths.get(basedir(), "src", "main", "resources", "io", "jooby", "whoops", "views")); - } - - private static String basedir() { - Path basedir = Paths.get(System.getProperty("user.dir")); - if (!basedir.getFileName().toString().equals("jooby-whoops")) { - // IDE vs Maven - basedir = basedir.resolve("modules").resolve("jooby-whoops"); - } - return basedir.toString(); - } - - private List phpFile(String filename) throws IOException { - return Files.readAllLines(basedir.resolve(filename + ".php")); - } - - private Path output(String filename, Path basedir) { - return output.resolve(filename); - } -} diff --git a/modules/jooby-whoops/src/test/java/io/jooby/internal/whoops/WhoopsTest.java b/modules/jooby-whoops/src/test/java/io/jooby/internal/whoops/WhoopsTest.java index 27dbad8538..19b5ca4c44 100644 --- a/modules/jooby-whoops/src/test/java/io/jooby/internal/whoops/WhoopsTest.java +++ b/modules/jooby-whoops/src/test/java/io/jooby/internal/whoops/WhoopsTest.java @@ -5,6 +5,8 @@ */ package io.jooby.internal.whoops; +import java.io.IOException; + import org.junit.jupiter.api.Test; import io.pebbletemplates.pebble.PebbleEngine; @@ -12,7 +14,7 @@ public class WhoopsTest { @Test - public void shouldParseTemplates() { + public void shouldParseTemplates() throws IOException { PebbleEngine engine = Whoops.engine(); String[] templates = { "env_details", diff --git a/modules/jooby-whoops/src/test/resources/whoops/views/frame_list.html.php b/modules/jooby-whoops/src/test/resources/whoops/views/frame_list.html.php index a4bc338c2b..deb202d488 100644 --- a/modules/jooby-whoops/src/test/resources/whoops/views/frame_list.html.php +++ b/modules/jooby-whoops/src/test/resources/whoops/views/frame_list.html.php @@ -11,7 +11,7 @@

getFile() ? $tpl->breakOnDelimiter('/', $tpl->shorten($tpl->escape($frame->getFile()))) : '<#unknown>' ?>getLine() ?> + -->:getLine() ?>

io.jooby modules - 4.5.0 + 4.5.1 jooby-yasson jooby-yasson diff --git a/modules/pom.xml b/modules/pom.xml index a5ea72b4bb..c796c9c661 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -4,7 +4,7 @@ io.jooby jooby-project - 4.5.0 + 4.5.1 modules diff --git a/pom.xml b/pom.xml index be14404702..60b6e83bda 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.jooby jooby-project - 4.5.0 + 4.5.1 pom jooby-project @@ -91,7 +91,7 @@ 1.5.32 - 2.25.4 + 2.26.0 2.0.17 @@ -107,10 +107,10 @@ 9.9.1 - 2.4.0.RC4 + 2.4.0.Final 12.1.9 4.2.13.Final - 5.0.11 + 5.0.12 2.2.49 @@ -135,19 +135,19 @@ 0.13.0 6.5.0 2.5.2 - 16.7.1 + 16.8.1

9.2.1

8.18.0

1.12.797

4.20.0 1.9.3 - 1.61.0 + 1.62.0

2.22.0

2.3.21 - 1.10.2 + 1.11.0 0.8.14 @@ -211,7 +211,7 @@ 21 21 yyyy-MM-dd HH:mm:ssa - 2026-05-07T20:22:58Z + 2026-05-12T21:53:47Z UTF-8 etc${file.separator}source${file.separator}formatter.sh diff --git a/tests/pom.xml b/tests/pom.xml index 4abeb2bcc1..b2d9df61e3 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 4.5.0 + 4.5.1 tests tests @@ -314,7 +314,7 @@ io.vertx vertx-pg-client - 5.0.11 + 5.0.12 diff --git a/tests/src/test/java/io/jooby/i2525/Issue2525.java b/tests/src/test/java/io/jooby/i2525/Issue2525.java index 7d12e2b885..977b68bdd7 100644 --- a/tests/src/test/java/io/jooby/i2525/Issue2525.java +++ b/tests/src/test/java/io/jooby/i2525/Issue2525.java @@ -7,6 +7,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import java.util.Map; + import io.jooby.jackson.Jackson2Module; import io.jooby.junit.ServerTest; import io.jooby.junit.ServerTestRunner; @@ -36,8 +38,16 @@ public void shouldHandleMultipleAcceptHeaders(ServerTestRunner runner) { rsp -> { assertEquals("[]", rsp.body().string()); }); + Map queryParams = + Map.of( + "foo[0][a]", 10, + "foo[0][b]", 20, + "foo[1][a]", 30, + "foo[1][b]", 40, + "something", "else"); http.get( - "/2525?foo[0][a]=10&foo[0][b]=20&foo[1][a]=30&foo[1][b]=40&something=else", + "/2525", + queryParams, rsp -> { assertEquals("[{\"a\":10,\"b\":20},{\"a\":30,\"b\":40}]", rsp.body().string()); }); diff --git a/tests/src/test/java/io/jooby/i3863/AbstractTrpcProtocolTest.java b/tests/src/test/java/io/jooby/i3863/AbstractTrpcProtocolTest.java index 787e9d6bb7..7e43528c55 100644 --- a/tests/src/test/java/io/jooby/i3863/AbstractTrpcProtocolTest.java +++ b/tests/src/test/java/io/jooby/i3863/AbstractTrpcProtocolTest.java @@ -68,8 +68,10 @@ void shouldHandleBasicAndMultiArgumentCalls(ServerTestRunner runner) { }); // Search (Multi-Argument Tuple) + Map queryMap = Map.of("input", "[\"Pulp Fiction\", 1994]"); http.get( - "/trpc/movies.search?input=[\"Pulp Fiction\", 1994]", + "/trpc/movies.search", + queryMap, rsp -> { assertThat(rsp.code()).isEqualTo(200); assertThat(rsp.body().string()) @@ -195,8 +197,10 @@ void shouldHandleNullabilityValidation(ServerTestRunner runner) { .ready( http -> { // Validating a nullable parameter is accepted (Integer) + Map input = Map.of("input", "[\"The Godfather\", null]"); http.get( - "/trpc/movies.search?input=[\"The Godfather\", null]", + "/trpc/movies.search", + input, rsp -> { assertThat(rsp.code()).isEqualTo(200); assertThat(rsp.body().string()).contains("\"The Godfather\"");