You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2026/07/23 17:28:23 UTC
(juneau) branch master updated: TODO-288: Normalize generic type-argument comma spacing reactor-wide
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 b662ff060a TODO-288: Normalize generic type-argument comma spacing reactor-wide
b662ff060a is described below
commit b662ff060a34d3af870806d04a36192eeecb830c
Author: James Bognar <ja...@apache.org>
AuthorDate: Thu Jul 23 13:28:11 2026 -0400
TODO-288: Normalize generic type-argument comma spacing reactor-wide
Drop the space after commas separating type arguments (Map<String, Object>
-> Map<String,Object>) at every nesting level, across all src/main and
src/test, including inside Javadoc/comments. Pure whitespace; marshalling
output byte-identical (full reactor suite green, 135,324 tests / 0 failures).
Also updates the Eclipse formatter profile to enforce the no-space style for
code going forward, and adds scripts/normalize-generic-commas.py (the
comment-aware transform tool, retained for future use).
Co-authored-by: Cursor <cu...@cursor.com>
---
.../juneau/bean/html5/HtmlElement_Attr_Test.java | 2 +-
.../bean/jsonschema/JsonSchemaProperty_Test.java | 2 +-
.../juneau/bean/jsonschema/JsonSchemaRef_Test.java | 2 +-
.../apache/juneau/bean/mcp/CallToolRequest.java | 6 +-
.../apache/juneau/bean/mcp/ClientCapabilities.java | 12 +-
.../apache/juneau/bean/mcp/GetPromptRequest.java | 6 +-
.../org/apache/juneau/bean/mcp/JsonSchema.java | 12 +-
.../apache/juneau/bean/mcp/ServerCapabilities.java | 6 +-
.../juneau/bean/mcp/McpBeans_RoundTrip_Test.java | 4 +-
.../juneau/commons/collections/FilteredMap.java | 2 +-
.../juneau/commons/collections/FluentMap.java | 4 +-
.../juneau/commons/collections/MultiMap.java | 2 +-
.../commons/concurrent/NullableReference.java | 4 +-
.../juneau/commons/conversion/BasicConverter.java | 60 ++--
.../commons/conversion/CachingConverter.java | 18 +-
.../commons/conversion/ConfigurableConverter.java | 4 +-
.../juneau/commons/conversion/Conversion.java | 2 +-
.../apache/juneau/commons/function/Memoizer.java | 2 +-
.../juneau/commons/function/NullableSupplier.java | 4 +-
.../juneau/commons/inject/BasicBeanStore.java | 10 +-
.../juneau/commons/inject/BeanInstantiator.java | 6 +-
.../apache/juneau/commons/inject/BeanStore.java | 2 +-
.../juneau/commons/inject/ValueResolver.java | 2 +-
.../apache/juneau/commons/logging/LogRecord.java | 2 +-
.../org/apache/juneau/commons/logging/Logger.java | 2 +-
.../apache/juneau/commons/reflect/ClassInfo.java | 2 +-
.../apache/juneau/commons/reflect/Property.java | 32 +-
.../juneau/commons/reflect/TypeVariables.java | 8 +-
.../commons/settings/FunctionalPropertyStore.java | 6 +-
.../apache/juneau/commons/settings/Setting.java | 2 +-
.../commons/svl/functions/JsonFunctions.java | 18 +-
.../juneau/commons/svl/functions/MiniJson.java | 10 +-
.../juneau/commons/utils/AssertionUtils.java | 2 +-
.../org/apache/juneau/commons/utils/DateUtils.java | 2 +-
.../juneau/commons/utils/PredicateUtils.java | 2 +-
.../juneau/commons/utils/ThrowableUtils.java | 6 +-
.../org/apache/juneau/commons/TestAssertions.java | 20 +-
.../juneau/commons/collections/BidiMap_Test.java | 8 +-
.../juneau/commons/collections/Cache2_Test.java | 8 +-
.../juneau/commons/collections/Cache3_Test.java | 6 +-
.../juneau/commons/collections/Cache4_Test.java | 6 +-
.../juneau/commons/collections/Cache5_Test.java | 6 +-
.../juneau/commons/collections/Cache_Test.java | 10 +-
.../commons/collections/FilteredMap_Test.java | 10 +-
.../juneau/commons/collections/FluentMap_Test.java | 90 ++---
.../juneau/commons/collections/HashKey_Test.java | 12 +-
.../juneau/commons/collections/MultiMap_Test.java | 24 +-
.../juneau/commons/collections/SimpleMap_Test.java | 4 +-
.../commons/conversion/BasicConverter_Test.java | 20 +-
.../commons/function/ThrowingConsumer2_Test.java | 26 +-
.../commons/function/ThrowingConsumer3_Test.java | 16 +-
.../commons/function/ThrowingConsumer4_Test.java | 14 +-
.../commons/function/ThrowingConsumer5_Test.java | 14 +-
.../commons/function/ThrowingFunction2_Test.java | 22 +-
.../commons/function/ThrowingFunction3_Test.java | 16 +-
.../commons/function/ThrowingFunction4_Test.java | 16 +-
.../commons/function/ThrowingFunction5_Test.java | 16 +-
.../juneau/commons/inject/BasicBeanStore_Test.java | 6 +-
.../commons/inject/BeanInstantiator_Test.java | 6 +-
.../apache/juneau/commons/lang/HashCode_Test.java | 2 +-
.../apache/juneau/commons/lang/Holder_Test.java | 2 +-
.../commons/reflect/ConstructorInfo_Test.java | 8 +-
.../juneau/commons/reflect/FieldInfo_Test.java | 4 +-
.../juneau/commons/reflect/MethodInfo_Test.java | 4 +-
.../reflect/ParameterInfo_Resolution_Test.java | 2 +-
.../juneau/commons/reflect/ParameterInfo_Test.java | 4 +-
.../juneau/commons/reflect/Property_Test.java | 50 +--
.../juneau/commons/reflect/ReflectionMap_Test.java | 10 +-
.../commons/reflect/ThrowingSupplier_Test.java | 8 +-
.../juneau/commons/settings/Settings_Test.java | 2 +-
.../commons/svl/functions/MiniJson_Test.java | 28 +-
.../juneau/commons/utils/CollectionUtils_Test.java | 94 ++---
.../juneau/commons/utils/PredicateUtils_Test.java | 14 +-
.../java/org/apache/juneau/config/Config_Test.java | 2 +-
.../transforms/EnumFormat_RoundTrip_Test.java | 2 +-
.../org/apache/juneau/marshall/TemporalFormat.java | 4 +-
.../juneau/marshall/collections/JsonMap.java | 12 +-
.../juneau/marshall/collections/MarshalledMap.java | 12 +-
.../apache/juneau/marshall/csv/CsvCellParser.java | 4 +-
.../juneau/marshall/csv/CsvCellSerializer.java | 6 +-
.../marshall/hjson/HjsonConfigAnnotation.java | 4 +-
.../apache/juneau/marshall/hjson/HjsonParser.java | 4 +-
.../juneau/marshall/hjson/HjsonParserSession.java | 2 +-
.../juneau/marshall/hjson/HjsonSerializer.java | 8 +-
.../marshall/hocon/HoconConfigAnnotation.java | 4 +-
.../apache/juneau/marshall/hocon/HoconParser.java | 6 +-
.../juneau/marshall/hocon/HoconParserSession.java | 6 +-
.../juneau/marshall/hocon/HoconResolver.java | 6 +-
.../juneau/marshall/hocon/HoconSerializer.java | 8 +-
.../apache/juneau/marshall/hocon/HoconValue.java | 4 +-
.../juneau/marshall/ini/IniConfigAnnotation.java | 4 +-
.../org/apache/juneau/marshall/ini/IniParser.java | 4 +-
.../juneau/marshall/ini/IniParserSession.java | 24 +-
.../apache/juneau/marshall/ini/IniSerializer.java | 4 +-
.../juneau/marshall/ini/IniSerializerSession.java | 4 +-
.../juneau/marshall/jcs/JcsSerializerSession.java | 2 +-
.../marshall/json5l/Json5lConfigAnnotation.java | 4 +-
.../marshall/jsonl/JsonlConfigAnnotation.java | 4 +-
.../markdown/MarkdownDocSerializerSession.java | 4 +-
.../marshall/parquet/ParquetParserSession.java | 56 +--
.../marshall/parquet/ParquetSchemaBuilder.java | 20 +-
.../marshall/parquet/ParquetSerializerSession.java | 16 +-
.../juneau/marshall/prototext/PrototextParser.java | 6 +-
.../marshall/prototext/PrototextParserSession.java | 16 +-
.../marshall/prototext/PrototextSerializer.java | 8 +-
.../prototext/PrototextSerializerSession.java | 2 +-
.../apache/juneau/marshall/stream/PojoWalker.java | 12 +-
.../apache/juneau/marshall/toml/TomlParser.java | 2 +-
.../juneau/marshall/toml/TomlParserSession.java | 40 +--
.../marshall/toml/TomlSerializerSession.java | 4 +-
.../apache/juneau/marshall/utils/Iso8601Utils.java | 2 +-
.../test/java/org/apache/juneau/BeanMap_Test.java | 2 +-
.../juneau/BeanProp_StarPlainField_Test.java | 2 +-
.../apache/juneau/DynaBean_ComboRoundTripTest.java | 4 +-
.../java/org/apache/juneau/MediaRange_Test.java | 2 +-
.../markdown/MarkdownParserSession_Test.java | 4 +-
.../juneau/markdown/MarkdownParser_Test.java | 4 +-
.../juneau/marshall/MarshallingContext_Test.java | 2 +-
.../juneau/marshall/bson/BsonEdgeCases_Test.java | 2 +-
.../juneau/marshall/bson/BsonRoundTrip_Test.java | 8 +-
.../marshall/cbor/CborOutputStream_Test.java | 2 +-
.../juneau/marshall/cbor/CborTokenStream_Test.java | 2 +-
.../juneau/marshall/csv/CsvCellParser_Test.java | 26 +-
.../org/apache/juneau/marshall/csv/Csv_Test.java | 4 +-
.../juneau/marshall/hjson/HjsonEdgeCases_Test.java | 30 +-
.../juneau/marshall/hjson/HjsonMediaType_Test.java | 2 +-
.../juneau/marshall/hjson/HjsonParser_Test.java | 26 +-
.../juneau/marshall/hjson/HjsonRoundTrip_Test.java | 52 +--
.../marshall/hjson/HjsonSerializer_Test.java | 26 +-
.../juneau/marshall/hocon/HoconEdgeCases_Test.java | 20 +-
.../juneau/marshall/hocon/HoconMediaType_Test.java | 2 +-
.../juneau/marshall/hocon/HoconMerging_Test.java | 20 +-
.../marshall/hocon/HoconParserSession_Test.java | 96 ++---
.../juneau/marshall/hocon/HoconParser_Test.java | 88 ++---
.../juneau/marshall/hocon/HoconPath_Test.java | 30 +-
.../juneau/marshall/hocon/HoconRoundTrip_Test.java | 56 +--
.../marshall/hocon/HoconSerializer_Test.java | 48 +--
.../marshall/hocon/HoconSubstitution_Test.java | 12 +-
.../marshall/html/HtmlParserSession_Test.java | 4 +-
.../html/HtmlSerializerSessionCoverage_Test.java | 16 +-
.../apache/juneau/marshall/ini/IniParser_Test.java | 24 +-
.../juneau/marshall/ini/IniRoundTrip_Test.java | 46 +--
.../juneau/marshall/ini/IniSerializer_Test.java | 40 +--
.../juneau/marshall/jcs/JcsEdgeCases_Test.java | 4 +-
.../juneau/marshall/jcs/JcsSorting_Test.java | 4 +-
.../juneau/marshall/json/JsonTokenStream_Test.java | 18 +-
.../marshall/json5/Json5TokenStream_Test.java | 2 +-
.../marshall/json5l/Json5lTokenStream_Test.java | 2 +-
.../marshall/jsonl/JsonlTokenStream_Test.java | 2 +-
.../marshall/markdown/MarkdownAiUseCase_Test.java | 2 +-
.../markdown/MarkdownDocParserSession_Test.java | 26 +-
.../marshall/markdown/MarkdownDocParser_Test.java | 2 +-
.../markdown/MarkdownDocSerializer_Test.java | 2 +-
.../marshall/markdown/MarkdownEdgeCases_Test.java | 8 +-
.../markdown/MarkdownParserSession_Test.java | 8 +-
.../marshall/markdown/MarkdownParser_Test.java | 4 +-
.../marshall/markdown/MarkdownSerializer_Test.java | 20 +-
.../marshaller/MarshallerStreamShortcuts_Test.java | 2 +-
.../parquet/ParquetParserSessionFull_Test.java | 48 +--
.../parquet/ParquetParserSession_Test.java | 10 +-
.../marshall/parquet/ParquetRoundTrip_Test.java | 26 +-
.../parquet/ParquetSerializerSessionFull_Test.java | 110 +++---
.../juneau/marshall/parser/ParserSession_Test.java | 28 +-
.../prototext/PrototextEdgeCases_Test.java | 2 +-
.../prototext/PrototextParserSession_Test.java | 4 +-
.../marshall/prototext/PrototextParser_Test.java | 4 +-
.../prototext/PrototextRoundTrip_Test.java | 16 +-
.../prototext/PrototextSerializerSession_Test.java | 138 +++----
.../prototext/PrototextSerializer_Test.java | 52 +--
.../marshall/stream/StreamInternals_Test.java | 16 +-
.../marshall/toml/TomlSerializerSession_Test.java | 52 +--
.../juneau/marshall/toml/TomlSerializer_Test.java | 8 +-
.../org/apache/juneau/marshall/toml/Toml_Test.java | 22 +-
.../transforms/EnumFormat_RoundTrip_Test.java | 2 +-
.../juneau/marshall/uon/UonParserSession_Test.java | 12 +-
.../juneau/marshall/xml/XmlParserSession_Test.java | 2 +-
.../XmlSerializerSession_BranchCoverage_Test.java | 4 +-
.../org/apache/juneau/marshall/yaml/Yaml_Test.java | 2 +-
.../org/apache/juneau/marshaller/Hjson_Test.java | 12 +-
.../org/apache/juneau/marshaller/Hocon_Test.java | 12 +-
.../org/apache/juneau/marshaller/Ini_Test.java | 12 +-
.../org/apache/juneau/test/bct/Listifier_Test.java | 4 +-
.../juneau/test/bct/PropertyExtractors_Test.java | 10 +-
.../apache/juneau/test/bct/Stringifier_Test.java | 4 +-
.../apache/juneau/test/bct/Stringifiers_Test.java | 4 +-
.../org/apache/juneau/test/bct/Swapper_Test.java | 2 +-
.../junit/testsupport/StubExtensionContext.java | 8 +-
.../java/org/apache/juneau/BenchmarkRunner.java | 18 +-
.../juneau/a/rttests/RoundTripTest_Base.java | 2 +-
.../juneau/commons/reflect/ClassInfo_Test.java | 4 +-
.../juneau/rest/server/RestBuilder_Test.java | 2 +-
.../rest/server/RestContext_Precedence_Test.java | 2 +-
.../rest/server/auth/ApiKeyAuthFilter_Test.java | 2 +-
.../server/auth/BearerTokenAuthFilter_Test.java | 4 +-
.../rest/server/debug/DebugEnablement_Test.java | 2 +-
.../juneau/rest/server/mcp/McpDispatcher_Test.java | 10 +-
.../rest/server/mcp/McpRestServlet_Test.java | 4 +-
.../rest/server/mcp/McpServerConfig_Test.java | 4 +-
.../rest/server/mcp/McpTypedHandlers_Test.java | 16 +-
.../server/processor/MdcAsyncListener_Test.java | 4 +-
.../juneau/rest/server/util/RestUtils_Test.java | 8 +-
.../apache/juneau/rest/server/view/View_Test.java | 12 +-
.../view/freemarker/FreemarkerView_Test.java | 4 +-
.../juneau/rest/server/view/jsp/JspView_Test.java | 2 +-
.../server/view/mustache/MustacheView_Test.java | 4 +-
.../server/view/thymeleaf/ThymeleafView_Test.java | 4 +-
.../RestValidation_CustomValidator_Test.java | 2 +-
.../org/apache/juneau/rest/client/RestRequest.java | 2 +-
.../juneau/rest/client/remote/RemoteClient.java | 2 +-
.../juneau/rest/client/RemoteClient_Test.java | 4 +-
.../juneau/http/remote/RrpcInterfaceMeta.java | 14 +-
.../http/remote/RrpcInterfaceMethodMeta.java | 2 +-
.../apache/juneau/rest/mock/MockRestClient.java | 2 +-
.../rest/server/auth/oauth/oidc/OidcMetadata.java | 2 +-
.../juneau/rest/server/mcp/McpDispatcher.java | 10 +-
.../juneau/rest/server/mcp/McpPromptHandler.java | 2 +-
.../juneau/rest/server/mcp/McpToolHandler.java | 2 +-
.../juneau/rest/server/mcp/McpTypedHandlers.java | 8 +-
.../rest/server/mcp/McpTypedToolHandler.java | 2 +-
.../juneau/rest/server/mcp/McpDispatcher_Test.java | 10 +-
.../rest/server/mcp/McpRestServlet_Test.java | 4 +-
.../rest/server/mcp/McpServerConfig_Test.java | 4 +-
.../rest/server/mcp/McpTypedHandlers_Test.java | 16 +-
.../rest/server/springboot/SpringBeanStore.java | 4 +-
.../server/view/freemarker/FreemarkerView.java | 12 +-
.../view/freemarker/FreemarkerView_Test.java | 4 +-
.../juneau/rest/server/view/jsp/JspView.java | 12 +-
.../juneau/rest/server/view/jsp/JspView_Test.java | 2 +-
.../rest/server/view/mustache/MustacheView.java | 12 +-
.../server/view/mustache/MustacheView_Test.java | 4 +-
.../rest/server/view/thymeleaf/ThymeleafView.java | 12 +-
.../server/view/thymeleaf/ThymeleafView_Test.java | 4 +-
.../juneau/rest/server/AbstractRestBuilder.java | 2 +-
.../rest/server/convention/FaviconMixin.java | 2 +-
.../juneau/rest/server/convention/SeoMixin.java | 2 +-
.../rest/server/convention/VersionMixin.java | 2 +-
.../rest/server/convention/WellKnownMixin.java | 2 +-
.../rest/server/processor/MdcAsyncListener.java | 12 +-
.../juneau/rest/server/servlet/RestMixin.java | 4 +-
.../juneau/rest/server/servlet/RestResource.java | 4 +-
.../juneau/rest/server/servlet/RestServlet.java | 4 +-
.../org/apache/juneau/rest/server/view/View.java | 4 +-
.../rest/server/arg/RestArgResolvers_Test.java | 18 +-
.../rest/server/auth/ApiKeyAuthFilter_Test.java | 2 +-
.../server/auth/BearerTokenAuthFilter_Test.java | 4 +-
.../apache/juneau/rest/server/view/View_Test.java | 12 +-
.../eclipse-preferences/juneau-formatter-rules.xml | 6 +
scripts/normalize-generic-commas.py | 399 +++++++++++++++++++++
248 files changed, 1894 insertions(+), 1489 deletions(-)
diff --git a/juneau-bean/juneau-bean-html5/src/test/java/org/apache/juneau/bean/html5/HtmlElement_Attr_Test.java b/juneau-bean/juneau-bean-html5/src/test/java/org/apache/juneau/bean/html5/HtmlElement_Attr_Test.java
index 0311525ec5..b068b9a202 100644
--- a/juneau-bean/juneau-bean-html5/src/test/java/org/apache/juneau/bean/html5/HtmlElement_Attr_Test.java
+++ b/juneau-bean/juneau-bean-html5/src/test/java/org/apache/juneau/bean/html5/HtmlElement_Attr_Test.java
@@ -231,7 +231,7 @@ class HtmlElement_Attr_Test extends TestBase {
// HtmlElement.setAttrs() line 1054: url/href/action keys → converted to URI
@Test void b04_htmlElement_setAttrs_withUriKeys() {
- var attrs = new java.util.LinkedHashMap<String, Object>();
+ var attrs = new java.util.LinkedHashMap<String,Object>();
attrs.put("url", "http://example.org/");
attrs.put("href", "http://example.org/page");
attrs.put("formaction", "http://example.org/submit");
diff --git a/juneau-bean/juneau-bean-jsonschema/src/test/java/org/apache/juneau/bean/jsonschema/JsonSchemaProperty_Test.java b/juneau-bean/juneau-bean-jsonschema/src/test/java/org/apache/juneau/bean/jsonschema/JsonSchemaProperty_Test.java
index 1d6b8cb298..572d0da8af 100644
--- a/juneau-bean/juneau-bean-jsonschema/src/test/java/org/apache/juneau/bean/jsonschema/JsonSchemaProperty_Test.java
+++ b/juneau-bean/juneau-bean-jsonschema/src/test/java/org/apache/juneau/bean/jsonschema/JsonSchemaProperty_Test.java
@@ -135,7 +135,7 @@ class JsonSchemaProperty_Test extends TestBase {
result = p.setMinProperties(1);
assertSame(p, result);
- var props = new HashMap<String, JsonSchema<?>>();
+ var props = new HashMap<String,JsonSchema<?>>();
result = p.setProperties(props);
assertSame(p, result);
diff --git a/juneau-bean/juneau-bean-jsonschema/src/test/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef_Test.java b/juneau-bean/juneau-bean-jsonschema/src/test/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef_Test.java
index 38443ac374..a975cc2cbf 100644
--- a/juneau-bean/juneau-bean-jsonschema/src/test/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef_Test.java
+++ b/juneau-bean/juneau-bean-jsonschema/src/test/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef_Test.java
@@ -134,7 +134,7 @@ class JsonSchemaRef_Test extends TestBase {
result = r.setMinProperties(1);
assertSame(r, result);
- var props = new HashMap<String, JsonSchema<?>>();
+ var props = new HashMap<String,JsonSchema<?>>();
result = r.setProperties(props);
assertSame(r, result);
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/CallToolRequest.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/CallToolRequest.java
index e90ca0d5fa..4500a36032 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/CallToolRequest.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/CallToolRequest.java
@@ -30,7 +30,7 @@ import org.apache.juneau.marshall.*;
public class CallToolRequest {
private String name;
- private Map<String, Object> arguments;
+ private Map<String,Object> arguments;
/**
* Tool name to invoke.
@@ -57,7 +57,7 @@ public class CallToolRequest {
*
* @return The arguments map, or {@code null} if not set.
*/
- public Map<String, Object> getArguments() {
+ public Map<String,Object> getArguments() {
return u(arguments);
}
@@ -67,7 +67,7 @@ public class CallToolRequest {
* @param value The new value. Can be <jk>null</jk> to unset the property.
* @return This object (for method chaining).
*/
- public CallToolRequest setArguments(Map<String, Object> value) {
+ public CallToolRequest setArguments(Map<String,Object> value) {
arguments = value;
return this;
}
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ClientCapabilities.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ClientCapabilities.java
index f7c55fd849..ef20060cf7 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ClientCapabilities.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ClientCapabilities.java
@@ -30,8 +30,8 @@ import org.apache.juneau.marshall.*;
public class ClientCapabilities {
private RootsCapability roots;
- private Map<String, Object> sampling;
- private Map<String, Object> experimental;
+ private Map<String,Object> sampling;
+ private Map<String,Object> experimental;
/**
* Roots capability.
@@ -58,7 +58,7 @@ public class ClientCapabilities {
*
* @return The sampling map, or {@code null} if not set.
*/
- public Map<String, Object> getSampling() {
+ public Map<String,Object> getSampling() {
return u(sampling);
}
@@ -68,7 +68,7 @@ public class ClientCapabilities {
* @param value The new value. Can be <jk>null</jk> to unset the property.
* @return This object (for method chaining).
*/
- public ClientCapabilities setSampling(Map<String, Object> value) {
+ public ClientCapabilities setSampling(Map<String,Object> value) {
sampling = value;
return this;
}
@@ -92,7 +92,7 @@ public class ClientCapabilities {
*
* @return The experimental map, or {@code null} if not set.
*/
- public Map<String, Object> getExperimental() {
+ public Map<String,Object> getExperimental() {
return u(experimental);
}
@@ -102,7 +102,7 @@ public class ClientCapabilities {
* @param value The new value. Can be <jk>null</jk> to unset the property.
* @return This object (for method chaining).
*/
- public ClientCapabilities setExperimental(Map<String, Object> value) {
+ public ClientCapabilities setExperimental(Map<String,Object> value) {
experimental = value;
return this;
}
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/GetPromptRequest.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/GetPromptRequest.java
index 9e64bf226b..e1885ef226 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/GetPromptRequest.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/GetPromptRequest.java
@@ -30,7 +30,7 @@ import org.apache.juneau.marshall.*;
public class GetPromptRequest {
private String name;
- private Map<String, Object> arguments;
+ private Map<String,Object> arguments;
/**
* Prompt name.
@@ -57,7 +57,7 @@ public class GetPromptRequest {
*
* @return The arguments map, or {@code null} if not set.
*/
- public Map<String, Object> getArguments() {
+ public Map<String,Object> getArguments() {
return u(arguments);
}
@@ -67,7 +67,7 @@ public class GetPromptRequest {
* @param value The new value. Can be <jk>null</jk> to unset the property.
* @return This object (for method chaining).
*/
- public GetPromptRequest setArguments(Map<String, Object> value) {
+ public GetPromptRequest setArguments(Map<String,Object> value) {
arguments = value;
return this;
}
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonSchema.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonSchema.java
index babd42b2ec..d6adfbe2c3 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonSchema.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonSchema.java
@@ -31,13 +31,13 @@ import org.apache.juneau.marshall.*;
public class JsonSchema {
private String type;
- private Map<String, JsonSchema> properties;
+ private Map<String,JsonSchema> properties;
private List<String> required;
private Object additionalProperties;
private JsonSchema items;
@BeanProp(name="$defs")
- private Map<String, JsonSchema> defs;
+ private Map<String,JsonSchema> defs;
/**
* Schema {@code type} keyword (for example {@code object}).
@@ -64,7 +64,7 @@ public class JsonSchema {
*
* @return The properties map, or {@code null} if not set.
*/
- public Map<String, JsonSchema> getProperties() {
+ public Map<String,JsonSchema> getProperties() {
return u(properties);
}
@@ -74,7 +74,7 @@ public class JsonSchema {
* @param value The new value. Can be <jk>null</jk> to unset the property.
* @return This object (for method chaining).
*/
- public JsonSchema setProperties(Map<String, JsonSchema> value) {
+ public JsonSchema setProperties(Map<String,JsonSchema> value) {
properties = value;
return this;
}
@@ -195,7 +195,7 @@ public class JsonSchema {
*
* @return The defs map, or {@code null} if not set.
*/
- public Map<String, JsonSchema> getDefs() {
+ public Map<String,JsonSchema> getDefs() {
return u(defs);
}
@@ -205,7 +205,7 @@ public class JsonSchema {
* @param value The new value. Can be <jk>null</jk> to unset the property.
* @return This object (for method chaining).
*/
- public JsonSchema setDefs(Map<String, JsonSchema> value) {
+ public JsonSchema setDefs(Map<String,JsonSchema> value) {
defs = value;
return this;
}
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ServerCapabilities.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ServerCapabilities.java
index 37355e9133..7d810d5060 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ServerCapabilities.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ServerCapabilities.java
@@ -33,7 +33,7 @@ public class ServerCapabilities {
private PromptCapability prompts;
private ResourceCapability resources;
private LoggingCapability logging;
- private Map<String, Object> experimental;
+ private Map<String,Object> experimental;
/**
* Tools capability.
@@ -120,7 +120,7 @@ public class ServerCapabilities {
*
* @return The experimental map, or {@code null} if not set.
*/
- public Map<String, Object> getExperimental() {
+ public Map<String,Object> getExperimental() {
return u(experimental);
}
@@ -130,7 +130,7 @@ public class ServerCapabilities {
* @param value The new value. Can be <jk>null</jk> to unset the property.
* @return This object (for method chaining).
*/
- public ServerCapabilities setExperimental(Map<String, Object> value) {
+ public ServerCapabilities setExperimental(Map<String,Object> value) {
experimental = value;
return this;
}
diff --git a/juneau-bean/juneau-bean-mcp/src/test/java/org/apache/juneau/bean/mcp/McpBeans_RoundTrip_Test.java b/juneau-bean/juneau-bean-mcp/src/test/java/org/apache/juneau/bean/mcp/McpBeans_RoundTrip_Test.java
index 2a194a226e..6c5eeaaba4 100644
--- a/juneau-bean/juneau-bean-mcp/src/test/java/org/apache/juneau/bean/mcp/McpBeans_RoundTrip_Test.java
+++ b/juneau-bean/juneau-bean-mcp/src/test/java/org/apache/juneau/bean/mcp/McpBeans_RoundTrip_Test.java
@@ -142,9 +142,9 @@ class McpBeans_RoundTrip_Test {
@Test
void a08_jsonSchemaDefsRoundTrip() {
var nested = new JsonSchema().setType("string");
- var props = new LinkedHashMap<String, JsonSchema>();
+ var props = new LinkedHashMap<String,JsonSchema>();
props.put("id", nested);
- var defs = new LinkedHashMap<String, JsonSchema>();
+ var defs = new LinkedHashMap<String,JsonSchema>();
defs.put("IdString", nested);
var root = new JsonSchema()
.setType("object")
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/FilteredMap.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/FilteredMap.java
index 670c54e02b..8434e337b5 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/FilteredMap.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/FilteredMap.java
@@ -401,7 +401,7 @@ public class FilteredMap<K,V> extends AbstractMap<K,V> {
}
@Override
- public void putAll(Map<? extends K, ? extends V> m) {
+ public void putAll(Map<? extends K,? extends V> m) {
for (var entry : m.entrySet()) {
if (filter.test(entry.getKey(), entry.getValue()))
map.put(entry.getKey(), entry.getValue());
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/FluentMap.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/FluentMap.java
index 780d4ad11c..805e55a18d 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/FluentMap.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/FluentMap.java
@@ -143,7 +143,7 @@ public class FluentMap<K,V> extends AbstractMap<K,V> {
* @param m The map whose entries are to be added. Can be <jk>null</jk> (no-op).
* @return This object for method chaining.
*/
- public FluentMap<K,V> aa(Map<? extends K, ? extends V> m) {
+ public FluentMap<K,V> aa(Map<? extends K,? extends V> m) {
if (m != null)
map.putAll(m);
return this;
@@ -228,7 +228,7 @@ public class FluentMap<K,V> extends AbstractMap<K,V> {
}
@Override
- public void putAll(Map<? extends K, ? extends V> m) {
+ public void putAll(Map<? extends K,? extends V> m) {
map.putAll(m);
}
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/MultiMap.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/MultiMap.java
index 328df1d1a1..3ada496145 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/MultiMap.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/MultiMap.java
@@ -386,7 +386,7 @@ public class MultiMap<K,V> extends AbstractMap<K,V> {
}
@Override
- public void putAll(Map<? extends K, ? extends V> m) {
+ public void putAll(Map<? extends K,? extends V> m) {
throw uoex("putAll() not supported on MultiMap. Use underlying maps directly.");
}
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/concurrent/NullableReference.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/concurrent/NullableReference.java
index 522cea379c..40a48dc40d 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/concurrent/NullableReference.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/concurrent/NullableReference.java
@@ -162,7 +162,7 @@ public class NullableReference<V> extends AtomicReference<V> {
* @param mapper A mapping function to apply to the value, if present. Must not be <jk>null</jk>.
* @return An NullableReference describing the result of applying a mapping function to the value, if a value is present, otherwise an empty NullableReference.
*/
- public <U> NullableReference<U> map(Function<? super V, ? extends U> mapper) {
+ public <U> NullableReference<U> map(Function<? super V,? extends U> mapper) {
assertArgNotNull(ARG_mapper, mapper);
V value = get();
return nn(value) ? NullableReference.of(mapper.apply(value)) : NullableReference.empty();
@@ -175,7 +175,7 @@ public class NullableReference<V> extends AtomicReference<V> {
* @param mapper A mapping function to apply to the value, if present. Must not be <jk>null</jk>.
* @return The result of applying an NullableReference-bearing mapping function to the value, if a value is present, otherwise an empty NullableReference.
*/
- public <U> NullableReference<U> flatMap(Function<? super V, ? extends NullableReference<? extends U>> mapper) {
+ public <U> NullableReference<U> flatMap(Function<? super V,? extends NullableReference<? extends U>> mapper) {
assertArgNotNull(ARG_mapper, mapper);
V value = get();
if (nn(value)) {
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/conversion/BasicConverter.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/conversion/BasicConverter.java
index 797666f021..8be6f17f78 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/conversion/BasicConverter.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/conversion/BasicConverter.java
@@ -167,7 +167,7 @@ public class BasicConverter extends CachingConverter {
"fromString", "valueOf", "of", "from", "parse", "create", "forName", "fromValue", "builder"
);
- private static final Map<Class<?>, Class<?>> PRIMITIVE_TO_WRAPPER = Map.of(
+ private static final Map<Class<?>,Class<?>> PRIMITIVE_TO_WRAPPER = Map.of(
boolean.class, Boolean.class,
byte.class, Byte.class,
char.class, Character.class,
@@ -184,10 +184,10 @@ public class BasicConverter extends CachingConverter {
protected BasicConverter() {}
@Override
- protected <I, O> Conversion<I, O> findConversion(Class<I> inType, Class<O> outType) {
+ protected <I,O> Conversion<I,O> findConversion(Class<I> inType, Class<O> outType) {
var out = outType.isPrimitive() ? (Class<O>) PRIMITIVE_TO_WRAPPER.get(outType) : outType;
- Conversion<I, O> c;
+ Conversion<I,O> c;
if ((c = findSpecialConversion(inType, out)) != null) return c;
@@ -201,7 +201,7 @@ public class BasicConverter extends CachingConverter {
if (out == Character.class && (c = findCharacterConversion(inType)) != null) return c;
if (out == String.class)
- return (Conversion<I, O>) findToStringConversion(inType);
+ return (Conversion<I,O>) findToStringConversion(inType);
if (out.isEnum() && (c = findEnumConversion(inType, out)) != null) return c;
@@ -229,17 +229,17 @@ public class BasicConverter extends CachingConverter {
// Number conversions
//-----------------------------------------------------------------------------------------------------------------
- private <I, O> Conversion<I, O> findNumberConversion(Class<I> inType, Class<O> outType) {
+ private <I,O> Conversion<I,O> findNumberConversion(Class<I> inType, Class<O> outType) {
if (Number.class.isAssignableFrom(inType))
return findNumberFromNumber(outType);
if (inType == Boolean.class)
- return (Conversion<I, O>) findNumberFromBoolean(outType);
+ return (Conversion<I,O>) findNumberFromBoolean(outType);
if (CharSequence.class.isAssignableFrom(inType))
- return (Conversion<I, O>) findNumberFromString(outType);
+ return (Conversion<I,O>) findNumberFromString(outType);
return null;
}
- private <I, O> Conversion<I, O> findNumberFromNumber(Class<O> outType) {
+ private <I,O> Conversion<I,O> findNumberFromNumber(Class<O> outType) {
if (outType == Integer.class) return (in, memberOf, session, args) -> (O) Integer.valueOf(((Number) in).intValue());
if (outType == Long.class) return (in, memberOf, session, args) -> (O) Long.valueOf(((Number) in).longValue());
if (outType == Short.class) return (in, memberOf, session, args) -> (O) Short.valueOf(((Number) in).shortValue());
@@ -258,7 +258,7 @@ public class BasicConverter extends CachingConverter {
return null;
}
- private <O> Conversion<Boolean, O> findNumberFromBoolean(Class<O> outType) {
+ private <O> Conversion<Boolean,O> findNumberFromBoolean(Class<O> outType) {
if (outType == Integer.class) return (in, memberOf, session, args) -> (O) Integer.valueOf(in.booleanValue() ? 1 : 0);
if (outType == Long.class) return (in, memberOf, session, args) -> (O) Long.valueOf(in.booleanValue() ? 1L : 0L);
if (outType == Short.class) return (in, memberOf, session, args) -> (O) Short.valueOf(in.booleanValue() ? (short) 1 : (short) 0);
@@ -272,7 +272,7 @@ public class BasicConverter extends CachingConverter {
return null;
}
- private <O> Conversion<CharSequence, O> findNumberFromString(Class<O> outType) {
+ private <O> Conversion<CharSequence,O> findNumberFromString(Class<O> outType) {
return (in, memberOf, session, args) -> {
var s = in.toString();
if (s.isEmpty() || "null".equals(s))
@@ -285,7 +285,7 @@ public class BasicConverter extends CachingConverter {
// Boolean conversions
//-----------------------------------------------------------------------------------------------------------------
- private <I, O> Conversion<I, O> findBooleanConversion(Class<I> inType) {
+ private <I,O> Conversion<I,O> findBooleanConversion(Class<I> inType) {
if (Number.class.isAssignableFrom(inType))
return (in, memberOf, session, args) -> (O) Boolean.valueOf(((Number) in).intValue() != 0);
return null;
@@ -295,7 +295,7 @@ public class BasicConverter extends CachingConverter {
// Character conversions
//-----------------------------------------------------------------------------------------------------------------
- private <I, O> Conversion<I, O> findCharacterConversion(Class<I> inType) {
+ private <I,O> Conversion<I,O> findCharacterConversion(Class<I> inType) {
if (CharSequence.class.isAssignableFrom(inType))
return (in, memberOf, session, args) -> {
var s = in.toString();
@@ -315,7 +315,7 @@ public class BasicConverter extends CachingConverter {
// String conversions
//-----------------------------------------------------------------------------------------------------------------
- private <I> Conversion<I, String> findToStringConversion(Class<I> inType) {
+ private <I> Conversion<I,String> findToStringConversion(Class<I> inType) {
if (inType.isArray()) {
if (inType == int[].class) return (in, memberOf, session, args) -> Arrays.toString((int[]) in);
if (inType == long[].class) return (in, memberOf, session, args) -> Arrays.toString((long[]) in);
@@ -334,7 +334,7 @@ public class BasicConverter extends CachingConverter {
// Enum conversions
//-----------------------------------------------------------------------------------------------------------------
- private <I, O> Conversion<I, O> findEnumConversion(Class<I> inType, Class<O> outType) {
+ private <I,O> Conversion<I,O> findEnumConversion(Class<I> inType, Class<O> outType) {
if (CharSequence.class.isAssignableFrom(inType))
return (in, memberOf, session, args) -> (O) Enum.valueOf((Class<Enum>) outType, in.toString());
return null;
@@ -344,8 +344,8 @@ public class BasicConverter extends CachingConverter {
// Optional conversions
//-----------------------------------------------------------------------------------------------------------------
- private <I, O> Conversion<I, O> findOptionalConversion() {
- return (Conversion<I, O>) (Conversion<Object, Optional<?>>) (in, memberOf, session, args) -> {
+ private <I,O> Conversion<I,O> findOptionalConversion() {
+ return (Conversion<I,O>) (Conversion<Object,Optional<?>>) (in, memberOf, session, args) -> {
if (in instanceof Optional<?> in2) {
if (args.length == 0)
return in2;
@@ -368,7 +368,7 @@ public class BasicConverter extends CachingConverter {
* @param out The target primitive-optional class.
* @return The conversion, never <jk>null</jk>.
*/
- private <I, O> Conversion<I, O> findPrimitiveOptionalConversion(Class<O> out) {
+ private <I,O> Conversion<I,O> findPrimitiveOptionalConversion(Class<O> out) {
final Class<? extends Number> elementType;
if (out == OptionalInt.class)
elementType = Integer.class;
@@ -376,7 +376,7 @@ public class BasicConverter extends CachingConverter {
elementType = Long.class;
else
elementType = Double.class;
- return (Conversion<I, O>) (Conversion<Object, Object>) (in, memberOf, session, args) -> {
+ return (Conversion<I,O>) (Conversion<Object,Object>) (in, memberOf, session, args) -> {
Object v = in;
if (v instanceof Optional<?> v2)
v = v2.orElse(null);
@@ -411,7 +411,7 @@ public class BasicConverter extends CachingConverter {
// Collection conversions
//-----------------------------------------------------------------------------------------------------------------
- private <I, O> Conversion<I, O> findCollectionConversion(Class<I> inType, Class<O> outType) {
+ private <I,O> Conversion<I,O> findCollectionConversion(Class<I> inType, Class<O> outType) {
if (Collection.class.isAssignableFrom(inType) || inType.isArray()) {
return (in, memberOf, session, args) -> {
// Treat Object.class as "no element type" since it means untyped/raw and needs no element conversion.
@@ -451,7 +451,7 @@ public class BasicConverter extends CachingConverter {
// Map conversions
//-----------------------------------------------------------------------------------------------------------------
- private <I, O> Conversion<I, O> findMapConversion(Class<I> inType, Class<O> outType) {
+ private <I,O> Conversion<I,O> findMapConversion(Class<I> inType, Class<O> outType) {
if (Map.class.isAssignableFrom(inType)) {
return (in, memberOf, session, args) -> {
// Treat Object.class as "no key/value type" since it means untyped/raw and needs no element conversion.
@@ -460,7 +460,7 @@ public class BasicConverter extends CachingConverter {
if (keyType == null && outType.isAssignableFrom(inType))
return (O) in;
var result = newMap(outType);
- ((Map<?, ?>) in).forEach((k, v) -> result.put(
+ ((Map<?,?>) in).forEach((k, v) -> result.put(
keyType != null ? to(k, keyType) : k,
valType != null ? to(v, valType) : v
));
@@ -470,7 +470,7 @@ public class BasicConverter extends CachingConverter {
return null;
}
- private Map<Object, Object> newMap(Class<?> outType) {
+ private Map<Object,Object> newMap(Class<?> outType) {
if (outType == Map.class || outType == LinkedHashMap.class || outType == AbstractMap.class)
return m();
if (outType == SortedMap.class || outType == NavigableMap.class || outType == TreeMap.class)
@@ -484,7 +484,7 @@ public class BasicConverter extends CachingConverter {
// Array conversions
//-----------------------------------------------------------------------------------------------------------------
- private <I, O> Conversion<I, O> findArrayConversion(Class<I> inType, Class<O> outType) {
+ private <I,O> Conversion<I,O> findArrayConversion(Class<I> inType, Class<O> outType) {
if (Collection.class.isAssignableFrom(inType) || inType.isArray()) {
var componentType = outType.getComponentType();
// For array→array, validate that element-level conversion is possible.
@@ -523,13 +523,13 @@ public class BasicConverter extends CachingConverter {
// Special-case conversions
//-----------------------------------------------------------------------------------------------------------------
- private <I, O> Conversion<I, O> findSpecialConversion(Class<I> inType, Class<O> outType) {
+ private <I,O> Conversion<I,O> findSpecialConversion(Class<I> inType, Class<O> outType) {
if (inType == String.class && outType == TimeZone.class)
- return (Conversion<I, O>) (Conversion<String, TimeZone>) (in, memberOf, session, args) -> TimeZone.getTimeZone(in);
+ return (Conversion<I,O>) (Conversion<String,TimeZone>) (in, memberOf, session, args) -> TimeZone.getTimeZone(in);
if (TimeZone.class.isAssignableFrom(inType) && outType == String.class)
- return (Conversion<I, O>) (Conversion<TimeZone, String>) (in, memberOf, session, args) -> in.getID();
+ return (Conversion<I,O>) (Conversion<TimeZone,String>) (in, memberOf, session, args) -> in.getID();
if (inType == String.class && outType == Locale.class)
- return (Conversion<I, O>) (Conversion<String, Locale>) (in, memberOf, session, args) -> Locale.forLanguageTag(in.replace('_', '-'));
+ return (Conversion<I,O>) (Conversion<String,Locale>) (in, memberOf, session, args) -> Locale.forLanguageTag(in.replace('_', '-'));
if (CharSequence.class.isAssignableFrom(inType) && outType == Boolean.class)
return (in, memberOf, session, args) -> {
var s = in.toString();
@@ -546,7 +546,7 @@ public class BasicConverter extends CachingConverter {
// Reflection: static factory methods
//-----------------------------------------------------------------------------------------------------------------
- private <I, O> Conversion<I, O> findStaticFactory(Class<I> inType, Class<O> outType) {
+ private <I,O> Conversion<I,O> findStaticFactory(Class<I> inType, Class<O> outType) {
var ci = info(outType);
for (var name : FACTORY_METHOD_NAMES) {
@@ -611,7 +611,7 @@ public class BasicConverter extends CachingConverter {
// Reflection: public constructors
//-----------------------------------------------------------------------------------------------------------------
- private <I, O> Conversion<I, O> findConstructorConversion(Class<I> inType, Class<O> outType) {
+ private <I,O> Conversion<I,O> findConstructorConversion(Class<I> inType, Class<O> outType) {
if (outType.getEnclosingClass() != null && !Modifier.isStatic(outType.getModifiers())) {
var enclosing = outType.getEnclosingClass();
var opt = info(outType).getPublicConstructor(c ->
@@ -642,7 +642,7 @@ public class BasicConverter extends CachingConverter {
// Reflection: toX() instance methods
//-----------------------------------------------------------------------------------------------------------------
- private <I, O> Conversion<I, O> findToXMethod(Class<I> inType, Class<O> outType) {
+ private <I,O> Conversion<I,O> findToXMethod(Class<I> inType, Class<O> outType) {
// Use getNameReadable() so that array types use "Array" suffix (e.g. "toStringArray" for String[]).
// Use equalsIgnoreCase to match Mutaters' behavior (e.g. "toByteArray" matches "tobyteArray" from byte[]).
var methodName = "to" + info(outType).getNameReadable();
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/conversion/CachingConverter.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/conversion/CachingConverter.java
index dedfb6f14c..1a1f1cbc53 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/conversion/CachingConverter.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/conversion/CachingConverter.java
@@ -119,7 +119,7 @@ public abstract class CachingConverter implements Converter {
}
// Two-level cache: input type -> output type -> conversion function (or NO_CONVERSION sentinel).
- private final Map<Class<?>, Map<Class<?>, Conversion<?,?>>> conversions = new ConcurrentHashMap<>();
+ private final Map<Class<?>,Map<Class<?>,Conversion<?,?>>> conversions = new ConcurrentHashMap<>();
/**
* Finds a conversion function from the specified input type to the specified output type.
@@ -141,19 +141,19 @@ public abstract class CachingConverter implements Converter {
* @param outType The target output class.
* @return A {@link Conversion} function, or <jk>null</jk> if no conversion is available.
*/
- protected abstract <I, O> Conversion<I, O> findConversion(Class<I> inType, Class<O> outType);
+ protected abstract <I,O> Conversion<I,O> findConversion(Class<I> inType, Class<O> outType);
@SuppressWarnings({
"unchecked" // Cast is safe: type parameter is verified at construction.
})
- private <I, O> Conversion<I, O> lookupConversion(Class<I> inType, Class<O> outType) {
+ private <I,O> Conversion<I,O> lookupConversion(Class<I> inType, Class<O> outType) {
var fn = conversions
.computeIfAbsent(inType, k -> new ConcurrentHashMap<>())
.computeIfAbsent(outType, k -> {
- Conversion<I, O> found = findConversion(inType, outType);
+ Conversion<I,O> found = findConversion(inType, outType);
return found != null ? found : NO_CONVERSION;
});
- return fn == NO_CONVERSION ? null : (Conversion<I, O>) fn;
+ return fn == NO_CONVERSION ? null : (Conversion<I,O>) fn;
}
@Override
@@ -187,7 +187,7 @@ public abstract class CachingConverter implements Converter {
var inType = o.getClass();
if (inType == type)
return (T) o;
- var fn = (Conversion<Object, T>) lookupConversion(inType, type);
+ var fn = (Conversion<Object,T>) lookupConversion(inType, type);
if (fn == null)
throw new InvalidConversionException(inType, type);
return fn.to(o, null, (ConverterSession)null);
@@ -225,7 +225,7 @@ public abstract class CachingConverter implements Converter {
if (o == null)
return nullDefault(rawType, argClasses);
var inType = o.getClass();
- var fn = (Conversion<Object, T>) lookupConversion(inType, rawType);
+ var fn = (Conversion<Object,T>) lookupConversion(inType, rawType);
if (fn == null)
throw new InvalidConversionException(inType, rawType);
return fn.to(o, null, (ConverterSession)null, argClasses);
@@ -257,7 +257,7 @@ public abstract class CachingConverter implements Converter {
var inType = o.getClass();
if (inType == type)
return (T) o;
- var fn = (Conversion<Object, T>) lookupConversion(inType, type);
+ var fn = (Conversion<Object,T>) lookupConversion(inType, type);
if (fn == null)
throw new InvalidConversionException(inType, type);
return fn.to(o, memberOf, session);
@@ -291,7 +291,7 @@ public abstract class CachingConverter implements Converter {
if (o == null)
return nullDefault(rawType, argClasses);
var inType = o.getClass();
- var fn = (Conversion<Object, T>) lookupConversion(inType, rawType);
+ var fn = (Conversion<Object,T>) lookupConversion(inType, rawType);
if (fn == null)
throw new InvalidConversionException(inType, rawType);
var result = fn.to(o, memberOf, session, argClasses);
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/conversion/ConfigurableConverter.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/conversion/ConfigurableConverter.java
index 8b7a4b52e1..59d08c6a8a 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/conversion/ConfigurableConverter.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/conversion/ConfigurableConverter.java
@@ -77,9 +77,9 @@ public class ConfigurableConverter extends BasicConverter {
@SuppressWarnings({
"unchecked" // Type safety guaranteed by ConversionFinder contract
})
- protected <I, O> Conversion<I, O> findConversion(Class<I> inType, Class<O> outType) {
+ protected <I,O> Conversion<I,O> findConversion(Class<I> inType, Class<O> outType) {
for (var finder : finders) {
- var fn = (Conversion<I, O>) finder.findConversion(inType, outType);
+ var fn = (Conversion<I,O>) finder.findConversion(inType, outType);
if (fn != null)
return fn;
}
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/conversion/Conversion.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/conversion/Conversion.java
index 0e372e9a4f..53b257e0fb 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/conversion/Conversion.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/conversion/Conversion.java
@@ -34,7 +34,7 @@ import java.util.*;
* @param <O> The output type.
*/
@FunctionalInterface
-public interface Conversion<I, O> {
+public interface Conversion<I,O> {
/**
* Converts the input object to the output type.
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Memoizer.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Memoizer.java
index afb3c49046..8efe75a696 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Memoizer.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/Memoizer.java
@@ -210,7 +210,7 @@ public class Memoizer<T> implements NullableSupplier<T> {
* @return A Memoizer describing the result of applying a mapping function to the value of this Memoizer, if a value is present, otherwise an empty Memoizer.
*/
@Override
- public <U> Memoizer<U> map(Function<? super T, ? extends U> mapper) {
+ public <U> Memoizer<U> map(Function<? super T,? extends U> mapper) {
assertArgNotNull(ARG_mapper, mapper);
return new Memoizer<>(() -> {
T value = get();
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/NullableSupplier.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/NullableSupplier.java
index f19f77db25..f83831a1a7 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/NullableSupplier.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/NullableSupplier.java
@@ -141,7 +141,7 @@ public interface NullableSupplier<T> extends Supplier<T> {
* @param mapper A mapping function to apply to the value, if present. Must not be <jk>null</jk>.
* @return A NullableSupplier describing the result of applying a mapping function to the value of this NullableSupplier, if a value is present, otherwise an empty NullableSupplier.
*/
- default <U> NullableSupplier<U> map(Function<? super T, ? extends U> mapper) {
+ default <U> NullableSupplier<U> map(Function<? super T,? extends U> mapper) {
assertArgNotNull(ARG_mapper, mapper);
return () -> {
T value = get();
@@ -156,7 +156,7 @@ public interface NullableSupplier<T> extends Supplier<T> {
* @param mapper A mapping function to apply to the value, if present. Must not be <jk>null</jk>.
* @return The result of applying a NullableSupplier-bearing mapping function to the value of this NullableSupplier, if a value is present, otherwise an empty NullableSupplier.
*/
- default <U> NullableSupplier<U> flatMap(Function<? super T, ? extends NullableSupplier<? extends U>> mapper) {
+ default <U> NullableSupplier<U> flatMap(Function<? super T,? extends NullableSupplier<? extends U>> mapper) {
assertArgNotNull(ARG_mapper, mapper);
return () -> {
T value = get();
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BasicBeanStore.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BasicBeanStore.java
index 3fb79cf1de..089ee8e882 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BasicBeanStore.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BasicBeanStore.java
@@ -102,11 +102,11 @@ public class BasicBeanStore implements WritableBeanStore {
private static final String ARG_beanType = "beanType";
private static final String ARG_onClassOrObject = "onClassOrObject";
- private final ConcurrentHashMap<Class<?>, ConcurrentHashMap<String, Supplier<?>>> entries;
- private final ConcurrentHashMap<Class<?>, ConcurrentHashMap<String, Supplier<?>>> defaults;
- private final ConcurrentHashMap<Class<?>, ConcurrentHashMap<String, BeanSourceMeta>> entryMetadata;
- private final ConcurrentHashMap<Class<?>, ConcurrentHashMap<String, BeanSourceMeta>> defaultMetadata;
- private final ConcurrentHashMap<Class<?>, Class<?>> typeBindings;
+ private final ConcurrentHashMap<Class<?>,ConcurrentHashMap<String,Supplier<?>>> entries;
+ private final ConcurrentHashMap<Class<?>,ConcurrentHashMap<String,Supplier<?>>> defaults;
+ private final ConcurrentHashMap<Class<?>,ConcurrentHashMap<String,BeanSourceMeta>> entryMetadata;
+ private final ConcurrentHashMap<Class<?>,ConcurrentHashMap<String,BeanSourceMeta>> defaultMetadata;
+ private final ConcurrentHashMap<Class<?>,Class<?>> typeBindings;
private final List<Object> resolvedBeans;
private final Set<Object> resolvedIdentities;
private final Set<Class<?>> registeredConfigurations;
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanInstantiator.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanInstantiator.java
index 6e5a99d89a..9792983b9d 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanInstantiator.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanInstantiator.java
@@ -979,11 +979,11 @@ public class BeanInstantiator<T> {
* <ul>
* <li>{@code TreeMap()}
* <li>{@code TreeMap(Comparator)}
- * <li>{@code TreeMap(Map<? extends K, ? extends V>)}
+ * <li>{@code TreeMap(Map<? extends K,? extends V>)}
* <li>{@code TreeMap(SortedMap)}
* </ul>
- * The default selection picks the {@code Map} copy-constructor — but that {@code Map<? extends K, ? extends V>}
- * parameter doesn't satisfy v2 inject-collection auto-resolution (which only handles {@code Map<String, T>}),
+ * The default selection picks the {@code Map} copy-constructor — but that {@code Map<? extends K,? extends V>}
+ * parameter doesn't satisfy v2 inject-collection auto-resolution (which only handles {@code Map<String,T>}),
* so injection fails at runtime even though {@link ParameterInfo#canResolve(BeanStore, Object...)} optimistically
* said yes. Callers that just want "give me a fresh empty container" should use this flag.
*
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanStore.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanStore.java
index 7b5d64e387..3a4ee51465 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanStore.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanStore.java
@@ -97,7 +97,7 @@ public interface BeanStore {
* @param beanType The bean type.
* @return A map of bean names to bean instances. Never <jk>null</jk>.
*/
- <T> Map<String, T> getBeansOfType(Class<T> beanType);
+ <T> Map<String,T> getBeansOfType(Class<T> beanType);
/**
* Returns <jk>true</jk> if this store contains at least one bean of the specified type.
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/ValueResolver.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/ValueResolver.java
index eccc6cef50..37a7b9c9de 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/ValueResolver.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/ValueResolver.java
@@ -63,7 +63,7 @@ public final class ValueResolver {
* read the cached {@link VarTemplate} and skip the tokenizer + var-registry-lookup
* pipeline entirely.
*/
- private static final ConcurrentMap<String, VarTemplate> TEMPLATE_CACHE = new ConcurrentHashMap<>();
+ private static final ConcurrentMap<String,VarTemplate> TEMPLATE_CACHE = new ConcurrentHashMap<>();
/**
* Returns the compiled {@link VarTemplate} for the given expression, computing and caching
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/LogRecord.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/LogRecord.java
index 8e7c1af3eb..c4f67d1f49 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/LogRecord.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/LogRecord.java
@@ -210,7 +210,7 @@ public class LogRecord extends java.util.logging.LogRecord {
public String formatted(String format) {
var date = new Date(getMillis());
- Function<String, Object> resolver = key -> switch (key) {
+ Function<String,Object> resolver = key -> switch (key) {
case KEY_date -> "%1$s";
case KEY_logger -> "%2$s";
case KEY_level -> "%3$s";
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/Logger.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/Logger.java
index 1e65f66afa..1675efa936 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/Logger.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/Logger.java
@@ -97,7 +97,7 @@ public class Logger extends java.util.logging.Logger {
* different instance, breaking {@link LogRecordCapture} and any other code that
* assumes one name == one identity.
*/
- private static final ConcurrentHashMap<String, Logger> loggers = new ConcurrentHashMap<>();
+ private static final ConcurrentHashMap<String,Logger> loggers = new ConcurrentHashMap<>();
/**
* The underlying logger instance that we delegate to.
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
index e5724366a7..8a228ca992 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
@@ -207,7 +207,7 @@ public non-sealed class ClassInfo extends ElementInfo implements Annotatable, Ty
private final Supplier<List<AnnotationInfo<? extends Annotation>>> annotationInfos; // All annotations on this class and parent classes/interfaces in child-to-parent order.
private final Supplier<List<RecordComponent>> recordComponents; // All record components if this is a record class (Java 14+).
private final Supplier<List<Type>> genericInterfaces; // All generic interface types (e.g., List<String> implements Comparable<List<String>>).
- private final Supplier<List<TypeVariable<?>>> typeParameters; // All type parameters declared on this class (e.g., <T, U> in class Foo<T, U>).
+ private final Supplier<List<TypeVariable<?>>> typeParameters; // All type parameters declared on this class (e.g., <T,U> in class Foo<T,U>).
private final Supplier<List<AnnotatedType>> annotatedInterfaces; // All annotated interface types with their annotations.
private final Supplier<List<Object>> signers; // All signers of this class (for signed JARs).
private final Supplier<List<MethodInfo>> publicMethods; // All public methods on this class and inherited, excluding Object methods.
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/Property.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/Property.java
index f1f4e3b560..edec9de7b4 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/Property.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/Property.java
@@ -82,7 +82,7 @@ import org.apache.juneau.commons.function.*;
@SuppressWarnings({
"java:S115" // Constants use UPPER_snakeCase convention
})
-public class Property<T, V> {
+public class Property<T,V> {
// Argument name constants for assertArgNotNull
private static final String ARG_object = "object";
@@ -105,12 +105,12 @@ public class Property<T, V> {
* @param <V> The value type.
* @return A new builder instance.
*/
- public static <T, V> Builder<T, V> create() {
+ public static <T,V> Builder<T,V> create() {
return new Builder<>();
}
- private final ThrowingFunction<T, V> producer;
- private final ThrowingConsumer2<T, V> consumer;
+ private final ThrowingFunction<T,V> producer;
+ private final ThrowingConsumer2<T,V> consumer;
/**
* Constructor.
@@ -118,7 +118,7 @@ public class Property<T, V> {
* @param producer The producer function (getter). Can be <jk>null</jk>, in which case {@link #canRead()} returns <jk>false</jk> and {@link #get(Object)} throws an {@link ExecutableException}.
* @param consumer The consumer function (setter). Can be <jk>null</jk>, in which case {@link #canWrite()} returns <jk>false</jk> and {@link #set(Object,Object)} throws an {@link ExecutableException}.
*/
- public Property(ThrowingFunction<T,V> producer, ThrowingConsumer2<T, V> consumer) {
+ public Property(ThrowingFunction<T,V> producer, ThrowingConsumer2<T,V> consumer) {
this.producer = producer;
this.consumer = consumer;
}
@@ -175,9 +175,9 @@ public class Property<T, V> {
* @param <T> The object type.
* @param <V> The value type.
*/
- public static class Builder<T, V> {
- private ThrowingFunction<T, V> producer;
- private ThrowingConsumer2<T, V> consumer;
+ public static class Builder<T,V> {
+ private ThrowingFunction<T,V> producer;
+ private ThrowingConsumer2<T,V> consumer;
/**
* Sets the producer (getter) using a function.
@@ -185,7 +185,7 @@ public class Property<T, V> {
* @param producer The producer function. Can be <jk>null</jk> to leave the property unreadable.
* @return This object.
*/
- public Builder<T, V> getter(ThrowingFunction<T, V> producer) {
+ public Builder<T,V> getter(ThrowingFunction<T,V> producer) {
this.producer = producer;
return this;
}
@@ -196,7 +196,7 @@ public class Property<T, V> {
* @param consumer The consumer function. Can be <jk>null</jk> to leave the property unwritable.
* @return This object.
*/
- public Builder<T, V> setter(ThrowingConsumer2<T, V> consumer) {
+ public Builder<T,V> setter(ThrowingConsumer2<T,V> consumer) {
this.consumer = consumer;
return this;
}
@@ -211,9 +211,9 @@ public class Property<T, V> {
* @return This object.
*/
@SuppressWarnings({
- "unchecked" // Type erasure requires cast to Builder<T, V>
+ "unchecked" // Type erasure requires cast to Builder<T,V>
})
- public Builder<T, V> field(FieldInfo field) {
+ public Builder<T,V> field(FieldInfo field) {
assertArgNotNull(ARG_field, field);
field.accessible();
boolean isStatic = field.isStatic();
@@ -232,9 +232,9 @@ public class Property<T, V> {
* @return This object.
*/
@SuppressWarnings({
- "unchecked" // Type erasure requires cast to Builder<T, V>
+ "unchecked" // Type erasure requires cast to Builder<T,V>
})
- public Builder<T, V> getter(MethodInfo method) {
+ public Builder<T,V> getter(MethodInfo method) {
assertArgNotNull(ARG_method, method);
method.accessible();
boolean isStatic = method.isStatic();
@@ -251,7 +251,7 @@ public class Property<T, V> {
* @param method The method info. Must not be <jk>null</jk>.
* @return This object.
*/
- public Builder<T, V> setter(MethodInfo method) {
+ public Builder<T,V> setter(MethodInfo method) {
assertArgNotNull(ARG_method, method);
method.accessible();
boolean isStatic = method.isStatic();
@@ -264,7 +264,7 @@ public class Property<T, V> {
*
* @return A new property instance.
*/
- public Property<T, V> build() {
+ public Property<T,V> build() {
return new Property<>(producer, consumer);
}
}
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/TypeVariables.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/TypeVariables.java
index 7c78c1275d..507d26e8b2 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/TypeVariables.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/TypeVariables.java
@@ -102,7 +102,7 @@ public class TypeVariables {
* @return A new TypeVariables instance. An empty instance is returned if the type is <jk>null</jk>.
*/
public static TypeVariables of(Type type) {
- Map<Class<?>, List<Class<?>>> m = m();
+ Map<Class<?>,List<Class<?>>> m = m();
findTypeVarImpls(type, m);
return fromMap(m);
}
@@ -116,7 +116,7 @@ public class TypeVariables {
@SuppressWarnings({
"java:S3776" // Cognitive complexity acceptable for type variable implementation discovery
})
- private static void findTypeVarImpls(Type t, Map<Class<?>, List<Class<?>>> m) {
+ private static void findTypeVarImpls(Type t, Map<Class<?>,List<Class<?>>> m) {
if (t instanceof Class<?> t2) {
findTypeVarImpls(t2.getGenericSuperclass(), m);
for (var ci : t2.getGenericInterfaces())
@@ -152,7 +152,7 @@ public class TypeVariables {
* @param map The map of class to type variable implementations.
* @return A new TypeVariables instance.
*/
- static TypeVariables fromMap(Map<Class<?>, List<Class<?>>> map) {
+ static TypeVariables fromMap(Map<Class<?>,List<Class<?>>> map) {
return new TypeVariables(map);
}
@@ -161,7 +161,7 @@ public class TypeVariables {
*
* @param map The map of class to type variable implementations.
*/
- TypeVariables(Map<Class<?>, List<Class<?>>> map) {
+ TypeVariables(Map<Class<?>,List<Class<?>>> map) {
this.map = map;
}
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/FunctionalPropertyStore.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/FunctionalPropertyStore.java
index 99e18973f1..81bbfa128f 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/FunctionalPropertyStore.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/FunctionalPropertyStore.java
@@ -38,7 +38,7 @@ public class FunctionalPropertyStore implements PropertyStore {
private static final String ARG_clearer = "clearer";
private final UnaryOperator<String> reader;
- private final BiConsumer<String, String> writer;
+ private final BiConsumer<String,String> writer;
private final Consumer<String> unsetter;
private final Snippet clearer;
@@ -52,7 +52,7 @@ public class FunctionalPropertyStore implements PropertyStore {
*/
public FunctionalPropertyStore(
UnaryOperator<String> reader,
- BiConsumer<String, String> writer,
+ BiConsumer<String,String> writer,
Consumer<String> unsetter,
Snippet clearer
) {
@@ -98,7 +98,7 @@ public class FunctionalPropertyStore implements PropertyStore {
*/
public static FunctionalPropertyStore of(
UnaryOperator<String> reader,
- BiConsumer<String, String> writer,
+ BiConsumer<String,String> writer,
Consumer<String> unsetter,
Snippet clearer
) {
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/Setting.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/Setting.java
index d04fb7e3ec..7ef7d301c6 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/Setting.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/Setting.java
@@ -102,7 +102,7 @@ public class Setting<T> extends Memoizer<T> {
* @return A Setting describing the result of applying a mapping function to the value of this Setting, if a value is present, otherwise an empty Setting.
*/
@Override
- public <U> Setting<U> map(Function<? super T, ? extends U> mapper) {
+ public <U> Setting<U> map(Function<? super T,? extends U> mapper) {
assertArgNotNull(ARG_mapper, mapper);
return new Setting<>(settings, () -> {
T value = get();
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/svl/functions/JsonFunctions.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/svl/functions/JsonFunctions.java
index dcc236f014..583e6fdf44 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/svl/functions/JsonFunctions.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/svl/functions/JsonFunctions.java
@@ -74,8 +74,8 @@ public final class JsonFunctions {
var current = root;
for (var seg : p.split("/")) {
if (current == null) return null;
- if (current instanceof Map<?, ?> current2) {
- current = ((Map<String, Object>) current2).get(seg);
+ if (current instanceof Map<?,?> current2) {
+ current = ((Map<String,Object>) current2).get(seg);
} else if (current instanceof List<?> current3) {
int idx;
try { idx = Integer.parseInt(seg); } catch (@SuppressWarnings("unused") NumberFormatException e) { return null; }
@@ -101,8 +101,8 @@ public final class JsonFunctions {
public String invoke(String json, String key) {
var v = MiniJson.parse(json);
if (v == null || key == null) return "";
- if (v instanceof Map<?, ?> v2) {
- var x = ((Map<String, Object>) v2).get(key);
+ if (v instanceof Map<?,?> v2) {
+ var x = ((Map<String,Object>) v2).get(key);
return x == null ? "" : MiniJson.render(x);
}
if (v instanceof List<?> v3) {
@@ -124,8 +124,8 @@ public final class JsonFunctions {
@Override public String name() { return "keys"; }
public String invoke(String json) {
var v = MiniJson.parse(json);
- if (!(v instanceof Map<?, ?> v2)) return "[]";
- return JsonShortcut.encodeArray(new ArrayList<>(((Map<String, Object>) v2).keySet()));
+ if (!(v instanceof Map<?,?> v2)) return "[]";
+ return JsonShortcut.encodeArray(new ArrayList<>(((Map<String,Object>) v2).keySet()));
}
}
@@ -137,9 +137,9 @@ public final class JsonFunctions {
@Override public String name() { return "values"; }
public String invoke(String json) {
var v = MiniJson.parse(json);
- if (v instanceof Map<?, ?> v2) {
+ if (v instanceof Map<?,?> v2) {
var out = new ArrayList<String>();
- for (var x : ((Map<String, Object>) v2).values()) out.add(MiniJson.render(x));
+ for (var x : ((Map<String,Object>) v2).values()) out.add(MiniJson.render(x));
return JsonShortcut.encodeArray(out);
}
if (v instanceof List<?> v3) {
@@ -160,7 +160,7 @@ public final class JsonFunctions {
public String invoke(String json) {
var v = MiniJson.parse(json);
if (v == null) return "0";
- if (v instanceof Map<?, ?> v2) return String.valueOf(v2.size());
+ if (v instanceof Map<?,?> v2) return String.valueOf(v2.size());
if (v instanceof List<?> v3) return String.valueOf(v3.size());
if (v instanceof String v4) return String.valueOf(v4.length());
return "0";
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/svl/functions/MiniJson.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/svl/functions/MiniJson.java
index 9f7100815c..351b3bd740 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/svl/functions/MiniJson.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/svl/functions/MiniJson.java
@@ -71,9 +71,9 @@ final class MiniJson {
throw err("Unexpected character '" + c + "'");
}
- private LinkedHashMap<String, Object> parseObject() {
+ private LinkedHashMap<String,Object> parseObject() {
pos++; // consume '{'
- var out = new LinkedHashMap<String, Object>();
+ var out = new LinkedHashMap<String,Object>();
skipWs();
if (peek() == '}') { pos++; return out; }
while (true) {
@@ -212,12 +212,12 @@ final class MiniJson {
static String render(Object value) {
if (value == null) return "";
if (value instanceof String value2) return value2;
- if (value instanceof Map<?, ?> value3) return renderMap((Map<String, Object>) value3);
+ if (value instanceof Map<?,?> value3) return renderMap((Map<String,Object>) value3);
if (value instanceof List<?> value4) return renderList((List<Object>) value4);
return String.valueOf(value);
}
- private static String renderMap(Map<String, Object> m) {
+ private static String renderMap(Map<String,Object> m) {
var sb = new StringBuilder();
sb.append('{');
var first = true;
@@ -250,7 +250,7 @@ final class MiniJson {
if (v == null) { sb.append("null"); return; }
if (v instanceof String v2) { appendString(sb, v2); return; }
if (v instanceof Boolean || v instanceof Number) { sb.append(v); return; }
- if (v instanceof Map<?, ?> v3) { sb.append(renderMap((Map<String, Object>) v3)); return; }
+ if (v instanceof Map<?,?> v3) { sb.append(renderMap((Map<String,Object>) v3)); return; }
if (v instanceof List<?> v4) { sb.append(renderList((List<Object>) v4)); return; }
appendString(sb, String.valueOf(v));
}
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/AssertionUtils.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/AssertionUtils.java
index 8460c7cd84..c8b5e14ca1 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/AssertionUtils.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/AssertionUtils.java
@@ -403,7 +403,7 @@ public class AssertionUtils {
* @return The same collection.
* @throws IllegalArgumentException Thrown if the specified collection or any of its elements are <jk>null</jk>.
*/
- public static final <T, C extends Collection<T>> C assertArgNoNulls(String name, C collection) throws IllegalArgumentException {
+ public static final <T,C extends Collection<T>> C assertArgNoNulls(String name, C collection) throws IllegalArgumentException {
assertArgNotNull(name, collection);
var i = 0;
for (var element : collection)
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/DateUtils.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/DateUtils.java
index 39ad18e479..6fa3c8cf9f 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/DateUtils.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/DateUtils.java
@@ -40,7 +40,7 @@ public class DateUtils {
*/
private DateUtils() {}
- private static final Cache<String, DateTimeFormatter> DATE_TIME_FORMATTER_CACHE = Cache.of(String.class, DateTimeFormatter.class)
+ private static final Cache<String,DateTimeFormatter> DATE_TIME_FORMATTER_CACHE = Cache.of(String.class, DateTimeFormatter.class)
.maxSize(100)
.supplier(pattern -> {
if (isEmpty(pattern))
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/PredicateUtils.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/PredicateUtils.java
index 3f2e806def..5a517d6896 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/PredicateUtils.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/PredicateUtils.java
@@ -99,7 +99,7 @@ public final class PredicateUtils {
* @return A predicate that returns <jk>true</jk> for the first occurrence of each unique key,
* and <jk>false</jk> for subsequent occurrences with the same key.
*/
- public static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
+ public static <T> Predicate<T> distinctByKey(Function<? super T,?> keyExtractor) {
var seen = ConcurrentHashMap.newKeySet();
return t -> seen.add(keyExtractor.apply(t));
}
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/ThrowableUtils.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/ThrowableUtils.java
index 6c21d8cfc7..1b89279d4d 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/ThrowableUtils.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/ThrowableUtils.java
@@ -310,7 +310,7 @@ public class ThrowableUtils {
@SuppressWarnings({
"java:S1181" // Need to catch Throwable to handle all exception types including Error
})
- public static void safe(Snippet snippet, Function<Throwable, RuntimeException> exceptionMapper) {
+ public static void safe(Snippet snippet, Function<Throwable,RuntimeException> exceptionMapper) {
try {
snippet.run();
} catch (RuntimeException t) {
@@ -338,7 +338,7 @@ public class ThrowableUtils {
@SuppressWarnings({
"java:S1181" // Need to catch Throwable to handle all exception types including Error
})
- public static <T> T safe(ThrowingSupplier<T> s, Function<Throwable, RuntimeException> exceptionMapper) {
+ public static <T> T safe(ThrowingSupplier<T> s, Function<Throwable,RuntimeException> exceptionMapper) {
try {
return s.get();
} catch (RuntimeException e) {
@@ -408,7 +408,7 @@ public class ThrowableUtils {
@SuppressWarnings({
"java:S1181" // Need to catch Throwable to handle all exception types including Error
})
- public static <T> T safeSupplier(SupplierWithThrowable<T> supplier, Function<Throwable, RuntimeException> exceptionMapper) {
+ public static <T> T safeSupplier(SupplierWithThrowable<T> supplier, Function<Throwable,RuntimeException> exceptionMapper) {
try {
return supplier.get();
} catch (RuntimeException t) {
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 bc4f5847ba..e6126a7135 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
@@ -73,8 +73,8 @@ public class TestAssertions {
* <p>Null keys render as {@code "<null>"}; null values render as {@code "<null>"}. Maps that are
* neither {@link SortedMap} nor {@link LinkedHashMap} are sorted by key string for determinism.
*/
- public static void assertMap(Map<?, ?> actual, Object... expected) {
- Map<?, ?> ordered = toOrderedMap(actual);
+ public static void assertMap(Map<?,?> actual, Object... expected) {
+ Map<?,?> ordered = toOrderedMap(actual);
List<String> entries = ordered.entrySet().stream()
.map(e -> stringifyKey(e.getKey()) + "=" + stringify(e.getValue()))
.toList();
@@ -208,7 +208,7 @@ public class TestAssertions {
return "[" + l.stream().map(TestAssertions::stringify).collect(Collectors.joining(",")) + "]";
if (o instanceof Collection<?> c)
return "[" + c.stream().map(TestAssertions::stringify).collect(Collectors.joining(",")) + "]";
- if (o instanceof Map<?, ?> m) {
+ if (o instanceof Map<?,?> m) {
return "{" + m.entrySet().stream()
.map(e -> stringifyKey(e.getKey()) + "=" + stringify(e.getValue()))
.collect(Collectors.joining(",")) + "}";
@@ -230,7 +230,7 @@ public class TestAssertions {
private static int sizeOf(Object o) {
if (o instanceof Collection<?> c) return c.size();
- if (o instanceof Map<?, ?> m) return m.size();
+ if (o instanceof Map<?,?> m) return m.size();
if (o instanceof String s) return s.length();
if (o.getClass().isArray()) return Array.getLength(o);
// Try size() method
@@ -250,7 +250,7 @@ public class TestAssertions {
private static boolean isEmptyLike(Object o) {
if (o instanceof Collection<?> c) return c.isEmpty();
- if (o instanceof Map<?, ?> m) return m.isEmpty();
+ if (o instanceof Map<?,?> m) return m.isEmpty();
if (o instanceof String s) return s.isEmpty();
if (o instanceof Optional<?> opt) return opt.isEmpty();
if (o instanceof Enumeration<?> e) return !e.hasMoreElements();
@@ -273,18 +273,18 @@ public class TestAssertions {
@SuppressWarnings({
"java:S1452" // Wildcard type parameter required for test utility generics.
})
- private static Map<?, ?> toOrderedMap(Map<?, ?> actual) {
+ private static Map<?,?> toOrderedMap(Map<?,?> actual) {
if (actual instanceof SortedMap || actual instanceof LinkedHashMap) return actual;
- List<Map.Entry<?, ?>> entries = new ArrayList<>(actual.entrySet());
+ List<Map.Entry<?,?>> entries = new ArrayList<>(actual.entrySet());
entries.sort(Comparator.comparing(e -> stringifyKey(e.getKey())));
- LinkedHashMap<Object, Object> result = new LinkedHashMap<>();
- for (Map.Entry<?, ?> e : entries)
+ LinkedHashMap<Object,Object> result = new LinkedHashMap<>();
+ for (Map.Entry<?,?> e : entries)
result.put(e.getKey(), e.getValue());
return result;
}
private static Object getProperty(Object obj, String name) {
- if (obj instanceof Map<?, ?> m) return m.get(name);
+ if (obj instanceof Map<?,?> m) return m.get(name);
// Try exact method name (e.g. on(), value(), number())
try {
Method m = obj.getClass().getMethod(name);
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/BidiMap_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/BidiMap_Test.java
index a01575cd04..241564215c 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/BidiMap_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/BidiMap_Test.java
@@ -586,7 +586,7 @@ class BidiMap_Test extends TestBase {
.add("two", 2)
.build();
- var forwardMap = new LinkedHashMap<String, Integer>();
+ var forwardMap = new LinkedHashMap<String,Integer>();
forwardMap.put("one", 1);
forwardMap.put("two", 2);
@@ -630,7 +630,7 @@ class BidiMap_Test extends TestBase {
.add("two", 2)
.build();
- var regularMap = new LinkedHashMap<String, Integer>();
+ var regularMap = new LinkedHashMap<String,Integer>();
regularMap.put("one", 1);
regularMap.put("two", 2);
@@ -673,7 +673,7 @@ class BidiMap_Test extends TestBase {
.add("two", 2)
.build();
- var regularMap = new LinkedHashMap<String, Integer>();
+ var regularMap = new LinkedHashMap<String,Integer>();
regularMap.put("one", 1);
regularMap.put("two", 2);
@@ -733,7 +733,7 @@ class BidiMap_Test extends TestBase {
.add("one", 1)
.build();
// putAll with same key-value pairs is not a conflict
- var sameEntries = new LinkedHashMap<String, Integer>();
+ var sameEntries = new LinkedHashMap<String,Integer>();
sameEntries.put("one", 1);
map.putAll(sameEntries);
assertEquals(1, map.size());
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache2_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache2_Test.java
index 25ce6f12a9..b6cf0dc468 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache2_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache2_Test.java
@@ -616,7 +616,7 @@ class Cache2_Test extends TestBase {
@Test
void l01_create_basic() {
- var x = Cache2.<String, Integer, String>create()
+ var x = Cache2.<String,Integer,String>create()
.supplier((k1, k2) -> k1 + ":" + k2)
.build();
@@ -705,7 +705,7 @@ class Cache2_Test extends TestBase {
.threadLocal()
.build();
var executor = Executors.newFixedThreadPool(2);
- var threadValues = new ConcurrentHashMap<Thread, String>();
+ var threadValues = new ConcurrentHashMap<Thread,String>();
// Each thread caches ("user", 123) with its own value
var future1 = CompletableFuture.runAsync(() -> {
@@ -726,7 +726,7 @@ class Cache2_Test extends TestBase {
assertTrue(threadValues.containsValue("thread2-value"));
// Verify each thread's cache is independent - same thread should get same cached value
- var threadValues2 = new ConcurrentHashMap<Thread, String>();
+ var threadValues2 = new ConcurrentHashMap<Thread,String>();
var threads = new ArrayList<>(threadValues.keySet());
future1 = CompletableFuture.runAsync(() -> {
@@ -846,7 +846,7 @@ class Cache2_Test extends TestBase {
.cacheMode(WEAK)
.build();
var executor = Executors.newFixedThreadPool(2);
- var threadValues = new ConcurrentHashMap<Thread, String>();
+ var threadValues = new ConcurrentHashMap<Thread,String>();
// Each thread caches ("user", 123) with its own value
var future1 = CompletableFuture.runAsync(() -> {
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache3_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache3_Test.java
index 256bef1380..21f37dc474 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache3_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache3_Test.java
@@ -296,7 +296,7 @@ class Cache3_Test extends TestBase {
@Test
void c01_create() {
- var x = Cache3.<String, String, Integer, String>create()
+ var x = Cache3.<String,String,Integer,String>create()
.supplier((k1, k2, k3) -> k1 + ":" + k2 + ":" + k3)
.build();
var result = x.get("en", "US", 1);
@@ -426,7 +426,7 @@ class Cache3_Test extends TestBase {
.threadLocal()
.build();
var executor = java.util.concurrent.Executors.newFixedThreadPool(2);
- var threadValues = new java.util.concurrent.ConcurrentHashMap<Thread, String>();
+ var threadValues = new java.util.concurrent.ConcurrentHashMap<Thread,String>();
// Each thread caches ("en", "US", 1) with its own value
var future1 = java.util.concurrent.CompletableFuture.runAsync(() -> {
@@ -543,7 +543,7 @@ class Cache3_Test extends TestBase {
.cacheMode(WEAK)
.build();
var executor = java.util.concurrent.Executors.newFixedThreadPool(2);
- var threadValues = new java.util.concurrent.ConcurrentHashMap<Thread, String>();
+ var threadValues = new java.util.concurrent.ConcurrentHashMap<Thread,String>();
// Each thread caches ("en", "US", 1) with its own value
var future1 = java.util.concurrent.CompletableFuture.runAsync(() -> {
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache4_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache4_Test.java
index 26e0f41bf3..3ecb45a7f0 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache4_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache4_Test.java
@@ -296,7 +296,7 @@ class Cache4_Test extends TestBase {
@Test
void c01_create() {
- var x = Cache4.<String, String, String, Integer, String>create()
+ var x = Cache4.<String,String,String,Integer,String>create()
.supplier((k1, k2, k3, k4) -> k1 + ":" + k2 + ":" + k3 + ":" + k4)
.build();
var result = x.get("en", "US", "formal", 1);
@@ -426,7 +426,7 @@ class Cache4_Test extends TestBase {
.threadLocal()
.build();
var executor = java.util.concurrent.Executors.newFixedThreadPool(2);
- var threadValues = new java.util.concurrent.ConcurrentHashMap<Thread, String>();
+ var threadValues = new java.util.concurrent.ConcurrentHashMap<Thread,String>();
// Each thread caches ("en", "US", "formal", 1) with its own value
var future1 = java.util.concurrent.CompletableFuture.runAsync(() -> {
@@ -543,7 +543,7 @@ class Cache4_Test extends TestBase {
.cacheMode(WEAK)
.build();
var executor = java.util.concurrent.Executors.newFixedThreadPool(2);
- var threadValues = new java.util.concurrent.ConcurrentHashMap<Thread, String>();
+ var threadValues = new java.util.concurrent.ConcurrentHashMap<Thread,String>();
// Each thread caches ("en", "US", "formal", 1) with its own value
var future1 = java.util.concurrent.CompletableFuture.runAsync(() -> {
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache5_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache5_Test.java
index 104774bc0c..dcf1769698 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache5_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache5_Test.java
@@ -297,7 +297,7 @@ class Cache5_Test extends TestBase {
@Test
void c01_create() {
- var x = Cache5.<String, String, String, String, Integer, String>create()
+ var x = Cache5.<String,String,String,String,Integer,String>create()
.supplier((k1, k2, k3, k4, k5) -> k1 + ":" + k2 + ":" + k3 + ":" + k4 + ":" + k5)
.build();
var result = x.get("en", "US", "west", "formal", 1);
@@ -427,7 +427,7 @@ class Cache5_Test extends TestBase {
.threadLocal()
.build();
var executor = java.util.concurrent.Executors.newFixedThreadPool(2);
- var threadValues = new java.util.concurrent.ConcurrentHashMap<Thread, String>();
+ var threadValues = new java.util.concurrent.ConcurrentHashMap<Thread,String>();
// Each thread caches ("en", "US", "west", "formal", 1) with its own value
var future1 = java.util.concurrent.CompletableFuture.runAsync(() -> {
@@ -544,7 +544,7 @@ class Cache5_Test extends TestBase {
.cacheMode(WEAK)
.build();
var executor = java.util.concurrent.Executors.newFixedThreadPool(2);
- var threadValues = new java.util.concurrent.ConcurrentHashMap<Thread, String>();
+ var threadValues = new java.util.concurrent.ConcurrentHashMap<Thread,String>();
// Each thread caches ("en", "US", "west", "formal", 1) with its own value
var future1 = java.util.concurrent.CompletableFuture.runAsync(() -> {
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache_Test.java
index a0efb6afe1..9681710137 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/Cache_Test.java
@@ -922,7 +922,7 @@ class Cache_Test extends TestBase {
//====================================================================================================
@Test void a51_create_basic() {
- var cache = Cache.<String, String>create()
+ var cache = Cache.<String,String>create()
.supplier(k -> "value-" + k)
.build();
@@ -932,7 +932,7 @@ class Cache_Test extends TestBase {
}
@Test void a52_create_withConfiguration() {
- var cache = Cache.<String, Integer>create()
+ var cache = Cache.<String,Integer>create()
.maxSize(50)
.cacheMode(WEAK)
.supplier(k -> k.length())
@@ -1002,7 +1002,7 @@ class Cache_Test extends TestBase {
.threadLocal()
.build();
var executor = Executors.newFixedThreadPool(2);
- var threadValues = new ConcurrentHashMap<Thread, String>();
+ var threadValues = new ConcurrentHashMap<Thread,String>();
// Each thread caches "key1" with its own value
var future1 = CompletableFuture.runAsync(() -> {
@@ -1023,7 +1023,7 @@ class Cache_Test extends TestBase {
assertTrue(threadValues.containsValue("thread2-value"));
// Verify each thread's cache is independent - same thread should get same cached value
- var threadValues2 = new ConcurrentHashMap<Thread, String>();
+ var threadValues2 = new ConcurrentHashMap<Thread,String>();
var threads = new ArrayList<>(threadValues.keySet());
future1 = CompletableFuture.runAsync(() -> {
@@ -1159,7 +1159,7 @@ class Cache_Test extends TestBase {
.cacheMode(WEAK)
.build();
var executor = Executors.newFixedThreadPool(2);
- var threadValues = new ConcurrentHashMap<Thread, String>();
+ var threadValues = new ConcurrentHashMap<Thread,String>();
// Each thread caches "key1" with its own value
var future1 = CompletableFuture.runAsync(() -> {
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/FilteredMap_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/FilteredMap_Test.java
index 520b2bf8b0..0a5b635d08 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/FilteredMap_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/FilteredMap_Test.java
@@ -909,7 +909,7 @@ class FilteredMap_Test extends TestBase {
@Test
void t01_getFilter_returnsFilter() {
- var originalFilter = (BiPredicate<String, Integer>)((k, v) -> v != null && v > 0);
+ var originalFilter = (BiPredicate<String,Integer>)((k, v) -> v != null && v > 0);
var map = FilteredMap
.create(String.class, Integer.class)
.filter(originalFilter)
@@ -1030,7 +1030,7 @@ class FilteredMap_Test extends TestBase {
map.put("key1", "value1");
map.put("key2", "value2");
- var underlyingMap = new LinkedHashMap<String, String>();
+ var underlyingMap = new LinkedHashMap<String,String>();
underlyingMap.put("key1", "value1");
underlyingMap.put("key2", "value2");
@@ -1046,7 +1046,7 @@ class FilteredMap_Test extends TestBase {
map1.put("key1", "value1");
map1.put("key2", "value2");
- var map2 = new LinkedHashMap<String, String>();
+ var map2 = new LinkedHashMap<String,String>();
map2.put("key1", "value1");
map2.put("key2", "value2");
@@ -1063,7 +1063,7 @@ class FilteredMap_Test extends TestBase {
.build();
map1.put("key1", "value1");
- var map2 = new LinkedHashMap<String, String>();
+ var map2 = new LinkedHashMap<String,String>();
map2.put("key1", "value2");
assertNotEquals(map1, map2);
@@ -1079,7 +1079,7 @@ class FilteredMap_Test extends TestBase {
map.put("key1", "value1");
map.put("key2", "value2");
- var underlyingMap = new LinkedHashMap<String, String>();
+ var underlyingMap = new LinkedHashMap<String,String>();
underlyingMap.put("key1", "value1");
underlyingMap.put("key2", "value2");
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/FluentMap_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/FluentMap_Test.java
index 2bbc3b10bc..4a0c121784 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/FluentMap_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/FluentMap_Test.java
@@ -34,7 +34,7 @@ class FluentMap_Test extends TestBase {
@Test
void a01_addSingleEntry() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1").a("key2", "value2").a("key3", "value3");
assertSize(3, map);
@@ -45,7 +45,7 @@ class FluentMap_Test extends TestBase {
@Test
void a02_addSingleEntry_returnsThis() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
var result = map.a("key1", "value1");
assertSame(map, result);
@@ -53,7 +53,7 @@ class FluentMap_Test extends TestBase {
@Test
void a03_addSingleEntry_nullValue() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1").a("key2", null).a("key3", "value3");
assertSize(3, map);
@@ -64,7 +64,7 @@ class FluentMap_Test extends TestBase {
@Test
void a04_addSingleEntry_nullKey() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a(null, "value1").a("key2", "value2");
assertSize(2, map);
@@ -74,7 +74,7 @@ class FluentMap_Test extends TestBase {
@Test
void a05_addSingleEntry_updateExisting() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1");
map.a("key1", "value1-updated");
@@ -88,7 +88,7 @@ class FluentMap_Test extends TestBase {
@Test
void b01_addMap() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
var other = map("key1", "value1", "key2", "value2", "key3", "value3");
map.aa(other);
@@ -100,7 +100,7 @@ class FluentMap_Test extends TestBase {
@Test
void b02_addMap_returnsThis() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
var other = map("key1", "value1", "key2", "value2");
var result = map.aa(other);
@@ -109,9 +109,9 @@ class FluentMap_Test extends TestBase {
@Test
void b03_addMap_nullMap() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1");
- map.aa((Map<String, String>)null);
+ map.aa((Map<String,String>)null);
map.a("key2", "value2");
assertSize(2, map);
@@ -121,7 +121,7 @@ class FluentMap_Test extends TestBase {
@Test
void b04_addMap_emptyMap() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1");
map.aa(map());
map.a("key2", "value2");
@@ -133,7 +133,7 @@ class FluentMap_Test extends TestBase {
@Test
void b05_addMap_multipleCalls() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.aa(map("key1", "value1", "key2", "value2"));
map.aa(map("key3", "value3", "key4", "value4"));
@@ -146,7 +146,7 @@ class FluentMap_Test extends TestBase {
@Test
void b06_addMap_overwritesExisting() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1");
map.aa(map("key1", "value1-updated", "key2", "value2"));
@@ -161,7 +161,7 @@ class FluentMap_Test extends TestBase {
@Test
void c01_ai_conditionTrue() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1").ai(true, "key2", "value2").a("key3", "value3");
assertSize(3, map);
@@ -172,7 +172,7 @@ class FluentMap_Test extends TestBase {
@Test
void c02_ai_conditionFalse() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1").ai(false, "key2", "value2").a("key3", "value3");
assertSize(2, map);
@@ -183,7 +183,7 @@ class FluentMap_Test extends TestBase {
@Test
void c03_ai_returnsThis() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
var result1 = map.ai(true, "key1", "value1");
var result2 = map.ai(false, "key2", "value2");
@@ -196,7 +196,7 @@ class FluentMap_Test extends TestBase {
boolean includeDebug = true;
boolean includeTest = false;
- var map = new FluentMap<>(new LinkedHashMap<String, String>())
+ var map = new FluentMap<>(new LinkedHashMap<String,String>())
.a("host", "localhost")
.a("port", "8080")
.ai(includeDebug, "debug", "true")
@@ -215,7 +215,7 @@ class FluentMap_Test extends TestBase {
@Test
void d01_methodChaining() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>())
+ var map = new FluentMap<>(new LinkedHashMap<String,String>())
.a("key1", "value1")
.a("key2", "value2")
.ai(true, "key3", "value3")
@@ -237,7 +237,7 @@ class FluentMap_Test extends TestBase {
@Test
void e01_mapInterface_get() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1").a("key2", "value2");
assertEquals("value1", map.get("key1"));
@@ -247,7 +247,7 @@ class FluentMap_Test extends TestBase {
@Test
void e02_mapInterface_put() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
assertNull(map.put("key1", "value1"));
assertEquals("value1", map.put("key1", "value1-updated"));
@@ -257,7 +257,7 @@ class FluentMap_Test extends TestBase {
@Test
void e03_mapInterface_putAll() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1");
map.putAll(map("key2", "value2", "key3", "value3"));
@@ -269,7 +269,7 @@ class FluentMap_Test extends TestBase {
@Test
void e04_mapInterface_remove() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1").a("key2", "value2").a("key3", "value3");
assertEquals("value2", map.remove("key2"));
@@ -281,7 +281,7 @@ class FluentMap_Test extends TestBase {
@Test
void e05_mapInterface_containsKey() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1").a("key2", "value2");
assertTrue(map.containsKey("key1"));
@@ -291,7 +291,7 @@ class FluentMap_Test extends TestBase {
@Test
void e06_mapInterface_containsValue() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1").a("key2", "value2");
assertTrue(map.containsValue("value1"));
@@ -301,7 +301,7 @@ class FluentMap_Test extends TestBase {
@Test
void e07_mapInterface_size() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
assertEquals(0, map.size());
map.a("key1", "value1");
@@ -313,7 +313,7 @@ class FluentMap_Test extends TestBase {
@Test
void e08_mapInterface_isEmpty() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
assertTrue(map.isEmpty());
map.a("key1", "value1");
@@ -322,7 +322,7 @@ class FluentMap_Test extends TestBase {
@Test
void e09_mapInterface_clear() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1").a("key2", "value2").a("key3", "value3");
map.clear();
@@ -332,7 +332,7 @@ class FluentMap_Test extends TestBase {
@Test
void e10_mapInterface_keySet() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1").a("key2", "value2").a("key3", "value3");
var keySet = map.keySet();
@@ -344,7 +344,7 @@ class FluentMap_Test extends TestBase {
@Test
void e11_mapInterface_values() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1").a("key2", "value2").a("key3", "value3");
var values = map.values();
@@ -356,7 +356,7 @@ class FluentMap_Test extends TestBase {
@Test
void e12_mapInterface_entrySet() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1").a("key2", "value2").a("key3", "value3");
var entrySet = map.entrySet();
@@ -377,7 +377,7 @@ class FluentMap_Test extends TestBase {
@Test
void f01_hashMap() {
- var map = new FluentMap<>(new HashMap<String, String>());
+ var map = new FluentMap<>(new HashMap<String,String>());
map.a("key1", "value1").a("key2", "value2").a("key3", "value3");
assertSize(3, map);
@@ -385,7 +385,7 @@ class FluentMap_Test extends TestBase {
@Test
void f02_treeMap() {
- var map = new FluentMap<>(new TreeMap<String, String>());
+ var map = new FluentMap<>(new TreeMap<String,String>());
map.a("zebra", "value3").a("apple", "value1").a("banana", "value2");
assertSize(3, map);
@@ -396,7 +396,7 @@ class FluentMap_Test extends TestBase {
@Test
void f03_concurrentHashMap() {
- var map = new FluentMap<>(new ConcurrentHashMap<String, String>());
+ var map = new FluentMap<>(new ConcurrentHashMap<String,String>());
map.a("key1", "value1").a("key2", "value2").a("key3", "value3");
assertSize(3, map);
@@ -408,7 +408,7 @@ class FluentMap_Test extends TestBase {
@Test
void g01_emptyMap() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
assertTrue(map.isEmpty());
assertSize(0, map);
@@ -418,7 +418,7 @@ class FluentMap_Test extends TestBase {
@Test
void g02_nullKeyAndValue() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a(null, null).a("key1", "value1");
assertSize(2, map);
@@ -429,7 +429,7 @@ class FluentMap_Test extends TestBase {
@Test
void g03_updateWithNullValue() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1");
map.a("key1", null);
@@ -444,10 +444,10 @@ class FluentMap_Test extends TestBase {
@Test
void w01_toString_delegatesToUnderlyingMap() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1").a("key2", "value2");
- var underlyingMap = new LinkedHashMap<String, String>();
+ var underlyingMap = new LinkedHashMap<String,String>();
underlyingMap.put("key1", "value1");
underlyingMap.put("key2", "value2");
@@ -456,10 +456,10 @@ class FluentMap_Test extends TestBase {
@Test
void w02_equals_delegatesToUnderlyingMap() {
- var map1 = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map1 = new FluentMap<>(new LinkedHashMap<String,String>());
map1.a("key1", "value1").a("key2", "value2");
- var map2 = new LinkedHashMap<String, String>();
+ var map2 = new LinkedHashMap<String,String>();
map2.put("key1", "value1");
map2.put("key2", "value2");
@@ -470,10 +470,10 @@ class FluentMap_Test extends TestBase {
@Test
void w03_equals_differentContents_returnsFalse() {
- var map1 = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map1 = new FluentMap<>(new LinkedHashMap<String,String>());
map1.a("key1", "value1");
- var map2 = new LinkedHashMap<String, String>();
+ var map2 = new LinkedHashMap<String,String>();
map2.put("key1", "value2");
assertNotEquals(map1, map2);
@@ -482,10 +482,10 @@ class FluentMap_Test extends TestBase {
@Test
void w04_hashCode_delegatesToUnderlyingMap() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.a("key1", "value1").a("key2", "value2");
- var underlyingMap = new LinkedHashMap<String, String>();
+ var underlyingMap = new LinkedHashMap<String,String>();
underlyingMap.put("key1", "value1");
underlyingMap.put("key2", "value2");
@@ -497,14 +497,14 @@ class FluentMap_Test extends TestBase {
//====================================================================================================
@Test
void x01_ai_predicateTrue() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.ai(s -> !s.isEmpty(), "key1", "value1");
assertEquals("value1", map.get("key1"));
}
@Test
void x02_ai_predicateFalse() {
- var map = new FluentMap<>(new LinkedHashMap<String, String>());
+ var map = new FluentMap<>(new LinkedHashMap<String,String>());
map.ai(s -> !s.isEmpty(), "key1", "");
assertFalse(map.containsKey("key1"));
}
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/HashKey_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/HashKey_Test.java
index f4678ebd87..549fa2500c 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/HashKey_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/HashKey_Test.java
@@ -269,7 +269,7 @@ class HashKey_Test extends TestBase {
@Test
void d01_hashMap_putAndGet() {
- Map<HashKey, String> map = new HashMap<>();
+ Map<HashKey,String> map = new HashMap<>();
HashKey key = HashKey.of("a", "b", 42);
map.put(key, "value");
assertEquals("value", map.get(key));
@@ -277,7 +277,7 @@ class HashKey_Test extends TestBase {
@Test
void d02_hashMap_equivalentKeys() {
- Map<HashKey, String> map = new HashMap<>();
+ Map<HashKey,String> map = new HashMap<>();
HashKey key1 = HashKey.of("a", "b", 42);
HashKey key2 = HashKey.of("a", "b", 42);
map.put(key1, "value");
@@ -286,7 +286,7 @@ class HashKey_Test extends TestBase {
@Test
void d03_hashMap_differentKeys() {
- Map<HashKey, String> map = new HashMap<>();
+ Map<HashKey,String> map = new HashMap<>();
HashKey key1 = HashKey.of("a", "b", 42);
HashKey key2 = HashKey.of("a", "b", 43);
map.put(key1, "value1");
@@ -297,7 +297,7 @@ class HashKey_Test extends TestBase {
@Test
void d04_hashMap_multipleEntries() {
- Map<HashKey, Integer> map = new HashMap<>();
+ Map<HashKey,Integer> map = new HashMap<>();
map.put(HashKey.of("a"), 1);
map.put(HashKey.of("b"), 2);
map.put(HashKey.of("c"), 3);
@@ -309,7 +309,7 @@ class HashKey_Test extends TestBase {
@Test
void d05_hashMap_withNullValues() {
- Map<HashKey, String> map = new HashMap<>();
+ Map<HashKey,String> map = new HashMap<>();
HashKey key = HashKey.of("a", null, "b");
map.put(key, "value");
assertEquals("value", map.get(HashKey.of("a", null, "b")));
@@ -317,7 +317,7 @@ class HashKey_Test extends TestBase {
@Test
void d06_hashMap_emptyKey() {
- Map<HashKey, String> map = new HashMap<>();
+ Map<HashKey,String> map = new HashMap<>();
HashKey key = HashKey.of();
map.put(key, "value");
assertEquals("value", map.get(HashKey.of()));
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/MultiMap_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/MultiMap_Test.java
index a998e41a21..8ec977ec1d 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/MultiMap_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/MultiMap_Test.java
@@ -181,7 +181,7 @@ class MultiMap_Test extends TestBase {
@Test
void e02_isEmpty_someMapsHaveEntries() {
- Map<String, String> map1 = map();
+ Map<String,String> map1 = map();
var map2 = map("key1", "value1");
var multiMap = new MultiMap<>(map1, map2);
@@ -198,7 +198,7 @@ class MultiMap_Test extends TestBase {
var map2 = map("key3", "value3");
var multiMap = new MultiMap<>(map1, map2);
- var entries = new ArrayList<Map.Entry<String, String>>();
+ var entries = new ArrayList<Map.Entry<String,String>>();
multiMap.entrySet().forEach(entries::add);
assertEquals(3, entries.size());
@@ -214,7 +214,7 @@ class MultiMap_Test extends TestBase {
var map3 = map("key2", "value3");
var multiMap = new MultiMap<>(map1, map2, map3);
- var entries = new ArrayList<Map.Entry<String, String>>();
+ var entries = new ArrayList<Map.Entry<String,String>>();
multiMap.entrySet().forEach(entries::add);
assertEquals(2, entries.size());
@@ -377,7 +377,7 @@ class MultiMap_Test extends TestBase {
@Test
void j03_nullValue() {
- Map<String, String> map1 = map("key1", null);
+ Map<String,String> map1 = map("key1", null);
var map2 = map("key2", "value2");
var multiMap = new MultiMap<>(map1, map2);
@@ -388,7 +388,7 @@ class MultiMap_Test extends TestBase {
@Test
void j04_nullKey() {
- var map1 = new LinkedHashMap<String, String>();
+ var map1 = new LinkedHashMap<String,String>();
map1.put(null, "value1");
var map2 = map("key2", "value2");
var multiMap = new MultiMap<>(map1, map2);
@@ -423,8 +423,8 @@ class MultiMap_Test extends TestBase {
@Test
void k03_toString_emptyMaps() {
- Map<String, String> map1 = map();
- Map<String, String> map2 = map();
+ Map<String,String> map1 = map();
+ Map<String,String> map2 = map();
var multiMap = new MultiMap<>(map1, map2);
var expected = "[" + map1.toString() + ", " + map2.toString() + "]";
@@ -433,9 +433,9 @@ class MultiMap_Test extends TestBase {
@Test
void k04_toString_mixedEmptyAndNonEmpty() {
- Map<String, String> map1 = map();
+ Map<String,String> map1 = map();
var map2 = map("key1", "value1");
- Map<String, String> map3 = map();
+ Map<String,String> map3 = map();
var multiMap = new MultiMap<>(map1, map2, map3);
var expected = "[" + map1.toString() + ", " + map2.toString() + ", " + map3.toString() + "]";
@@ -521,8 +521,8 @@ class MultiMap_Test extends TestBase {
@Test
void m01_entrySet_iterator_emptyMaps() {
- Map<String, String> map1 = map();
- Map<String, String> map2 = map();
+ Map<String,String> map1 = map();
+ Map<String,String> map2 = map();
var multiMap = new MultiMap<>(map1, map2);
var iterator = multiMap.entrySet().iterator();
assertFalse(iterator.hasNext());
@@ -530,7 +530,7 @@ class MultiMap_Test extends TestBase {
@Test
void m02_entrySet_iterator_next_throwsWhenNextEntryIsNull() {
- Map<String, String> map1 = map();
+ Map<String,String> map1 = map();
var multiMap = new MultiMap<>(map1);
var iterator = multiMap.entrySet().iterator();
assertThrows(NoSuchElementException.class, iterator::next);
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/SimpleMap_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/SimpleMap_Test.java
index 077d798917..59d8ea0421 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/SimpleMap_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/collections/SimpleMap_Test.java
@@ -374,7 +374,7 @@ class SimpleMap_Test extends TestBase {
Object[] values = { "value1", "value2" };
SimpleMap<String,Object> map = new SimpleMap<>(keys, values);
- var regularMap = new LinkedHashMap<String, Object>();
+ var regularMap = new LinkedHashMap<String,Object>();
regularMap.put("key1", "value1");
regularMap.put("key2", "value2");
@@ -423,7 +423,7 @@ class SimpleMap_Test extends TestBase {
Object[] values = { "value1", "value2" };
SimpleMap<String,Object> map = new SimpleMap<>(keys, values);
- var regularMap = new LinkedHashMap<String, Object>();
+ var regularMap = new LinkedHashMap<String,Object>();
regularMap.put("key1", "value1");
regularMap.put("key2", "value2");
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/conversion/BasicConverter_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/conversion/BasicConverter_Test.java
index 6a37d34705..5c24453421 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/conversion/BasicConverter_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/conversion/BasicConverter_Test.java
@@ -317,13 +317,13 @@ class BasicConverter_Test extends TestBase {
var a = C.to(Map.of("a", 1, "b", 2), Map.class);
assertNotNull(a);
assertInstanceOf(Map.class, a);
- assertEquals(2, ((Map<?, ?>) a).size());
+ assertEquals(2, ((Map<?,?>) a).size());
}
@Test void g02_mapToMapTyped() {
var a = C.to(Map.of(1, "100", 2, "200"), (Type) Map.class, new Type[]{String.class, Integer.class});
assertNotNull(a);
- var map = (Map<?, ?>) a;
+ var map = (Map<?,?>) a;
assertTrue(map.containsKey("1") || map.containsKey("2"));
for (var v : map.values())
assertInstanceOf(Integer.class, v);
@@ -333,21 +333,21 @@ class BasicConverter_Test extends TestBase {
var a = C.to(Map.of("c", 3, "a", 1, "b", 2), SortedMap.class);
assertNotNull(a);
assertInstanceOf(SortedMap.class, a);
- assertEquals("a", ((SortedMap<?, ?>) a).firstKey());
+ assertEquals("a", ((SortedMap<?,?>) a).firstKey());
}
@Test void g04_mapToHashMap() {
var a = C.to(Map.of("a", 1), HashMap.class);
assertNotNull(a);
assertInstanceOf(HashMap.class, a);
- assertEquals(1, ((HashMap<?, ?>) a).size());
+ assertEquals(1, ((HashMap<?,?>) a).size());
}
@Test void g05_mapToConcreteMap() {
var a = C.to(Map.of("a", 1), ConcurrentHashMap.class);
assertNotNull(a);
assertInstanceOf(ConcurrentHashMap.class, a);
- assertEquals(1, ((ConcurrentHashMap<?, ?>) a).size());
+ assertEquals(1, ((ConcurrentHashMap<?,?>) a).size());
}
public static class G06_NoDefaultCtorMap extends HashMap<Object,Object> {
@@ -356,7 +356,7 @@ class BasicConverter_Test extends TestBase {
}
@Test void g06_mapToMapWithNoDefaultCtor() {
- var a = (Map<?, ?>) C.to(Map.of("a", 1), G06_NoDefaultCtorMap.class);
+ var a = (Map<?,?>) C.to(Map.of("a", 1), G06_NoDefaultCtorMap.class);
assertNotNull(a);
assertInstanceOf(LinkedHashMap.class, a);
assertEquals(1, a.size());
@@ -364,7 +364,7 @@ class BasicConverter_Test extends TestBase {
@Test void g07_mapToLinkedHashMap() {
// Hits line 370 B=true branch (LinkedHashMap.class)
- var a = (Map<?, ?>) C.to(Map.of("a", 1), LinkedHashMap.class);
+ var a = (Map<?,?>) C.to(Map.of("a", 1), LinkedHashMap.class);
assertNotNull(a);
assertInstanceOf(LinkedHashMap.class, a);
assertEquals(1, a.size());
@@ -372,7 +372,7 @@ class BasicConverter_Test extends TestBase {
@Test void g08_mapToAbstractMap() {
// Hits line 370 C=true branch (AbstractMap.class); use typed args to bypass short-circuit
- var a = (Map<?, ?>) C.to(Map.of("a", 1), (Type) AbstractMap.class, new Type[]{String.class, Integer.class});
+ var a = (Map<?,?>) C.to(Map.of("a", 1), (Type) AbstractMap.class, new Type[]{String.class, Integer.class});
assertNotNull(a);
assertInstanceOf(AbstractMap.class, a);
assertEquals(1, a.size());
@@ -380,7 +380,7 @@ class BasicConverter_Test extends TestBase {
@Test void g09_mapToNavigableMap() {
// Hits line 372 B=true branch (NavigableMap.class)
- var a = (Map<?, ?>) C.to(Map.of("a", 1), NavigableMap.class);
+ var a = (Map<?,?>) C.to(Map.of("a", 1), NavigableMap.class);
assertNotNull(a);
assertInstanceOf(NavigableMap.class, a);
assertEquals(1, a.size());
@@ -388,7 +388,7 @@ class BasicConverter_Test extends TestBase {
@Test void g10_mapToTreeMap() {
// Hits line 372 C=true branch (TreeMap.class)
- var a = (Map<?, ?>) C.to(Map.of("a", 1), TreeMap.class);
+ var a = (Map<?,?>) C.to(Map.of("a", 1), TreeMap.class);
assertNotNull(a);
assertInstanceOf(TreeMap.class, a);
assertEquals(1, a.size());
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingConsumer2_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingConsumer2_Test.java
index b20a4ed5a8..d9fe035825 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingConsumer2_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingConsumer2_Test.java
@@ -32,7 +32,7 @@ class ThrowingConsumer2_Test extends TestBase {
var callCount = new AtomicInteger();
var receivedValues = new Object[2];
- var consumer = (ThrowingConsumer2<String, Integer>)(a, b) -> {
+ var consumer = (ThrowingConsumer2<String,Integer>)(a, b) -> {
callCount.incrementAndGet();
receivedValues[0] = a;
receivedValues[1] = b;
@@ -48,7 +48,7 @@ class ThrowingConsumer2_Test extends TestBase {
var callCount = new AtomicInteger();
var receivedValues = new Object[2];
- var consumer = (ThrowingConsumer2<String, Integer>)(a, b) -> {
+ var consumer = (ThrowingConsumer2<String,Integer>)(a, b) -> {
callCount.incrementAndGet();
receivedValues[0] = a;
receivedValues[1] = b;
@@ -64,7 +64,7 @@ class ThrowingConsumer2_Test extends TestBase {
// Exception handling tests.
//------------------------------------------------------------------------------------------------------------------
@Test void b01_throwsCheckedException() {
- var consumer = (ThrowingConsumer2<String, Integer>)(a, b) -> {
+ var consumer = (ThrowingConsumer2<String,Integer>)(a, b) -> {
throw new Exception("Test exception");
};
@@ -77,7 +77,7 @@ class ThrowingConsumer2_Test extends TestBase {
}
@Test void b02_throwsRuntimeException() {
- var consumer = (ThrowingConsumer2<String, Integer>)(a, b) -> {
+ var consumer = (ThrowingConsumer2<String,Integer>)(a, b) -> {
throw new RuntimeException("Test runtime exception");
};
@@ -91,7 +91,7 @@ class ThrowingConsumer2_Test extends TestBase {
}
@Test void b03_throwsError() {
- var consumer = (ThrowingConsumer2<String, Integer>)(a, b) -> {
+ var consumer = (ThrowingConsumer2<String,Integer>)(a, b) -> {
throw new Error("Test error");
};
@@ -110,7 +110,7 @@ class ThrowingConsumer2_Test extends TestBase {
var callCount = new AtomicInteger();
// ThrowingConsumer2 extends Consumer2, so it can be used where Consumer2 is expected
- var consumer = (Consumer2<String, Integer>)(a, b) -> {
+ var consumer = (Consumer2<String,Integer>)(a, b) -> {
callCount.incrementAndGet();
};
@@ -121,7 +121,7 @@ class ThrowingConsumer2_Test extends TestBase {
@Test void c02_lambdaExpression() {
var sum = new AtomicInteger(0);
- var consumer = (ThrowingConsumer2<Integer, Integer>)(a, b) -> {
+ var consumer = (ThrowingConsumer2<Integer,Integer>)(a, b) -> {
sum.addAndGet(a + b);
};
@@ -131,9 +131,9 @@ class ThrowingConsumer2_Test extends TestBase {
}
@Test void c03_methodReference() {
- var map = new java.util.HashMap<String, Integer>();
+ var map = new java.util.HashMap<String,Integer>();
- var consumer = (ThrowingConsumer2<String, Integer>)map::put;
+ var consumer = (ThrowingConsumer2<String,Integer>)map::put;
consumer.apply("key1", 1);
consumer.apply("key2", 2);
@@ -146,8 +146,8 @@ class ThrowingConsumer2_Test extends TestBase {
var callCount1 = new AtomicInteger();
var callCount2 = new AtomicInteger();
- var consumer1 = (ThrowingConsumer2<String, Integer>)(a, b) -> callCount1.incrementAndGet();
- var consumer2 = (ThrowingConsumer2<String, Integer>)(a, b) -> callCount2.incrementAndGet();
+ var consumer1 = (ThrowingConsumer2<String,Integer>)(a, b) -> callCount1.incrementAndGet();
+ var consumer2 = (ThrowingConsumer2<String,Integer>)(a, b) -> callCount2.incrementAndGet();
var composed = consumer1.andThen(consumer2);
composed.apply("test", 42);
@@ -159,10 +159,10 @@ class ThrowingConsumer2_Test extends TestBase {
@Test void c05_andThen_withException() {
var callCount = new AtomicInteger();
- var consumer1 = (ThrowingConsumer2<String, Integer>)(a, b) -> {
+ var consumer1 = (ThrowingConsumer2<String,Integer>)(a, b) -> {
throw new RuntimeException("First consumer failed");
};
- var consumer2 = (ThrowingConsumer2<String, Integer>)(a, b) -> callCount.incrementAndGet();
+ var consumer2 = (ThrowingConsumer2<String,Integer>)(a, b) -> callCount.incrementAndGet();
var composed = consumer1.andThen(consumer2);
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingConsumer3_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingConsumer3_Test.java
index b17b0ef9ac..54c568364d 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingConsumer3_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingConsumer3_Test.java
@@ -32,7 +32,7 @@ class ThrowingConsumer3_Test extends TestBase {
var callCount = new AtomicInteger();
var receivedValues = new Object[3];
- var consumer = (ThrowingConsumer3<String, Integer, Boolean>)(a, b, c) -> {
+ var consumer = (ThrowingConsumer3<String,Integer,Boolean>)(a, b, c) -> {
callCount.incrementAndGet();
receivedValues[0] = a;
receivedValues[1] = b;
@@ -50,7 +50,7 @@ class ThrowingConsumer3_Test extends TestBase {
var callCount = new AtomicInteger();
var receivedValues = new Object[3];
- var consumer = (ThrowingConsumer3<String, Integer, Boolean>)(a, b, c) -> {
+ var consumer = (ThrowingConsumer3<String,Integer,Boolean>)(a, b, c) -> {
callCount.incrementAndGet();
receivedValues[0] = a;
receivedValues[1] = b;
@@ -68,7 +68,7 @@ class ThrowingConsumer3_Test extends TestBase {
// Exception handling tests.
//------------------------------------------------------------------------------------------------------------------
@Test void b01_throwsCheckedException() {
- var consumer = (ThrowingConsumer3<String, Integer, Boolean>)(a, b, c) -> {
+ var consumer = (ThrowingConsumer3<String,Integer,Boolean>)(a, b, c) -> {
throw new Exception("Test exception");
};
@@ -81,7 +81,7 @@ class ThrowingConsumer3_Test extends TestBase {
}
@Test void b02_throwsRuntimeException() {
- var consumer = (ThrowingConsumer3<String, Integer, Boolean>)(a, b, c) -> {
+ var consumer = (ThrowingConsumer3<String,Integer,Boolean>)(a, b, c) -> {
throw new RuntimeException("Test runtime exception");
};
@@ -99,7 +99,7 @@ class ThrowingConsumer3_Test extends TestBase {
@Test void c01_usedAsConsumer3() {
var callCount = new AtomicInteger();
- var consumer = (Consumer3<String, Integer, Boolean>)(a, b, c) -> {
+ var consumer = (Consumer3<String,Integer,Boolean>)(a, b, c) -> {
callCount.incrementAndGet();
};
@@ -110,7 +110,7 @@ class ThrowingConsumer3_Test extends TestBase {
@Test void c02_lambdaExpression() {
var sum = new AtomicInteger(0);
- ThrowingConsumer3<Integer, Integer, Integer> consumer = (a, b, c) -> {
+ ThrowingConsumer3<Integer,Integer,Integer> consumer = (a, b, c) -> {
sum.addAndGet(a + b + c);
};
@@ -123,8 +123,8 @@ class ThrowingConsumer3_Test extends TestBase {
var callCount1 = new AtomicInteger();
var callCount2 = new AtomicInteger();
- ThrowingConsumer3<String, Integer, Boolean> consumer1 = (a, b, c) -> callCount1.incrementAndGet();
- ThrowingConsumer3<String, Integer, Boolean> consumer2 = (a, b, c) -> callCount2.incrementAndGet();
+ ThrowingConsumer3<String,Integer,Boolean> consumer1 = (a, b, c) -> callCount1.incrementAndGet();
+ ThrowingConsumer3<String,Integer,Boolean> consumer2 = (a, b, c) -> callCount2.incrementAndGet();
var composed = consumer1.andThen(consumer2);
composed.apply("test", 42, true);
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingConsumer4_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingConsumer4_Test.java
index 7bfd672d72..981ef8bac8 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingConsumer4_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingConsumer4_Test.java
@@ -32,7 +32,7 @@ class ThrowingConsumer4_Test extends TestBase {
var callCount = new AtomicInteger();
var receivedValues = new Object[4];
- var consumer = (ThrowingConsumer4<String, Integer, Boolean, Double>)(a, b, c, d) -> {
+ var consumer = (ThrowingConsumer4<String,Integer,Boolean,Double>)(a, b, c, d) -> {
callCount.incrementAndGet();
receivedValues[0] = a;
receivedValues[1] = b;
@@ -52,7 +52,7 @@ class ThrowingConsumer4_Test extends TestBase {
// Exception handling tests.
//------------------------------------------------------------------------------------------------------------------
@Test void b01_throwsCheckedException() {
- var consumer = (ThrowingConsumer4<String, Integer, Boolean, Double>)(a, b, c, d) -> {
+ var consumer = (ThrowingConsumer4<String,Integer,Boolean,Double>)(a, b, c, d) -> {
throw new Exception("Test exception");
};
@@ -65,7 +65,7 @@ class ThrowingConsumer4_Test extends TestBase {
}
@Test void b02_throwsRuntimeException() {
- var consumer = (ThrowingConsumer4<String, Integer, Boolean, Double>)(a, b, c, d) -> {
+ var consumer = (ThrowingConsumer4<String,Integer,Boolean,Double>)(a, b, c, d) -> {
throw new RuntimeException("Test runtime exception");
};
@@ -83,7 +83,7 @@ class ThrowingConsumer4_Test extends TestBase {
@Test void c01_usedAsConsumer4() {
var callCount = new AtomicInteger();
- var consumer = (Consumer4<String, Integer, Boolean, Double>)(a, b, c, d) -> {
+ var consumer = (Consumer4<String,Integer,Boolean,Double>)(a, b, c, d) -> {
callCount.incrementAndGet();
};
@@ -94,7 +94,7 @@ class ThrowingConsumer4_Test extends TestBase {
@Test void c02_lambdaExpression() {
var sum = new AtomicInteger(0);
- ThrowingConsumer4<Integer, Integer, Integer, Integer> consumer = (a, b, c, d) -> {
+ ThrowingConsumer4<Integer,Integer,Integer,Integer> consumer = (a, b, c, d) -> {
sum.addAndGet(a + b + c + d);
};
@@ -106,8 +106,8 @@ class ThrowingConsumer4_Test extends TestBase {
var callCount1 = new AtomicInteger();
var callCount2 = new AtomicInteger();
- ThrowingConsumer4<String, Integer, Boolean, Double> consumer1 = (a, b, c, d) -> callCount1.incrementAndGet();
- ThrowingConsumer4<String, Integer, Boolean, Double> consumer2 = (a, b, c, d) -> callCount2.incrementAndGet();
+ ThrowingConsumer4<String,Integer,Boolean,Double> consumer1 = (a, b, c, d) -> callCount1.incrementAndGet();
+ ThrowingConsumer4<String,Integer,Boolean,Double> consumer2 = (a, b, c, d) -> callCount2.incrementAndGet();
var composed = consumer1.andThen(consumer2);
composed.apply("test", 42, true, 3.14);
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingConsumer5_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingConsumer5_Test.java
index e465bd7dd3..4b5da51a5b 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingConsumer5_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingConsumer5_Test.java
@@ -32,7 +32,7 @@ class ThrowingConsumer5_Test extends TestBase {
var callCount = new AtomicInteger();
var receivedValues = new Object[5];
- var consumer = (ThrowingConsumer5<String, Integer, Boolean, Double, Long>)(a, b, c, d, e) -> {
+ var consumer = (ThrowingConsumer5<String,Integer,Boolean,Double,Long>)(a, b, c, d, e) -> {
callCount.incrementAndGet();
receivedValues[0] = a;
receivedValues[1] = b;
@@ -54,7 +54,7 @@ class ThrowingConsumer5_Test extends TestBase {
// Exception handling tests.
//------------------------------------------------------------------------------------------------------------------
@Test void b01_throwsCheckedException() {
- var consumer = (ThrowingConsumer5<String, Integer, Boolean, Double, Long>)(a, b, c, d, e) -> {
+ var consumer = (ThrowingConsumer5<String,Integer,Boolean,Double,Long>)(a, b, c, d, e) -> {
throw new Exception("Test exception");
};
@@ -67,7 +67,7 @@ class ThrowingConsumer5_Test extends TestBase {
}
@Test void b02_throwsRuntimeException() {
- var consumer = (ThrowingConsumer5<String, Integer, Boolean, Double, Long>)(a, b, c, d, e) -> {
+ var consumer = (ThrowingConsumer5<String,Integer,Boolean,Double,Long>)(a, b, c, d, e) -> {
throw new RuntimeException("Test runtime exception");
};
@@ -85,7 +85,7 @@ class ThrowingConsumer5_Test extends TestBase {
@Test void c01_usedAsConsumer5() {
var callCount = new AtomicInteger();
- var consumer = (Consumer5<String, Integer, Boolean, Double, Long>)(a, b, c, d, e) -> {
+ var consumer = (Consumer5<String,Integer,Boolean,Double,Long>)(a, b, c, d, e) -> {
callCount.incrementAndGet();
};
@@ -96,7 +96,7 @@ class ThrowingConsumer5_Test extends TestBase {
@Test void c02_lambdaExpression() {
var sum = new AtomicInteger(0);
- ThrowingConsumer5<Integer, Integer, Integer, Integer, Integer> consumer = (a, b, c, d, e) -> {
+ ThrowingConsumer5<Integer,Integer,Integer,Integer,Integer> consumer = (a, b, c, d, e) -> {
sum.addAndGet(a + b + c + d + e);
};
@@ -108,8 +108,8 @@ class ThrowingConsumer5_Test extends TestBase {
var callCount1 = new AtomicInteger();
var callCount2 = new AtomicInteger();
- ThrowingConsumer5<String, Integer, Boolean, Double, Long> consumer1 = (a, b, c, d, e) -> callCount1.incrementAndGet();
- ThrowingConsumer5<String, Integer, Boolean, Double, Long> consumer2 = (a, b, c, d, e) -> callCount2.incrementAndGet();
+ ThrowingConsumer5<String,Integer,Boolean,Double,Long> consumer1 = (a, b, c, d, e) -> callCount1.incrementAndGet();
+ ThrowingConsumer5<String,Integer,Boolean,Double,Long> consumer2 = (a, b, c, d, e) -> callCount2.incrementAndGet();
var composed = consumer1.andThen(consumer2);
composed.apply("test", 42, true, 3.14, 100L);
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingFunction2_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingFunction2_Test.java
index 5f6b725d29..1baf18c9fd 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingFunction2_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingFunction2_Test.java
@@ -27,14 +27,14 @@ class ThrowingFunction2_Test extends TestBase {
// Basic tests.
//------------------------------------------------------------------------------------------------------------------
@Test void a01_basic() {
- var function = (ThrowingFunction2<String, Integer, String>)(a, b) -> a + "-" + b;
+ var function = (ThrowingFunction2<String,Integer,String>)(a, b) -> a + "-" + b;
assertEquals("test-42", function.apply("test", 42));
assertEquals("hello-0", function.apply("hello", 0));
}
@Test void a02_withNullValues() {
- var function = (ThrowingFunction2<String, Integer, String>)(a, b) -> {
+ var function = (ThrowingFunction2<String,Integer,String>)(a, b) -> {
String aStr = a == null ? "null" : a;
String bStr = b == null ? "null" : String.valueOf(b);
return aStr + "-" + bStr;
@@ -45,7 +45,7 @@ class ThrowingFunction2_Test extends TestBase {
}
@Test void a03_returnsNull() {
- var function = (ThrowingFunction2<String, Integer, String>)(a, b) -> null;
+ var function = (ThrowingFunction2<String,Integer,String>)(a, b) -> null;
assertNull(function.apply("test", 42));
}
@@ -54,7 +54,7 @@ class ThrowingFunction2_Test extends TestBase {
// Exception handling tests.
//------------------------------------------------------------------------------------------------------------------
@Test void b01_throwsCheckedException() {
- var function = (ThrowingFunction2<String, Integer, String>)(a, b) -> {
+ var function = (ThrowingFunction2<String,Integer,String>)(a, b) -> {
throw new Exception("Test exception");
};
@@ -67,7 +67,7 @@ class ThrowingFunction2_Test extends TestBase {
}
@Test void b02_throwsRuntimeException() {
- var function = (ThrowingFunction2<String, Integer, String>)(a, b) -> {
+ var function = (ThrowingFunction2<String,Integer,String>)(a, b) -> {
throw new RuntimeException("Test runtime exception");
};
@@ -80,7 +80,7 @@ class ThrowingFunction2_Test extends TestBase {
}
@Test void b03_throwsError() {
- var function = (ThrowingFunction2<String, Integer, String>)(a, b) -> {
+ var function = (ThrowingFunction2<String,Integer,String>)(a, b) -> {
throw new Error("Test error");
};
@@ -95,13 +95,13 @@ class ThrowingFunction2_Test extends TestBase {
// Functional interface tests.
//------------------------------------------------------------------------------------------------------------------
@Test void c01_usedAsFunction2() {
- var function = (Function2<String, Integer, String>)(a, b) -> a + "-" + b;
+ var function = (Function2<String,Integer,String>)(a, b) -> a + "-" + b;
assertEquals("test-42", function.apply("test", 42));
}
@Test void c02_lambdaExpression() {
- var function = (ThrowingFunction2<Integer, Integer, Integer>)(a, b) -> a + b;
+ var function = (ThrowingFunction2<Integer,Integer,Integer>)(a, b) -> a + b;
assertEquals(5, function.apply(2, 3));
assertEquals(0, function.apply(0, 0));
@@ -109,15 +109,15 @@ class ThrowingFunction2_Test extends TestBase {
}
@Test void c03_methodReference() {
- var function = (ThrowingFunction2<String, String, Boolean>)String::equals;
+ var function = (ThrowingFunction2<String,String,Boolean>)String::equals;
assertTrue(function.apply("test", "test"));
assertFalse(function.apply("test", "other"));
}
@Test void c04_andThen() {
- var add = (ThrowingFunction2<Integer, Integer, Integer>)(a, b) -> a + b;
- var toString = (java.util.function.Function<Integer, String>)Object::toString;
+ var add = (ThrowingFunction2<Integer,Integer,Integer>)(a, b) -> a + b;
+ var toString = (java.util.function.Function<Integer,String>)Object::toString;
var composed = add.andThen(toString);
assertEquals("5", composed.apply(2, 3));
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingFunction3_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingFunction3_Test.java
index 540eb9195c..69ce19511b 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingFunction3_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingFunction3_Test.java
@@ -27,7 +27,7 @@ class ThrowingFunction3_Test extends TestBase {
// Basic tests.
//------------------------------------------------------------------------------------------------------------------
@Test void a01_basic() {
- var function = (ThrowingFunction3<String, Integer, Boolean, String>)(a, b, c) -> {
+ var function = (ThrowingFunction3<String,Integer,Boolean,String>)(a, b, c) -> {
return a + "-" + b + "-" + (c ? "Y" : "N");
};
@@ -36,7 +36,7 @@ class ThrowingFunction3_Test extends TestBase {
}
@Test void a02_returnsNull() {
- ThrowingFunction3<String, Integer, Boolean, String> function = (a, b, c) -> null;
+ ThrowingFunction3<String,Integer,Boolean,String> function = (a, b, c) -> null;
assertNull(function.apply("test", 42, true));
}
@@ -45,7 +45,7 @@ class ThrowingFunction3_Test extends TestBase {
// Exception handling tests.
//------------------------------------------------------------------------------------------------------------------
@Test void b01_throwsCheckedException() {
- var function = (ThrowingFunction3<String, Integer, Boolean, String>)(a, b, c) -> {
+ var function = (ThrowingFunction3<String,Integer,Boolean,String>)(a, b, c) -> {
throw new Exception("Test exception");
};
@@ -58,7 +58,7 @@ class ThrowingFunction3_Test extends TestBase {
}
@Test void b02_throwsRuntimeException() {
- var function = (ThrowingFunction3<String, Integer, Boolean, String>)(a, b, c) -> {
+ var function = (ThrowingFunction3<String,Integer,Boolean,String>)(a, b, c) -> {
throw new RuntimeException("Test runtime exception");
};
@@ -74,21 +74,21 @@ class ThrowingFunction3_Test extends TestBase {
// Functional interface tests.
//------------------------------------------------------------------------------------------------------------------
@Test void c01_usedAsFunction3() {
- var function = (Function3<String, Integer, Boolean, String>)(a, b, c) -> a + "-" + b + "-" + c;
+ var function = (Function3<String,Integer,Boolean,String>)(a, b, c) -> a + "-" + b + "-" + c;
assertEquals("test-42-true", function.apply("test", 42, true));
}
@Test void c02_lambdaExpression() {
- ThrowingFunction3<Integer, Integer, Integer, Integer> function = (a, b, c) -> a + b + c;
+ ThrowingFunction3<Integer,Integer,Integer,Integer> function = (a, b, c) -> a + b + c;
assertEquals(6, function.apply(1, 2, 3));
assertEquals(0, function.apply(0, 0, 0));
}
@Test void c03_andThen() {
- var add = (ThrowingFunction3<Integer, Integer, Integer, Integer>)(a, b, c) -> a + b + c;
- var toString = (java.util.function.Function<Integer, String>)Object::toString;
+ var add = (ThrowingFunction3<Integer,Integer,Integer,Integer>)(a, b, c) -> a + b + c;
+ var toString = (java.util.function.Function<Integer,String>)Object::toString;
var composed = add.andThen(toString);
assertEquals("6", composed.apply(1, 2, 3));
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingFunction4_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingFunction4_Test.java
index 6a20e94647..a222ed8d46 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingFunction4_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingFunction4_Test.java
@@ -27,7 +27,7 @@ class ThrowingFunction4_Test extends TestBase {
// Basic tests.
//------------------------------------------------------------------------------------------------------------------
@Test void a01_basic() {
- var function = (ThrowingFunction4<String, Integer, Boolean, Double, String>)(a, b, c, d) -> {
+ var function = (ThrowingFunction4<String,Integer,Boolean,Double,String>)(a, b, c, d) -> {
return a + "-" + b + "-" + c + "-" + d;
};
@@ -35,7 +35,7 @@ class ThrowingFunction4_Test extends TestBase {
}
@Test void a02_returnsNull() {
- ThrowingFunction4<String, Integer, Boolean, Double, String> function = (a, b, c, d) -> null;
+ ThrowingFunction4<String,Integer,Boolean,Double,String> function = (a, b, c, d) -> null;
assertNull(function.apply("test", 42, true, 3.14));
}
@@ -44,7 +44,7 @@ class ThrowingFunction4_Test extends TestBase {
// Exception handling tests.
//------------------------------------------------------------------------------------------------------------------
@Test void b01_throwsCheckedException() {
- var function = (ThrowingFunction4<String, Integer, Boolean, Double, String>)(a, b, c, d) -> {
+ var function = (ThrowingFunction4<String,Integer,Boolean,Double,String>)(a, b, c, d) -> {
throw new Exception("Test exception");
};
@@ -57,7 +57,7 @@ class ThrowingFunction4_Test extends TestBase {
}
@Test void b02_throwsRuntimeException() {
- var function = (ThrowingFunction4<String, Integer, Boolean, Double, String>)(a, b, c, d) -> {
+ var function = (ThrowingFunction4<String,Integer,Boolean,Double,String>)(a, b, c, d) -> {
throw new RuntimeException("Test runtime exception");
};
@@ -73,20 +73,20 @@ class ThrowingFunction4_Test extends TestBase {
// Functional interface tests.
//------------------------------------------------------------------------------------------------------------------
@Test void c01_usedAsFunction4() {
- var function = (Function4<String, Integer, Boolean, Double, String>)(a, b, c, d) -> a + "-" + b;
+ var function = (Function4<String,Integer,Boolean,Double,String>)(a, b, c, d) -> a + "-" + b;
assertEquals("test-42", function.apply("test", 42, true, 3.14));
}
@Test void c02_lambdaExpression() {
- ThrowingFunction4<Integer, Integer, Integer, Integer, Integer> function = (a, b, c, d) -> a + b + c + d;
+ ThrowingFunction4<Integer,Integer,Integer,Integer,Integer> function = (a, b, c, d) -> a + b + c + d;
assertEquals(10, function.apply(1, 2, 3, 4));
}
@Test void c03_andThen() {
- var add = (ThrowingFunction4<Integer, Integer, Integer, Integer, Integer>)(a, b, c, d) -> a + b + c + d;
- var toString = (java.util.function.Function<Integer, String>)Object::toString;
+ var add = (ThrowingFunction4<Integer,Integer,Integer,Integer,Integer>)(a, b, c, d) -> a + b + c + d;
+ var toString = (java.util.function.Function<Integer,String>)Object::toString;
var composed = add.andThen(toString);
assertEquals("10", composed.apply(1, 2, 3, 4));
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingFunction5_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingFunction5_Test.java
index e027137557..7d52b7ba45 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingFunction5_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/function/ThrowingFunction5_Test.java
@@ -27,7 +27,7 @@ class ThrowingFunction5_Test extends TestBase {
// Basic tests.
//------------------------------------------------------------------------------------------------------------------
@Test void a01_basic() {
- var function = (ThrowingFunction5<String, Integer, Boolean, Double, Long, String>)(a, b, c, d, e) -> {
+ var function = (ThrowingFunction5<String,Integer,Boolean,Double,Long,String>)(a, b, c, d, e) -> {
return a + "-" + b + "-" + c + "-" + d + "-" + e;
};
@@ -35,7 +35,7 @@ class ThrowingFunction5_Test extends TestBase {
}
@Test void a02_returnsNull() {
- ThrowingFunction5<String, Integer, Boolean, Double, Long, String> function = (a, b, c, d, e) -> null;
+ ThrowingFunction5<String,Integer,Boolean,Double,Long,String> function = (a, b, c, d, e) -> null;
assertNull(function.apply("test", 42, true, 3.14, 100L));
}
@@ -44,7 +44,7 @@ class ThrowingFunction5_Test extends TestBase {
// Exception handling tests.
//------------------------------------------------------------------------------------------------------------------
@Test void b01_throwsCheckedException() {
- var function = (ThrowingFunction5<String, Integer, Boolean, Double, Long, String>)(a, b, c, d, e) -> {
+ var function = (ThrowingFunction5<String,Integer,Boolean,Double,Long,String>)(a, b, c, d, e) -> {
throw new Exception("Test exception");
};
@@ -57,7 +57,7 @@ class ThrowingFunction5_Test extends TestBase {
}
@Test void b02_throwsRuntimeException() {
- var function = (ThrowingFunction5<String, Integer, Boolean, Double, Long, String>)(a, b, c, d, e) -> {
+ var function = (ThrowingFunction5<String,Integer,Boolean,Double,Long,String>)(a, b, c, d, e) -> {
throw new RuntimeException("Test runtime exception");
};
@@ -73,20 +73,20 @@ class ThrowingFunction5_Test extends TestBase {
// Functional interface tests.
//------------------------------------------------------------------------------------------------------------------
@Test void c01_usedAsFunction5() {
- var function = (Function5<String, Integer, Boolean, Double, Long, String>)(a, b, c, d, e) -> a + "-" + b;
+ var function = (Function5<String,Integer,Boolean,Double,Long,String>)(a, b, c, d, e) -> a + "-" + b;
assertEquals("test-42", function.apply("test", 42, true, 3.14, 100L));
}
@Test void c02_lambdaExpression() {
- ThrowingFunction5<Integer, Integer, Integer, Integer, Integer, Integer> function = (a, b, c, d, e) -> a + b + c + d + e;
+ ThrowingFunction5<Integer,Integer,Integer,Integer,Integer,Integer> function = (a, b, c, d, e) -> a + b + c + d + e;
assertEquals(15, function.apply(1, 2, 3, 4, 5));
}
@Test void c03_andThen() {
- var add = (ThrowingFunction5<Integer, Integer, Integer, Integer, Integer, Integer>)(a, b, c, d, e) -> a + b + c + d + e;
- var toString = (java.util.function.Function<Integer, String>)Object::toString;
+ var add = (ThrowingFunction5<Integer,Integer,Integer,Integer,Integer,Integer>)(a, b, c, d, e) -> a + b + c + d + e;
+ var toString = (java.util.function.Function<Integer,String>)Object::toString;
var composed = add.andThen(toString);
assertEquals("15", composed.apply(1, 2, 3, 4, 5));
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/inject/BasicBeanStore_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/inject/BasicBeanStore_Test.java
index 6383f02a33..063170341a 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/inject/BasicBeanStore_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/inject/BasicBeanStore_Test.java
@@ -1247,7 +1247,7 @@ class BasicBeanStore_Test extends TestBase {
@Override public boolean hasBean(Class<?> t, String n) { return false; }
@Override public <T> Optional<T> getBean(Class<T> t) { return oe(); }
@Override public <T> Optional<T> getBean(Class<T> t, String n) { return oe(); }
- @Override public <T> Map<String, T> getBeansOfType(Class<T> t) { return Map.of(); }
+ @Override public <T> Map<String,T> getBeansOfType(Class<T> t) { return Map.of(); }
};
var store = new BasicBeanStore(null, overriding);
var s = store.toString();
@@ -1280,7 +1280,7 @@ class BasicBeanStore_Test extends TestBase {
@Override public boolean hasBean(Class<?> t, String n) { return delegate.hasBean(t, n); }
@Override public <T> Optional<T> getBean(Class<T> t) { return delegate.getBean(t); }
@Override public <T> Optional<T> getBean(Class<T> t, String n) { return delegate.getBean(t, n); }
- @Override public <T> Map<String, T> getBeansOfType(Class<T> t) { return delegate.getBeansOfType(t); }
+ @Override public <T> Map<String,T> getBeansOfType(Class<T> t) { return delegate.getBeansOfType(t); }
@Override public WritableBeanStore registerConfiguration(Class<?> c) { return delegate.registerConfiguration(c); }
@Override public Snapshot pushOverlay(BeanStore overlay) { return delegate.pushOverlay(overlay); }
@Override public void popOverlay(Snapshot snapshot) { delegate.popOverlay(snapshot); }
@@ -1436,7 +1436,7 @@ class BasicBeanStore_Test extends TestBase {
@Override public boolean hasBean(Class<?> t, String n) { return delegate.hasBean(t, n); }
@Override public <T> Optional<T> getBean(Class<T> t) { return delegate.getBean(t); }
@Override public <T> Optional<T> getBean(Class<T> t, String n) { return delegate.getBean(t, n); }
- @Override public <T> Map<String, T> getBeansOfType(Class<T> t) { return delegate.getBeansOfType(t); }
+ @Override public <T> Map<String,T> getBeansOfType(Class<T> t) { return delegate.getBeansOfType(t); }
}
@Test
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/inject/BeanInstantiator_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/inject/BeanInstantiator_Test.java
index c56e213ea4..b8369fd248 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/inject/BeanInstantiator_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/inject/BeanInstantiator_Test.java
@@ -453,13 +453,13 @@ class BeanInstantiator_Test extends TestBase {
// Bean with Map parameter for named beans
public static class A07_BeanWithMap {
- private final Map<String, TestService> services;
+ private final Map<String,TestService> services;
- public A07_BeanWithMap(Map<String, TestService> services) {
+ public A07_BeanWithMap(Map<String,TestService> services) {
this.services = services;
}
- public Map<String, TestService> getServices() { return services; }
+ public Map<String,TestService> getServices() { return services; }
}
/**
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/lang/HashCode_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/lang/HashCode_Test.java
index f58c9e94c8..33e9835f32 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/lang/HashCode_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/lang/HashCode_Test.java
@@ -334,7 +334,7 @@ class HashCode_Test extends TestBase {
@Test
void g03_addObject_map() {
- var map = new HashMap<String, String>();
+ var map = new HashMap<String,String>();
map.put("key", "value");
var hc = HashCode.create();
hc.add(map);
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/lang/Holder_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/lang/Holder_Test.java
index 521d2fcc99..c7c4cca353 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/lang/Holder_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/lang/Holder_Test.java
@@ -378,7 +378,7 @@ class Holder_Test extends TestBase {
@Test
void g06_hashCode_useInHashMap() {
- var map = new java.util.HashMap<Holder<String>, String>();
+ var map = new java.util.HashMap<Holder<String>,String>();
var key1 = Holder.of("key");
var key2 = Holder.of("key");
map.put(key1, "value");
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ConstructorInfo_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ConstructorInfo_Test.java
index f7776ad2aa..b629b00e43 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ConstructorInfo_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ConstructorInfo_Test.java
@@ -765,7 +765,7 @@ class ConstructorInfo_Test extends TestBase {
assertEquals(ci1a, ci1c);
// HashMap usage - same constructor should map to same value
- Map<ConstructorInfo, String> map = new HashMap<>();
+ Map<ConstructorInfo,String> map = new HashMap<>();
map.put(ci1a, "value1");
assertEquals("value1", map.get(ci1b));
assertEquals("value1", map.get(ci1c));
@@ -843,7 +843,7 @@ class ConstructorInfo_Test extends TestBase {
}
public static class TestClass7 {
- public TestClass7(Map<String, TestService> services) {
+ public TestClass7(Map<String,TestService> services) {
// Map parameter
}
}
@@ -1101,7 +1101,7 @@ class ConstructorInfo_Test extends TestBase {
var params = constructor.resolveParameters(beanStore, null);
assertEquals(1, params.length);
assertTrue(params[0] instanceof Map);
- var map = (Map<String, TestService>) params[0];
+ var map = (Map<String,TestService>) params[0];
assertEquals(2, map.size());
assertSame(service1, map.get("service1"));
assertSame(service2, map.get("service2"));
@@ -1117,7 +1117,7 @@ class ConstructorInfo_Test extends TestBase {
var params = constructor.resolveParameters(beanStore, null);
assertEquals(1, params.length);
assertTrue(params[0] instanceof Map);
- var map = (Map<String, TestService>) params[0];
+ var map = (Map<String,TestService>) params[0];
assertEquals(2, map.size());
assertSame(service1, map.get("")); // Unnamed beans use empty string as key
assertSame(service2, map.get("service2"));
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/FieldInfo_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/FieldInfo_Test.java
index dce4e65e10..b76d092f3e 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/FieldInfo_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/FieldInfo_Test.java
@@ -759,7 +759,7 @@ class FieldInfo_Test extends TestBase {
public volatile boolean volatileField;
public transient Object transientField;
private List<String> genericField;
- private Map<String, Integer> mapField;
+ private Map<String,Integer> mapField;
public int[] arrayField;
public String[][] matrixField;
public List<String>[] genericArrayField;
@@ -805,7 +805,7 @@ class FieldInfo_Test extends TestBase {
assertEquals(fi1a, fi1c);
// HashMap usage - same field should map to same value
- Map<FieldInfo, String> map = new HashMap<>();
+ Map<FieldInfo,String> map = new HashMap<>();
map.put(fi1a, "value1");
assertEquals("value1", map.get(fi1b));
assertEquals("value1", map.get(fi1c));
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/MethodInfo_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/MethodInfo_Test.java
index 8467807bdc..a72a4cb52b 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/MethodInfo_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/MethodInfo_Test.java
@@ -890,7 +890,7 @@ class MethodInfo_Test extends TestBase {
assertEquals(mi1a, mi1c);
// HashMap usage - same method should map to same value
- Map<MethodInfo, String> map = new HashMap<>();
+ Map<MethodInfo,String> map = new HashMap<>();
map.put(mi1a, "value1");
assertEquals("value1", map.get(mi1b));
assertEquals("value1", map.get(mi1c));
@@ -930,7 +930,7 @@ class MethodInfo_Test extends TestBase {
public void method4(TestService[] services) {}
public void method5(List<TestService> services) {}
public void method6(Set<TestService> services) {}
- public void method7(Map<String, TestService> services) {}
+ public void method7(Map<String,TestService> services) {}
public static void staticMethod(TestService service) {}
}
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ParameterInfo_Resolution_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ParameterInfo_Resolution_Test.java
index a2317ec1cf..c5286756c9 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ParameterInfo_Resolution_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ParameterInfo_Resolution_Test.java
@@ -66,7 +66,7 @@ class ParameterInfo_Resolution_Test extends TestBase {
}
public static class MapBeanHolder {
- public MapBeanHolder(Map<String, MyService> svcs) {}
+ public MapBeanHolder(Map<String,MyService> svcs) {}
}
public static class ArrayBeanHolder {
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ParameterInfo_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ParameterInfo_Test.java
index e632affe37..966e6a5c76 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ParameterInfo_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ParameterInfo_Test.java
@@ -284,7 +284,7 @@ class ParameterInfo_Test extends TestBase {
public void basicMethod(int a, String b) {}
public void namedMethod(@Name("x") int x, @Name("y") String y) {}
public void finalMethod(final int value) {}
- public void genericMethod(@Name("list") List<String> list, @Name("map") Map<String, Integer> map) {}
+ public void genericMethod(@Name("list") List<String> list, @Name("map") Map<String,Integer> map) {}
public void varargsMethod(@Name("values") String... values) {}
public void finalVarargsMethod(final @Name("args") String... args) {}
public void arrayMethod(@Name("numbers") int[] numbers, @Name("matrix") String[][] matrix) {}
@@ -998,7 +998,7 @@ class ParameterInfo_Test extends TestBase {
assertEquals(pi1a, pi1c);
// HashMap usage - same parameter should map to same value
- Map<ParameterInfo, String> map = new HashMap<>();
+ Map<ParameterInfo,String> map = new HashMap<>();
map.put(pi1a, "value1");
assertEquals("value1", map.get(pi1b));
assertEquals("value1", map.get(pi1c));
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/Property_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/Property_Test.java
index 25903068ee..14d1b584eb 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/Property_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/Property_Test.java
@@ -67,7 +67,7 @@ class Property_Test extends TestBase {
//====================================================================================================
@Test
void a002_functionGetterAndSetter() {
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.getter(TestClass::getPublicField)
.setter(TestClass::setPublicField)
.build();
@@ -83,7 +83,7 @@ class Property_Test extends TestBase {
//====================================================================================================
@Test
void a003_getterOnly() {
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.getter(TestClass::getPublicField)
.build();
@@ -99,7 +99,7 @@ class Property_Test extends TestBase {
//====================================================================================================
@Test
void a004_setterOnly() {
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.setter(TestClass::setPublicField)
.build();
@@ -115,7 +115,7 @@ class Property_Test extends TestBase {
//====================================================================================================
@Test
void a005_get_withNullProducer() {
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.setter(TestClass::setPublicField)
.build();
@@ -129,7 +129,7 @@ class Property_Test extends TestBase {
//====================================================================================================
@Test
void a006_set_withNullConsumer() {
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.getter(TestClass::getPublicField)
.build();
@@ -143,7 +143,7 @@ class Property_Test extends TestBase {
//====================================================================================================
@Test
void a007_get_withNullObject() {
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.getter(TestClass::getPublicField)
.build();
@@ -155,7 +155,7 @@ class Property_Test extends TestBase {
//====================================================================================================
@Test
void a008_set_withNullObject() {
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.setter(TestClass::setPublicField)
.build();
@@ -171,7 +171,7 @@ class Property_Test extends TestBase {
.filter(f -> f.getName().equals("publicField"))
.findFirst()
.orElseThrow();
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.field(field)
.build();
@@ -190,7 +190,7 @@ class Property_Test extends TestBase {
.filter(f -> f.getName().equals("privateField"))
.findFirst()
.orElseThrow();
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.field(field)
.build();
@@ -205,7 +205,7 @@ class Property_Test extends TestBase {
//====================================================================================================
@Test
void a011_field_withNullField() {
- var builder = Property.<TestClass, String>create();
+ var builder = Property.<TestClass,String>create();
assertThrows(IllegalArgumentException.class, () -> builder.field(null));
}
@@ -218,7 +218,7 @@ class Property_Test extends TestBase {
.filter(m -> m.hasName("getPublicField"))
.findFirst()
.orElseThrow();
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.getter(getter)
.setter(TestClass::setPublicField)
.build();
@@ -237,7 +237,7 @@ class Property_Test extends TestBase {
.filter(m -> m.hasName("setPublicField") && m.hasParameterTypes(String.class))
.findFirst()
.orElseThrow();
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.getter(TestClass::getPublicField)
.setter(setter)
.build();
@@ -252,7 +252,7 @@ class Property_Test extends TestBase {
//====================================================================================================
@Test
void a014_getter_withNullMethod() {
- var builder = Property.<TestClass, String>create();
+ var builder = Property.<TestClass,String>create();
assertThrows(IllegalArgumentException.class, () -> builder.getter((MethodInfo)null));
}
@@ -261,7 +261,7 @@ class Property_Test extends TestBase {
//====================================================================================================
@Test
void a015_setter_withNullMethod() {
- var builder = Property.<TestClass, String>create();
+ var builder = Property.<TestClass,String>create();
assertThrows(IllegalArgumentException.class, () -> builder.setter((MethodInfo)null));
}
@@ -274,7 +274,7 @@ class Property_Test extends TestBase {
.filter(f -> f.getName().equals("intField"))
.findFirst()
.orElseThrow();
- var prop = Property.<TestClass, Integer>create()
+ var prop = Property.<TestClass,Integer>create()
.field(field)
.build();
@@ -289,7 +289,7 @@ class Property_Test extends TestBase {
//====================================================================================================
@Test
void a017_set_withNullValue() {
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.getter(TestClass::getPublicField)
.setter(TestClass::setPublicField)
.build();
@@ -306,7 +306,7 @@ class Property_Test extends TestBase {
//====================================================================================================
@Test
void a018_get_exceptionHandling() {
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.getter(obj -> {
throw new RuntimeException("Test exception");
})
@@ -322,7 +322,7 @@ class Property_Test extends TestBase {
//====================================================================================================
@Test
void a019_set_exceptionHandling() {
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.setter((obj, val) -> {
throw new RuntimeException("Test exception");
})
@@ -339,7 +339,7 @@ class Property_Test extends TestBase {
@Test
void a020_get_executableExceptionPassThrough() {
var originalEx = new ExecutableException("Original exception");
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.getter(obj -> {
throw originalEx;
})
@@ -356,7 +356,7 @@ class Property_Test extends TestBase {
@Test
void a021_set_executableExceptionPassThrough() {
var originalEx = new ExecutableException("Original exception");
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.setter((obj, val) -> {
throw originalEx;
})
@@ -372,7 +372,7 @@ class Property_Test extends TestBase {
//====================================================================================================
@Test
void a022_get_checkedExceptionWrapping() {
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.getter(obj -> {
throw new java.io.IOException("IO error");
})
@@ -390,7 +390,7 @@ class Property_Test extends TestBase {
//====================================================================================================
@Test
void a023_set_checkedExceptionWrapping() {
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.setter((obj, val) -> {
throw new java.io.IOException("IO error");
})
@@ -408,7 +408,7 @@ class Property_Test extends TestBase {
//====================================================================================================
@Test
void a024_builder_chaining() {
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.getter(TestClass::getPublicField)
.setter(TestClass::setPublicField)
.build();
@@ -427,7 +427,7 @@ class Property_Test extends TestBase {
.filter(f -> f.getName().equals("publicField"))
.findFirst()
.orElseThrow();
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.field(field)
.build();
@@ -453,7 +453,7 @@ class Property_Test extends TestBase {
.filter(m -> m.hasName("setPublicField") && m.hasParameterTypes(String.class))
.findFirst()
.orElseThrow();
- var prop = Property.<TestClass, String>create()
+ var prop = Property.<TestClass,String>create()
.getter(getter)
.setter(setter)
.build();
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ReflectionMap_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ReflectionMap_Test.java
index aa8526cb93..ed5326bff0 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ReflectionMap_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ReflectionMap_Test.java
@@ -293,7 +293,7 @@ class ReflectionMap_Test extends TestBase {
static class B2a {
public void m1(List x) { /* no-op */ }
public void m2(List<String> x) { /* no-op */ }
- public void m3(Map<String, Integer> x) { /* no-op */ }
+ public void m3(Map<String,Integer> x) { /* no-op */ }
public void m4(List<List<String>> x) { /* no-op */ }
public void m5(Map x, List y) { /* no-op */ }
}
@@ -352,7 +352,7 @@ class ReflectionMap_Test extends TestBase {
// Test for generic arrays - combining generics and arrays
static class B4 {
public void m1(List<String>[] x) { /* no-op */ }
- public void m2(Map<String, Integer>[][] x) { /* no-op */ }
+ public void m2(Map<String,Integer>[][] x) { /* no-op */ }
}
@Test void a05_genericArrays() throws NoSuchMethodException, SecurityException {
@@ -552,9 +552,9 @@ class ReflectionMap_Test extends TestBase {
// Test for generic parameters with commas in constructor signatures
static class D3 {
- public D3(Map<String, Integer> x) { /* no-op */ }
- public D3(Map<String, Integer> x, List<String> y) { /* no-op */ }
- public D3(Map<String, Integer>[] x) { /* no-op */ }
+ public D3(Map<String,Integer> x) { /* no-op */ }
+ public D3(Map<String,Integer> x, List<String> y) { /* no-op */ }
+ public D3(Map<String,Integer>[] x) { /* no-op */ }
}
@Test void a03_generics() throws NoSuchMethodException, SecurityException {
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ThrowingSupplier_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ThrowingSupplier_Test.java
index a516f11a57..ca0ad6920d 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ThrowingSupplier_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/reflect/ThrowingSupplier_Test.java
@@ -226,8 +226,8 @@ class ThrowingSupplier_Test extends TestBase {
@Test
void d04_successfulComplexOperation() {
// Simulate successful complex operation
- ThrowingSupplier<Map<String, Object>> complexOperation = () -> {
- var result = new HashMap<String, Object>();
+ ThrowingSupplier<Map<String,Object>> complexOperation = () -> {
+ var result = new HashMap<String,Object>();
result.put("status", "success");
result.put("data", l("item1", "item2", "item3"));
result.put("timestamp", System.currentTimeMillis());
@@ -394,8 +394,8 @@ class ThrowingSupplier_Test extends TestBase {
@Test
void g04_mapTypeSupplier() throws Exception {
- ThrowingSupplier<Map<String, Integer>> mapSupplier = () -> {
- var map = new HashMap<String, Integer>();
+ ThrowingSupplier<Map<String,Integer>> mapSupplier = () -> {
+ var map = new HashMap<String,Integer>();
map.put("key1", 1);
map.put("key2", 2);
return map;
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/settings/Settings_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/settings/Settings_Test.java
index 0d0e989a2f..1b6de1a7d1 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/settings/Settings_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/settings/Settings_Test.java
@@ -763,7 +763,7 @@ class Settings_Test extends TestBase {
@Test
void q03_writeableFunctionalPropertySource_clear() {
// Test clear() functionality with a custom clearer
- var map = new java.util.HashMap<String, String>();
+ var map = new java.util.HashMap<String,String>();
var source = FunctionalPropertyStore.of(
map::get,
map::put,
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/svl/functions/MiniJson_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/svl/functions/MiniJson_Test.java
index 1bf5b70aa4..f2ca4ae500 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/svl/functions/MiniJson_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/svl/functions/MiniJson_Test.java
@@ -182,7 +182,7 @@ class MiniJson_Test extends TestBase {
"unchecked" // Unchecked cast required for generic test utility.
})
@Test void d03_parse_simpleObject() {
- var m = (Map<String, Object>) MiniJson.parse("{\"a\":1}");
+ var m = (Map<String,Object>) MiniJson.parse("{\"a\":1}");
assertEquals(1L, m.get("a"));
assertEquals(1, m.size());
}
@@ -191,7 +191,7 @@ class MiniJson_Test extends TestBase {
"unchecked" // Unchecked cast required for generic test utility.
})
@Test void d04_parse_multipleEntries() {
- var m = (Map<String, Object>) MiniJson.parse("{\"a\":1,\"b\":2,\"c\":3}");
+ var m = (Map<String,Object>) MiniJson.parse("{\"a\":1,\"b\":2,\"c\":3}");
assertEquals(3, m.size());
assertEquals(1L, m.get("a"));
assertEquals(2L, m.get("b"));
@@ -202,8 +202,8 @@ class MiniJson_Test extends TestBase {
"unchecked" // Unchecked cast required for generic test utility.
})
@Test void d05_parse_nestedObject() {
- var m = (Map<String, Object>) MiniJson.parse("{\"a\":{\"b\":\"c\"}}");
- var inner = (Map<String, Object>) m.get("a");
+ var m = (Map<String,Object>) MiniJson.parse("{\"a\":{\"b\":\"c\"}}");
+ var inner = (Map<String,Object>) m.get("a");
assertEquals("c", inner.get("b"));
}
@@ -219,7 +219,7 @@ class MiniJson_Test extends TestBase {
@SuppressWarnings({
"unchecked" // Unchecked cast required for generic test utility.
})
- var m = (Map<String, Object>) MiniJson.parse("{\"z\":1,\"a\":2,\"m\":3}");
+ var m = (Map<String,Object>) MiniJson.parse("{\"z\":1,\"a\":2,\"m\":3}");
assertEquals(List.of("z", "a", "m"), new ArrayList<>(m.keySet()));
}
@@ -325,7 +325,7 @@ class MiniJson_Test extends TestBase {
//-----------------------------------------------------------------------------------------------------------------
@Test void h01_render_emptyMap() {
- assertEquals("{}", MiniJson.render(new LinkedHashMap<String, Object>()));
+ assertEquals("{}", MiniJson.render(new LinkedHashMap<String,Object>()));
}
static Stream<Arguments> h02_render_singleEntryMapCases() {
@@ -339,28 +339,28 @@ class MiniJson_Test extends TestBase {
@ParameterizedTest
@MethodSource("h02_render_singleEntryMapCases")
void h02_render_singleEntryMap(Object value, String expected) {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("a", value);
assertEquals(expected, MiniJson.render(m));
}
@Test void h03_render_mapMultipleEntries() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("a", 1L);
m.put("b", "two");
assertEquals("{\"a\":1,\"b\":\"two\"}", MiniJson.render(m));
}
@Test void h05_render_mapWithNestedMap() {
- var inner = new LinkedHashMap<String, Object>();
+ var inner = new LinkedHashMap<String,Object>();
inner.put("b", "c");
- var outer = new LinkedHashMap<String, Object>();
+ var outer = new LinkedHashMap<String,Object>();
outer.put("a", inner);
assertEquals("{\"a\":{\"b\":\"c\"}}", MiniJson.render(outer));
}
@Test void h07_render_mapWithBooleanAndNumber() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("flag", Boolean.TRUE);
m.put("count", 5L);
assertEquals("{\"flag\":true,\"count\":5}", MiniJson.render(m));
@@ -395,7 +395,7 @@ class MiniJson_Test extends TestBase {
}
@Test void i06_render_listOfMaps() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("k", "v");
assertEquals("[{\"k\":\"v\"}]", MiniJson.render(List.of(m)));
}
@@ -424,14 +424,14 @@ class MiniJson_Test extends TestBase {
//-----------------------------------------------------------------------------------------------------------------
@Test void k01_render_mapKeyWithQuote() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("a\"b", 1L);
// appendString escapes " and \
assertEquals("{\"a\\\"b\":1}", MiniJson.render(m));
}
@Test void k02_render_mapKeyWithBackslash() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("a\\b", 1L);
assertEquals("{\"a\\\\b\":1}", MiniJson.render(m));
}
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/utils/CollectionUtils_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/utils/CollectionUtils_Test.java
index ef579c4d9f..9bdd1fc9b8 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/utils/CollectionUtils_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/utils/CollectionUtils_Test.java
@@ -438,15 +438,15 @@ class CollectionUtils_Test extends TestBase {
//====================================================================================================
@Test
void a023_copyOf_map() {
- Map<String, Integer> map = map("a", 1, "b", 2);
- Map<String, Integer> result = copyOf(map);
+ Map<String,Integer> map = map("a", 1, "b", 2);
+ Map<String,Integer> result = copyOf(map);
assertNotNull(result);
assertEquals(2, result.size());
assertEquals(1, result.get("a"));
assertEquals(2, result.get("b"));
assertNotSame(map, result);
- assertNull(copyOf((Map<String, Integer>)null));
+ assertNull(copyOf((Map<String,Integer>)null));
}
//====================================================================================================
@@ -454,8 +454,8 @@ class CollectionUtils_Test extends TestBase {
//====================================================================================================
@Test
void a024_copyOf_mapFunction() {
- Map<String, Integer> map = map("a", 1, "b", 2);
- Map<String, Integer> result = copyOf(map, v -> v * 2);
+ Map<String,Integer> map = map("a", 1, "b", 2);
+ Map<String,Integer> result = copyOf(map, v -> v * 2);
assertNotNull(result);
assertEquals(2, result.size());
assertEquals(2, result.get("a"));
@@ -467,14 +467,14 @@ class CollectionUtils_Test extends TestBase {
//====================================================================================================
@Test
void a025_copyOf_mapFunctionSupplier() {
- Map<String, Integer> map = map("a", 1);
- Map<String, Integer> result = copyOf(map, v -> v, TreeMap::new);
+ Map<String,Integer> map = map("a", 1);
+ Map<String,Integer> result = copyOf(map, v -> v, TreeMap::new);
assertNotNull(result);
assertTrue(result instanceof TreeMap);
assertEquals(1, result.size());
// Test line 647: null map returns null
- assertNull(copyOf((Map<String, Integer>)null, v -> v, TreeMap::new));
+ assertNull(copyOf((Map<String,Integer>)null, v -> v, TreeMap::new));
}
//====================================================================================================
@@ -777,59 +777,59 @@ class CollectionUtils_Test extends TestBase {
@Test
void a051_m() {
// Empty
- Map<String, Integer> empty = immutableMap();
+ Map<String,Integer> empty = immutableMap();
assertNotNull(empty);
assertTrue(empty.isEmpty());
assertThrows(UnsupportedOperationException.class, () -> empty.put("x", 1));
// 1 pair
- Map<String, Integer> m1 = immutableMap("a", 1);
+ Map<String,Integer> m1 = immutableMap("a", 1);
assertEquals(1, m1.size());
assertEquals(1, m1.get("a"));
// 2 pairs
- Map<String, Integer> m2 = immutableMap("a", 1, "b", 2);
+ Map<String,Integer> m2 = immutableMap("a", 1, "b", 2);
assertEquals(2, m2.size());
assertEquals(1, m2.get("a"));
assertEquals(2, m2.get("b"));
// 3 pairs
- Map<String, Integer> m3 = immutableMap("a", 1, "b", 2, "c", 3);
+ Map<String,Integer> m3 = immutableMap("a", 1, "b", 2, "c", 3);
assertEquals(3, m3.size());
// 4 pairs
- Map<String, Integer> m4 = immutableMap("a", 1, "b", 2, "c", 3, "d", 4);
+ Map<String,Integer> m4 = immutableMap("a", 1, "b", 2, "c", 3, "d", 4);
assertEquals(4, m4.size());
// 5 pairs
- Map<String, Integer> m5 = immutableMap("a", 1, "b", 2, "c", 3, "d", 4, "e", 5);
+ Map<String,Integer> m5 = immutableMap("a", 1, "b", 2, "c", 3, "d", 4, "e", 5);
assertEquals(5, m5.size());
// 6 pairs
- Map<String, Integer> m6 = immutableMap("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6);
+ Map<String,Integer> m6 = immutableMap("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6);
assertEquals(6, m6.size());
// 7 pairs
- Map<String, Integer> m7 = immutableMap("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7);
+ Map<String,Integer> m7 = immutableMap("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7);
assertEquals(7, m7.size());
// 8 pairs
- Map<String, Integer> m8 = immutableMap("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7, "h", 8);
+ Map<String,Integer> m8 = immutableMap("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7, "h", 8);
assertEquals(8, m8.size());
// 9 pairs
- Map<String, Integer> m9 = immutableMap("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7, "h", 8, "i", 9);
+ Map<String,Integer> m9 = immutableMap("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7, "h", 8, "i", 9);
assertEquals(9, m9.size());
// 10 pairs
- Map<String, Integer> m10 = immutableMap("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7, "h", 8, "i", 9, "j", 10);
+ Map<String,Integer> m10 = immutableMap("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7, "h", 8, "i", 9, "j", 10);
assertEquals(10, m10.size());
// Null handling
- Map<String, Integer> nullKey = immutableMap(null, 1);
+ Map<String,Integer> nullKey = immutableMap(null, 1);
assertEquals(1, nullKey.get(null));
- Map<String, Integer> nullValue = immutableMap("a", null);
+ Map<String,Integer> nullValue = immutableMap("a", null);
assertNull(nullValue.get("a"));
assertTrue(nullValue.containsKey("a"));
@@ -839,7 +839,7 @@ class CollectionUtils_Test extends TestBase {
});
// Insertion order preservation
- Map<String, Integer> ordered = immutableMap("z", 1, "a", 2, "m", 3, "b", 4);
+ Map<String,Integer> ordered = immutableMap("z", 1, "a", 2, "m", 3, "b", 4);
var keys = new ArrayList<>(ordered.keySet());
assertEquals(list("z", "a", "m", "b"), keys);
@@ -855,61 +855,61 @@ class CollectionUtils_Test extends TestBase {
@Test
void a052_map() {
// Empty
- Map<String, Integer> empty = map();
+ Map<String,Integer> empty = map();
assertNotNull(empty);
assertTrue(empty.isEmpty());
empty.put("x", 1); // Modifiable
assertEquals(1, empty.size());
// 1 pair
- Map<String, Integer> m1 = map("a", 1);
+ Map<String,Integer> m1 = map("a", 1);
assertEquals(1, m1.size());
assertEquals(1, m1.get("a"));
// 2 pairs
- Map<String, Integer> m2 = map("a", 1, "b", 2);
+ Map<String,Integer> m2 = map("a", 1, "b", 2);
assertEquals(2, m2.size());
// 3 pairs
- Map<String, Integer> m3 = map("a", 1, "b", 2, "c", 3);
+ Map<String,Integer> m3 = map("a", 1, "b", 2, "c", 3);
assertEquals(3, m3.size());
// 4 pairs
- Map<String, Integer> m4 = map("a", 1, "b", 2, "c", 3, "d", 4);
+ Map<String,Integer> m4 = map("a", 1, "b", 2, "c", 3, "d", 4);
assertEquals(4, m4.size());
var keys = new ArrayList<>(m4.keySet());
assertEquals(fixedSizeList("a", "b", "c", "d"), keys);
// 5 pairs
- Map<String, Integer> m5 = map("a", 1, "b", 2, "c", 3, "d", 4, "e", 5);
+ Map<String,Integer> m5 = map("a", 1, "b", 2, "c", 3, "d", 4, "e", 5);
assertEquals(5, m5.size());
// 6 pairs
- Map<String, Integer> m6 = map("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6);
+ Map<String,Integer> m6 = map("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6);
assertEquals(6, m6.size());
// 7 pairs - test lines 1400-1408
- Map<String, Integer> m7 = map("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7);
+ Map<String,Integer> m7 = map("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7);
assertEquals(7, m7.size());
assertEquals(7, m7.get("g"));
// 8 pairs - test lines 1435-1444
- Map<String, Integer> m8 = map("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7, "h", 8);
+ Map<String,Integer> m8 = map("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7, "h", 8);
assertEquals(8, m8.size());
assertEquals(8, m8.get("h"));
// 9 pairs - test lines 1473-1483
- Map<String, Integer> m9 = map("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7, "h", 8, "i", 9);
+ Map<String,Integer> m9 = map("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7, "h", 8, "i", 9);
assertEquals(9, m9.size());
assertEquals(9, m9.get("i"));
// 10 pairs
- Map<String, Integer> m10 = map("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7, "h", 8, "i", 9, "j", 10);
+ Map<String,Integer> m10 = map("a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7, "h", 8, "i", 9, "j", 10);
assertEquals(10, m10.size());
assertEquals(fixedSizeList("a", "b", "c", "d", "e", "f", "g", "h", "i", "j"), new ArrayList<>(m10.keySet()));
// Null values
- Map<String, String> nullVals = map("a", "val1", "b", null, "c", "val3", "d", null);
+ Map<String,String> nullVals = map("a", "val1", "b", null, "c", "val3", "d", null);
assertEquals(4, nullVals.size());
assertNull(nullVals.get("b"));
}
@@ -919,9 +919,9 @@ class CollectionUtils_Test extends TestBase {
//====================================================================================================
@Test
void a053_mapBuilder() {
- Maps<String, Object> builder = mapBuilder();
+ Maps<String,Object> builder = mapBuilder();
assertNotNull(builder);
- Map<String, Object> result = builder.add("a", 1).add("b", 2).build();
+ Map<String,Object> result = builder.add("a", 1).add("b", 2).build();
assertEquals(2, result.size());
assertEquals(1, result.get("a"));
assertEquals(2, result.get("b"));
@@ -932,9 +932,9 @@ class CollectionUtils_Test extends TestBase {
//====================================================================================================
@Test
void a054_mapb_class() {
- Maps<String, Integer> builder = mapBuilder(String.class, Integer.class);
+ Maps<String,Integer> builder = mapBuilder(String.class, Integer.class);
assertNotNull(builder);
- Map<String, Integer> result = builder.add("a", 1).build();
+ Map<String,Integer> result = builder.add("a", 1).build();
assertEquals(1, result.size());
}
@@ -951,7 +951,7 @@ class CollectionUtils_Test extends TestBase {
//====================================================================================================
@Test
void a057_mapOfType() {
- Map<String, Integer> result = mapOfType(String.class, Integer.class);
+ Map<String,Integer> result = mapOfType(String.class, Integer.class);
assertNotNull(result);
assertTrue(result.isEmpty());
result.put("a", 1); // Modifiable
@@ -1121,7 +1121,7 @@ class CollectionUtils_Test extends TestBase {
//====================================================================================================
@Test
void a070_sortedMap() {
- SortedMap<String, Integer> result = sortedMap();
+ SortedMap<String,Integer> result = sortedMap();
assertNotNull(result);
assertTrue(result.isEmpty());
result.put("a", 1);
@@ -1183,12 +1183,12 @@ class CollectionUtils_Test extends TestBase {
//====================================================================================================
@Test
void a074_synced_map() {
- Map<String, Integer> map = map("a", 1);
- Map<String, Integer> result = synced(map);
+ Map<String,Integer> map = map("a", 1);
+ Map<String,Integer> result = synced(map);
assertNotNull(result);
assertEquals(1, result.size());
assertEquals(1, result.get("a"));
- assertNull(synced((Map<String, Integer>)null));
+ assertNull(synced((Map<String,Integer>)null));
}
//====================================================================================================
@@ -1287,7 +1287,7 @@ class CollectionUtils_Test extends TestBase {
assertEquals("x", result4.get(0));
// Map
- Map<String, Integer> map = map("a", 1, "b", 2);
+ Map<String,Integer> map = map("a", 1, "b", 2);
List<?> result5 = toList(map);
assertEquals(2, result5.size());
@@ -1507,11 +1507,11 @@ class CollectionUtils_Test extends TestBase {
//====================================================================================================
@Test
void a090_u_map() {
- Map<String, Integer> map = map("a", 1);
- Map<String, Integer> result = unmodifiable(map);
+ Map<String,Integer> map = map("a", 1);
+ Map<String,Integer> result = unmodifiable(map);
assertNotNull(result);
assertThrows(UnsupportedOperationException.class, () -> result.put("b", 2));
- assertNull(unmodifiable((Map<String, Integer>)null));
+ assertNull(unmodifiable((Map<String,Integer>)null));
}
//====================================================================================================
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/utils/PredicateUtils_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/utils/PredicateUtils_Test.java
index f5710ff1af..8aaeb56cf2 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/utils/PredicateUtils_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/utils/PredicateUtils_Test.java
@@ -80,7 +80,7 @@ class PredicateUtils_Test {
try {
// Test peek() function
- Function<String, String> peekFunc = peek();
+ Function<String,String> peekFunc = peek();
String result = peekFunc.apply("test value");
// Should return the value unchanged
@@ -92,7 +92,7 @@ class PredicateUtils_Test {
// Test with null
errCapture.reset();
- Function<Object, Object> peekFunc2 = peek();
+ Function<Object,Object> peekFunc2 = peek();
Object result2 = peekFunc2.apply(null);
assertNull(result2);
String output2 = errCapture.toString();
@@ -100,7 +100,7 @@ class PredicateUtils_Test {
// Test with different types
errCapture.reset();
- Function<Integer, Integer> peekInt = peek();
+ Function<Integer,Integer> peekInt = peek();
Integer result3 = peekInt.apply(123);
assertEquals(123, result3);
String output3 = errCapture.toString();
@@ -122,7 +122,7 @@ class PredicateUtils_Test {
try {
// Test peek() with message and formatter
- Function<String, String> peekFunc = peek("Processing: {0}", String::toUpperCase);
+ Function<String,String> peekFunc = peek("Processing: {0}", String::toUpperCase);
String result = peekFunc.apply("test");
// Should return the value unchanged
@@ -134,7 +134,7 @@ class PredicateUtils_Test {
// Test with different formatter
errCapture.reset();
- Function<Integer, Integer> peekInt = peek("Value: {0}", i -> i * 2);
+ Function<Integer,Integer> peekInt = peek("Value: {0}", i -> i * 2);
Integer result2 = peekInt.apply(5);
assertEquals(5, result2);
String output2 = errCapture.toString();
@@ -142,7 +142,7 @@ class PredicateUtils_Test {
// Test with null value
errCapture.reset();
- Function<String, String> peekNull = peek("Null value: {0}", s -> s == null ? "null" : s);
+ Function<String,String> peekNull = peek("Null value: {0}", s -> s == null ? "null" : s);
String result3 = peekNull.apply(null);
assertNull(result3);
String output3 = errCapture.toString();
@@ -154,7 +154,7 @@ class PredicateUtils_Test {
String name;
Person(String name) { this.name = name; }
}
- Function<Person, Person> peekPerson = peek("Person: {0}", p -> p.name);
+ Function<Person,Person> peekPerson = peek("Person: {0}", p -> p.name);
Person person = new Person("John");
Person result4 = peekPerson.apply(person);
assertSame(person, result4);
diff --git a/juneau-core/juneau-config/src/test/java/org/apache/juneau/config/Config_Test.java b/juneau-core/juneau-config/src/test/java/org/apache/juneau/config/Config_Test.java
index 033d7a267b..2838b9b6b6 100644
--- a/juneau-core/juneau-config/src/test/java/org/apache/juneau/config/Config_Test.java
+++ b/juneau-core/juneau-config/src/test/java/org/apache/juneau/config/Config_Test.java
@@ -1862,7 +1862,7 @@ class Config_Test extends TestBase {
@Test void a51_load_map() throws Exception {
var c = init();
- var data = new LinkedHashMap<String, Map<String, Object>>();
+ var data = new LinkedHashMap<String,Map<String,Object>>();
data.put("S", JsonMap.of("k", "v"));
c.load(data);
assertEquals("v", c.get("S/k").get());
diff --git a/juneau-core/juneau-marshall-rdf/src/test/java/org/apache/juneau/marshall/transforms/EnumFormat_RoundTrip_Test.java b/juneau-core/juneau-marshall-rdf/src/test/java/org/apache/juneau/marshall/transforms/EnumFormat_RoundTrip_Test.java
index c7bfe872b5..c260c81fb1 100644
--- a/juneau-core/juneau-marshall-rdf/src/test/java/org/apache/juneau/marshall/transforms/EnumFormat_RoundTrip_Test.java
+++ b/juneau-core/juneau-marshall-rdf/src/test/java/org/apache/juneau/marshall/transforms/EnumFormat_RoundTrip_Test.java
@@ -195,7 +195,7 @@ class EnumFormat_RoundTrip_Test extends TestBase {
//====================================================================================================
public static class A04Bean {
- public Map<TestEnum, String> mapKey;
+ public Map<TestEnum,String> mapKey;
}
@ParameterizedTest(name = "{0} | {1}")
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/TemporalFormat.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/TemporalFormat.java
index 3b51f8a2a4..d480f27b77 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/TemporalFormat.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/TemporalFormat.java
@@ -157,7 +157,7 @@ public enum TemporalFormat {
private static final DateTimeFormatter YEAR_FORMATTER = DateTimeFormatter.ofPattern("uuuu");
private static final DateTimeFormatter YEAR_MONTH_FORMATTER = DateTimeFormatter.ofPattern("uuuu-MM");
- private static final Map<Class<?>, DateTimeFormatter> DEFAULT_FORMATTERS = Map.ofEntries(
+ private static final Map<Class<?>,DateTimeFormatter> DEFAULT_FORMATTERS = Map.ofEntries(
Map.entry(Instant.class, DateTimeFormatter.ISO_INSTANT),
Map.entry(ZonedDateTime.class, DateTimeFormatter.ISO_OFFSET_DATE_TIME),
Map.entry(OffsetDateTime.class, DateTimeFormatter.ISO_OFFSET_DATE_TIME),
@@ -169,7 +169,7 @@ public enum TemporalFormat {
Map.entry(YearMonth.class, YEAR_MONTH_FORMATTER)
);
- private static final Map<Class<? extends TemporalAccessor>, Method> FROM_METHODS = new ConcurrentHashMap<>();
+ private static final Map<Class<? extends TemporalAccessor>,Method> FROM_METHODS = new ConcurrentHashMap<>();
/**
* Returns <jk>true</jk> when {@link #MILLIS} produces a numeric wire string for the specified subtype.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/collections/JsonMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/collections/JsonMap.java
index 1b88e59802..df9288faab 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/collections/JsonMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/collections/JsonMap.java
@@ -118,17 +118,17 @@ public class JsonMap extends MarshalledMap {
}
@Override
- public Object compute(String key, BiFunction<? super String, ? super Object, ?> remappingFunction) {
+ public Object compute(String key, BiFunction<? super String,? super Object,?> remappingFunction) {
throw uoroex();
}
@Override
- public Object computeIfAbsent(String key, Function<? super String, ?> mappingFunction) {
+ public Object computeIfAbsent(String key, Function<? super String,?> mappingFunction) {
throw uoroex();
}
@Override
- public Object computeIfPresent(String key, BiFunction<? super String, ? super Object, ?> remappingFunction) {
+ public Object computeIfPresent(String key, BiFunction<? super String,? super Object,?> remappingFunction) {
throw uoroex();
}
@@ -146,7 +146,7 @@ public class JsonMap extends MarshalledMap {
}
@Override
- public Object merge(String key, Object value, BiFunction<? super Object, ? super Object, ?> remappingFunction) {
+ public Object merge(String key, Object value, BiFunction<? super Object,? super Object,?> remappingFunction) {
throw uoroex();
}
@@ -156,7 +156,7 @@ public class JsonMap extends MarshalledMap {
}
@Override
- public void putAll(Map<? extends String, ?> m) {
+ public void putAll(Map<? extends String,?> m) {
throw uoroex();
}
@@ -186,7 +186,7 @@ public class JsonMap extends MarshalledMap {
}
@Override
- public void replaceAll(BiFunction<? super String, ? super Object, ?> function) {
+ public void replaceAll(BiFunction<? super String,? super Object,?> function) {
throw uoroex();
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/collections/MarshalledMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/collections/MarshalledMap.java
index 83335ae922..c14053106c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/collections/MarshalledMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/collections/MarshalledMap.java
@@ -80,17 +80,17 @@ public class MarshalledMap extends LinkedHashMap<String,Object> {
}
@Override
- public Object compute(String key, BiFunction<? super String, ? super Object, ?> remappingFunction) {
+ public Object compute(String key, BiFunction<? super String,? super Object,?> remappingFunction) {
throw uoroex();
}
@Override
- public Object computeIfAbsent(String key, Function<? super String, ?> mappingFunction) {
+ public Object computeIfAbsent(String key, Function<? super String,?> mappingFunction) {
throw uoroex();
}
@Override
- public Object computeIfPresent(String key, BiFunction<? super String, ? super Object, ?> remappingFunction) {
+ public Object computeIfPresent(String key, BiFunction<? super String,? super Object,?> remappingFunction) {
throw uoroex();
}
@@ -108,7 +108,7 @@ public class MarshalledMap extends LinkedHashMap<String,Object> {
}
@Override
- public Object merge(String key, Object value, BiFunction<? super Object, ? super Object, ?> remappingFunction) {
+ public Object merge(String key, Object value, BiFunction<? super Object,? super Object,?> remappingFunction) {
throw uoroex();
}
@@ -118,7 +118,7 @@ public class MarshalledMap extends LinkedHashMap<String,Object> {
}
@Override
- public void putAll(Map<? extends String, ?> m) {
+ public void putAll(Map<? extends String,?> m) {
throw uoroex();
}
@@ -148,7 +148,7 @@ public class MarshalledMap extends LinkedHashMap<String,Object> {
}
@Override
- public void replaceAll(BiFunction<? super String, ? super Object, ?> function) {
+ public void replaceAll(BiFunction<? super String,? super Object,?> function) {
throw uoroex();
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/csv/CsvCellParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/csv/CsvCellParser.java
index 463cd6ffc9..4963de7006 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/csv/CsvCellParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/csv/CsvCellParser.java
@@ -103,10 +103,10 @@ public final class CsvCellParser {
return readSimpleValue();
}
- private Map<String, Object> readObject() throws ParseException {
+ private Map<String,Object> readObject() throws ParseException {
if (consume() != '{')
throw new ParseException("Expected opening brace");
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
skipWhitespace();
if (peek() == '}') {
consume();
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/csv/CsvCellSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/csv/CsvCellSerializer.java
index 367d22d759..2b5c6b1001 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/csv/CsvCellSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/csv/CsvCellSerializer.java
@@ -65,7 +65,7 @@ public final class CsvCellSerializer {
private String writeValue(Object value, CsvSerializerSession session) {
if (value == null)
return nullMarker;
- if (value instanceof Map<?, ?> value2)
+ if (value instanceof Map<?,?> value2)
return writeMap(value2, session);
if (value instanceof Collection<?> value2)
return writeCollection(value2, session);
@@ -82,13 +82,13 @@ public final class CsvCellSerializer {
if (value instanceof char[] value2) return formatCharArray(value2);
// Bean or simple: use session to convert/format
var prepared = session.prepareForInlineValue(value);
- if (prepared instanceof Map) return writeMap((Map<?, ?>) prepared, session);
+ if (prepared instanceof Map) return writeMap((Map<?,?>) prepared, session);
if (prepared instanceof Collection) return writeCollection((Collection<?>) prepared, session);
if (prepared instanceof Object[] prepared2) return writeObjectArray(prepared2, session);
return escapeIfNeeded(prepared.toString());
}
- private String writeMap(Map<?, ?> m, CsvSerializerSession session) {
+ private String writeMap(Map<?,?> m, CsvSerializerSession session) {
var sb = new StringBuilder();
sb.append('{');
var first = true;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonConfigAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonConfigAnnotation.java
index 5da8ba47db..e1c683bd6b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonConfigAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonConfigAnnotation.java
@@ -30,7 +30,7 @@ public class HjsonConfigAnnotation {
/**
* Applies {@link HjsonConfig} annotations to an {@link HjsonParser.Builder}.
*/
- public static class ParserApply extends AnnotationApplier<HjsonConfig, HjsonParser.Builder> {
+ public static class ParserApply extends AnnotationApplier<HjsonConfig,HjsonParser.Builder> {
/**
* Constructor.
@@ -51,7 +51,7 @@ public class HjsonConfigAnnotation {
/**
* Applies {@link HjsonConfig} annotations to an {@link HjsonSerializer.Builder}.
*/
- public static class SerializerApply extends AnnotationApplier<HjsonConfig, HjsonSerializer.Builder> {
+ public static class SerializerApply extends AnnotationApplier<HjsonConfig,HjsonSerializer.Builder> {
/**
* Constructor.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonParser.java
index 56b294c1b3..ac907ca243 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonParser.java
@@ -126,8 +126,8 @@ public class HjsonParser extends ReaderParser implements HjsonMetaProvider, Reco
private static final String ARG_ctx = "ctx";
- private final java.util.concurrent.ConcurrentHashMap<ClassMeta<?>, HjsonClassMeta> hjsonClassMetas = new java.util.concurrent.ConcurrentHashMap<>();
- private final java.util.concurrent.ConcurrentHashMap<BeanPropertyMeta, HjsonBeanPropertyMeta> hjsonBeanPropertyMetas = new java.util.concurrent.ConcurrentHashMap<>();
+ private final java.util.concurrent.ConcurrentHashMap<ClassMeta<?>,HjsonClassMeta> hjsonClassMetas = new java.util.concurrent.ConcurrentHashMap<>();
+ private final java.util.concurrent.ConcurrentHashMap<BeanPropertyMeta,HjsonBeanPropertyMeta> hjsonBeanPropertyMetas = new java.util.concurrent.ConcurrentHashMap<>();
/**
* Builder class.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonParserSession.java
index 3461fee068..7c2188a7d0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonParserSession.java
@@ -331,7 +331,7 @@ public class HjsonParserSession extends ReaderParserSession implements RecordRea
setParent(cm, val, bean);
if (cm.isMap() && val instanceof Map<?,?> val2 && !cm.getValueType().isObject() && cm.getValueType().getNameProperty() != null) {
var valueType = cm.getValueType();
- for (Map.Entry<?, ?> e : ((Map<?,?>)val2).entrySet())
+ for (Map.Entry<?,?> e : ((Map<?,?>)val2).entrySet())
setName(valueType, e.getValue(), e.getKey());
}
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonSerializer.java
index 7aecd21499..850a273dd8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hjson/HjsonSerializer.java
@@ -121,8 +121,8 @@ public class HjsonSerializer extends WriterSerializer implements HjsonMetaProvid
private static final String ARG_copyFrom = "copyFrom";
- private final java.util.concurrent.ConcurrentHashMap<ClassMeta<?>, HjsonClassMeta> hjsonClassMetas = new java.util.concurrent.ConcurrentHashMap<>();
- private final java.util.concurrent.ConcurrentHashMap<BeanPropertyMeta, HjsonBeanPropertyMeta> hjsonBeanPropertyMetas = new java.util.concurrent.ConcurrentHashMap<>();
+ private final java.util.concurrent.ConcurrentHashMap<ClassMeta<?>,HjsonClassMeta> hjsonClassMetas = new java.util.concurrent.ConcurrentHashMap<>();
+ private final java.util.concurrent.ConcurrentHashMap<BeanPropertyMeta,HjsonBeanPropertyMeta> hjsonBeanPropertyMetas = new java.util.concurrent.ConcurrentHashMap<>();
/** Use multiline ''' for strings with newlines. */
protected final boolean useMultilineStrings;
@@ -144,7 +144,7 @@ public class HjsonSerializer extends WriterSerializer implements HjsonMetaProvid
*/
public static class Builder extends WriterSerializer.Builder<Builder> {
- private static final Cache<HashKey, HjsonSerializer> CACHE = Cache.of(HashKey.class, HjsonSerializer.class).build();
+ private static final Cache<HashKey,HjsonSerializer> CACHE = Cache.of(HashKey.class, HjsonSerializer.class).build();
private boolean useMultilineStrings = true;
private boolean useQuotelessStrings = true;
@@ -325,7 +325,7 @@ public class HjsonSerializer extends WriterSerializer implements HjsonMetaProvid
}
@Override
- protected FluentMap<String, Object> properties() {
+ protected FluentMap<String,Object> properties() {
return super.properties()
.a("useMultilineStrings", useMultilineStrings)
.a("useQuotelessStrings", useQuotelessStrings)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconConfigAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconConfigAnnotation.java
index 331b7f3de7..ca32a90ae8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconConfigAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconConfigAnnotation.java
@@ -30,7 +30,7 @@ public class HoconConfigAnnotation {
/**
* Applies {@link HoconConfig} annotations to an {@link HoconParser.Builder}.
*/
- public static class ParserApply extends AnnotationApplier<HoconConfig, HoconParser.Builder> {
+ public static class ParserApply extends AnnotationApplier<HoconConfig,HoconParser.Builder> {
/**
* Constructor.
@@ -52,7 +52,7 @@ public class HoconConfigAnnotation {
/**
* Applies {@link HoconConfig} annotations to an {@link HoconSerializer.Builder}.
*/
- public static class SerializerApply extends AnnotationApplier<HoconConfig, HoconSerializer.Builder> {
+ public static class SerializerApply extends AnnotationApplier<HoconConfig,HoconSerializer.Builder> {
/**
* Constructor.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconParser.java
index afe9d634a1..51c48d17e6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconParser.java
@@ -74,8 +74,8 @@ public class HoconParser extends ReaderParser implements HoconMetaProvider, Reco
private static final String ARG_ctx = "ctx";
- private final java.util.concurrent.ConcurrentHashMap<ClassMeta<?>, HoconClassMeta> hoconClassMetas = new java.util.concurrent.ConcurrentHashMap<>();
- private final java.util.concurrent.ConcurrentHashMap<BeanPropertyMeta, HoconBeanPropertyMeta> hoconBeanPropertyMetas = new java.util.concurrent.ConcurrentHashMap<>();
+ private final java.util.concurrent.ConcurrentHashMap<ClassMeta<?>,HoconClassMeta> hoconClassMetas = new java.util.concurrent.ConcurrentHashMap<>();
+ private final java.util.concurrent.ConcurrentHashMap<BeanPropertyMeta,HoconBeanPropertyMeta> hoconBeanPropertyMetas = new java.util.concurrent.ConcurrentHashMap<>();
/** Whether to resolve ${var} substitutions. */
protected final boolean resolveSubstitutions;
@@ -85,7 +85,7 @@ public class HoconParser extends ReaderParser implements HoconMetaProvider, Reco
*/
public static class Builder extends ReaderParser.Builder<Builder> {
- private static final Cache<HashKey, HoconParser> CACHE = Cache.of(HashKey.class, HoconParser.class).build();
+ private static final Cache<HashKey,HoconParser> CACHE = Cache.of(HashKey.class, HoconParser.class).build();
private boolean resolveSubstitutions = true;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconParserSession.java
index 3ace717287..5263d2d23c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconParserSession.java
@@ -278,7 +278,7 @@ public class HoconParserSession extends ReaderParserSession implements RecordRea
if (existing == null)
return value;
var resolver = new HoconResolver(root);
- java.util.function.Function<String, HoconValue> lookup = p -> p.equals(pathStr) ? existing : resolver.lookup(p);
+ java.util.function.Function<String,HoconValue> lookup = p -> p.equals(pathStr) ? existing : resolver.lookup(p);
return resolver.resolveConcatWithLookup(concat, lookup);
}
@@ -514,9 +514,9 @@ public class HoconParserSession extends ReaderParserSession implements RecordRea
setName(cm, val, key);
if (cm.getParentProperty() != null)
setParent(cm, val, bean);
- if (cm.isMap() && val instanceof Map<?, ?> val2 && !cm.getValueType().isObject() && cm.getValueType().getNameProperty() != null) {
+ if (cm.isMap() && val instanceof Map<?,?> val2 && !cm.getValueType().isObject() && cm.getValueType().getNameProperty() != null) {
var valueType = cm.getValueType();
- for (Map.Entry<?, ?> e : ((Map<?, ?>) val2).entrySet())
+ for (Map.Entry<?,?> e : ((Map<?,?>) val2).entrySet())
setName(valueType, e.getValue(), e.getKey());
}
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconResolver.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconResolver.java
index 9dcaec4a15..859e5e39cc 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconResolver.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconResolver.java
@@ -167,7 +167,7 @@ public class HoconResolver {
* <br>Must not be <jk>null</jk>.
* @return The resolved string value.
*/
- public HoconValue resolveConcatWithLookup(HoconValue.HoconConcat concat, Function<String, HoconValue> lookup) {
+ public HoconValue resolveConcatWithLookup(HoconValue.HoconConcat concat, Function<String,HoconValue> lookup) {
var sb = new StringBuilder();
for (var p : concat.getParts()) {
var resolved = resolveValueWithLookup(p, lookup);
@@ -177,7 +177,7 @@ public class HoconResolver {
return new HoconValue.HoconString(sb.toString());
}
- private HoconValue resolveValueWithLookup(HoconValue val, Function<String, HoconValue> lookup) {
+ private HoconValue resolveValueWithLookup(HoconValue val, Function<String,HoconValue> lookup) {
if (val == null)
return null;
return switch (val.getType()) {
@@ -202,7 +202,7 @@ public class HoconResolver {
}
private HoconValue resolveSubstitutionWithLookup(HoconValue.HoconSubstitution sub, boolean optional,
- Function<String, HoconValue> lookup) {
+ Function<String,HoconValue> lookup) {
var path = sub.getPath();
if (inProgress.contains(path))
throw rex("Circular substitution: %s", path);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconSerializer.java
index 24b02ab904..06b54c5dce 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconSerializer.java
@@ -131,8 +131,8 @@ public class HoconSerializer extends WriterSerializer implements HoconMetaProvid
private static final String ARG_copyFrom = "copyFrom";
- private final java.util.concurrent.ConcurrentHashMap<ClassMeta<?>, HoconClassMeta> hoconClassMetas = new java.util.concurrent.ConcurrentHashMap<>();
- private final java.util.concurrent.ConcurrentHashMap<BeanPropertyMeta, HoconBeanPropertyMeta> hoconBeanPropertyMetas = new java.util.concurrent.ConcurrentHashMap<>();
+ private final java.util.concurrent.ConcurrentHashMap<ClassMeta<?>,HoconClassMeta> hoconClassMetas = new java.util.concurrent.ConcurrentHashMap<>();
+ private final java.util.concurrent.ConcurrentHashMap<BeanPropertyMeta,HoconBeanPropertyMeta> hoconBeanPropertyMetas = new java.util.concurrent.ConcurrentHashMap<>();
/** Use = (not :) for key-value separator. */
protected final boolean useEqualsSign;
@@ -157,7 +157,7 @@ public class HoconSerializer extends WriterSerializer implements HoconMetaProvid
*/
public static class Builder extends WriterSerializer.Builder<Builder> {
- private static final Cache<HashKey, HoconSerializer> CACHE = Cache.of(HashKey.class, HoconSerializer.class).build();
+ private static final Cache<HashKey,HoconSerializer> CACHE = Cache.of(HashKey.class, HoconSerializer.class).build();
private boolean useEqualsSign = true;
private boolean useUnquotedStrings = true;
@@ -357,7 +357,7 @@ public class HoconSerializer extends WriterSerializer implements HoconMetaProvid
}
@Override
- protected FluentMap<String, Object> properties() {
+ protected FluentMap<String,Object> properties() {
return super.properties()
.a("useEqualsSign", useEqualsSign)
.a("useUnquotedStrings", useUnquotedStrings)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconValue.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconValue.java
index aaf06baf6a..c0cb61b512 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconValue.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/hocon/HoconValue.java
@@ -68,7 +68,7 @@ public abstract sealed class HoconValue {
* HOCON object (maps to Java bean or Map).
*/
public static final class HoconObject extends HoconValue {
- private final LinkedHashMap<String, HoconValue> members = new LinkedHashMap<>();
+ private final LinkedHashMap<String,HoconValue> members = new LinkedHashMap<>();
@Override
public Type getType() {
@@ -83,7 +83,7 @@ public abstract sealed class HoconValue {
@SuppressWarnings({
"java:S1319" // LinkedHashMap return type intentional; HOCON preserves insertion order of object members
})
- public LinkedHashMap<String, HoconValue> getMembers() {
+ public LinkedHashMap<String,HoconValue> getMembers() {
return members;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniConfigAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniConfigAnnotation.java
index 5153faa3b3..260230e70c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniConfigAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniConfigAnnotation.java
@@ -30,7 +30,7 @@ public class IniConfigAnnotation {
/**
* Applies {@link IniConfig} annotations to an {@link IniParser.Builder}.
*/
- public static class ParserApply extends AnnotationApplier<IniConfig, IniParser.Builder> {
+ public static class ParserApply extends AnnotationApplier<IniConfig,IniParser.Builder> {
/**
* Constructor.
@@ -52,7 +52,7 @@ public class IniConfigAnnotation {
/**
* Applies {@link IniConfig} annotations to an {@link IniSerializer.Builder}.
*/
- public static class SerializerApply extends AnnotationApplier<IniConfig, IniSerializer.Builder> {
+ public static class SerializerApply extends AnnotationApplier<IniConfig,IniSerializer.Builder> {
/**
* Constructor.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniParser.java
index 5c637e4e1f..9ec1c01355 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniParser.java
@@ -94,8 +94,8 @@ import org.apache.juneau.marshall.stream.*;
})
public class IniParser extends ReaderParser implements IniMetaProvider, RecordReadable {
- private final java.util.concurrent.ConcurrentHashMap<ClassMeta<?>, IniClassMeta> iniClassMetas = new java.util.concurrent.ConcurrentHashMap<>();
- private final java.util.concurrent.ConcurrentHashMap<BeanPropertyMeta, IniBeanPropertyMeta> iniBeanPropertyMetas = new java.util.concurrent.ConcurrentHashMap<>();
+ private final java.util.concurrent.ConcurrentHashMap<ClassMeta<?>,IniClassMeta> iniClassMetas = new java.util.concurrent.ConcurrentHashMap<>();
+ private final java.util.concurrent.ConcurrentHashMap<BeanPropertyMeta,IniBeanPropertyMeta> iniBeanPropertyMetas = new java.util.concurrent.ConcurrentHashMap<>();
private static final String PROP_kvSeparator = "kvSeparator";
private static final String ARG_copyFrom = "copyFrom";
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniParserSession.java
index 1920f594d7..fcd3749537 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniParserSession.java
@@ -127,8 +127,8 @@ public class IniParserSession extends ReaderParserSession implements RecordReada
* <br>Must not be <jk>null</jk>.
* @return Map of section name to key-value map. Default section uses "".
*/
- protected Map<String, Map<String, String>> readIniContent(Reader r) throws IOException {
- var sections = new LinkedHashMap<String, Map<String, String>>();
+ protected Map<String,Map<String,String>> readIniContent(Reader r) throws IOException {
+ var sections = new LinkedHashMap<String,Map<String,String>>();
var current = sections.computeIfAbsent("", k -> new LinkedHashMap<>());
var br = r instanceof BufferedReader r2 ? r2 : new BufferedReader(r);
String line;
@@ -190,10 +190,10 @@ public class IniParserSession extends ReaderParserSession implements RecordReada
return new String[] { line.substring(0, idx), line.substring(idx + 1) };
}
- private void populateBean(BeanMap<?> bm, Map<String, Map<String, String>> sections, String sectionPath) throws ParseException, ExecutableException {
+ private void populateBean(BeanMap<?> bm, Map<String,Map<String,String>> sections, String sectionPath) throws ParseException, ExecutableException {
var defaultSection = sections.get(sectionPath);
if (defaultSection != null) {
- for (Entry<String, String> e : defaultSection.entrySet()) {
+ for (Entry<String,String> e : defaultSection.entrySet()) {
var key = e.getKey();
var rawValue = e.getValue();
var pMeta = bm.getMeta().getProperties().get(key);
@@ -232,19 +232,19 @@ public class IniParserSession extends ReaderParserSession implements RecordReada
var valueType = cMeta.getValueType();
if (valueType == null)
valueType = object();
- var map = new LinkedHashMap<String, Object>();
- for (Entry<String, String> e : sub.entrySet())
+ var map = new LinkedHashMap<String,Object>();
+ for (Entry<String,String> e : sub.entrySet())
map.put(e.getKey(), readValue(e.getValue(), valueType));
bm.put(childName, convertMapToTarget(map, cMeta));
}
}
}
- private Map<String, Object> buildMapFromSections(Map<String, Map<String, String>> sections, String sectionPath) throws ParseException, ExecutableException {
- var result = new LinkedHashMap<String, Object>();
+ private Map<String,Object> buildMapFromSections(Map<String,Map<String,String>> sections, String sectionPath) throws ParseException, ExecutableException {
+ var result = new LinkedHashMap<String,Object>();
var defaultSection = sections.get(sectionPath);
if (defaultSection != null) {
- for (Entry<String, String> e : defaultSection.entrySet())
+ for (Entry<String,String> e : defaultSection.entrySet())
result.put(e.getKey(), readValue(e.getValue(), object()));
}
for (var entry : sections.entrySet()) {
@@ -265,8 +265,8 @@ public class IniParserSession extends ReaderParserSession implements RecordReada
if (hasNested) {
result.put(childName, buildMapFromSections(sections, childPath));
} else if (childSection != null) {
- var map = new LinkedHashMap<String, Object>();
- for (Entry<String, String> e : childSection.entrySet())
+ var map = new LinkedHashMap<String,Object>();
+ for (Entry<String,String> e : childSection.entrySet())
map.put(e.getKey(), readValue(e.getValue(), object()));
result.put(childName, map);
}
@@ -336,7 +336,7 @@ public class IniParserSession extends ReaderParserSession implements RecordReada
return json5Parser.get();
}
- private static Object convertMapToTarget(Map<String, Object> map, ClassMeta<?> type) throws ParseException, ExecutableException {
+ private static Object convertMapToTarget(Map<String,Object> map, ClassMeta<?> type) throws ParseException, ExecutableException {
if (JsonMap.class.isAssignableFrom(type.inner()))
return new JsonMap(map);
return map;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniSerializer.java
index 0a16a5ff3e..ac8847da4f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniSerializer.java
@@ -99,8 +99,8 @@ import org.apache.juneau.marshall.stream.*;
})
public class IniSerializer extends WriterSerializer implements IniMetaProvider, RecordWritable {
- private final java.util.concurrent.ConcurrentHashMap<ClassMeta<?>, IniClassMeta> iniClassMetas = new java.util.concurrent.ConcurrentHashMap<>();
- private final java.util.concurrent.ConcurrentHashMap<BeanPropertyMeta, IniBeanPropertyMeta> iniBeanPropertyMetas = new java.util.concurrent.ConcurrentHashMap<>();
+ private final java.util.concurrent.ConcurrentHashMap<ClassMeta<?>,IniClassMeta> iniClassMetas = new java.util.concurrent.ConcurrentHashMap<>();
+ private final java.util.concurrent.ConcurrentHashMap<BeanPropertyMeta,IniBeanPropertyMeta> iniBeanPropertyMetas = new java.util.concurrent.ConcurrentHashMap<>();
private static final String PROP_kvSeparator = "kvSeparator";
private static final String PROP_spacedSeparator = "spacedSeparator";
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniSerializerSession.java
index 3617b61cd7..0de81f2fd1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/ini/IniSerializerSession.java
@@ -128,8 +128,8 @@ public class IniSerializerSession extends WriterSerializerSession implements Rec
private void writeBean(IniWriter w, BeanMap<?> m, String sectionPath) throws IOException, SerializeException {
Predicate<Object> checkNull = x -> isKeepNullProperties() || nn(x);
- var simple = new ArrayList<Map.Entry<BeanPropertyMeta, Object>>();
- var sections = new ArrayList<Map.Entry<BeanPropertyMeta, Object>>();
+ var simple = new ArrayList<Map.Entry<BeanPropertyMeta,Object>>();
+ var sections = new ArrayList<Map.Entry<BeanPropertyMeta,Object>>();
m.forEachValue(checkNull, (pMeta, key, value, thrown) -> {
if (nn(thrown))
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/jcs/JcsSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/jcs/JcsSerializerSession.java
index 5a018d7492..eb71e5cbc8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/jcs/JcsSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/jcs/JcsSerializerSession.java
@@ -309,7 +309,7 @@ public class JcsSerializerSession extends JsonSerializerSession {
return out;
}
- private static class BeanProp implements Map.Entry<String, Object> {
+ private static class BeanProp implements Map.Entry<String,Object> {
final BeanPropertyMeta pMeta;
final String key;
final Object value;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/json5l/Json5lConfigAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/json5l/Json5lConfigAnnotation.java
index dc9e3b0608..47c59b1d40 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/json5l/Json5lConfigAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/json5l/Json5lConfigAnnotation.java
@@ -34,7 +34,7 @@ public class Json5lConfigAnnotation {
@SuppressWarnings({
"rawtypes" // Raw types required for reflective annotation application.
})
- public static class ParserApply extends AnnotationApplier<Json5lConfig, JsonParser.Builder> {
+ public static class ParserApply extends AnnotationApplier<Json5lConfig,JsonParser.Builder> {
/**
* Constructor.
@@ -58,7 +58,7 @@ public class Json5lConfigAnnotation {
@SuppressWarnings({
"rawtypes" // Raw types required for reflective annotation application.
})
- public static class SerializerApply extends AnnotationApplier<Json5lConfig, JsonSerializer.Builder> {
+ public static class SerializerApply extends AnnotationApplier<Json5lConfig,JsonSerializer.Builder> {
/**
* Constructor.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/jsonl/JsonlConfigAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/jsonl/JsonlConfigAnnotation.java
index fa89e18d3a..8e940f4a93 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/jsonl/JsonlConfigAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/jsonl/JsonlConfigAnnotation.java
@@ -34,7 +34,7 @@ public class JsonlConfigAnnotation {
@SuppressWarnings({
"rawtypes" // Raw types required for reflective annotation application.
})
- public static class ParserApply extends AnnotationApplier<JsonlConfig, JsonParser.Builder> {
+ public static class ParserApply extends AnnotationApplier<JsonlConfig,JsonParser.Builder> {
/**
* Constructor.
@@ -58,7 +58,7 @@ public class JsonlConfigAnnotation {
@SuppressWarnings({
"rawtypes" // Raw types required for reflective annotation application.
})
- public static class SerializerApply extends AnnotationApplier<JsonlConfig, JsonSerializer.Builder> {
+ public static class SerializerApply extends AnnotationApplier<JsonlConfig,JsonSerializer.Builder> {
/**
* Constructor.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/markdown/MarkdownDocSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/markdown/MarkdownDocSerializerSession.java
index d0bf9b4655..2921bde632 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/markdown/MarkdownDocSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/markdown/MarkdownDocSerializerSession.java
@@ -175,8 +175,8 @@ public class MarkdownDocSerializerSession extends MarkdownSerializerSession {
*/
protected void writeBeanWithHeadings(MarkdownWriter w, BeanMap<?> bm, int level) throws IOException, SerializeException {
// Collect simple properties for the key/value table
- var simpleProps = new LinkedHashMap<String, Object>();
- var complexProps = new LinkedHashMap<String, Object>();
+ var simpleProps = new LinkedHashMap<String,Object>();
+ var complexProps = new LinkedHashMap<String,Object>();
for (var e : bm.entrySet()) {
var key = e.getKey();
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parquet/ParquetParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parquet/ParquetParserSession.java
index 7f2205c856..9fbff0c203 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parquet/ParquetParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parquet/ParquetParserSession.java
@@ -223,7 +223,7 @@ public class ParquetParserSession extends InputStreamParserSession implements Re
boolean targetWantsScalar = !type.isMap()
&& !(type.isCollection() && type.getElementType() != null && type.getElementType().isMap())
&& !(type.isArray() && type.getElementType() != null && type.getElementType().isMap());
- if (rows.size() == 1 && rows.get(0) instanceof Map<?, ?> m && m.containsKey("value") && targetWantsScalar) {
+ if (rows.size() == 1 && rows.get(0) instanceof Map<?,?> m && m.containsKey("value") && targetWantsScalar) {
var inner = m.get("value");
if (type.isOptional())
return (T)o(convertToType(inner, type.getElementType()));
@@ -242,9 +242,9 @@ public class ParquetParserSession extends InputStreamParserSession implements Re
}
if (type.isMap()) {
// Unwrap ValueHolder {value: Map} when addRootType wrapped root Map (2.2)
- if (rows.size() == 1 && rows.get(0) instanceof Map<?, ?> m && m.containsKey("value") && m.size() == 1) {
+ if (rows.size() == 1 && rows.get(0) instanceof Map<?,?> m && m.containsKey("value") && m.size() == 1) {
var inner = m.get("value");
- if (inner instanceof Map<?, ?>)
+ if (inner instanceof Map<?,?>)
return (T)convertToType(inner, type);
}
var keyType = type.getKeyType();
@@ -253,7 +253,7 @@ public class ParquetParserSession extends InputStreamParserSession implements Re
if (valueType == null) valueType = ctx.getMarshallingContext().getClassMeta(Object.class);
var result = new LinkedHashMap<>();
for (var row : rows) {
- var rowMap = (Map<?, ?>)row;
+ var rowMap = (Map<?,?>)row;
var rawKey = rowMap.get("key");
var k = (rawKey != null && ctx.nullKeyString.equals(String.valueOf(rawKey)))
? null
@@ -263,9 +263,9 @@ public class ParquetParserSession extends InputStreamParserSession implements Re
}
return (T)convertToType(result, type);
}
- if (rows.size() == 1 && rows.get(0) instanceof Map<?, ?> m) {
+ if (rows.size() == 1 && rows.get(0) instanceof Map<?,?> m) {
// Unwrap {root: {...}} from buildSchemaFromMap flat format
- if (m.size() == 1 && m.containsKey("root") && m.get("root") instanceof Map<?, ?> inner)
+ if (m.size() == 1 && m.containsKey("root") && m.get("root") instanceof Map<?,?> inner)
return (T)convertToType(prepareMapForBean(inner, type), type);
return (T)convertToType(prepareMapForBean(m, type), type);
}
@@ -331,7 +331,7 @@ public class ParquetParserSession extends InputStreamParserSession implements Re
/** Sentinel for a null intermediate OPTIONAL group at the given def level (GAP-14 multi-level nesting). */
private record GroupNull(int defLevel) {}
- private record FileMeta(long numRows, List<RowGroupMeta> rowGroups, Map<String, Integer> schemaRepetition, Set<String> rawByteArrayPaths, Set<String> uuidPaths, Map<String, ColumnLogical> columnLogical) {}
+ private record FileMeta(long numRows, List<RowGroupMeta> rowGroups, Map<String,Integer> schemaRepetition, Set<String> rawByteArrayPaths, Set<String> uuidPaths, Map<String,ColumnLogical> columnLogical) {}
private record RowGroupMeta(long numRows, List<ColumnChunkMeta> columns) {}
private record ColumnChunkMeta(int type, List<String> pathInSchema, int codec, long numValues, long dataPageOffset, long totalCompressedSize) {}
@@ -445,7 +445,7 @@ public class ParquetParserSession extends InputStreamParserSession implements Re
* physical-type heuristic when no logical type is recorded (backward compatibility with files written
* without the opt-in discriminator).
*/
- private record SchemaReadResult(Map<String, Integer> repetitions, Set<String> rawByteArrayPaths, Set<String> uuidPaths, Map<String, ColumnLogical> columnLogical) {}
+ private record SchemaReadResult(Map<String,Integer> repetitions, Set<String> rawByteArrayPaths, Set<String> uuidPaths, Map<String,ColumnLogical> columnLogical) {}
/**
* Per-leaf logical-type metadata captured from the schema, used to decode native logical-type columns
@@ -460,10 +460,10 @@ public class ParquetParserSession extends InputStreamParserSession implements Re
dec.readStructBegin();
long numRows = 0;
List<RowGroupMeta> rowGroups = null;
- Map<String, Integer> schemaRepetition = Map.of();
+ Map<String,Integer> schemaRepetition = Map.of();
Set<String> rawByteArrayPaths = Set.of();
Set<String> uuidPaths = Set.of();
- Map<String, ColumnLogical> columnLogical = Map.of();
+ Map<String,ColumnLogical> columnLogical = Map.of();
ThriftCompactDecoder.FieldHeader fh;
while (!(fh = dec.readFieldHeader()).isStop) {
switch (fh.fieldId) {
@@ -492,10 +492,10 @@ public class ParquetParserSession extends InputStreamParserSession implements Re
private static SchemaReadResult readSchema(ThriftCompactDecoder dec) throws IOException {
var lh = dec.readListHeader();
var pathStack = new ArrayList<SchemaStackFrame>();
- var result = new LinkedHashMap<String, Integer>();
+ var result = new LinkedHashMap<String,Integer>();
var rawByteArrayPaths = new LinkedHashSet<String>();
var uuidPaths = new LinkedHashSet<String>();
- var columnLogical = new LinkedHashMap<String, ColumnLogical>();
+ var columnLogical = new LinkedHashMap<String,ColumnLogical>();
for (int i = 0; i < lh.size; i++) {
dec.readStructBegin();
Integer type = null;
@@ -678,7 +678,7 @@ public class ParquetParserSession extends InputStreamParserSession implements Re
return list;
}
- private List<?> readAllRows(byte[] fileBytes, FileMeta meta, ClassMeta<?> elementType, Map<String, Integer> schemaRepetition, Set<String> rawByteArrayPaths, Set<String> uuidPaths, Map<String, ColumnLogical> columnLogical) throws ParseException {
+ private List<?> readAllRows(byte[] fileBytes, FileMeta meta, ClassMeta<?> elementType, Map<String,Integer> schemaRepetition, Set<String> rawByteArrayPaths, Set<String> uuidPaths, Map<String,ColumnLogical> columnLogical) throws ParseException {
if (meta.numRows() == 0 || meta.rowGroups().isEmpty())
return List.of();
// Multi-row-group (GAP-2): read every row group and concatenate its reassembled rows in order.
@@ -695,8 +695,8 @@ public class ParquetParserSession extends InputStreamParserSession implements Re
@SuppressWarnings({
"java:S107" // Parser-internal method threads decode state (column paths, schema repetition, logical types); parameter count is intentional.
})
- private List<?> readRowGroupRows(byte[] fileBytes, RowGroupMeta group, int numRows, ClassMeta<?> elementType, Map<String, Integer> schemaRepetition, Set<String> rawByteArrayPaths, Set<String> uuidPaths, Map<String, ColumnLogical> columnLogical) throws ParseException {
- var columnData = new LinkedHashMap<String, List<Object>>();
+ private List<?> readRowGroupRows(byte[] fileBytes, RowGroupMeta group, int numRows, ClassMeta<?> elementType, Map<String,Integer> schemaRepetition, Set<String> rawByteArrayPaths, Set<String> uuidPaths, Map<String,ColumnLogical> columnLogical) throws ParseException {
+ var columnData = new LinkedHashMap<String,List<Object>>();
for (var cc : group.columns()) {
var path = String.join(".", cc.pathInSchema());
List<Object> values;
@@ -996,7 +996,7 @@ public class ParquetParserSession extends InputStreamParserSession implements Re
@SuppressWarnings({
"java:S107" // Parser-internal method threads decode state (column paths, schema repetition, logical types); parameter count is intentional.
})
- private static List<Object> readColumnChunk(byte[] fileBytes, ColumnChunkMeta cc, int numRows, Map<String, Integer> schemaRepetition, Set<String> rawByteArrayPaths, Set<String> uuidPaths, Map<String, ColumnLogical> columnLogical, boolean trimStrings) throws ParseException {
+ private static List<Object> readColumnChunk(byte[] fileBytes, ColumnChunkMeta cc, int numRows, Map<String,Integer> schemaRepetition, Set<String> rawByteArrayPaths, Set<String> uuidPaths, Map<String,ColumnLogical> columnLogical, boolean trimStrings) throws ParseException {
try {
if (cc.numValues() < 0 || cc.numValues() > MAX_NUM_VALUES)
throw new ParseException("Invalid numValues for column '%s': %s", String.join(".", cc.pathInSchema()), cc.numValues());
@@ -1290,7 +1290,7 @@ public class ParquetParserSession extends InputStreamParserSession implements Re
return new UUID(msb, lsb);
}
- private List<Object> reassembleRows(Map<String, List<Object>> columnData, int numRows, ClassMeta<?> elementType) throws ParseException {
+ private List<Object> reassembleRows(Map<String,List<Object>> columnData, int numRows, ClassMeta<?> elementType) throws ParseException {
var result = new ArrayList<>(numRows);
var listBeanColumns = groupListBeanColumns(columnData.keySet(), elementType);
var mapColumns = groupMapColumns(columnData.keySet());
@@ -1341,8 +1341,8 @@ public class ParquetParserSession extends InputStreamParserSession implements Re
return result;
}
- private static Map<String, List<ListColumnInfo>> groupListBeanColumns(Set<String> columnPaths, ClassMeta<?> elementType) {
- var groups = new LinkedHashMap<String, List<ListColumnInfo>>();
+ private static Map<String,List<ListColumnInfo>> groupListBeanColumns(Set<String> columnPaths, ClassMeta<?> elementType) {
+ var groups = new LinkedHashMap<String,List<ListColumnInfo>>();
if (!elementType.isBean())
return groups;
var bm = elementType.getBeanMeta();
@@ -1368,8 +1368,8 @@ public class ParquetParserSession extends InputStreamParserSession implements Re
private record MapColumnInfo(String keyColumnPath, String valueColumnPath) {}
- private static Map<String, MapColumnInfo> groupMapColumns(Set<String> columnPaths) {
- var groups = new LinkedHashMap<String, MapColumnInfo>();
+ private static Map<String,MapColumnInfo> groupMapColumns(Set<String> columnPaths) {
+ var groups = new LinkedHashMap<String,MapColumnInfo>();
for (var fullPath : columnPaths) {
var rowRelPath = rowRelativePath(fullPath);
if (!isMapKeyValueColumnPath(rowRelPath))
@@ -1385,7 +1385,7 @@ public class ParquetParserSession extends InputStreamParserSession implements Re
return groups;
}
- private Map<Object, Object> mergeMapColumns(MapColumnInfo info, Map<String, List<Object>> columnData, int rowIndex) throws ParseException {
+ private Map<Object,Object> mergeMapColumns(MapColumnInfo info, Map<String,List<Object>> columnData, int rowIndex) throws ParseException {
var keyList = (List<?>) columnData.get(info.keyColumnPath()).get(rowIndex);
if (keyList.isEmpty())
return new LinkedHashMap<>();
@@ -1400,7 +1400,7 @@ public class ParquetParserSession extends InputStreamParserSession implements Re
return result;
}
- private List<Object> mergeListBeanColumns(List<ListColumnInfo> columnsInGroup, Map<String, List<Object>> columnData,
+ private List<Object> mergeListBeanColumns(List<ListColumnInfo> columnsInGroup, Map<String,List<Object>> columnData,
int rowIndex) throws ParseException {
var elemType = columnsInGroup.get(0).elementType();
var firstList = (List<?>) columnData.get(columnsInGroup.get(0).fullPath()).get(rowIndex);
@@ -1427,11 +1427,11 @@ public class ParquetParserSession extends InputStreamParserSession implements Re
private void replaceNullKeySentinel(Object obj) {
if (obj == null)
return;
- if (obj instanceof Map<?, ?> obj2) {
+ if (obj instanceof Map<?,?> obj2) {
if (obj2.containsKey(ctx.nullKeyString)) {
var val = obj2.get(ctx.nullKeyString);
- ((Map<Object, Object>)obj2).remove(ctx.nullKeyString);
- ((Map<Object, Object>)obj2).put(null, val);
+ ((Map<Object,Object>)obj2).remove(ctx.nullKeyString);
+ ((Map<Object,Object>)obj2).put(null, val);
}
for (var v : obj2.values())
replaceNullKeySentinel(v);
@@ -1545,14 +1545,14 @@ public class ParquetParserSession extends InputStreamParserSession implements Re
return value;
if (value instanceof JsonMap)
return value;
- if (value instanceof Map<?, ?> value2 && !type.isMap())
+ if (value instanceof Map<?,?> value2 && !type.isMap())
return new JsonMap(value2);
return value;
}
/** Unwraps ValueHolder map {value: X} to X when target is scalar; else converts via MarshallingSession. */
private Object unwrapValueHolder(Object row, ClassMeta<?> targetType) throws ParseException {
- if (!(row instanceof Map<?, ?> row2))
+ if (!(row instanceof Map<?,?> row2))
return convertToType(row, targetType);
// Unwrap {value: X} when target is scalar (or Object) - allow maps with extra keys (e.g. _type)
if (row2.containsKey("value") && (targetType.isObject()
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parquet/ParquetSchemaBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parquet/ParquetSchemaBuilder.java
index 987c1b1554..8b03603ed7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parquet/ParquetSchemaBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parquet/ParquetSchemaBuilder.java
@@ -109,7 +109,7 @@ public final class ParquetSchemaBuilder {
*/
public List<ParquetSchemaElement> buildSchema(ClassMeta<?> cm, Object sampleBean) {
var elements = new ArrayList<ParquetSchemaElement>();
- var typesInProgress = new HashMap<Class<?>, Integer>();
+ var typesInProgress = new HashMap<Class<?>,Integer>();
addSchemaElements(elements, cm, "root", null, true, sampleBean, typesInProgress);
return elements;
}
@@ -120,7 +120,7 @@ public final class ParquetSchemaBuilder {
* @param map The map instance (keys become column names).
* @return The depth-first list of schema elements (root first).
*/
- public List<ParquetSchemaElement> buildSchemaFromMap(Map<?, ?> map) {
+ public List<ParquetSchemaElement> buildSchemaFromMap(Map<?,?> map) {
var elements = new ArrayList<ParquetSchemaElement>();
var keys = map.keySet().stream()
.filter(String.class::isInstance)
@@ -138,7 +138,7 @@ public final class ParquetSchemaBuilder {
null,
null,
null));
- var typesInProgress = new HashMap<Class<?>, Integer>();
+ var typesInProgress = new HashMap<Class<?>,Integer>();
for (var key : keys) {
var val = map.get(key);
var cm = marshallingContext.getClassMeta(val != null ? val.getClass() : Object.class);
@@ -159,7 +159,7 @@ public final class ParquetSchemaBuilder {
*/
public List<ParquetSchemaElement> buildSchemaForKeyValuePairs(Object keySample, Object valueSample) {
var elements = new ArrayList<ParquetSchemaElement>();
- var typesInProgress = new HashMap<Class<?>, Integer>();
+ var typesInProgress = new HashMap<Class<?>,Integer>();
var keyCm = marshallingContext.getClassMeta(keySample != null ? keySample.getClass() : Object.class);
var valueCm = marshallingContext.getClassMeta(valueSample != null ? valueSample.getClass() : Object.class);
elements.add(new ParquetSchemaElement("root", null, null, null, 2, null, null, null, null, null));
@@ -168,7 +168,7 @@ public final class ParquetSchemaBuilder {
return elements;
}
- private void addSchemaElements(List<ParquetSchemaElement> elements, ClassMeta<?> cm, String name, String parentPath, boolean isRoot, Object sampleBean, Map<Class<?>, Integer> typesInProgress) {
+ private void addSchemaElements(List<ParquetSchemaElement> elements, ClassMeta<?> cm, String name, String parentPath, boolean isRoot, Object sampleBean, Map<Class<?>,Integer> typesInProgress) {
if (cm.isOptional()) {
addOptionalSchema(elements, cm, name, parentPath, isRoot, sampleBean, typesInProgress);
} else if (cm.isBean()) {
@@ -188,7 +188,7 @@ public final class ParquetSchemaBuilder {
@SuppressWarnings({
"java:S3776" // Cognitive Complexity: optional/value dispatch is inherently branchy
})
- private void addOptionalSchema(List<ParquetSchemaElement> elements, ClassMeta<?> cm, String name, String parentPath, boolean isRoot, Object sampleBean, Map<Class<?>, Integer> typesInProgress) {
+ private void addOptionalSchema(List<ParquetSchemaElement> elements, ClassMeta<?> cm, String name, String parentPath, boolean isRoot, Object sampleBean, Map<Class<?>,Integer> typesInProgress) {
var et = cm.getElementType();
if (et == null) // HTT: ClassMeta always resolves Optional's type parameter to Object at minimum
et = marshallingContext.getClassMeta(Object.class);
@@ -201,7 +201,7 @@ public final class ParquetSchemaBuilder {
@SuppressWarnings({
"java:S3776" // Cognitive Complexity: bean/cycle/property dispatch is inherently branchy
})
- private void addBeanSchema(List<ParquetSchemaElement> elements, ClassMeta<?> cm, String name, String parentPath, boolean isRoot, Object sampleBean, Map<Class<?>, Integer> typesInProgress) {
+ private void addBeanSchema(List<ParquetSchemaElement> elements, ClassMeta<?> cm, String name, String parentPath, boolean isRoot, Object sampleBean, Map<Class<?>,Integer> typesInProgress) {
var bm = cm.getBeanMeta();
if (bm == null) // HTT: addBeanSchema is only called after isBean() check; getBeanMeta() is non-null
throw iaex("Class '%s' is not a bean", cm.getName());
@@ -232,7 +232,7 @@ public final class ParquetSchemaBuilder {
var entries = new ArrayList<ResolvedProp>();
for (var p : props) {
Object childSample = null;
- if (sampleBean instanceof Map<?, ?> sampleBean2)
+ if (sampleBean instanceof Map<?,?> sampleBean2)
childSample = sampleBean2.get(p.getName());
ClassMeta<?> propCm = (ClassMeta<?>) p.getBeanInfo();
// Native logical types (GAP-9/10): a java.time temporal property carries a swap, so its
@@ -309,7 +309,7 @@ public final class ParquetSchemaBuilder {
return f != null && ap.has(ParentProperty.class, f);
}
- private void addListSchema(List<ParquetSchemaElement> elements, ClassMeta<?> cm, String name, String parentPath, boolean isRoot, Object sampleBean, Map<Class<?>, Integer> typesInProgress) {
+ private void addListSchema(List<ParquetSchemaElement> elements, ClassMeta<?> cm, String name, String parentPath, boolean isRoot, Object sampleBean, Map<Class<?>,Integer> typesInProgress) {
var et = cm.getElementType();
if (et == null) // HTT: ClassMeta always provides an element type (at least Object) for list types
throw iaex("List element type cannot be determined for '%s'", cm.getName());
@@ -336,7 +336,7 @@ public final class ParquetSchemaBuilder {
return Collections.emptyList();
}
- private void addMapSchema(List<ParquetSchemaElement> elements, ClassMeta<?> cm, String name, String parentPath, boolean isRoot, Map<Class<?>, Integer> typesInProgress) {
+ private void addMapSchema(List<ParquetSchemaElement> elements, ClassMeta<?> cm, String name, String parentPath, boolean isRoot, Map<Class<?>,Integer> typesInProgress) {
var vt = cm.getValueType();
// Parquet MAP stores keys as STRING; non-String keys (e.g. Enum) are serialized via toString/name()
if (vt == null) // HTT: ClassMeta always provides a value type (at least Object) for map types
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parquet/ParquetSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parquet/ParquetSerializerSession.java
index 07b6c63751..3ec754d1b7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parquet/ParquetSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parquet/ParquetSerializerSession.java
@@ -154,7 +154,7 @@ public class ParquetSerializerSession extends OutputStreamSerializerSession impl
// Each collection element becomes one Parquet row. Avoids list column format issues.
schema = new ParquetSchemaBuilder(ctx.getMarshallingContext(), ctx.writeDatesAsTimestamp, ctx.cycleHandling, ctx.maxRecursionDepth, ctx.nativeLogicalTypes).buildSchema(elementType, first);
} else {
- var mapFirst = (Map<?, ?>) first;
+ var mapFirst = (Map<?,?>) first;
if (!(((Map<?,?>) o).keySet().iterator().next() instanceof String)) {
schema = new ParquetSchemaBuilder(ctx.getMarshallingContext(), ctx.writeDatesAsTimestamp, ctx.cycleHandling, ctx.maxRecursionDepth, ctx.nativeLogicalTypes)
.buildSchemaForKeyValuePairs(mapFirst.get("key"), mapFirst.get("value"));
@@ -245,7 +245,7 @@ public class ParquetSerializerSession extends OutputStreamSerializerSession impl
}
var sType = getExpectedRootType(o);
if (sType.isMap()) {
- var m = (Map<?, ?>) o;
+ var m = (Map<?,?>) o;
if (m.isEmpty())
return List.of();
var firstKey = m.keySet().iterator().next();
@@ -262,9 +262,9 @@ public class ParquetSerializerSession extends OutputStreamSerializerSession impl
}
return List.of(swappedMap);
}
- var result = new ArrayList<Map<String, Object>>(m.size());
+ var result = new ArrayList<Map<String,Object>>(m.size());
for (var e : m.entrySet()) {
- var row = new LinkedHashMap<String, Object>();
+ var row = new LinkedHashMap<String,Object>();
row.put("key", e.getKey());
row.put("value", e.getValue());
result.add(row);
@@ -453,7 +453,7 @@ public class ParquetSerializerSession extends OutputStreamSerializerSession impl
*/
private DefValue computeDefValue(Object row, String path, int maxDef) throws SerializeException {
var parts = path.split("\\.");
- var seen = Collections.newSetFromMap(new IdentityHashMap<Object, Boolean>());
+ var seen = Collections.newSetFromMap(new IdentityHashMap<Object,Boolean>());
seen.add(row);
seen.add(((BeanMap<?>) row).getBean());
Object current = row;
@@ -607,7 +607,7 @@ public class ParquetSerializerSession extends OutputStreamSerializerSession impl
int maxDef = maxDefLevelForListPath(path);
int depth = listDepth(path);
for (var row : rows) {
- var seen = Collections.newSetFromMap(new IdentityHashMap<Object, Boolean>());
+ var seen = Collections.newSetFromMap(new IdentityHashMap<Object,Boolean>());
flattenListValues(row, path, 0, true, 0, depth, maxDef, result, seen);
}
return result;
@@ -638,7 +638,7 @@ public class ParquetSerializerSession extends OutputStreamSerializerSession impl
return result;
}
- private Map<?, ?> getMapAtPath(Object row, String mapProp) throws SerializeException {
+ private Map<?,?> getMapAtPath(Object row, String mapProp) throws SerializeException {
var obj = getValueByPath(row, mapProp);
if (obj == null)
return Collections.emptyMap();
@@ -750,7 +750,7 @@ public class ParquetSerializerSession extends OutputStreamSerializerSession impl
private Object getValueByPath(Object row, String path) throws SerializeException {
var parts = path.split("\\.");
- var seen = Collections.newSetFromMap(new IdentityHashMap<Object, Boolean>());
+ var seen = Collections.newSetFromMap(new IdentityHashMap<Object,Boolean>());
seen.add(row);
if (row instanceof BeanMap<?> row2)
seen.add(row2.getBean());
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextParser.java
index bb4d03efb9..4764a8bfd3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextParser.java
@@ -106,7 +106,7 @@ public class PrototextParser extends ReaderParser implements PrototextMetaProvid
*/
public static class Builder extends ReaderParser.Builder<Builder> {
- private static final Cache<HashKey, PrototextParser> CACHE =
+ private static final Cache<HashKey,PrototextParser> CACHE =
Cache.of(HashKey.class, PrototextParser.class).build();
protected Builder() {
@@ -135,8 +135,8 @@ public class PrototextParser extends ReaderParser implements PrototextMetaProvid
/** Default parser instance. */
public static final PrototextParser DEFAULT = new PrototextParser(create());
- private final Map<ClassMeta<?>, PrototextClassMeta> prototextClassMetas = new ConcurrentHashMap<>();
- private final Map<BeanPropertyMeta, PrototextBeanPropertyMeta> prototextBeanPropertyMetas = new ConcurrentHashMap<>();
+ private final Map<ClassMeta<?>,PrototextClassMeta> prototextClassMetas = new ConcurrentHashMap<>();
+ private final Map<BeanPropertyMeta,PrototextBeanPropertyMeta> prototextBeanPropertyMetas = new ConcurrentHashMap<>();
/**
* Creates a new builder.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextParserSession.java
index 9bfb24ea4a..e7ac23b538 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextParserSession.java
@@ -94,7 +94,7 @@ public class PrototextParserSession extends ReaderParserSession implements Recor
if (r == null)
return null;
var t = new PrototextTokenizer(r);
- Map<String, Object> root = readMessage(t, false);
+ Map<String,Object> root = readMessage(t, false);
if (isEmpty(root))
return type.canCreateNewBean(getOuter()) ? type.newInstance(getOuter()) : null;
if (root.size() == 1 && root.containsKey("_value")) {
@@ -114,7 +114,7 @@ public class PrototextParserSession extends ReaderParserSession implements Recor
}
}
- private Map<String, Object> readMessage(PrototextTokenizer t, boolean requireBraces) throws IOException, ParseException {
+ private Map<String,Object> readMessage(PrototextTokenizer t, boolean requireBraces) throws IOException, ParseException {
PrototextToken.TokenType closeBrace = null;
if (requireBraces) {
var tok = t.read();
@@ -126,7 +126,7 @@ public class PrototextParserSession extends ReaderParserSession implements Recor
return new LinkedHashMap<>();
}
- var result = new LinkedHashMap<String, Object>();
+ var result = new LinkedHashMap<String,Object>();
while (true) {
t.skipWhitespaceAndComments();
@@ -275,7 +275,7 @@ public class PrototextParserSession extends ReaderParserSession implements Recor
};
}
- private <T> T convertMapToType(Map<String, Object> map, ClassMeta<T> type) throws ParseException, ExecutableException {
+ private <T> T convertMapToType(Map<String,Object> map, ClassMeta<T> type) throws ParseException, ExecutableException {
if (type.isMap()) {
var inner = type.inner();
if (inner != null && JsonMap.class.isAssignableFrom(inner)) {
@@ -294,9 +294,9 @@ public class PrototextParserSession extends ReaderParserSession implements Recor
return bm.getBean();
}
- private JsonMap toJsonMap(Map<?, ?> map) throws ParseException, ExecutableException {
+ private JsonMap toJsonMap(Map<?,?> map) throws ParseException, ExecutableException {
var jm = new JsonMap();
- for (Entry<?, ?> e : map.entrySet()) {
+ for (Entry<?,?> e : map.entrySet()) {
var k = e.getKey();
var v = e.getValue();
Object converted = v instanceof Map v2 ? toJsonMap(v2) : convertValue(v, object());
@@ -305,9 +305,9 @@ public class PrototextParserSession extends ReaderParserSession implements Recor
return jm;
}
- private void populateBeanMap(BeanMap<?> bm, Map<String, Object> map) throws ParseException, ExecutableException {
+ private void populateBeanMap(BeanMap<?> bm, Map<String,Object> map) throws ParseException, ExecutableException {
var typePropName = getBeanTypePropertyName((ClassMeta<?>) bm.getBeanInfo());
- for (Entry<String, Object> e : map.entrySet()) {
+ for (Entry<String,Object> e : map.entrySet()) {
var key = e.getKey();
if (key.equals(typePropName))
continue;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextSerializer.java
index 7bcbb08aa9..5837142a6b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextSerializer.java
@@ -138,7 +138,7 @@ public class PrototextSerializer extends WriterSerializer implements PrototextMe
*/
public static class Builder extends WriterSerializer.Builder<Builder> {
- private static final Cache<HashKey, PrototextSerializer> CACHE =
+ private static final Cache<HashKey,PrototextSerializer> CACHE =
Cache.of(HashKey.class, PrototextSerializer.class).build();
private boolean useListSyntaxForBeans = false;
@@ -244,8 +244,8 @@ public class PrototextSerializer extends WriterSerializer implements PrototextMe
protected final boolean useListSyntaxForBeans;
protected final boolean useColonForMessages;
- private final Map<ClassMeta<?>, PrototextClassMeta> prototextClassMetas = new ConcurrentHashMap<>();
- private final Map<BeanPropertyMeta, PrototextBeanPropertyMeta> prototextBeanPropertyMetas = new ConcurrentHashMap<>();
+ private final Map<ClassMeta<?>,PrototextClassMeta> prototextClassMetas = new ConcurrentHashMap<>();
+ private final Map<BeanPropertyMeta,PrototextBeanPropertyMeta> prototextBeanPropertyMetas = new ConcurrentHashMap<>();
/**
* Constructor.
@@ -269,7 +269,7 @@ public class PrototextSerializer extends WriterSerializer implements PrototextMe
}
@Override
- protected FluentMap<String, Object> properties() {
+ protected FluentMap<String,Object> properties() {
return super.properties()
.a(PROP_useListSyntaxForBeans, useListSyntaxForBeans)
.a(PROP_useColonForMessages, useColonForMessages);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextSerializerSession.java
index 2ac4cfd3b9..50149cbb90 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/prototext/PrototextSerializerSession.java
@@ -326,7 +326,7 @@ public class PrototextSerializerSession extends WriterSerializerSession implemen
});
}
- private void writeMap(PrototextWriter out, Map<?, ?> map, ClassMeta<?> type) throws SerializeException {
+ private void writeMap(PrototextWriter out, Map<?,?> map, ClassMeta<?> type) throws SerializeException {
forEachEntry(map, e -> {
var k = toString(e.getKey());
var v = e.getValue();
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/stream/PojoWalker.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/stream/PojoWalker.java
index 92d4f3a947..a0b53c033b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/stream/PojoWalker.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/stream/PojoWalker.java
@@ -171,7 +171,7 @@ public final class PojoWalker {
w.string(value2.toString());
return;
}
- if (value instanceof Map<?, ?> value2) {
+ if (value instanceof Map<?,?> value2) {
enterAncestor(value, ancestors);
try {
walkMap(w, value2, options, ancestors);
@@ -251,9 +251,9 @@ public final class PojoWalker {
w.number(n);
}
- private static void walkMap(TokenWriter w, Map<?, ?> m, Options options, Set<Object> ancestors) throws IOException {
+ private static void walkMap(TokenWriter w, Map<?,?> m, Options options, Set<Object> ancestors) throws IOException {
w.startObject();
- Iterable<? extends Map.Entry<?, ?>> entries = m.entrySet();
+ Iterable<? extends Map.Entry<?,?>> entries = m.entrySet();
if (options.sortMaps && !m.isEmpty())
entries = sortedEntries(m);
for (var entry : entries) {
@@ -267,8 +267,8 @@ public final class PojoWalker {
w.endObject();
}
- private static List<Map.Entry<Object, Object>> sortedEntries(Map<?, ?> m) {
- var list = new ArrayList<Map.Entry<Object, Object>>(m.size());
+ private static List<Map.Entry<Object,Object>> sortedEntries(Map<?,?> m) {
+ var list = new ArrayList<Map.Entry<Object,Object>>(m.size());
for (var entry : m.entrySet())
list.add(new AbstractMap.SimpleEntry<>(entry.getKey(), entry.getValue()));
list.sort(Comparator.comparing(e -> {
@@ -281,7 +281,7 @@ public final class PojoWalker {
private static boolean skipMapEntry(Object value, Options options) {
if (value == null)
return !options.keepNullProperties;
- if (options.trimEmptyMaps && value instanceof Map<?, ?> value2 && value2.isEmpty())
+ if (options.trimEmptyMaps && value instanceof Map<?,?> value2 && value2.isEmpty())
return true;
if (options.trimEmptyCollections) {
if (value instanceof Collection<?> value2 && value2.isEmpty())
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/toml/TomlParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/toml/TomlParser.java
index 91b6972b63..2043757f5a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/toml/TomlParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/toml/TomlParser.java
@@ -198,7 +198,7 @@ public class TomlParser extends ReaderParser implements RecordReadable {
}
@Override
- protected FluentMap<String, Object> properties() {
+ protected FluentMap<String,Object> properties() {
return super.properties().a(PROP_nullValue, nullValue);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/toml/TomlParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/toml/TomlParserSession.java
index b117a6c5d2..02f1b8b25c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/toml/TomlParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/toml/TomlParserSession.java
@@ -110,7 +110,7 @@ public class TomlParserSession extends ReaderParserSession implements RecordRead
try (Reader r = pipe.getParserReader()) {
if (r == null)
return null;
- Map<String, Object> root = readTomlDocument(new TomlTokenizer(r));
+ Map<String,Object> root = readTomlDocument(new TomlTokenizer(r));
if (isEmpty(root))
return type.canCreateNewBean(getOuter()) ? type.newInstance(getOuter()) : null;
// Root _value wrapper: document has exactly one key _value
@@ -122,9 +122,9 @@ public class TomlParserSession extends ReaderParserSession implements RecordRead
}
}
- private Map<String, Object> readTomlDocument(TomlTokenizer t) throws IOException, ParseException {
- Map<String, Object> root = new LinkedHashMap<>();
- Map<String, Object> currentTable = root;
+ private Map<String,Object> readTomlDocument(TomlTokenizer t) throws IOException, ParseException {
+ Map<String,Object> root = new LinkedHashMap<>();
+ Map<String,Object> currentTable = root;
while (!t.isEof()) {
t.skipWhitespaceAndComments();
@@ -144,7 +144,7 @@ public class TomlParserSession extends ReaderParserSession implements RecordRead
setAt(root, path, new ArrayList<>());
existing = getOrCreateAt(root, path);
}
- Map<String, Object> newTable = new LinkedHashMap<>();
+ Map<String,Object> newTable = new LinkedHashMap<>();
((List)existing).add(newTable);
currentTable = newTable;
} else {
@@ -237,7 +237,7 @@ public class TomlParserSession extends ReaderParserSession implements RecordRead
if (c == '{') {
t.read();
t.skipWhitespace();
- var map = new LinkedHashMap<String, Object>();
+ var map = new LinkedHashMap<String,Object>();
while (t.peek() != '}') {
t.skipWhitespace();
List<String> k = readKey(t);
@@ -362,46 +362,46 @@ public class TomlParserSession extends ReaderParserSession implements RecordRead
}
}
- private static Object getOrCreateAt(Map<String, Object> root, String path) {
+ private static Object getOrCreateAt(Map<String,Object> root, String path) {
String[] parts = path.split("\\.");
Object current = root;
for (int i = 0; i < parts.length - 1; i++) {
- current = ((Map)current).computeIfAbsent(parts[i], k -> new LinkedHashMap<String, Object>());
+ current = ((Map)current).computeIfAbsent(parts[i], k -> new LinkedHashMap<String,Object>());
}
return ((Map)current).get(parts[parts.length - 1]);
}
- private static Map<String, Object> getOrCreateTableAt(Map<String, Object> root, String path) {
+ private static Map<String,Object> getOrCreateTableAt(Map<String,Object> root, String path) {
String[] parts = path.split("\\.");
Object current = root;
for (String part : parts) {
- current = ((Map)current).computeIfAbsent(part, k -> new LinkedHashMap<String, Object>());
+ current = ((Map)current).computeIfAbsent(part, k -> new LinkedHashMap<String,Object>());
}
- return (Map<String, Object>) current;
+ return (Map<String,Object>) current;
}
- private static void setAt(Map<String, Object> root, String path, Object value) {
+ private static void setAt(Map<String,Object> root, String path, Object value) {
String[] parts = path.split("\\.");
Object current = root;
for (int i = 0; i < parts.length - 1; i++) {
- current = ((Map)current).computeIfAbsent(parts[i], k -> new LinkedHashMap<String, Object>());
+ current = ((Map)current).computeIfAbsent(parts[i], k -> new LinkedHashMap<String,Object>());
}
((Map)current).put(parts[parts.length - 1], value);
}
- private static void setValueAt(Map<String, Object> root, List<String> keyPath, Object value) {
+ private static void setValueAt(Map<String,Object> root, List<String> keyPath, Object value) {
if (keyPath.size() == 1) {
root.put(keyPath.get(0), value);
return;
}
Object current = root;
for (int i = 0; i < keyPath.size() - 1; i++) {
- current = ((Map)current).computeIfAbsent(keyPath.get(i), k -> new LinkedHashMap<String, Object>());
+ current = ((Map)current).computeIfAbsent(keyPath.get(i), k -> new LinkedHashMap<String,Object>());
}
((Map)current).put(keyPath.get(keyPath.size() - 1), value);
}
- private <T> T convertMapToType(Map<String, Object> map, ClassMeta<T> type) throws ParseException, ExecutableException {
+ private <T> T convertMapToType(Map<String,Object> map, ClassMeta<T> type) throws ParseException, ExecutableException {
if (type.isMap()) {
var keyType = type.getKeyType();
var valueType = type.getValueType();
@@ -419,9 +419,9 @@ public class TomlParserSession extends ReaderParserSession implements RecordRead
return (T) bm.getBean();
}
- private JsonMap toJsonMap(Map<?, ?> map) throws ParseException, ExecutableException {
+ private JsonMap toJsonMap(Map<?,?> map) throws ParseException, ExecutableException {
var jm = new JsonMap();
- for (Entry<?, ?> e : map.entrySet()) {
+ for (Entry<?,?> e : map.entrySet()) {
Object k = e.getKey();
Object v = e.getValue();
Object converted = v instanceof Map v2 ? toJsonMap(v2) : convertValue(v, object());
@@ -430,8 +430,8 @@ public class TomlParserSession extends ReaderParserSession implements RecordRead
return jm;
}
- private void populateBeanMap(BeanMap<?> bm, Map<String, Object> map) throws ParseException, ExecutableException {
- for (Entry<String, Object> e : map.entrySet()) {
+ private void populateBeanMap(BeanMap<?> bm, Map<String,Object> map) throws ParseException, ExecutableException {
+ for (Entry<String,Object> e : map.entrySet()) {
String key = e.getKey();
Object val = e.getValue();
BeanPropertyMeta pMeta = bm.getMeta().getProperties().get(key);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/toml/TomlSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/toml/TomlSerializerSession.java
index 521f787969..5c6001a63e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/toml/TomlSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/toml/TomlSerializerSession.java
@@ -164,8 +164,8 @@ public class TomlSerializerSession extends WriterSerializerSession implements Re
private void writeBean(TomlWriter w, BeanMap<?> m, String tablePath) throws SerializeException {
Predicate<Object> checkNull = x -> isKeepNullProperties() || nn(x);
- List<Map.Entry<BeanPropertyMeta, Object>> simple = new ArrayList<>();
- List<Map.Entry<BeanPropertyMeta, Object>> complex = new ArrayList<>();
+ List<Map.Entry<BeanPropertyMeta,Object>> simple = new ArrayList<>();
+ List<Map.Entry<BeanPropertyMeta,Object>> complex = new ArrayList<>();
m.forEachValue(checkNull, (pMeta, key, value, thrown) -> {
if (nn(thrown))
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/utils/Iso8601Utils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/utils/Iso8601Utils.java
index 98ed8a92b8..89e6403ca6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/utils/Iso8601Utils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/utils/Iso8601Utils.java
@@ -53,7 +53,7 @@ public final class Iso8601Utils {
private static final DateTimeFormatter YEAR_FORMATTER = DateTimeFormatter.ofPattern("uuuu");
private static final DateTimeFormatter YEAR_MONTH_FORMATTER = DateTimeFormatter.ofPattern("uuuu-MM");
- private static final Map<Class<?>, DateTimeFormatter> DEFAULT_FORMATTERS = Map.ofEntries(
+ private static final Map<Class<?>,DateTimeFormatter> DEFAULT_FORMATTERS = Map.ofEntries(
Map.entry(Instant.class, DateTimeFormatter.ISO_INSTANT),
Map.entry(ZonedDateTime.class, DateTimeFormatter.ISO_OFFSET_DATE_TIME),
Map.entry(OffsetDateTime.class, DateTimeFormatter.ISO_OFFSET_DATE_TIME),
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/BeanMap_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/BeanMap_Test.java
index 43dfacb86f..969bacf3de 100755
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/BeanMap_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/BeanMap_Test.java
@@ -2023,7 +2023,7 @@ class BeanMap_Test extends TestBase {
/** Bean with a Map-backed dyna property for extra entries (see BasicBeans_Test.B). */
public static class DynaExtrasBean {
@BeanProp(name="*")
- public Map<String, Object> extras = new LinkedHashMap<>();
+ public Map<String,Object> extras = new LinkedHashMap<>();
}
@Test void z02_containsKey_dynaBean_unknownKeyNotInExtrasMap() {
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/BeanProp_StarPlainField_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/BeanProp_StarPlainField_Test.java
index 8b4a1e1ba2..99bbe2b966 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/BeanProp_StarPlainField_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/BeanProp_StarPlainField_Test.java
@@ -46,7 +46,7 @@ class BeanProp_StarPlainField_Test extends TestBase {
/** Dynamic {@code Map} field must remain the dyna property {@code *}. */
public static class C {
@BeanProp("*")
- public Map<String, Object> extra = new LinkedHashMap<>();
+ public Map<String,Object> extra = new LinkedHashMap<>();
}
@Test
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/DynaBean_ComboRoundTripTest.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/DynaBean_ComboRoundTripTest.java
index 93c4965b0b..d66b57ca5d 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/DynaBean_ComboRoundTripTest.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/DynaBean_ComboRoundTripTest.java
@@ -227,7 +227,7 @@ class DynaBean_ComboRoundTripTest extends ComboRoundTripTest_Base {
public void setF3(int v) { f3 = v; }
@BeanProp(name="*")
- public Map<String, Object> xxx() {
+ public Map<String,Object> xxx() {
return f2;
}
@@ -297,7 +297,7 @@ class DynaBean_ComboRoundTripTest extends ComboRoundTripTest_Base {
public void setF3(int v) { f3 = v; }
@BeanProp(name="*")
- public Map<String, Object> xxx() {
+ public Map<String,Object> xxx() {
return f2;
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/MediaRange_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/MediaRange_Test.java
index d93f5bf641..ac6c7af76e 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/MediaRange_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/MediaRange_Test.java
@@ -63,7 +63,7 @@ class MediaRange_Test extends TestBase {
var x = new MediaRange(element);
// Collect all parameter values
- var params = new HashMap<String, String>();
+ var params = new HashMap<String,String>();
x.forEachParameter(p -> params.put(p.getName(), p.getValue()));
assertEquals("UTF-8", params.get("charset"));
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/markdown/MarkdownParserSession_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/markdown/MarkdownParserSession_Test.java
index 917d3459c8..5afc299daa 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/markdown/MarkdownParserSession_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/markdown/MarkdownParserSession_Test.java
@@ -412,7 +412,7 @@ class MarkdownParserSession_Test extends TestBase {
}
// Swap targeting Map<String,Object> - exercises top-level keyValueTableToJson5 / needsJson5Path branch.
- public static class IBeanMapSwap extends ObjectSwap<IBeanWithSwap, Map<String,Object>> {
+ public static class IBeanMapSwap extends ObjectSwap<IBeanWithSwap,Map<String,Object>> {
@Override
public Map<String,Object> swap(MarshallingSession session, IBeanWithSwap o) {
var m = new LinkedHashMap<String,Object>();
@@ -487,7 +487,7 @@ class MarkdownParserSession_Test extends TestBase {
assertEquals("x", r.name);
}
- public static class IBeanMapSwapBool extends ObjectSwap<IBeanBool, Map<String,Object>> {
+ public static class IBeanMapSwapBool extends ObjectSwap<IBeanBool,Map<String,Object>> {
@Override
public Map<String,Object> swap(MarshallingSession session, IBeanBool o) {
var m = new LinkedHashMap<String,Object>();
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/markdown/MarkdownParser_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/markdown/MarkdownParser_Test.java
index 56f262450e..515eabfaae 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/markdown/MarkdownParser_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/markdown/MarkdownParser_Test.java
@@ -305,11 +305,11 @@ class MarkdownParser_Test {
"unchecked" // Unchecked cast required for generic test utility.
})
void j04_roundTripStringToStringMap() {
- var original = new LinkedHashMap<String, String>();
+ var original = new LinkedHashMap<String,String>();
original.put("k1", "v1");
original.put("k2", "v2");
var md = MarkdownSerializer.DEFAULT.write(original);
- var parsed = (Map<String, String>) MarkdownParser.DEFAULT.read(md, Map.class, String.class, String.class);
+ var parsed = (Map<String,String>) MarkdownParser.DEFAULT.read(md, Map.class, String.class, String.class);
assertEquals(original, parsed);
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/MarshallingContext_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/MarshallingContext_Test.java
index b9783ac690..dc054876c2 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/MarshallingContext_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/MarshallingContext_Test.java
@@ -375,7 +375,7 @@ class BeanContext_Test extends TestBase {
public DummyNormal(String v) { this.value = v; }
}
- public static class DummySwap extends ObjectSwap<DummyNormal, String> {
+ public static class DummySwap extends ObjectSwap<DummyNormal,String> {
@Override
public String swap(MarshallingSession session, DummyNormal o) throws Exception {
return o.value;
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/bson/BsonEdgeCases_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/bson/BsonEdgeCases_Test.java
index b17e3c8b99..1dc7b693cb 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/bson/BsonEdgeCases_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/bson/BsonEdgeCases_Test.java
@@ -66,7 +66,7 @@ class BsonEdgeCases_Test extends TestBase {
@Test
void a04_nestedEmptyStructures() throws Exception {
- Map<String, Object> m = new LinkedHashMap<>();
+ Map<String,Object> m = new LinkedHashMap<>();
m.put("emptyMap", new LinkedHashMap<>());
m.put("emptyList", List.of());
var s = BsonSerializer.create().keepNullProperties().build();
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/bson/BsonRoundTrip_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/bson/BsonRoundTrip_Test.java
index 531fdc1a4f..beb0019a44 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/bson/BsonRoundTrip_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/bson/BsonRoundTrip_Test.java
@@ -40,22 +40,22 @@ class BsonRoundTrip_Test extends TestBase {
void a01_simpleMapRoundTrip() throws Exception {
var a = JsonMap.of("name", "Alice", "age", 30, "active", true);
var bytes = BsonSerializer.create().keepNullProperties().build().write(a);
- var b = (Map<String, Object>) BsonParser.create().build().read(bytes, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) BsonParser.create().build().read(bytes, Map.class, String.class, Object.class);
assertBean(b, "name,age,active", "Alice,30,true");
}
@Test
void a02_nestedMapRoundTrip() throws Exception {
- var addr = new LinkedHashMap<String, Object>();
+ var addr = new LinkedHashMap<String,Object>();
addr.put("city", "Boston");
addr.put("state", "MA");
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("name", "Alice");
a.put("address", addr);
var s = BsonSerializer.create().keepNullProperties().build();
var p = BsonParser.create().build();
var bytes = s.write(a);
- var b = (Map<String, Object>) p.read(bytes, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) p.read(bytes, Map.class, String.class, Object.class);
assertBean(b, "name,address{city,state}", "Alice,{Boston,MA}");
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/cbor/CborOutputStream_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/cbor/CborOutputStream_Test.java
index 21a6b3e2a3..adfeea9535 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/cbor/CborOutputStream_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/cbor/CborOutputStream_Test.java
@@ -230,7 +230,7 @@ class CborOutputStream_Test extends TestBase {
@Test
void a31_longMap() throws Exception {
- var m = new LinkedHashMap<String, Integer>();
+ var m = new LinkedHashMap<String,Integer>();
for (int i = 0; i < 24; i++)
m.put("k" + i, i);
var b = CborSerializer.DEFAULT.write(m);
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/cbor/CborTokenStream_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/cbor/CborTokenStream_Test.java
index c5aa95054a..1b6a821555 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/cbor/CborTokenStream_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/cbor/CborTokenStream_Test.java
@@ -318,7 +318,7 @@ class CborTokenStream_Test extends TestBase {
@Test void e02_objectWithBinary() throws Exception {
// byte[] inside a Map should emit as VALUE_BINARY native, not base64.
- var m = new java.util.LinkedHashMap<String, Object>();
+ var m = new java.util.LinkedHashMap<String,Object>();
m.put("name", "alice");
m.put("data", new byte[]{1, 2, 3});
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/csv/CsvCellParser_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/csv/CsvCellParser_Test.java
index d27ec9498d..e7c5248da0 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/csv/CsvCellParser_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/csv/CsvCellParser_Test.java
@@ -129,20 +129,20 @@ class CsvCellParser_Test extends TestBase {
@SuppressWarnings("unchecked")
@Test void d01_empty_object() throws ParseException {
- var r = (Map<String, Object>) CsvCellParser.read("{}", null);
+ var r = (Map<String,Object>) CsvCellParser.read("{}", null);
assertNotNull(r);
assertTrue(r.isEmpty());
}
@SuppressWarnings("unchecked")
@Test void d02_single_pair() throws ParseException {
- var r = (Map<String, Object>) CsvCellParser.read("{a:1}", null);
+ var r = (Map<String,Object>) CsvCellParser.read("{a:1}", null);
assertEquals(1L, r.get("a"));
}
@SuppressWarnings("unchecked")
@Test void d03_multiple_pairs() throws ParseException {
- var r = (Map<String, Object>) CsvCellParser.read("{a:1;b:2;c:3}", null);
+ var r = (Map<String,Object>) CsvCellParser.read("{a:1;b:2;c:3}", null);
assertEquals(1L, r.get("a"));
assertEquals(2L, r.get("b"));
assertEquals(3L, r.get("c"));
@@ -150,19 +150,19 @@ class CsvCellParser_Test extends TestBase {
@SuppressWarnings("unchecked")
@Test void d04_object_with_string_value() throws ParseException {
- var r = (Map<String, Object>) CsvCellParser.read("{name:Alice}", null);
+ var r = (Map<String,Object>) CsvCellParser.read("{name:Alice}", null);
assertEquals("Alice", r.get("name"));
}
@SuppressWarnings("unchecked")
@Test void d05_object_with_quoted_key() throws ParseException {
- var r = (Map<String, Object>) CsvCellParser.read("{\"my key\":val}", null);
+ var r = (Map<String,Object>) CsvCellParser.read("{\"my key\":val}", null);
assertEquals("val", r.get("my key"));
}
@SuppressWarnings("unchecked")
@Test void d06_object_with_null_value() throws ParseException {
- var r = (Map<String, Object>) CsvCellParser.read("{a:null}", null);
+ var r = (Map<String,Object>) CsvCellParser.read("{a:null}", null);
assertNull(r.get("a"));
}
@@ -176,7 +176,7 @@ class CsvCellParser_Test extends TestBase {
@SuppressWarnings("unchecked")
@Test void d09_nested_object() throws ParseException {
- var r = (Map<String, Object>) CsvCellParser.read("{a:{b:1}}", null);
+ var r = (Map<String,Object>) CsvCellParser.read("{a:{b:1}}", null);
assertInstanceOf(Map.class, r.get("a"));
}
@@ -239,7 +239,7 @@ class CsvCellParser_Test extends TestBase {
@SuppressWarnings("unchecked")
@Test void f01_object_with_spaces() throws ParseException {
- var r = (Map<String, Object>) CsvCellParser.read("{ a : 1 ; b : 2 }", null);
+ var r = (Map<String,Object>) CsvCellParser.read("{ a : 1 ; b : 2 }", null);
assertEquals(1L, r.get("a"));
assertEquals(2L, r.get("b"));
}
@@ -261,14 +261,14 @@ class CsvCellParser_Test extends TestBase {
@SuppressWarnings("unchecked")
@Test void h01_object_empty_value_before_semicolon() throws ParseException {
// In {a:;b:2}, the value of 'a' is parsed via readSimpleValue where peek() == ';'
- var r = (Map<String, Object>) CsvCellParser.read("{a:;b:2}", null);
+ var r = (Map<String,Object>) CsvCellParser.read("{a:;b:2}", null);
assertEquals("", r.get("a"));
assertEquals(2L, r.get("b"));
}
@SuppressWarnings("unchecked")
@Test void h02_object_empty_value_before_close() throws ParseException {
- var r = (Map<String, Object>) CsvCellParser.read("{a:}", null);
+ var r = (Map<String,Object>) CsvCellParser.read("{a:}", null);
assertEquals("", r.get("a"));
}
@@ -292,13 +292,13 @@ class CsvCellParser_Test extends TestBase {
@SuppressWarnings("unchecked")
@Test void i01_identifier_stops_at_colon() throws ParseException {
- var r = (Map<String, Object>) CsvCellParser.read("{key:val}", null);
+ var r = (Map<String,Object>) CsvCellParser.read("{key:val}", null);
assertEquals("val", r.get("key"));
}
@SuppressWarnings("unchecked")
@Test void i02_identifier_stops_at_semicolon() throws ParseException {
- var r = (Map<String, Object>) CsvCellParser.read("{a:x;b:y}", null);
+ var r = (Map<String,Object>) CsvCellParser.read("{a:x;b:y}", null);
assertEquals("x", r.get("a"));
}
@@ -313,7 +313,7 @@ class CsvCellParser_Test extends TestBase {
@SuppressWarnings("unchecked")
@Test void g02_empty_key_reads_to_empty_string() throws ParseException {
// parser reads empty identifier as empty string key
- var r = (Map<String, Object>) CsvCellParser.read("{:val}", null);
+ var r = (Map<String,Object>) CsvCellParser.read("{:val}", null);
assertTrue(r.containsKey(""));
assertEquals("val", r.get(""));
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/csv/Csv_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/csv/Csv_Test.java
index 3808efff66..9a0ba81007 100755
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/csv/Csv_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/csv/Csv_Test.java
@@ -538,10 +538,10 @@ class Csv_Test extends TestBase {
public static class J {
public String name;
public List<String> tags;
- public Map<String, Object> meta;
+ public Map<String,Object> meta;
public J() {}
- public J(String name, List<String> tags, Map<String, Object> meta) {
+ public J(String name, List<String> tags, Map<String,Object> meta) {
this.name = name;
this.tags = tags;
this.meta = meta;
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonEdgeCases_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonEdgeCases_Test.java
index cec4ca65fe..e8972cb5e0 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonEdgeCases_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonEdgeCases_Test.java
@@ -47,11 +47,11 @@ class HjsonEdgeCases_Test extends TestBase {
@Test
void f03_unicodeStrings() throws Exception {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("text", "Hello 世界 café \uD83D\uDE00");
m.put("key\u4E2D", "value");
var hjson = HjsonSerializer.DEFAULT.write(m);
- var parsed = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var parsed = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertEquals("Hello 世界 café \uD83D\uDE00", parsed.get("text"));
assertEquals("value", parsed.get("key\u4E2D"));
}
@@ -59,10 +59,10 @@ class HjsonEdgeCases_Test extends TestBase {
@Test
void f04_windowsLineEndings() throws Exception {
var hjson = "a: x\r\nb: y";
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertBean(m, "a,b", "x,y");
var hjson2 = "{\"a\":1,\"b\":2}";
- var m2 = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson2, Map.class, String.class, Object.class);
+ var m2 = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson2, Map.class, String.class, Object.class);
assertEquals(1, m2.get("a"));
assertEquals(2, m2.get("b"));
}
@@ -75,30 +75,30 @@ class HjsonEdgeCases_Test extends TestBase {
sb.append("{}");
for (var i = 0; i < 12; i++)
sb.append("}");
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(sb.toString(), Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(sb.toString(), Map.class, String.class, Object.class);
var current = m;
for (var i = 0; i < 12; i++) {
assertEquals(i, current.get("a"));
var next = current.get("nest");
if (i < 11) {
assertNotNull(next);
- current = (Map<String, Object>) next;
+ current = (Map<String,Object>) next;
}
}
- assertEquals(0, ((Map<?, ?>) current.get("nest")).size());
+ assertEquals(0, ((Map<?,?>) current.get("nest")).size());
}
@Test
void f06_quotelessWithTrailingSpaces() throws Exception {
var hjson = "key: value with spaces ";
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertEquals("value with spaces", m.get("key"));
}
@Test
void f07_multilineEmpty() throws Exception {
var hjson = "{\"x\":'''\n'''}";
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertEquals("", m.get("x"));
}
@@ -111,18 +111,18 @@ class HjsonEdgeCases_Test extends TestBase {
c: 'single'
}
""";
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertBean(m, "a,b,c", "quoteless,quoted,single");
}
@Test
void f09_quotelessNumberVsString() throws Exception {
var hjson = "{\"n\":5,\"s\":\"5 times\"}";
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertEquals(5, m.get("n"));
assertEquals("5 times", m.get("s"));
var hjson2 = "n: 5\ns: 5 times";
- var m2 = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson2, Map.class, String.class, Object.class);
+ var m2 = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson2, Map.class, String.class, Object.class);
assertEquals(5, m2.get("n"));
assertEquals("5 times", m2.get("s"));
}
@@ -130,12 +130,12 @@ class HjsonEdgeCases_Test extends TestBase {
@Test
void f10_unicodeEscapeInQuoted() throws Exception {
var hjson = "{\"a\":\"\\" + "u0041\",\"b\":\"\\" + "u00E9\",\"c\":\"\\" + "u4E2D\"}";
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertEquals("A", m.get("a"));
assertEquals("\u00E9", m.get("b"));
assertEquals("\u4E2D", m.get("c"));
var emoji = "{\"x\":\"\\" + "uD83D\\" + "uDE00\"}";
- var m2 = (Map<String, Object>) HjsonParser.DEFAULT.read(emoji, Map.class, String.class, Object.class);
+ var m2 = (Map<String,Object>) HjsonParser.DEFAULT.read(emoji, Map.class, String.class, Object.class);
assertEquals("\uD83D\uDE00", m2.get("x"));
}
@@ -150,7 +150,7 @@ class HjsonEdgeCases_Test extends TestBase {
'''
}
""";
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
var desc = (String) m.get("desc");
assertNotNull(desc);
assertTrue(desc.contains("line1"));
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonMediaType_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonMediaType_Test.java
index f30b673104..ac31764605 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonMediaType_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonMediaType_Test.java
@@ -53,7 +53,7 @@ class HjsonMediaType_Test {
var a = JsonMap.of("name", "test", "count", 42);
var hjson = toHjson(a);
assertNotNull(hjson);
- var b = (Map<String, Object>) fromHjson(hjson, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) fromHjson(hjson, Map.class, String.class, Object.class);
assertBean(b, "name,count", "test,42");
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonParser_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonParser_Test.java
index f984cdb9e6..e555281af8 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonParser_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonParser_Test.java
@@ -35,7 +35,7 @@ class HjsonParser_Test extends TestBase {
@Test
void a01_quotedStrings() throws Exception {
var hjson = "{\"name\":\"Alice\",\"age\":30}";
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertBean(m, "name,age", "Alice,30");
}
@@ -47,21 +47,21 @@ class HjsonParser_Test extends TestBase {
age: 30
}
""";
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertBean(m, "name,age", "Alice,30");
}
@Test
void a03_rootBraceless() throws Exception {
var hjson = "name: Bob\nage: 25";
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertBean(m, "name,age", "Bob,25");
}
@Test
void a04_numberAndBoolean() throws Exception {
var hjson = "{\"count\":42,\"flag\":true}";
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertEquals(42, m.get("count"));
assertEquals(true, m.get("flag"));
}
@@ -69,7 +69,7 @@ class HjsonParser_Test extends TestBase {
@Test
void a05_nullValue() throws Exception {
var hjson = "{\"name\":\"x\",\"middle\":null}";
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertNull(m.get("middle"));
assertEquals("x", m.get("name"));
}
@@ -95,7 +95,7 @@ class HjsonParser_Test extends TestBase {
age: 30
}
""";
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertBean(m, "name,age", "Alice,30");
}
@@ -107,7 +107,7 @@ class HjsonParser_Test extends TestBase {
name: Bob
}
""";
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertEquals("Bob", m.get("name"));
}
@@ -119,21 +119,21 @@ class HjsonParser_Test extends TestBase {
x: 1
}
""";
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertEquals(1, m.get("x"));
}
@Test
void b04_trailingCommas() throws Exception {
var hjson = "{\"a\":1,\"b\":2}";
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertBean(m, "a,b", "1,2");
}
@Test
void b05_quotelessValueEdgeCases() throws Exception {
var hjson = "n: 5\ns: 5 times\nb: true";
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertEquals(5, m.get("n"));
assertEquals("5 times", m.get("s"));
assertEquals(true, m.get("b"));
@@ -142,8 +142,8 @@ class HjsonParser_Test extends TestBase {
@Test
void b06_nestedObjects() throws Exception {
var hjson = "{\"outer\":{\"inner\":\"value\"}}";
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
- var outer = (Map<String, Object>) m.get("outer");
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var outer = (Map<String,Object>) m.get("outer");
assertNotNull(outer);
assertEquals("value", outer.get("inner"));
}
@@ -151,7 +151,7 @@ class HjsonParser_Test extends TestBase {
@Test
void b07_arrays() throws Exception {
var hjson = "{\"arr\":[1,2,3]}";
- var m = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
var arr = m.get("arr");
assertTrue(arr instanceof List);
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonRoundTrip_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonRoundTrip_Test.java
index 0a6329130e..520bf4f682 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonRoundTrip_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonRoundTrip_Test.java
@@ -39,97 +39,97 @@ class HjsonRoundTrip_Test extends TestBase {
@Test
void c01_simpleBeanRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("name", "Alice");
a.put("age", 30);
a.put("active", true);
var hjson = HjsonSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertBean(b, "name,age,active", "Alice,30,true");
}
@Test
void c02_nestedBeanRoundTrip() throws Exception {
- var addr = new LinkedHashMap<String, Object>();
+ var addr = new LinkedHashMap<String,Object>();
addr.put("city", "Boston");
addr.put("state", "MA");
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("name", "Alice");
a.put("address", addr);
var hjson = HjsonSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertBean(b, "name,address{city,state}", "Alice,{Boston,MA}");
}
@Test
void c03_collectionRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("tags", list("a", "b", "c"));
a.put("counts", list(1, 2, 3));
var hjson = HjsonSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertBean(b, "tags,counts", "[a,b,c],[1,2,3]");
}
@Test
void c04_mapRoundTrip() throws Exception {
- var nested = new LinkedHashMap<String, Object>();
+ var nested = new LinkedHashMap<String,Object>();
nested.put("host", "localhost");
nested.put("port", 8080);
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("name", "app");
a.put("database", nested);
var hjson = HjsonSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertBean(b, "name,database{host,port}", "app,{localhost,8080}");
}
@Test
void c05_enumRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("size", "LARGE");
a.put("status", "ACTIVE");
var hjson = HjsonSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertBean(b, "size,status", "LARGE,ACTIVE");
}
@Test
void c06_multilineStringRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("desc", "line1\nline2\nline3");
var hjson = HjsonSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertEquals("line1\nline2\nline3", b.get("desc"));
}
@Test
void c07_specialCharStringRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("s", "a{b}c:d\"e");
var hjson = HjsonSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertEquals("a{b}c:d\"e", b.get("s"));
}
@Test
void c08_booleanStringRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("asBoolean", true);
a.put("asString", "true");
var hjson = HjsonSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertEquals(true, b.get("asBoolean"));
assertEquals("true", b.get("asString"));
}
@Test
void c09_numberStringRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("asNumber", 42);
a.put("asString", "42");
var hjson = HjsonSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertEquals(42, b.get("asNumber"));
assertEquals("42", b.get("asString"));
}
@@ -137,25 +137,25 @@ class HjsonRoundTrip_Test extends TestBase {
@Test
void c10_nullRoundTrip() throws Exception {
var hjson = "{\"name\":\"x\",\"middle\":null}";
- var b = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertEquals("x", b.get("name"));
assertNull(b.get("middle"));
}
@Test
void c11_emptyStringRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("empty", "");
var hjson = HjsonSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertEquals("", b.get("empty"));
}
@Test
void c12_complexBeanRoundTrip() throws Exception {
- var nested = new LinkedHashMap<String, Object>();
+ var nested = new LinkedHashMap<String,Object>();
nested.put("city", "NYC");
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("name", "Bob");
a.put("age", 25);
a.put("active", true);
@@ -163,7 +163,7 @@ class HjsonRoundTrip_Test extends TestBase {
a.put("address", nested);
a.put("empty", "");
var hjson = HjsonSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HjsonParser.DEFAULT.read(hjson, Map.class, String.class, Object.class);
assertBean(b, "name,age,active,tags,address{city},empty", "Bob,25,true,[x,y],{NYC},");
}
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonSerializer_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonSerializer_Test.java
index 3b7cd1e845..e7e377e68d 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonSerializer_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hjson/HjsonSerializer_Test.java
@@ -29,7 +29,7 @@ class HjsonSerializer_Test {
@Test
void a01_simpleBean() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("name", "Alice");
m.put("age", 30);
m.put("active", true);
@@ -42,10 +42,10 @@ class HjsonSerializer_Test {
@Test
void a02_nestedBean() {
- var address = new LinkedHashMap<String, Object>();
+ var address = new LinkedHashMap<String,Object>();
address.put("city", "Boston");
address.put("state", "MA");
- var config = new LinkedHashMap<String, Object>();
+ var config = new LinkedHashMap<String,Object>();
config.put("name", "myapp");
config.put("address", address);
var hjson = HjsonSerializer.DEFAULT.write(config);
@@ -56,7 +56,7 @@ class HjsonSerializer_Test {
@Test
void a03_quotelessStrings() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("key", "simple");
var hjson = HjsonSerializer.DEFAULT.write(m);
assertNotNull(hjson);
@@ -66,7 +66,7 @@ class HjsonSerializer_Test {
@Test
void a04_compactMode() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("name", "Alice");
m.put("age", 30);
var hjson = HjsonSerializer.DEFAULT_COMPACT.write(m);
@@ -77,7 +77,7 @@ class HjsonSerializer_Test {
@Test
void a05_nullValue() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("name", "Alice");
m.put("middle", null);
var s = HjsonSerializer.create().keepNullProperties().build();
@@ -88,7 +88,7 @@ class HjsonSerializer_Test {
@Test
void a06_arrayOfStrings() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("tags", List.of("web", "api", "rest"));
var hjson = HjsonSerializer.DEFAULT.write(m);
assertNotNull(hjson);
@@ -97,7 +97,7 @@ class HjsonSerializer_Test {
@Test
void a07_quotedStringRequired() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("special", "a{b}c:d\"e");
var hjson = HjsonSerializer.DEFAULT.write(m);
assertNotNull(hjson);
@@ -106,7 +106,7 @@ class HjsonSerializer_Test {
@Test
void a08_multilineString() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("desc", "line1\nline2");
var hjson = HjsonSerializer.DEFAULT.write(m);
assertNotNull(hjson);
@@ -115,7 +115,7 @@ class HjsonSerializer_Test {
@Test
void a09_emptyBean() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
var hjson = HjsonSerializer.DEFAULT.write(m);
assertNotNull(hjson);
assertTrue(hjson.contains("{") && hjson.contains("}"));
@@ -123,7 +123,7 @@ class HjsonSerializer_Test {
@Test
void a10_emptyCollection() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("tags", List.of());
var hjson = HjsonSerializer.DEFAULT.write(m);
assertNotNull(hjson);
@@ -132,7 +132,7 @@ class HjsonSerializer_Test {
@Test
void a11_stringLikeBoolean() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("s", "true");
var hjson = HjsonSerializer.DEFAULT.write(m);
assertNotNull(hjson);
@@ -141,7 +141,7 @@ class HjsonSerializer_Test {
@Test
void a12_omitRootBraces() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("name", "x");
var s = HjsonSerializer.create().omitRootBraces(true).build();
var hjson = s.write(m);
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconEdgeCases_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconEdgeCases_Test.java
index 98eb95d0e6..d429c33c85 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconEdgeCases_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconEdgeCases_Test.java
@@ -47,11 +47,11 @@ class HoconEdgeCases_Test extends TestBase {
@Test
void i03_unicodeStrings() throws Exception {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("text", "Hello 世界 café \uD83D\uDE00");
m.put("key\u4E2D", "value");
var hocon = HoconSerializer.DEFAULT.write(m);
- var parsed = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var parsed = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals("Hello 世界 café \uD83D\uDE00", parsed.get("text"));
assertEquals("value", parsed.get("key\u4E2D"));
}
@@ -59,20 +59,20 @@ class HoconEdgeCases_Test extends TestBase {
@Test
void i04_windowsLineEndings() throws Exception {
var hocon = "a = x\r\nb = y";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertBean(m, "a,b", "x,y");
}
@Test
void i05_deeplyNested() throws Exception {
var hocon = "n0.n1.n2.n3.n4.n5.n6.n7.n8.n9 = 99";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
var current = m;
for (var i = 0; i < 9; i++) {
var key = "n" + i;
var next = current.get(key);
assertNotNull(next);
- current = (Map<String, Object>) next;
+ current = (Map<String,Object>) next;
}
assertEquals(99, ((Number) current.get("n9")).intValue());
}
@@ -80,7 +80,7 @@ class HoconEdgeCases_Test extends TestBase {
@Test
void i06_emptyObject() throws Exception {
var hocon = "{}";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertNotNull(m);
assertTrue(m.isEmpty());
}
@@ -88,7 +88,7 @@ class HoconEdgeCases_Test extends TestBase {
@Test
void i07_emptyArray() throws Exception {
var hocon = "arr = []";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
var arr = (List<?>) m.get("arr");
assertNotNull(arr);
assertTrue(arr.isEmpty());
@@ -97,21 +97,21 @@ class HoconEdgeCases_Test extends TestBase {
@Test
void i08_tripleQuotedString() throws Exception {
var hocon = "x = \"\"\"line1\nline2\"\"\"";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals("line1\nline2", m.get("x"));
}
@Test
void i09_valueWithSpaces() throws Exception {
var hocon = "key = \"value with spaces\"";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals("value with spaces", m.get("key"));
}
@Test
void i10_hashCommentInline() throws Exception {
var hocon = "a = 1 # comment\nb = 2";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals(1, ((Number) m.get("a")).intValue());
assertEquals(2, ((Number) m.get("b")).intValue());
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconMediaType_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconMediaType_Test.java
index 066c066266..4d6500bdd1 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconMediaType_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconMediaType_Test.java
@@ -53,7 +53,7 @@ class HoconMediaType_Test {
var a = JsonMap.of("name", "test", "count", 42);
var hocon = toHocon(a);
assertNotNull(hocon);
- var b = (Map<String, Object>) fromHocon(hocon, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) fromHocon(hocon, Map.class, String.class, Object.class);
assertBean(b, "name,count", "test,42");
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconMerging_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconMerging_Test.java
index b0d4c292d5..3456aa8fac 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconMerging_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconMerging_Test.java
@@ -33,8 +33,8 @@ class HoconMerging_Test {
@Test
void f01_duplicateObjectsMerge() {
var hocon = "a { x = 1 }\na { y = 2 }";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
- var a = (Map<String, Object>) m.get("a");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var a = (Map<String,Object>) m.get("a");
assertEquals(1, ((Number) a.get("x")).intValue());
assertEquals(2, ((Number) a.get("y")).intValue());
}
@@ -42,15 +42,15 @@ class HoconMerging_Test {
@Test
void f02_scalarOverwrite() {
var hocon = "k = 1\nk = 2";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals(2, ((Number) m.get("k")).intValue());
}
@Test
void f03_objectOverScalar() {
var hocon = "a = 1\na { b = 2 }";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
- var a = (Map<String, Object>) m.get("a");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var a = (Map<String,Object>) m.get("a");
assertNotNull(a);
assertEquals(2, ((Number) a.get("b")).intValue());
}
@@ -58,16 +58,16 @@ class HoconMerging_Test {
@Test
void f04_scalarOverObject() {
var hocon = "a { b = 1 }\na = 2";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals(2, ((Number) m.get("a")).intValue());
}
@Test
void f05_deepMerge() {
var hocon = "a { b { x = 1 } }\na { b { y = 2 } }";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
- var a = (Map<String, Object>) m.get("a");
- var b = (Map<String, Object>) a.get("b");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var a = (Map<String,Object>) m.get("a");
+ var b = (Map<String,Object>) a.get("b");
assertEquals(1, ((Number) b.get("x")).intValue());
assertEquals(2, ((Number) b.get("y")).intValue());
}
@@ -75,7 +75,7 @@ class HoconMerging_Test {
@Test
void f06_plusEqualsArray() {
var hocon = "list = [a, b]\nlist += c";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
var list = (List<?>) m.get("list");
assertNotNull(list);
assertEquals(3, list.size());
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconParserSession_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconParserSession_Test.java
index 4262af2c8c..e007a2447f 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconParserSession_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconParserSession_Test.java
@@ -78,7 +78,7 @@ class HoconParserSession_Test extends TestBase {
// Hits the "if (hoconParser.resolveSubstitutions)" false branch.
var p = HoconParser.create().resolveSubstitutions(false).build();
var hocon = "x = hello\nval = ${x}";
- var m = (Map<String, Object>) p.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) p.read(hocon, Map.class, String.class, Object.class);
assertNotNull(m);
// When unresolved, ${x} stays as a HoconSubstitution which renders as string with $ token.
// We don't assert exact form — just that no exception is thrown and the doc parses.
@@ -88,7 +88,7 @@ class HoconParserSession_Test extends TestBase {
@Test
void a05_bracedRoot() throws Exception {
// Root starts with LBRACE → readObject path, not readRootBraceless.
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("{ a = 1, b = 2 }", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("{ a = 1, b = 2 }", Map.class, String.class, Object.class);
assertNotNull(m);
assertEquals(1, ((Number) m.get("a")).intValue());
assertEquals(2, ((Number) m.get("b")).intValue());
@@ -101,7 +101,7 @@ class HoconParserSession_Test extends TestBase {
@Test
void b01_numericKey() throws Exception {
// Key tokenized as NUMBER → tok.numberValue().toString() branch in readPath.
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("{ 42 = answer }", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("{ 42 = answer }", Map.class, String.class, Object.class);
assertNotNull(m);
// Number key path: HoconTokenizer reads "42" as NUMBER token.
assertTrue(m.containsKey("42"));
@@ -111,7 +111,7 @@ class HoconParserSession_Test extends TestBase {
@Test
void b02_trueKey() throws Exception {
// Key tokenized as TRUE keyword → "true" branch in readPath.
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("{ true = yes }", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("{ true = yes }", Map.class, String.class, Object.class);
assertNotNull(m);
assertEquals("yes", m.get("true"));
}
@@ -119,7 +119,7 @@ class HoconParserSession_Test extends TestBase {
@Test
void b03_falseKey() throws Exception {
// Key tokenized as FALSE keyword → "false" branch in readPath.
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("{ false = no }", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("{ false = no }", Map.class, String.class, Object.class);
assertNotNull(m);
assertEquals("no", m.get("false"));
}
@@ -127,7 +127,7 @@ class HoconParserSession_Test extends TestBase {
@Test
void b04_quotedKey() throws Exception {
// Quoted key — uses QUOTED_STRING branch.
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("\"my key\" = value", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("\"my key\" = value", Map.class, String.class, Object.class);
assertNotNull(m);
assertEquals("value", m.get("my key"));
}
@@ -135,11 +135,11 @@ class HoconParserSession_Test extends TestBase {
@Test
void b05_unquotedDottedPath() throws Exception {
// Unquoted dotted key — covers the "first.contains(\".\") → split" branch in readPath.
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("a.b.c = 7", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("a.b.c = 7", Map.class, String.class, Object.class);
assertNotNull(m);
- var a = (Map<?, ?>) m.get("a");
+ var a = (Map<?,?>) m.get("a");
assertNotNull(a);
- var b = (Map<?, ?>) a.get("b");
+ var b = (Map<?,?>) a.get("b");
assertNotNull(b);
assertEquals(7, ((Number) b.get("c")).intValue());
}
@@ -148,7 +148,7 @@ class HoconParserSession_Test extends TestBase {
void b06_quotedKeyContainingDot() throws Exception {
// Quoted key with embedded dot — preserved literally (no split). Covers QUOTED_STRING branch
// with no path-split, and the empty-component skip when first is quoted.
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("\"a.b.c\" = 9", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("\"a.b.c\" = 9", Map.class, String.class, Object.class);
assertNotNull(m);
assertTrue(m.containsKey("a.b.c"));
}
@@ -160,7 +160,7 @@ class HoconParserSession_Test extends TestBase {
@Test
void c01_nullValue() throws Exception {
// readValue NULL branch.
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("x = null", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("x = null", Map.class, String.class, Object.class);
assertNotNull(m);
assertTrue(m.containsKey("x"));
assertNull(m.get("x"));
@@ -168,26 +168,26 @@ class HoconParserSession_Test extends TestBase {
@Test
void c02_booleanValueTrue() throws Exception {
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("x = true", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("x = true", Map.class, String.class, Object.class);
assertEquals(Boolean.TRUE, m.get("x"));
}
@Test
void c03_booleanValueFalse() throws Exception {
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("x = false", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("x = false", Map.class, String.class, Object.class);
assertEquals(Boolean.FALSE, m.get("x"));
}
@Test
void c04_numberValue() throws Exception {
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("x = 3.14", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("x = 3.14", Map.class, String.class, Object.class);
assertEquals(3.14, ((Number) m.get("x")).doubleValue(), 1e-9);
}
@Test
void c05_inlineEmptyObject() throws Exception {
// readValue LBRACE branch.
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("x = {}", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("x = {}", Map.class, String.class, Object.class);
assertNotNull(m);
assertTrue(m.get("x") instanceof Map);
assertTrue(((Map<?,?>) m.get("x")).isEmpty());
@@ -197,7 +197,7 @@ class HoconParserSession_Test extends TestBase {
void c06_arrayConcatenation() throws Exception {
// readValueOrConcat: adjacent arrays without separator → flattened.
// HOCON: `[1,2] [3,4]` ≡ `[1,2,3,4]`.
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("a = [1,2] [3,4]", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("a = [1,2] [3,4]", Map.class, String.class, Object.class);
var a = (List<?>) m.get("a");
assertEquals(4, a.size());
assertEquals(1, ((Number) a.get(0)).intValue());
@@ -207,8 +207,8 @@ class HoconParserSession_Test extends TestBase {
@Test
void c07_objectConcatenation() throws Exception {
// readValueOrConcat: adjacent objects without separator → merged.
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("a = { x=1 } { y=2 }", Map.class, String.class, Object.class);
- var a = (Map<String, Object>) m.get("a");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("a = { x=1 } { y=2 }", Map.class, String.class, Object.class);
+ var a = (Map<String,Object>) m.get("a");
assertEquals(1, ((Number) a.get("x")).intValue());
assertEquals(2, ((Number) a.get("y")).intValue());
}
@@ -217,7 +217,7 @@ class HoconParserSession_Test extends TestBase {
void c08_stringAndNumberConcat() throws Exception {
// Mixed string + number concat → goes through HoconConcat's resolveConcatPart.
// (whitespace is stripped between unquoted tokens by the tokenizer; current implementation joins).
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("a = port 80", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("a = port 80", Map.class, String.class, Object.class);
// Confirm a value was produced — exact format is implementation-dependent.
assertNotNull(m.get("a"));
}
@@ -226,7 +226,7 @@ class HoconParserSession_Test extends TestBase {
void c09_unquotedStringAfterArrayBreaksConcat() throws Exception {
// After an array, an UNQUOTED_STRING is treated as next key, not concat.
// Covers the "last instanceof HoconArray" break in readValueOrConcat.
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("a = [1,2]\nnext = ok", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("a = [1,2]\nnext = ok", Map.class, String.class, Object.class);
var a = (List<?>) m.get("a");
assertEquals(2, a.size());
assertEquals("ok", m.get("next"));
@@ -235,8 +235,8 @@ class HoconParserSession_Test extends TestBase {
@Test
void c10_unquotedStringAfterObjectBreaksConcat() throws Exception {
// After an inline object, UNQUOTED_STRING is next key, not concat target.
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("a = { x=1 }\nnext = ok", Map.class, String.class, Object.class);
- var a = (Map<String, Object>) m.get("a");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("a = { x=1 }\nnext = ok", Map.class, String.class, Object.class);
+ var a = (Map<String,Object>) m.get("a");
assertEquals(1, ((Number) a.get("x")).intValue());
assertEquals("ok", m.get("next"));
}
@@ -280,7 +280,7 @@ class HoconParserSession_Test extends TestBase {
@Test
void e01_plusEqualsCreatingNewArray() throws Exception {
// `list += a` with no prior `list` — covers existing == null branch (newArr empty case).
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("list += a", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("list += a", Map.class, String.class, Object.class);
var list = (List<?>) m.get("list");
assertEquals(1, list.size());
assertEquals("a", list.get(0));
@@ -289,7 +289,7 @@ class HoconParserSession_Test extends TestBase {
@Test
void e02_plusEqualsAppendsToExistingArray() throws Exception {
// `list = [a]` then `list += b` — covers existing instanceof HoconArray.
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("list = [a]\nlist += b", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("list = [a]\nlist += b", Map.class, String.class, Object.class);
var list = (List<?>) m.get("list");
assertEquals(2, list.size());
}
@@ -298,7 +298,7 @@ class HoconParserSession_Test extends TestBase {
void e03_plusEqualsConvertsScalarToArray() throws Exception {
// `list = a` then `list += b` — existing is scalar, gets wrapped in a new array.
// Covers the "existing != null" but not array branch in PLUS_EQUALS handler.
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("list = a\nlist += b", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("list = a\nlist += b", Map.class, String.class, Object.class);
var list = (List<?>) m.get("list");
assertEquals(2, list.size());
}
@@ -306,8 +306,8 @@ class HoconParserSession_Test extends TestBase {
@Test
void e04_plusEqualsInsideObject() throws Exception {
// PLUS_EQUALS branch in readObject (not just root).
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("a { items += x\nitems += y }", Map.class, String.class, Object.class);
- var a = (Map<String, Object>) m.get("a");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("a { items += x\nitems += y }", Map.class, String.class, Object.class);
+ var a = (Map<String,Object>) m.get("a");
var items = (List<?>) a.get("items");
assertEquals(2, items.size());
}
@@ -319,8 +319,8 @@ class HoconParserSession_Test extends TestBase {
@Test
void f01_mergeObjectsAtRoot() throws Exception {
// `a { x=1 }` then `a { y=2 }` — second occurrence merges into first.
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("a { x=1 }\na { y=2 }", Map.class, String.class, Object.class);
- var a = (Map<String, Object>) m.get("a");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("a { x=1 }\na { y=2 }", Map.class, String.class, Object.class);
+ var a = (Map<String,Object>) m.get("a");
assertEquals(1, ((Number) a.get("x")).intValue());
assertEquals(2, ((Number) a.get("y")).intValue());
}
@@ -328,9 +328,9 @@ class HoconParserSession_Test extends TestBase {
@Test
void f02_mergeObjectsInsideParent() throws Exception {
var hocon = "p { a { x=1 }\na { y=2 } }";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
- var p = (Map<String, Object>) m.get("p");
- var a = (Map<String, Object>) p.get("a");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var p = (Map<String,Object>) m.get("p");
+ var a = (Map<String,Object>) p.get("a");
assertEquals(1, ((Number) a.get("x")).intValue());
assertEquals(2, ((Number) a.get("y")).intValue());
}
@@ -344,7 +344,7 @@ class HoconParserSession_Test extends TestBase {
// Concat that doesn't reference its own path — covers the early-return
// "!concat.referencesPath(pathStr) → return value" branch in resolveSelfRefConcatIfNeeded.
var hocon = "a = base\nb = ${a}\"-x\"";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals("base-x", m.get("b"));
}
@@ -352,7 +352,7 @@ class HoconParserSession_Test extends TestBase {
void g02_selfRefWithExisting() throws Exception {
// existing != null branch — full self-ref concat.
var hocon = "a = base\na = ${a}\"-tail\"";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals("base-tail", m.get("a"));
}
@@ -360,7 +360,7 @@ class HoconParserSession_Test extends TestBase {
void g03_concatWithoutSelfRef() throws Exception {
// HoconConcat that doesn't reference its own path → returns as-is from resolveSelfRefConcatIfNeeded.
var hocon = "x = hi\na = ${x}\"!\"";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals("hi!", m.get("a"));
}
@@ -406,7 +406,7 @@ class HoconParserSession_Test extends TestBase {
@Test
void i02_readBeanWithNameProperty() throws Exception {
// Hits injectAnnotations: cm.getNameProperty() != null path.
- // Outer bean has a Map<String, NamedChild> where each value-bean has @NameProperty.
+ // Outer bean has a Map<String,NamedChild> where each value-bean has @NameProperty.
var hocon = "items { foo { value = aa }, bar { value = bb } }";
var bean = HoconParser.DEFAULT.read(hocon, OuterWithNamedMap.class);
assertNotNull(bean);
@@ -431,7 +431,7 @@ class HoconParserSession_Test extends TestBase {
@Test
void j01_tripleQuotedAsKey() throws Exception {
// Triple-quoted as key — exercises the TRIPLE_QUOTED case in readPath.
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("\"\"\"k\"\"\" = v", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("\"\"\"k\"\"\" = v", Map.class, String.class, Object.class);
assertEquals("v", m.get("k"));
}
@@ -476,7 +476,7 @@ class HoconParserSession_Test extends TestBase {
var hocon = "null = x";
// Either parses to null or throws — both exercise the empty-path branch.
try {
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
// If it parses, we just need any result.
assertTrue(m == null || !m.containsKey("x"));
} catch (Exception ignore) {
@@ -487,7 +487,7 @@ class HoconParserSession_Test extends TestBase {
@Test
void l02_arrayWithNewlineSeparators() throws Exception {
// Arrays separated by newlines — covers readArray separator branch (NEWLINE).
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("a = [\n 1\n 2\n 3\n]", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("a = [\n 1\n 2\n 3\n]", Map.class, String.class, Object.class);
var a = (List<?>) m.get("a");
assertEquals(3, a.size());
}
@@ -497,7 +497,7 @@ class HoconParserSession_Test extends TestBase {
// EOF inside `[ ... ` — readArray's "EOF in while-condition" branch (line 372).
// Parser is tolerant: returns the partial array.
var hocon = "a = [ 1, 2";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
var a = (List<?>) m.get("a");
assertEquals(2, a.size());
}
@@ -536,7 +536,7 @@ class HoconParserSession_Test extends TestBase {
@Test
void l06_commaSeparatedInsideObject() throws Exception {
// Comma separator inside braced object — exercises readObject COMMA branch (line 360).
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("{ a = 1, b = 2, c = 3 }", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("{ a = 1, b = 2, c = 3 }", Map.class, String.class, Object.class);
assertEquals(1, ((Number) m.get("a")).intValue());
assertEquals(2, ((Number) m.get("b")).intValue());
assertEquals(3, ((Number) m.get("c")).intValue());
@@ -559,9 +559,9 @@ class HoconParserSession_Test extends TestBase {
// Quoted segment followed by `.` then unquoted — exercises readPath's
// "loop reads more tokens after quoted first" branch (lines 183-191).
var hocon = "\"a\".\"b\" = 5";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertNotNull(m);
- var a = (Map<?, ?>) m.get("a");
+ var a = (Map<?,?>) m.get("a");
assertNotNull(a);
assertEquals(5, ((Number) a.get("b")).intValue());
}
@@ -570,7 +570,7 @@ class HoconParserSession_Test extends TestBase {
void l10_objectInsideArrayWithDottedKeys() throws Exception {
// Dotted unquoted keys inside array elements — re-entry through readPath/readObject.
var hocon = "list = [{ a.b = 1 }, { a.c = 2 }]";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
var list = (List<?>) m.get("list");
assertEquals(2, list.size());
}
@@ -579,7 +579,7 @@ class HoconParserSession_Test extends TestBase {
void l11_substitutionToObject() throws Exception {
// Substitution target is an object — covers HoconConcat handling when value is non-string.
var hocon = "a = { x = 1 }\nb = ${a}";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
var b = m.get("b");
assertNotNull(b);
assertTrue(b instanceof Map);
@@ -590,7 +590,7 @@ class HoconParserSession_Test extends TestBase {
void l12_arrayOfArraysPreservesNesting() throws Exception {
// Nested arrays separated by COMMA — exercises readArray COMMA branch and ensures
// concat doesn't flatten (separator preserves nesting).
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("a = [[1,2], [3,4]]", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("a = [[1,2], [3,4]]", Map.class, String.class, Object.class);
var a = (List<?>) m.get("a");
assertEquals(2, a.size());
assertTrue(a.get(0) instanceof List);
@@ -634,7 +634,7 @@ class HoconParserSession_Test extends TestBase {
}
public static class OuterWithNamedMap {
- public Map<String, NamedChild> items;
+ public Map<String,NamedChild> items;
}
public static class BeanWithByteList {
@@ -642,7 +642,7 @@ class HoconParserSession_Test extends TestBase {
}
public static class BeanWithIntMap {
- public Map<Integer, String> counts;
+ public Map<Integer,String> counts;
}
public static class BeanWithList {
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconParser_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconParser_Test.java
index c982b23c1f..9b3d035c91 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconParser_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconParser_Test.java
@@ -32,49 +32,49 @@ class HoconParser_Test {
@Test
void b01_equalsSignSeparator() {
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("name = Alice", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("name = Alice", Map.class, String.class, Object.class);
assertNotNull(m);
assertEquals("Alice", m.get("name"));
}
@Test
void b02_colonSeparator() {
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("name: Alice", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("name: Alice", Map.class, String.class, Object.class);
assertNotNull(m);
assertEquals("Alice", m.get("name"));
}
@Test
void b03_unquotedValues() {
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("key = hello", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("key = hello", Map.class, String.class, Object.class);
assertNotNull(m);
assertEquals("hello", m.get("key"));
}
@Test
void b04_quotedValues() {
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("key = \"hello world\"", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("key = \"hello world\"", Map.class, String.class, Object.class);
assertNotNull(m);
assertEquals("hello world", m.get("key"));
}
@Test
void b05_pathExpressions() {
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("a.b.c = 10", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("a.b.c = 10", Map.class, String.class, Object.class);
assertNotNull(m);
var a = m.get("a");
assertNotNull(a);
assertTrue(a instanceof Map);
- var b = ((Map<?, ?>) a).get("b");
+ var b = ((Map<?,?>) a).get("b");
assertNotNull(b);
assertTrue(b instanceof Map);
- var c = ((Map<?, ?>) b).get("c");
+ var c = ((Map<?,?>) b).get("c");
assertEquals(10, ((Number) c).intValue());
}
@Test
void b06_rootBraceless() {
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("name = myapp\nport = 8080", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("name = myapp\nport = 8080", Map.class, String.class, Object.class);
assertNotNull(m);
assertEquals("myapp", m.get("name"));
assertEquals(8080, ((Number) m.get("port")).intValue());
@@ -83,28 +83,28 @@ class HoconParser_Test {
@Test
void b07_nestedObjects() {
var hocon = "database {\n host = localhost\n port = 5432\n}";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertNotNull(m);
var db = m.get("database");
assertNotNull(db);
assertTrue(db instanceof Map);
- assertEquals("localhost", ((Map<?, ?>) db).get("host"));
- assertEquals(5432, ((Number) ((Map<?, ?>) db).get("port")).intValue());
+ assertEquals("localhost", ((Map<?,?>) db).get("host"));
+ assertEquals(5432, ((Number) ((Map<?,?>) db).get("port")).intValue());
}
@Test
void b08_pathExpressions() {
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("a.b.c = 10", Map.class, String.class, Object.class);
- var a = (Map<String, Object>) m.get("a");
- var b = (Map<String, Object>) a.get("b");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("a.b.c = 10", Map.class, String.class, Object.class);
+ var a = (Map<String,Object>) m.get("a");
+ var b = (Map<String,Object>) a.get("b");
assertEquals(10, ((Number) b.get("c")).intValue());
}
@Test
void b09_objectMerging() {
var hocon = "a { x = 1 }\na { y = 2 }";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
- var a = (Map<String, Object>) m.get("a");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var a = (Map<String,Object>) m.get("a");
assertEquals(1, ((Number) a.get("x")).intValue());
assertEquals(2, ((Number) a.get("y")).intValue());
}
@@ -112,28 +112,28 @@ class HoconParser_Test {
@Test
void b10_substitutions() {
var hocon = "x = hello\nval = ${x}";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals("hello", m.get("val"));
}
@Test
void b11_optionalSubstitutions() {
var hocon = "val = ${?missing}";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertNull(m.get("val"));
}
@Test
void b12_tripleQuotedValues() {
var hocon = "key = \"\"\"line1\nline2\"\"\"";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals("line1\nline2", m.get("key"));
}
@Test
void b13_hashComments() {
var hocon = "a = 1 # comment\nb = 2";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals(1, ((Number) m.get("a")).intValue());
assertEquals(2, ((Number) m.get("b")).intValue());
}
@@ -141,7 +141,7 @@ class HoconParser_Test {
@Test
void b14_slashComments() {
var hocon = "a = 1\n// comment\nb = 2";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals(1, ((Number) m.get("a")).intValue());
assertEquals(2, ((Number) m.get("b")).intValue());
}
@@ -149,7 +149,7 @@ class HoconParser_Test {
@Test
void b15_trailingCommas() {
var hocon = "arr = [1, 2, 3,]";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
var arr = (List<?>) m.get("arr");
assertEquals(3, arr.size());
assertEquals(1, ((Number) arr.get(0)).intValue());
@@ -160,7 +160,7 @@ class HoconParser_Test {
@Test
void b16_newlineSeparators() {
var hocon = "a = 1\nb = 2\nc = 3";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals(1, ((Number) m.get("a")).intValue());
assertEquals(2, ((Number) m.get("b")).intValue());
assertEquals(3, ((Number) m.get("c")).intValue());
@@ -169,16 +169,16 @@ class HoconParser_Test {
@Test
void b17_nestedObjectsDeep() {
var hocon = "a { b { c = 42 } }";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
- var a = (Map<String, Object>) m.get("a");
- var b = (Map<String, Object>) a.get("b");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var a = (Map<String,Object>) m.get("a");
+ var b = (Map<String,Object>) a.get("b");
assertEquals(42, ((Number) b.get("c")).intValue());
}
@Test
void b18_arrays() {
var hocon = "nums = [1, 2, 3]";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
var arr = (List<?>) m.get("nums");
assertEquals(3, arr.size());
assertEquals(1, ((Number) arr.get(0)).intValue());
@@ -189,15 +189,15 @@ class HoconParser_Test {
@Test
void b19_quotedPathComponent() {
var hocon = "\"a.b\".c = 1";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
- var ab = (Map<String, Object>) m.get("a.b");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var ab = (Map<String,Object>) m.get("a.b");
assertEquals(1, ((Number) ab.get("c")).intValue());
}
@Test
void b20_numberValues() {
var hocon = "int = 42\nfloat = 3.14";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals(42, ((Number) m.get("int")).intValue());
assertEquals(3.14, ((Number) m.get("float")).doubleValue(), 0.001);
}
@@ -205,7 +205,7 @@ class HoconParser_Test {
@Test
void b21_booleanNullValues() {
var hocon = "t = true\nf = false\nn = null";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals(true, m.get("t"));
assertEquals(false, m.get("f"));
assertNull(m.get("n"));
@@ -214,7 +214,7 @@ class HoconParser_Test {
@Test
void b22_plusEquals() {
var hocon = "list = [a, b]\nlist += c";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
var list = (List<?>) m.get("list");
assertNotNull(list);
assertEquals(3, list.size());
@@ -226,21 +226,21 @@ class HoconParser_Test {
@Test
void b23_selfReferentialSubstitution() {
var hocon = "path = /usr\npath = ${path}\"/bin\"";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals("/usr/bin", m.get("path"));
}
@Test
void b24_valueConcatenation() {
var hocon = "path = /usr \"/local\"";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals("/usr/local", m.get("path"));
}
@Test
void b25_arrayConcatenation() {
var hocon = "nums = [1, 2] [3, 4]";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
var arr = (List<?>) m.get("nums");
assertNotNull(arr);
assertEquals(4, arr.size());
@@ -253,8 +253,8 @@ class HoconParser_Test {
@Test
void b26_objectConcatenation() {
var hocon = "obj = { a = 1 } { b = 2 }";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
- var obj = (Map<String, Object>) m.get("obj");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var obj = (Map<String,Object>) m.get("obj");
assertNotNull(obj);
assertEquals(1, ((Number) obj.get("a")).intValue());
assertEquals(2, ((Number) obj.get("b")).intValue());
@@ -268,7 +268,7 @@ class HoconParser_Test {
@Test
void b27_nestedArraysNewlineSeparatedStayNested() {
var hocon = "outer = [\n [1, 2]\n [3, 4]\n]";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
var outer = (List<?>) m.get("outer");
assertNotNull(outer);
assertEquals(2, outer.size());
@@ -287,7 +287,7 @@ class HoconParser_Test {
@Test
void b28_sameLineInnerArraysStillConcatenate() {
var hocon = "outer = [\n [1, 2] [3, 4]\n]";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
var outer = (List<?>) m.get("outer");
assertNotNull(outer);
assertEquals(1, outer.size());
@@ -303,8 +303,8 @@ class HoconParser_Test {
@Test
void b29_nestedObjectClosePreservesSiblingNewline() {
var hocon = "a {\n b = 1\n}\nc = 2";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
- var a = (Map<String, Object>) m.get("a");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var a = (Map<String,Object>) m.get("a");
assertNotNull(a);
assertEquals(1, ((Number) a.get("b")).intValue());
assertEquals(2, ((Number) m.get("c")).intValue());
@@ -315,11 +315,11 @@ class HoconParser_Test {
@Test
void b30_arrayOfObjectsNewlineSeparatedStayDistinct() {
var hocon = "items = [\n { id = 1 }\n { id = 2 }\n]";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
var items = (List<?>) m.get("items");
assertNotNull(items);
assertEquals(2, items.size());
- assertEquals(1, ((Number) ((Map<String, Object>) items.get(0)).get("id")).intValue());
- assertEquals(2, ((Number) ((Map<String, Object>) items.get(1)).get("id")).intValue());
+ assertEquals(1, ((Number) ((Map<String,Object>) items.get(0)).get("id")).intValue());
+ assertEquals(2, ((Number) ((Map<String,Object>) items.get(1)).get("id")).intValue());
}
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconPath_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconPath_Test.java
index 81f6175324..68f19c5b99 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconPath_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconPath_Test.java
@@ -32,49 +32,49 @@ class HoconPath_Test {
@Test
void d01_simplePath() {
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("a.b = 1", Map.class, String.class, Object.class);
- var a = (Map<String, Object>) m.get("a");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("a.b = 1", Map.class, String.class, Object.class);
+ var a = (Map<String,Object>) m.get("a");
assertNotNull(a);
assertEquals(1, ((Number) a.get("b")).intValue());
}
@Test
void d02_deepPath() {
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("a.b.c.d = 1", Map.class, String.class, Object.class);
- var a = (Map<String, Object>) m.get("a");
- var b = (Map<String, Object>) a.get("b");
- var c = (Map<String, Object>) b.get("c");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("a.b.c.d = 1", Map.class, String.class, Object.class);
+ var a = (Map<String,Object>) m.get("a");
+ var b = (Map<String,Object>) a.get("b");
+ var c = (Map<String,Object>) b.get("c");
assertEquals(1, ((Number) c.get("d")).intValue());
}
@Test
void d03_quotedPathComponent() {
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("\"a.b\".c = 1", Map.class, String.class, Object.class);
- var ab = (Map<String, Object>) m.get("a.b");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("\"a.b\".c = 1", Map.class, String.class, Object.class);
+ var ab = (Map<String,Object>) m.get("a.b");
assertNotNull(ab);
assertEquals(1, ((Number) ab.get("c")).intValue());
}
@Test
void d04_mixedPathAndNested() {
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("a.b { c = 1 }", Map.class, String.class, Object.class);
- var a = (Map<String, Object>) m.get("a");
- var b = (Map<String, Object>) a.get("b");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("a.b { c = 1 }", Map.class, String.class, Object.class);
+ var a = (Map<String,Object>) m.get("a");
+ var b = (Map<String,Object>) a.get("b");
assertEquals(1, ((Number) b.get("c")).intValue());
}
@Test
void d05_pathMerging() {
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("a.x = 1\na.y = 2", Map.class, String.class, Object.class);
- var a = (Map<String, Object>) m.get("a");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("a.x = 1\na.y = 2", Map.class, String.class, Object.class);
+ var a = (Map<String,Object>) m.get("a");
assertEquals(1, ((Number) a.get("x")).intValue());
assertEquals(2, ((Number) a.get("y")).intValue());
}
@Test
void d06_pathOverwrite() {
- var m = (Map<String, Object>) HoconParser.DEFAULT.read("a.b = 1\na.b = 2", Map.class, String.class, Object.class);
- var a = (Map<String, Object>) m.get("a");
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read("a.b = 1\na.b = 2", Map.class, String.class, Object.class);
+ var a = (Map<String,Object>) m.get("a");
assertEquals(2, ((Number) a.get("b")).intValue());
}
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconRoundTrip_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconRoundTrip_Test.java
index 07f6f57a3e..572abd17f5 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconRoundTrip_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconRoundTrip_Test.java
@@ -35,97 +35,97 @@ class HoconRoundTrip_Test extends TestBase {
@Test
void c01_simpleBeanRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("name", "Alice");
a.put("age", 30);
a.put("active", true);
var hocon = HoconSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertBean(b, "name,age,active", "Alice,30,true");
}
@Test
void c02_nestedBeanRoundTrip() throws Exception {
- var addr = new LinkedHashMap<String, Object>();
+ var addr = new LinkedHashMap<String,Object>();
addr.put("city", "Boston");
addr.put("state", "MA");
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("name", "Alice");
a.put("address", addr);
var hocon = HoconSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertBean(b, "name,address{city,state}", "Alice,{Boston,MA}");
}
@Test
void c03_collectionRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("tags", list("a", "b", "c"));
a.put("counts", list(1, 2, 3));
var hocon = HoconSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertBean(b, "tags,counts", "[a,b,c],[1,2,3]");
}
@Test
void c04_mapRoundTrip() throws Exception {
- var nested = new LinkedHashMap<String, Object>();
+ var nested = new LinkedHashMap<String,Object>();
nested.put("host", "localhost");
nested.put("port", 8080);
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("name", "app");
a.put("database", nested);
var hocon = HoconSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertBean(b, "name,database{host,port}", "app,{localhost,8080}");
}
@Test
void c05_enumRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("size", "LARGE");
a.put("status", "ACTIVE");
var hocon = HoconSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertBean(b, "size,status", "LARGE,ACTIVE");
}
@Test
void c06_multilineStringRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("desc", "line1\nline2\nline3");
var hocon = HoconSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals("line1\nline2\nline3", b.get("desc"));
}
@Test
void c07_specialCharStringRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("s", "a{b}c:d\"e");
var hocon = HoconSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals("a{b}c:d\"e", b.get("s"));
}
@Test
void c08_booleanStringRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("asBoolean", true);
a.put("asString", "true");
var hocon = HoconSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals(true, b.get("asBoolean"));
assertEquals("true", b.get("asString"));
}
@Test
void c09_numberStringRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("asNumber", 42);
a.put("asString", "42");
var hocon = HoconSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals(42, b.get("asNumber"));
assertEquals("42", b.get("asString"));
}
@@ -133,25 +133,25 @@ class HoconRoundTrip_Test extends TestBase {
@Test
void c10_nullRoundTrip() throws Exception {
var hocon = "name = x\nmiddle = null";
- var b = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals("x", b.get("name"));
assertNull(b.get("middle"));
}
@Test
void c11_emptyStringRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("empty", "");
var hocon = HoconSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals("", b.get("empty"));
}
@Test
void c12_complexBeanRoundTrip() throws Exception {
- var nested = new LinkedHashMap<String, Object>();
+ var nested = new LinkedHashMap<String,Object>();
nested.put("city", "NYC");
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("name", "Bob");
a.put("age", 25);
a.put("active", true);
@@ -159,13 +159,13 @@ class HoconRoundTrip_Test extends TestBase {
a.put("address", nested);
a.put("empty", "");
var hocon = HoconSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertBean(b, "name,age,active,tags,address{city},empty", "Bob,25,true,[x,y],{NYC},");
}
@Test
void c13_parserForbiddenCharsRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("caret", "a^b");
a.put("slash", "a\\b");
a.put("question", "a?b");
@@ -183,7 +183,7 @@ class HoconRoundTrip_Test extends TestBase {
assertTrue(hocon.contains("star = \"a*b\""));
assertTrue(hocon.contains("amp = \"a&b\""));
- var b = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertBean(
b,
"caret,slash,question,bang,at,star,amp",
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconSerializer_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconSerializer_Test.java
index 0f7bc88f27..61f2c499e1 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconSerializer_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconSerializer_Test.java
@@ -30,7 +30,7 @@ class HoconSerializer_Test {
@Test
void a01_simpleBean() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("name", "Alice");
m.put("age", 30);
m.put("active", true);
@@ -44,10 +44,10 @@ class HoconSerializer_Test {
@Test
void a02_nestedBean() {
- var address = new LinkedHashMap<String, Object>();
+ var address = new LinkedHashMap<String,Object>();
address.put("city", "Boston");
address.put("state", "MA");
- var config = new LinkedHashMap<String, Object>();
+ var config = new LinkedHashMap<String,Object>();
config.put("name", "myapp");
config.put("address", address);
var hocon = HoconSerializer.DEFAULT.write(config);
@@ -58,7 +58,7 @@ class HoconSerializer_Test {
@Test
void a03_unquotedStrings() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("key", "simple");
var hocon = HoconSerializer.DEFAULT.write(m);
assertNotNull(hocon);
@@ -68,7 +68,7 @@ class HoconSerializer_Test {
@Test
void a04_omitRootBraces() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("name", "Alice");
var hocon = HoconSerializer.DEFAULT.write(m);
assertNotNull(hocon);
@@ -77,7 +77,7 @@ class HoconSerializer_Test {
@Test
void a05_withRootBraces() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("name", "Alice");
var hocon = HoconSerializer.DEFAULT_BRACES.write(m);
assertNotNull(hocon);
@@ -86,7 +86,7 @@ class HoconSerializer_Test {
@Test
void a06_arrayOfStrings() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("tags", List.of("web", "api", "rest"));
var hocon = HoconSerializer.DEFAULT.write(m);
assertNotNull(hocon);
@@ -95,10 +95,10 @@ class HoconSerializer_Test {
@Test
void a07_mapProperty() {
- var nested = new LinkedHashMap<String, Object>();
+ var nested = new LinkedHashMap<String,Object>();
nested.put("host", "localhost");
nested.put("port", 8080);
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("database", nested);
var hocon = HoconSerializer.DEFAULT.write(m);
assertNotNull(hocon);
@@ -108,7 +108,7 @@ class HoconSerializer_Test {
@Test
void a08_nullValues() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("name", "Alice");
m.put("middle", null);
var s = HoconSerializer.create().keepNullProperties().build();
@@ -119,7 +119,7 @@ class HoconSerializer_Test {
@Test
void a09_quotedStringRequired() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("special", "a{b}c:d\"e");
var hocon = HoconSerializer.DEFAULT.write(m);
assertNotNull(hocon);
@@ -128,7 +128,7 @@ class HoconSerializer_Test {
@Test
void a10_tripleQuotedString() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("desc", "line1\nline2");
var hocon = HoconSerializer.DEFAULT.write(m);
assertNotNull(hocon);
@@ -137,7 +137,7 @@ class HoconSerializer_Test {
@Test
void a11_equalsSignSeparator() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("key", "value");
var hocon = HoconSerializer.DEFAULT.write(m);
assertTrue(hocon.contains("="));
@@ -146,7 +146,7 @@ class HoconSerializer_Test {
@Test
void a12_newlineSeparators() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("a", 1);
m.put("b", 2);
var hocon = HoconSerializer.DEFAULT.write(m);
@@ -155,7 +155,7 @@ class HoconSerializer_Test {
@Test
void a13_compactMode() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("name", "Alice");
m.put("age", 30);
var hocon = HoconSerializer.DEFAULT_COMPACT.write(m);
@@ -165,7 +165,7 @@ class HoconSerializer_Test {
@Test
void a14_emptyBean() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
var hocon = HoconSerializer.DEFAULT_BRACES.write(m);
assertNotNull(hocon);
assertTrue(hocon.contains("{") && hocon.contains("}"));
@@ -173,7 +173,7 @@ class HoconSerializer_Test {
@Test
void a15_emptyCollection() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("tags", List.of());
var hocon = HoconSerializer.DEFAULT.write(m);
assertNotNull(hocon);
@@ -182,7 +182,7 @@ class HoconSerializer_Test {
@Test
void a16_enumValues() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("size", "LARGE");
m.put("status", "ACTIVE");
var hocon = HoconSerializer.DEFAULT.write(m);
@@ -191,7 +191,7 @@ class HoconSerializer_Test {
@Test
void a17_stringLikeSpecialValues() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("asBoolean", "true");
m.put("asNumber", "42");
m.put("asNull", "null");
@@ -201,13 +201,13 @@ class HoconSerializer_Test {
@Test
void a18_collectionOfBeans() {
- var server1 = new LinkedHashMap<String, Object>();
+ var server1 = new LinkedHashMap<String,Object>();
server1.put("host", "a");
server1.put("port", 8080);
- var server2 = new LinkedHashMap<String, Object>();
+ var server2 = new LinkedHashMap<String,Object>();
server2.put("host", "b");
server2.put("port", 9090);
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("servers", List.of(server1, server2));
var hocon = HoconSerializer.DEFAULT.write(m);
assertNotNull(hocon);
@@ -218,9 +218,9 @@ class HoconSerializer_Test {
@Test
void a19_indentation() {
- var nested = new LinkedHashMap<String, Object>();
+ var nested = new LinkedHashMap<String,Object>();
nested.put("inner", "value");
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("outer", nested);
var hocon = HoconSerializer.DEFAULT.write(m);
assertNotNull(hocon);
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconSubstitution_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconSubstitution_Test.java
index 9726c838d7..7509088d59 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconSubstitution_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/hocon/HoconSubstitution_Test.java
@@ -33,7 +33,7 @@ class HoconSubstitution_Test {
@Test
void e01_simpleSubstitution() {
var hocon = "x = hello\nval = ${x}";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals("hello", m.get("x"));
assertEquals("hello", m.get("val"));
}
@@ -41,21 +41,21 @@ class HoconSubstitution_Test {
@Test
void e02_nestedPathSubstitution() {
var hocon = "a { b { c = 42 } }\nv = ${a.b.c}";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals(42, ((Number) m.get("v")).intValue());
}
@Test
void e03_optionalSubstitutionPresent() {
var hocon = "x = hello\nval = ${?x}";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals("hello", m.get("val"));
}
@Test
void e04_optionalSubstitutionMissing() {
var hocon = "val = ${?missing}";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertNull(m.get("val"));
}
@@ -74,14 +74,14 @@ class HoconSubstitution_Test {
@Test
void e07_stringConcatSubstitution() {
var hocon = "name = World\nval = \"Hello \" ${name}";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals("Hello World", m.get("val"));
}
@Test
void e08_selfReferentialAppend() {
var hocon = "path = /usr\npath = ${path}\"/bin\"";
- var m = (Map<String, Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) HoconParser.DEFAULT.read(hocon, Map.class, String.class, Object.class);
assertEquals("/usr/bin", m.get("path"));
}
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/html/HtmlParserSession_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/html/HtmlParserSession_Test.java
index 647ddffd5e..c7692b7fa4 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/html/HtmlParserSession_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/html/HtmlParserSession_Test.java
@@ -101,11 +101,11 @@ class HtmlParserSession_Test extends TestBase {
@Test void b04_tableWithObjectType_intoMap() throws Exception {
// Table with type="object" → sType.isMap() at line 347
- var map = new LinkedHashMap<String, String>();
+ var map = new LinkedHashMap<String,String>();
map.put("k1", "v1");
map.put("k2", "v2");
var html = SER.write(map);
- var result = (Map<String, String>) PAR.read(html, LinkedHashMap.class, String.class, String.class);
+ var result = (Map<String,String>) PAR.read(html, LinkedHashMap.class, String.class, String.class);
assertEquals("v1", result.get("k1"));
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/html/HtmlSerializerSessionCoverage_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/html/HtmlSerializerSessionCoverage_Test.java
index 75c37a06cd..d0fd1e9f02 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/html/HtmlSerializerSessionCoverage_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/html/HtmlSerializerSessionCoverage_Test.java
@@ -260,10 +260,10 @@ class HtmlSerializerSessionCoverage_Test extends TestBase {
@Test void d06_tableHeaders_mapListWithMaps() throws Exception {
// A collection of plain maps → getTableHeaders returns key set
- var m1 = new LinkedHashMap<String, Object>();
+ var m1 = new LinkedHashMap<String,Object>();
m1.put("k1", "v1");
m1.put("k2", "v2");
- var m2 = new LinkedHashMap<String, Object>();
+ var m2 = new LinkedHashMap<String,Object>();
m2.put("k1", "v3");
m2.put("k2", "v4");
var list = l(m1, m2);
@@ -397,7 +397,7 @@ class HtmlSerializerSessionCoverage_Test extends TestBase {
//-----------------------------------------------------------------------------------------------------------------
@Html(noTableHeaders=true)
- public static class NoHeadersMapList extends LinkedHashMap<String, String> {}
+ public static class NoHeadersMapList extends LinkedHashMap<String,String> {}
@Test void f06_collection_noHeaderTableMaps() throws Exception {
// noTableHeaders on map class → getTableHeaders returns Object[0] → th=null inside loop
@@ -445,10 +445,10 @@ class HtmlSerializerSessionCoverage_Test extends TestBase {
@Test void f09_writeCollection_nonBeanMapWithNonMapValue() throws Exception {
// A list of plain maps where values are plain strings (not maps) → table headers from key set
- var m1 = new LinkedHashMap<String, String>();
+ var m1 = new LinkedHashMap<String,String>();
m1.put("a", "1");
m1.put("b", "2");
- var m2 = new LinkedHashMap<String, String>();
+ var m2 = new LinkedHashMap<String,String>();
m2.put("a", "3");
m2.put("b", "4");
var r = HtmlSerializer.DEFAULT_SQ.write(l(m1, m2));
@@ -512,7 +512,7 @@ class HtmlSerializerSessionCoverage_Test extends TestBase {
//-----------------------------------------------------------------------------------------------------------------
@Test void g04_writeMapEntry_nullKey() throws Exception {
- var m = new LinkedHashMap<String, String>();
+ var m = new LinkedHashMap<String,String>();
m.put(null, "v1");
var r = HtmlSerializer.DEFAULT_SQ.write(m);
assertTrue(r.contains("<table"), "Expected table with null key, got: " + r);
@@ -731,7 +731,7 @@ class HtmlSerializerSessionCoverage_Test extends TestBase {
public String value = "original";
}
- public static class SwappedBeanSwap extends ObjectSwap<SwappedBean, String> {
+ public static class SwappedBeanSwap extends ObjectSwap<SwappedBean,String> {
@Override
public String swap(MarshallingSession session, SwappedBean o) throws Exception {
return o.value + "_swapped";
@@ -1018,7 +1018,7 @@ class HtmlSerializerSessionCoverage_Test extends TestBase {
@Test void j10_writeMapEntry_crElements_complexKey() throws Exception {
// A map whose key is a bean should return CR_ELEMENTS from writeAnything
- var m = new LinkedHashMap<Object, String>();
+ var m = new LinkedHashMap<Object,String>();
m.put(new TypedBean(), "value1");
var r = HtmlSerializer.DEFAULT_SQ.write(m);
assertTrue(r.contains("<table"), "Expected table for map with bean key, got: " + r);
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/ini/IniParser_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/ini/IniParser_Test.java
index 18ab16321a..e8180e9905 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/ini/IniParser_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/ini/IniParser_Test.java
@@ -40,69 +40,69 @@ class IniParser_Test extends TestBase {
@Test
void a01_simpleBean() throws Exception {
var ini = "host = localhost\nport = 8080\ndebug = true";
- var m = (Map<String, Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
assertBean(m, "host,port,debug", "localhost,8080,true");
}
@Test
void a02_nestedBean() throws Exception {
var ini = "name = myapp\n\n[database]\nhost = localhost\nport = 5432";
- var m = (Map<String, Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
assertBean(m, "name,database{host,port}", "myapp,{localhost,5432}");
}
@Test
void a03_nullValues() throws Exception {
var ini = "name = Alice\nmiddle = null";
- var m = (Map<String, Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
assertBean(m, "name,middle", "Alice,<null>");
}
@Test
void a04_quotedStrings() throws Exception {
var ini = "a = 'hello'\nb = 'world'";
- var m = (Map<String, Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
assertBean(m, "a,b", "hello,world");
}
@Test
void a05_numbersAndBooleans() throws Exception {
var ini = "count = 42\nratio = 3.14\nflag = true";
- var m = (Map<String, Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
assertBean(m, "count,ratio,flag", "42,3.14,true");
}
@Test
void a06_listOfStrings() throws Exception {
var ini = "tags = ['a','b','c']";
- var m = (Map<String, Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
assertBean(m, "tags", "[a,b,c]");
}
@Test
void a07_commentsIgnored() throws Exception {
var ini = "# comment\nname = Alice\n# another";
- var m = (Map<String, Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
assertBean(m, "name", "Alice");
}
@Test
void a08_blankLinesIgnored() throws Exception {
var ini = "a = 1\n\n\nb = 2";
- var m = (Map<String, Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
assertBean(m, "a,b", "1,2");
}
@Test
void a09_deeplyNestedBean() throws Exception {
var ini = "name = John\n\n[employment]\ntitle = Engineer\n\n[employment/company]\nname = Acme\nticker = ACME";
- var m = (Map<String, Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
assertBean(m, "name,employment{title,company{name,ticker}}", "John,{Engineer,{Acme,ACME}}");
}
@Test
void a10_emptyInput() throws Exception {
- var m = (Map<String, Object>) IniParser.DEFAULT.read("", Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) IniParser.DEFAULT.read("", Map.class, String.class, Object.class);
assertNotNull(m);
assertTrue(m.isEmpty());
}
@@ -110,14 +110,14 @@ class IniParser_Test extends TestBase {
@Test
void a11_colonSeparator() throws Exception {
var ini = "key: value";
- var m = (Map<String, Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
assertBean(m, "key", "value");
}
@Test
void a12_noSpaceSeparator() throws Exception {
var ini = "key=value";
- var m = (Map<String, Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
assertBean(m, "key", "value");
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/ini/IniRoundTrip_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/ini/IniRoundTrip_Test.java
index a28d08fe90..c7e9406f89 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/ini/IniRoundTrip_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/ini/IniRoundTrip_Test.java
@@ -93,94 +93,94 @@ class IniRoundTrip_Test extends TestBase {
@Test
void a03_mapRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("name", "test");
a.put("count", 42);
a.put("flag", true);
var ini = IniSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
assertBean(b, "name,count,flag", "test,42,true");
}
@Test
void a04_nestedMapRoundTrip() throws Exception {
- var nested = new LinkedHashMap<String, Object>();
+ var nested = new LinkedHashMap<String,Object>();
nested.put("host", "localhost");
nested.put("port", 8080);
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("name", "app");
a.put("database", nested);
var ini = IniSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
assertBean(b, "name,database{host,port}", "app,{localhost,8080}");
}
@Test
void a05_nullPropertiesRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("name", "Alice");
a.put("middle", null);
var s = IniSerializer.create().keepNullProperties().build();
var ini = s.write(a);
- var b = (Map<String, Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
assertBean(b, "name,middle", "Alice,<null>");
}
@Test
void a06_collectionsRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("name", "x");
a.put("tags", list("a", "b", "c"));
a.put("counts", list(1, 2, 3));
var ini = IniSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
assertBean(b, "name,tags,counts", "x,[a,b,c],[1,2,3]");
}
@Test
void a07_deepNestingRoundTrip() throws Exception {
- var company = new LinkedHashMap<String, Object>();
+ var company = new LinkedHashMap<String,Object>();
company.put("name", "Acme");
company.put("ticker", "ACME");
- var employment = new LinkedHashMap<String, Object>();
+ var employment = new LinkedHashMap<String,Object>();
employment.put("title", "Engineer");
employment.put("company", company);
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("name", "John");
a.put("employment", employment);
var ini = IniSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
assertBean(b, "name,employment{title,company{name,ticker}}", "John,{Engineer,{Acme,ACME}}");
}
@Test
void a08_emptyCollectionsRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("name", "x");
a.put("tags", list());
var ini = IniSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
assertBean(b, "name,tags", "x,[]");
}
@Test
void a09_stringEdgeCases() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("empty", "");
a.put("numeric", "123");
a.put("boolean", "true");
var ini = IniSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
assertBean(b, "empty,numeric,boolean", ",123,true");
}
@Test
void a10_unicodeRoundTrip() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("name", "José");
a.put("emoji", "Hello \uD83D\uDE00");
var ini = IniSerializer.DEFAULT.write(a);
- var b = (Map<String, Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) IniParser.DEFAULT.read(ini, Map.class, String.class, Object.class);
assertBean(b, "name,emoji", "José,Hello \uD83D\uDE00");
}
@@ -190,13 +190,13 @@ class IniRoundTrip_Test extends TestBase {
@Test
void b01_customKvSeparatorRoundTrip_map() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("name", "Alice");
a.put("age", 30);
var s = IniSerializer.create().kvSeparator('|').build();
var ini = s.write(a);
var p = IniParser.create().kvSeparator('|').build();
- var b = (Map<String, Object>) p.read(ini, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) p.read(ini, Map.class, String.class, Object.class);
assertBean(b, "name,age", "Alice,30");
}
@@ -212,12 +212,12 @@ class IniRoundTrip_Test extends TestBase {
@Test
void b03_defaultKvSeparatorBehaviorUnchanged() throws Exception {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("name", "Alice");
a.put("age", 30);
var ini = IniSerializer.DEFAULT.write(a);
var p = IniParser.create().build();
- var b = (Map<String, Object>) p.read(ini, Map.class, String.class, Object.class);
+ var b = (Map<String,Object>) p.read(ini, Map.class, String.class, Object.class);
assertBean(b, "name,age", "Alice,30");
}
}
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 4fa9e15656..80371f5bc1 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
@@ -38,7 +38,7 @@ class IniSerializer_Test {
@Test
void a01_simpleBean() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("host", "localhost");
m.put("port", 8080);
m.put("debug", true);
@@ -51,10 +51,10 @@ class IniSerializer_Test {
@Test
void a02_nestedBean() {
- var db = new LinkedHashMap<String, Object>();
+ var db = new LinkedHashMap<String,Object>();
db.put("host", "localhost");
db.put("port", 5432);
- var config = new LinkedHashMap<String, Object>();
+ var config = new LinkedHashMap<String,Object>();
config.put("name", "myapp");
config.put("database", db);
var ini = IniSerializer.DEFAULT.write(config);
@@ -67,7 +67,7 @@ class IniSerializer_Test {
@Test
void a03_beanWithListOfStrings() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("tags", List.of("web", "api", "rest"));
var ini = IniSerializer.DEFAULT.write(m);
assertNotNull(ini);
@@ -77,7 +77,7 @@ class IniSerializer_Test {
@Test
void a04_nullValues() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("name", "Alice");
m.put("middle", null);
var s = IniSerializer.create().keepNullProperties().build();
@@ -89,7 +89,7 @@ class IniSerializer_Test {
@Test
void a05_stringQuoting() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("key", "123");
m.put("flag", "true");
var ini = IniSerializer.DEFAULT.write(m);
@@ -100,7 +100,7 @@ class IniSerializer_Test {
@Test
void a06_emptyStrings() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("empty", "");
var ini = IniSerializer.DEFAULT.write(m);
assertNotNull(ini);
@@ -109,10 +109,10 @@ class IniSerializer_Test {
@Test
void a07_beanWithMap() {
- var settings = new LinkedHashMap<String, String>();
+ var settings = new LinkedHashMap<String,String>();
settings.put("timeout", "30");
settings.put("retries", "3");
- var config = new LinkedHashMap<String, Object>();
+ var config = new LinkedHashMap<String,Object>();
config.put("name", "app");
config.put("settings", settings);
var ini = IniSerializer.DEFAULT.write(config);
@@ -124,13 +124,13 @@ class IniSerializer_Test {
@Test
void a08_deeplyNestedBean() {
- var company = new LinkedHashMap<String, Object>();
+ var company = new LinkedHashMap<String,Object>();
company.put("name", "Acme");
company.put("ticker", "ACME");
- var employment = new LinkedHashMap<String, Object>();
+ var employment = new LinkedHashMap<String,Object>();
employment.put("title", "Engineer");
employment.put("company", company);
- var person = new LinkedHashMap<String, Object>();
+ var person = new LinkedHashMap<String,Object>();
person.put("name", "John");
person.put("employment", employment);
var ini = IniSerializer.DEFAULT.write(person);
@@ -142,11 +142,11 @@ class IniSerializer_Test {
@Test
void a09_multipleNestedBeans() {
- var addr1 = new LinkedHashMap<String, Object>();
+ var addr1 = new LinkedHashMap<String,Object>();
addr1.put("city", "Boston");
- var addr2 = new LinkedHashMap<String, Object>();
+ var addr2 = new LinkedHashMap<String,Object>();
addr2.put("city", "NYC");
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("name", "x");
m.put("home", addr1);
m.put("work", addr2);
@@ -174,7 +174,7 @@ class IniSerializer_Test {
@Test
void a12_emptyBean() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
var ini = IniSerializer.DEFAULT.write(m);
assertNotNull(ini);
assertTrue(ini.trim().isEmpty() || ini.contains("\n\n"));
@@ -182,7 +182,7 @@ class IniSerializer_Test {
@Test
void a13_kvSeparator() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("key", "value");
var s = IniSerializer.create().kvSeparator(':').build();
var ini = s.write(m);
@@ -191,7 +191,7 @@ class IniSerializer_Test {
@Test
void a14_addBeanTypes() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("name", "test");
var s = IniSerializer.create().addBeanTypes().addRootType().build();
var ini = s.write(m);
@@ -205,7 +205,7 @@ class IniSerializer_Test {
@Test
void b01_dateValues() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("date", LocalDate.of(2024, 3, 15));
m.put("instant", Instant.parse("2024-03-15T12:00:00Z"));
var ini = IniSerializer.DEFAULT.write(m);
@@ -215,7 +215,7 @@ class IniSerializer_Test {
@Test
void b02_enumValues() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("status", TestEnum.ACTIVE);
var ini = IniSerializer.DEFAULT.write(m);
assertTrue(ini.contains("ACTIVE"));
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/jcs/JcsEdgeCases_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/jcs/JcsEdgeCases_Test.java
index 70c98afa47..d75222e736 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/jcs/JcsEdgeCases_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/jcs/JcsEdgeCases_Test.java
@@ -72,7 +72,7 @@ class JcsEdgeCases_Test extends TestBase {
@Test
void f08_duplicateMapKeys() throws Exception {
// JSON semantics: last value wins. JCS output is sorted.
- var m = new LinkedHashMap<String, Integer>();
+ var m = new LinkedHashMap<String,Integer>();
m.put("x", 1);
m.put("a", 2);
m.put("x", 3); // overwrites
@@ -81,7 +81,7 @@ class JcsEdgeCases_Test extends TestBase {
@Test
void f09_largeObject() throws Exception {
- var m = new TreeMap<String, Integer>();
+ var m = new TreeMap<String,Integer>();
for (var i = 0; i < 100; i++)
m.put("k" + i, i);
var s = JcsSerializer.DEFAULT.write(m);
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/jcs/JcsSorting_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/jcs/JcsSorting_Test.java
index 778ea4dc64..82880bb6d0 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/jcs/JcsSorting_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/jcs/JcsSorting_Test.java
@@ -61,7 +61,7 @@ class JcsSorting_Test extends TestBase {
@Test
void c05_utf16SortOrder() throws Exception {
// RFC 8785: keys sorted by UTF-16 code unit order
- var m = new LinkedHashMap<String, Integer>();
+ var m = new LinkedHashMap<String,Integer>();
m.put(Character.toString((char) 0x00F6), 1); // ö
m.put("1", 2);
m.put("\r", 3); // carriage return
@@ -83,7 +83,7 @@ class JcsSorting_Test extends TestBase {
@Test
void c06_mapKeysSorted() throws Exception {
- var m = new HashMap<String, Object>();
+ var m = new HashMap<String,Object>();
m.put("z", 1);
m.put("a", 2);
m.put("m", 3);
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/json/JsonTokenStream_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/json/JsonTokenStream_Test.java
index e1b11de745..fe7a915be4 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/json/JsonTokenStream_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/json/JsonTokenStream_Test.java
@@ -509,7 +509,7 @@ class JsonTokenStream_Test extends TestBase {
}
var streamed = sb.toString();
- var pojo = new LinkedHashMap<String, Object>();
+ var pojo = new LinkedHashMap<String,Object>();
pojo.put("a", 1);
pojo.put("b", List.of("x", "y"));
var databind = JsonSerializer.DEFAULT.writeToString(pojo);
@@ -875,7 +875,7 @@ class JsonTokenStream_Test extends TestBase {
public String name;
public int age;
public List<String> tags;
- public Map<String, Integer> scores;
+ public Map<String,Integer> scores;
}
@Test void h01_simpleScalar() throws Exception {
@@ -919,7 +919,7 @@ class JsonTokenStream_Test extends TestBase {
}
@Test void h05_compositeWithMapsAndArrays() throws Exception {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("a", 1);
m.put("b", List.of("x", "y"));
m.put("c", new int[]{10, 20});
@@ -960,7 +960,7 @@ class JsonTokenStream_Test extends TestBase {
}
@Test void h08_sortMapsHonored() throws Exception {
- var m = new LinkedHashMap<String, Integer>();
+ var m = new LinkedHashMap<String,Integer>();
m.put("z", 1);
m.put("a", 2);
m.put("m", 3);
@@ -975,7 +975,7 @@ class JsonTokenStream_Test extends TestBase {
@Test void h09_sortMapsDefaultOff() throws Exception {
// Default: insertion order preserved.
- var m = new LinkedHashMap<String, Integer>();
+ var m = new LinkedHashMap<String,Integer>();
m.put("z", 1);
m.put("a", 2);
var sb = new StringWriter();
@@ -986,7 +986,7 @@ class JsonTokenStream_Test extends TestBase {
}
@Test void h10_keepNullPropertiesOff() throws Exception {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("a", 1);
m.put("b", null);
m.put("c", 3);
@@ -1002,7 +1002,7 @@ class JsonTokenStream_Test extends TestBase {
}
@Test void h11_keepNullPropertiesOn() throws Exception {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("a", 1);
m.put("b", null);
var ser = JsonSerializer.create().keepNullProperties().build();
@@ -1014,7 +1014,7 @@ class JsonTokenStream_Test extends TestBase {
}
@Test void h12_trimEmptyMapsHonored() throws Exception {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("a", 1);
m.put("b", Map.of());
var ser = JsonSerializer.create().trimEmptyMaps().build();
@@ -1026,7 +1026,7 @@ class JsonTokenStream_Test extends TestBase {
}
@Test void h13_trimEmptyCollectionsHonored() throws Exception {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("a", 1);
m.put("b", List.of());
var ser = JsonSerializer.create().trimEmptyCollections().build();
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/json5/Json5TokenStream_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/json5/Json5TokenStream_Test.java
index bc9d48e771..fa30aa3826 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/json5/Json5TokenStream_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/json5/Json5TokenStream_Test.java
@@ -286,7 +286,7 @@ class Json5TokenStream_Test extends TestBase {
}
@Test void e02_objectMatchesSerializer() throws Exception {
- var m = new java.util.LinkedHashMap<String, Object>();
+ var m = new java.util.LinkedHashMap<String,Object>();
m.put("a", 1);
m.put("b", java.util.List.of("x", "y"));
var sb = new StringWriter();
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/json5l/Json5lTokenStream_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/json5l/Json5lTokenStream_Test.java
index e79a3bd450..220cb5cc0f 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/json5l/Json5lTokenStream_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/json5l/Json5lTokenStream_Test.java
@@ -124,7 +124,7 @@ class Json5lTokenStream_Test extends TestBase {
}
assertString("{\"x\":1}\n{\"x\":2}\n", sb);
- var records = new java.util.ArrayList<java.util.Map<?, ?>>();
+ var records = new java.util.ArrayList<java.util.Map<?,?>>();
try (RecordReader r = Json5lParser.DEFAULT.readArrayRecords(sb.toString())) {
assertTrue(r.isStreaming());
while (r.canRead())
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/jsonl/JsonlTokenStream_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/jsonl/JsonlTokenStream_Test.java
index d4e67ea6a3..fb2f199068 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/jsonl/JsonlTokenStream_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/jsonl/JsonlTokenStream_Test.java
@@ -324,7 +324,7 @@ class JsonlTokenStream_Test extends TestBase {
assertString("{\"x\":1}\n{\"x\":2}\n{\"x\":3}\n", sb);
// Read them back via readArrayRecords(...) and assert each record's shape with BCT.
- var records = new java.util.ArrayList<java.util.Map<?, ?>>();
+ var records = new java.util.ArrayList<java.util.Map<?,?>>();
try (RecordReader r = JsonlParser.DEFAULT.readArrayRecords(sb.toString())) {
assertTrue(r.isStreaming());
while (r.canRead())
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownAiUseCase_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownAiUseCase_Test.java
index 81705a9670..0c00c6ecf4 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownAiUseCase_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownAiUseCase_Test.java
@@ -162,6 +162,6 @@ class MarkdownAiUseCase_Test {
public String code;
public String message;
public String timestamp;
- public Map<String, Object> details;
+ public Map<String,Object> details;
}
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownDocParserSession_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownDocParserSession_Test.java
index 48925df9ec..997f0ebffa 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownDocParserSession_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownDocParserSession_Test.java
@@ -124,7 +124,7 @@ class MarkdownDocParserSession_Test {
public String val;
}
- public static class CSwap extends ObjectSwap<CWrapped, String> {
+ public static class CSwap extends ObjectSwap<CWrapped,String> {
@Override
public String swap(MarshallingSession session, CWrapped o) {
return o == null ? null : o.val;
@@ -423,7 +423,7 @@ class MarkdownDocParserSession_Test {
| a | 1 |
| b | 2 |
""";
- var r = (Map<String, Object>) MarkdownDocParser.DEFAULT.read(md, Map.class);
+ var r = (Map<String,Object>) MarkdownDocParser.DEFAULT.read(md, Map.class);
assertNotNull(r);
assertEquals(2, r.size());
}
@@ -442,7 +442,7 @@ class MarkdownDocParserSession_Test {
| x | 10 |
| y | 20 |
""";
- var r = (TreeMap<String, Integer>) MarkdownDocParser.DEFAULT.read(md, TreeMap.class, String.class, Integer.class);
+ var r = (TreeMap<String,Integer>) MarkdownDocParser.DEFAULT.read(md, TreeMap.class, String.class, Integer.class);
assertNotNull(r);
assertEquals(10, (int) r.get("x"));
assertEquals(20, (int) r.get("y"));
@@ -459,7 +459,7 @@ class MarkdownDocParserSession_Test {
Just text, no table.
""";
- var r = (Map<String, Object>) MarkdownDocParser.DEFAULT.read(md, Map.class);
+ var r = (Map<String,Object>) MarkdownDocParser.DEFAULT.read(md, Map.class);
assertNotNull(r);
assertTrue(r.isEmpty());
}
@@ -477,7 +477,7 @@ class MarkdownDocParserSession_Test {
|---|---|
| a | b |
""";
- var r = (Map<String, Object>) MarkdownDocParser.DEFAULT.read(md, Map.class);
+ var r = (Map<String,Object>) MarkdownDocParser.DEFAULT.read(md, Map.class);
assertNotNull(r);
assertTrue(r.isEmpty());
}
@@ -497,7 +497,7 @@ class MarkdownDocParserSession_Test {
| badrow |
| k2 | v2 |
""";
- var r = (Map<String, Object>) MarkdownDocParser.DEFAULT.read(md, Map.class);
+ var r = (Map<String,Object>) MarkdownDocParser.DEFAULT.read(md, Map.class);
assertEquals("v1", r.get("k1"));
assertEquals("v2", r.get("k2"));
assertFalse(r.containsKey("badrow"));
@@ -522,7 +522,7 @@ class MarkdownDocParserSession_Test {
some text
""";
var p = MarkdownDocParser.create().headingLevel(1).build();
- var r = (Map<String, Object>) p.read(md, Map.class);
+ var r = (Map<String,Object>) p.read(md, Map.class);
assertNotNull(r);
assertEquals("v1", r.get("k1"));
assertTrue(r.containsKey("section1"));
@@ -636,7 +636,7 @@ class MarkdownDocParserSession_Test {
public String val;
}
- public static class WSwap extends ObjectSwap<WWrapped, String> {
+ public static class WSwap extends ObjectSwap<WWrapped,String> {
@Override
public String swap(MarshallingSession session, WWrapped o) {
return o == null ? null : o.val;
@@ -676,7 +676,7 @@ class MarkdownDocParserSession_Test {
val2
""";
var p = MarkdownDocParser.create().headingLevel(1).build();
- var r = (Map<String, Object>) p.read(md, Map.class);
+ var r = (Map<String,Object>) p.read(md, Map.class);
assertNotNull(r);
assertTrue(r.containsKey("key1"));
assertTrue(r.containsKey("key2"));
@@ -733,7 +733,7 @@ class MarkdownDocParserSession_Test {
|---|---|---|
| a | b | c |
""";
- var r = (Map<String, Object>) MarkdownDocParser.DEFAULT.read(md, Map.class);
+ var r = (Map<String,Object>) MarkdownDocParser.DEFAULT.read(md, Map.class);
assertNotNull(r);
assertTrue(r.isEmpty());
}
@@ -751,7 +751,7 @@ class MarkdownDocParserSession_Test {
|---|---|
| k1 | v1 |
""";
- var r = (Map<String, Object>) MarkdownDocParser.DEFAULT.read(md, Map.class);
+ var r = (Map<String,Object>) MarkdownDocParser.DEFAULT.read(md, Map.class);
assertNotNull(r);
assertTrue(r.isEmpty());
}
@@ -771,7 +771,7 @@ class MarkdownDocParserSession_Test {
| b | 2 |
| a | 1 |
""";
- var r = (TreeMap<?, ?>) MarkdownDocParser.DEFAULT.read(md, TreeMap.class);
+ var r = (TreeMap<?,?>) MarkdownDocParser.DEFAULT.read(md, TreeMap.class);
assertNotNull(r);
assertInstanceOf(TreeMap.class, r);
assertEquals(2, r.size());
@@ -844,7 +844,7 @@ class MarkdownDocParserSession_Test {
public static class AEBean {
public String name;
- public Map<String, String> props;
+ public Map<String,String> props;
}
@Test void af01_subSection_keyValueTable_nonBeanProp_readTable() {
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownDocParser_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownDocParser_Test.java
index 2b3fef6f1b..87d16a3f43 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownDocParser_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownDocParser_Test.java
@@ -167,7 +167,7 @@ class MarkdownDocParser_Test {
| k1 | v1 |
| k2 | v2 |
""";
- var r = (Map<String, String>) MarkdownDocParser.DEFAULT.read(md, Map.class, String.class, String.class);
+ var r = (Map<String,String>) MarkdownDocParser.DEFAULT.read(md, Map.class, String.class, String.class);
assertEquals("v1", r.get("k1"));
assertEquals("v2", r.get("k2"));
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownDocSerializer_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownDocSerializer_Test.java
index a849d69b73..a2b874a35c 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownDocSerializer_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownDocSerializer_Test.java
@@ -283,7 +283,7 @@ class MarkdownDocSerializer_Test {
public static class G {
public String name;
- public Map<String, Object> settings;
+ public Map<String,Object> settings;
}
//-----------------------------------------------------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownEdgeCases_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownEdgeCases_Test.java
index 3ae7fd2af4..7924ef0bb6 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownEdgeCases_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownEdgeCases_Test.java
@@ -45,7 +45,7 @@ class MarkdownEdgeCases_Test {
@Test void f02_multiLineStrings() {
var value = "line1\nline2\nline3";
- var bean = new LinkedHashMap<String, String>();
+ var bean = new LinkedHashMap<String,String>();
bean.put("text", value);
var md = toMarkdown(bean);
// Multi-line strings are wrapped in JSON5 backtick syntax for round-trip correctness
@@ -103,7 +103,7 @@ class MarkdownEdgeCases_Test {
//-----------------------------------------------------------------------------------------------------------------
@Test void f07_veryWideTable() {
- var props = new LinkedHashMap<String, Integer>();
+ var props = new LinkedHashMap<String,Integer>();
for (var i = 0; i < 20; i++)
props.put("col" + i, i);
var list = List.of(props);
@@ -165,8 +165,8 @@ class MarkdownEdgeCases_Test {
@Test void f11_deepNesting() {
// Deeply nested structure - Maps render nested maps as inline JSON5; beans get sub-headings
var s = MarkdownDocSerializer.create().title("L1").build();
- var nested = Map.<String, Object>of("x", "deep");
- var l1 = new LinkedHashMap<String, Object>();
+ var nested = Map.<String,Object>of("x", "deep");
+ var l1 = new LinkedHashMap<String,Object>();
l1.put("nested", nested);
var md = s.write(l1);
assertTrue(md.contains("deep"), "Expected deep value: " + md);
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownParserSession_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownParserSession_Test.java
index f8e84effc9..21f9ab3c2e 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownParserSession_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownParserSession_Test.java
@@ -416,7 +416,7 @@ class MarkdownParserSession_Test extends TestBase {
}
// Swap targeting Map<String,Object> - exercises top-level keyValueTableToJson5 / needsJson5Path branch.
- public static class IBeanMapSwap extends ObjectSwap<IBeanWithSwap, Map<String,Object>> {
+ public static class IBeanMapSwap extends ObjectSwap<IBeanWithSwap,Map<String,Object>> {
@Override
public Map<String,Object> swap(MarshallingSession session, IBeanWithSwap o) {
var m = new LinkedHashMap<String,Object>();
@@ -492,7 +492,7 @@ class MarkdownParserSession_Test extends TestBase {
public int count;
}
- public static class I07BeanSwap extends ObjectSwap<I07Bean, Map<String,Object>> {
+ public static class I07BeanSwap extends ObjectSwap<I07Bean,Map<String,Object>> {
@Override
public Map<String,Object> swap(MarshallingSession session, I07Bean o) {
var m = new LinkedHashMap<String,Object>();
@@ -550,7 +550,7 @@ class MarkdownParserSession_Test extends TestBase {
assertEquals("x", r.name);
}
- public static class IBeanMapSwapBool extends ObjectSwap<IBeanBool, Map<String,Object>> {
+ public static class IBeanMapSwapBool extends ObjectSwap<IBeanBool,Map<String,Object>> {
@Override
public Map<String,Object> swap(MarshallingSession session, IBeanBool o) {
var m = new LinkedHashMap<String,Object>();
@@ -791,7 +791,7 @@ class MarkdownParserSession_Test extends TestBase {
void t01_keyValueTable_asTypedMap() {
// Key-value table with typed Map target → isMap() branch in readKeyValueTable at line 306
// Also covers line 311 (keyType != null), 315 (cells.size() < 2)
- var r = (TreeMap<String, String>) MarkdownParser.DEFAULT.read(
+ var r = (TreeMap<String,String>) MarkdownParser.DEFAULT.read(
"| Key | Value |\n|---|---|\n| k1 | v1 |\n| k2 | v2 |",
TreeMap.class, String.class, String.class
);
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownParser_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownParser_Test.java
index 9c0618d82c..316ac9fa17 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownParser_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownParser_Test.java
@@ -304,11 +304,11 @@ class MarkdownParser_Test {
"unchecked" // Unchecked cast required for generic test utility.
})
void j04_roundTripStringToStringMap() {
- var original = new LinkedHashMap<String, String>();
+ var original = new LinkedHashMap<String,String>();
original.put("k1", "v1");
original.put("k2", "v2");
var md = MarkdownSerializer.DEFAULT.write(original);
- var parsed = (Map<String, String>) MarkdownParser.DEFAULT.read(md, Map.class, String.class, String.class);
+ var parsed = (Map<String,String>) MarkdownParser.DEFAULT.read(md, Map.class, String.class, String.class);
assertEquals(original, parsed);
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownSerializer_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownSerializer_Test.java
index cfdfc1e948..f82e6e44fd 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownSerializer_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/markdown/MarkdownSerializer_Test.java
@@ -75,7 +75,7 @@ class MarkdownSerializer_Test {
//====================================================================================================
@Test void b01_writeStringMap() {
- var m = new LinkedHashMap<String, String>();
+ var m = new LinkedHashMap<String,String>();
m.put("k1", "v1");
m.put("k2", "v2");
var md = toMarkdown(m);
@@ -232,11 +232,11 @@ class MarkdownSerializer_Test {
"unchecked" // Unchecked cast required for generic test utility.
})
void i04_roundTripMap() {
- var original = new LinkedHashMap<String, String>();
+ var original = new LinkedHashMap<String,String>();
original.put("k1", "v1");
original.put("k2", "v2");
var md = toMarkdown(original);
- var parsed = (Map<String, String>) fromMarkdown(md, Map.class, String.class, String.class);
+ var parsed = (Map<String,String>) fromMarkdown(md, Map.class, String.class, String.class);
assertEquals(original, parsed);
}
@@ -384,7 +384,7 @@ class MarkdownSerializer_Test {
@Test void m01_writeStringWithSingleQuoteAndBackslash() {
// Single-quote and backslash in string → escapeJson5String special char branches
- var m = new java.util.LinkedHashMap<String, String>();
+ var m = new java.util.LinkedHashMap<String,String>();
m.put("val", "it's a \\test");
var md = MarkdownSerializer.DEFAULT.write(m);
assertNotNull(md);
@@ -397,7 +397,7 @@ class MarkdownSerializer_Test {
@Test void m02_writeStringWithTabAndCR() {
// Tab and CR in string → escapeJson5String \t and \r paths
- var m = new java.util.LinkedHashMap<String, String>();
+ var m = new java.util.LinkedHashMap<String,String>();
m.put("tab", "a\tb");
m.put("cr", "a\rb");
var md = MarkdownSerializer.DEFAULT.write(m);
@@ -443,7 +443,7 @@ class MarkdownSerializer_Test {
@ParameterizedTest
@MethodSource("o01_temporalTypeAsMapValueProvider")
void o01_temporalTypeAsMapValue(String key, Object value) {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put(key, value);
var md = MarkdownSerializer.DEFAULT.write(m);
assertNotNull(md);
@@ -500,7 +500,7 @@ class MarkdownSerializer_Test {
@Test void q01_noHeadersForMap() {
// showHeaders=false with a map → skip header at line 257
var s = MarkdownSerializer.create().showHeaders(false).build();
- var m = new java.util.LinkedHashMap<String, String>();
+ var m = new java.util.LinkedHashMap<String,String>();
m.put("k1", "v1");
var md = s.write(m);
assertFalse(md.contains("| Key |"), "Should not have header row: " + md);
@@ -513,7 +513,7 @@ class MarkdownSerializer_Test {
@Test void r01_numericMapKey() {
// Key that looks like a number → isAmbiguousString returns true for key at line 266
- var m = new java.util.LinkedHashMap<String, String>();
+ var m = new java.util.LinkedHashMap<String,String>();
m.put("42", "answer");
var md = MarkdownSerializer.DEFAULT.write(m);
assertNotNull(md);
@@ -555,7 +555,7 @@ class MarkdownSerializer_Test {
@Test void u01_emptyStringAsMapValue() {
// Empty string value → isAmbiguousString returns true at line 369 (s.isEmpty())
- var m = new java.util.LinkedHashMap<String, String>();
+ var m = new java.util.LinkedHashMap<String,String>();
m.put("key", "");
var md = MarkdownSerializer.DEFAULT.write(m);
assertNotNull(md);
@@ -566,7 +566,7 @@ class MarkdownSerializer_Test {
@MethodSource("u02_ambiguousMapEntryProducesOutputProvider")
void u02_ambiguousMapEntryProducesOutput(String key, String value) {
// Ambiguous map keys/values still produce non-null serialized output.
- var m = new java.util.LinkedHashMap<String, String>();
+ var m = new java.util.LinkedHashMap<String,String>();
m.put(key, value);
var md = MarkdownSerializer.DEFAULT.write(m);
assertNotNull(md);
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/marshaller/MarshallerStreamShortcuts_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/marshaller/MarshallerStreamShortcuts_Test.java
index b09fab6540..055bfa1034 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/marshaller/MarshallerStreamShortcuts_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/marshaller/MarshallerStreamShortcuts_Test.java
@@ -97,7 +97,7 @@ class MarshallerStreamShortcuts_Test extends TestBase {
}
assertEquals("{\"x\":1}\n{\"x\":2}\n", sb.toString());
- var seen = new ArrayList<Map<?, ?>>();
+ var seen = new ArrayList<Map<?,?>>();
try (var r = Jsonl.toArrayRecords(sb.toString())) {
while (r.canRead())
seen.add(r.read(Map.class));
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parquet/ParquetParserSessionFull_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parquet/ParquetParserSessionFull_Test.java
index 133fac195c..f1d21f823b 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parquet/ParquetParserSessionFull_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parquet/ParquetParserSessionFull_Test.java
@@ -62,11 +62,11 @@ class ParquetParserSessionFull_Test extends TestBase {
public static class MapBean {
public String name;
- public Map<String, String> attrs;
+ public Map<String,String> attrs;
}
public static class IntKeyMapBean {
- public Map<Integer, String> codes;
+ public Map<Integer,String> codes;
}
public static class OptionalBean {
@@ -329,7 +329,7 @@ class ParquetParserSessionFull_Test extends TestBase {
// Empty file parsed as Map<Integer,String>: rows is empty, isKeyValuePairFormat returns false
// via e(rows) early-exit (line 731 true branch), exercises the isEmpty branch.
var bytes = ParquetSerializer.DEFAULT.write(list());
- var out = (Map<Integer, String>) ParquetParser.DEFAULT.read(bytes, Map.class, Integer.class, String.class);
+ var out = (Map<Integer,String>) ParquetParser.DEFAULT.read(bytes, Map.class, Integer.class, String.class);
// An empty Parquet file with no rows produces null or empty map for a Map target.
assertTrue(out == null || out.isEmpty());
}
@@ -575,22 +575,22 @@ class ParquetParserSessionFull_Test extends TestBase {
// =================================================================================
@Test void j01_rootMapStringKeys() throws Exception {
- var in = new LinkedHashMap<String, String>();
+ var in = new LinkedHashMap<String,String>();
in.put("a", "1");
in.put("b", "2");
var bytes = ParquetSerializer.DEFAULT.write(in);
- var out = (Map<String, String>) ParquetParser.DEFAULT.read(bytes, Map.class, String.class, String.class);
+ var out = (Map<String,String>) ParquetParser.DEFAULT.read(bytes, Map.class, String.class, String.class);
assertEquals("1", out.get("a"));
assertEquals("2", out.get("b"));
}
@Test void j02_rootMapNonStringKeysWithNullKeyValue() throws Exception {
var s = ParquetSerializer.create().keepNullProperties().build();
- var in = new LinkedHashMap<Integer, String>();
+ var in = new LinkedHashMap<Integer,String>();
in.put(10, "ten");
in.put(20, "twenty");
var bytes = s.write(in);
- var out = (Map<Integer, String>) ParquetParser.DEFAULT.read(bytes, Map.class, Integer.class, String.class);
+ var out = (Map<Integer,String>) ParquetParser.DEFAULT.read(bytes, Map.class, Integer.class, String.class);
assertEquals("ten", out.get(10));
assertEquals("twenty", out.get(20));
}
@@ -769,23 +769,23 @@ class ParquetParserSessionFull_Test extends TestBase {
// A Map whose key is literally "root" with a nested Map value triggers the {root:{...}} unwrap
// on line 264: buildSchemaFromMap creates root.root.key_value.key/value columns; reassembleRows
// merges them into row["root"] = innerMap; doRead unwraps the single-key root map.
- var inner = new LinkedHashMap<String, Object>();
+ var inner = new LinkedHashMap<String,Object>();
inner.put("inner", "val");
- var in = new LinkedHashMap<String, Object>();
+ var in = new LinkedHashMap<String,Object>();
in.put("root", inner);
var bytes = ParquetSerializer.DEFAULT.write(in);
- var out = (Map<?, ?>) ParquetParser.DEFAULT.read(bytes, Map.class);
+ var out = (Map<?,?>) ParquetParser.DEFAULT.read(bytes, Map.class);
// The parser unwraps {root:{...}} → the inner map is returned directly.
assertNotNull(out);
}
@Test void p02_rootMapStringKeysFlatUnwrap() throws Exception {
// Normal string-keyed map: doRead single-row Map branch returns the flat row map directly.
- var in = new LinkedHashMap<String, Object>();
+ var in = new LinkedHashMap<String,Object>();
in.put("a", "1");
in.put("b", "2");
var bytes = ParquetSerializer.DEFAULT.write(in);
- var out = (Map<String, Object>) ParquetParser.DEFAULT.read(bytes, Map.class, String.class, Object.class);
+ var out = (Map<String,Object>) ParquetParser.DEFAULT.read(bytes, Map.class, String.class, Object.class);
assertEquals("1", out.get("a"));
assertEquals("2", out.get("b"));
}
@@ -802,11 +802,11 @@ class ParquetParserSessionFull_Test extends TestBase {
@Test void p04_mapTargetNonStringKeyWithNullKey() throws Exception {
// nullKey path in isKeyValuePairFormat: null key stored as nullKeyString sentinel
- var in = new LinkedHashMap<Integer, String>();
+ var in = new LinkedHashMap<Integer,String>();
in.put(1, "one");
in.put(null, "nullval");
var bytes = ParquetSerializer.create().keepNullProperties().build().write(in);
- var out = (Map<Integer, String>) ParquetParser.DEFAULT.read(bytes, Map.class, Integer.class, String.class);
+ var out = (Map<Integer,String>) ParquetParser.DEFAULT.read(bytes, Map.class, Integer.class, String.class);
assertEquals("one", out.get(1));
assertTrue(out.containsKey(null));
assertEquals("nullval", out.get(null));
@@ -814,11 +814,11 @@ class ParquetParserSessionFull_Test extends TestBase {
@Test void p05_mapTargetNonStringKeyNullValueType() throws Exception {
// valueType == null path in the non-string-key map branch (line 249)
- var in = new LinkedHashMap<Integer, String>();
+ var in = new LinkedHashMap<Integer,String>();
in.put(10, "ten");
var bytes = ParquetSerializer.DEFAULT.write(in);
- // Parse as Map<Integer, ?> without explicit value type
- var out = (Map<?, ?>) ParquetParser.DEFAULT.read(bytes, Map.class, Integer.class);
+ // Parse as Map<Integer,?> without explicit value type
+ var out = (Map<?,?>) ParquetParser.DEFAULT.read(bytes, Map.class, Integer.class);
assertEquals("ten", out.get(10));
}
@@ -1282,10 +1282,10 @@ class ParquetParserSessionFull_Test extends TestBase {
@Test void ee01_prepareMapForBeanMapTarget() throws Exception {
// value is a Map and target type is Map — exercises the !type.isMap() false branch (line 1575).
- var in = new LinkedHashMap<String, String>();
+ var in = new LinkedHashMap<String,String>();
in.put("a", "1");
var bytes = ParquetSerializer.DEFAULT.write(in);
- var out = (Map<String, String>) ParquetParser.DEFAULT.read(bytes, Map.class, String.class, String.class);
+ var out = (Map<String,String>) ParquetParser.DEFAULT.read(bytes, Map.class, String.class, String.class);
assertEquals("1", out.get("a"));
}
@@ -1403,7 +1403,7 @@ class ParquetParserSessionFull_Test extends TestBase {
// Serializing a scalar produces {value:"x"} rows; parsing as Map target hits the
// isMap() branch where inner is NOT a Map → inner instanceof Map<?,?> = false (line 240).
var bytes = ParquetSerializer.DEFAULT.write("hello");
- var out = (Map<?, ?>) ParquetParser.DEFAULT.read(bytes, (Class<Object>)(Class<?>)Map.class);
+ var out = (Map<?,?>) ParquetParser.DEFAULT.read(bytes, (Class<Object>)(Class<?>)Map.class);
// Falls through to single-row Map branch and returns the {value:"hello"} row as-is.
assertNotNull(out);
}
@@ -1430,10 +1430,10 @@ class ParquetParserSessionFull_Test extends TestBase {
@Test void hh04_prepareMapForBeanMapTarget() throws Exception {
// prepareMapForBean with a Map value and a Map target type: type.isMap() = true
// → falls through to return value as-is (line 1539 false branch on !type.isMap()).
- var in = new LinkedHashMap<String, Object>();
+ var in = new LinkedHashMap<String,Object>();
in.put("a", "1");
var bytes = ParquetSerializer.DEFAULT.write(in);
- var out = (Map<?, ?>) ParquetParser.DEFAULT.read(bytes, Map.class, String.class, Object.class);
+ var out = (Map<?,?>) ParquetParser.DEFAULT.read(bytes, Map.class, String.class, Object.class);
assertEquals("1", out.get("a"));
}
@@ -1455,11 +1455,11 @@ class ParquetParserSessionFull_Test extends TestBase {
// Serializing a List<Map> wraps each Map element in a ValueHolder row {value: {k:v}}.
// Parsing with Map target enters the type.isMap() block; single {value: Map} row's inner
// value is a Map, so convertToType(inner, type) is returned directly.
- var inner = new LinkedHashMap<String, Object>();
+ var inner = new LinkedHashMap<String,Object>();
inner.put("k", "v");
var in = list(inner);
var bytes = ParquetSerializer.DEFAULT.write(in);
- var out = (Map<?, ?>) ParquetParser.DEFAULT.read(bytes, (Class<Object>)(Class<?>)Map.class);
+ var out = (Map<?,?>) ParquetParser.DEFAULT.read(bytes, (Class<Object>)(Class<?>)Map.class);
assertNotNull(out);
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parquet/ParquetParserSession_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parquet/ParquetParserSession_Test.java
index 0ee628751c..e284f6ade7 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parquet/ParquetParserSession_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parquet/ParquetParserSession_Test.java
@@ -230,13 +230,13 @@ class ParquetParserSession_Test extends TestBase {
@Test void e01_mapTarget() throws Exception {
// Map<String,Object> from a single bean - exercises Map-target branch in doRead.
var bytes = ParquetSerializer.DEFAULT.write(simple("alice", 30));
- var m = (Map<String, Object>) ParquetParser.DEFAULT.read(bytes, Map.class, String.class, Object.class);
+ var m = (Map<String,Object>) ParquetParser.DEFAULT.read(bytes, Map.class, String.class, Object.class);
assertNotNull(m);
}
@Test void e02_listOfMaps() throws Exception {
var bytes = ParquetSerializer.DEFAULT.write(list(simple("a", 1), simple("b", 2)));
- var l = (List<Map<String, Object>>) ParquetParser.DEFAULT.read(bytes, List.class, Map.class);
+ var l = (List<Map<String,Object>>) ParquetParser.DEFAULT.read(bytes, List.class, Map.class);
assertEquals(2, l.size());
}
@@ -310,12 +310,12 @@ class ParquetParserSession_Test extends TestBase {
// -----------------------------------------------------------------------------------------------------------------
@Test void i01_intKeyedMap() throws Exception {
- // Map<Integer, String> serialized as key/value pairs - exercises isKeyValuePairFormat branch.
- var src = new LinkedHashMap<Integer, String>();
+ // Map<Integer,String> serialized as key/value pairs - exercises isKeyValuePairFormat branch.
+ var src = new LinkedHashMap<Integer,String>();
src.put(1, "a");
src.put(2, "b");
var bytes = ParquetSerializer.DEFAULT.write(src);
- var m = (Map<Integer, String>) ParquetParser.DEFAULT.read(bytes, Map.class, Integer.class, String.class);
+ var m = (Map<Integer,String>) ParquetParser.DEFAULT.read(bytes, Map.class, Integer.class, String.class);
assertNotNull(m);
assertEquals(2, m.size());
assertEquals("a", m.get(1));
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parquet/ParquetRoundTrip_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parquet/ParquetRoundTrip_Test.java
index 6bc2d303ff..3e0f2026ca 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parquet/ParquetRoundTrip_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parquet/ParquetRoundTrip_Test.java
@@ -137,12 +137,12 @@ class ParquetRoundTrip_Test extends TestBase {
@Test
void a08_mapWithNonStringKeysRoundTrip() throws Exception {
- var in = new TreeMap<Integer, String>();
+ var in = new TreeMap<Integer,String>();
in.put(1, "a");
in.put(2, "b");
in.put(3, "c");
var bytes = ParquetSerializer.DEFAULT.write(in);
- var out = (Map<Integer, String>) ParquetParser.DEFAULT.read(bytes, Map.class, Integer.class, String.class);
+ var out = (Map<Integer,String>) ParquetParser.DEFAULT.read(bytes, Map.class, Integer.class, String.class);
assertEquals(3, out.size());
assertEquals("a", out.get(1));
assertEquals("b", out.get(2));
@@ -174,11 +174,11 @@ class ParquetRoundTrip_Test extends TestBase {
@Test
void a11_mapWithEnumKeysRoundTrip() throws Exception {
// 2.7: Map<Enum,?> at root - enum keys serialized as name(), parser converts string back to enum
- var in = new LinkedHashMap<TestEnum, String>();
+ var in = new LinkedHashMap<TestEnum,String>();
in.put(TestEnum.FOO, "x");
in.put(TestEnum.BAR, "y");
var bytes = ParquetSerializer.DEFAULT.write(in);
- var out = (Map<TestEnum, String>) ParquetParser.DEFAULT.read(bytes,
+ var out = (Map<TestEnum,String>) ParquetParser.DEFAULT.read(bytes,
Map.class, TestEnum.class, String.class);
assertEquals(2, out.size());
assertEquals("x", out.get(TestEnum.FOO));
@@ -188,17 +188,17 @@ class ParquetRoundTrip_Test extends TestBase {
/** Bean with nested Map<Enum,Enum> - 2.1 nested map key_value support. */
public static class BeanWithNestedMap {
public String name;
- public Map<TestEnum, TestEnum> statusMap;
+ public Map<TestEnum,TestEnum> statusMap;
}
@Test
void a11_mapIntegerStringRoundTrip() throws Exception {
// 2.2: Root Map with non-String keys
- var x = new TreeMap<Integer, String>();
+ var x = new TreeMap<Integer,String>();
x.put(1, "a");
x.put(2, null);
var bytes = ParquetSerializer.DEFAULT.write(x);
- var parsed = (TreeMap<Integer, String>) ParquetParser.DEFAULT.read(bytes, TreeMap.class, Integer.class, String.class);
+ var parsed = (TreeMap<Integer,String>) ParquetParser.DEFAULT.read(bytes, TreeMap.class, Integer.class, String.class);
assertEquals("a", parsed.get(1));
assertNull(parsed.get(2));
assertEquals(2, parsed.size());
@@ -209,11 +209,11 @@ class ParquetRoundTrip_Test extends TestBase {
// 2.2: Root Map with addRootType (ValueHolder unwrap)
var s = ParquetSerializer.create().keepNullProperties().addBeanTypes().addRootType().build();
var p = ParquetParser.create().build();
- var x = new TreeMap<Integer, String>();
+ var x = new TreeMap<Integer,String>();
x.put(1, "a");
x.put(2, null);
var bytes = s.write(x);
- var parsed = (TreeMap<Integer, String>) p.read(bytes, TreeMap.class, Integer.class, String.class);
+ var parsed = (TreeMap<Integer,String>) p.read(bytes, TreeMap.class, Integer.class, String.class);
assertEquals("a", parsed.get(1));
assertNull(parsed.get(2));
assertEquals(2, parsed.size());
@@ -226,11 +226,11 @@ class ParquetRoundTrip_Test extends TestBase {
var p = ParquetParser.create().build();
var xd1 = GregorianCalendar.from(java.time.ZonedDateTime.of(1901, 3, 3, 4, 5, 6, 0, java.time.ZoneId.systemDefault())).getTime();
var xd2 = GregorianCalendar.from(java.time.ZonedDateTime.of(1902, 4, 4, 5, 6, 7, 0, java.time.ZoneId.systemDefault())).getTime();
- var x = new TreeMap<Date, String>();
+ var x = new TreeMap<Date,String>();
x.put(xd1, "a");
x.put(xd2, null);
var bytes = s.write(x);
- var parsed = (TreeMap<Date, String>) p.read(bytes, TreeMap.class, Date.class, String.class);
+ var parsed = (TreeMap<Date,String>) p.read(bytes, TreeMap.class, Date.class, String.class);
assertEquals("a", parsed.get(xd1));
assertNull(parsed.get(xd2));
assertEquals(2, parsed.size());
@@ -243,11 +243,11 @@ class ParquetRoundTrip_Test extends TestBase {
var p = ParquetParser.create().build();
var xc1 = GregorianCalendar.from(java.time.ZonedDateTime.parse("2012-12-21T12:34:56Z"));
var xc2 = GregorianCalendar.from(java.time.ZonedDateTime.parse("2012-12-21T12:34:57Z"));
- var x = new TreeMap<Calendar, String>();
+ var x = new TreeMap<Calendar,String>();
x.put(xc1, "a");
x.put(xc2, null);
var bytes = s.write(x);
- var parsed = (TreeMap<Calendar, String>) p.read(bytes, TreeMap.class, GregorianCalendar.class, String.class);
+ var parsed = (TreeMap<Calendar,String>) p.read(bytes, TreeMap.class, GregorianCalendar.class, String.class);
assertEquals("a", parsed.get(xc1));
assertNull(parsed.get(xc2));
assertEquals(2, parsed.size());
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parquet/ParquetSerializerSessionFull_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parquet/ParquetSerializerSessionFull_Test.java
index 981f7c52c1..2bd578a979 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parquet/ParquetSerializerSessionFull_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parquet/ParquetSerializerSessionFull_Test.java
@@ -362,7 +362,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
@Test
void e01_mapStringKeys() throws Exception {
- var in = new LinkedHashMap<String, Object>();
+ var in = new LinkedHashMap<String,Object>();
in.put("a", 1);
in.put("b", "two");
var bytes = ParquetSerializer.DEFAULT.write(in);
@@ -372,7 +372,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
@Test
void e02_mapWithNullKey() throws Exception {
- var in = new HashMap<String, Object>();
+ var in = new HashMap<String,Object>();
in.put(null, "nullval");
in.put("a", "aval");
var bytes = ParquetSerializer.DEFAULT.write(in);
@@ -382,35 +382,35 @@ class ParquetSerializerSessionFull_Test extends TestBase {
@Test
void e03_mapIntegerKeys() throws Exception {
- var in = new TreeMap<Integer, String>();
+ var in = new TreeMap<Integer,String>();
in.put(1, "a");
in.put(2, "b");
var bytes = ParquetSerializer.DEFAULT.write(in);
- var out = (Map<Integer, String>) ParquetParser.DEFAULT.read(bytes, Map.class, Integer.class, String.class);
+ var out = (Map<Integer,String>) ParquetParser.DEFAULT.read(bytes, Map.class, Integer.class, String.class);
assertEquals("a", out.get(1));
assertEquals("b", out.get(2));
}
@Test
void e04_mapEnumKeys() throws Exception {
- var in = new LinkedHashMap<Color, String>();
+ var in = new LinkedHashMap<Color,String>();
in.put(Color.RED, "r");
in.put(Color.GREEN, "g");
var bytes = ParquetSerializer.DEFAULT.write(in);
- var out = (Map<Color, String>) ParquetParser.DEFAULT.read(bytes, Map.class, Color.class, String.class);
+ var out = (Map<Color,String>) ParquetParser.DEFAULT.read(bytes, Map.class, Color.class, String.class);
assertEquals("r", out.get(Color.RED));
}
public static class NestedMapBean {
public String name;
- public Map<String, Integer> counts;
+ public Map<String,Integer> counts;
public NestedMapBean() {}
- public NestedMapBean(String name, Map<String, Integer> counts) { this.name = name; this.counts = counts; }
+ public NestedMapBean(String name, Map<String,Integer> counts) { this.name = name; this.counts = counts; }
}
@Test
void e05_nestedMapProperty() throws Exception {
- var m = new LinkedHashMap<String, Integer>();
+ var m = new LinkedHashMap<String,Integer>();
m.put("x", 1);
m.put("y", 2);
var in = list(new NestedMapBean("a", m), new NestedMapBean("b", map()));
@@ -423,7 +423,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
@Test
void e06_mapEnumKeysAndDateKeys() throws Exception {
// Map with non-string keys at root drives mapKeyToStoredString for Date/Calendar/Temporal branches.
- var in = new LinkedHashMap<LocalDate, String>();
+ var in = new LinkedHashMap<LocalDate,String>();
in.put(LocalDate.parse("2020-01-01"), "a");
in.put(LocalDate.parse("2021-02-02"), "b");
var bytes = ParquetSerializer.create().keepNullProperties().addBeanTypes().addRootType().build().write(in);
@@ -433,15 +433,15 @@ class ParquetSerializerSessionFull_Test extends TestBase {
public static class TemporalMapBean {
public String name;
- public Map<String, Instant> events;
+ public Map<String,Instant> events;
public TemporalMapBean() {}
- public TemporalMapBean(String name, Map<String, Instant> events) { this.name = name; this.events = events; }
+ public TemporalMapBean(String name, Map<String,Instant> events) { this.name = name; this.events = events; }
}
@Test
void e07_nestedMapTemporalValuesAsString() throws Exception {
// Nested Map<String,Instant> value column at UTF8 (writeDatesAsTimestamp(false)); values reach writeValue raw.
- var m = new LinkedHashMap<String, Instant>();
+ var m = new LinkedHashMap<String,Instant>();
m.put("start", Instant.parse("2020-01-02T03:04:05Z"));
m.put("end", Instant.parse("2020-01-03T03:04:05Z"));
var in = list(new TemporalMapBean("a", m), new TemporalMapBean("b", map()));
@@ -452,14 +452,14 @@ class ParquetSerializerSessionFull_Test extends TestBase {
public static class IntMapBean {
public String name;
- public Map<String, Integer> nums;
+ public Map<String,Integer> nums;
public IntMapBean() {}
- public IntMapBean(String name, Map<String, Integer> nums) { this.name = name; this.nums = nums; }
+ public IntMapBean(String name, Map<String,Integer> nums) { this.name = name; this.nums = nums; }
}
@Test
void e08_nestedMapWithNullValue() throws Exception {
- var m = new LinkedHashMap<String, Integer>();
+ var m = new LinkedHashMap<String,Integer>();
m.put("x", 1);
m.put("y", null);
var in = list(new IntMapBean("a", m));
@@ -470,14 +470,14 @@ class ParquetSerializerSessionFull_Test extends TestBase {
public static class NonStrKeyMapBean {
public String name;
- public Map<Integer, String> byId;
+ public Map<Integer,String> byId;
public NonStrKeyMapBean() {}
- public NonStrKeyMapBean(String name, Map<Integer, String> byId) { this.name = name; this.byId = byId; }
+ public NonStrKeyMapBean(String name, Map<Integer,String> byId) { this.name = name; this.byId = byId; }
}
@Test
void e09_nestedMapNonStringKeys() throws Exception {
- var m = new LinkedHashMap<Integer, String>();
+ var m = new LinkedHashMap<Integer,String>();
m.put(1, "a");
m.put(2, "b");
var in = list(new NonStrKeyMapBean("x", m));
@@ -693,7 +693,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
* driving the {@code toInt64} temporal-instance branches at INT64/TIMESTAMP_MILLIS columns. */
@Test
void g10_mapWithTemporalValuesDefault() throws Exception {
- var in = new LinkedHashMap<String, Object>();
+ var in = new LinkedHashMap<String,Object>();
in.put("d", new Date(1_000_000_000L));
var cal = new GregorianCalendar();
cal.setTimeInMillis(2_000_000_000L);
@@ -717,14 +717,14 @@ class ParquetSerializerSessionFull_Test extends TestBase {
void g11_mapWithTemporalValuesNative() throws Exception {
var ser = ParquetSerializer.create().nativeLogicalTypes(true).build();
// DATE (INT32 / toEpochDay) — LocalDate, LocalDateTime, Instant, ZonedDateTime, OffsetDateTime.
- var dates = new LinkedHashMap<String, Object>();
+ var dates = new LinkedHashMap<String,Object>();
dates.put("ld", LocalDate.parse("2020-01-02"));
assertNotNull(ser.write(dates));
// TIME (INT64 micros / toTimeMicros) — LocalTime, OffsetTime.
- var times = new LinkedHashMap<String, Object>();
+ var times = new LinkedHashMap<String,Object>();
times.put("lt", LocalTime.parse("03:04:05"));
assertNotNull(ser.write(times));
- var times2 = new LinkedHashMap<String, Object>();
+ var times2 = new LinkedHashMap<String,Object>();
times2.put("ot", OffsetTime.parse("03:04:05+01:00"));
assertNotNull(ser.write(times2));
// TIMESTAMP (INT64 micros / toInstant) — Date, Calendar, Instant, LocalDate, LocalDateTime, ZonedDateTime, OffsetDateTime.
@@ -735,7 +735,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
LocalDateTime.parse("2020-01-02T03:04:05"),
ZonedDateTime.parse("2020-01-02T03:04:05Z"),
OffsetDateTime.parse("2020-01-02T03:04:05+01:00") }) {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("ts", v);
assertNotNull(ser.write(m));
}
@@ -754,7 +754,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
@Test
void g12_mapBigDecimalNative() throws Exception {
var ser = ParquetSerializer.create().nativeLogicalTypes(true).build();
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("amt", new BigDecimal("12.5"));
m.put("amt2", new BigInteger("42"));
assertNotNull(ser.write(m));
@@ -763,7 +763,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
/** Root Map with byte[], enum, UUID, Duration values — drives toByteArray / toFixedLenByteArray branches with raw objects. */
@Test
void g13_mapWithBinaryValues() throws Exception {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("bytes", new byte[]{1, 2, 3});
m.put("color", Color.GREEN);
m.put("id", UUID.fromString("12345678-1234-5678-1234-567812345678"));
@@ -777,7 +777,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
* toByteArray CONVERTED_UTF8 branch. */
@Test
void g14_mapTemporalValuesAsString() throws Exception {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("inst", Instant.parse("2020-01-02T03:04:05Z"));
var bytes = ParquetSerializer.create().writeDatesAsTimestamp(false).build().write(m);
assertNotNull(bytes);
@@ -791,7 +791,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
b.name = "a";
b.counts = null;
// Bean with Map<String,Integer> values reach writeValue raw; combine with arbitrary scalar map.
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("n", 42L);
m.put("s", "str");
var bytes = ParquetSerializer.DEFAULT.write(m);
@@ -895,7 +895,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
public static class MapCycleBean {
public String name;
- public Map<String, Object> data;
+ public Map<String,Object> data;
public MapCycleBean() { /* no-op */ }
}
@@ -1110,7 +1110,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
void l11_toByteArrayConvertedTimestampMillis() throws Exception {
// writeDatesAsTimestamp(false) + temporal value -> CONVERTED_TIMESTAMP_MILLIS path in toByteArray (line 1023)
// A Date value at a BYTE_ARRAY/TIMESTAMP_MILLIS column reaches the timestamp-to-string branch.
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("d", new Date(1_000_000_000L));
var bytes = ParquetSerializer.create().writeDatesAsTimestamp(false).build().write(m);
assertNotNull(bytes);
@@ -1123,7 +1123,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
@Test
void l12_applyDefaultSwapClassValue() throws Exception {
// A Class<?> value in a Map column: applyDefaultSwap finds the ClassSwap and returns a String.
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("type", String.class);
var bytes = ParquetSerializer.DEFAULT.write(m);
assertNotNull(bytes);
@@ -1181,9 +1181,9 @@ class ParquetSerializerSessionFull_Test extends TestBase {
@Test
void l16_toByteArrayConvertedUtf8NonString() throws SerializeException {
// BYTE_ARRAY / CONVERTED_UTF8 column from row-0 String; row-1 passes an Integer -> String.valueOf fires.
- var m0 = new LinkedHashMap<String, Object>();
+ var m0 = new LinkedHashMap<String,Object>();
m0.put("s", "hello");
- var m1 = new LinkedHashMap<String, Object>();
+ var m1 = new LinkedHashMap<String,Object>();
m1.put("s", 42);
// Two maps serialized as two-row list equivalent via writeRecords
var ser = ParquetSerializer.DEFAULT;
@@ -1225,7 +1225,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
@Test
void m01_emptyRootMap() throws Exception {
// sType.isMap() && m.isEmpty() -> true branch on line 249: returns List.of().
- var bytes = ParquetSerializer.DEFAULT.write(new LinkedHashMap<String, Object>());
+ var bytes = ParquetSerializer.DEFAULT.write(new LinkedHashMap<String,Object>());
assertNotNull(bytes);
assertTrue(bytes.length > 0);
}
@@ -1233,7 +1233,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
@Test
void m02_rootMapWithNullValue() throws Exception {
// String-keyed root map with null value -> val != null false branch (line 259): val stays null.
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("a", "x");
m.put("b", null);
var bytes = ParquetSerializer.create().keepNullProperties().build().write(m);
@@ -1273,15 +1273,15 @@ class ParquetSerializerSessionFull_Test extends TestBase {
public static class MapNestedBean {
public String id;
- public Map<String, String> data;
+ public Map<String,String> data;
public MapNestedBean() { /* no-op */ }
- public MapNestedBean(String id, Map<String, String> data) { this.id = id; this.data = data; }
+ public MapNestedBean(String id, Map<String,String> data) { this.id = id; this.data = data; }
}
@Test
void m04_computeDefValueMapPath() throws Exception {
// Bean with nested Map property -> computeDefValue walks Map path (line 483).
- var m = new LinkedHashMap<String, String>();
+ var m = new LinkedHashMap<String,String>();
m.put("x", "1");
m.put("y", "2");
var in = list(new MapNestedBean("a", m), new MapNestedBean("b", null));
@@ -1311,17 +1311,17 @@ class ParquetSerializerSessionFull_Test extends TestBase {
public static class ListMapBean {
public String name;
- public List<Map<String, String>> rows;
+ public List<Map<String,String>> rows;
public ListMapBean() { /* no-op */ }
- public ListMapBean(String name, List<Map<String, String>> rows) { this.name = name; this.rows = rows; }
+ public ListMapBean(String name, List<Map<String,String>> rows) { this.name = name; this.rows = rows; }
}
@Test
void m06_flattenListMapElements() throws Exception {
// List<Map<String,String>> -> flattenListValues Map path (line 789).
- var row1 = new LinkedHashMap<String, String>();
+ var row1 = new LinkedHashMap<String,String>();
row1.put("k", "v1");
- var row2 = new LinkedHashMap<String, String>();
+ var row2 = new LinkedHashMap<String,String>();
row2.put("k", "v2");
var in = list(new ListMapBean("a", list(row1, row2)));
var bytes = ParquetSerializer.DEFAULT.write(in);
@@ -1374,15 +1374,15 @@ class ParquetSerializerSessionFull_Test extends TestBase {
public static class MapValueBean {
public String id;
- public Map<String, Object> extra;
+ public Map<String,Object> extra;
public MapValueBean() { /* no-op */ }
- public MapValueBean(String id, Map<String, Object> extra) { this.id = id; this.extra = extra; }
+ public MapValueBean(String id, Map<String,Object> extra) { this.id = id; this.extra = extra; }
}
@Test
void m09_getValueByPathMap() throws Exception {
// Bean with Map property -> getValueByPath hits Map branch (line 823).
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("sub", "val");
var in = list(new MapValueBean("a", m));
var bytes = ParquetSerializer.DEFAULT.write(in);
@@ -1417,7 +1417,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
public static class CycleMap {
public String name;
- public Map<String, Object> data;
+ public Map<String,Object> data;
public CycleMap() { /* no-op */ }
}
@@ -1441,7 +1441,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
// Non-string-key root Map with multiple entries -> collectBeans produces key/value pair rows,
// writeColumnChunk calls writeMapColumnChunk for root.key_value.key/value paths,
// extractFlattenedMapValues hits isRootKeyValue=true and the {key,value} row branch (lines 657/660).
- var in = new LinkedHashMap<Integer, String>();
+ var in = new LinkedHashMap<Integer,String>();
in.put(1, "a");
in.put(2, null); // null value -> def=1 branch in extractFlattenedMapValues (line 683)
var bytes = ParquetSerializer.create().keepNullProperties().build().write(in);
@@ -1452,7 +1452,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
@Test
void m13_nonStringKeyRootMapSingleEntry() throws Exception {
// Single-entry non-string-key root Map -> isRootKeyValue path with exactly one entry (rep=0 only).
- var in = new LinkedHashMap<Long, String>();
+ var in = new LinkedHashMap<Long,String>();
in.put(42L, "answer");
var bytes = ParquetSerializer.DEFAULT.write(in);
assertNotNull(bytes);
@@ -1635,13 +1635,13 @@ class ParquetSerializerSessionFull_Test extends TestBase {
public SwappedBean() {}
}
- public static class SwapToString extends ObjectSwap<SwappedBean, String> {
+ public static class SwapToString extends ObjectSwap<SwappedBean,String> {
@Override public String swap(MarshallingSession s, SwappedBean o) { return o.name; }
}
@Test
void m27_collectBeansOrigBeanSwappedToNonBean() throws Exception {
- // ObjectSwap<SwappedBean, String>: swappedType.isBean()=false, origType.isBean()=true -> line 289 true branch.
+ // ObjectSwap<SwappedBean,String>: swappedType.isBean()=false, origType.isBean()=true -> line 289 true branch.
var ser = ParquetSerializer.create().swaps(SwapToString.class).build();
var bytes = ser.write(list(new SwappedBean("Alice"), new SwappedBean("Bob")));
assertNotNull(bytes);
@@ -1723,8 +1723,8 @@ class ParquetSerializerSessionFull_Test extends TestBase {
//-----------------------------------------------------------------------------------------------------------------
public static class InnerMapHolder {
- public Map<String, Integer> counts;
- public InnerMapHolder(Map<String, Integer> counts) { this.counts = counts; }
+ public Map<String,Integer> counts;
+ public InnerMapHolder(Map<String,Integer> counts) { this.counts = counts; }
public InnerMapHolder() {}
}
@@ -1737,7 +1737,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
@Test
void m31_getValueByPathNullMidPath() throws Exception {
- var m = new LinkedHashMap<String, Integer>();
+ var m = new LinkedHashMap<String,Integer>();
m.put("x", 1);
var in = list(new OuterMapHolder("a", new InnerMapHolder(m)), new OuterMapHolder("b", null));
var bytes = ParquetSerializer.DEFAULT.write(in);
@@ -1762,7 +1762,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
void m32_getValueByPathCycleFlatBean() throws Exception {
// Schema inferred from row1: counts=Map -> key_value columns -> getMapAtPath calls getValueByPath.
// Row2: counts = row2 itself -> bm.get("counts") = row2 (in seen) -> handleCycle(NULL) -> map=empty.
- var m = new LinkedHashMap<String, Integer>();
+ var m = new LinkedHashMap<String,Integer>();
m.put("x", 1);
var row1 = new CycleFlatMapBean("a", m);
var row2 = new CycleFlatMapBean("b", null);
@@ -1774,7 +1774,7 @@ class ParquetSerializerSessionFull_Test extends TestBase {
@Test
void m33_getValueByPathCycleThrowMode() {
// Same structure with THROW mode: cycle at line 766 TT -> handleCycle(THROW) -> SerializeException.
- var m = new LinkedHashMap<String, Integer>();
+ var m = new LinkedHashMap<String,Integer>();
m.put("x", 1);
var row1 = new CycleFlatMapBean("a", m);
var row2 = new CycleFlatMapBean("b", null);
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parser/ParserSession_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parser/ParserSession_Test.java
index 9f838eb3c1..676904b688 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parser/ParserSession_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/parser/ParserSession_Test.java
@@ -125,7 +125,7 @@ class ParserSession_Test extends TestBase {
}
@Test void a07_read_typeWithArgs_nestedMap() throws Exception {
- var m = (Map<String, List<Bean>>) P.read(
+ var m = (Map<String,List<Bean>>) P.read(
"{\"a\":[{\"f1\":\"x\",\"f2\":1}]}",
Map.class, String.class, List.class, Bean.class);
assertEquals(1, m.size());
@@ -186,14 +186,14 @@ class ParserSession_Test extends TestBase {
// -----------------------------------------------------------------------------------------------------------------
@Test void c01_readIntoMap_basic() throws Exception {
- var dest = new HashMap<String, Integer>();
+ var dest = new HashMap<String,Integer>();
P.readIntoMap("{\"a\":1,\"b\":2}", dest, String.class, Integer.class);
assertEquals(1, dest.get("a"));
assertEquals(2, dest.get("b"));
}
@Test void c02_readIntoMap_intKeys() throws Exception {
- var dest = new HashMap<Integer, String>();
+ var dest = new HashMap<Integer,String>();
P.readIntoMap("{\"1\":\"a\",\"2\":\"b\"}", dest, Integer.class, String.class);
assertEquals("a", dest.get(1));
assertEquals("b", dest.get(2));
@@ -201,13 +201,13 @@ class ParserSession_Test extends TestBase {
@Test void c03_readIntoMap_defaultElementTypes() throws Exception {
// Passing null types defaults to String/Object.
- var dest = new HashMap<String, Object>();
+ var dest = new HashMap<String,Object>();
P.readIntoMap("{\"a\":1}", dest, null, null);
assertEquals(1, dest.get("a"));
}
@Test void c04_readIntoMap_malformedThrowsParseException() {
- var dest = new HashMap<String, Object>();
+ var dest = new HashMap<String,Object>();
assertThrows(ParseException.class,
() -> P.readIntoMap("{not-json", dest, String.class, Object.class));
}
@@ -702,7 +702,7 @@ class ParserSession_Test extends TestBase {
@Test void m01_readIntoMap_runtimeWrappedAsParseException() {
// Malformed JSON (truncated input) triggers ParseException re-wrapping.
- var dest = new HashMap<String, Object>();
+ var dest = new HashMap<String,Object>();
assertThrows(ParseException.class,
() -> P.readIntoMap("{\"a\":[1,2", dest, String.class, Object.class));
}
@@ -719,13 +719,13 @@ class ParserSession_Test extends TestBase {
// -----------------------------------------------------------------------------------------------------------------
@Test void n01_convertAttr_charType() throws Exception {
- var m = (Map<Character, String>) P.read(
+ var m = (Map<Character,String>) P.read(
"{\"x\":\"foo\"}", HashMap.class, Character.class, String.class);
assertTrue(m.containsKey('x'));
}
@Test void n02_convertAttr_booleanType() throws Exception {
- var m = (Map<Boolean, String>) P.read(
+ var m = (Map<Boolean,String>) P.read(
"{\"true\":\"yes\",\"false\":\"no\"}", HashMap.class, Boolean.class, String.class);
assertEquals("yes", m.get(true));
assertEquals("no", m.get(false));
@@ -768,7 +768,7 @@ class ParserSession_Test extends TestBase {
@Test void p01_convertAttr_temporalKey() throws Exception {
// Use java.time.LocalDate as a map key — exercises sType.isTemporal() branch.
- var m = (Map<java.time.LocalDate, String>) P.read(
+ var m = (Map<java.time.LocalDate,String>) P.read(
"{\"2020-01-02\":\"v\"}", HashMap.class, java.time.LocalDate.class, String.class);
assertEquals(1, m.size());
assertEquals("v", m.values().iterator().next());
@@ -776,35 +776,35 @@ class ParserSession_Test extends TestBase {
@Test void p02_convertAttr_durationKey() throws Exception {
// Duration as a map key — exercises sType.isDuration() branch.
- var m = (Map<java.time.Duration, String>) P.read(
+ var m = (Map<java.time.Duration,String>) P.read(
"{\"PT1H\":\"v\"}", HashMap.class, java.time.Duration.class, String.class);
assertEquals(1, m.size());
}
@Test void p03_convertAttr_periodKey() throws Exception {
// Period as a map key — exercises sType.isPeriod() branch.
- var m = (Map<java.time.Period, String>) P.read(
+ var m = (Map<java.time.Period,String>) P.read(
"{\"P1D\":\"v\"}", HashMap.class, java.time.Period.class, String.class);
assertEquals(1, m.size());
}
@Test void p04_convertAttr_dateKey() throws Exception {
// Date as a map key — exercises sType.isDate() branch.
- var m = (Map<Date, String>) P.read(
+ var m = (Map<Date,String>) P.read(
"{\"2020-01-02T00:00:00Z\":\"v\"}", HashMap.class, Date.class, String.class);
assertEquals(1, m.size());
}
@Test void p05_convertAttr_calendarKey() throws Exception {
// Calendar as a map key — exercises sType.isCalendar() branch.
- var m = (Map<Calendar, String>) P.read(
+ var m = (Map<Calendar,String>) P.read(
"{\"2020-01-02T00:00:00Z\":\"v\"}", HashMap.class, Calendar.class, String.class);
assertEquals(1, m.size());
}
@Test void p06_convertAttr_numberKey() throws Exception {
// Number subtype (Long) as a map key.
- var m = (Map<Long, String>) P.read(
+ var m = (Map<Long,String>) P.read(
"{\"100\":\"v\"}", HashMap.class, Long.class, String.class);
assertEquals("v", m.get(100L));
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextEdgeCases_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextEdgeCases_Test.java
index e9b890d20c..3151dc102b 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextEdgeCases_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextEdgeCases_Test.java
@@ -106,7 +106,7 @@ class PrototextEdgeCases_Test {
@Test
void g10_mapWithNonStringKeys() {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("k1", "one");
a.put("k2", "two");
var proto = toPrototext(a);
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextParserSession_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextParserSession_Test.java
index 8c4531e3e8..082d1bcea8 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextParserSession_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextParserSession_Test.java
@@ -178,7 +178,7 @@ class PrototextParserSession_Test extends TestBase {
@Test void d03_readToMap_stringKey() throws Exception {
// convertMapToType → isMap() → default string key path → return map
@SuppressWarnings("unchecked")
- var r = (Map<String, String>) PrototextParser.DEFAULT.read("a: \"1\" b: \"2\"", Map.class, String.class, String.class);
+ var r = (Map<String,String>) PrototextParser.DEFAULT.read("a: \"1\" b: \"2\"", Map.class, String.class, String.class);
assertNotNull(r);
}
@@ -242,6 +242,6 @@ class PrototextParserSession_Test extends TestBase {
}
public static class BeanWithMapProp {
- public Map<String, Object> metadata;
+ public Map<String,Object> metadata;
}
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextParser_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextParser_Test.java
index b040ac380a..a0e4e64236 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextParser_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextParser_Test.java
@@ -82,8 +82,8 @@ class PrototextParser_Test {
var list = a.getList("servers");
assertNotNull(list);
assertEquals(2, list.size());
- assertEquals("alpha", ((Map<?, ?>) list.get(0)).get("host"));
- assertEquals("beta", ((Map<?, ?>) list.get(1)).get("host"));
+ assertEquals("alpha", ((Map<?,?>) list.get(0)).get("host"));
+ assertEquals("beta", ((Map<?,?>) list.get(1)).get("host"));
}
@Test
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextRoundTrip_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextRoundTrip_Test.java
index a6125a722a..dc1c525a30 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextRoundTrip_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextRoundTrip_Test.java
@@ -42,10 +42,10 @@ class PrototextRoundTrip_Test {
@Test
void a02_nestedBeanRoundTrip() {
- var inner = new LinkedHashMap<String, Object>();
+ var inner = new LinkedHashMap<String,Object>();
inner.put("city", "Boston");
inner.put("state", "MA");
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("name", "Alice");
a.put("address", inner);
@@ -60,10 +60,10 @@ class PrototextRoundTrip_Test {
@Test
void a03_collectionOfBeansRoundTrip() {
- var a1 = new LinkedHashMap<String, Object>();
+ var a1 = new LinkedHashMap<String,Object>();
a1.put("host", "alpha");
a1.put("port", 8080);
- var a2 = new LinkedHashMap<String, Object>();
+ var a2 = new LinkedHashMap<String,Object>();
a2.put("host", "beta");
a2.put("port", 8081);
var a = JsonMap.of("servers", List.of(a1, a2));
@@ -73,8 +73,8 @@ class PrototextRoundTrip_Test {
var list = b.getList("servers");
assertNotNull(list);
assertEquals(2, list.size());
- assertEquals("alpha", ((Map<?, ?>) list.get(0)).get("host"));
- assertEquals("beta", ((Map<?, ?>) list.get(1)).get("host"));
+ assertEquals("alpha", ((Map<?,?>) list.get(0)).get("host"));
+ assertEquals("beta", ((Map<?,?>) list.get(1)).get("host"));
}
@Test
@@ -87,7 +87,7 @@ class PrototextRoundTrip_Test {
@Test
void a05_mapRoundTrip() {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("env", new LinkedHashMap<>(Map.of("PATH", "/usr/bin", "HOME", "/home")));
var proto = toPrototext(a);
@@ -171,7 +171,7 @@ class PrototextRoundTrip_Test {
@Test
void a13_nullableReferenceRoundTrip() {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("s", "x");
a.put("n", 1);
a.put("nullStr", null);
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextSerializerSession_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextSerializerSession_Test.java
index a93d0b5c4e..f543b78e7c 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextSerializerSession_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextSerializerSession_Test.java
@@ -134,13 +134,13 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void c01_beanProperty_listOfBeans() throws Exception {
// Exercise the collection-of-beans branch in writeBeanMap.
// Use Map-of-Map values (which Juneau treats as bean-like) to match existing proto patterns.
- var c1 = new LinkedHashMap<String, Object>();
+ var c1 = new LinkedHashMap<String,Object>();
c1.put("id", 1);
c1.put("label", "alpha");
- var c2 = new LinkedHashMap<String, Object>();
+ var c2 = new LinkedHashMap<String,Object>();
c2.put("id", 2);
c2.put("label", "beta");
- var root = new LinkedHashMap<String, Object>();
+ var root = new LinkedHashMap<String,Object>();
root.put("name", "parent");
root.put("children", List.of(c1, c2));
@@ -153,13 +153,13 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void c02_beanProperty_listOfBeans_listSyntax() throws Exception {
// useListSyntaxForBeans=true → exercise the [{...}, {...}] writer path.
var ser = PrototextSerializer.create().useListSyntaxForBeans(true).build();
- var c1 = new LinkedHashMap<String, Object>();
+ var c1 = new LinkedHashMap<String,Object>();
c1.put("id", 1);
c1.put("label", "alpha");
- var c2 = new LinkedHashMap<String, Object>();
+ var c2 = new LinkedHashMap<String,Object>();
c2.put("id", 2);
c2.put("label", "beta");
- var root = new LinkedHashMap<String, Object>();
+ var root = new LinkedHashMap<String,Object>();
root.put("name", "parent");
root.put("children", List.of(c1, c2));
@@ -171,12 +171,12 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void c03_arrayOfMaps() throws Exception {
// Map<String,Object>[] property — exercises aType.isArray() branch in writeBeanMap with bean elements.
- var c1 = new LinkedHashMap<String, Object>();
+ var c1 = new LinkedHashMap<String,Object>();
c1.put("label", "x");
- var c2 = new LinkedHashMap<String, Object>();
+ var c2 = new LinkedHashMap<String,Object>();
c2.put("label", "y");
- Map<String, Object>[] arr = new Map[] { c1, c2 };
- var root = new LinkedHashMap<String, Object>();
+ Map<String,Object>[] arr = new Map[] { c1, c2 };
+ var root = new LinkedHashMap<String,Object>();
root.put("name", "parent");
root.put("children", arr);
@@ -187,7 +187,7 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void c04_intArray_property() throws Exception {
// int[] in a Map property — exercises array → list of scalars branch.
- var root = new LinkedHashMap<String, Object>();
+ var root = new LinkedHashMap<String,Object>();
root.put("values", new int[] { 10, 20, 30 });
var proto = PrototextSerializer.DEFAULT.write(root);
assertNotNull(proto);
@@ -197,9 +197,9 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void c05_listSyntax_useColon() throws Exception {
// Combine useListSyntaxForBeans + useColonForMessages to hit both branches.
var ser = PrototextSerializer.create().useListSyntaxForBeans(true).useColonForMessages(true).build();
- var c1 = new LinkedHashMap<String, Object>();
+ var c1 = new LinkedHashMap<String,Object>();
c1.put("label", "z");
- var root = new LinkedHashMap<String, Object>();
+ var root = new LinkedHashMap<String,Object>();
root.put("name", "parent");
root.put("children", List.of(c1));
@@ -210,9 +210,9 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void c06_useColonForMessages_nestedBean() throws Exception {
var ser = PrototextSerializer.create().useColonForMessages(true).build();
- var inner = new LinkedHashMap<String, Object>();
+ var inner = new LinkedHashMap<String,Object>();
inner.put("x", 1);
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("inner", inner);
var proto = ser.write(m);
@@ -226,13 +226,13 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void d01_mapOfMaps() throws Exception {
// Hits writeMap → bean/map branch (recursive writeMap).
- var inner = new LinkedHashMap<String, Object>();
+ var inner = new LinkedHashMap<String,Object>();
inner.put("a", 1);
inner.put("b", 2);
- var outer = new LinkedHashMap<String, Object>();
+ var outer = new LinkedHashMap<String,Object>();
outer.put("nested", inner);
// Wrap so root is a top-level message rather than the map itself.
- var root = new LinkedHashMap<String, Object>();
+ var root = new LinkedHashMap<String,Object>();
root.put("config", outer);
var proto = PrototextSerializer.DEFAULT.write(root);
@@ -244,9 +244,9 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void d02_mapWithListValues() throws Exception {
// Hits writeMap → collection branch.
- var sub = new LinkedHashMap<String, Object>();
+ var sub = new LinkedHashMap<String,Object>();
sub.put("tags", List.of("a", "b"));
- var root = new LinkedHashMap<String, Object>();
+ var root = new LinkedHashMap<String,Object>();
root.put("sub", sub);
var proto = PrototextSerializer.DEFAULT.write(root);
@@ -257,9 +257,9 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void d03_mapWithArrayValues() throws Exception {
// Hits writeMap → array branch (toList for array).
- var sub = new LinkedHashMap<String, Object>();
+ var sub = new LinkedHashMap<String,Object>();
sub.put("ports", new int[] { 80, 443 });
- var root = new LinkedHashMap<String, Object>();
+ var root = new LinkedHashMap<String,Object>();
root.put("sub", sub);
var proto = PrototextSerializer.DEFAULT.write(root);
@@ -268,17 +268,17 @@ class PrototextSerializerSession_Test extends TestBase {
}
@Test void d04_mapWithMapValues() throws Exception {
- // Map<String, Map> nested values — exercises writeMap recursion.
- var c1 = new LinkedHashMap<String, Object>();
+ // Map<String,Map> nested values — exercises writeMap recursion.
+ var c1 = new LinkedHashMap<String,Object>();
c1.put("id", 1);
c1.put("label", "first");
- var c2 = new LinkedHashMap<String, Object>();
+ var c2 = new LinkedHashMap<String,Object>();
c2.put("id", 2);
c2.put("label", "second");
- var entries = new LinkedHashMap<String, Object>();
+ var entries = new LinkedHashMap<String,Object>();
entries.put("k1", c1);
entries.put("k2", c2);
- var root = new LinkedHashMap<String, Object>();
+ var root = new LinkedHashMap<String,Object>();
root.put("entries", entries);
var proto = PrototextSerializer.DEFAULT.write(root);
@@ -287,10 +287,10 @@ class PrototextSerializerSession_Test extends TestBase {
}
@Test void d05_mapWithNullValueIsSkipped() throws Exception {
- var sub = new LinkedHashMap<String, Object>();
+ var sub = new LinkedHashMap<String,Object>();
sub.put("present", "yes");
sub.put("missing", null);
- var root = new LinkedHashMap<String, Object>();
+ var root = new LinkedHashMap<String,Object>();
root.put("sub", sub);
var proto = PrototextSerializer.DEFAULT.write(root);
@@ -303,7 +303,7 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void e01_iterableProperty_scalar() throws Exception {
// Iterable<String> as a Map-property value — exercises the streamable scalar element path.
Iterable<String> items = List.of("alpha", "beta");
- var root = new LinkedHashMap<String, Object>();
+ var root = new LinkedHashMap<String,Object>();
root.put("items", items);
var proto = PrototextSerializer.DEFAULT.write(root);
assertNotNull(proto);
@@ -314,7 +314,7 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void f01_dateProperty() throws Exception {
// type.isDate() branch.
- var root = new LinkedHashMap<String, Object>();
+ var root = new LinkedHashMap<String,Object>();
root.put("when", new Date(0L));
var proto = PrototextSerializer.DEFAULT.write(root);
assertNotNull(proto);
@@ -324,7 +324,7 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void f02_calendarProperty() throws Exception {
// type.isCalendar() branch.
var cal = GregorianCalendar.from(Instant.EPOCH.atZone(ZoneOffset.UTC));
- var root = new LinkedHashMap<String, Object>();
+ var root = new LinkedHashMap<String,Object>();
root.put("when", cal);
var proto = PrototextSerializer.DEFAULT.write(root);
assertNotNull(proto);
@@ -333,7 +333,7 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void f03_temporalProperty() throws Exception {
// type.isTemporal() branch.
- var root = new LinkedHashMap<String, Object>();
+ var root = new LinkedHashMap<String,Object>();
root.put("when", Instant.ofEpochMilli(0L));
var proto = PrototextSerializer.DEFAULT.write(root);
assertNotNull(proto);
@@ -342,7 +342,7 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void f04_durationProperty() throws Exception {
// type.isDuration() branch.
- var root = new LinkedHashMap<String, Object>();
+ var root = new LinkedHashMap<String,Object>();
root.put("length", Duration.ofMinutes(90));
var proto = PrototextSerializer.DEFAULT.write(root);
assertNotNull(proto);
@@ -352,7 +352,7 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void f05_periodProperty() throws Exception {
// type.isPeriod() branch.
- var root = new LinkedHashMap<String, Object>();
+ var root = new LinkedHashMap<String,Object>();
root.put("span", Period.ofDays(7));
var proto = PrototextSerializer.DEFAULT.write(root);
assertNotNull(proto);
@@ -362,7 +362,7 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void f06_byteArrayProperty() throws Exception {
// value instanceof byte[] branch.
- var root = new LinkedHashMap<String, Object>();
+ var root = new LinkedHashMap<String,Object>();
root.put("payload", new byte[] { 0x01, 0x02, 0x03 });
var proto = PrototextSerializer.DEFAULT.write(root);
assertNotNull(proto);
@@ -371,7 +371,7 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void f07_floatProperty() throws Exception {
// value instanceof Float branch (separate from Double).
- var root = new LinkedHashMap<String, Object>();
+ var root = new LinkedHashMap<String,Object>();
root.put("ratio", 3.5f);
var proto = PrototextSerializer.DEFAULT.write(root);
assertNotNull(proto);
@@ -382,7 +382,7 @@ class PrototextSerializerSession_Test extends TestBase {
// keepNullProperties=true should still skip writing null values per the proto.
// However, this exercises the alternative branch in the checkNull predicate.
var ser = PrototextSerializer.create().keepNullProperties().build();
- var root = new LinkedHashMap<String, Object>();
+ var root = new LinkedHashMap<String,Object>();
root.put("a", null);
// Should not throw even when all props are null.
@@ -394,7 +394,7 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void g01_optionalProperty_present() throws Exception {
// Hits isOptional branch in writeAnything (via map of Optional<String>).
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("opt", o("value"));
var proto = PrototextSerializer.DEFAULT.write(m);
assertNotNull(proto);
@@ -403,7 +403,7 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void g02_optionalProperty_empty() throws Exception {
// Optional.empty() -> writeAnything handles via getOptionalValue (returns null).
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("opt", oe());
var proto = PrototextSerializer.DEFAULT.write(m);
assertNotNull(proto);
@@ -425,9 +425,9 @@ class PrototextSerializerSession_Test extends TestBase {
// Bean has a List<Map> property — exercises writeBeanMap collection-with-bean-elements
// path (lines 270-296 in PrototextSerializerSession).
var bean = new BeanWithListOfMaps();
- var c1 = new LinkedHashMap<String, Object>();
+ var c1 = new LinkedHashMap<String,Object>();
c1.put("k", "alpha");
- var c2 = new LinkedHashMap<String, Object>();
+ var c2 = new LinkedHashMap<String,Object>();
c2.put("k", "beta");
bean.setItems(List.of(c1, c2));
var proto = PrototextSerializer.DEFAULT.write(bean);
@@ -439,9 +439,9 @@ class PrototextSerializerSession_Test extends TestBase {
// Bean with List<Map> + useListSyntaxForBeans — hits the [{...},{...}] writer path inside
// writeBeanMap (lines 274-288).
var bean = new BeanWithListOfMaps();
- var c1 = new LinkedHashMap<String, Object>();
+ var c1 = new LinkedHashMap<String,Object>();
c1.put("k", "alpha");
- var c2 = new LinkedHashMap<String, Object>();
+ var c2 = new LinkedHashMap<String,Object>();
c2.put("k", "beta");
bean.setItems(List.of(c1, c2));
var ser = PrototextSerializer.create().useListSyntaxForBeans(true).build();
@@ -456,9 +456,9 @@ class PrototextSerializerSession_Test extends TestBase {
// toBeanMap() unconditionally on the map elements, which threw BeanRuntimeException.
// The array path now dispatches Map vs Bean correctly.
var bean = new BeanWithMapArray();
- var c1 = new LinkedHashMap<String, Object>();
+ var c1 = new LinkedHashMap<String,Object>();
c1.put("k", "alpha");
- var c2 = new LinkedHashMap<String, Object>();
+ var c2 = new LinkedHashMap<String,Object>();
c2.put("k", "beta");
@SuppressWarnings({
})
@@ -473,9 +473,9 @@ class PrototextSerializerSession_Test extends TestBase {
// Same as h04 but with useListSyntaxForBeans=true — covers the [{...},{...}] writer branch
// where the dispatch fix also applies.
var bean = new BeanWithMapArray();
- var c1 = new LinkedHashMap<String, Object>();
+ var c1 = new LinkedHashMap<String,Object>();
c1.put("k", "alpha");
- var c2 = new LinkedHashMap<String, Object>();
+ var c2 = new LinkedHashMap<String,Object>();
c2.put("k", "beta");
@SuppressWarnings({
})
@@ -510,9 +510,9 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void h07_topLevelStreamOfMaps() throws Exception {
// Top-level Stream<Map> — hits writeStreamable bean-element branch.
- var c1 = new LinkedHashMap<String, Object>();
+ var c1 = new LinkedHashMap<String,Object>();
c1.put("k", "alpha");
- var c2 = new LinkedHashMap<String, Object>();
+ var c2 = new LinkedHashMap<String,Object>();
c2.put("k", "beta");
var stream = java.util.stream.Stream.of(c1, c2);
var proto = PrototextSerializer.DEFAULT.write(stream);
@@ -538,8 +538,8 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void j_mapWithMapValue() throws Exception {
// Map value inside a Map → writeMap: aType.isMap() branch (line 337/340 isMap=true)
- var outer = new LinkedHashMap<String, Object>();
- var inner = new LinkedHashMap<String, Object>();
+ var outer = new LinkedHashMap<String,Object>();
+ var inner = new LinkedHashMap<String,Object>();
inner.put("k1", "v1");
outer.put("nested", inner);
var proto = PrototextSerializer.DEFAULT.write(outer);
@@ -549,7 +549,7 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void j_mapWithCollectionValue() throws Exception {
// Collection value inside a Map → writeMap: aType.isCollection() branch
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("items", List.of("a", "b", "c"));
var proto = PrototextSerializer.DEFAULT.write(m);
assertNotNull(proto);
@@ -560,9 +560,9 @@ class PrototextSerializerSession_Test extends TestBase {
// Bean property with List<Map> → writeCollection: elementIsBeanOrMap=true, useListSyntaxForBeans=false (default)
// Exercises the else-if(nn(fieldName)) path in writeBeanMap for collection-of-maps
var root = new BeanWithBeanListProp();
- var item1 = new LinkedHashMap<String, Object>();
+ var item1 = new LinkedHashMap<String,Object>();
item1.put("name", "alice");
- var item2 = new LinkedHashMap<String, Object>();
+ var item2 = new LinkedHashMap<String,Object>();
item2.put("name", "bob");
root.setChildren(List.of(item1, item2));
var proto = PrototextSerializer.DEFAULT.write(root);
@@ -574,9 +574,9 @@ class PrototextSerializerSession_Test extends TestBase {
// Bean property with List<Map> and useListSyntaxForBeans=true → list syntax path
var s = PrototextSerializer.create().useListSyntaxForBeans(true).build();
var root = new BeanWithBeanListProp();
- var item1 = new LinkedHashMap<String, Object>();
+ var item1 = new LinkedHashMap<String,Object>();
item1.put("name", "alice");
- var item2 = new LinkedHashMap<String, Object>();
+ var item2 = new LinkedHashMap<String,Object>();
item2.put("name", "bob");
root.setChildren(List.of(item1, item2));
var proto = s.write(root);
@@ -587,9 +587,9 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void j_collectionOfMaps_asProperty() throws Exception {
// Collection items that are Maps → writeCollectionItem: aType.isMap() branch (line 361)
var root = new BeanWithMapListProp();
- var m1 = new LinkedHashMap<String, Object>();
+ var m1 = new LinkedHashMap<String,Object>();
m1.put("x", "1");
- var m2 = new LinkedHashMap<String, Object>();
+ var m2 = new LinkedHashMap<String,Object>();
m2.put("x", "2");
root.setEntries(List.of(m1, m2));
var proto = PrototextSerializer.DEFAULT.write(root);
@@ -599,7 +599,7 @@ class PrototextSerializerSession_Test extends TestBase {
@Test void j_mapWithBeanValue_writeMap() throws Exception {
// Map value that is a bean → writeMap: aType.isBean() branch (line 340 true)
- var outer = new LinkedHashMap<String, Object>();
+ var outer = new LinkedHashMap<String,Object>();
outer.put("child", new ChildBean("eve"));
var proto = PrototextSerializer.DEFAULT.write(outer);
assertNotNull(proto);
@@ -703,9 +703,9 @@ class PrototextSerializerSession_Test extends TestBase {
}
public static class BeanWithListOfMaps {
- private List<Map<String, Object>> items;
- public List<Map<String, Object>> getItems() { return items; }
- public void setItems(List<Map<String, Object>> v) { items = v; }
+ private List<Map<String,Object>> items;
+ public List<Map<String,Object>> getItems() { return items; }
+ public void setItems(List<Map<String,Object>> v) { items = v; }
}
public static class BeanWithListOfStrings {
@@ -721,9 +721,9 @@ class PrototextSerializerSession_Test extends TestBase {
}
public static class BeanWithMapArray {
- private Map<String, Object>[] items;
- public Map<String, Object>[] getItems() { return items; }
- public void setItems(Map<String, Object>[] v) { items = v; }
+ private Map<String,Object>[] items;
+ public Map<String,Object>[] getItems() { return items; }
+ public void setItems(Map<String,Object>[] v) { items = v; }
}
public static class ChildBean {
@@ -741,9 +741,9 @@ class PrototextSerializerSession_Test extends TestBase {
}
public static class BeanWithMapListProp {
- private List<Map<String, Object>> entries;
- public List<Map<String, Object>> getEntries() { return entries; }
- public void setEntries(List<Map<String, Object>> v) { entries = v; }
+ private List<Map<String,Object>> entries;
+ public List<Map<String,Object>> getEntries() { return entries; }
+ public void setEntries(List<Map<String,Object>> v) { entries = v; }
}
public static class BeanWithDateProp {
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextSerializer_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextSerializer_Test.java
index 4a0059599b..86ef2a30d6 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextSerializer_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/prototext/PrototextSerializer_Test.java
@@ -30,7 +30,7 @@ class PrototextSerializer_Test {
@Test
void a01_simpleBean() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("host", "localhost");
m.put("port", 8080);
m.put("debug", true);
@@ -50,10 +50,10 @@ class PrototextSerializer_Test {
@Test
void a02_nestedBean() {
- var db = new LinkedHashMap<String, Object>();
+ var db = new LinkedHashMap<String,Object>();
db.put("host", "localhost");
db.put("port", 5432);
- var config = new LinkedHashMap<String, Object>();
+ var config = new LinkedHashMap<String,Object>();
config.put("name", "myapp");
config.put("database", db);
@@ -67,12 +67,12 @@ class PrototextSerializer_Test {
@Test
void a03_deeplyNestedBean() {
- var ssl = new LinkedHashMap<String, Object>();
+ var ssl = new LinkedHashMap<String,Object>();
ssl.put("enabled", true);
- var server = new LinkedHashMap<String, Object>();
+ var server = new LinkedHashMap<String,Object>();
server.put("host", "localhost");
server.put("ssl", ssl);
- var config = new LinkedHashMap<String, Object>();
+ var config = new LinkedHashMap<String,Object>();
config.put("server", server);
String proto = PrototextSerializer.DEFAULT.write(config);
@@ -84,7 +84,7 @@ class PrototextSerializer_Test {
@Test
void a04_collectionOfStrings() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("tags", List.of("a", "b", "c"));
String proto = PrototextSerializer.DEFAULT.write(m);
@@ -95,7 +95,7 @@ class PrototextSerializer_Test {
@Test
void a05_collectionOfIntegers() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("ports", List.of(8080, 8443, 9090));
String proto = PrototextSerializer.DEFAULT.write(m);
@@ -106,13 +106,13 @@ class PrototextSerializer_Test {
@Test
void a06_collectionOfBeans() {
- var a = new LinkedHashMap<String, Object>();
+ var a = new LinkedHashMap<String,Object>();
a.put("host", "alpha");
a.put("port", 8080);
- var b = new LinkedHashMap<String, Object>();
+ var b = new LinkedHashMap<String,Object>();
b.put("host", "beta");
b.put("port", 8081);
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("servers", List.of(a, b));
String proto = PrototextSerializer.DEFAULT.write(m);
@@ -123,7 +123,7 @@ class PrototextSerializer_Test {
@Test
void a07_mapProperty() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("env", Map.of("PATH", "/usr/bin", "HOME", "/home/user"));
String proto = PrototextSerializer.DEFAULT.write(m);
@@ -134,7 +134,7 @@ class PrototextSerializer_Test {
@Test
void a08_nullValues() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("a", "x");
m.put("b", null);
m.put("c", 1);
@@ -148,7 +148,7 @@ class PrototextSerializer_Test {
@Test
void a09_booleanValues() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("t", true);
m.put("f", false);
@@ -159,7 +159,7 @@ class PrototextSerializer_Test {
@Test
void a10_floatValues() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("x", 3.14);
m.put("inf", Double.POSITIVE_INFINITY);
m.put("nan", Double.NaN);
@@ -173,7 +173,7 @@ class PrototextSerializer_Test {
@Test
void a11_stringEscaping() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("s", "a\nb\tc\\d\"e");
String proto = PrototextSerializer.DEFAULT.write(m);
@@ -183,7 +183,7 @@ class PrototextSerializer_Test {
@Test
void a12_enumValues() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("level", LogLevel.WARN);
String proto = PrototextSerializer.DEFAULT.write(m);
@@ -193,7 +193,7 @@ class PrototextSerializer_Test {
@Test
void a13_emptyBean() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
String proto = PrototextSerializer.DEFAULT.write(m);
assertNotNull(proto);
@@ -202,7 +202,7 @@ class PrototextSerializer_Test {
@Test
void a14_emptyCollections() {
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("tags", List.of());
String proto = PrototextSerializer.DEFAULT.write(m);
@@ -211,9 +211,9 @@ class PrototextSerializer_Test {
@Test
void a16_noColonBeforeMessages() {
- var inner = new LinkedHashMap<String, Object>();
+ var inner = new LinkedHashMap<String,Object>();
inner.put("x", 1);
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("inner", inner);
String proto = PrototextSerializer.DEFAULT.write(m);
@@ -223,9 +223,9 @@ class PrototextSerializer_Test {
@Test
void a17_indentation() {
- var inner = new LinkedHashMap<String, Object>();
+ var inner = new LinkedHashMap<String,Object>();
inner.put("x", 1);
- var m = new LinkedHashMap<String, Object>();
+ var m = new LinkedHashMap<String,Object>();
m.put("inner", inner);
String proto = PrototextSerializer.DEFAULT_READABLE.write(m);
@@ -244,7 +244,7 @@ class PrototextSerializer_Test {
... 2815 lines suppressed ...