This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 0551f6acce SonarQube bug fixes
0551f6acce is described below
commit 0551f6accebf3fe38e8d2ac8a7028ac927849504
Author: James Bognar <[email protected]>
AuthorDate: Wed Feb 4 16:06:17 2026 -0500
SonarQube bug fixes
---
.../java/org/apache/juneau/assertions/FluentStringAssertion.java | 7 ++++---
.../main/java/org/apache/juneau/rest/stats/MethodExecStore.java | 6 +++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
index 45ecadd1dc..8551dc13de 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
@@ -142,6 +142,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
private static final String ARG_regex = "regex";
private static final String ARG_replacement = "replacement";
private static final String ARG_searchPattern = "searchPattern";
+ private static final String LINE_SEPARATOR_REGEX = "[\\r\\n]+";
private static final String ARG_string = "string";
private static final String ARG_target = "target";
private static final String ARG_values = "values";
@@ -239,7 +240,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
* @return This object.
*/
public FluentListAssertion<String,R> asLines() {
- return asSplit("[\r\n]+");
+ return asSplit(LINE_SEPARATOR_REGEX);
}
/**
@@ -582,8 +583,8 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
assertArgNotNull(ARG_lines, lines);
// Must work for windows too.
- var e = join(lines, '\n').trim().split("[\r\n]+");
- var a = value().trim().split("[\r\n]+");
+ var e = join(lines, '\n').trim().split(LINE_SEPARATOR_REGEX);
+ var a = value().trim().split(LINE_SEPARATOR_REGEX);
if (e.length != a.length)
throw
error(MSG_expectedStringHadDifferentNumbersOfLines, e.length, a.length);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/MethodExecStore.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/MethodExecStore.java
index 98e03c5edb..79598011fc 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/MethodExecStore.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/MethodExecStore.java
@@ -155,12 +155,12 @@ public class MethodExecStore {
public String getReport() {
// @formatter:off
var sb = new StringBuilder()
- .append(" Method Runs
Running Errors Avg Total \n")
- .append("------------------------------ ---------
--------- -------- ------------ -----------\n");
+ .append(f(" Method Runs
Running Errors Avg Total %n"))
+ .append(f("------------------------------ ---------
--------- -------- ------------ -----------%n"));
getStatsByTotalTime()
.stream()
.sorted(Comparator.comparingDouble(MethodExecStats::getTotalTime).reversed())
- .forEach(x -> sb.append(String.format("%30s %9d %9d %9d
%10dms %10dms\n", x.getMethod(), x.getRuns(), x.getRunning(), x.getErrors(),
x.getAvgTime(), x.getTotalTime())));
+ .forEach(x -> sb.append(f("%30s %9d %9d %9d %10dms
%10dms%n", x.getMethod(), x.getRuns(), x.getRunning(), x.getErrors(),
x.getAvgTime(), x.getTotalTime())));
// @formatter:on
return sb.toString();