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 f3146ba73e test: SonarCloud cleanup batch — fix S5845/S8745 bugs;
suppress by-design S1104/S8694; apply S1612/S6204/S6126/S7158 auto-fixes
f3146ba73e is described below
commit f3146ba73ec55f3be0599c6ecbd66b5f761f9df7
Author: James Bognar <[email protected]>
AuthorDate: Thu Jun 11 14:16:04 2026 -0400
test: SonarCloud cleanup batch — fix S5845/S8745 bugs; suppress by-design
S1104/S8694; apply S1612/S6204/S6126/S7158 auto-fixes
---
.../org/apache/juneau/commons/TestAssertions.java | 4 ++--
.../juneau/commons/bean/BeanMap_Coverage_Test.java | 2 +-
.../commons/svl/functions/SvlFunctions_Test.java | 3 +++
.../apache/juneau/commons/utils/Utils_Test.java | 7 ++++---
.../juneau/collections/MarshalledMap_Test.java | 2 +-
.../MarshalledPropertyPostProcessor_Test.java | 3 ++-
.../juneau/marshall/csv/CsvParserSession_Test.java | 18 ++++++++++------
.../hocon/HoconSerializerSession_Test.java | 3 +++
.../juneau/marshall/ini/IniSerializer_Test.java | 3 +++
.../marshall/toml/TomlSerializerSession_Test.java | 3 ++-
.../juneau/marshall/toml/TomlTokenizer_Test.java | 24 +++++++++++-----------
.../juneau/marshall/toml/TomlWriter_Test.java | 3 ++-
...emporalFormat_LocalDateTime_RoundTrip_Test.java | 3 ++-
.../TemporalFormat_LocalDate_RoundTrip_Test.java | 3 ++-
.../TemporalFormat_MonthDay_RoundTrip_Test.java | 3 ++-
.../marshall/transforms/TemporalFormat_Test.java | 3 ++-
.../TemporalFormat_YearMonth_RoundTrip_Test.java | 3 ++-
.../pojos/PrimitiveAtomicObjectsBean.java | 4 +++-
.../testutils/pojos/PrimitiveObjectsBean.java | 4 +++-
.../apache/juneau/utest/utils/MutableSupplier.java | 3 +++
.../juneau/rest/server/logger/RestLogger_Test.java | 6 +++---
.../rest/server/vars/RequestSwaggerVar_Test.java | 4 ++--
.../resources/MicroserviceResources_Test.java | 6 +++++-
.../apache/juneau/http/classic/BasicPart_Test.java | 4 ++--
.../juneau/rest/server/logger/RestLogger_Test.java | 6 +++---
25 files changed, 81 insertions(+), 46 deletions(-)
diff --git
a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/TestAssertions.java
b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/TestAssertions.java
index b283a3de8e..e4fb773872 100644
---
a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/TestAssertions.java
+++
b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/TestAssertions.java
@@ -76,7 +76,7 @@ public class TestAssertions {
Map<?, ?> ordered = toOrderedMap(actual);
List<String> entries = ordered.entrySet().stream()
.map(e -> stringifyKey(e.getKey()) + "=" +
stringify(e.getValue()))
- .collect(Collectors.toList());
+ .toList();
assertList(entries, expected);
}
@@ -165,7 +165,7 @@ public class TestAssertions {
private static List<?> toList(Object actual) {
if (actual instanceof List<?> l) return l;
if (actual instanceof Collection<?> c) return new
ArrayList<>(c);
- if (actual instanceof Stream<?> s) return
s.collect(Collectors.toList());
+ if (actual instanceof Stream<?> s) return s.toList();
if (actual instanceof Enumeration<?> e) {
List<Object> result = new ArrayList<>();
while (e.hasMoreElements()) result.add(e.nextElement());
diff --git
a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/bean/BeanMap_Coverage_Test.java
b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/bean/BeanMap_Coverage_Test.java
index 0b2d6dd90d..f22702f8ff 100644
---
a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/bean/BeanMap_Coverage_Test.java
+++
b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/bean/BeanMap_Coverage_Test.java
@@ -313,7 +313,7 @@ class BeanMap_Coverage_Test extends TestBase {
p.setY(10);
var bm = BeanMap.of(p);
Map<String,Object> seen = new HashMap<>();
- bm.forEachValue(v -> v instanceof String, (pm, name, val, t) ->
seen.put(name, val));
+ bm.forEachValue(String.class::isInstance, (pm, name, val, t) ->
seen.put(name, val));
assertEquals(Set.of("x"), seen.keySet());
}
diff --git
a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/svl/functions/SvlFunctions_Test.java
b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/svl/functions/SvlFunctions_Test.java
index 2e54b82832..83edabf25b 100644
---
a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/svl/functions/SvlFunctions_Test.java
+++
b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/svl/functions/SvlFunctions_Test.java
@@ -26,6 +26,9 @@ import org.apache.juneau.commons.TestBase;
* Expanded edge-case tests for all SVL function categories to increase
instruction coverage.
* Supplements the per-category *_Test files with null/empty/boundary inputs.
*/
+@SuppressWarnings({
+ "java:S8694" // Test data uses literal month ints for date
construction; Month enum constants add noise without value.
+})
class SvlFunctions_Test extends TestBase {
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/utils/Utils_Test.java
b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/utils/Utils_Test.java
index 94fd0ffab1..ec82e28f7e 100644
---
a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/utils/Utils_Test.java
+++
b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/utils/Utils_Test.java
@@ -1491,13 +1491,14 @@ class Utils_Test extends TestBase {
assertEquals(5.0f, abs(-5.0f));
assertEquals((short)5, abs((short)-5));
assertEquals((byte)5, abs((byte)-5));
- // Custom Number type falls through to double calculation
- assertEquals(42.0, abs(new Number() {
+ // Custom Number type falls through to double calculation
(returns a Double at runtime)
+ Number a = abs(new Number() {
@Override public int intValue() { return -42; }
@Override public long longValue() { return -42L; }
@Override public float floatValue() { return -42.0f; }
@Override public double doubleValue() { return -42.0; }
- }));
+ });
+ assertEquals(42.0, a.doubleValue());
assertNull(abs(null));
}
diff --git
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/collections/MarshalledMap_Test.java
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/collections/MarshalledMap_Test.java
index f3dd7a09f8..d7158e299a 100644
---
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/collections/MarshalledMap_Test.java
+++
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/collections/MarshalledMap_Test.java
@@ -316,7 +316,7 @@ class MarshalledMap_Test extends TestBase {
}
@Test void b13_appendIfPredicateTrue() {
- var m = MarshalledMap.create().appendIf(s ->
((String)s).length() > 0, "k", "value");
+ var m = MarshalledMap.create().appendIf(s ->
!((String)s).isEmpty(), "k", "value");
assertEquals("value", m.getString("k"));
}
diff --git
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/MarshalledPropertyPostProcessor_Test.java
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/MarshalledPropertyPostProcessor_Test.java
index b9b85c3ceb..4f3437c16b 100644
---
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/MarshalledPropertyPostProcessor_Test.java
+++
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/MarshalledPropertyPostProcessor_Test.java
@@ -44,7 +44,8 @@ import org.junit.jupiter.api.*;
*/
@SuppressWarnings({
"java:S1186", // Annotation-presence-only fixtures don't need test body
wiring beyond round-trip.
- "java:S2699" // Several tests assert through the roundTripDefault
helper (and the l01 no-op guard) that Sonar can't see as assertions.
+ "java:S2699", // Several tests assert through the roundTripDefault
helper (and the l01 no-op guard) that Sonar can't see as assertions.
+ "java:S8694" // Test data uses literal month ints for date
construction; Month enum constants add noise without value.
})
class MarshalledPropertyPostProcessor_Test {
diff --git
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/csv/CsvParserSession_Test.java
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/csv/CsvParserSession_Test.java
index b64e36a2c1..82c8919ce7 100644
---
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/csv/CsvParserSession_Test.java
+++
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/csv/CsvParserSession_Test.java
@@ -285,8 +285,10 @@ class CsvParserSession_Test extends TestBase {
//====================================================================================================
@Test void j01_primitiveArrays_longFloatShortBooleanChar() throws
Exception {
- var csv = "name,longs,floats,shorts,bools,chars\n"
- +
"row1,[1;2;3],[1.5;2.5],[10;20],[true;false],[65;66;67]\n";
+ var csv = """
+ name,longs,floats,shorts,bools,chars
+ row1,[1;2;3],[1.5;2.5],[10;20],[true;false],[65;66;67]
+ """;
var r = (List<P>) CsvParser.DEFAULT.parse(csv, List.class,
P.class);
assertEquals(1, r.size());
assertArrayEquals(new long[]{1L, 2L, 3L}, r.get(0).longs);
@@ -298,8 +300,10 @@ class CsvParserSession_Test extends TestBase {
@Test void j02_primitiveArrays_emptyVariants() throws Exception {
// "[]" -> createEmptyPrimitiveArray; exercises
long/float/short/bool/char empty branches.
- var csv = "name,longs,floats,shorts,bools,chars\n"
- + "row1,[],[],[],[],[]\n";
+ var csv = """
+ name,longs,floats,shorts,bools,chars
+ row1,[],[],[],[],[]
+ """;
var r = (List<P>) CsvParser.DEFAULT.parse(csv, List.class,
P.class);
assertEquals(0, r.get(0).longs.length);
assertEquals(0, r.get(0).floats.length);
@@ -311,8 +315,10 @@ class CsvParserSession_Test extends TestBase {
@Test void j03_primitiveArray_missingBracketsTreatedAsString() throws
Exception {
// Array cell without [..] markers -> parseCsvCellValue returns
null and
// convertToType(string,int[]) is attempted; throws
ParseException.
- var csv = "name,longs,floats,shorts,bools,chars\n"
- + "row1,1;2;3,[],[],[],[]\n";
+ var csv = """
+ name,longs,floats,shorts,bools,chars
+ row1,1;2;3,[],[],[],[]
+ """;
assertThrows(ParseException.class, () ->
CsvParser.DEFAULT.parse(csv, List.class, P.class));
}
diff --git
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconSerializerSession_Test.java
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconSerializerSession_Test.java
index ccf3a4646f..269300b46d 100644
---
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconSerializerSession_Test.java
+++
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconSerializerSession_Test.java
@@ -36,6 +36,9 @@ import org.junit.jupiter.api.*;
* (Date/Calendar/Temporal/Duration/Period/byte[]/Reader/InputStream),
* and null-policy variations.
*/
+@SuppressWarnings({
+ "java:S8694" // Test data uses literal month ints for date
construction; Month enum constants add noise without value.
+})
class HoconSerializerSession_Test extends TestBase {
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/ini/IniSerializer_Test.java
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/ini/IniSerializer_Test.java
index 6d1af1a4ef..44616de662 100644
---
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/ini/IniSerializer_Test.java
+++
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/ini/IniSerializer_Test.java
@@ -26,6 +26,9 @@ import org.junit.jupiter.api.*;
/**
* Tests for {@link IniSerializer}.
*/
+@SuppressWarnings({
+ "java:S8694" // Test data uses literal month ints for date
construction; Month enum constants add noise without value.
+})
class IniSerializer_Test {
//====================================================================================================
diff --git
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/toml/TomlSerializerSession_Test.java
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/toml/TomlSerializerSession_Test.java
index f978b4b636..f04e2215a6 100644
---
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/toml/TomlSerializerSession_Test.java
+++
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/toml/TomlSerializerSession_Test.java
@@ -33,7 +33,8 @@ import org.junit.jupiter.api.*;
*/
@SuppressWarnings({
"java:S125", // Commented-out code is retained as historical reference
/ future re-enable candidate.
- "java:S5976" // Separate test methods preferred over parameterized for
clarity and independent failure reporting.
+ "java:S5976", // Separate test methods preferred over parameterized
for clarity and independent failure reporting.
+ "java:S8694" // Test data uses literal month ints for date
construction; Month enum constants add noise without value.
})
class TomlSerializerSession_Test extends TestBase {
diff --git
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/toml/TomlTokenizer_Test.java
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/toml/TomlTokenizer_Test.java
index 9949308a22..739a18b9a0 100644
---
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/toml/TomlTokenizer_Test.java
+++
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/toml/TomlTokenizer_Test.java
@@ -271,7 +271,7 @@ class TomlTokenizer_Test extends TestBase {
@Test
void f02_readBasicStringMissingOpenQuoteThrows() {
var tok = t("hello");
- assertThrows(ParseException.class, () -> tok.readBasicString());
+ assertThrows(ParseException.class, tok::readBasicString);
}
@Test
@@ -295,38 +295,38 @@ class TomlTokenizer_Test extends TestBase {
@Test
void f06_readBasicStringInvalidEscape() {
var tok = t("\"\\q\"");
- assertThrows(ParseException.class, () -> tok.readBasicString());
+ assertThrows(ParseException.class, tok::readBasicString);
}
@Test
void f07_readBasicStringUnterminated() {
var tok = t("\"hello");
- assertThrows(ParseException.class, () -> tok.readBasicString());
+ assertThrows(ParseException.class, tok::readBasicString);
}
@Test
void f08_readBasicStringEofAfterBackslash() {
var tok = t("\"\\");
- assertThrows(ParseException.class, () -> tok.readBasicString());
+ assertThrows(ParseException.class, tok::readBasicString);
}
@Test
void f09_readBasicStringInvalidUnicodeHex() {
var tok = t("\"\\uXYZW\"");
- assertThrows(ParseException.class, () -> tok.readBasicString());
+ assertThrows(ParseException.class, tok::readBasicString);
}
@Test
void f10_readBasicStringInvalidUnicodeShortEof() {
var tok = t("\"\\u00\"");
- assertThrows(ParseException.class, () -> tok.readBasicString());
+ assertThrows(ParseException.class, tok::readBasicString);
}
@Test
void f11_readBasicStringInvalidLongUnicodeCodePoint() {
// \U with code point > 0x10FFFF is invalid (out of valid
Unicode range)
var tok = t("\"\\U00200000\"");
- assertThrows(ParseException.class, () -> tok.readBasicString());
+ assertThrows(ParseException.class, tok::readBasicString);
}
//-----------------------------------------------------------------------------------------------------------------
@@ -342,13 +342,13 @@ class TomlTokenizer_Test extends TestBase {
@Test
void g02_readLiteralStringMissingOpenQuoteThrows() {
var tok = t("hello");
- assertThrows(ParseException.class, () ->
tok.readLiteralString());
+ assertThrows(ParseException.class, tok::readLiteralString);
}
@Test
void g03_readLiteralStringUnterminated() {
var tok = t("'hello");
- assertThrows(ParseException.class, () ->
tok.readLiteralString());
+ assertThrows(ParseException.class, tok::readLiteralString);
}
//-----------------------------------------------------------------------------------------------------------------
@@ -415,13 +415,13 @@ class TomlTokenizer_Test extends TestBase {
@Test
void h10_readMultiLineBasicStringUnterminated() {
var tok = t("foo");
- assertThrows(ParseException.class, () ->
tok.readMultiLineBasicString());
+ assertThrows(ParseException.class,
tok::readMultiLineBasicString);
}
@Test
void h11_readMultiLineBasicStringInvalidEscape() {
var tok = t("\\q\"\"\"");
- assertThrows(ParseException.class, () ->
tok.readMultiLineBasicString());
+ assertThrows(ParseException.class,
tok::readMultiLineBasicString);
}
@Test
@@ -480,7 +480,7 @@ class TomlTokenizer_Test extends TestBase {
@Test
void i07_readMultiLineLiteralStringUnterminated() {
var tok = t("foo");
- assertThrows(ParseException.class, () ->
tok.readMultiLineLiteralString());
+ assertThrows(ParseException.class,
tok::readMultiLineLiteralString);
}
//-----------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/toml/TomlWriter_Test.java
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/toml/TomlWriter_Test.java
index e9bb7ec158..f1a64de77a 100644
---
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/toml/TomlWriter_Test.java
+++
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/toml/TomlWriter_Test.java
@@ -26,7 +26,8 @@ import org.apache.juneau.marshall.*;
import org.junit.jupiter.api.*;
@SuppressWarnings({
- "resource" // Closeable resources in tests are intentionally
unassigned; closing is handled by test infrastructure.
+ "resource", // Closeable resources in tests are intentionally
unassigned; closing is handled by test infrastructure.
+ "java:S8694" // Test data uses literal month ints for date
construction; Month enum constants add noise without value.
})
class TomlWriter_Test extends TestBase {
diff --git
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_LocalDateTime_RoundTrip_Test.java
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_LocalDateTime_RoundTrip_Test.java
index 0b19fd0c57..27dd9be0a5 100644
---
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_LocalDateTime_RoundTrip_Test.java
+++
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_LocalDateTime_RoundTrip_Test.java
@@ -64,7 +64,8 @@ import org.junit.jupiter.params.provider.*;
* comes to 42 × 20 = 840 testers per test method.
*/
@SuppressWarnings({
- "unused" // Exception parameter intentionally unused in catch block;
only the fact of the exception matters.
+ "unused", // Exception parameter intentionally unused in catch block;
only the fact of the exception matters.
+ "java:S8694" // Test data uses literal month ints for date
construction; Month enum constants add noise without value.
})
class TemporalFormat_LocalDateTime_RoundTrip_Test extends TestBase {
diff --git
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_LocalDate_RoundTrip_Test.java
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_LocalDate_RoundTrip_Test.java
index 7c3773b66f..020f12f21f 100644
---
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_LocalDate_RoundTrip_Test.java
+++
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_LocalDate_RoundTrip_Test.java
@@ -69,7 +69,8 @@ import org.junit.jupiter.params.provider.*;
* the assertion reflects the lossy canonical form.
*/
@SuppressWarnings({
- "unused" // Exception parameter intentionally unused in catch block;
only the fact of the exception matters.
+ "unused", // Exception parameter intentionally unused in catch block;
only the fact of the exception matters.
+ "java:S8694" // Test data uses literal month ints for date
construction; Month enum constants add noise without value.
})
class TemporalFormat_LocalDate_RoundTrip_Test extends TestBase {
diff --git
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_MonthDay_RoundTrip_Test.java
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_MonthDay_RoundTrip_Test.java
index 9c829d46a1..54b8ad1da5 100644
---
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_MonthDay_RoundTrip_Test.java
+++
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_MonthDay_RoundTrip_Test.java
@@ -70,7 +70,8 @@ import org.junit.jupiter.params.provider.*;
* per test method.
*/
@SuppressWarnings({
- "unused" // Exception parameter intentionally unused in catch block;
only the fact of the exception matters.
+ "unused", // Exception parameter intentionally unused in catch block;
only the fact of the exception matters.
+ "java:S8694" // Test data uses literal month ints for date
construction; Month enum constants add noise without value.
})
class TemporalFormat_MonthDay_RoundTrip_Test extends TestBase {
diff --git
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_Test.java
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_Test.java
index 078eb1aa59..50617455fd 100644
---
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_Test.java
+++
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_Test.java
@@ -26,7 +26,8 @@ import org.apache.juneau.marshall.*;
import org.junit.jupiter.api.*;
@SuppressWarnings({
- "java:S5778" // assertThrows lambdas with chained calls; intermediate
invocations do not throw in practice
+ "java:S5778", // assertThrows lambdas with chained calls; intermediate
invocations do not throw in practice
+ "java:S8694" // Test data uses literal month ints for date
construction; Month enum constants add noise without value.
})
class TemporalFormat_Test {
diff --git
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_YearMonth_RoundTrip_Test.java
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_YearMonth_RoundTrip_Test.java
index 6abd98a9d7..edab7b7897 100644
---
a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_YearMonth_RoundTrip_Test.java
+++
b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/transforms/TemporalFormat_YearMonth_RoundTrip_Test.java
@@ -69,7 +69,8 @@ import org.junit.jupiter.params.provider.*;
* lossy canonical form.
*/
@SuppressWarnings({
- "unused" // Exception parameter intentionally unused in catch block;
only the fact of the exception matters.
+ "unused", // Exception parameter intentionally unused in catch block;
only the fact of the exception matters.
+ "java:S8694" // Test data uses literal month ints for date
construction; Month enum constants add noise without value.
})
class TemporalFormat_YearMonth_RoundTrip_Test extends TestBase {
diff --git
a/juneau-core/juneau-test-utils/src/main/java/org/apache/juneau/testutils/pojos/PrimitiveAtomicObjectsBean.java
b/juneau-core/juneau-test-utils/src/main/java/org/apache/juneau/testutils/pojos/PrimitiveAtomicObjectsBean.java
index ef43049607..2e709938ec 100755
---
a/juneau-core/juneau-test-utils/src/main/java/org/apache/juneau/testutils/pojos/PrimitiveAtomicObjectsBean.java
+++
b/juneau-core/juneau-test-utils/src/main/java/org/apache/juneau/testutils/pojos/PrimitiveAtomicObjectsBean.java
@@ -25,7 +25,9 @@ import java.util.concurrent.atomic.*;
* Test bean fields of type AtomicInteger and AtomicLong.
* Note that Jena parsers cannot handle these types, so we only test non-Jena
parsers.
*/
-@SuppressWarnings({})
+@SuppressWarnings({
+ "java:S1104" // Intentional public-field marshalling fixture;
getters/setters would defeat the bean's purpose.
+})
public class PrimitiveAtomicObjectsBean {
// primitive objects
diff --git
a/juneau-core/juneau-test-utils/src/main/java/org/apache/juneau/testutils/pojos/PrimitiveObjectsBean.java
b/juneau-core/juneau-test-utils/src/main/java/org/apache/juneau/testutils/pojos/PrimitiveObjectsBean.java
index d3f6a1cf6b..024a8dcae0 100755
---
a/juneau-core/juneau-test-utils/src/main/java/org/apache/juneau/testutils/pojos/PrimitiveObjectsBean.java
+++
b/juneau-core/juneau-test-utils/src/main/java/org/apache/juneau/testutils/pojos/PrimitiveObjectsBean.java
@@ -21,7 +21,9 @@ import static
org.apache.juneau.commons.utils.CollectionUtils.*;
import java.math.*;
import java.util.*;
-@SuppressWarnings({})
+@SuppressWarnings({
+ "java:S1104" // Intentional public-field marshalling fixture;
getters/setters would defeat the bean's purpose.
+})
public class PrimitiveObjectsBean {
// primitive objects
diff --git
a/juneau-core/juneau-test-utils/src/main/java/org/apache/juneau/utest/utils/MutableSupplier.java
b/juneau-core/juneau-test-utils/src/main/java/org/apache/juneau/utest/utils/MutableSupplier.java
index a862353fd4..65d3812cbc 100644
---
a/juneau-core/juneau-test-utils/src/main/java/org/apache/juneau/utest/utils/MutableSupplier.java
+++
b/juneau-core/juneau-test-utils/src/main/java/org/apache/juneau/utest/utils/MutableSupplier.java
@@ -21,6 +21,9 @@ import java.util.function.*;
/**
* A simple supplier of objects.
*/
+@SuppressWarnings({
+ "java:S1104" // Intentional public mutable field accessed directly by
tests.
+})
public class MutableSupplier<T> implements Supplier<T> {
public T value;
diff --git
a/juneau-integration-tests/src/test/java/org/apache/juneau/rest/server/logger/RestLogger_Test.java
b/juneau-integration-tests/src/test/java/org/apache/juneau/rest/server/logger/RestLogger_Test.java
index c06a5a8508..cfd1e82d80 100644
---
a/juneau-integration-tests/src/test/java/org/apache/juneau/rest/server/logger/RestLogger_Test.java
+++
b/juneau-integration-tests/src/test/java/org/apache/juneau/rest/server/logger/RestLogger_Test.java
@@ -125,7 +125,7 @@ class RestLogger_Test extends TestBase {
@Test void d01_exceptionFilter_matchesWhenExceptionPresent() throws
Exception {
var rule = CallLoggerRule.create(BasicBeanStore.INSTANCE)
- .exceptionFilter(x -> x instanceof
IllegalArgumentException)
+
.exceptionFilter(IllegalArgumentException.class::isInstance)
.build();
var req = new
org.springframework.mock.web.MockHttpServletRequest();
req.setAttribute("Exception", new
IllegalArgumentException("test"));
@@ -135,7 +135,7 @@ class RestLogger_Test extends TestBase {
@Test void d02_exceptionFilter_doesNotMatchWrongType() throws Exception
{
var rule = CallLoggerRule.create(BasicBeanStore.INSTANCE)
- .exceptionFilter(x -> x instanceof
IllegalArgumentException)
+
.exceptionFilter(IllegalArgumentException.class::isInstance)
.build();
var req = new
org.springframework.mock.web.MockHttpServletRequest();
req.setAttribute("Exception", new RuntimeException("test"));
@@ -146,7 +146,7 @@ class RestLogger_Test extends TestBase {
@Test void d03_exceptionFilter_matchesWhenNoException() throws
Exception {
// When no exception is present, the exception filter is not
evaluated; the rule still matches.
var rule = CallLoggerRule.create(BasicBeanStore.INSTANCE)
- .exceptionFilter(x -> x instanceof
IllegalArgumentException)
+
.exceptionFilter(IllegalArgumentException.class::isInstance)
.build();
var req = new
org.springframework.mock.web.MockHttpServletRequest();
var res = new
org.springframework.mock.web.MockHttpServletResponse();
diff --git
a/juneau-integration-tests/src/test/java/org/apache/juneau/rest/server/vars/RequestSwaggerVar_Test.java
b/juneau-integration-tests/src/test/java/org/apache/juneau/rest/server/vars/RequestSwaggerVar_Test.java
index bd32f78a03..fd31a45c8d 100644
---
a/juneau-integration-tests/src/test/java/org/apache/juneau/rest/server/vars/RequestSwaggerVar_Test.java
+++
b/juneau-integration-tests/src/test/java/org/apache/juneau/rest/server/vars/RequestSwaggerVar_Test.java
@@ -71,6 +71,8 @@ class RequestSwaggerVar_Test extends TestBase {
@BeforeAll
static void beforeAll() {
clientA = MockRestClient.build(A.class);
+ beforeAllC();
+ beforeAllE();
}
@Test void a01_title() throws Exception {
@@ -228,7 +230,6 @@ class RequestSwaggerVar_Test extends TestBase {
private static MockRestClient clientC;
- @BeforeAll
static void beforeAllC() {
clientC = MockRestClient.build(C.class);
}
@@ -305,7 +306,6 @@ class RequestSwaggerVar_Test extends TestBase {
private static MockRestClient clientE;
- @BeforeAll
static void beforeAllE() {
clientE = MockRestClient.build(E.class);
}
diff --git
a/juneau-microservice/juneau-microservice/src/test/java/org/apache/juneau/microservice/resources/MicroserviceResources_Test.java
b/juneau-microservice/juneau-microservice/src/test/java/org/apache/juneau/microservice/resources/MicroserviceResources_Test.java
index dd8f01e2ef..fd13e7231a 100644
---
a/juneau-microservice/juneau-microservice/src/test/java/org/apache/juneau/microservice/resources/MicroserviceResources_Test.java
+++
b/juneau-microservice/juneau-microservice/src/test/java/org/apache/juneau/microservice/resources/MicroserviceResources_Test.java
@@ -48,6 +48,11 @@ class MicroserviceResources_Test extends TestBase {
static Path dirRoot;
@BeforeAll
+ static void setup() throws Exception {
+ setupDir();
+ setupLogs();
+ }
+
static void setupDir() throws Exception {
dirRoot = dirTempDir.resolve("dir-root");
Files.createDirectories(dirRoot);
@@ -147,7 +152,6 @@ class MicroserviceResources_Test extends TestBase {
static Path logsRoot;
- @BeforeAll
static void setupLogs() throws Exception {
logsRoot = logsTempDir.resolve("logs-root");
Files.createDirectories(logsRoot);
diff --git
a/juneau-rest/juneau-rest-common-classic/src/test/java/org/apache/juneau/http/classic/BasicPart_Test.java
b/juneau-rest/juneau-rest-common-classic/src/test/java/org/apache/juneau/http/classic/BasicPart_Test.java
index 982e7b022a..5464be927c 100644
---
a/juneau-rest/juneau-rest-common-classic/src/test/java/org/apache/juneau/http/classic/BasicPart_Test.java
+++
b/juneau-rest/juneau-rest-common-classic/src/test/java/org/apache/juneau/http/classic/BasicPart_Test.java
@@ -147,8 +147,8 @@ class BasicPart_Test extends TestBase {
assertNotEquals(x1, "Foo=bar");
assertNotEquals(x1, null);
- // Equal to a different NameValuePair impl with same name/value
- var other = new
org.apache.http.message.BasicNameValuePair("Foo","bar");
+ // Equal to a different NameValuePair impl with same name/value
(cross-impl equality via the shared interface)
+ NameValuePair other = new
org.apache.http.message.BasicNameValuePair("Foo","bar");
assertEquals(x1, other);
}
diff --git
a/juneau-rest/juneau-rest-server-springboot/src/test/java/org/apache/juneau/rest/server/logger/RestLogger_Test.java
b/juneau-rest/juneau-rest-server-springboot/src/test/java/org/apache/juneau/rest/server/logger/RestLogger_Test.java
index c06a5a8508..cfd1e82d80 100644
---
a/juneau-rest/juneau-rest-server-springboot/src/test/java/org/apache/juneau/rest/server/logger/RestLogger_Test.java
+++
b/juneau-rest/juneau-rest-server-springboot/src/test/java/org/apache/juneau/rest/server/logger/RestLogger_Test.java
@@ -125,7 +125,7 @@ class RestLogger_Test extends TestBase {
@Test void d01_exceptionFilter_matchesWhenExceptionPresent() throws
Exception {
var rule = CallLoggerRule.create(BasicBeanStore.INSTANCE)
- .exceptionFilter(x -> x instanceof
IllegalArgumentException)
+
.exceptionFilter(IllegalArgumentException.class::isInstance)
.build();
var req = new
org.springframework.mock.web.MockHttpServletRequest();
req.setAttribute("Exception", new
IllegalArgumentException("test"));
@@ -135,7 +135,7 @@ class RestLogger_Test extends TestBase {
@Test void d02_exceptionFilter_doesNotMatchWrongType() throws Exception
{
var rule = CallLoggerRule.create(BasicBeanStore.INSTANCE)
- .exceptionFilter(x -> x instanceof
IllegalArgumentException)
+
.exceptionFilter(IllegalArgumentException.class::isInstance)
.build();
var req = new
org.springframework.mock.web.MockHttpServletRequest();
req.setAttribute("Exception", new RuntimeException("test"));
@@ -146,7 +146,7 @@ class RestLogger_Test extends TestBase {
@Test void d03_exceptionFilter_matchesWhenNoException() throws
Exception {
// When no exception is present, the exception filter is not
evaluated; the rule still matches.
var rule = CallLoggerRule.create(BasicBeanStore.INSTANCE)
- .exceptionFilter(x -> x instanceof
IllegalArgumentException)
+
.exceptionFilter(IllegalArgumentException.class::isInstance)
.build();
var req = new
org.springframework.mock.web.MockHttpServletRequest();
var res = new
org.springframework.mock.web.MockHttpServletResponse();
