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 21d89e4a90 SonarQube bug fixes
21d89e4a90 is described below
commit 21d89e4a901c59e11790bd2e93c7df16578e554a
Author: James Bognar <[email protected]>
AuthorDate: Wed Feb 4 21:29:34 2026 -0500
SonarQube bug fixes
---
.../org/apache/juneau/assertions/Assertion.java | 7 +-
.../juneau/assertions/AssertionPredicate.java | 7 +-
.../juneau/assertions/AssertionPredicates.java | 17 ++---
.../juneau/assertions/FluentArrayAssertion.java | 19 ++---
.../juneau/assertions/FluentBooleanAssertion.java | 7 +-
.../assertions/FluentCollectionAssertion.java | 15 ++--
.../assertions/FluentComparableAssertion.java | 11 +--
.../juneau/assertions/FluentDateAssertion.java | 9 +--
.../juneau/assertions/FluentMapAssertion.java | 13 ++--
.../juneau/assertions/FluentObjectAssertion.java | 23 +++---
.../assertions/FluentPrimitiveArrayAssertion.java | 21 +++---
.../juneau/assertions/FluentStringAssertion.java | 27 +++----
.../assertions/FluentThrowableAssertion.java | 9 +--
.../assertions/FluentZonedDateTimeAssertion.java | 9 +--
.../java/org/apache/juneau/assertions/Verify.java | 7 +-
.../apache/juneau/config/internal/ConfigMap.java | 2 +-
.../http/annotation/CollectionFormatType.java | 22 +++---
.../juneau/http/annotation/ParameterType.java | 23 +++---
.../java/org/apache/juneau/msgpack/DataType.java | 87 +++++++++++-----------
.../juneau/objecttools/NumberMatcherFactory.java | 9 +--
.../juneau/objecttools/StringMatcherFactory.java | 11 +--
.../juneau/objecttools/TimeMatcherFactory.java | 7 +-
.../java/org/apache/juneau/swap/AutoListSwap.java | 7 +-
.../java/org/apache/juneau/swap/AutoMapSwap.java | 7 +-
.../org/apache/juneau/swap/AutoNumberSwap.java | 7 +-
.../org/apache/juneau/swap/AutoObjectSwap.java | 7 +-
.../examples/core/config/store/SqlStore.java | 11 ++-
.../juneau/microservice/resources/LogParser.java | 3 +-
.../apache/juneau/rest/common/utils/HttpUtils.java | 7 +-
29 files changed, 172 insertions(+), 239 deletions(-)
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java
index 04c3bb5a5b..94a779d3dc 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java
@@ -62,11 +62,8 @@ public class Assertion {
private static final Messages MESSAGES = Messages.of(Assertion.class,
"Messages");
- // @formatter:off
- static final String
- MSG_parameterCannotBeNull =
MESSAGES.getString("parameterCannotBeNull"),
- MSG_causedBy = MESSAGES.getString("causedBy");
- // @formatter:on
+ static final String MSG_parameterCannotBeNull =
MESSAGES.getString("parameterCannotBeNull");
+ static final String MSG_causedBy = MESSAGES.getString("causedBy");
/**
* Convenience method for getting the array class of the specified
element type.
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
index a5912d1247..1d58db41a9 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
@@ -189,11 +189,8 @@ public class AssertionPredicate<T> implements Predicate<T>
{
*/
public static final Function<Object,String> VALUE =
StringUtils::readable;
private static final Messages MESSAGES =
Messages.of(AssertionPredicate.class, "Messages");
- // @formatter:off
- private static final String
- MSG_valueDidNotPassTest =
MESSAGES.getString("valueDidNotPassTest"),
- MSG_valueDidNotPassTestWithValue =
MESSAGES.getString("valueDidNotPassTestWithValue");
- // @formatter:on
+ private static final String MSG_valueDidNotPassTest =
MESSAGES.getString("valueDidNotPassTest");
+ private static final String MSG_valueDidNotPassTestWithValue =
MESSAGES.getString("valueDidNotPassTestWithValue");
private final Predicate<T> inner;
private final String message;
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
index 8b12ff6e43..f9e2531cff 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
@@ -64,17 +64,14 @@ public class AssertionPredicates {
private static final Function<Object,String> TYPENAME = Utils::cn;
- // @formatter:off
private static final Messages MESSAGES =
Messages.of(AssertionPredicates.class, "Messages");
- private static final String
- MSG_valueWasNull = MESSAGES.getString("valueWasNull"),
- MSG_valueWasNotNull = MESSAGES.getString("valueWasNotNull"),
- MSG_valueDidNotMatchExpected =
MESSAGES.getString("valueDidNotMatchExpected"),
- MSG_valueDidNotContainExpected =
MESSAGES.getString("valueDidNotContainExpected"),
- MSG_valueUnexpectedlyMatched =
MESSAGES.getString("valueUnexpectedlyMatched"),
- MSG_valueWasNotExpectedType =
MESSAGES.getString("valueWasNotExpectedType"),
- MSG_valueDidNotMatchPattern =
MESSAGES.getString("valueDidNotMatchPattern");
- // @formatter:on
+ private static final String MSG_valueWasNull =
MESSAGES.getString("valueWasNull");
+ private static final String MSG_valueWasNotNull =
MESSAGES.getString("valueWasNotNull");
+ private static final String MSG_valueDidNotMatchExpected =
MESSAGES.getString("valueDidNotMatchExpected");
+ private static final String MSG_valueDidNotContainExpected =
MESSAGES.getString("valueDidNotContainExpected");
+ private static final String MSG_valueUnexpectedlyMatched =
MESSAGES.getString("valueUnexpectedlyMatched");
+ private static final String MSG_valueWasNotExpectedType =
MESSAGES.getString("valueWasNotExpectedType");
+ private static final String MSG_valueDidNotMatchPattern =
MESSAGES.getString("valueDidNotMatchPattern");
/**
* Combines the specified predicates into a singled AND'ed predicate.
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
index 966d04c00a..8b6ec72a47 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
@@ -121,18 +121,15 @@ public class FluentArrayAssertion<E,R> extends
FluentObjectAssertion<E[],R> {
private static final String ARG_entries = "entries";
private static final String ARG_test = "test";
- // @formatter:off
private static final Messages MESSAGES =
Messages.of(FluentArrayAssertion.class, "Messages");
- private static final String
- MSG_arrayWasNotEmpty = MESSAGES.getString("arrayWasNotEmpty"),
- MSG_arrayWasEmpty = MESSAGES.getString("arrayWasEmpty"),
- MSG_arrayUnexpectedSize =
MESSAGES.getString("arrayUnexpectedSize"),
- MSG_arrayDidNotContainExpectedValue =
MESSAGES.getString("arrayDidNotContainExpectedValue"),
- MSG_arrayContainedUnexpectedValue =
MESSAGES.getString("arrayContainedUnexpectedValue"),
- MSG_arrayDidNotContainExpectedValueAt =
MESSAGES.getString("arrayDidNotContainExpectedValueAt"),
- MSG_arrayDidntContainAnyMatchingValue =
MESSAGES.getString("arrayDidntContainAnyMatchingValue"),
- MSG_arrayContainedNonMatchingValueAt =
MESSAGES.getString("arrayContainedNonMatchingValueAt");
- // @formatter:on
+ private static final String MSG_arrayWasEmpty =
MESSAGES.getString("arrayWasEmpty");
+ private static final String MSG_arrayWasNotEmpty =
MESSAGES.getString("arrayWasNotEmpty");
+ private static final String MSG_arrayUnexpectedSize =
MESSAGES.getString("arrayUnexpectedSize");
+ private static final String MSG_arrayDidNotContainExpectedValue =
MESSAGES.getString("arrayDidNotContainExpectedValue");
+ private static final String MSG_arrayContainedUnexpectedValue =
MESSAGES.getString("arrayContainedUnexpectedValue");
+ private static final String MSG_arrayDidNotContainExpectedValueAt =
MESSAGES.getString("arrayDidNotContainExpectedValueAt");
+ private static final String MSG_arrayDidntContainAnyMatchingValue =
MESSAGES.getString("arrayDidntContainAnyMatchingValue");
+ private static final String MSG_arrayContainedNonMatchingValueAt =
MESSAGES.getString("arrayContainedNonMatchingValueAt");
/**
* Chained constructor.
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
index bcb4b78ecd..77746a2c8a 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
@@ -98,12 +98,9 @@ import org.apache.juneau.serializer.*;
*/
public class FluentBooleanAssertion<R> extends
FluentComparableAssertion<Boolean,R> {
- // @formatter:off
private static final Messages MESSAGES =
Messages.of(FluentBooleanAssertion.class, "Messages");
- private static final String
- MSG_valueWasFalse = MESSAGES.getString("valueWasFalse"),
- MSG_valueWasTrue = MESSAGES.getString("valueWasTrue");
- // @formatter:on
+ private static final String MSG_valueWasFalse =
MESSAGES.getString("valueWasFalse");
+ private static final String MSG_valueWasTrue =
MESSAGES.getString("valueWasTrue");
/**
* Chained constructor.
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
index 4e1f456afe..2e21e7f104 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
@@ -105,16 +105,13 @@ import org.apache.juneau.serializer.*;
*/
public class FluentCollectionAssertion<E,R> extends
FluentObjectAssertion<Collection<E>,R> {
- // @formatter:off
private static final Messages MESSAGES =
Messages.of(FluentCollectionAssertion.class, "Messages");
- private static final String
- MSG_collectionWasNotEmpty =
MESSAGES.getString("collectionWasNotEmpty"),
- MSG_collectionDidNotContainExpectedValue =
MESSAGES.getString("collectionDidNotContainExpectedValue"),
- MSG_collectionDidNotContainTestedValue =
MESSAGES.getString("collectionDidNotContainTestedValue"),
- MSG_collectionContainedUnexpectedValue =
MESSAGES.getString("collectionContainedUnexpectedValue"),
- MSG_collectionWasEmpty =
MESSAGES.getString("collectionWasEmpty"),
- MSG_collectionDidNotHaveExpectedSize =
MESSAGES.getString("collectionDidNotHaveExpectedSize");
- // @formatter:on
+ private static final String MSG_collectionWasNotEmpty =
MESSAGES.getString("collectionWasNotEmpty");
+ private static final String MSG_collectionDidNotContainExpectedValue =
MESSAGES.getString("collectionDidNotContainExpectedValue");
+ private static final String MSG_collectionDidNotContainTestedValue =
MESSAGES.getString("collectionDidNotContainTestedValue");
+ private static final String MSG_collectionContainedUnexpectedValue =
MESSAGES.getString("collectionContainedUnexpectedValue");
+ private static final String MSG_collectionWasEmpty =
MESSAGES.getString("collectionWasEmpty");
+ private static final String MSG_collectionDidNotHaveExpectedSize =
MESSAGES.getString("collectionDidNotHaveExpectedSize");
/**
* Chained constructor.
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
index 3991e29079..9fb35f331f 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
@@ -103,14 +103,11 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
private static final String ARG_upper = "upper";
private static final String ARG_value = "value";
- // @formatter:off
private static final Messages MESSAGES =
Messages.of(FluentComparableAssertion.class, "Messages");
- private static final String
- MSG_valueWasNotGreaterThanExpected =
MESSAGES.getString("valueWasNotGreaterThanExpected"),
- MSG_valueWasNotGreaterOrEqualsToExpected =
MESSAGES.getString("valueWasNotGreaterOrEqualsToExpected"),
- MSG_valueWasNotLessThanExpected =
MESSAGES.getString("valueWasNotLessThanExpected"),
- MSG_valueWasNotLessOrEqualsToExpected =
MESSAGES.getString("valueWasNotLessOrEqualsToExpected");
- // @formatter:on
+ private static final String MSG_valueWasNotGreaterThanExpected =
MESSAGES.getString("valueWasNotGreaterThanExpected");
+ private static final String MSG_valueWasNotGreaterOrEqualsToExpected =
MESSAGES.getString("valueWasNotGreaterOrEqualsToExpected");
+ private static final String MSG_valueWasNotLessThanExpected =
MESSAGES.getString("valueWasNotLessThanExpected");
+ private static final String MSG_valueWasNotLessOrEqualsToExpected =
MESSAGES.getString("valueWasNotLessOrEqualsToExpected");
/**
* Chained constructor.
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
index ce9c855a83..eb2ba092de 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
@@ -128,13 +128,10 @@ public class FluentDateAssertion<R> extends
FluentComparableAssertion<Date,R> {
private static final String ARG_upper = "upper";
private static final String ARG_value = "value";
- // @formatter:off
private static final Messages MESSAGES =
Messages.of(FluentDateAssertion.class, "Messages");
- private static final String
- MSG_unexpectedValue = MESSAGES.getString("unexpectedValue"),
- MSG_valueWasNotAfterExpected =
MESSAGES.getString("valueWasNotAfterExpected"),
- MSG_valueWasNotBeforeExpected =
MESSAGES.getString("valueWasNotBeforeExpected");
- // @formatter:on
+ private static final String MSG_unexpectedValue =
MESSAGES.getString("unexpectedValue");
+ private static final String MSG_valueWasNotAfterExpected =
MESSAGES.getString("valueWasNotAfterExpected");
+ private static final String MSG_valueWasNotBeforeExpected =
MESSAGES.getString("valueWasNotBeforeExpected");
/**
* Chained constructor.
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
index 8485219d59..f501c7e27e 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
@@ -109,15 +109,12 @@ import org.apache.juneau.serializer.*;
*/
public class FluentMapAssertion<K,V,R> extends
FluentObjectAssertion<Map<K,V>,R> {
- // @formatter:off
private static final Messages MESSAGES =
Messages.of(FluentMapAssertion.class, "Messages");
- private static final String
- MSG_mapWasNotEmpty = MESSAGES.getString("mapWasNotEmpty"),
- MSG_mapDidNotContainExpectedKey =
MESSAGES.getString("mapDidNotContainExpectedKey"),
- MSG_mapContainedUnexpectedKey =
MESSAGES.getString("mapContainedUnexpectedKey"),
- MSG_mapWasEmpty = MESSAGES.getString("mapWasEmpty"),
- MSG_mapDidNotHaveTheExpectedSize =
MESSAGES.getString("mapDidNotHaveTheExpectedSize");
- // @formatter:on
+ private static final String MSG_mapWasNotEmpty =
MESSAGES.getString("mapWasNotEmpty");
+ private static final String MSG_mapDidNotContainExpectedKey =
MESSAGES.getString("mapDidNotContainExpectedKey");
+ private static final String MSG_mapContainedUnexpectedKey =
MESSAGES.getString("mapContainedUnexpectedKey");
+ private static final String MSG_mapWasEmpty =
MESSAGES.getString("mapWasEmpty");
+ private static final String MSG_mapDidNotHaveTheExpectedSize =
MESSAGES.getString("mapDidNotHaveTheExpectedSize");
/**
* Chained constructor.
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
index e58ba2cdf2..7a904d0b4d 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
@@ -100,20 +100,17 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
private static final String ARG_parent = "parent";
private static final String ARG_type = "type";
- // @formatter:off
private static final Messages MESSAGES =
Messages.of(FluentObjectAssertion.class, "Messages");
- private static final String
- MSG_unexpectedType = MESSAGES.getString("unexpectedType"),
- MSG_unexpectedComparison =
MESSAGES.getString("unexpectedComparison"),
- MSG_unexpectedValue = MESSAGES.getString("unexpectedValue"),
- MSG_unexpectedValueDidNotExpect =
MESSAGES.getString("unexpectedValueDidNotExpect"),
- MSG_notTheSameValue = MESSAGES.getString("notTheSameValue"),
- MSG_valueWasNull = MESSAGES.getString("valueWasNull"),
- MSG_valueWasNotNull = MESSAGES.getString("valueWasNotNull"),
- MSG_expectedValueNotFound =
MESSAGES.getString("expectedValueNotFound"),
- MSG_unexpectedValueFound =
MESSAGES.getString("unexpectedValueFound"),
- MSG_unexpectedValue2 = MESSAGES.getString("unexpectedValue2");
- // @formatter:on
+ private static final String MSG_unexpectedType =
MESSAGES.getString("unexpectedType");
+ private static final String MSG_unexpectedComparison =
MESSAGES.getString("unexpectedComparison");
+ private static final String MSG_unexpectedValue =
MESSAGES.getString("unexpectedValue");
+ private static final String MSG_unexpectedValueDidNotExpect =
MESSAGES.getString("unexpectedValueDidNotExpect");
+ private static final String MSG_notTheSameValue =
MESSAGES.getString("notTheSameValue");
+ private static final String MSG_valueWasNull =
MESSAGES.getString("valueWasNull");
+ private static final String MSG_valueWasNotNull =
MESSAGES.getString("valueWasNotNull");
+ private static final String MSG_expectedValueNotFound =
MESSAGES.getString("expectedValueNotFound");
+ private static final String MSG_unexpectedValueFound =
MESSAGES.getString("unexpectedValueFound");
+ private static final String MSG_unexpectedValue2 =
MESSAGES.getString("unexpectedValue2");
private static final JsonSerializer JSON =
JsonSerializer.create().json5().build();
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
index c53b984410..626cfde528 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
@@ -128,19 +128,16 @@ public class FluentPrimitiveArrayAssertion<E,T,R> extends
FluentObjectAssertion<
STRINGIFIERS.put(short.class, x -> Arrays.toString((short[])x));
}
- // @formatter:off
private static final Messages MESSAGES =
Messages.of(FluentPrimitiveArrayAssertion.class, "Messages");
- static final String
- MSG_objectWasNotAnArray =
MESSAGES.getString("objectWasNotAnArray"),
- MSG_arrayWasNotEmpty = MESSAGES.getString("arrayWasNotEmpty"),
- MSG_arrayWasEmpty = MESSAGES.getString("arrayWasEmpty"),
- MSG_arrayDidNotHaveExpectedSize =
MESSAGES.getString("arrayDidNotHaveExpectedSize"),
- MSG_arrayDidNotContainExpectedValue =
MESSAGES.getString("arrayDidNotContainExpectedValue"),
- MSG_arrayDidNotContainExpectedValueAt =
MESSAGES.getString("arrayDidNotContainExpectedValueAt"),
- MSG_arrayContainedUnexpectedValue =
MESSAGES.getString("arrayContainedUnexpectedValue"),
- MSG_arrayDidntContainAnyMatchingValue =
MESSAGES.getString("arrayDidntContainAnyMatchingValue"),
- MSG_arrayContainedNonMatchingValueAt =
MESSAGES.getString("arrayContainedNonMatchingValueAt");
- // @formatter:on
+ static final String MSG_objectWasNotAnArray =
MESSAGES.getString("objectWasNotAnArray");
+ static final String MSG_arrayWasNotEmpty =
MESSAGES.getString("arrayWasNotEmpty");
+ static final String MSG_arrayWasEmpty =
MESSAGES.getString("arrayWasEmpty");
+ static final String MSG_arrayDidNotHaveExpectedSize =
MESSAGES.getString("arrayDidNotHaveExpectedSize");
+ static final String MSG_arrayDidNotContainExpectedValue =
MESSAGES.getString("arrayDidNotContainExpectedValue");
+ static final String MSG_arrayDidNotContainExpectedValueAt =
MESSAGES.getString("arrayDidNotContainExpectedValueAt");
+ static final String MSG_arrayContainedUnexpectedValue =
MESSAGES.getString("arrayContainedUnexpectedValue");
+ static final String MSG_arrayDidntContainAnyMatchingValue =
MESSAGES.getString("arrayDidntContainAnyMatchingValue");
+ static final String MSG_arrayContainedNonMatchingValueAt =
MESSAGES.getString("arrayContainedNonMatchingValueAt");
/**
* Chained constructor.
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 199b24fd55..b63b3bdd85 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
@@ -147,22 +147,19 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
private static final String ARG_target = "target";
private static final String ARG_values = "values";
- // @formatter:off
private static final Messages MESSAGES =
Messages.of(FluentStringAssertion.class, "Messages");
- private static final String
- MSG_stringDifferedAtPosition =
MESSAGES.getString("stringDifferedAtPosition"),
- MSG_expectedStringHadDifferentNumbersOfLines =
MESSAGES.getString("expectedStringHadDifferentNumbersOfLines"),
- MSG_expectedStringHadDifferentValuesAtLine =
MESSAGES.getString("expectedStringHadDifferentValuesAtLine"),
- MSG_stringEqualedUnexpected =
MESSAGES.getString("stringEqualedUnexpected"),
- MSG_stringDidNotContainExpectedSubstring =
MESSAGES.getString("stringDidNotContainExpectedSubstring"),
- MSG_stringContainedUnexpectedSubstring =
MESSAGES.getString("stringContainedUnexpectedSubstring"),
- MSG_stringWasNotEmpty = MESSAGES.getString("stringWasNotEmpty"),
- MSG_stringWasNull = MESSAGES.getString("stringWasNull"),
- MSG_stringWasEmpty = MESSAGES.getString("stringWasEmpty"),
- MSG_stringDidNotMatchExpectedPattern =
MESSAGES.getString("stringDidNotMatchExpectedPattern"),
- MSG_stringDidNotStartWithExpected =
MESSAGES.getString("stringDidNotStartWithExpected"),
- MSG_stringDidNotEndWithExpected =
MESSAGES.getString("stringDidNotEndWithExpected");
- // @formatter:on
+ private static final String MSG_stringDifferedAtPosition =
MESSAGES.getString("stringDifferedAtPosition");
+ private static final String
MSG_expectedStringHadDifferentNumbersOfLines =
MESSAGES.getString("expectedStringHadDifferentNumbersOfLines");
+ private static final String MSG_expectedStringHadDifferentValuesAtLine
= MESSAGES.getString("expectedStringHadDifferentValuesAtLine");
+ private static final String MSG_stringEqualedUnexpected =
MESSAGES.getString("stringEqualedUnexpected");
+ private static final String MSG_stringDidNotContainExpectedSubstring =
MESSAGES.getString("stringDidNotContainExpectedSubstring");
+ private static final String MSG_stringContainedUnexpectedSubstring =
MESSAGES.getString("stringContainedUnexpectedSubstring");
+ private static final String MSG_stringWasNotEmpty =
MESSAGES.getString("stringWasNotEmpty");
+ private static final String MSG_stringWasNull =
MESSAGES.getString("stringWasNull");
+ private static final String MSG_stringWasEmpty =
MESSAGES.getString("stringWasEmpty");
+ private static final String MSG_stringDidNotMatchExpectedPattern =
MESSAGES.getString("stringDidNotMatchExpectedPattern");
+ private static final String MSG_stringDidNotStartWithExpected =
MESSAGES.getString("stringDidNotStartWithExpected");
+ private static final String MSG_stringDidNotEndWithExpected =
MESSAGES.getString("stringDidNotEndWithExpected");
private boolean javaStrings;
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
index a315caed2f..ef7e289b2c 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
@@ -109,13 +109,10 @@ public class FluentThrowableAssertion<T extends
Throwable,R> extends FluentObjec
private static final String ARG_parent = "parent";
private static final String ARG_type = "type";
- // @formatter:off
private static final Messages MESSAGES =
Messages.of(FluentThrowableAssertion.class, "Messages");
- private static final String
- MSG_exceptionWasNotExpectedType =
MESSAGES.getString("exceptionWasNotExpectedType"),
- MSG_exceptionWasNotThrown =
MESSAGES.getString("exceptionWasNotThrown"),
- MSG_causedByExceptionNotExpectedType =
MESSAGES.getString("causedByExceptionNotExpectedType");
- // @formatter:on
+ private static final String MSG_exceptionWasNotExpectedType =
MESSAGES.getString("exceptionWasNotExpectedType");
+ private static final String MSG_exceptionWasNotThrown =
MESSAGES.getString("exceptionWasNotThrown");
+ private static final String MSG_causedByExceptionNotExpectedType =
MESSAGES.getString("causedByExceptionNotExpectedType");
/**
* Chained constructor.
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
index bd8a6a1bdc..9de297f139 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
@@ -124,13 +124,10 @@ public class FluentZonedDateTimeAssertion<R> extends
FluentComparableAssertion<Z
private static final String ARG_upper = "upper";
private static final String ARG_value = "value";
- // @formatter:off
private static final Messages MESSAGES =
Messages.of(FluentZonedDateTimeAssertion.class, "Messages");
- private static final String
- MSG_unexpectedValue = MESSAGES.getString("unexpectedValue"),
- MSG_valueWasNotAfterExpected =
MESSAGES.getString("valueWasNotAfterExpected"),
- MSG_valueWasNotBeforeExpected =
MESSAGES.getString("valueWasNotBeforeExpected");
- // @formatter:on
+ private static final String MSG_unexpectedValue =
MESSAGES.getString("unexpectedValue");
+ private static final String MSG_valueWasNotAfterExpected =
MESSAGES.getString("valueWasNotAfterExpected");
+ private static final String MSG_valueWasNotBeforeExpected =
MESSAGES.getString("valueWasNotBeforeExpected");
/**
* Chained constructor.
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
index cb9af865d0..14ef982328 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
@@ -43,12 +43,9 @@ import org.apache.juneau.cp.*;
*/
public class Verify {
- // @formatter:off
private static final Messages MESSAGES = Messages.of(Verify.class,
"Messages");
- static final String
- MSG_unexpectedType = MESSAGES.getString("unexpectedType"),
- MSG_unexpectedValue = MESSAGES.getString("unexpectedValue");
- // @formatter:on
+ static final String MSG_unexpectedType =
MESSAGES.getString("unexpectedType");
+ static final String MSG_unexpectedValue =
MESSAGES.getString("unexpectedValue");
/**
* Create a new verifier object.
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
index c176892d76..f3d49a1194 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
@@ -876,7 +876,7 @@ public class ConfigMap implements ConfigStoreListener {
accumulator.insert(0,
l.substring(1) + "\n");
li.remove();
}
- } else if (nn(accumulator)) {
+ } else if (accumulator != null) {
li.set(l + "\n" + accumulator.toString());
accumulator = null;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/CollectionFormatType.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/CollectionFormatType.java
index 7156495197..b9833eb1a6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/CollectionFormatType.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/CollectionFormatType.java
@@ -27,14 +27,16 @@ public class CollectionFormatType {
*/
private CollectionFormatType() {}
- @SuppressWarnings("javadoc")
- // @formatter:off
- public static final String
- CSV = "csv",
- SSV = "ssv",
- TSV = "tsv",
- PIPES = "pipes",
- MULTI = "multi",
- UON = "uon";
- // @formatter:on
+ /** CSV collection format. */
+ public static final String CSV = "csv";
+ /** SSV collection format. */
+ public static final String SSV = "ssv";
+ /** TSV collection format. */
+ public static final String TSV = "tsv";
+ /** PIPES collection format. */
+ public static final String PIPES = "pipes";
+ /** MULTI collection format. */
+ public static final String MULTI = "multi";
+ /** UON collection format. */
+ public static final String UON = "uon";
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ParameterType.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ParameterType.java
index 74d9baef90..89d1d4d83f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ParameterType.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ParameterType.java
@@ -27,15 +27,18 @@ public class ParameterType {
*/
private ParameterType() {}
- // @formatter:off
@SuppressWarnings("javadoc")
- public static final String
- STRING = "string",
- NUMBER = "number",
- INTEGER = "integer",
- BOOLEAN = "boolean",
- ARRAY = "array",
- OBJECT = "object",
- FILE = "file";
- // @formatter:on
+ public static final String STRING = "string";
+ /** Number parameter type. */
+ public static final String NUMBER = "number";
+ /** Integer parameter type. */
+ public static final String INTEGER = "integer";
+ /** Boolean parameter type. */
+ public static final String BOOLEAN = "boolean";
+ /** Array parameter type. */
+ public static final String ARRAY = "array";
+ /** Object parameter type. */
+ public static final String OBJECT = "object";
+ /** File parameter type. */
+ public static final String FILE = "file";
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/DataType.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/DataType.java
index 6fc8bd6348..94120db9d7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/DataType.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/DataType.java
@@ -26,51 +26,48 @@ package org.apache.juneau.msgpack;
enum DataType {
NULL, BOOLEAN, INT, LONG, FLOAT, DOUBLE, STRING, BIN, EXT, ARRAY, MAP,
INVALID;
- // @formatter:off
- static final int
- POSFIXINT_L = 0x00, // pos fixint 0xxxxxxx 0x00 -
0x7f
- POSFIXINT_U = 0x7F,
- FIXMAP_L = 0x80, // fixmap 1000xxxx 0x80 -
0x8f
- FIXMAP_U = 0x8F,
- FIXARRAY_L = 0x90, // fixarray 1001xxxx 0x90 -
0x9f
- FIXARRAY_U = 0x9F,
- FIXSTR_L = 0xA0, // fixstr 101xxxxx 0xa0 -
0xbf
- FIXSTR_U = 0xBF,
- NIL = 0xC0, // nil 11000000 0xc0
- NU = 0xC1, // (never used) 11000001 0xc1
- FALSE = 0xC2, // false 11000010 0xc2
- TRUE = 0xC3, // true 11000011 0xc3
- BIN8 = 0xC4, // bin 8 11000100 0xc4
- BIN16 = 0xC5, // bin 16 11000101 0xc5
- BIN32 = 0xC6, // bin 32 11000110 0xc6
- EXT8 = 0xC7, // ext 8 11000111 0xc7
- EXT16 = 0xC8, // ext 16 11001000 0xc8
- EXT32 = 0xC9, // ext 32 11001001 0xc9
- FLOAT32 = 0xCA, // float 32 11001010 0xca
- FLOAT64 = 0xCB, // float 64 11001011 0xcb
- UINT8 = 0xCC, // uint 8 11001100 0xcc
- UINT16 = 0xCD, // uint 16 11001101 0xcd
- UINT32 = 0xCE, // uint 32 11001110 0xce
- UINT64 = 0xCF, // uint 64 11001111 0xcf
- INT8 = 0xD0, // int 8 11010000 0xd0
- INT16 = 0xD1, // int 16 11010001 0xd1
- INT32 = 0xD2, // int 32 11010010 0xd2
- INT64 = 0xD3, // int 64 11010011 0xd3
- FIXEXT1 = 0xD4, // fixext 1 11010100 0xd4
- FIXEXT2 = 0xD5, // fixext 2 11010101 0xd5
- FIXEXT4 = 0xD6, // fixext 4 11010110 0xd6
- FIXEXT8 = 0xD7, // fixext 8 11010111 0xd7
- FIXEXT16 = 0xD8, // fixext 16 11011000 0xd8
- STR8 = 0xD9, // str 8 11011001 0xd9
- STR16 = 0xDA, // str 16 11011010 0xda
- STR32 = 0xDB, // str 32 11011011 0xdb
- ARRAY16 = 0xDC, // array 16 11011100 0xdc
- ARRAY32 = 0xDD, // array 32 11011101 0xdd
- MAP16 = 0xDE, // map 16 11011110 0xde
- MAP32 = 0xDF, // map 32 11011111 0xdf
- NEGFIXINT_L = 0xE0, // neg fixint 111xxxxx 0xe0 -
0xff
- NEGFIXINT_U = 0xFF;
- // @formatter:on
+ static final int POSFIXINT_L = 0x00; // pos fixint 0xxxxxxx
0x00 - 0x7f
+ static final int POSFIXINT_U = 0x7F;
+ static final int FIXMAP_L = 0x80; // fixmap 1000xxxx
0x80 - 0x8f
+ static final int FIXMAP_U = 0x8F;
+ static final int FIXARRAY_L = 0x90; // fixarray 1001xxxx
0x90 - 0x9f
+ static final int FIXARRAY_U = 0x9F;
+ static final int FIXSTR_L = 0xA0; // fixstr 101xxxxx
0xa0 - 0xbf
+ static final int FIXSTR_U = 0xBF;
+ static final int NIL = 0xC0; // nil 11000000
0xc0
+ static final int NU = 0xC1; // (never used) 11000001
0xc1
+ static final int FALSE = 0xC2; // false 11000010
0xc2
+ static final int TRUE = 0xC3; // true 11000011
0xc3
+ static final int BIN8 = 0xC4; // bin 8 11000100
0xc4
+ static final int BIN16 = 0xC5; // bin 16 11000101
0xc5
+ static final int BIN32 = 0xC6; // bin 32 11000110
0xc6
+ static final int EXT8 = 0xC7; // ext 8 11000111
0xc7
+ static final int EXT16 = 0xC8; // ext 16 11001000
0xc8
+ static final int EXT32 = 0xC9; // ext 32 11001001
0xc9
+ static final int FLOAT32 = 0xCA; // float 32 11001010
0xca
+ static final int FLOAT64 = 0xCB; // float 64 11001011
0xcb
+ static final int UINT8 = 0xCC; // uint 8 11001100
0xcc
+ static final int UINT16 = 0xCD; // uint 16 11001101
0xcd
+ static final int UINT32 = 0xCE; // uint 32 11001110
0xce
+ static final int UINT64 = 0xCF; // uint 64 11001111
0xcf
+ static final int INT8 = 0xD0; // int 8 11010000
0xd0
+ static final int INT16 = 0xD1; // int 16 11010001
0xd1
+ static final int INT32 = 0xD2; // int 32 11010010
0xd2
+ static final int INT64 = 0xD3; // int 64 11010011
0xd3
+ static final int FIXEXT1 = 0xD4; // fixext 1 11010100
0xd4
+ static final int FIXEXT2 = 0xD5; // fixext 2 11010101
0xd5
+ static final int FIXEXT4 = 0xD6; // fixext 4 11010110
0xd6
+ static final int FIXEXT8 = 0xD7; // fixext 8 11010111
0xd7
+ static final int FIXEXT16 = 0xD8; // fixext 16 11011000
0xd8
+ static final int STR8 = 0xD9; // str 8 11011001
0xd9
+ static final int STR16 = 0xDA; // str 16 11011010
0xda
+ static final int STR32 = 0xDB; // str 32 11011011
0xdb
+ static final int ARRAY16 = 0xDC; // array 16 11011100
0xdc
+ static final int ARRAY32 = 0xDD; // array 32 11011101
0xdd
+ static final int MAP16 = 0xDE; // map 16 11011110
0xde
+ static final int MAP32 = 0xDF; // map 32 11011111
0xdf
+ static final int NEGFIXINT_L = 0xE0; // neg fixint 111xxxxx
0xe0 - 0xff
+ static final int NEGFIXINT_U = 0xFF;
boolean isOneOf(DataType...dataTypes) {
for (var dt : dataTypes)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/NumberMatcherFactory.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/NumberMatcherFactory.java
index 8e4115813e..303302535f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/NumberMatcherFactory.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/NumberMatcherFactory.java
@@ -49,12 +49,9 @@ public class NumberMatcherFactory extends MatcherFactory {
* A construct representing a single search pattern.
*/
private static class NumberMatcher extends AbstractMatcher {
- // @formatter:off
- private static final AsciiSet
- SNUM = AsciiSet.of("-0123456789."),
- NUM = AsciiSet.of("0123456789."),
- WS = AsciiSet.of(" \t");
- // @formatter:on
+ private static final AsciiSet SNUM =
AsciiSet.of("-0123456789.");
+ private static final AsciiSet NUM = AsciiSet.of("0123456789.");
+ private static final AsciiSet WS = AsciiSet.of(" \t");
NumberRange[] numberRanges;
String pattern;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/StringMatcherFactory.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/StringMatcherFactory.java
index b999df2290..d196d74bb5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/StringMatcherFactory.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/StringMatcherFactory.java
@@ -52,13 +52,10 @@ public class StringMatcherFactory extends MatcherFactory {
* A construct representing a single search pattern.
*/
private static class StringMatcher extends AbstractMatcher {
- // @formatter:off
- private static final AsciiSet
- META_CHARS = AsciiSet.of("*?'\""),
- SQ_CHAR = AsciiSet.of("'"),
- DQ_CHAR = AsciiSet.of("\""),
- REGEX_CHARS = AsciiSet.of("+\\[]{}()^$.");
- // @formatter:on
+ private static final AsciiSet META_CHARS = AsciiSet.of("*?'\"");
+ private static final AsciiSet SQ_CHAR = AsciiSet.of("'");
+ private static final AsciiSet DQ_CHAR = AsciiSet.of("\"");
+ private static final AsciiSet REGEX_CHARS =
AsciiSet.of("+\\[]{}()^$.");
private String pattern;
Pattern[] orPatterns;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java
index 5834f9cec2..73605e5cc6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java
@@ -56,11 +56,8 @@ public class TimeMatcherFactory extends MatcherFactory {
*/
private static class TimeMatcher extends AbstractMatcher {
- // @formatter:off
- private static final AsciiSet
- DT = AsciiSet.of("0123456789-:T./"),
- WS = AsciiSet.of(" \t");
- // @formatter:on
+ private static final AsciiSet DT =
AsciiSet.of("0123456789-:T./");
+ private static final AsciiSet WS = AsciiSet.of(" \t");
TimestampRange[] ranges;
List<TimestampRange> l = new LinkedList<>();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoListSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoListSwap.java
index 77b2db518c..13d9242a97 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoListSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoListSwap.java
@@ -84,11 +84,8 @@ import org.apache.juneau.serializer.*;
*/
public class AutoListSwap<T> extends ObjectSwap<T,List<?>> {
- // @formatter:off
- private static final Set<String>
- SWAP_METHOD_NAMES = u(set("toList", "toJsonList")),
- UNSWAP_METHOD_NAMES = u(set("fromList", "fromJsonList",
"create", "valueOf"));
- // @formatter:on
+ private static final Set<String> SWAP_METHOD_NAMES = u(set("toList",
"toJsonList"));
+ private static final Set<String> UNSWAP_METHOD_NAMES =
u(set("fromList", "fromJsonList", "create", "valueOf"));
/**
* Look for constructors and methods on this class and construct a
dynamic swap if it's possible to do so.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoMapSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoMapSwap.java
index 76fb7f8a0b..eb409d7183 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoMapSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoMapSwap.java
@@ -84,11 +84,8 @@ import org.apache.juneau.serializer.*;
*/
public class AutoMapSwap<T> extends ObjectSwap<T,Map<?,?>> {
- // @formatter:off
- private static final Set<String>
- SWAP_METHOD_NAMES = u(set("toMap", "toJsonMap")),
- UNSWAP_METHOD_NAMES = u(set("fromMap", "fromJsonMap", "create",
"valueOf"));
- // @formatter:on
+ private static final Set<String> SWAP_METHOD_NAMES = u(set("toMap",
"toJsonMap"));
+ private static final Set<String> UNSWAP_METHOD_NAMES = u(set("fromMap",
"fromJsonMap", "create", "valueOf"));
/**
* Look for constructors and methods on this class and construct a
dynamic swap if it's possible to do so.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
index 756f6f2ba0..3343c274d4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
@@ -107,11 +107,8 @@ import org.apache.juneau.serializer.*;
*/
public class AutoNumberSwap<T> extends ObjectSwap<T,Number> {
- // @formatter:off
- private static final Set<String>
- SWAP_METHOD_NAMES = u(set("toNumber", "toInteger", "toInt",
"toLong", "toFloat", "toDouble", "toShort", "toByte")),
- UNSWAP_METHOD_NAMES = u(set("fromInteger", "fromInt",
"fromLong", "fromFloat", "fromDouble", "fromShort", "fromByte", "create",
"valueOf"));
- // @formatter:on
+ private static final Set<String> SWAP_METHOD_NAMES = u(set("toNumber",
"toInteger", "toInt", "toLong", "toFloat", "toDouble", "toShort", "toByte"));
+ private static final Set<String> UNSWAP_METHOD_NAMES =
u(set("fromInteger", "fromInt", "fromLong", "fromFloat", "fromDouble",
"fromShort", "fromByte", "create", "valueOf"));
/**
* Look for constructors and methods on this class and construct a
dynamic swap if it's possible to do so.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoObjectSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoObjectSwap.java
index 396857d7c3..9d8ff753fe 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoObjectSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoObjectSwap.java
@@ -86,11 +86,8 @@ import org.apache.juneau.serializer.*;
*/
public class AutoObjectSwap<T> extends ObjectSwap<T,Object> {
- // @formatter:off
- private static final Set<String>
- SWAP_METHOD_NAMES = u(set("swap", "toObject")),
- UNSWAP_METHOD_NAMES = u(set("unswap", "create", "fromObject",
"of"));
- // @formatter:on
+ private static final Set<String> SWAP_METHOD_NAMES = u(set("swap",
"toObject"));
+ private static final Set<String> UNSWAP_METHOD_NAMES = u(set("unswap",
"create", "fromObject", "of"));
/**
* Inspects the specified class and returns a swap of this type if
possible.
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/config/store/SqlStore.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/config/store/SqlStore.java
index 6427fc1e0c..c5a51a822d 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/config/store/SqlStore.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/config/store/SqlStore.java
@@ -123,12 +123,11 @@ public class SqlStore extends ConfigStore {
}
}
- static final String
- SQLSTORE_jdbcUrl = "SqlStore.jdbcUrl",
- SQLSTORE_tableName = "SqlStore.tableName",
- SQLSTORE_nameColumn = "SqlStore.nameColumn",
- SQLSTORE_valueColumn = "SqlStore.valueColumn",
- SQLSTORE_pollInterval = "SqlStore.pollInterval";
+ static final String SQLSTORE_jdbcUrl = "SqlStore.jdbcUrl";
+ static final String SQLSTORE_tableName = "SqlStore.tableName";
+ static final String SQLSTORE_nameColumn = "SqlStore.nameColumn";
+ static final String SQLSTORE_valueColumn = "SqlStore.valueColumn";
+ static final String SQLSTORE_pollInterval = "SqlStore.pollInterval";
/**
* Instantiates a builder for this object.
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
index bafdb190e6..6af9f36a16 100644
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
@@ -127,7 +127,8 @@ public class LogParser implements
Iterable<LogParser.Entry>, Iterator<LogParser.
LogEntryFormatter formatter;
Date start;
Date end;
- Set<String> loggerFilter, severityFilter;
+ Set<String> loggerFilter;
+ Set<String> severityFilter;
String threadFilter;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/rest/common/utils/HttpUtils.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/rest/common/utils/HttpUtils.java
index 177c8760c6..3f307f8457 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/rest/common/utils/HttpUtils.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/rest/common/utils/HttpUtils.java
@@ -29,11 +29,8 @@ public class HttpUtils {
*/
private HttpUtils() {}
- // @formatter:off
- private static final String[]
- LC_METHODS = { "get", "put", "post", "delete", "options",
"head", "connect", "trace", "patch" },
- UC_METHODS = { "GET", "PUT", "POST", "DELETE", "OPTIONS",
"HEAD", "CONNECT", "TRACE", "PATCH" };
- // @formatter:on
+ private static final String[] LC_METHODS = { "get", "put", "post",
"delete", "options", "head", "connect", "trace", "patch" };
+ private static final String[] UC_METHODS = { "GET", "PUT", "POST",
"DELETE", "OPTIONS", "HEAD", "CONNECT", "TRACE", "PATCH" };
/**
* Given a method name, infers the REST method name.
