You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by gg...@apache.org on 2023/06/24 03:48:36 UTC
[juneau] branch master updated (805f9cc22 -> 0e3806a85)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
from 805f9cc22 Remove unnecessary type cast
new 5012ee5c8 [juneau-marshall] Refactor to multi-catch
new 3562c6213 Remove trailing whitespace
new f4ef67145 Use Comparator.comparing()
new cbe8e2af4 [juneau-config] Use lambdas
new 06e21ad4e [juneau-dto] Use lambdas
new 4ed9c577c [juneau-marshall] Use lambdas
new 3732b1454 [juneau-microservice-core] Use lambdas
new 970718f42 [juneau-rest-client] Use lambdas
new 0c37f204d [juneau-rest-server] Use lambdas
new 5dcc55293 [juneau-utest] Use lambdas
new bd5f3ceb8 [juneau-utest-utils] Use lambdas
new 60972b9bf Fix whitespace
new d99a45fd9 [juneau-marshall] Use "L" instead of "l" for long literals (legibility)
new 3815d954d [juneau-utest] Use "L" instead of "l" for long literals (legibility)
new 7bfd7d565 [juneau-utest-utils] Use "L" instead of "l" for long literals (legibility)
new 62d651301 Remove unused imports
new d7788b7eb Remove redundant calls to super()
new 99a7604ad Use better map APIs
new e818c5094 Add TODO comments
new 6ad92149b [juneau-common] Remove redundant modifiers
new 831ced8d1 [juneau-dto] Remove redundant modifiers
new 89e35a42f [juneau-marshall] Remove redundant modifiers
new 8dd625d8e [juneau-rest-server] Remove redundant modifiers
new c9d9bdd46 [juneau-utest] Remove redundant modifiers
new cd84f7192 [juneau-utest-utils] Remove redundant modifiers
new abe64f377 [juneau-marshall] Use {} only when creating certain arrays
new 382cedd1b [juneau-microservice-core] Use {} only when creating certain arrays
new f99028ab2 [juneau-microservice-core] Use {} only when creating certain arrays
new 0e3806a85 [juneau-utest] Use {} only when creating certain arrays
The 29 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../juneau/assertions/AssertionPredicate.java | 3 +-
.../juneau/assertions/FluentArrayAssertion.java | 2 +-
.../assertions/FluentCollectionAssertion.java | 4 +-
.../assertions/FluentPrimitiveArrayAssertion.java | 16 +-
.../assertions/FluentStringListAssertion.java | 2 +-
.../org/apache/juneau/common/internal/IOUtils.java | 8 +-
.../apache/juneau/common/internal/StringUtils.java | 20 +--
.../juneau/common/internal/ThrowableUtils.java | 2 +-
.../main/java/org/apache/juneau/config/Config.java | 1 -
.../java/org/apache/juneau/config/Section.java | 38 ++---
.../apache/juneau/config/internal/ConfigMap.java | 30 ++--
.../apache/juneau/config/store/ClasspathStore.java | 1 -
.../apache/juneau/config/store/ConfigStore.java | 1 -
.../org/apache/juneau/config/store/FileStore.java | 1 -
.../apache/juneau/config/store/MemoryStore.java | 1 -
.../java/org/apache/juneau/dto/atom/Content.java | 1 -
.../apache/juneau/dto/jsonschema/JsonSchema.java | 4 +-
.../org/apache/juneau/dto/jsonschema/JsonType.java | 2 +-
.../org/apache/juneau/dto/swagger/Swagger.java | 7 +-
.../java/org/apache/juneau/AnnotationApplier.java | 7 +-
.../java/org/apache/juneau/AnnotationProvider.java | 17 +-
.../main/java/org/apache/juneau/BeanContext.java | 1 -
.../java/org/apache/juneau/BeanContextable.java | 1 -
.../src/main/java/org/apache/juneau/BeanMap.java | 4 +-
.../src/main/java/org/apache/juneau/BeanMeta.java | 4 +-
.../java/org/apache/juneau/BeanPropertyMeta.java | 2 +-
.../main/java/org/apache/juneau/BeanRegistry.java | 4 +-
.../main/java/org/apache/juneau/BeanSession.java | 2 +-
.../org/apache/juneau/BeanTraverseContext.java | 1 -
.../src/main/java/org/apache/juneau/ClassMeta.java | 10 +-
.../src/main/java/org/apache/juneau/Context.java | 2 +-
.../src/main/java/org/apache/juneau/Delegate.java | 2 +-
.../main/java/org/apache/juneau/MediaRanges.java | 24 ++-
.../main/java/org/apache/juneau/PropertyNamer.java | 2 +-
.../main/java/org/apache/juneau/StringRanges.java | 24 ++-
.../org/apache/juneau/collections/JsonList.java | 55 +++---
.../org/apache/juneau/collections/JsonMap.java | 11 +-
.../java/org/apache/juneau/cp/BasicFileFinder.java | 4 +-
.../java/org/apache/juneau/cp/BeanCreator.java | 4 +-
.../main/java/org/apache/juneau/cp/BeanStore.java | 4 +-
.../main/java/org/apache/juneau/cp/FileFinder.java | 12 +-
.../main/java/org/apache/juneau/csv/CsvParser.java | 1 -
.../java/org/apache/juneau/csv/CsvSerializer.java | 1 -
.../apache/juneau/csv/CsvSerializerSession.java | 8 +-
.../org/apache/juneau/encoders/EncoderSet.java | 2 +-
.../org/apache/juneau/html/HtmlDocSerializer.java | 5 +-
.../org/apache/juneau/html/HtmlDocTemplate.java | 2 +-
.../java/org/apache/juneau/html/HtmlParser.java | 1 -
.../org/apache/juneau/html/HtmlParserSession.java | 8 +-
.../juneau/html/HtmlSchemaDocSerializer.java | 1 -
.../apache/juneau/html/HtmlSchemaSerializer.java | 1 -
.../org/apache/juneau/html/HtmlSerializer.java | 1 -
.../apache/juneau/html/HtmlSerializerSession.java | 4 +-
.../juneau/html/HtmlStrippedDocSerializer.java | 1 -
.../java/org/apache/juneau/html/HtmlWidget.java | 8 +-
.../apache/juneau/httppart/BaseHttpPartParser.java | 1 -
.../juneau/httppart/BaseHttpPartSerializer.java | 1 -
.../org/apache/juneau/httppart/HttpPartParser.java | 10 +-
.../juneau/httppart/HttpPartParserSession.java | 2 +-
.../org/apache/juneau/httppart/HttpPartSchema.java | 4 +-
.../apache/juneau/httppart/HttpPartSerializer.java | 6 +-
.../juneau/httppart/HttpPartSerializerSession.java | 2 +-
.../apache/juneau/httppart/SimplePartParser.java | 1 -
.../juneau/httppart/SimplePartSerializer.java | 1 -
.../org/apache/juneau/internal/ArrayUtils.java | 8 +-
.../org/apache/juneau/internal/ClassUtils.java | 2 +-
.../java/org/apache/juneau/internal/DateUtils.java | 2 +-
.../main/java/org/apache/juneau/internal/Flag.java | 4 +-
.../java/org/apache/juneau/internal/HttpUtils.java | 4 +-
.../org/apache/juneau/internal/SimpleNoOpLock.java | 1 -
.../juneau/internal/SimpleReadWriteLock.java | 1 -
.../java/org/apache/juneau/internal/SystemEnv.java | 4 +-
.../java/org/apache/juneau/json/JsonParser.java | 1 -
.../org/apache/juneau/json/JsonParserSession.java | 6 +-
.../apache/juneau/json/JsonSchemaSerializer.java | 1 -
.../org/apache/juneau/json/JsonSerializer.java | 1 -
.../juneau/jsonschema/JsonSchemaGenerator.java | 1 -
.../apache/juneau/msgpack/MsgPackInputStream.java | 2 +-
.../apache/juneau/msgpack/MsgPackOutputStream.java | 36 ++--
.../org/apache/juneau/msgpack/MsgPackParser.java | 1 -
.../apache/juneau/msgpack/MsgPackSerializer.java | 1 -
.../juneau/msgpack/MsgPackSerializerSession.java | 4 +-
.../java/org/apache/juneau/oapi/OpenApiParser.java | 1 -
.../org/apache/juneau/oapi/OpenApiSerializer.java | 1 -
.../org/apache/juneau/objecttools/ObjectTool.java | 2 +-
.../apache/juneau/parser/InputStreamParser.java | 1 -
.../main/java/org/apache/juneau/parser/Parser.java | 1 -
.../java/org/apache/juneau/parser/ParserSet.java | 8 +-
.../org/apache/juneau/parser/ReaderParser.java | 1 -
.../apache/juneau/plaintext/PlainTextParser.java | 1 -
.../juneau/plaintext/PlainTextSerializer.java | 1 -
.../org/apache/juneau/reflect/AnnotationList.java | 7 +-
.../java/org/apache/juneau/reflect/ClassInfo.java | 20 +--
.../org/apache/juneau/reflect/ConstructorInfo.java | 10 +-
.../java/org/apache/juneau/reflect/FieldInfo.java | 2 +-
.../java/org/apache/juneau/reflect/MethodInfo.java | 12 +-
.../juneau/serializer/OutputStreamSerializer.java | 1 -
.../org/apache/juneau/serializer/Serializer.java | 1 -
.../apache/juneau/serializer/SerializerSet.java | 8 +-
.../apache/juneau/serializer/WriterSerializer.java | 1 -
.../org/apache/juneau/soap/SoapXmlSerializer.java | 1 -
.../org/apache/juneau/svl/ResolvingJsonMap.java | 1 -
.../main/java/org/apache/juneau/svl/VarList.java | 1 -
.../java/org/apache/juneau/swap/StringSwap.java | 1 -
.../main/java/org/apache/juneau/uon/UonParser.java | 1 -
.../main/java/org/apache/juneau/uon/UonReader.java | 4 +-
.../java/org/apache/juneau/uon/UonSerializer.java | 1 -
.../main/java/org/apache/juneau/uon/UonUtils.java | 2 +-
.../main/java/org/apache/juneau/uon/UonWriter.java | 2 +-
.../juneau/urlencoding/UrlEncodingClassMeta.java | 2 +-
.../juneau/urlencoding/UrlEncodingParser.java | 1 -
.../juneau/urlencoding/UrlEncodingSerializer.java | 1 -
.../juneau/utils/ExtendedMimetypesFileTypeMap.java | 1 -
.../main/java/org/apache/juneau/xml/XmlParser.java | 1 -
.../java/org/apache/juneau/xml/XmlSerializer.java | 3 +-
.../apache/juneau/xml/XmlSerializerSession.java | 14 +-
.../main/java/org/apache/juneau/xml/XmlUtils.java | 34 ++--
.../juneau/microservice/resources/LogParser.java | 2 +-
.../microservice/resources/LogsResource.java | 18 +-
.../microservice/resources/ShutdownResource.java | 19 +--
.../microservice/jetty/JettyMicroservice.java | 4 +-
.../apache/juneau/rest/client/ResponseContent.java | 54 ++----
.../org/apache/juneau/rest/client/RestClient.java | 77 ++++-----
.../org/apache/juneau/rest/client/RestRequest.java | 22 +--
.../apache/juneau/rest/client/RestResponse.java | 29 ++--
.../apache/juneau/http/entity/ByteArrayEntity.java | 3 +-
.../org/apache/juneau/http/entity/FileEntity.java | 1 -
.../apache/juneau/http/entity/ReaderEntity.java | 1 -
.../juneau/http/entity/SerializedEntity.java | 1 -
.../apache/juneau/http/entity/StreamEntity.java | 1 -
.../apache/juneau/http/entity/StringEntity.java | 1 -
.../org/apache/juneau/http/header/BasicHeader.java | 2 +-
.../org/apache/juneau/http/header/HeaderList.java | 8 +-
.../apache/juneau/http/part/BasicCsvArrayPart.java | 2 +-
.../java/org/apache/juneau/http/part/PartList.java | 8 +-
.../apache/juneau/rest/mock/MockRestClient.java | 3 +-
.../juneau/rest/mock/MockServletRequest.java | 6 +-
.../java/org/apache/juneau/rest/RestContext.java | 11 +-
.../java/org/apache/juneau/rest/RestOpContext.java | 40 ++---
.../java/org/apache/juneau/rest/RestRequest.java | 47 +++--
.../juneau/rest/annotation/RestAnnotation.java | 12 +-
.../rest/annotation/RestDeleteAnnotation.java | 15 +-
.../juneau/rest/annotation/RestGetAnnotation.java | 15 +-
.../juneau/rest/annotation/RestOpAnnotation.java | 21 ++-
.../rest/annotation/RestOptionsAnnotation.java | 15 +-
.../rest/annotation/RestPatchAnnotation.java | 21 ++-
.../juneau/rest/annotation/RestPostAnnotation.java | 21 ++-
.../juneau/rest/annotation/RestPutAnnotation.java | 21 ++-
.../org/apache/juneau/rest/arg/HasFormDataArg.java | 2 +-
.../org/apache/juneau/rest/arg/HasQueryArg.java | 2 +-
.../juneau/rest/arg/HttpServletRequestArgs.java | 8 +-
.../juneau/rest/arg/HttpServletResponseArgs.java | 2 +-
.../apache/juneau/rest/arg/HttpSessionArgs.java | 2 +-
.../juneau/rest/arg/InputStreamParserArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/ParserArg.java | 2 +-
.../apache/juneau/rest/arg/ReaderParserArg.java | 2 +-
.../apache/juneau/rest/arg/ResponseBeanArg.java | 21 +--
.../apache/juneau/rest/arg/ResponseCodeArg.java | 7 +-
.../apache/juneau/rest/arg/ResponseHeaderArg.java | 21 +--
.../apache/juneau/rest/arg/RestContextArgs.java | 26 +--
.../java/org/apache/juneau/rest/arg/RestOpArg.java | 2 +-
.../apache/juneau/rest/arg/RestOpContextArgs.java | 8 +-
.../apache/juneau/rest/arg/RestOpSessionArgs.java | 4 +-
.../apache/juneau/rest/arg/RestRequestArgs.java | 36 ++--
.../apache/juneau/rest/arg/RestResponseArgs.java | 8 +-
.../apache/juneau/rest/arg/RestSessionArgs.java | 6 +-
.../rest/beans/ChildResourceDescriptions.java | 1 -
.../org/apache/juneau/rest/beans/SeeOtherRoot.java | 2 -
.../juneau/rest/converter/RestConverter.java | 2 +-
.../juneau/rest/converter/RestConverterList.java | 2 +-
.../juneau/rest/debug/DebugEnablementMap.java | 1 -
.../apache/juneau/rest/guard/RestGuardList.java | 2 +-
.../juneau/rest/httppart/NamedAttribute.java | 4 +-
.../juneau/rest/httppart/NamedAttributeMap.java | 1 -
.../juneau/rest/httppart/RequestAttributes.java | 1 -
.../juneau/rest/httppart/RequestContent.java | 2 +-
.../juneau/rest/httppart/RequestFormParams.java | 8 +-
.../juneau/rest/httppart/RequestHeaders.java | 6 +-
.../juneau/rest/httppart/RequestPathParams.java | 6 +-
.../juneau/rest/httppart/RequestQueryParams.java | 6 +-
.../apache/juneau/rest/httppart/RestPartType.java | 2 +-
.../juneau/rest/matcher/RestMatcherList.java | 4 +-
.../juneau/rest/processor/ResponseProcessor.java | 6 +-
.../juneau/rest/servlet/BasicGroupOperations.java | 3 +-
.../juneau/rest/servlet/BasicRestOperations.java | 15 +-
.../juneau/rest/staticfile/BasicStaticFiles.java | 1 -
.../apache/juneau/rest/staticfile/StaticFiles.java | 4 +-
.../org/apache/juneau/rest/stats/ThrownStore.java | 6 +-
.../juneau/rest/swagger/SwaggerProvider.java | 12 +-
.../rest/util/BoundedServletInputStream.java | 4 +-
.../org/apache/juneau/testutils/CalendarUtils.java | 2 +-
.../juneau/testutils/MockStreamSerializer.java | 2 +-
.../juneau/testutils/MockWriterSerializer.java | 9 +-
.../testutils/pojos/PrimitiveObjectsBean.java | 8 +-
.../juneau/testutils/pojos/TestEnumToString.java | 2 +-
.../java/org/apache/juneau/BeanConfigTest.java | 10 +-
.../java/org/apache/juneau/BeanContextTest.java | 8 +-
.../java/org/apache/juneau/BeanMapErrorsTest.java | 17 +-
.../test/java/org/apache/juneau/BeanMapTest.java | 12 +-
.../juneau/BeanTraversePropertiesComboTest.java | 5 +-
.../test/java/org/apache/juneau/BenchmarkTest.java | 2 +-
.../test/java/org/apache/juneau/ClassMetaTest.java | 8 +-
.../test/java/org/apache/juneau/ProxyBeanTest.java | 2 +-
.../juneau/SerializerPropertiesComboTest.java | 25 +--
.../a/rttests/RoundTripAddClassAttrsTest.java | 6 +-
.../a/rttests/RoundTripBeanInheritanceTest.java | 2 -
.../juneau/a/rttests/RoundTripBeanMapsTest.java | 8 +-
.../a/rttests/RoundTripBeanPropertiesTest.java | 8 +-
.../apache/juneau/a/rttests/RoundTripEnumTest.java | 2 +-
.../a/rttests/RoundTripObjectsAsStringsTest.java | 4 +-
.../rttests/RoundTripPrimitiveObjectBeansTest.java | 4 +-
.../a/rttests/RoundTripPrimitivesBeansTest.java | 22 +--
.../a/rttests/RoundTripSimpleObjectsTest.java | 28 +--
.../juneau/a/rttests/RoundTripToJsonMapsTest.java | 2 +-
.../a/rttests/RoundTripTransformBeansTest.java | 2 +-
.../juneau/assertions/AnyAssertion_Test.java | 2 +-
.../apache/juneau/assertions/Assertions_Test.java | 4 +-
.../juneau/assertions/DateAssertion_Test.java | 4 +-
.../juneau/assertions/LongAssertion_Test.java | 56 +++---
.../apache/juneau/config/ConfigInterfaceTest.java | 190 ++++++++++-----------
.../java/org/apache/juneau/config/ConfigTest.java | 63 ++++---
.../config/store/ConfigClasspathStoreTest.java | 22 +--
.../juneau/config/store/ConfigFileStoreTest.java | 88 ++++------
.../juneau/config/store/ConfigMemoryStoreTest.java | 22 +--
.../java/org/apache/juneau/cp/BeanStore_Test.java | 4 +-
.../org/apache/juneau/html/BasicHtml_Test.java | 6 +-
.../juneau/html/HtmlConfigAnnotation_Test.java | 11 +-
.../juneau/html/HtmlDocConfigAnnotation_Test.java | 27 ++-
.../juneau/html/HtmlSchemaSerializerTest.java | 4 +-
.../java/org/apache/juneau/html/Html_Test.java | 2 +-
.../apache/juneau/http/BasicHttpResource_Test.java | 10 +-
.../org/apache/juneau/http/BasicPart_Test.java | 14 +-
.../org/apache/juneau/http/HttpHeaders_Test.java | 14 +-
.../juneau/http/SerializedHttpEntity_Test.java | 7 +-
.../juneau/http/header/BasicLongHeader_Test.java | 4 +-
.../juneau/http/header/ContentLength_Test.java | 2 +-
.../http/remote/Remote_CommonInterfaces_Test.java | 22 +--
.../http/remote/Remote_ContentAnnotation_Test.java | 6 +-
.../remote/Remote_FormDataAnnotation_Test.java | 84 ++++-----
.../http/remote/Remote_HeaderAnnotation_Test.java | 80 ++++-----
.../http/remote/Remote_PathAnnotation_Test.java | 76 ++++-----
.../http/remote/Remote_QueryAnnotation_Test.java | 86 +++++-----
.../remote/Remote_RemoteOpAnnotation_Test.java | 12 +-
.../http/remote/Remote_RequestAnnotation_Test.java | 10 +-
.../remote/Remote_ResponseAnnotation_Test.java | 6 +-
.../org/apache/juneau/http/remote/Remote_Test.java | 79 ++++-----
.../juneau/http/remote/RrpcInterfaceTest.java | 20 +--
.../juneau/httppart/OpenApiPartParser_Test.java | 8 +-
.../httppart/OpenApiPartSerializer_Test.java | 56 +++---
.../juneau/json/JsonConfigAnnotationTest.java | 7 +-
.../juneau/json/JsonSchemaSerializerTest.java | 2 +-
.../jsonschema/JsonSchemaConfigAnnotationTest.java | 23 ++-
.../juneau/jsonschema/JsonSchemaGeneratorTest.java | 4 +-
.../msgpack/MsgPackConfigAnnotationTest.java | 7 +-
.../apache/juneau/mstat/MethodExecStore_Test.java | 6 +-
.../org/apache/juneau/mstat/ThrownStore_Test.java | 24 +--
.../java/org/apache/juneau/oapi/OpenApiTest.java | 14 +-
.../juneau/objecttools/ObjectMerger_Test.java | 2 +-
.../apache/juneau/objecttools/ObjectRest_Test.java | 52 +++---
.../juneau/objecttools/ObjectSearcher_Test.java | 14 +-
.../juneau/parser/ParserConfigAnnotationTest.java | 17 +-
.../org/apache/juneau/reflect/ClassInfoTest.java | 97 +++++------
.../apache/juneau/reflect/ConstructorInfoTest.java | 2 +-
.../apache/juneau/reflect/ExecutableInfoTest.java | 20 +--
.../org/apache/juneau/reflect/FieldInfoTest.java | 29 ++--
.../org/apache/juneau/reflect/MethodInfoTest.java | 12 +-
.../org/apache/juneau/reflect/ParamInfoTest.java | 18 +-
.../Rest_AnnotationInheritance_Test.java | 11 +-
.../Rest_DefaultRequestAttributes_Test.java | 2 +-
.../rest/client/RestClient_BasicCalls_Test.java | 3 +-
.../juneau/rest/client/RestClient_Body_Test.java | 2 +-
.../client/RestClient_Config_BeanContext_Test.java | 17 +-
.../client/RestClient_Config_OpenApi_Test.java | 3 +-
.../client/RestClient_Config_RestClient_Test.java | 4 +-
.../client/RestClient_Config_Serializer_Test.java | 2 +-
.../rest/client/RestClient_FormData_Test.java | 13 +-
.../rest/client/RestClient_Headers_Test.java | 14 +-
.../juneau/rest/client/RestClient_Paths_Test.java | 2 +-
.../juneau/rest/client/RestClient_Query_Test.java | 2 +-
.../rest/client/RestClient_Response_Body_Test.java | 6 +-
.../client/RestClient_Response_Headers_Test.java | 5 +-
.../rest/client/RestClient_Response_Test.java | 2 +-
.../apache/juneau/rest/client/RestClient_Test.java | 25 +--
.../rest/test/client/ThirdPartyProxyTest.java | 111 ++++--------
.../serializer/SerializerConfigAnnotationTest.java | 17 +-
.../juneau/soap/SoapXmlConfigAnnotationTest.java | 7 +-
.../apache/juneau/svl/ResolvingJsonMapTest.java | 2 +-
.../juneau/transform/AutoNumberSwapTest.java | 10 +-
.../juneau/transforms/BeanDictionaryComboTest.java | 4 +-
.../apache/juneau/transforms/BeanFilterTest.java | 8 +-
.../org/apache/juneau/transforms/BeanMapTest.java | 2 +-
.../apache/juneau/transforms/ObjectSwapTest.java | 3 +-
.../apache/juneau/uon/UonConfigAnnotationTest.java | 7 +-
.../UrlEncodingConfigAnnotationTest.java | 7 +-
.../org/apache/juneau/utils/ArrayBuilder_Test.java | 2 +-
.../org/apache/juneau/utils/ArrayUtilsTest.java | 2 +-
.../java/org/apache/juneau/utils/IOUtilsTest.java | 2 -
.../java/org/apache/juneau/xml/BasicXmlTest.java | 6 +-
.../apache/juneau/xml/XmlConfigAnnotationTest.java | 29 ++--
.../apache/juneau/xml/XmlIgnoreCommentsTest.java | 6 +-
.../test/java/org/apache/juneau/xml/XmlTest.java | 2 +-
301 files changed, 1505 insertions(+), 1892 deletions(-)
[juneau] 17/29: Remove redundant calls to super()
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit d7788b7ebe1f8c0902debedf6c8f8feba6408340
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:24:18 2023 -0400
Remove redundant calls to super()
---
.../juneau-config/src/main/java/org/apache/juneau/config/Config.java | 1 -
.../src/main/java/org/apache/juneau/config/store/ClasspathStore.java | 1 -
.../src/main/java/org/apache/juneau/config/store/ConfigStore.java | 1 -
.../src/main/java/org/apache/juneau/config/store/FileStore.java | 1 -
.../src/main/java/org/apache/juneau/config/store/MemoryStore.java | 1 -
.../juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java | 1 -
.../juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java | 1 -
.../src/main/java/org/apache/juneau/BeanContextable.java | 1 -
.../src/main/java/org/apache/juneau/BeanTraverseContext.java | 1 -
.../src/main/java/org/apache/juneau/collections/JsonList.java | 3 ---
.../src/main/java/org/apache/juneau/collections/JsonMap.java | 1 -
.../juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java | 1 -
.../src/main/java/org/apache/juneau/csv/CsvSerializer.java | 1 -
.../src/main/java/org/apache/juneau/html/HtmlDocSerializer.java | 1 -
.../src/main/java/org/apache/juneau/html/HtmlParser.java | 1 -
.../src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java | 1 -
.../src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java | 1 -
.../src/main/java/org/apache/juneau/html/HtmlSerializer.java | 1 -
.../main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java | 1 -
.../src/main/java/org/apache/juneau/httppart/BaseHttpPartParser.java | 1 -
.../main/java/org/apache/juneau/httppart/BaseHttpPartSerializer.java | 1 -
.../src/main/java/org/apache/juneau/httppart/SimplePartParser.java | 1 -
.../src/main/java/org/apache/juneau/httppart/SimplePartSerializer.java | 1 -
.../src/main/java/org/apache/juneau/internal/SimpleNoOpLock.java | 1 -
.../src/main/java/org/apache/juneau/internal/SimpleReadWriteLock.java | 1 -
.../src/main/java/org/apache/juneau/json/JsonParser.java | 1 -
.../src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java | 1 -
.../src/main/java/org/apache/juneau/json/JsonSerializer.java | 1 -
.../main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java | 1 -
.../src/main/java/org/apache/juneau/msgpack/MsgPackParser.java | 1 -
.../src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java | 1 -
.../src/main/java/org/apache/juneau/oapi/OpenApiParser.java | 1 -
.../src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java | 1 -
.../src/main/java/org/apache/juneau/parser/InputStreamParser.java | 1 -
.../juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java | 1 -
.../src/main/java/org/apache/juneau/parser/ReaderParser.java | 1 -
.../src/main/java/org/apache/juneau/plaintext/PlainTextParser.java | 1 -
.../src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java | 1 -
.../main/java/org/apache/juneau/serializer/OutputStreamSerializer.java | 1 -
.../src/main/java/org/apache/juneau/serializer/Serializer.java | 1 -
.../src/main/java/org/apache/juneau/serializer/WriterSerializer.java | 1 -
.../src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java | 1 -
.../src/main/java/org/apache/juneau/svl/ResolvingJsonMap.java | 1 -
.../juneau-marshall/src/main/java/org/apache/juneau/svl/VarList.java | 1 -
.../src/main/java/org/apache/juneau/swap/StringSwap.java | 1 -
.../juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java | 1 -
.../src/main/java/org/apache/juneau/uon/UonSerializer.java | 1 -
.../src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java | 1 -
.../main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java | 1 -
.../java/org/apache/juneau/utils/ExtendedMimetypesFileTypeMap.java | 1 -
.../juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java | 1 -
.../src/main/java/org/apache/juneau/xml/XmlSerializer.java | 1 -
.../src/main/java/org/apache/juneau/rest/client/RestClient.java | 1 -
.../src/main/java/org/apache/juneau/http/entity/ByteArrayEntity.java | 1 -
.../src/main/java/org/apache/juneau/http/entity/FileEntity.java | 1 -
.../src/main/java/org/apache/juneau/http/entity/ReaderEntity.java | 1 -
.../src/main/java/org/apache/juneau/http/entity/SerializedEntity.java | 1 -
.../src/main/java/org/apache/juneau/http/entity/StreamEntity.java | 1 -
.../src/main/java/org/apache/juneau/http/entity/StringEntity.java | 1 -
.../src/main/java/org/apache/juneau/rest/mock/MockRestClient.java | 1 -
.../java/org/apache/juneau/rest/beans/ChildResourceDescriptions.java | 1 -
.../src/main/java/org/apache/juneau/rest/beans/SeeOtherRoot.java | 2 --
.../src/main/java/org/apache/juneau/rest/debug/DebugEnablementMap.java | 1 -
.../main/java/org/apache/juneau/rest/httppart/NamedAttributeMap.java | 1 -
.../main/java/org/apache/juneau/rest/httppart/RequestAttributes.java | 1 -
.../main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java | 1 -
.../java/org/apache/juneau/a/rttests/RoundTripBeanInheritanceTest.java | 2 --
.../src/test/java/org/apache/juneau/http/remote/Remote_Test.java | 1 -
.../src/test/java/org/apache/juneau/rest/client/RestClient_Test.java | 1 -
.../java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java | 1 -
juneau-utest/src/test/java/org/apache/juneau/utils/IOUtilsTest.java | 2 --
71 files changed, 76 deletions(-)
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
index 477d1d27b..1fc7beac0 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
@@ -197,7 +197,6 @@ public final class Config extends Context implements ConfigEventListener {
* Constructor, default settings.
*/
protected Builder() {
- super();
name = env("Config.name", "Configuration.cfg");
store = FileStore.DEFAULT;
serializer = Json5Serializer.DEFAULT;
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ClasspathStore.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ClasspathStore.java
index 158405cb8..e22518486 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ClasspathStore.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ClasspathStore.java
@@ -69,7 +69,6 @@ public class ClasspathStore extends ConfigStore {
* Constructor, default settings.
*/
protected Builder() {
- super();
}
/**
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java
index 5e048c785..6e63fcda0 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java
@@ -55,7 +55,6 @@ public abstract class ConfigStore extends Context implements Closeable {
* Constructor, default settings.
*/
protected Builder() {
- super();
}
/**
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
index ad0df0c4c..d7b463982 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
@@ -79,7 +79,6 @@ public class FileStore extends ConfigStore {
* Constructor, default settings.
*/
protected Builder() {
- super();
directory = env("ConfigFileStore.directory", ".");
charset = env("ConfigFileStore.charset", Charset.defaultCharset());
enableWatcher = env("ConfigFileStore.enableWatcher", false);
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/MemoryStore.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/MemoryStore.java
index e50001896..2a901f82a 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/MemoryStore.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/MemoryStore.java
@@ -65,7 +65,6 @@ public class MemoryStore extends ConfigStore {
* Constructor, default settings.
*/
protected Builder() {
- super();
}
/**
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java
index 88a7c2594..760fe8f31 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java
@@ -83,7 +83,6 @@ public class Content extends Text {
* Normal content.
*/
public Content() {
- super();
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index 0914241a9..f8b7e4fbd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -244,7 +244,6 @@ public class BeanContext extends Context {
* All default settings.
*/
protected Builder() {
- super();
beanClassVisibility = env("BeanContext.beanClassVisibility", PUBLIC);
beanConstructorVisibility = env("BeanContext.beanConstructorVisibility", PUBLIC);
beanMethodVisibility = env("BeanContext.beanMethodVisibility", PUBLIC);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
index 9a392f6fa..3b7d69931 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
@@ -58,7 +58,6 @@ public abstract class BeanContextable extends Context {
* All default settings.
*/
protected Builder() {
- super();
this.bcBuilder = BeanContext.create();
registerBuilders(bcBuilder);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
index 10f8b2186..c9adbcd25 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
@@ -55,7 +55,6 @@ public abstract class BeanTraverseContext extends BeanContextable {
* Constructor, default settings.
*/
protected Builder() {
- super();
detectRecursions = env("BeanTraverseContext.detectRecursions", false);
ignoreRecursions = env("BeanTraverseContext.ignoreRecursions", false);
initialDepth = env("BeanTraverseContext.initialDepth", 0);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
index 373e5556c..ace844a58 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
@@ -188,7 +188,6 @@ public class JsonList extends LinkedList<Object> {
* @param session The bean session to use for creating beans.
*/
public JsonList(BeanSession session) {
- super();
this.session = session;
}
@@ -268,7 +267,6 @@ public class JsonList extends LinkedList<Object> {
* @param entries The entries to add to this list.
*/
public JsonList(Object... entries) {
- super();
Collections.addAll(this, entries);
}
@@ -1021,7 +1019,6 @@ public class JsonList extends LinkedList<Object> {
private static final long serialVersionUID = 1L;
UnmodifiableJsonList(JsonList contents) {
- super();
if (contents != null)
this.forEach(super::add);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
index 3f556d7d8..efcf0e854 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
@@ -1781,7 +1781,6 @@ public class JsonMap extends LinkedHashMap<String,Object> {
private static final long serialVersionUID = 1L;
UnmodifiableJsonMap(JsonMap contents) {
- super();
if (contents != null)
contents.forEach(super::put);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
index 4d115140c..8285f87a0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
@@ -67,7 +67,6 @@ public class CsvParser extends ReaderParser implements CsvMetaProvider {
* Constructor, default settings.
*/
protected Builder() {
- super();
consumes("text/csv");
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
index a4ed99491..ec9109b5e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
@@ -67,7 +67,6 @@ public final class CsvSerializer extends WriterSerializer implements CsvMetaProv
* Constructor, default settings.
*/
protected Builder() {
- super();
produces("text/csv");
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index f6a2846de..784f60642 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -120,7 +120,6 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* Constructor, default settings.
*/
protected Builder() {
- super();
produces("text/html");
accept("text/html");
asideFloat = AsideFloat.RIGHT;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
index 3d2585864..1f1551574 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
@@ -78,7 +78,6 @@ public class HtmlParser extends XmlParser implements HtmlMetaProvider {
* Constructor, default settings.
*/
protected Builder() {
- super();
consumes("text/html,text/html+stripped");
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
index 91be4ab7a..6704b9346 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
@@ -84,7 +84,6 @@ public final class HtmlSchemaDocSerializer extends HtmlDocSerializer {
* Constructor, default settings.
*/
protected Builder() {
- super();
produces("text/html");
accept("text/html+schema");
generatorBuilder = JsonSchemaGenerator.create().beanContext(beanContext());
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
index c9c48472e..fd66c43a7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
@@ -144,7 +144,6 @@ public class HtmlSchemaSerializer extends HtmlSerializer {
* Constructor, default settings.
*/
protected Builder() {
- super();
produces("text/html");
accept("text/html+schema");
generatorBuilder = JsonSchemaGenerator.create().beanContext(beanContext());
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index 80f3bc7d6..d8e0ca189 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -213,7 +213,6 @@ public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider {
* Constructor, default settings.
*/
protected Builder() {
- super();
produces("text/html");
addBeanTypesHtml = env("HtmlSerializer.addBeanTypesHtml", false);
addKeyValueTableHeaders = env("HtmlSerializer.addKeyValueTableHeaders", false);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
index aa74f51ac..cd3e3423b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
@@ -79,7 +79,6 @@ public class HtmlStrippedDocSerializer extends HtmlSerializer {
* Constructor, default settings.
*/
protected Builder() {
- super();
produces("text/html");
accept("text/html+stripped");
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartParser.java
index 2a85d7cb2..a5645b48c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartParser.java
@@ -43,7 +43,6 @@ public abstract class BaseHttpPartParser extends BeanContextable implements Http
* Constructor.
*/
protected Builder() {
- super();
}
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartSerializer.java
index 40cad9629..77ee2e951 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartSerializer.java
@@ -41,7 +41,6 @@ public abstract class BaseHttpPartSerializer extends BeanContextable implements
* Constructor.
*/
protected Builder() {
- super();
}
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartParser.java
index 87572e950..fc318b701 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartParser.java
@@ -84,7 +84,6 @@ public class SimplePartParser extends BaseHttpPartParser {
* Constructor.
*/
protected Builder() {
- super();
}
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartSerializer.java
index 981831ab3..6d2713603 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartSerializer.java
@@ -64,7 +64,6 @@ public class SimplePartSerializer extends BaseHttpPartSerializer {
* Constructor.
*/
protected Builder() {
- super();
}
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SimpleNoOpLock.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SimpleNoOpLock.java
index d1d2e93e5..c7b7729bb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SimpleNoOpLock.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SimpleNoOpLock.java
@@ -25,7 +25,6 @@ public class SimpleNoOpLock extends ReentrantReadWriteLock {
* Constructor.
*/
public SimpleNoOpLock() {
- super();
}
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SimpleReadWriteLock.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SimpleReadWriteLock.java
index f43d9681a..ced5a87b9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SimpleReadWriteLock.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SimpleReadWriteLock.java
@@ -49,7 +49,6 @@ public class SimpleReadWriteLock extends ReentrantReadWriteLock {
* Constructor.
*/
public SimpleReadWriteLock() {
- super();
}
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
index cabc05b52..47c6eb645 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
@@ -171,7 +171,6 @@ public class JsonParser extends ReaderParser implements JsonMetaProvider {
* Constructor, default settings.
*/
protected Builder() {
- super();
consumes("application/json,text/json");
validateEnd = env("JsonParser.validateEnd", false);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
index ccbdfd7da..c5cca8a2e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
@@ -136,7 +136,6 @@ public class JsonSchemaSerializer extends JsonSerializer implements JsonSchemaMe
* Constructor, default settings.
*/
protected Builder() {
- super();
produces("application/json");
accept("application/json+schema,text/json+schema");
generatorBuilder = JsonSchemaGenerator.create().beanContext(beanContext());
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
index 26582ad7d..095a2c52d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
@@ -175,7 +175,6 @@ public class JsonSerializer extends WriterSerializer implements JsonMetaProvider
* Constructor, default settings.
*/
protected Builder() {
- super();
produces("application/json");
accept("application/json,text/json");
addBeanTypesJson = env("JsonSerializer.addBeanTypes", false);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
index d5a0cfcd4..899928c47 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
@@ -85,7 +85,6 @@ public class JsonSchemaGenerator extends BeanTraverseContext implements JsonSche
* Constructor, default settings.
*/
protected Builder() {
- super();
BeanContext.Builder bc = beanContext();
jsonSerializerBuilder = JsonSerializer.create().beanContext(bc);
jsonParserBuilder = JsonParser.create().beanContext(bc);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
index c4344fae0..649afb258 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
@@ -111,7 +111,6 @@ public class MsgPackParser extends InputStreamParser implements MsgPackMetaProvi
* Constructor, default settings.
*/
protected Builder() {
- super();
consumes("octal/msgpack");
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
index 43fce5801..df3ede251 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
@@ -114,7 +114,6 @@ public class MsgPackSerializer extends OutputStreamSerializer implements MsgPack
* Constructor, default settings.
*/
protected Builder() {
- super();
produces("octal/msgpack");
addBeanTypesMsgPack = env("MsgPackSerializer.addBeanTypesMsgPack", false);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
index 17e44c23f..7ca980181 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
@@ -73,7 +73,6 @@ public class OpenApiParser extends UonParser implements OpenApiMetaProvider {
* Constructor, default settings.
*/
protected Builder() {
- super();
consumes("text/openapi");
format = HttpPartFormat.NO_FORMAT;
collectionFormat = HttpPartCollectionFormat.NO_COLLECTION_FORMAT;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
index fc01eaf19..7244d51b6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
@@ -73,7 +73,6 @@ public class OpenApiSerializer extends UonSerializer implements OpenApiMetaProvi
* Constructor, default settings.
*/
protected Builder() {
- super();
produces("text/openapi");
format = HttpPartFormat.NO_FORMAT;
collectionFormat = HttpPartCollectionFormat.NO_COLLECTION_FORMAT;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
index 586795e94..55edec9ad 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
@@ -72,7 +72,6 @@ public class InputStreamParser extends Parser {
* Constructor, default settings.
*/
protected Builder() {
- super();
binaryFormat = env("InputStreamParser.binaryFormat", BinaryFormat.HEX);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
index 2d6206644..1f530600d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
@@ -192,7 +192,6 @@ public class Parser extends BeanContextable {
* Constructor, default settings.
*/
protected Builder() {
- super();
autoCloseStreams = env("Parser.autoCloseStreams", false);
strict = env("Parser.strict", false);
trimStrings = env("Parser.trimStrings", false);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
index 56cd9bbf4..77889c946 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
@@ -74,7 +74,6 @@ public class ReaderParser extends Parser {
* Constructor, default settings.
*/
protected Builder() {
- super();
fileCharset = env("ReaderParser.fileCharset", Charset.defaultCharset());
streamCharset = env("ReaderParser.streamCharset", IOUtils.UTF8);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
index 20c41d6d6..1cfa41984 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
@@ -86,7 +86,6 @@ public class PlainTextParser extends ReaderParser implements PlainTextMetaProvid
* Constructor, default settings.
*/
protected Builder() {
- super();
consumes("text/plain");
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
index 940c8fc8f..3a9d3ef0a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
@@ -82,7 +82,6 @@ public class PlainTextSerializer extends WriterSerializer implements PlainTextMe
* Constructor, default settings.
*/
protected Builder() {
- super();
produces("text/plain");
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
index d83e0c196..e0693832e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
@@ -64,7 +64,6 @@ public class OutputStreamSerializer extends Serializer {
* Constructor, default settings.
*/
protected Builder() {
- super();
binaryFormat = env("OutputStreamSerializer.binaryFormat", BinaryFormat.HEX);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
index 47a070823..193699e23 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
@@ -123,7 +123,6 @@ public class Serializer extends BeanTraverseContext {
* Constructor, default settings.
*/
protected Builder() {
- super();
produces = null;
accept = null;
addBeanTypes = env("Serializer.addBeanTypes", false);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
index 6219bc790..c446294db 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
@@ -72,7 +72,6 @@ public class WriterSerializer extends Serializer {
* Constructor, default settings.
*/
protected Builder() {
- super();
fileCharset = Charset.defaultCharset();
streamCharset = IOUtils.UTF8;
maxIndent = env("WriterSerializer.maxIndent", 100);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
index 401136dab..aa476d446 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
@@ -79,7 +79,6 @@ public class SoapXmlSerializer extends XmlSerializer implements SoapXmlMetaProvi
* Constructor, default settings.
*/
protected Builder() {
- super();
produces("text/xml");
accept("text/xml+soap");
soapAction = "http://www.w3.org/2003/05/soap-envelope";
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/ResolvingJsonMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/ResolvingJsonMap.java
index f929fd040..806cf05ea 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/ResolvingJsonMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/ResolvingJsonMap.java
@@ -44,7 +44,6 @@ public class ResolvingJsonMap extends JsonMap {
* @param varResolver The var resolver session to use for resolving SVL variables.
*/
public ResolvingJsonMap(VarResolverSession varResolver) {
- super();
this.varResolver = varResolver;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarList.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarList.java
index ea4ec2919..0d44f5fa9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarList.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarList.java
@@ -65,7 +65,6 @@ public class VarList extends ArrayList<Object> {
* Constructor.
*/
protected VarList() {
- super();
}
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/StringSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/StringSwap.java
index 44969e163..256fde0ce 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/StringSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/StringSwap.java
@@ -50,7 +50,6 @@ public abstract class StringSwap<T> extends ObjectSwap<T,String> {
* Constructor.
*/
protected StringSwap() {
- super();
}
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
index 1ca8d3814..0424f691f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
@@ -101,7 +101,6 @@ public class UonParser extends ReaderParser implements HttpPartParser, UonMetaPr
* Constructor, default settings.
*/
protected Builder() {
- super();
consumes("text/uon");
decoding = env("UonParser.decoding", false);
validateEnd = env("UonParser.validateEnd", false);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
index da104aaef..e2278201b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
@@ -230,7 +230,6 @@ public class UonSerializer extends WriterSerializer implements HttpPartSerialize
* Constructor, default settings.
*/
protected Builder() {
- super();
produces("text/uon");
addBeanTypesUon = env("UonSerializer.addBeanTypesUon", false);
encoding = env("UonSerializer.encoding", false);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
index e22ead404..112c86584 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
@@ -86,7 +86,6 @@ public class UrlEncodingParser extends UonParser implements UrlEncodingMetaProvi
* Constructor, default settings.
*/
protected Builder() {
- super();
decoding();
consumes("application/x-www-form-urlencoded");
expandedParams = env("UrlEncoding.expandedParams", false);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
index 1dcc3bdd2..4b8177a12 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
@@ -221,7 +221,6 @@ public class UrlEncodingSerializer extends UonSerializer implements UrlEncodingM
* Constructor, default settings.
*/
protected Builder() {
- super();
produces("application/x-www-form-urlencoded");
expandedParams = env("UrlEncoding.expandedParams", false);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ExtendedMimetypesFileTypeMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ExtendedMimetypesFileTypeMap.java
index ee6e26e80..013cdcc51 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ExtendedMimetypesFileTypeMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ExtendedMimetypesFileTypeMap.java
@@ -31,7 +31,6 @@ public class ExtendedMimetypesFileTypeMap extends MimetypesFileTypeMap {
* Constructor.
*/
public ExtendedMimetypesFileTypeMap() {
- super();
addMimeTypes("application/epub+zip epub");
addMimeTypes("application/java-archive jar");
addMimeTypes("application/javascript js");
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
index f546ce695..d556b7bb9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
@@ -88,7 +88,6 @@ public class XmlParser extends ReaderParser implements XmlMetaProvider {
* Constructor, default settings.
*/
protected Builder() {
- super();
consumes("text/xml,application/xml");
preserveRootElement = env("XmlParser.preserveRootElement", false);
validating = env("XmlParser.validating", false);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
index 589802633..43bd49c36 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
@@ -258,7 +258,6 @@ public class XmlSerializer extends WriterSerializer implements XmlMetaProvider {
* Constructor, default settings.
*/
protected Builder() {
- super();
produces("text/xml");
addBeanTypesXml = env("XmlSerializer.addBeanTypes", false);
addNamespaceUrisToRoot = env("XmlSerializer.addNamespaceUrisToRoot", false);
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 7770574e2..32573b3cb 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -1105,7 +1105,6 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
* Constructor.
*/
protected Builder() {
- super();
}
@Override /* Context.Builder */
diff --git a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ByteArrayEntity.java b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ByteArrayEntity.java
index 9ce8087f6..3f48bd8f4 100644
--- a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ByteArrayEntity.java
+++ b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ByteArrayEntity.java
@@ -45,7 +45,6 @@ public class ByteArrayEntity extends BasicHttpEntity {
* Constructor.
*/
public ByteArrayEntity() {
- super();
}
/**
diff --git a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/FileEntity.java b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/FileEntity.java
index 131b118dd..5768f4696 100644
--- a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/FileEntity.java
+++ b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/FileEntity.java
@@ -45,7 +45,6 @@ public class FileEntity extends BasicHttpEntity {
* Constructor.
*/
public FileEntity() {
- super();
}
/**
diff --git a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ReaderEntity.java b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ReaderEntity.java
index d052375de..aff5485d7 100644
--- a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ReaderEntity.java
+++ b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ReaderEntity.java
@@ -44,7 +44,6 @@ public class ReaderEntity extends BasicHttpEntity {
* Constructor.
*/
public ReaderEntity() {
- super();
}
/**
diff --git a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/SerializedEntity.java b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/SerializedEntity.java
index bbf138da0..a2e9f6f7f 100644
--- a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/SerializedEntity.java
+++ b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/SerializedEntity.java
@@ -48,7 +48,6 @@ public class SerializedEntity extends BasicHttpEntity {
* Constructor.
*/
public SerializedEntity() {
- super();
}
/**
diff --git a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StreamEntity.java b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StreamEntity.java
index 612b11d32..d08da3ec5 100644
--- a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StreamEntity.java
+++ b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StreamEntity.java
@@ -44,7 +44,6 @@ public class StreamEntity extends BasicHttpEntity {
* Constructor.
*/
public StreamEntity() {
- super();
}
/**
diff --git a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StringEntity.java b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StringEntity.java
index d77da7bc9..c479c66dc 100644
--- a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StringEntity.java
+++ b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StringEntity.java
@@ -48,7 +48,6 @@ public class StringEntity extends BasicHttpEntity {
* Constructor.
*/
public StringEntity() {
- super();
}
/**
diff --git a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
index fe2388b26..6a4557875 100644
--- a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
+++ b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
@@ -416,7 +416,6 @@ public class MockRestClient extends RestClient implements HttpClientConnection {
* Provided so that this class can be easily subclassed.
*/
protected Builder() {
- super();
connectionManager(new MockHttpClientConnectionManager());
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ChildResourceDescriptions.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ChildResourceDescriptions.java
index 550c8a759..fe7607de2 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ChildResourceDescriptions.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/ChildResourceDescriptions.java
@@ -98,6 +98,5 @@ public class ChildResourceDescriptions extends ResourceDescriptions {
* Bean constructor.
*/
public ChildResourceDescriptions() {
- super();
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/SeeOtherRoot.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/SeeOtherRoot.java
index 080071914..ccc798f78 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/SeeOtherRoot.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/beans/SeeOtherRoot.java
@@ -35,7 +35,6 @@ public class SeeOtherRoot extends SeeOther {
* Constructor.
*/
public SeeOtherRoot() {
- super();
setLocation("servlet:/");
}
@@ -47,7 +46,6 @@ public class SeeOtherRoot extends SeeOther {
* @param content Message to send as the response.
*/
public SeeOtherRoot(String content) {
- super();
setLocation("servlet:/");
setContent(content);
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/DebugEnablementMap.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/DebugEnablementMap.java
index c684bf105..8575d83b7 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/DebugEnablementMap.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/DebugEnablementMap.java
@@ -50,7 +50,6 @@ public class DebugEnablementMap extends ReflectionMap<Enablement> {
* Constructor.
*/
protected Builder() {
- super();
}
@Override /* ReflectionMapBuilder */
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/NamedAttributeMap.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/NamedAttributeMap.java
index 3faade529..4421846d5 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/NamedAttributeMap.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/NamedAttributeMap.java
@@ -64,7 +64,6 @@ public class NamedAttributeMap extends LinkedHashMap<String,NamedAttribute> {
* @param copyFrom The list to copy from.
*/
public NamedAttributeMap(NamedAttributeMap copyFrom) {
- super();
putAll(copyFrom);
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttributes.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttributes.java
index e62b4bcdb..281b63ac9 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttributes.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttributes.java
@@ -101,7 +101,6 @@ public class RequestAttributes {
* @param req The request creating this bean.
*/
public RequestAttributes(RestRequest req) {
- super();
this.req = req;
this.sreq = req.getHttpServletRequest();
this.vs = req.getVarResolverSession();
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java
index 6489d5e03..80b632cd7 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java
@@ -97,7 +97,6 @@ public class BasicStaticFiles implements StaticFiles {
* Can be used when subclassing and overriding the {@link #resolve(String, Locale)} method.
*/
protected BasicStaticFiles() {
- super();
this.headers = new Header[0];
this.mimeTypes = null;
this.hashCode = HashCode.of(hashCode(), headers);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanInheritanceTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanInheritanceTest.java
index ae6663aa6..252272428 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanInheritanceTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanInheritanceTest.java
@@ -95,7 +95,6 @@ public class RoundTripBeanInheritanceTest extends RoundTripTest {
public static class A2 extends A1 {
public A2() {
- super();
}
public A2(String x, String y, String z) {
@@ -118,7 +117,6 @@ public class RoundTripBeanInheritanceTest extends RoundTripTest {
// This is not supposed to be a valid bean since it has no getters defined.
public static class A3 extends A1 {
public A3() {
- super();
}
public A3(String x, String y, String z) {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
index ee22dfe67..1d968c0f1 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
@@ -585,7 +585,6 @@ public class Remote_Test {
@SuppressWarnings("serial")
public static class F2b extends HeaderList {
public F2b() {
- super();
throw new NullPointerException("foo");
}
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
index 1db594fdb..8247915ac 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
@@ -73,7 +73,6 @@ public class RestClient_Test {
public static class A2 extends RestClient.Builder {
public A2() {
- super();
}
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java b/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
index 6da37590f..c653d2881 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
@@ -2454,7 +2454,6 @@ public class ThirdPartyProxyTest {
public static class Builder extends BaseHttpPartSerializer.Builder {
Builder() {
- super();
}
Builder(Builder builder) {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/utils/IOUtilsTest.java b/juneau-utest/src/test/java/org/apache/juneau/utils/IOUtilsTest.java
index 69c83c141..1b0c74c78 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/utils/IOUtilsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/utils/IOUtilsTest.java
@@ -71,7 +71,6 @@ public class IOUtilsTest {
boolean closed;
public TestWriter() {
- super();
}
@Override /* Writer */
@@ -98,7 +97,6 @@ public class IOUtilsTest {
boolean closed;
public TestOutputStream() {
- super();
}
@Override /* OutputStream */
[juneau] 19/29: Add TODO comments
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit e818c5094d95ee452320420a82ae99b36d2fbb16
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:35:06 2023 -0400
Add TODO comments
---
.../test/java/org/apache/juneau/BeanMapErrorsTest.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java b/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java
index f018bc5e0..e3ffcd5bb 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java
@@ -40,7 +40,9 @@ public class BeanMapErrorsTest {
assertEquals(-1, bm.get("f2"));
bm.put("f2", -2);
assertEquals(-2, bm.get("f2"));
- assertFalse(bm.containsKey("f2"));
+ assertFalse(bm.keySet().contains("f2"));
+ // TODO: Why does this fail?
+ // assertFalse(bm.containsKey("f2"));
assertFalse(bm.entrySet().stream().map(Entry::getKey).collect(Collectors.toList()).contains("f2"));
}
@@ -68,7 +70,9 @@ public class BeanMapErrorsTest {
assertEquals(-1, bm.get("f2"));
bm.put("f2", -2);
assertEquals(-2, bm.get("f2"));
- assertFalse(bm.containsKey("f2"));
+ assertFalse(bm.keySet().contains("f2"));
+ // TODO: Why does this fail?
+ // assertFalse(bm.containsKey("f2"));
assertFalse(bm.entrySet().stream().map(Entry::getKey).collect(Collectors.toList()).contains("f2"));
}
@@ -104,7 +108,9 @@ public class BeanMapErrorsTest {
assertEquals(-1, bm.get("f2"));
bm.put("f2", -2);
assertEquals(-2, bm.get("f2"));
- assertFalse(bm.containsKey("f2"));
+ assertFalse(bm.keySet().contains("f2"));
+ // TODO: Why does this fail?
+ // assertFalse(bm.containsKey("f2"));
assertFalse(bm.entrySet().stream().map(Entry::getKey).collect(Collectors.toList()).contains("f2"));
}
@@ -125,7 +131,9 @@ public class BeanMapErrorsTest {
assertEquals(-1, bm.get("f2"));
bm.put("f2", -2);
assertEquals(-2, bm.get("f2"));
- assertFalse(bm.containsKey("f2"));
+ assertFalse(bm.keySet().contains("f2"));
+ // TODO: Why does this fail?
+ // assertFalse(bm.containsKey("f2"));
assertFalse(bm.entrySet().stream().map(Entry::getKey).collect(Collectors.toList()).contains("f2"));
}
[juneau] 02/29: Remove trailing whitespace
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 3562c6213f8b667e4e7e4ef3d4d50061b1976988
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 22:35:35 2023 -0400
Remove trailing whitespace
---
.../src/main/java/org/apache/juneau/rest/httppart/RequestContent.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
index 229f884cf..3b6a6e552 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
@@ -516,7 +516,7 @@ public class RequestContent {
.debug(req.isDebug() ? true : null)
.outer(req.getContext().getResource())
.build();
-
+
try (Closeable in = session.isReaderParser() ? getUnbufferedReader() : getInputStream()) {
T o = session.parse(in, cm);
if (schema != null)
[juneau] 12/29: Fix whitespace
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 60972b9bf55eaa78aa342a39c2f7f4c341d26dc1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:04:13 2023 -0400
Fix whitespace
---
.../src/test/java/org/apache/juneau/html/HtmlConfigAnnotation_Test.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlConfigAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlConfigAnnotation_Test.java
index b042e5c5f..b20aa64ea 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlConfigAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlConfigAnnotation_Test.java
@@ -35,7 +35,7 @@ public class HtmlConfigAnnotation_Test {
}
private static final Function<Object,String> TO_STRING = t -> Objects.toString(t, null);
-
+
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
[juneau] 04/29: [juneau-config] Use lambdas
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit cbe8e2af4608bd6629b3b1f7523956d64f7bd73d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 22:46:31 2023 -0400
[juneau-config] Use lambdas
---
.../java/org/apache/juneau/config/Section.java | 38 +++++++++-------------
.../apache/juneau/config/internal/ConfigMap.java | 26 +++++----------
2 files changed, 25 insertions(+), 39 deletions(-)
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java
index 0717113c8..3fdd90566 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java
@@ -204,30 +204,24 @@ public class Section {
* @return The proxy interface.
*/
@SuppressWarnings("unchecked")
- public <T> Optional<T> asInterface(final Class<T> c) {
- assertArgNotNull("c", c);
-
- if (! c.isInterface())
- throw new IllegalArgumentException("Class '"+c.getName()+"' passed to toInterface() is not an interface.");
+ public <T> Optional<T> asInterface(final Class<T> c) {
+ assertArgNotNull("c", c);
- InvocationHandler h = new InvocationHandler() {
+ if (!c.isInterface())
+ throw new IllegalArgumentException("Class '" + c.getName() + "' passed to toInterface() is not an interface.");
- @Override
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- BeanInfo bi = Introspector.getBeanInfo(c, null);
- for (PropertyDescriptor pd : bi.getPropertyDescriptors()) {
- Method rm = pd.getReadMethod(), wm = pd.getWriteMethod();
- if (method.equals(rm))
- return config.get(name + '/' + pd.getName()).as(rm.getGenericReturnType()).orElse(null);
- if (method.equals(wm))
- return config.set(name + '/' + pd.getName(), args[0]);
- }
- throw new UnsupportedOperationException("Unsupported interface method. method='"+method+"'");
- }
- };
-
- return optional((T)Proxy.newProxyInstance(c.getClassLoader(), new Class[] { c }, h));
- }
+ return optional((T) Proxy.newProxyInstance(c.getClassLoader(), new Class[] { c }, (InvocationHandler) (proxy, method, args) -> {
+ BeanInfo bi = Introspector.getBeanInfo(c, null);
+ for (PropertyDescriptor pd : bi.getPropertyDescriptors()) {
+ Method rm = pd.getReadMethod(), wm = pd.getWriteMethod();
+ if (method.equals(rm))
+ return config.get(name + '/' + pd.getName()).as(rm.getGenericReturnType()).orElse(null);
+ if (method.equals(wm))
+ return config.set(name + '/' + pd.getName(), args[0]);
+ }
+ throw new UnsupportedOperationException("Unsupported interface method. method='" + method + "'");
+ }));
+ }
/**
* Copies the entries in this section to the specified bean by calling the public setters on that bean.
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
index 6d28f131b..e11ee8df3 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
@@ -477,16 +477,11 @@ public class ConfigMap implements ConfigStoreListener {
if (synchronous) {
final CountDownLatch latch = new CountDownLatch(1);
- ConfigStoreListener l = new ConfigStoreListener() {
- @Override
- public void onChange(String contents) {
- latch.countDown();
- }
- };
- store.register(name, l);
+ ConfigStoreListener listener = contents1 -> latch.countDown();
+ store.register(name, listener);
store.write(name, null, contents);
latch.await(30, TimeUnit.SECONDS);
- store.unregister(name, l);
+ store.unregister(name, listener);
} else {
store.write(name, null, contents);
}
@@ -914,15 +909,12 @@ public class ConfigMap implements ConfigStoreListener {
}
synchronized Import register(final ConfigEventListener listener) {
- ConfigEventListener l2 = new ConfigEventListener() {
- @Override
- public void onConfigChange(ConfigEvents events) {
- ConfigEvents events2 = new ConfigEvents();
- events.stream().filter(x -> ! hasEntry(x.getSection(), x.getKey())).forEach(x -> events2.add(x));
- if (events2.size() > 0)
- listener.onConfigChange(events2);
- }
- };
+ ConfigEventListener l2 = events -> {
+ ConfigEvents events2 = new ConfigEvents();
+ events.stream().filter(x -> ! hasEntry(x.getSection(), x.getKey())).forEach(x -> events2.add(x));
+ if (events2.size() > 0)
+ listener.onConfigChange(events2);
+ };
listenerMap.put(listener, l2);
configMap.register(l2);
return this;
[juneau] 08/29: [juneau-rest-client] Use lambdas
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 970718f42c5674744a08ad9968bbfb3f9c5a0e61
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 22:52:16 2023 -0400
[juneau-rest-client] Use lambdas
---
.../apache/juneau/rest/client/ResponseContent.java | 52 +++++-----------------
.../org/apache/juneau/rest/client/RestClient.java | 40 +++++++----------
.../org/apache/juneau/rest/client/RestRequest.java | 20 ++-------
.../apache/juneau/rest/client/RestResponse.java | 29 ++++++------
4 files changed, 46 insertions(+), 95 deletions(-)
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
index 567ac09dc..641e07f96 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
@@ -764,16 +764,9 @@ public class ResponseContent implements HttpEntity {
* RestClient.Builder#executorService(ExecutorService, boolean) for defining the executor service for creating
* {@link Future Futures}.
*/
- public <T> Future<T> asFuture(final Class<T> type) throws RestCallException {
- return client.getExecutorService().submit(
- new Callable<T>() {
- @Override /* Callable */
- public T call() throws Exception {
- return as(type);
- }
- }
- );
- }
+ public <T> Future<T> asFuture(final Class<T> type) throws RestCallException {
+ return client.getExecutorService().submit(() -> as(type));
+ }
/**
* Same as {@link #as(ClassMeta)} but allows you to run the call asynchronously.
@@ -797,16 +790,9 @@ public class ResponseContent implements HttpEntity {
* RestClient.Builder#executorService(ExecutorService, boolean) for defining the executor service for creating
* {@link Future Futures}.
*/
- public <T> Future<T> asFuture(final ClassMeta<T> type) throws RestCallException {
- return client.getExecutorService().submit(
- new Callable<T>() {
- @Override /* Callable */
- public T call() throws Exception {
- return as(type);
- }
- }
- );
- }
+ public <T> Future<T> asFuture(final ClassMeta<T> type) throws RestCallException {
+ return client.getExecutorService().submit(() -> as(type));
+ }
/**
* Same as {@link #as(Type,Type...)} but allows you to run the call asynchronously.
@@ -836,16 +822,9 @@ public class ResponseContent implements HttpEntity {
* RestClient.Builder#executorService(ExecutorService, boolean) for defining the executor service for creating
* {@link Future Futures}.
*/
- public <T> Future<T> asFuture(final Type type, final Type...args) throws RestCallException {
- return client.getExecutorService().submit(
- new Callable<T>() {
- @Override /* Callable */
- public T call() throws Exception {
- return as(type, args);
- }
- }
- );
- }
+ public <T> Future<T> asFuture(final Type type, final Type... args) throws RestCallException {
+ return client.getExecutorService().submit(() -> as(type, args));
+ }
/**
* Returns the contents of this body as a string.
@@ -894,16 +873,9 @@ public class ResponseContent implements HttpEntity {
* RestClient.Builder#executorService(ExecutorService, boolean) for defining the executor service for creating
* {@link Future Futures}.
*/
- public Future<String> asStringFuture() throws RestCallException {
- return client.getExecutorService().submit(
- new Callable<String>() {
- @Override /* Callable */
- public String call() throws Exception {
- return asString();
- }
- }
- );
- }
+ public Future<String> asStringFuture() throws RestCallException {
+ return client.getExecutorService().submit(() -> asString());
+ }
/**
* Same as {@link #asString()} but truncates the string to the specified length.
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 0f3483fad..0c243bf2d 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -7396,31 +7396,25 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
RemoteOperationReturn ror = rom.getReturns();
if (ror.isFuture()) {
- return getExecutorService().submit(new Callable<Object>() {
- @Override
- public Object call() throws Exception {
- try {
- return executeRemote(interfaceClass, rc, method, rom);
- } catch (Exception e) {
- throw e;
- } catch (Throwable e) {
- throw asRuntimeException(e);
- }
- }
- });
+ return getExecutorService().submit(() -> {
+ try {
+ return executeRemote(interfaceClass, rc, method, rom);
+ } catch (Exception e) {
+ throw e;
+ } catch (Throwable e) {
+ throw asRuntimeException(e);
+ }
+ });
} else if (ror.isCompletableFuture()) {
CompletableFuture<Object> cf = new CompletableFuture<>();
- getExecutorService().submit(new Callable<Object>() {
- @Override
- public Object call() throws Exception {
- try {
- cf.complete(executeRemote(interfaceClass, rc, method, rom));
- } catch (Throwable e) {
- cf.completeExceptionally(e);
- }
- return null;
- }
- });
+ getExecutorService().submit(() -> {
+ try {
+ cf.complete(executeRemote(interfaceClass, rc, method, rom));
+ } catch (Throwable e) {
+ cf.completeExceptionally(e);
+ }
+ return null;
+ });
return cf;
}
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
index ff9944c89..db263db99 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
@@ -2025,16 +2025,9 @@ public class RestRequest extends BeanSession implements HttpUriRequest, Configur
* @return The HTTP status code.
* @throws RestCallException If the executor service was not defined.
*/
- public Future<RestResponse> runFuture() throws RestCallException {
- return client.getExecutorService().submit(
- new Callable<RestResponse>() {
- @Override /* Callable */
- public RestResponse call() throws Exception {
- return run();
- }
- }
- );
- }
+ public Future<RestResponse> runFuture() throws RestCallException {
+ return client.getExecutorService().submit(() -> run());
+ }
/**
* Same as {@link #run()} but immediately calls {@link RestResponse#consume()} to clean up the response.
@@ -2085,12 +2078,7 @@ public class RestRequest extends BeanSession implements HttpUriRequest, Configur
*/
public Future<RestResponse> completeFuture() throws RestCallException {
return client.getExecutorService().submit(
- new Callable<RestResponse>() {
- @Override /* Callable */
- public RestResponse call() throws Exception {
- return complete();
- }
- }
+ () -> complete()
);
}
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
index 83841cedb..6fbe88c27 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
@@ -438,22 +438,19 @@ public class RestResponse implements HttpResponse {
return (T)Proxy.newProxyInstance(
c.getClassLoader(),
new Class[] { c },
- new InvocationHandler() {
- @Override /* InvocationHandler */
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- ResponseBeanPropertyMeta pm = rbm.getProperty(method.getName());
- HttpPartParserSession pp = getPartParserSession(pm.getParser().orElse(rc.getPartParser()));
- HttpPartSchema schema = pm.getSchema();
- HttpPartType pt = pm.getPartType();
- String name = pm.getPartName().orElse(null);
- ClassMeta<?> type = rc.getBeanContext().getClassMeta(method.getGenericReturnType());
- if (pt == RESPONSE_HEADER)
- return getHeader(name).parser(pp).schema(schema).as(type).orElse(null);
- if (pt == RESPONSE_STATUS)
- return getStatusCode();
- return getContent().schema(schema).as(type);
- }
- });
+ (InvocationHandler) (proxy, method, args) -> {
+ ResponseBeanPropertyMeta pm = rbm.getProperty(method.getName());
+ HttpPartParserSession pp = getPartParserSession(pm.getParser().orElse(rc.getPartParser()));
+ HttpPartSchema schema = pm.getSchema();
+ HttpPartType pt = pm.getPartType();
+ String name = pm.getPartName().orElse(null);
+ ClassMeta<?> type = rc.getBeanContext().getClassMeta(method.getGenericReturnType());
+ if (pt == RESPONSE_HEADER)
+ return getHeader(name).parser(pp).schema(schema).as(type).orElse(null);
+ if (pt == RESPONSE_STATUS)
+ return getStatusCode();
+ return getContent().schema(schema).as(type);
+ });
}
/**
[juneau] 09/29: [juneau-rest-server] Use lambdas
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 0c37f204d35e5738c6f0281ee4a1f77be8f77542
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 22:53:11 2023 -0400
[juneau-rest-server] Use lambdas
---
.../java/org/apache/juneau/rest/RestRequest.java | 47 ++++++++++------------
.../apache/juneau/rest/arg/ResponseBeanArg.java | 21 +++++-----
.../apache/juneau/rest/arg/ResponseCodeArg.java | 7 +---
.../apache/juneau/rest/arg/ResponseHeaderArg.java | 21 +++++-----
4 files changed, 40 insertions(+), 56 deletions(-)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index 2467183e1..a714cfcdb 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -21,7 +21,6 @@ import static java.util.Optional.*;
import java.io.*;
import java.lang.reflect.*;
-import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.net.*;
import java.nio.charset.*;
@@ -1523,31 +1522,27 @@ public final class RestRequest extends HttpServletRequestWrapper {
return (T)Proxy.newProxyInstance(
c.getClassLoader(),
new Class[] { c },
- new InvocationHandler() {
- @Override /* InvocationHandler */
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- RequestBeanPropertyMeta pm = rbm.getProperty(method.getName());
- if (pm != null) {
- HttpPartParserSession pp = pm.getParser(getPartParserSession());
- HttpPartSchema schema = pm.getSchema();
- String name = pm.getPartName();
- ClassMeta<?> type = bs.getClassMeta(method.getGenericReturnType());
- HttpPartType pt = pm.getPartType();
- if (pt == HttpPartType.BODY)
- return getContent().setSchema(schema).as(type);
- if (pt == QUERY)
- return getQueryParam(name).parser(pp).schema(schema).as(type).orElse(null);
- if (pt == FORMDATA)
- return getFormParam(name).parser(pp).schema(schema).as(type).orElse(null);
- if (pt == HEADER)
- return getHeaderParam(name).parser(pp).schema(schema).as(type).orElse(null);
- if (pt == PATH)
- return getPathParam(name).parser(pp).schema(schema).as(type).orElse(null);
- }
- return null;
- }
-
- });
+ (InvocationHandler) (proxy, method, args) -> {
+ RequestBeanPropertyMeta pm = rbm.getProperty(method.getName());
+ if (pm != null) {
+ HttpPartParserSession pp = pm.getParser(getPartParserSession());
+ HttpPartSchema schema = pm.getSchema();
+ String name = pm.getPartName();
+ ClassMeta<?> type = bs.getClassMeta(method.getGenericReturnType());
+ HttpPartType pt = pm.getPartType();
+ if (pt == HttpPartType.BODY)
+ return getContent().setSchema(schema).as(type);
+ if (pt == QUERY)
+ return getQueryParam(name).parser(pp).schema(schema).as(type).orElse(null);
+ if (pt == FORMDATA)
+ return getFormParam(name).parser(pp).schema(schema).as(type).orElse(null);
+ if (pt == HEADER)
+ return getHeaderParam(name).parser(pp).schema(schema).as(type).orElse(null);
+ if (pt == PATH)
+ return getPathParam(name).parser(pp).schema(schema).as(type).orElse(null);
+ }
+ return null;
+ });
} catch (Exception e) {
throw asRuntimeException(e);
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseBeanArg.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseBeanArg.java
index d840450fe..a321949ef 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseBeanArg.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseBeanArg.java
@@ -71,18 +71,15 @@ public class ResponseBeanArg implements RestOpArg {
@Override /* RestOpArg */
public Object resolve(final RestOpSession opSession) throws Exception {
Value<Object> v = new Value();
- v.listener(new ValueListener() {
- @Override
- public void onSet(Object o) {
- RestRequest req = opSession.getRequest();
- RestResponse res = opSession.getResponse();
- ResponseBeanMeta meta = req.getOpContext().getResponseBeanMeta(o);
- if (meta == null)
- meta = ResponseBeanArg.this.meta;
- res.setResponseBeanMeta(meta);
- res.setContent(o);
- }
- });
+ v.listener(o -> {
+ RestRequest req = opSession.getRequest();
+ RestResponse res = opSession.getResponse();
+ ResponseBeanMeta meta = req.getOpContext().getResponseBeanMeta(o);
+ if (meta == null)
+ meta = ResponseBeanArg.this.meta;
+ res.setResponseBeanMeta(meta);
+ res.setContent(o);
+ });
return v;
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseCodeArg.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseCodeArg.java
index 6ddfafbca..03a924632 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseCodeArg.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseCodeArg.java
@@ -59,12 +59,7 @@ public class ResponseCodeArg implements RestOpArg {
@Override /* RestOpArg */
public Object resolve(final RestOpSession opSession) throws Exception {
Value<Object> v = new Value();
- v.listener(new ValueListener() {
- @Override
- public void onSet(Object o) {
- opSession.getResponse().setStatus(Integer.parseInt(o.toString()));
- }
- });
+ v.listener(o -> opSession.getResponse().setStatus(Integer.parseInt(o.toString())));
return v;
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseHeaderArg.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseHeaderArg.java
index 3f50da126..5d99654a1 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseHeaderArg.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseHeaderArg.java
@@ -81,18 +81,15 @@ public class ResponseHeaderArg implements RestOpArg {
@Override /* RestOpArg */
public Object resolve(final RestOpSession opSession) throws Exception {
Value<Object> v = new Value();
- v.listener(new ValueListener() {
- @Override
- public void onSet(Object o) {
- RestRequest req = opSession.getRequest();
- RestResponse res = opSession.getResponse();
- ResponsePartMeta rpm = req.getOpContext().getResponseHeaderMeta(o);
- if (rpm == null)
- rpm = ResponseHeaderArg.this.meta;
- HttpPartSerializerSession pss = rpm.getSerializer() == null ? req.getPartSerializerSession() : rpm.getSerializer().getPartSession();
- res.setHeader(new SerializedHeader(name, o, pss, rpm.getSchema(), false));
- }
- });
+ v.listener(o -> {
+ RestRequest req = opSession.getRequest();
+ RestResponse res = opSession.getResponse();
+ ResponsePartMeta rpm = req.getOpContext().getResponseHeaderMeta(o);
+ if (rpm == null)
+ rpm = ResponseHeaderArg.this.meta;
+ HttpPartSerializerSession pss = rpm.getSerializer() == null ? req.getPartSerializerSession() : rpm.getSerializer().getPartSession();
+ res.setHeader(new SerializedHeader(name, o, pss, rpm.getSchema(), false));
+ });
return v;
}
}
[juneau] 07/29: [juneau-microservice-core] Use lambdas
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 3732b145472289b68f5553283e46cf3dc86fe736
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 22:49:55 2023 -0400
[juneau-microservice-core] Use lambdas
---
.../juneau/microservice/resources/LogsResource.java | 18 +++++-------------
.../microservice/resources/ShutdownResource.java | 19 ++++++++-----------
2 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
index 64b819690..1a62d7809 100644
--- a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
+++ b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
@@ -276,20 +276,12 @@ public class LogsResource extends BasicRestServlet {
return s;
}
- static final FileFilter FILE_FILTER = new FileFilter() {
- @Override /* FileFilter */
- public boolean accept(File f) {
- return f.isDirectory() || f.getName().endsWith(".log");
- }
- };
+ static final FileFilter FILE_FILTER = f -> f.isDirectory() || f.getName().endsWith(".log");
- static final Comparator<FileResource> FILE_COMPARATOR = new Comparator<>() {
- @Override /* Comparator */
- public int compare(FileResource o1, FileResource o2) {
- int c = o1.getType().compareTo(o2.getType());
- return c != 0 ? c : o1.getName().compareTo(o2.getName());
- }
- };
+ static final Comparator<FileResource> FILE_COMPARATOR = (o1, o2) -> {
+ int c = o1.getType().compareTo(o2.getType());
+ return c != 0 ? c : o1.getName().compareTo(o2.getName());
+ };
}
diff --git a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java
index 904ba2ce6..ff3b4b722 100755
--- a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java
+++ b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java
@@ -40,17 +40,14 @@ public class ShutdownResource extends BasicRestServlet {
@RestGet(path="/", description="Show contents of config file.")
public String shutdown() {
new Thread(
- new Runnable() {
- @Override /* Runnable */
- public void run() {
- try {
- Thread.sleep(1000);
- System.exit(0);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
+ () -> {
+ try {
+ Thread.sleep(1000);
+ System.exit(0);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
).start();
return "OK";
}
[juneau] 03/29: Use Comparator.comparing()
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit f4ef67145a4709c8516321dbb8e6bd5e0613ad30
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 22:37:02 2023 -0400
Use Comparator.comparing()
---
.../main/java/org/apache/juneau/rest/httppart/RequestFormParams.java | 2 +-
.../src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java | 2 +-
.../main/java/org/apache/juneau/rest/httppart/RequestPathParams.java | 2 +-
.../main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
index b175b88a4..43743fba2 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
@@ -436,7 +436,7 @@ public class RequestFormParams extends ArrayList<RequestFormParam> {
public Stream<RequestFormParam> getSorted() {
Comparator<RequestFormParam> x;
if (caseSensitive)
- x = (x1,x2) -> x1.getName().compareTo(x2.getName());
+ x = Comparator.comparing(RequestFormParam::getName);
else
x = (x1,x2) -> String.CASE_INSENSITIVE_ORDER.compare(x1.getName(), x2.getName());
return stream().sorted(x);
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
index c609bd663..d319469db 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
@@ -394,7 +394,7 @@ public class RequestHeaders extends ArrayList<RequestHeader> {
public Stream<RequestHeader> getSorted() {
Comparator<RequestHeader> x;
if (caseSensitive)
- x = (x1,x2) -> x1.getName().compareTo(x2.getName());
+ x = Comparator.comparing(RequestHeader::getName);
else
x = (x1,x2) -> String.CASE_INSENSITIVE_ORDER.compare(x1.getName(), x2.getName());
return stream().sorted(x);
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
index 8a402934b..fd5644175 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
@@ -394,7 +394,7 @@ public class RequestPathParams extends ArrayList<RequestPathParam> {
public Stream<RequestPathParam> getSorted() {
Comparator<RequestPathParam> x;
if (caseSensitive)
- x = (x1,x2) -> x1.getName().compareTo(x2.getName());
+ x = Comparator.comparing(RequestPathParam::getName);
else
x = (x1,x2) -> String.CASE_INSENSITIVE_ORDER.compare(x1.getName(), x2.getName());
return stream().sorted(x);
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
index 984e6fb58..5a4ca7c04 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
@@ -410,7 +410,7 @@ public class RequestQueryParams extends ArrayList<RequestQueryParam> {
public Stream<RequestQueryParam> getSorted() {
Comparator<RequestQueryParam> x;
if (caseSensitive)
- x = (x1,x2) -> x1.getName().compareTo(x2.getName());
+ x = Comparator.comparing(RequestQueryParam::getName);
else
x = (x1,x2) -> String.CASE_INSENSITIVE_ORDER.compare(x1.getName(), x2.getName());
return stream().sorted(x);
[juneau] 18/29: Use better map APIs
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 99a7604ad593cba3636bd7784ea5737b21ced5b8
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:31:00 2023 -0400
Use better map APIs
---
juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java | 4 ++--
.../src/test/java/org/apache/juneau/BeanMapErrorsTest.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java b/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java
index 8f6ead9c2..f3a2c4f43 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java
@@ -97,8 +97,8 @@ public class BeanConfigTest {
fail("java.lang.Class incorrectly desingated as bean type.");
Map m4 = bm1;
- if (m4.keySet().size() != m2.size())
- fail("Bean Adapter map's key set has wrong size: " + a + " / " + m4.keySet().size() + " / " + m2.size());
+ if (m4.size() != m2.size())
+ fail("Bean Adapter map's key set has wrong size: " + a + " / " + m4.size() + " / " + m2.size());
Iterator iter = m4.keySet().iterator();
Set temp = new HashSet();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java b/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java
index cff6d6d4b..f018bc5e0 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java
@@ -40,7 +40,7 @@ public class BeanMapErrorsTest {
assertEquals(-1, bm.get("f2"));
bm.put("f2", -2);
assertEquals(-2, bm.get("f2"));
- assertFalse(bm.keySet().contains("f2"));
+ assertFalse(bm.containsKey("f2"));
assertFalse(bm.entrySet().stream().map(Entry::getKey).collect(Collectors.toList()).contains("f2"));
}
@@ -68,7 +68,7 @@ public class BeanMapErrorsTest {
assertEquals(-1, bm.get("f2"));
bm.put("f2", -2);
assertEquals(-2, bm.get("f2"));
- assertFalse(bm.keySet().contains("f2"));
+ assertFalse(bm.containsKey("f2"));
assertFalse(bm.entrySet().stream().map(Entry::getKey).collect(Collectors.toList()).contains("f2"));
}
@@ -104,7 +104,7 @@ public class BeanMapErrorsTest {
assertEquals(-1, bm.get("f2"));
bm.put("f2", -2);
assertEquals(-2, bm.get("f2"));
- assertFalse(bm.keySet().contains("f2"));
+ assertFalse(bm.containsKey("f2"));
assertFalse(bm.entrySet().stream().map(Entry::getKey).collect(Collectors.toList()).contains("f2"));
}
@@ -125,7 +125,7 @@ public class BeanMapErrorsTest {
assertEquals(-1, bm.get("f2"));
bm.put("f2", -2);
assertEquals(-2, bm.get("f2"));
- assertFalse(bm.keySet().contains("f2"));
+ assertFalse(bm.containsKey("f2"));
assertFalse(bm.entrySet().stream().map(Entry::getKey).collect(Collectors.toList()).contains("f2"));
}
[juneau] 16/29: Remove unused imports
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 62d651301c435e422cc1b67f26fb8cb57a22e183
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:22:07 2023 -0400
Remove unused imports
---
.../juneau/assertions/AssertionPredicate.java | 3 +-
.../juneau/assertions/FluentArrayAssertion.java | 2 +-
.../assertions/FluentCollectionAssertion.java | 4 +--
.../assertions/FluentPrimitiveArrayAssertion.java | 16 ++++-----
.../assertions/FluentStringListAssertion.java | 2 +-
.../apache/juneau/common/internal/StringUtils.java | 4 +--
.../apache/juneau/config/internal/ConfigMap.java | 4 +--
.../apache/juneau/dto/jsonschema/JsonSchema.java | 4 +--
.../java/org/apache/juneau/AnnotationApplier.java | 7 ++--
.../java/org/apache/juneau/AnnotationProvider.java | 10 +++---
.../src/main/java/org/apache/juneau/BeanMap.java | 4 +--
.../main/java/org/apache/juneau/BeanRegistry.java | 4 +--
.../src/main/java/org/apache/juneau/ClassMeta.java | 8 ++---
.../src/main/java/org/apache/juneau/Context.java | 2 +-
.../org/apache/juneau/collections/JsonList.java | 2 +-
.../org/apache/juneau/collections/JsonMap.java | 4 +--
.../java/org/apache/juneau/cp/BasicFileFinder.java | 4 +--
.../java/org/apache/juneau/cp/BeanCreator.java | 4 +--
.../main/java/org/apache/juneau/cp/BeanStore.java | 4 +--
.../main/java/org/apache/juneau/cp/FileFinder.java | 4 +--
.../apache/juneau/csv/CsvSerializerSession.java | 4 +--
.../org/apache/juneau/encoders/EncoderSet.java | 2 +-
.../org/apache/juneau/html/HtmlDocSerializer.java | 2 +-
.../org/apache/juneau/httppart/HttpPartSchema.java | 4 +--
.../org/apache/juneau/internal/ClassUtils.java | 2 +-
.../java/org/apache/juneau/internal/SystemEnv.java | 4 +--
.../java/org/apache/juneau/parser/ParserSet.java | 8 ++---
.../apache/juneau/serializer/SerializerSet.java | 8 ++---
.../juneau/urlencoding/UrlEncodingClassMeta.java | 2 +-
.../apache/juneau/xml/XmlSerializerSession.java | 6 ++--
.../microservice/jetty/JettyMicroservice.java | 4 +--
.../apache/juneau/rest/client/ResponseContent.java | 4 +--
.../org/apache/juneau/rest/client/RestClient.java | 34 +++++++++---------
.../org/apache/juneau/rest/client/RestRequest.java | 6 ++--
.../org/apache/juneau/http/header/HeaderList.java | 8 ++---
.../java/org/apache/juneau/http/part/PartList.java | 8 ++---
.../juneau/rest/mock/MockServletRequest.java | 4 +--
.../java/org/apache/juneau/rest/RestContext.java | 11 +++---
.../java/org/apache/juneau/rest/RestOpContext.java | 40 +++++++++++-----------
.../juneau/rest/annotation/RestAnnotation.java | 12 +++----
.../rest/annotation/RestDeleteAnnotation.java | 15 ++++----
.../juneau/rest/annotation/RestGetAnnotation.java | 15 ++++----
.../juneau/rest/annotation/RestOpAnnotation.java | 19 +++++-----
.../rest/annotation/RestOptionsAnnotation.java | 15 ++++----
.../rest/annotation/RestPatchAnnotation.java | 19 +++++-----
.../juneau/rest/annotation/RestPostAnnotation.java | 19 +++++-----
.../juneau/rest/annotation/RestPutAnnotation.java | 19 +++++-----
.../org/apache/juneau/rest/arg/HasFormDataArg.java | 2 +-
.../org/apache/juneau/rest/arg/HasQueryArg.java | 2 +-
.../juneau/rest/arg/HttpServletRequestArgs.java | 8 ++---
.../juneau/rest/arg/HttpServletResponseArgs.java | 2 +-
.../apache/juneau/rest/arg/HttpSessionArgs.java | 2 +-
.../juneau/rest/arg/InputStreamParserArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/ParserArg.java | 2 +-
.../apache/juneau/rest/arg/ReaderParserArg.java | 2 +-
.../apache/juneau/rest/arg/RestContextArgs.java | 26 +++++++-------
.../apache/juneau/rest/arg/RestOpContextArgs.java | 8 ++---
.../apache/juneau/rest/arg/RestOpSessionArgs.java | 4 +--
.../apache/juneau/rest/arg/RestRequestArgs.java | 36 +++++++++----------
.../apache/juneau/rest/arg/RestResponseArgs.java | 8 ++---
.../apache/juneau/rest/arg/RestSessionArgs.java | 6 ++--
.../juneau/rest/converter/RestConverterList.java | 2 +-
.../apache/juneau/rest/guard/RestGuardList.java | 2 +-
.../juneau/rest/httppart/RequestFormParams.java | 6 ++--
.../juneau/rest/httppart/RequestHeaders.java | 4 +--
.../juneau/rest/httppart/RequestPathParams.java | 4 +--
.../juneau/rest/httppart/RequestQueryParams.java | 4 +--
.../juneau/rest/matcher/RestMatcherList.java | 4 +--
.../org/apache/juneau/rest/stats/ThrownStore.java | 6 ++--
.../juneau/rest/swagger/SwaggerProvider.java | 8 ++---
.../juneau/testutils/MockStreamSerializer.java | 2 +-
.../juneau/testutils/MockWriterSerializer.java | 2 +-
.../java/org/apache/juneau/BeanContextTest.java | 2 +-
.../java/org/apache/juneau/BeanMapErrorsTest.java | 9 ++---
.../juneau/BeanTraversePropertiesComboTest.java | 5 +--
.../test/java/org/apache/juneau/BenchmarkTest.java | 2 +-
.../juneau/SerializerPropertiesComboTest.java | 21 ++++++------
.../java/org/apache/juneau/cp/BeanStore_Test.java | 4 +--
.../juneau/http/SerializedHttpEntity_Test.java | 5 +--
.../org/apache/juneau/http/remote/Remote_Test.java | 3 +-
.../juneau/json/JsonConfigAnnotationTest.java | 2 +-
.../msgpack/MsgPackConfigAnnotationTest.java | 2 +-
.../org/apache/juneau/reflect/ClassInfoTest.java | 2 +-
.../apache/juneau/reflect/ConstructorInfoTest.java | 2 +-
.../apache/juneau/reflect/ExecutableInfoTest.java | 18 +++++-----
.../Rest_DefaultRequestAttributes_Test.java | 2 +-
.../rest/client/RestClient_BasicCalls_Test.java | 3 +-
.../juneau/rest/client/RestClient_Body_Test.java | 2 +-
.../client/RestClient_Config_BeanContext_Test.java | 3 +-
.../client/RestClient_Config_OpenApi_Test.java | 3 +-
.../client/RestClient_Config_RestClient_Test.java | 4 +--
.../rest/client/RestClient_Headers_Test.java | 3 +-
.../client/RestClient_Response_Headers_Test.java | 3 +-
.../rest/test/client/ThirdPartyProxyTest.java | 8 ++---
.../juneau/soap/SoapXmlConfigAnnotationTest.java | 2 +-
.../apache/juneau/transforms/ObjectSwapTest.java | 3 +-
.../apache/juneau/uon/UonConfigAnnotationTest.java | 2 +-
.../UrlEncodingConfigAnnotationTest.java | 2 +-
98 files changed, 334 insertions(+), 327 deletions(-)
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
index 8a1aa0e40..399dbb7dc 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.common.internal.StringUtils.*;
import java.text.*;
import java.util.function.*;
+import org.apache.juneau.common.internal.StringUtils;
import org.apache.juneau.cp.*;
/**
@@ -62,7 +63,7 @@ public class AssertionPredicate<T> implements Predicate<T> {
/**
* Argument placeholder for tested value.
*/
- public static final Function<Object,String> VALUE = x -> stringifyDeep(x);
+ public static final Function<Object,String> VALUE = StringUtils::stringifyDeep;
private static final Messages MESSAGES = Messages.of(AssertionPredicate.class, "Messages");
private static final String
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
index b194b0ac6..023999fb7 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
@@ -191,7 +191,7 @@ public class FluentArrayAssertion<E,R> extends FluentObjectAssertion<E[],R> {
* @return A new fluent string assertion.
*/
public FluentStringListAssertion<R> asStrings() {
- return new FluentStringListAssertion<>(this, valueIsNull() ? null : stream(value()).map(x -> stringify(x)).collect(Collectors.toList()), returns());
+ return new FluentStringListAssertion<>(this, valueIsNull() ? null : stream(value()).map(StringUtils::stringify).collect(Collectors.toList()), returns());
}
/**
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
index db290ce62..fb776768e 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
@@ -12,7 +12,6 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
import java.io.*;
@@ -20,6 +19,7 @@ import java.util.*;
import java.util.function.*;
import java.util.stream.*;
+import org.apache.juneau.common.internal.StringUtils;
import org.apache.juneau.cp.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.serializer.*;
@@ -172,7 +172,7 @@ public class FluentCollectionAssertion<E,R> extends FluentObjectAssertion<Collec
* @return A new fluent string assertion.
*/
public FluentStringListAssertion<R> asStrings() {
- return new FluentStringListAssertion<>(this, valueIsNull() ? null : value().stream().map(x -> stringify(x)).collect(Collectors.toList()), returns());
+ return new FluentStringListAssertion<>(this, valueIsNull() ? null : value().stream().map(StringUtils::stringify).collect(Collectors.toList()), returns());
}
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
index c15578a1c..77a4d43fa 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
@@ -115,14 +115,14 @@ public class FluentPrimitiveArrayAssertion<E,T,R> extends FluentObjectAssertion<
private static final Map<Class<?>,Function<Object,String>> STRINGIFIERS = new HashMap<>();
static {
- STRINGIFIERS.put(boolean.class, (x) -> Arrays.toString((boolean[])x));
- STRINGIFIERS.put(byte.class, (x) -> Arrays.toString((byte[])x));
- STRINGIFIERS.put(char.class, (x) -> Arrays.toString((char[])x));
- STRINGIFIERS.put(double.class, (x) -> Arrays.toString((double[])x));
- STRINGIFIERS.put(float.class, (x) -> Arrays.toString((float[])x));
- STRINGIFIERS.put(int.class, (x) -> Arrays.toString((int[])x));
- STRINGIFIERS.put(long.class, (x) -> Arrays.toString((long[])x));
- STRINGIFIERS.put(short.class, (x) -> Arrays.toString((short[])x));
+ STRINGIFIERS.put(boolean.class, x -> Arrays.toString((boolean[])x));
+ STRINGIFIERS.put(byte.class, x -> Arrays.toString((byte[])x));
+ STRINGIFIERS.put(char.class, x -> Arrays.toString((char[])x));
+ STRINGIFIERS.put(double.class, x -> Arrays.toString((double[])x));
+ STRINGIFIERS.put(float.class, x -> Arrays.toString((float[])x));
+ STRINGIFIERS.put(int.class, x -> Arrays.toString((int[])x));
+ STRINGIFIERS.put(long.class, x -> Arrays.toString((long[])x));
+ STRINGIFIERS.put(short.class, x -> Arrays.toString((short[])x));
}
private static final Messages MESSAGES = Messages.of(FluentPrimitiveArrayAssertion.class, "Messages");
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java
index 028d55b79..b392c18b4 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java
@@ -204,7 +204,7 @@ public class FluentStringListAssertion<R> extends FluentListAssertion<String,R>
* @return A new assertion.
*/
public FluentStringListAssertion<R> asTrimmed() {
- return new FluentStringListAssertion<>(this, valueIsNull() ? null : value().stream().map(x -> StringUtils.trim(x)).collect(toList()), returns());
+ return new FluentStringListAssertion<>(this, valueIsNull() ? null : value().stream().map(StringUtils::trim).collect(toList()), returns());
}
//-----------------------------------------------------------------------------------------------------------------
diff --git a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
index 23b1d743c..d31e425cf 100644
--- a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
+++ b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
@@ -41,7 +41,7 @@ public final class StringUtils {
/**
* Predicate check to filter out null and empty strings.
*/
- public static final Predicate<String> NOT_EMPTY = x -> isNotEmpty(x);
+ public static final Predicate<String> NOT_EMPTY = StringUtils::isNotEmpty;
private static final AsciiSet numberChars = AsciiSet.create("-xX.+-#pP0123456789abcdefABCDEF");
private static final AsciiSet firstNumberChars =AsciiSet.create("+-.#0123456789");
@@ -2273,7 +2273,7 @@ public final class StringUtils {
if (o instanceof Method)
return Method.class.cast(o).getName();
if (o.getClass().isArray())
- return arrayAsList(o).stream().map(x -> convertToReadable(x)).collect(Collectors.joining(", ", "[", "]"));
+ return arrayAsList(o).stream().map(StringUtils::convertToReadable).collect(Collectors.joining(", ", "[", "]"));
return o.toString();
}
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
index e11ee8df3..781aeeae4 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
@@ -80,7 +80,7 @@ public class ConfigMap implements ConfigStoreListener {
entries.clear();
oentries.clear();
- imports.forEach(x -> x.unregisterAll());
+ imports.forEach(Import::unregisterAll);
imports.clear();
Map<String,ConfigMap> imports = map();
@@ -904,7 +904,7 @@ public class ConfigMap implements ConfigStoreListener {
}
synchronized Import register(Collection<ConfigEventListener> listeners) {
- listeners.forEach(x -> register(x));
+ listeners.forEach(this::register);
return this;
}
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
index f515a0c80..a626e17e1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
@@ -1375,12 +1375,12 @@ public class JsonSchema {
private void setMasterOn(Collection<JsonSchema> ss) {
if (ss != null)
- ss.forEach(x -> setMasterOn(x));
+ ss.forEach(this::setMasterOn);
}
private void setMasterOn(JsonSchemaArray ss) {
if (ss != null)
- ss.forEach(x -> setMasterOn(x));
+ ss.forEach(this::setMasterOn);
}
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
index 5d2b1cc1b..2f1ca17c2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
@@ -22,6 +22,7 @@ import java.util.*;
import java.util.stream.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.StringUtils;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
@@ -169,7 +170,7 @@ public abstract class AnnotationApplier<A extends Annotation, B> {
* @return The array wrapped in an {@link Optional}.
*/
protected Optional<String[]> strings(String[] in) {
- return optional(in.length == 0 ? null : Arrays.stream(in).map(x -> vr.resolve(x)).filter(x -> isNotEmpty(x)).toArray(String[]::new));
+ return optional(in.length == 0 ? null : Arrays.stream(in).map(x -> vr.resolve(x)).filter(StringUtils::isNotEmpty).toArray(String[]::new));
}
/**
@@ -179,7 +180,7 @@ public abstract class AnnotationApplier<A extends Annotation, B> {
* @return An array with resolved strings.
*/
protected Stream<String> stream(String[] in) {
- return Arrays.stream(in).map(x -> vr.resolve(x)).filter(x -> isNotEmpty(x));
+ return Arrays.stream(in).map(x -> vr.resolve(x)).filter(StringUtils::isNotEmpty);
}
/**
@@ -189,7 +190,7 @@ public abstract class AnnotationApplier<A extends Annotation, B> {
* @return An array with resolved strings.
*/
protected Stream<String> cdl(String in) {
- return Arrays.stream(split(vr.resolve(in))).filter(x -> isNotEmpty(x));
+ return Arrays.stream(split(vr.resolve(in))).filter(StringUtils::isNotEmpty);
}
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java
index 6139ff184..0ab895670 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java
@@ -39,11 +39,11 @@ public interface AnnotationProvider {
@SuppressWarnings("unchecked")
public static final AnnotationProvider DEFAULT = new AnnotationProvider() {
- private final TwoKeyConcurrentCache<Class<?>,Class<? extends Annotation>,Annotation[]> classAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, (k1,k2) -> k1.getAnnotationsByType(k2));
- private final TwoKeyConcurrentCache<Class<?>,Class<? extends Annotation>,Annotation[]> declaredClassAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, (k1,k2) -> k1.getDeclaredAnnotationsByType(k2));
- private final TwoKeyConcurrentCache<Method,Class<? extends Annotation>,Annotation[]> methodAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, (k1,k2) -> k1.getAnnotationsByType(k2));
- private final TwoKeyConcurrentCache<Field,Class<? extends Annotation>,Annotation[]> fieldAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, (k1,k2) -> k1.getAnnotationsByType(k2));
- private final TwoKeyConcurrentCache<Constructor<?>,Class<? extends Annotation>,Annotation[]> constructorAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, (k1,k2) -> k1.getAnnotationsByType(k2));
+ private final TwoKeyConcurrentCache<Class<?>,Class<? extends Annotation>,Annotation[]> classAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, Class::getAnnotationsByType);
+ private final TwoKeyConcurrentCache<Class<?>,Class<? extends Annotation>,Annotation[]> declaredClassAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, Class::getDeclaredAnnotationsByType);
+ private final TwoKeyConcurrentCache<Method,Class<? extends Annotation>,Annotation[]> methodAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, Method::getAnnotationsByType);
+ private final TwoKeyConcurrentCache<Field,Class<? extends Annotation>,Annotation[]> fieldAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, Field::getAnnotationsByType);
+ private final TwoKeyConcurrentCache<Constructor<?>,Class<? extends Annotation>,Annotation[]> constructorAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, Constructor::getAnnotationsByType);
@Override /* MetaProvider */
public <A extends Annotation> void forEachAnnotation(Class<A> type, Class<?> onClass, Predicate<A> filter, Consumer<A> action) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
index 37eeeecd6..168f7bd83 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
@@ -498,7 +498,7 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T
// Normal bean.
if (meta.dynaProperty == null) {
- forEachProperty(x -> x.canRead(), bpm -> {
+ forEachProperty(BeanPropertyMeta::canRead, bpm -> {
try {
Object val = bpm.get(this, null);
if (valueFilter.test(val))
@@ -526,7 +526,7 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T
}
});
- forEachProperty(x -> x.isDyna(), bpm -> {
+ forEachProperty(BeanPropertyMeta::isDyna, bpm -> {
try {
// TODO - This is kind of inefficient.
Map<String,Object> dynaMap = bpm.getDynaMap(bean);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
index c334d823a..0eb4c9fbe 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
@@ -55,9 +55,9 @@ public class BeanRegistry {
this.beanContext = beanContext;
this.map = new ConcurrentHashMap<>();
this.reverseMap = new ConcurrentHashMap<>();
- beanContext.getBeanDictionary().forEach(c -> addClass(c));
+ beanContext.getBeanDictionary().forEach(this::addClass);
if (parent != null)
- parent.map.forEach((k,v) -> addToMap(k, v));
+ parent.map.forEach(this::addToMap);
for (Class<?> c : classes)
addClass(c);
isEmpty = map.isEmpty();
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
index 1068d6d39..109f897c6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
@@ -447,7 +447,7 @@ public final class ClassMeta<T> implements Type {
&& x.hasReturnType(c)
&& x.hasParamTypes(String.class)
&& ArrayUtils.contains(x.getName(), fromStringMethodNames))
- ).map(x -> x.inner())
+ ).map(MethodInfo::inner)
.orElse(null);
// Find example() method if present.
@@ -457,7 +457,7 @@ public final class ClassMeta<T> implements Type {
&& x.isNotDeprecated()
&& x.hasName("example")
&& x.hasFuzzyParamTypes(BeanSession.class))
- ).map(x -> x.inner())
+ ).map(MethodInfo::inner)
.orElse(null);
ci.forEachAllField(x -> x.hasAnnotation(bc, ParentProperty.class), x -> {
@@ -521,7 +521,7 @@ public final class ClassMeta<T> implements Type {
primitiveDefault = ci.getPrimitiveDefault();
ci.forEachPublicMethod(
- x -> x.isNotDeprecated(),
+ MethodInfo::isNotDeprecated,
x -> publicMethods.put(x.getSignature(), x.inner())
);
@@ -549,7 +549,7 @@ public final class ClassMeta<T> implements Type {
if (innerClass != Object.class) {
ClassInfo x = implClass == null ? ci : ClassInfo.of(implClass);
- noArgConstructor = x.getPublicConstructor(y -> y.hasNoParams());
+ noArgConstructor = x.getPublicConstructor(ConstructorInfo::hasNoParams);
}
try {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
index c72d90569..8ab5a7790 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
@@ -842,7 +842,7 @@ public abstract class Context implements AnnotationProvider {
protected Context(Builder builder) {
init(builder);
debug = builder.debug;
- annotations = optional(builder.annotations).orElseGet(()->emptyList());
+ annotations = optional(builder.annotations).orElseGet(CollectionUtils::emptyList);
ReflectionMap.Builder<Annotation> rmb = ReflectionMap.create(Annotation.class);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
index 077cf55fd..373e5556c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
@@ -1023,7 +1023,7 @@ public class JsonList extends LinkedList<Object> {
UnmodifiableJsonList(JsonList contents) {
super();
if (contents != null)
- this.forEach(x -> super.add(x));
+ this.forEach(super::add);
}
@Override /* List */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
index 438b9ec38..3f556d7d8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
@@ -1258,7 +1258,7 @@ public class JsonMap extends LinkedHashMap<String,Object> {
* @param keys The list of keys to remove.
*/
public void removeAll(Collection<String> keys) {
- keys.forEach(x -> remove(x));
+ keys.forEach(this::remove);
}
/**
@@ -1783,7 +1783,7 @@ public class JsonMap extends LinkedHashMap<String,Object> {
UnmodifiableJsonMap(JsonMap contents) {
super();
if (contents != null)
- contents.forEach((k,v) -> super.put(k, v));
+ contents.forEach(super::put);
}
@Override
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
index efeb1a651..35a7d6afa 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
@@ -72,8 +72,8 @@ public class BasicFileFinder implements FileFinder {
this.cachingLimit = builder.cachingLimit;
this.include = builder.include;
this.exclude = builder.exclude;
- this.includePatterns = alist(include).stream().map(x->x.pattern()).toArray(String[]::new);
- this.excludePatterns = alist(exclude).stream().map(x->x.pattern()).toArray(String[]::new);
+ this.includePatterns = alist(include).stream().map(Pattern::pattern).toArray(String[]::new);
+ this.excludePatterns = alist(exclude).stream().map(Pattern::pattern).toArray(String[]::new);
this.hashCode = HashCode.of(getClass(), roots, cachingLimit, includePatterns, excludePatterns);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
index af115ad0b..5a944c836 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
@@ -330,7 +330,7 @@ public class BeanCreator<T> {
// Look for protected constructor.
if (! constructorMatch.isPresent()) {
- type.forEachDeclaredConstructor(x -> x.isProtected(), x -> {
+ type.forEachDeclaredConstructor(ConstructorInfo::isProtected, x -> {
found.setIfEmpty("PROTECTED_CONSTRUCTOR");
if (hasAllParams(x))
constructorMatch.add(x);
@@ -367,7 +367,7 @@ public class BeanCreator<T> {
} else if (found.get().equals("PUBLIC_CONSTRUCTOR")) {
msg = "Public constructor found but could not find prerequisites: " + type.getPublicConstructors().stream().map(x -> getMissingParams(x)).sorted().collect(joining(" or "));
} else {
- msg = "Protected constructor found but could not find prerequisites: " + type.getDeclaredConstructors().stream().filter(x -> x.isProtected()).map(x -> getMissingParams(x)).sorted().collect(joining(" or "));
+ msg = "Protected constructor found but could not find prerequisites: " + type.getDeclaredConstructors().stream().filter(ConstructorInfo::isProtected).map(x -> getMissingParams(x)).sorted().collect(joining(" or "));
}
throw new ExecutableException("Could not instantiate class {0}: {1}.", type.getName(), msg);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
index 96e477468..8b6c3a8b8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
@@ -701,9 +701,9 @@ public class BeanStore {
Predicate<Boolean> nf = ObjectUtils::isTrue;
return filteredMap()
.append("identity", ObjectUtils.identity(this))
- .append("entries", entries.stream().map(x -> x.properties()).collect(toList()))
+ .append("entries", entries.stream().map(BeanStoreEntry::properties).collect(toList()))
.append("outer", ObjectUtils.identity(outer.orElse(null)))
- .append("parent", parent.map(x->x.properties()).orElse(null))
+ .append("parent", parent.map(BeanStore::properties).orElse(null))
.appendIf(nf, "readOnly", readOnly)
.appendIf(nf, "threadSafe", threadSafe)
;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
index 5a24be3a9..d16f270bd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
@@ -212,7 +212,7 @@ public interface FileFinder {
*/
@FluentSetter
public Builder include(String...patterns) {
- this.include = alist(patterns).stream().map(x->Pattern.compile(x)).toArray(Pattern[]::new);
+ this.include = alist(patterns).stream().map(Pattern::compile).toArray(Pattern[]::new);
return this;
}
@@ -226,7 +226,7 @@ public interface FileFinder {
*/
@FluentSetter
public Builder exclude(String...patterns) {
- this.exclude = alist(patterns).stream().map(x->Pattern.compile(x)).toArray(Pattern[]::new);
+ this.exclude = alist(patterns).stream().map(Pattern::compile).toArray(Pattern[]::new);
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
index ec05ced78..fa3468d10 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
@@ -231,7 +231,7 @@ public final class CsvSerializerSession extends WriterSerializerSession {
if (entryType.isBean()) {
BeanMeta<?> bm = entryType.getBeanMeta();
Flag addComma = Flag.create();
- bm.forEachProperty(x -> x.canRead(), x -> {
+ bm.forEachProperty(BeanPropertyMeta::canRead, x -> {
addComma.ifSet(() -> w.w(',')).set();
w.writeEntry(x.getName());
});
@@ -239,7 +239,7 @@ public final class CsvSerializerSession extends WriterSerializerSession {
l.forEach(x -> {
Flag addComma2 = Flag.create();
BeanMap<?> bean = toBeanMap(x);
- bm.forEachProperty(y -> y.canRead(), y -> {
+ bm.forEachProperty(BeanPropertyMeta::canRead, y -> {
addComma2.ifSet(() -> w.w(',')).set();
w.writeEntry(y.get(bean, y.getName()));
});
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
index 790aa3d8c..3c30b5d41 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
@@ -283,7 +283,7 @@ public final class EncoderSet {
@Override /* Object */
public String toString() {
- return entries.stream().map(x -> toString(x)).collect(joining(",","[","]"));
+ return entries.stream().map(Builder::toString).collect(joining(",","[","]"));
}
private static String toString(Object o) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index 4366f8e03..f6a2846de 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -1666,7 +1666,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
templateBean = newInstance(template);
widgetMap = new HtmlWidgetMap();
- widgets.stream().map(x -> newInstance(x)).forEach(x -> widgetMap.append(x));
+ widgets.stream().map(this::newInstance).forEach(x -> widgetMap.append(x));
widgetArray = array(widgetMap.values(), HtmlWidget.class);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
index 7b1808c45..18e29eb69 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
@@ -665,7 +665,7 @@ public class HttpPartSchema {
Builder apply(Class<? extends Annotation> c, ParamInfo mpi) {
apply(c, mpi.getParameterType().innerType());
- mpi.forEachDeclaredAnnotation(c, x -> true, x -> apply(x));
+ mpi.forEachDeclaredAnnotation(c, x -> true, this::apply);
return this;
}
@@ -687,7 +687,7 @@ public class HttpPartSchema {
Builder apply(Class<? extends Annotation> c, java.lang.reflect.Type t) {
if (t instanceof Class<?>) {
- ClassInfo.of((Class<?>)t).forEachAnnotation(c, x -> true, x -> apply(x));
+ ClassInfo.of((Class<?>)t).forEachAnnotation(c, x -> true, this::apply);
} else if (Value.isType(t)) {
apply(c, Value.getParameterType(t));
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
index ed8a6e5fd..6bdcf31b0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
@@ -29,7 +29,7 @@ public final class ClassUtils {
/**
* Predicate check to filter out void classes.
*/
- public static final Predicate<Class<?>> NOT_VOID = x -> isNotVoid(x);
+ public static final Predicate<Class<?>> NOT_VOID = ClassUtils::isNotVoid;
/**
* Returns the class types for the specified arguments.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SystemEnv.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SystemEnv.java
index fd787ef7c..b70713d9e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SystemEnv.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SystemEnv.java
@@ -78,8 +78,8 @@ public class SystemEnv {
private static final Map<Class<?>,Function<String,?>> ENV_FUNCTIONS = new IdentityHashMap<>();
static {
- ENV_FUNCTIONS.put(Boolean.class, x -> Boolean.valueOf(x));
- ENV_FUNCTIONS.put(Charset.class, x -> Charset.forName(x));
+ ENV_FUNCTIONS.put(Boolean.class, Boolean::valueOf);
+ ENV_FUNCTIONS.put(Charset.class, Charset::forName);
}
private static final ConcurrentHashMap<String,String> PROPERTY_TO_ENV = new ConcurrentHashMap<>();
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
index dc1a7a90c..9a8a9bb34 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
@@ -174,7 +174,7 @@ public final class ParserSet {
super(copyFrom);
bcBuilder = copyFrom.bcBuilder == null ? null : copyFrom.bcBuilder.copy();
entries = list();
- copyFrom.entries.stream().map(x -> copyBuilder(x)).forEach(x -> entries.add(x));
+ copyFrom.entries.stream().map(this::copyBuilder).forEach(x -> entries.add(x));
}
private Object copyBuilder(Object o) {
@@ -316,7 +316,7 @@ public final class ParserSet {
if (o instanceof Class) {
// Check for no-arg constructor.
- ConstructorInfo ci = ClassInfo.of((Class<?>)o).getPublicConstructor(x -> x.hasNoParams());
+ ConstructorInfo ci = ClassInfo.of((Class<?>)o).getPublicConstructor(ConstructorInfo::hasNoParams);
if (ci != null)
return ci.invoke();
@@ -461,7 +461,7 @@ public final class ParserSet {
@Override /* Object */
public String toString() {
- return entries.stream().map(x -> toString(x)).collect(joining(",","[","]"));
+ return entries.stream().map(this::toString).collect(joining(",","[","]"));
}
private String toString(Object o) {
@@ -492,7 +492,7 @@ public final class ParserSet {
*/
public ParserSet(Builder builder) {
- this.entries = builder.entries.stream().map(x -> build(x)).toArray(Parser[]::new);
+ this.entries = builder.entries.stream().map(this::build).toArray(Parser[]::new);
List<MediaType> lmt = list();
List<Parser> l = list();
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
index 466b48c0f..77a1fb73c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
@@ -173,7 +173,7 @@ public final class SerializerSet {
super(copyFrom);
bcBuilder = copyFrom.bcBuilder == null ? null : copyFrom.bcBuilder.copy();
entries = list();
- copyFrom.entries.stream().map(x -> copyBuilder(x)).forEach(x -> entries.add(x));
+ copyFrom.entries.stream().map(this::copyBuilder).forEach(x -> entries.add(x));
}
private Object copyBuilder(Object o) {
@@ -312,7 +312,7 @@ public final class SerializerSet {
if (o instanceof Class) {
// Check for no-arg constructor.
- ConstructorInfo ci = ClassInfo.of((Class<?>)o).getPublicConstructor(x -> x.hasNoParams());
+ ConstructorInfo ci = ClassInfo.of((Class<?>)o).getPublicConstructor(ConstructorInfo::hasNoParams);
if (ci != null)
return ci.invoke();
@@ -461,7 +461,7 @@ public final class SerializerSet {
@Override /* Object */
public String toString() {
- return entries.stream().map(x -> toString(x)).collect(joining(",","[","]"));
+ return entries.stream().map(this::toString).collect(joining(",","[","]"));
}
private String toString(Object o) {
@@ -496,7 +496,7 @@ public final class SerializerSet {
*/
protected SerializerSet(Builder builder) {
- this.entries = builder.entries.stream().map(x -> build(x)).toArray(Serializer[]::new);
+ this.entries = builder.entries.stream().map(this::build).toArray(Serializer[]::new);
this.entriesList = ulist(entries);
List<MediaRange> lmtr = list();
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java
index 3f2c637ca..added73fc 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java
@@ -36,7 +36,7 @@ public class UrlEncodingClassMeta extends ExtendedClassMeta {
super(cm);
Value<Boolean> expandedParams = Value.empty();
- cm.forEachAnnotation(UrlEncoding.class, x -> x.expandedParams(), x -> expandedParams.set(true));
+ cm.forEachAnnotation(UrlEncoding.class, UrlEncoding::expandedParams, x -> expandedParams.set(true));
this.expandedParams = expandedParams.orElse(false);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index 74868b448..589844509 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -345,7 +345,7 @@ public class XmlSerializerSession extends WriterSerializerSession {
}
if (innerType.isBean()) {
- innerType.getBeanMeta().forEachProperty(x -> x.canRead(), x -> {
+ innerType.getBeanMeta().forEachProperty(BeanPropertyMeta::canRead, x -> {
ns.set(getXmlBeanPropertyMeta(x).getNamespace());
if (ns.isPresent() && ns.get().uri != null)
addNamespace(ns.get());
@@ -353,13 +353,13 @@ public class XmlSerializerSession extends WriterSerializerSession {
} else if (innerType.isMap()) {
((Map<?,?>)o).forEach((k,v) -> findNsfMappings(v));
} else if (innerType.isCollection()) {
- ((Collection<?>)o).forEach(x -> findNsfMappings(x));
+ ((Collection<?>)o).forEach(this::findNsfMappings);
}
} else if (aType.isMap()) {
((Map<?,?>)o).forEach((k,v) -> findNsfMappings(v));
} else if (aType.isCollection()) {
- ((Collection<?>)o).forEach(x -> findNsfMappings(x));
+ ((Collection<?>)o).forEach(this::findNsfMappings);
} else if (aType.isArray() && ! aType.getElementType().isPrimitive()) {
for (Object o2 : ((Object[])o))
findNsfMappings(o2);
diff --git a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
index 3dcbee605..ca54dca9a 100644
--- a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
+++ b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
@@ -720,11 +720,11 @@ public class JettyMicroservice extends Microservice {
}
});
- cf.get("Jetty/servletAttributes").asMap().orElse(EMPTY_MAP).forEach((k,v) -> addServletAttribute(k, v));
+ cf.get("Jetty/servletAttributes").asMap().orElse(EMPTY_MAP).forEach(this::addServletAttribute);
builder.servlets.forEach((k,v) -> addServlet(v, k));
- builder.servletAttributes.forEach((k,v) -> addServletAttribute(k, v));
+ builder.servletAttributes.forEach(this::addServletAttribute);
if (System.getProperty("juneau.serverPort") == null)
System.setProperty("juneau.serverPort", String.valueOf(availablePort));
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
index 641e07f96..b0068faed 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
@@ -711,7 +711,7 @@ public class ResponseContent implements HttpEntity {
// Some HTTP responses have no body, so try to create these beans if they've got no-arg constructors.
if (t == null && ! type.is(String.class)) {
- ConstructorInfo c = type.getInfo().getPublicConstructor(x -> x.hasNoParams());
+ ConstructorInfo c = type.getInfo().getPublicConstructor(ConstructorInfo::hasNoParams);
if (c != null) {
try {
return c.<T>invoke();
@@ -874,7 +874,7 @@ public class ResponseContent implements HttpEntity {
* {@link Future Futures}.
*/
public Future<String> asStringFuture() throws RestCallException {
- return client.getExecutorService().submit(() -> asString());
+ return client.getExecutorService().submit(this::asString);
}
/**
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 0c243bf2d..7770574e2 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -2636,7 +2636,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
@FluentSetter
public Builder debug() {
super.debug();
- serializers().forEach(x -> x.debug());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::debug);
return headers(Debug.TRUE);
}
@@ -4068,7 +4068,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder detectRecursions() {
- serializers().forEach(x -> x.detectRecursions());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::detectRecursions);
return this;
}
@@ -4121,7 +4121,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder ignoreRecursions() {
- serializers().forEach(x -> x.ignoreRecursions());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::ignoreRecursions);
return this;
}
@@ -4261,7 +4261,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder addBeanTypes() {
- serializers().forEach(x -> x.addBeanTypes());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::addBeanTypes);
return this;
}
@@ -4315,7 +4315,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder addRootType() {
- serializers().forEach(x -> x.addRootType());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::addRootType);
return this;
}
@@ -4357,7 +4357,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder keepNullProperties() {
- serializers().forEach(x -> x.keepNullProperties());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::keepNullProperties);
return this;
}
@@ -4396,7 +4396,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder sortCollections() {
- serializers().forEach(x -> x.sortCollections());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::sortCollections);
return this;
}
@@ -4435,7 +4435,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder sortMaps() {
- serializers().forEach(x -> x.sortMaps());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::sortMaps);
return this;
}
@@ -4481,7 +4481,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder trimEmptyCollections() {
- serializers().forEach(x -> x.trimEmptyCollections());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::trimEmptyCollections);
return this;
}
@@ -4526,7 +4526,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder trimEmptyMaps() {
- serializers().forEach(x -> x.trimEmptyMaps());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::trimEmptyMaps);
return this;
}
@@ -4562,7 +4562,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder trimStringsOnWrite() {
- serializers().forEach(x -> x.trimStrings());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::trimStrings);
return this;
}
@@ -4814,7 +4814,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder sq() {
- serializers().forEachWS(x -> x.sq());
+ serializers().forEachWS(org.apache.juneau.serializer.WriterSerializer.Builder::sq);
return this;
}
@@ -4851,7 +4851,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder useWhitespace() {
- serializers().forEachWS(x -> x.useWhitespace());
+ serializers().forEachWS(org.apache.juneau.serializer.WriterSerializer.Builder::useWhitespace);
return this;
}
@@ -4889,7 +4889,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder ws() {
- serializers().forEachWS(x -> x.ws());
+ serializers().forEachWS(org.apache.juneau.serializer.WriterSerializer.Builder::ws);
return this;
}
@@ -5006,7 +5006,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder strict() {
- parsers().forEach(x -> x.strict());
+ parsers().forEach(org.apache.juneau.parser.Parser.Builder::strict);
return this;
}
@@ -5044,7 +5044,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder trimStringsOnRead() {
- parsers().forEach(x -> x.trimStrings());
+ parsers().forEach(org.apache.juneau.parser.Parser.Builder::trimStrings);
return this;
}
@@ -5270,7 +5270,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder paramFormatPlain() {
- serializers().forEach(UonSerializer.Builder.class, x -> x.paramFormatPlain());
+ serializers().forEach(UonSerializer.Builder.class, org.apache.juneau.uon.UonSerializer.Builder::paramFormatPlain);
return this;
}
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
index db263db99..bb11a3648 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
@@ -1975,7 +1975,7 @@ public class RestRequest extends BeanSession implements HttpUriRequest, Configur
c = ci.getPublicConstructor(x -> x.hasParamTypes(String.class,Throwable.class));
if (c != null)
throw c.<Throwable>invoke(message != null ? message : response.getContent().asString(), null);
- c = ci.getPublicConstructor(x -> x.hasNoParams());
+ c = ci.getPublicConstructor(ConstructorInfo::hasNoParams);
if (c != null)
throw c.<Throwable>invoke();
}
@@ -2026,7 +2026,7 @@ public class RestRequest extends BeanSession implements HttpUriRequest, Configur
* @throws RestCallException If the executor service was not defined.
*/
public Future<RestResponse> runFuture() throws RestCallException {
- return client.getExecutorService().submit(() -> run());
+ return client.getExecutorService().submit(this::run);
}
/**
@@ -2078,7 +2078,7 @@ public class RestRequest extends BeanSession implements HttpUriRequest, Configur
*/
public Future<RestResponse> completeFuture() throws RestCallException {
return client.getExecutorService().submit(
- () -> complete()
+ this::complete
);
}
diff --git a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
index 75830269c..2a215f22e 100644
--- a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
+++ b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
@@ -175,7 +175,7 @@ public class HeaderList extends ControlledArrayList<Header> {
*/
public HeaderList setDefault(List<Header> headers) {
if (headers != null)
- headers.stream().filter(x -> x != null && ! contains(x.getName())).forEach(x -> set(x));
+ headers.stream().filter(x -> x != null && ! contains(x.getName())).forEach(this::set);
return this;
}
@@ -350,7 +350,7 @@ public class HeaderList extends ControlledArrayList<Header> {
@FluentSetter
public HeaderList append(List<Header> values) {
if (values != null)
- values.forEach(x -> append(x));
+ values.forEach(this::append);
return this;
}
@@ -459,7 +459,7 @@ public class HeaderList extends ControlledArrayList<Header> {
@FluentSetter
public HeaderList remove(List<Header> values) {
if (values != null)
- values.forEach(x -> remove(x));
+ values.forEach(this::remove);
return this;
}
@@ -833,7 +833,7 @@ public class HeaderList extends ControlledArrayList<Header> {
* @return An array containing all values. Never <jk>null</jk>.
*/
public String[] getValues(String name) {
- return stream().filter(x -> eq(x.getName(), name)).map(x -> x.getValue()).toArray(String[]::new);
+ return stream().filter(x -> eq(x.getName(), name)).map(Header::getValue).toArray(String[]::new);
}
/**
diff --git a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
index 11094c64f..ae0429e16 100644
--- a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
+++ b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
@@ -161,7 +161,7 @@ public class PartList extends ControlledArrayList<NameValuePair> {
*/
public PartList setDefault(List<NameValuePair> parts) {
if (parts != null)
- parts.stream().filter(x -> x != null && ! contains(x.getName())).forEach(x -> set(x));
+ parts.stream().filter(x -> x != null && ! contains(x.getName())).forEach(this::set);
return this;
}
@@ -335,7 +335,7 @@ public class PartList extends ControlledArrayList<NameValuePair> {
@FluentSetter
public PartList append(List<NameValuePair> values) {
if (values != null)
- values.forEach(x -> append(x));
+ values.forEach(this::append);
return this;
}
@@ -444,7 +444,7 @@ public class PartList extends ControlledArrayList<NameValuePair> {
@FluentSetter
public PartList remove(List<NameValuePair> values) {
if (values != null)
- values.forEach(x -> remove(x));
+ values.forEach(this::remove);
return this;
}
@@ -807,7 +807,7 @@ public class PartList extends ControlledArrayList<NameValuePair> {
* @return An array containing all values. Never <jk>null</jk>.
*/
public String[] getValues(String name) {
- return stream().filter(x -> eq(x.getName(), name)).map(x -> x.getValue()).toArray(String[]::new);
+ return stream().filter(x -> eq(x.getName(), name)).map(NameValuePair::getValue).toArray(String[]::new);
}
/**
diff --git a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
index e9e5715e4..50893e5a1 100644
--- a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
+++ b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
@@ -980,8 +980,8 @@ public class MockServletRequest implements HttpServletRequest {
if (req instanceof MockRestRequest) {
MockRestRequest mreq = (MockRestRequest)req;
- mreq.getAttributeMap().forEach((k,v) -> attribute(k, v));
- mreq.getRequestDispatcherMap().forEach((k,v) -> requestDispatcher(k, v));
+ mreq.getAttributeMap().forEach(this::attribute);
+ mreq.getRequestDispatcherMap().forEach(this::requestDispatcher);
if (mreq.getCharacterEncoding() != null)
characterEncoding(mreq.getCharacterEncoding());
if (mreq.getProtocol() != null)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index 77e297746..b41c6782e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -51,6 +51,7 @@ import org.apache.juneau.encoders.*;
import org.apache.juneau.html.*;
import org.apache.juneau.html.annotation.*;
import org.apache.juneau.httppart.*;
+import org.apache.juneau.httppart.HttpPartSerializer.Creator;
import org.apache.juneau.internal.*;
import org.apache.juneau.jsonschema.*;
import org.apache.juneau.oapi.*;
@@ -2246,7 +2247,7 @@ public class RestContext extends Context {
// Replace with builder from bean store.
beanStore
.getBean(BeanContext.Builder.class)
- .map(x -> x.copy())
+ .map(BeanContext.Builder::copy)
.ifPresent(x -> v.set(x));
// Replace with bean from bean store.
@@ -2360,7 +2361,7 @@ public class RestContext extends Context {
// Replace with builder from bean store.
beanStore
.getBean(HttpPartSerializer.Creator.class)
- .map(x -> x.copy())
+ .map(Creator::copy)
.ifPresent(x -> v.set(x));
// Replace with bean from bean store.
@@ -2490,7 +2491,7 @@ public class RestContext extends Context {
// Replace with builder from bean store.
beanStore
.getBean(HttpPartParser.Creator.class)
- .map(x -> x.copy())
+ .map(HttpPartParser.Creator::copy)
.ifPresent(x -> v.set(x));
// Replace with bean from bean store.
@@ -2618,7 +2619,7 @@ public class RestContext extends Context {
// Replace with builder from bean store.
beanStore
.getBean(JsonSchemaGenerator.Builder.class)
- .map(x -> x.copy())
+ .map(JsonSchemaGenerator.Builder::copy)
.ifPresent(x -> v.set(x));
// Replace with bean from bean store.
@@ -3471,7 +3472,7 @@ public class RestContext extends Context {
// Default value.
Value<MethodList> v = Value.of(
- getAnnotatedMethods(resource, RestPostInit.class, x -> x.childFirst())
+ getAnnotatedMethods(resource, RestPostInit.class, RestPostInit::childFirst)
);
// Replace with bean from: @RestInject(name="postInitChildFirstMethods") public [static] MethodList xxx(<args>)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
index c0ad67513..65943134c 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
@@ -44,9 +44,9 @@ import org.apache.juneau.http.header.*;
import org.apache.juneau.http.part.*;
import org.apache.juneau.http.remote.*;
import org.apache.juneau.httppart.*;
+import org.apache.juneau.httppart.HttpPartSerializer.Creator;
import org.apache.juneau.httppart.bean.*;
import org.apache.juneau.internal.*;
-import org.apache.juneau.internal.HttpUtils;
import org.apache.juneau.jsonschema.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.parser.ParseException;
@@ -330,14 +330,14 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
.of(beanStore, resource)
.addBean(BeanContext.Builder.class, v.get())
.createMethodFinder(BeanContext.class, resource)
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
}
Optional<BeanContext> getBeanContext() {
- return optional(beanContext).map(x -> x.build());
+ return optional(beanContext).map(BeanContext.Builder::build);
}
//-----------------------------------------------------------------------------------------------------------------
@@ -413,14 +413,14 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
.of(beanStore, resource)
.addBean(EncoderSet.Builder.class, v.get())
.createMethodFinder(EncoderSet.class, resource)
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
}
Optional<EncoderSet> getEncoders() {
- return optional(encoders).map(x -> x.build());
+ return optional(encoders).map(EncoderSet.Builder::build);
}
//-----------------------------------------------------------------------------------------------------------------
@@ -496,14 +496,14 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
.of(beanStore, resource)
.addBean(SerializerSet.Builder.class, v.get())
.createMethodFinder(SerializerSet.class, resource)
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
}
Optional<SerializerSet> getSerializers() {
- return optional(serializers).map(x -> x.build());
+ return optional(serializers).map(SerializerSet.Builder::build);
}
//-----------------------------------------------------------------------------------------------------------------
@@ -579,14 +579,14 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
.of(beanStore, resource)
.addBean(ParserSet.Builder.class, v.get())
.createMethodFinder(ParserSet.class, resource)
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
}
Optional<ParserSet> getParsers() {
- return optional(parsers).map(x -> x.build());
+ return optional(parsers).map(ParserSet.Builder::build);
}
//-----------------------------------------------------------------------------------------------------------------
@@ -661,14 +661,14 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
.of(beanStore, resource)
.addBean(HttpPartSerializer.Creator.class, v.get())
.createMethodFinder(HttpPartSerializer.class, resource)
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
}
Optional<HttpPartSerializer> getPartSerializer() {
- return optional(partSerializer).map(x -> x.create());
+ return optional(partSerializer).map(Creator::create);
}
//-----------------------------------------------------------------------------------------------------------------
@@ -743,14 +743,14 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
.of(beanStore, resource)
.addBean(HttpPartParser.Creator.class, v.get())
.createMethodFinder(HttpPartParser.class, resource)
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
}
Optional<HttpPartParser> getPartParser() {
- return optional(partParser).map(x -> x.create());
+ return optional(partParser).map(org.apache.juneau.httppart.HttpPartParser.Creator::create);
}
//-----------------------------------------------------------------------------------------------------------------
@@ -825,14 +825,14 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
.of(beanStore, resource)
.addBean(JsonSchemaGenerator.Builder.class, v.get())
.createMethodFinder(JsonSchemaGenerator.class, resource)
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
}
Optional<JsonSchemaGenerator> getJsonSchemaGenerator() {
- return optional(jsonSchemaGenerator).map(x -> x.build());
+ return optional(jsonSchemaGenerator).map(JsonSchemaGenerator.Builder::build);
}
//-----------------------------------------------------------------------------------------------------------------
@@ -984,7 +984,7 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
beanStore
.createMethodFinder(RestConverterList.class)
.addBean(RestConverterList.Builder.class, v.get())
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
@@ -1092,7 +1092,7 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
beanStore
.createMethodFinder(RestGuardList.class)
.addBean(RestGuardList.Builder.class, v.get())
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
@@ -1100,7 +1100,7 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
RestGuardList getGuards() {
RestGuardList.Builder b = guards();
- Set<String> roleGuard = optional(this.roleGuard).orElseGet(()->set());
+ Set<String> roleGuard = optional(this.roleGuard).orElseGet(CollectionUtils::set);
for (String rg : roleGuard) {
try {
@@ -1241,7 +1241,7 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
beanStore
.createMethodFinder(RestMatcherList.class)
.addBean(RestMatcherList.Builder.class, v.get())
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
@@ -1308,7 +1308,7 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
beanStore
.createMethodFinder(UrlPathMatcherList.class, resource().get())
.addBean(UrlPathMatcherList.class, v.get())
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.set(x));
return v.get();
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
index 2699b2efe..0f3a8f471 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
@@ -12,7 +12,6 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import java.lang.annotation.*;
import java.nio.charset.*;
@@ -21,6 +20,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.encoders.*;
+import org.apache.juneau.http.HttpHeaders;
import org.apache.juneau.httppart.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
@@ -1013,11 +1013,11 @@ public class RestAnnotation {
type(a.partParser()).ifPresent(x -> b.partParser().type(x));
stream(a.produces()).map(MediaType::of).forEach(x -> b.produces(x));
stream(a.consumes()).map(MediaType::of).forEach(x -> b.consumes(x));
- stream(a.defaultRequestAttributes()).map(x -> BasicNamedAttribute.ofPair(x)).forEach(x -> b.defaultRequestAttributes(x));
- stream(a.defaultRequestHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultRequestHeaders(x));
- stream(a.defaultResponseHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultResponseHeaders(x));
- string(a.defaultAccept()).map(x -> accept(x)).ifPresent(x -> b.defaultRequestHeaders(x));
- string(a.defaultContentType()).map(x -> contentType(x)).ifPresent(x -> b.defaultRequestHeaders(x));
+ stream(a.defaultRequestAttributes()).map(BasicNamedAttribute::ofPair).forEach(x -> b.defaultRequestAttributes(x));
+ stream(a.defaultRequestHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultRequestHeaders(x));
+ stream(a.defaultResponseHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultResponseHeaders(x));
+ string(a.defaultAccept()).map(HttpHeaders::accept).ifPresent(x -> b.defaultRequestHeaders(x));
+ string(a.defaultContentType()).map(HttpHeaders::contentType).ifPresent(x -> b.defaultRequestHeaders(x));
b.responseProcessors().add(a.responseProcessors());
b.children((Object[])a.children());
b.restOpArgs(a.restOpArgs());
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
index c6dc53127..065afa293 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
@@ -12,16 +12,15 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
-import static org.apache.juneau.http.HttpParts.*;
-
import java.lang.annotation.*;
import java.nio.charset.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
+import org.apache.juneau.http.HttpHeaders;
+import org.apache.juneau.http.HttpParts;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.guard.*;
@@ -458,11 +457,11 @@ public class RestDeleteAnnotation {
b.httpMethod("delete");
classes(a.encoders()).ifPresent(x -> b.encoders().set(x));
- stream(a.defaultRequestHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultRequestHeaders().setDefault(x));
- stream(a.defaultResponseHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultResponseHeaders().setDefault(x));
- stream(a.defaultRequestAttributes()).map(x -> BasicNamedAttribute.ofPair(x)).forEach(x -> b.defaultRequestAttributes().add(x));
- stream(a.defaultRequestQueryData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestQueryData().setDefault(x));
- string(a.defaultAccept()).map(x -> accept(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultRequestHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultResponseHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultResponseHeaders().setDefault(x));
+ stream(a.defaultRequestAttributes()).map(BasicNamedAttribute::ofPair).forEach(x -> b.defaultRequestAttributes().add(x));
+ stream(a.defaultRequestQueryData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestQueryData().setDefault(x));
+ string(a.defaultAccept()).map(HttpHeaders::accept).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
b.guards().append(a.guards());
b.matchers().append(a.matchers());
string(a.clientVersion()).ifPresent(x -> b.clientVersion(x));
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
index 05c142e67..101d77d85 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
@@ -12,16 +12,15 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
-import static org.apache.juneau.http.HttpParts.*;
-
import java.lang.annotation.*;
import java.nio.charset.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
+import org.apache.juneau.http.HttpHeaders;
+import org.apache.juneau.http.HttpParts;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.converter.*;
@@ -517,11 +516,11 @@ public class RestGetAnnotation {
classes(a.serializers()).ifPresent(x -> b.serializers().set(x));
classes(a.encoders()).ifPresent(x -> b.encoders().set(x));
stream(a.produces()).map(MediaType::of).forEach(x -> b.produces(x));
- stream(a.defaultRequestHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultRequestHeaders().setDefault(x));
- stream(a.defaultResponseHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultResponseHeaders().setDefault(x));
- stream(a.defaultRequestAttributes()).map(x -> BasicNamedAttribute.ofPair(x)).forEach(x -> b.defaultRequestAttributes().add(x));
- stream(a.defaultRequestQueryData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestQueryData().setDefault(x));
- string(a.defaultAccept()).map(x -> accept(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultRequestHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultResponseHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultResponseHeaders().setDefault(x));
+ stream(a.defaultRequestAttributes()).map(BasicNamedAttribute::ofPair).forEach(x -> b.defaultRequestAttributes().add(x));
+ stream(a.defaultRequestQueryData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestQueryData().setDefault(x));
+ string(a.defaultAccept()).map(HttpHeaders::accept).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
b.converters().append(a.converters());
b.guards().append(a.guards());
b.matchers().append(a.matchers());
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
index 9a6a5e172..7ede73063 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
@@ -12,10 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
-import static org.apache.juneau.http.HttpParts.*;
-
import java.lang.annotation.*;
import java.nio.charset.*;
import java.util.function.*;
@@ -24,6 +21,8 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.common.internal.*;
import org.apache.juneau.encoders.*;
+import org.apache.juneau.http.HttpHeaders;
+import org.apache.juneau.http.HttpParts;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.converter.*;
@@ -628,13 +627,13 @@ public class RestOpAnnotation {
classes(a.encoders()).ifPresent(x -> b.encoders().set(x));
stream(a.produces()).map(MediaType::of).forEach(x -> b.produces(x));
stream(a.consumes()).map(MediaType::of).forEach(x -> b.consumes(x));
- stream(a.defaultRequestHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultRequestHeaders().setDefault(x));
- stream(a.defaultResponseHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultResponseHeaders().setDefault(x));
- stream(a.defaultRequestAttributes()).map(x -> BasicNamedAttribute.ofPair(x)).forEach(x -> b.defaultRequestAttributes().add(x));
- stream(a.defaultRequestQueryData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestQueryData().setDefault(x));
- stream(a.defaultRequestFormData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestFormData().setDefault(x));
- string(a.defaultAccept()).map(x -> accept(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
- string(a.defaultContentType()).map(x -> contentType(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultRequestHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultResponseHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultResponseHeaders().setDefault(x));
+ stream(a.defaultRequestAttributes()).map(BasicNamedAttribute::ofPair).forEach(x -> b.defaultRequestAttributes().add(x));
+ stream(a.defaultRequestQueryData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestQueryData().setDefault(x));
+ stream(a.defaultRequestFormData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestFormData().setDefault(x));
+ string(a.defaultAccept()).map(HttpHeaders::accept).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ string(a.defaultContentType()).map(HttpHeaders::contentType).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
b.converters().append(a.converters());
b.guards().append(a.guards());
b.matchers().append(a.matchers());
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java
index 0af1993f7..e6659a4d1 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java
@@ -12,16 +12,15 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
-import static org.apache.juneau.http.HttpParts.*;
-
import java.lang.annotation.*;
import java.nio.charset.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
+import org.apache.juneau.http.HttpHeaders;
+import org.apache.juneau.http.HttpParts;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.converter.*;
@@ -517,11 +516,11 @@ public class RestOptionsAnnotation {
classes(a.serializers()).ifPresent(x -> b.serializers().set(x));
classes(a.encoders()).ifPresent(x -> b.encoders().set(x));
stream(a.produces()).map(MediaType::of).forEach(x -> b.produces(x));
- stream(a.defaultRequestHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultRequestHeaders().setDefault(x));
- stream(a.defaultResponseHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultResponseHeaders().setDefault(x));
- stream(a.defaultRequestAttributes()).map(x -> BasicNamedAttribute.ofPair(x)).forEach(x -> b.defaultRequestAttributes().add(x));
- stream(a.defaultRequestQueryData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestQueryData().setDefault(x));
- string(a.defaultAccept()).map(x -> accept(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultRequestHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultResponseHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultResponseHeaders().setDefault(x));
+ stream(a.defaultRequestAttributes()).map(BasicNamedAttribute::ofPair).forEach(x -> b.defaultRequestAttributes().add(x));
+ stream(a.defaultRequestQueryData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestQueryData().setDefault(x));
+ string(a.defaultAccept()).map(HttpHeaders::accept).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
b.converters().append(a.converters());
b.guards().append(a.guards());
b.matchers().append(a.matchers());
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
index a1649fc20..221b8382e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
@@ -12,16 +12,15 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
-import static org.apache.juneau.http.HttpParts.*;
-
import java.lang.annotation.*;
import java.nio.charset.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
+import org.apache.juneau.http.HttpHeaders;
+import org.apache.juneau.http.HttpParts;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.converter.*;
@@ -606,13 +605,13 @@ public class RestPatchAnnotation {
classes(a.encoders()).ifPresent(x -> b.encoders().set(x));
stream(a.produces()).map(MediaType::of).forEach(x -> b.produces(x));
stream(a.consumes()).map(MediaType::of).forEach(x -> b.consumes(x));
- stream(a.defaultRequestHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultRequestHeaders().setDefault(x));
- stream(a.defaultResponseHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultResponseHeaders().setDefault(x));
- stream(a.defaultRequestAttributes()).map(x -> BasicNamedAttribute.ofPair(x)).forEach(x -> b.defaultRequestAttributes().add(x));
- stream(a.defaultRequestQueryData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestQueryData().setDefault(x));
- stream(a.defaultRequestFormData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestFormData().setDefault(x));
- string(a.defaultAccept()).map(x -> accept(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
- string(a.defaultContentType()).map(x -> contentType(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultRequestHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultResponseHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultResponseHeaders().setDefault(x));
+ stream(a.defaultRequestAttributes()).map(BasicNamedAttribute::ofPair).forEach(x -> b.defaultRequestAttributes().add(x));
+ stream(a.defaultRequestQueryData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestQueryData().setDefault(x));
+ stream(a.defaultRequestFormData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestFormData().setDefault(x));
+ string(a.defaultAccept()).map(HttpHeaders::accept).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ string(a.defaultContentType()).map(HttpHeaders::contentType).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
b.converters().append(a.converters());
b.guards().append(a.guards());
b.matchers().append(a.matchers());
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
index 56197e2e3..3e1e48115 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
@@ -12,16 +12,15 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
-import static org.apache.juneau.http.HttpParts.*;
-
import java.lang.annotation.*;
import java.nio.charset.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
+import org.apache.juneau.http.HttpHeaders;
+import org.apache.juneau.http.HttpParts;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.converter.*;
@@ -606,13 +605,13 @@ public class RestPostAnnotation {
classes(a.encoders()).ifPresent(x -> b.encoders().set(x));
stream(a.produces()).map(MediaType::of).forEach(x -> b.produces(x));
stream(a.consumes()).map(MediaType::of).forEach(x -> b.consumes(x));
- stream(a.defaultRequestHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultRequestHeaders().setDefault(x));
- stream(a.defaultResponseHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultResponseHeaders().setDefault(x));
- stream(a.defaultRequestAttributes()).map(x -> BasicNamedAttribute.ofPair(x)).forEach(x -> b.defaultRequestAttributes().add(x));
- stream(a.defaultRequestQueryData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestQueryData().setDefault(x));
- stream(a.defaultRequestFormData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestFormData().setDefault(x));
- string(a.defaultAccept()).map(x -> accept(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
- string(a.defaultContentType()).map(x -> contentType(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultRequestHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultResponseHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultResponseHeaders().setDefault(x));
+ stream(a.defaultRequestAttributes()).map(BasicNamedAttribute::ofPair).forEach(x -> b.defaultRequestAttributes().add(x));
+ stream(a.defaultRequestQueryData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestQueryData().setDefault(x));
+ stream(a.defaultRequestFormData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestFormData().setDefault(x));
+ string(a.defaultAccept()).map(HttpHeaders::accept).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ string(a.defaultContentType()).map(HttpHeaders::contentType).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
b.converters().append(a.converters());
b.guards().append(a.guards());
b.matchers().append(a.matchers());
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
index 51ccd334f..96301fa75 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
@@ -12,16 +12,15 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
-import static org.apache.juneau.http.HttpParts.*;
-
import java.lang.annotation.*;
import java.nio.charset.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
+import org.apache.juneau.http.HttpHeaders;
+import org.apache.juneau.http.HttpParts;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.converter.*;
@@ -606,13 +605,13 @@ public class RestPutAnnotation {
classes(a.encoders()).ifPresent(x -> b.encoders().set(x));
stream(a.produces()).map(MediaType::of).forEach(x -> b.produces(x));
stream(a.consumes()).map(MediaType::of).forEach(x -> b.consumes(x));
- stream(a.defaultRequestHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultRequestHeaders().setDefault(x));
- stream(a.defaultResponseHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultResponseHeaders().setDefault(x));
- stream(a.defaultRequestAttributes()).map(x -> BasicNamedAttribute.ofPair(x)).forEach(x -> b.defaultRequestAttributes().add(x));
- stream(a.defaultRequestQueryData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestQueryData().setDefault(x));
- stream(a.defaultRequestFormData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestFormData().setDefault(x));
- string(a.defaultAccept()).map(x -> accept(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
- string(a.defaultContentType()).map(x -> contentType(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultRequestHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultResponseHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultResponseHeaders().setDefault(x));
+ stream(a.defaultRequestAttributes()).map(BasicNamedAttribute::ofPair).forEach(x -> b.defaultRequestAttributes().add(x));
+ stream(a.defaultRequestQueryData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestQueryData().setDefault(x));
+ stream(a.defaultRequestFormData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestFormData().setDefault(x));
+ string(a.defaultAccept()).map(HttpHeaders::accept).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ string(a.defaultContentType()).map(HttpHeaders::contentType).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
b.converters().append(a.converters());
b.guards().append(a.guards());
b.matchers().append(a.matchers());
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasFormDataArg.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasFormDataArg.java
index c90863f1f..a1fda33f1 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasFormDataArg.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasFormDataArg.java
@@ -65,7 +65,7 @@ public class HasFormDataArg implements RestOpArg {
*/
protected HasFormDataArg(ParamInfo pi) {
Value<String> _name = Value.empty();
- pi.forEachAnnotation(HasFormData.class, x -> hasName(x), x -> _name.set(getName(x)));
+ pi.forEachAnnotation(HasFormData.class, HasFormDataArg::hasName, x -> _name.set(getName(x)));
this.name = _name.orElseThrow(() -> new ArgException(pi, "@HasFormData used without name or value"));
this.type = pi.getParameterType().innerType();
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasQueryArg.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasQueryArg.java
index e4ef65020..dd3f6696b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasQueryArg.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasQueryArg.java
@@ -66,7 +66,7 @@ public class HasQueryArg implements RestOpArg {
*/
protected HasQueryArg(ParamInfo pi) {
Value<String> _name = Value.empty();
- pi.forEachAnnotation(HasQuery.class, x -> hasName(x), x -> _name.set(getName(x)));
+ pi.forEachAnnotation(HasQuery.class, HasQueryArg::hasName, x -> _name.set(getName(x)));
this.name = _name.orElseThrow(() -> new ArgException(pi, "@HasQuery used without name or value"));
this.type = pi.getParameterType().innerType();
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletRequestArgs.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletRequestArgs.java
index 3f4d9221e..22187e242 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletRequestArgs.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletRequestArgs.java
@@ -46,15 +46,15 @@ public class HttpServletRequestArgs extends SimpleRestOperationArg {
*/
public static HttpServletRequestArgs create(ParamInfo paramInfo) {
if (paramInfo.isType(AsyncContext.class))
- return new HttpServletRequestArgs(x->x.getAsyncContext());
+ return new HttpServletRequestArgs(HttpServletRequest::getAsyncContext);
if (paramInfo.isType(CookieList.class))
return new HttpServletRequestArgs(x->CookieList.of(x.getCookies()));
if (paramInfo.isType(DispatcherType.class))
- return new HttpServletRequestArgs(x->x.getDispatcherType());
+ return new HttpServletRequestArgs(HttpServletRequest::getDispatcherType);
if (paramInfo.isType(HttpServletRequest.class))
return new HttpServletRequestArgs(x->x);
if (paramInfo.isType(Principal.class))
- return new HttpServletRequestArgs(x->x.getUserPrincipal());
+ return new HttpServletRequestArgs(HttpServletRequest::getUserPrincipal);
return null;
}
@@ -65,6 +65,6 @@ public class HttpServletRequestArgs extends SimpleRestOperationArg {
* @param function The function for finding the arg.
*/
protected <T> HttpServletRequestArgs(ThrowingFunction<HttpServletRequest,T> function) {
- super((session)->function.apply(session.getRequest().getHttpServletRequest()));
+ super(session -> function.apply(session.getRequest().getHttpServletRequest()));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletResponseArgs.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletResponseArgs.java
index e77a20016..02e8291d0 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletResponseArgs.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletResponseArgs.java
@@ -50,6 +50,6 @@ public class HttpServletResponseArgs extends SimpleRestOperationArg {
* @param function The function for finding the arg.
*/
protected <T> HttpServletResponseArgs(ThrowingFunction<HttpServletResponse,T> function) {
- super((session)->function.apply(session.getRestSession().getResponse()));
+ super(session -> function.apply(session.getRestSession().getResponse()));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpSessionArgs.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpSessionArgs.java
index 04ac36a53..8dacbe3b0 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpSessionArgs.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpSessionArgs.java
@@ -50,6 +50,6 @@ public class HttpSessionArgs extends SimpleRestOperationArg {
* @param function The function for finding the arg.
*/
protected <T> HttpSessionArgs(ThrowingFunction<HttpSession,T> function) {
- super((session)->function.apply(session.getRestSession().getRequest().getSession()));
+ super(session -> function.apply(session.getRestSession().getRequest().getSession()));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/InputStreamParserArg.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/InputStreamParserArg.java
index d91cbedb7..e6411b098 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/InputStreamParserArg.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/InputStreamParserArg.java
@@ -53,6 +53,6 @@ public class InputStreamParserArg extends SimpleRestOperationArg {
* Constructor.
*/
protected InputStreamParserArg() {
- super((opSession)->opSession.getRequest().getContent().getParserMatch().map(ParserMatch::getParser).filter(InputStreamParser.class::isInstance).orElse(null));
+ super(opSession -> opSession.getRequest().getContent().getParserMatch().map(ParserMatch::getParser).filter(InputStreamParser.class::isInstance).orElse(null));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ParserArg.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ParserArg.java
index 80923272f..76eb516de 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ParserArg.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ParserArg.java
@@ -53,6 +53,6 @@ public class ParserArg extends SimpleRestOperationArg {
* Constructor.
*/
protected ParserArg() {
- super((opSession)->opSession.getRequest().getContent().getParserMatch().map(ParserMatch::getParser).orElse(null));
+ super(opSession -> opSession.getRequest().getContent().getParserMatch().map(ParserMatch::getParser).orElse(null));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ReaderParserArg.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ReaderParserArg.java
index b0afb5668..c59275d20 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ReaderParserArg.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ReaderParserArg.java
@@ -53,6 +53,6 @@ public class ReaderParserArg extends SimpleRestOperationArg {
* Constructor.
*/
protected ReaderParserArg() {
- super((opSession)->opSession.getRequest().getContent().getParserMatch().map(ParserMatch::getParser).filter(ReaderParser.class::isInstance).orElse(null));
+ super(opSession -> opSession.getRequest().getContent().getParserMatch().map(ParserMatch::getParser).filter(ReaderParser.class::isInstance).orElse(null));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestContextArgs.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestContextArgs.java
index 7863d2947..fa28ab0fc 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestContextArgs.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestContextArgs.java
@@ -61,31 +61,31 @@ public class RestContextArgs extends SimpleRestOperationArg {
*/
public static RestContextArgs create(ParamInfo paramInfo) {
if (paramInfo.isType(BeanContext.class))
- return new RestContextArgs(x->x.getBeanContext());
+ return new RestContextArgs(RestContext::getBeanContext);
if (paramInfo.isType(Config.class))
- return new RestContextArgs(x->x.getConfig());
+ return new RestContextArgs(RestContext::getConfig);
if (paramInfo.isType(DebugEnablement.class))
- return new RestContextArgs(x->x.getDebugEnablement());
+ return new RestContextArgs(RestContext::getDebugEnablement);
if (paramInfo.isType(EncoderSet.class))
- return new RestContextArgs(x->x.getEncoders());
+ return new RestContextArgs(RestContext::getEncoders);
if (paramInfo.isType(Logger.class))
- return new RestContextArgs(x->x.getLogger());
+ return new RestContextArgs(RestContext::getLogger);
if (paramInfo.isType(MethodExecStore.class))
- return new RestContextArgs(x->x.getMethodExecStore());
+ return new RestContextArgs(RestContext::getMethodExecStore);
if (paramInfo.isType(RestChildren.class))
- return new RestContextArgs(x->x.getRestChildren());
+ return new RestContextArgs(RestContext::getRestChildren);
if (paramInfo.isType(RestContext.class))
return new RestContextArgs(x->x);
if (paramInfo.isType(RestContextStats.class))
- return new RestContextArgs(x->x.getStats());
+ return new RestContextArgs(RestContext::getStats);
if (paramInfo.isType(CallLogger.class))
- return new RestContextArgs(x->x.getCallLogger());
+ return new RestContextArgs(RestContext::getCallLogger);
if (paramInfo.isType(RestOperations.class))
- return new RestContextArgs(x->x.getRestOperations());
+ return new RestContextArgs(RestContext::getRestOperations);
if (paramInfo.isType(StaticFiles.class))
- return new RestContextArgs(x->x.getStaticFiles());
+ return new RestContextArgs(RestContext::getStaticFiles);
if (paramInfo.isType(ThrownStore.class))
- return new RestContextArgs(x->x.getThrownStore());
+ return new RestContextArgs(RestContext::getThrownStore);
return null;
}
@@ -96,6 +96,6 @@ public class RestContextArgs extends SimpleRestOperationArg {
* @param function The function for finding the arg.
*/
protected <T> RestContextArgs(ThrowingFunction<RestContext,T> function) {
- super((session)->function.apply(session.getRestContext()));
+ super(session -> function.apply(session.getRestContext()));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpContextArgs.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpContextArgs.java
index cd11bafee..904643ed3 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpContextArgs.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpContextArgs.java
@@ -44,13 +44,13 @@ public class RestOpContextArgs extends SimpleRestOperationArg {
*/
public static RestOpContextArgs create(ParamInfo paramInfo) {
if (paramInfo.isType(JsonSchemaGenerator.class))
- return new RestOpContextArgs(x->x.getJsonSchemaGenerator());
+ return new RestOpContextArgs(RestOpContext::getJsonSchemaGenerator);
if (paramInfo.isType(ParserSet.class))
- return new RestOpContextArgs(x->x.getParsers());
+ return new RestOpContextArgs(RestOpContext::getParsers);
if (paramInfo.isType(RestOpContext.class))
return new RestOpContextArgs(x->x);
if (paramInfo.isType(SerializerSet.class))
- return new RestOpContextArgs(x->x.getSerializers());
+ return new RestOpContextArgs(RestOpContext::getSerializers);
return null;
}
@@ -61,6 +61,6 @@ public class RestOpContextArgs extends SimpleRestOperationArg {
* @param function The function for finding the arg.
*/
protected <T> RestOpContextArgs(ThrowingFunction<RestOpContext,T> function) {
- super((session)->function.apply(session.getContext()));
+ super(session -> function.apply(session.getContext()));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpSessionArgs.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpSessionArgs.java
index c0127fb11..30ad702a0 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpSessionArgs.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpSessionArgs.java
@@ -40,7 +40,7 @@ public class RestOpSessionArgs extends SimpleRestOperationArg {
*/
public static RestOpSessionArgs create(ParamInfo paramInfo) {
if (paramInfo.isType(BeanStore.class))
- return new RestOpSessionArgs(x->x.getBeanStore());
+ return new RestOpSessionArgs(RestOpSession::getBeanStore);
if (paramInfo.isType(RestOpSession.class))
return new RestOpSessionArgs(x->x);
return null;
@@ -53,6 +53,6 @@ public class RestOpSessionArgs extends SimpleRestOperationArg {
* @param function The function for finding the arg.
*/
protected <T> RestOpSessionArgs(ThrowingFunction<RestOpSession,T> function) {
- super((session)->function.apply(session));
+ super(session -> function.apply(session));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestRequestArgs.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestRequestArgs.java
index ddd64aea2..ff852ea9b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestRequestArgs.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestRequestArgs.java
@@ -70,45 +70,45 @@ public class RestRequestArgs extends SimpleRestOperationArg {
*/
public static RestRequestArgs create(ParamInfo paramInfo) {
if (paramInfo.isType(HttpPartParserSession.class))
- return new RestRequestArgs(x->x.getPartParserSession());
+ return new RestRequestArgs(RestRequest::getPartParserSession);
if (paramInfo.isType(HttpPartSerializerSession.class))
- return new RestRequestArgs(x->x.getPartSerializerSession());
+ return new RestRequestArgs(RestRequest::getPartSerializerSession);
if (paramInfo.isType(InputStream.class))
- return new RestRequestArgs(x->x.getInputStream());
+ return new RestRequestArgs(RestRequest::getInputStream);
if (paramInfo.isType(Locale.class))
- return new RestRequestArgs(x->x.getLocale());
+ return new RestRequestArgs(RestRequest::getLocale);
if (paramInfo.isType(Messages.class))
- return new RestRequestArgs(x->x.getMessages());
+ return new RestRequestArgs(RestRequest::getMessages);
if (paramInfo.isType(Reader.class))
- return new RestRequestArgs(x->x.getReader());
+ return new RestRequestArgs(RestRequest::getReader);
if (paramInfo.isType(RequestAttributes.class))
- return new RestRequestArgs(x->x.getAttributes());
+ return new RestRequestArgs(RestRequest::getAttributes);
if (paramInfo.isType(RequestContent.class))
- return new RestRequestArgs(x->x.getContent());
+ return new RestRequestArgs(RestRequest::getContent);
if (paramInfo.isType(RequestFormParams.class))
- return new RestRequestArgs(x->x.getFormParams());
+ return new RestRequestArgs(RestRequest::getFormParams);
if (paramInfo.isType(RequestHeaders.class))
- return new RestRequestArgs(x->x.getHeaders());
+ return new RestRequestArgs(RestRequest::getHeaders);
if (paramInfo.isType(RequestPathParams.class))
- return new RestRequestArgs(x->x.getPathParams());
+ return new RestRequestArgs(RestRequest::getPathParams);
if (paramInfo.isType(RequestQueryParams.class))
- return new RestRequestArgs(x->x.getQueryParams());
+ return new RestRequestArgs(RestRequest::getQueryParams);
if (paramInfo.isType(ResourceBundle.class))
- return new RestRequestArgs(x->x.getMessages());
+ return new RestRequestArgs(RestRequest::getMessages);
if (paramInfo.isType(RestRequest.class))
return new RestRequestArgs(x->x);
if (paramInfo.isType(ServletInputStream.class))
- return new RestRequestArgs(x->x.getInputStream());
+ return new RestRequestArgs(RestRequest::getInputStream);
if (paramInfo.isType(Swagger.class))
return new RestRequestArgs(x->x.getSwagger().orElse(null));
if (paramInfo.isType(TimeZone.class))
return new RestRequestArgs(x->x.getTimeZone().orElse(null));
if (paramInfo.isType(UriContext.class))
- return new RestRequestArgs(x->x.getUriContext());
+ return new RestRequestArgs(RestRequest::getUriContext);
if (paramInfo.isType(UriResolver.class))
- return new RestRequestArgs(x->x.getUriResolver());
+ return new RestRequestArgs(RestRequest::getUriResolver);
if (paramInfo.isType(VarResolverSession.class))
- return new RestRequestArgs(x->x.getVarResolverSession());
+ return new RestRequestArgs(RestRequest::getVarResolverSession);
return null;
}
@@ -119,6 +119,6 @@ public class RestRequestArgs extends SimpleRestOperationArg {
* @param function The function for finding the arg.
*/
protected <T> RestRequestArgs(ThrowingFunction<RestRequest,T> function) {
- super((session)->function.apply(session.getRequest()));
+ super(session -> function.apply(session.getRequest()));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestResponseArgs.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestResponseArgs.java
index 1b9dd6ffd..cd7cbd78f 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestResponseArgs.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestResponseArgs.java
@@ -44,13 +44,13 @@ public class RestResponseArgs extends SimpleRestOperationArg {
*/
public static RestResponseArgs create(ParamInfo paramInfo) {
if (paramInfo.isType(OutputStream.class))
- return new RestResponseArgs(x->x.getOutputStream());
+ return new RestResponseArgs(RestResponse::getOutputStream);
if (paramInfo.isType(RestResponse.class))
return new RestResponseArgs(x->x);
if (paramInfo.isType(ServletOutputStream.class))
- return new RestResponseArgs(x->x.getOutputStream());
+ return new RestResponseArgs(RestResponse::getOutputStream);
if (paramInfo.isType(Writer.class))
- return new RestResponseArgs(x->x.getWriter());
+ return new RestResponseArgs(RestResponse::getWriter);
return null;
}
@@ -61,6 +61,6 @@ public class RestResponseArgs extends SimpleRestOperationArg {
* @param function The function for finding the arg.
*/
protected <T> RestResponseArgs(ThrowingFunction<RestResponse,T> function) {
- super((session)->function.apply(session.getResponse()));
+ super(session -> function.apply(session.getResponse()));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestSessionArgs.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestSessionArgs.java
index 56c8cfb13..501d7eacd 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestSessionArgs.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestSessionArgs.java
@@ -43,9 +43,9 @@ public class RestSessionArgs extends SimpleRestOperationArg {
if (paramInfo.isType(RestSession.class))
return new RestSessionArgs(x->x);
if (paramInfo.isType(UrlPath.class))
- return new RestSessionArgs(x->x.getUrlPath());
+ return new RestSessionArgs(RestSession::getUrlPath);
if (paramInfo.isType(UrlPathMatch.class))
- return new RestSessionArgs(x->x.getUrlPathMatch());
+ return new RestSessionArgs(RestSession::getUrlPathMatch);
return null;
}
@@ -56,6 +56,6 @@ public class RestSessionArgs extends SimpleRestOperationArg {
* @param function The function for finding the arg.
*/
protected <T> RestSessionArgs(ThrowingFunction<RestSession,T> function) {
- super((session)->function.apply(session.getRestSession()));
+ super(session -> function.apply(session.getRestSession()));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverterList.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverterList.java
index 46ca147c2..07fca9fed 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverterList.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverterList.java
@@ -132,7 +132,7 @@ public class RestConverterList {
builder
.entries
.stream()
- .map(x -> x.run())
+ .map(BeanCreator::run)
.toArray(RestConverter[]::new);
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RestGuardList.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RestGuardList.java
index 1cdd6b69f..3473a0f58 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RestGuardList.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RestGuardList.java
@@ -132,7 +132,7 @@ public class RestGuardList {
builder
.entries
.stream()
- .map(x -> x.run())
+ .map(BeanCreator::run)
.toArray(RestGuard[]::new);
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
index 43743fba2..ca7de3cda 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
@@ -162,7 +162,7 @@ public class RequestFormParams extends ArrayList<RequestFormParam> {
add(new RequestFormParam(req, name, value));
}
} else if (c != null) {
- c.stream().forEach(x->add(x));
+ c.stream().forEach(this::add);
}
}
@@ -187,7 +187,7 @@ public class RequestFormParams extends ArrayList<RequestFormParam> {
parser = copyFrom.parser;
vs = copyFrom.vs;
for (String n : names)
- copyFrom.stream().filter(x -> eq(x.getName(), n)).forEach(x -> add(x));
+ copyFrom.stream().filter(x -> eq(x.getName(), n)).forEach(this::add);
}
/**
@@ -447,7 +447,7 @@ public class RequestFormParams extends ArrayList<RequestFormParam> {
* @return The list of all unique header names in this list.
*/
public List<String> getNames() {
- return stream().map(x -> x.getName()).map(x -> caseSensitive ? x : x.toLowerCase()).distinct().collect(toList());
+ return stream().map(RequestFormParam::getName).map(x -> caseSensitive ? x : x.toLowerCase()).distinct().collect(toList());
}
/**
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
index d319469db..9fe1faa98 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
@@ -165,7 +165,7 @@ public class RequestHeaders extends ArrayList<RequestHeader> {
parser = copyFrom.parser;
vs = copyFrom.vs;
for (String n : names)
- copyFrom.stream().filter(x -> eq(x.getName(), n)).forEach(x -> add(x));
+ copyFrom.stream().filter(x -> eq(x.getName(), n)).forEach(this::add);
}
/**
@@ -405,7 +405,7 @@ public class RequestHeaders extends ArrayList<RequestHeader> {
* @return The list of all unique header names in this list.
*/
public List<String> getNames() {
- return stream().map(x -> x.getName()).map(x -> caseSensitive ? x : x.toLowerCase()).distinct().collect(toList());
+ return stream().map(RequestHeader::getName).map(x -> caseSensitive ? x : x.toLowerCase()).distinct().collect(toList());
}
/**
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
index fd5644175..9d2697a6a 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
@@ -159,7 +159,7 @@ public class RequestPathParams extends ArrayList<RequestPathParam> {
parser = copyFrom.parser;
vs = copyFrom.vs;
for (String n : names)
- copyFrom.stream().filter(x -> eq(x.getName(), n)).forEach(x -> add(x));
+ copyFrom.stream().filter(x -> eq(x.getName(), n)).forEach(this::add);
}
/**
@@ -405,7 +405,7 @@ public class RequestPathParams extends ArrayList<RequestPathParam> {
* @return The list of all unique header names in this list.
*/
public List<String> getNames() {
- return stream().map(x -> x.getName()).map(x -> caseSensitive ? x : x.toLowerCase()).distinct().collect(toList());
+ return stream().map(RequestPathParam::getName).map(x -> caseSensitive ? x : x.toLowerCase()).distinct().collect(toList());
}
/**
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
index 5a4ca7c04..fe1fa6a86 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
@@ -178,7 +178,7 @@ public class RequestQueryParams extends ArrayList<RequestQueryParam> {
parser = copyFrom.parser;
vs = copyFrom.vs;
for (String n : names)
- copyFrom.stream().filter(x -> eq(x.getName(), n)).forEach(x -> add(x));
+ copyFrom.stream().filter(x -> eq(x.getName(), n)).forEach(this::add);
}
/**
@@ -421,7 +421,7 @@ public class RequestQueryParams extends ArrayList<RequestQueryParam> {
* @return The list of all unique header names in this list.
*/
public List<String> getNames() {
- return stream().map(x -> x.getName()).map(x -> caseSensitive ? x : x.toLowerCase()).distinct().collect(toList());
+ return stream().map(RequestQueryParam::getName).map(x -> caseSensitive ? x : x.toLowerCase()).distinct().collect(toList());
}
/**
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matcher/RestMatcherList.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matcher/RestMatcherList.java
index d6f22a50b..680697a87 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matcher/RestMatcherList.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matcher/RestMatcherList.java
@@ -134,10 +134,10 @@ public class RestMatcherList {
builder
.entries
.stream()
- .map(x -> x.run())
+ .map(BeanCreator::run)
.collect(toList());
optionalEntries = l.stream().filter(x -> ! x.required()).toArray(RestMatcher[]::new);
- requiredEntries = l.stream().filter(x -> x.required()).toArray(RestMatcher[]::new);
+ requiredEntries = l.stream().filter(RestMatcher::required).toArray(RestMatcher[]::new);
}
/**
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java
index 694181f4c..30b896b25 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java
@@ -181,7 +181,7 @@ public class ThrownStore {
Set<String> s = null;
if (builder.ignoreClasses != null)
- s = builder.ignoreClasses.stream().map(x->x.getName()).collect(toSet());
+ s = builder.ignoreClasses.stream().map(Class::getName).collect(toSet());
if (s == null && parent.isPresent())
s = parent.get().ignoreClasses;
if (s == null)
@@ -230,7 +230,7 @@ public class ThrownStore {
* @return The list of all stack traces in this database, cloned and sorted by count descending.
*/
public List<ThrownStats> getStats() {
- return db.values().stream().map(x -> x.clone()).sorted(comparingInt(ThrownStats::getCount).reversed()).collect(toList());
+ return db.values().stream().map(ThrownStats::clone).sorted(comparingInt(ThrownStats::getCount).reversed()).collect(toList());
}
/**
@@ -271,7 +271,7 @@ public class ThrownStore {
* @return A modifiable list of strings.
*/
protected List<String> createStackTrace(Throwable t) {
- return alist(t.getStackTrace()).stream().filter(x -> include(x)).map(x -> normalize(x)).collect(toList());
+ return alist(t.getStackTrace()).stream().filter(this::include).map(this::normalize).collect(toList());
}
/**
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/SwaggerProvider.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/SwaggerProvider.java
index a88426196..c07fe9c56 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/SwaggerProvider.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/SwaggerProvider.java
@@ -106,7 +106,7 @@ public interface SwaggerProvider {
* @return The var resolver.
*/
public Optional<VarResolver> varResolver() {
- return optional(varResolver).map(x -> x.get());
+ return optional(varResolver).map(Supplier::get);
}
/**
@@ -115,7 +115,7 @@ public interface SwaggerProvider {
* @return The JSON schema generator.
*/
public Optional<JsonSchemaGenerator> jsonSchemaGenerator() {
- return optional(jsonSchemaGenerator).map(x -> x.get());
+ return optional(jsonSchemaGenerator).map(Supplier::get);
}
/**
@@ -124,7 +124,7 @@ public interface SwaggerProvider {
* @return The messages.
*/
public Optional<Messages> messages() {
- return optional(messages).map(x -> x.get());
+ return optional(messages).map(Supplier::get);
}
/**
@@ -133,7 +133,7 @@ public interface SwaggerProvider {
* @return The file finder.
*/
public Optional<FileFinder> fileFinder() {
- return optional(fileFinder).map(x -> x.get());
+ return optional(fileFinder).map(Supplier::get);
}
/**
diff --git a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockStreamSerializer.java b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockStreamSerializer.java
index 2dd2ad139..32222c3c6 100644
--- a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockStreamSerializer.java
+++ b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockStreamSerializer.java
@@ -38,7 +38,7 @@ public class MockStreamSerializer extends OutputStreamSerializer {
public static class Builder extends OutputStreamSerializer.Builder {
MockStreamSerializerFunction function = (s,o) -> StringUtils.stringify(o).getBytes();
- Function<SerializerSession,Map<String,String>> headers = (s) -> Collections.emptyMap();
+ Function<SerializerSession,Map<String,String>> headers = s -> Collections.emptyMap();
public Builder function(MockStreamSerializerFunction function) {
this.function = function;
diff --git a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockWriterSerializer.java b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockWriterSerializer.java
index 4fc3ea199..cdc5cd7fc 100644
--- a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockWriterSerializer.java
+++ b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockWriterSerializer.java
@@ -69,7 +69,7 @@ public class MockWriterSerializer extends WriterSerializer implements HttpPartSe
public static class Builder extends WriterSerializer.Builder {
MockWriterSerializerFunction function = (s,o) -> StringUtils.stringify(o);
MockWriterSerializerPartFunction partFunction = (t,s,o) -> StringUtils.stringify(o);
- Function<WriterSerializerSession,Map<String,String>> headers = (s) -> Collections.emptyMap();
+ Function<WriterSerializerSession,Map<String,String>> headers = s -> Collections.emptyMap();
public Builder function(MockWriterSerializerFunction value) {
function = value;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanContextTest.java b/juneau-utest/src/test/java/org/apache/juneau/BeanContextTest.java
index 418eb094f..67714b109 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanContextTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanContextTest.java
@@ -45,7 +45,7 @@ public class BeanContextTest {
@Test
public void a02_lambdaExpressionsNotCached() throws ExecutableException {
BeanContext bc = BeanContext.DEFAULT;
- A2 fi = (x) -> System.out.println(x);
+ A2 fi = x -> System.out.println(x);
ClassMeta cm1 = bc.getClassMeta(fi.getClass()), cm2 = bc.getClassMeta(fi.getClass());
assertTrue(cm1 != cm2);
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java b/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java
index 76bf00b15..cff6d6d4b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java
@@ -15,6 +15,7 @@ package org.apache.juneau;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
+import java.util.Map.Entry;
import java.util.stream.*;
import org.apache.juneau.annotation.*;
@@ -40,7 +41,7 @@ public class BeanMapErrorsTest {
bm.put("f2", -2);
assertEquals(-2, bm.get("f2"));
assertFalse(bm.keySet().contains("f2"));
- assertFalse(bm.entrySet().stream().map(x -> x.getKey()).collect(Collectors.toList()).contains("f2"));
+ assertFalse(bm.entrySet().stream().map(Entry::getKey).collect(Collectors.toList()).contains("f2"));
}
@Bean(p="f1")
@@ -68,7 +69,7 @@ public class BeanMapErrorsTest {
bm.put("f2", -2);
assertEquals(-2, bm.get("f2"));
assertFalse(bm.keySet().contains("f2"));
- assertFalse(bm.entrySet().stream().map(x -> x.getKey()).collect(Collectors.toList()).contains("f2"));
+ assertFalse(bm.entrySet().stream().map(Entry::getKey).collect(Collectors.toList()).contains("f2"));
}
@Bean(on="Dummy",p="dummy")
@@ -104,7 +105,7 @@ public class BeanMapErrorsTest {
bm.put("f2", -2);
assertEquals(-2, bm.get("f2"));
assertFalse(bm.keySet().contains("f2"));
- assertFalse(bm.entrySet().stream().map(x -> x.getKey()).collect(Collectors.toList()).contains("f2"));
+ assertFalse(bm.entrySet().stream().map(Entry::getKey).collect(Collectors.toList()).contains("f2"));
}
@Bean(p="f1")
@@ -125,7 +126,7 @@ public class BeanMapErrorsTest {
bm.put("f2", -2);
assertEquals(-2, bm.get("f2"));
assertFalse(bm.keySet().contains("f2"));
- assertFalse(bm.entrySet().stream().map(x -> x.getKey()).collect(Collectors.toList()).contains("f2"));
+ assertFalse(bm.entrySet().stream().map(Entry::getKey).collect(Collectors.toList()).contains("f2"));
}
@Bean(on="Dummy",p="dummy")
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanTraversePropertiesComboTest.java b/juneau-utest/src/test/java/org/apache/juneau/BeanTraversePropertiesComboTest.java
index 92526b144..e244e4951 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanTraversePropertiesComboTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanTraversePropertiesComboTest.java
@@ -14,6 +14,7 @@ package org.apache.juneau;
import java.util.*;
+import org.apache.juneau.BeanTraverseContext.Builder;
import org.junit.runner.*;
import org.junit.runners.*;
@@ -106,7 +107,7 @@ public class BeanTraversePropertiesComboTest extends ComboRoundTripTest {
.rdfXml("x")
.rdfXmlT("x")
.rdfXmlR("x")
- .apply(BeanTraverseContext.Builder.class, x -> x.detectRecursions())
+ .apply(BeanTraverseContext.Builder.class, Builder::detectRecursions)
.exceptionMsg("Recursion occurred")
},
{ /* 2 */
@@ -136,7 +137,7 @@ public class BeanTraversePropertiesComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n</rdf:RDF>\n")
- .apply(BeanTraverseContext.Builder.class, x -> x.ignoreRecursions())
+ .apply(BeanTraverseContext.Builder.class, Builder::ignoreRecursions)
},
{ /* 3 */
new ComboInput<>(
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BenchmarkTest.java b/juneau-utest/src/test/java/org/apache/juneau/BenchmarkTest.java
index f78372552..5c1df0647 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/BenchmarkTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BenchmarkTest.java
@@ -94,7 +94,7 @@ public class BenchmarkTest {
int cap = 100000;
long startTime = 0;
List<Integer> arrayList = new ArrayList<>();
- arrayList.forEach(x -> Objects.hash(x));
+ arrayList.forEach(Objects::hash);
IntStream.of(null).forEach(null);
startTime = System.currentTimeMillis();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/SerializerPropertiesComboTest.java b/juneau-utest/src/test/java/org/apache/juneau/SerializerPropertiesComboTest.java
index 287062b2d..229577324 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/SerializerPropertiesComboTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/SerializerPropertiesComboTest.java
@@ -19,6 +19,7 @@ import java.util.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.serializer.*;
+import org.apache.juneau.serializer.Serializer.Builder;
import org.apache.juneau.xml.*;
import org.junit.runner.*;
import org.junit.runners.*;
@@ -61,7 +62,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:a rdf:parseType='Resource'>\n<jp:t>BwT</jp:t>\n<jp:f>1</jp:f>\n</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:a rdf:parseType='Resource'>\n <jp:_type>BwT</jp:_type>\n <jp:f>1</jp:f>\n </jp:a>\n </rdf:Description>\n</rdf:RDF>\n")
.beanContext(x -> x.beanDictionary(T0.class))
- .apply(Serializer.Builder.class, x -> x.addBeanTypes())
+ .apply(Serializer.Builder.class, Builder::addBeanTypes)
},
{ /* 1 */
new ComboInput<>(
@@ -91,7 +92,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>BwT</jp:t>\n<jp:f>1</jp:f>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>BwT</jp:_type>\n <jp:f>1</jp:f>\n </rdf:Description>\n</rdf:RDF>\n")
.beanContext(x -> x.beanDictionary(T0.class))
- .apply(Serializer.Builder.class, x -> x.addRootType())
+ .apply(Serializer.Builder.class, Builder::addRootType)
},
{ /* 2 */
new ComboInput<>(
@@ -120,7 +121,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>a</rdf:li>\n<rdf:li>b</rdf:li>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>a</rdf:li>\n<rdf:li>b</rdf:li>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>a</rdf:li>\n <rdf:li>b</rdf:li>\n <rdf:li>c</rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .apply(Serializer.Builder.class, x -> x.sortCollections())
+ .apply(Serializer.Builder.class, Builder::sortCollections)
},
{ /* 3 */
new ComboInput<>(
@@ -149,7 +150,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>a</rdf:li>\n<rdf:li>b</rdf:li>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>a</rdf:li>\n<rdf:li>b</rdf:li>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>a</rdf:li>\n <rdf:li>b</rdf:li>\n <rdf:li>c</rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .apply(Serializer.Builder.class, x -> x.sortCollections())
+ .apply(Serializer.Builder.class, Builder::sortCollections)
},
{ /* 4 */
new ComboInput<>(
@@ -178,7 +179,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:a>1</jp:a>\n<jp:b>2</jp:b>\n<jp:c>3</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:a>1</jp:a>\n<jp:b>2</jp:b>\n<jp:c>3</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:a>1</jp:a>\n <jp:b>2</jp:b>\n <jp:c>3</jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .apply(Serializer.Builder.class, x -> x.sortMaps())
+ .apply(Serializer.Builder.class, Builder::sortMaps)
},
{ /* 5 */
new ComboInput<>(
@@ -207,7 +208,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n</rdf:RDF>\n")
- .apply(Serializer.Builder.class, x -> x.trimEmptyCollections())
+ .apply(Serializer.Builder.class, Builder::trimEmptyCollections)
},
{ /* 6 */
new ComboInput<>(
@@ -236,7 +237,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n</rdf:RDF>\n")
- .apply(Serializer.Builder.class, x -> x.trimEmptyMaps())
+ .apply(Serializer.Builder.class, Builder::trimEmptyMaps)
},
{ /* 7 */
new ComboInput<>(
@@ -265,7 +266,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:f rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:f rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:f rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Description>\n</rdf:RDF>\n")
- .apply(Serializer.Builder.class, x -> x.keepNullProperties())
+ .apply(Serializer.Builder.class, Builder::keepNullProperties)
},
{ /* 8 */
new ComboInput<>(
@@ -294,7 +295,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:f>foo</jp:f>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:f>foo</jp:f>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:f>foo</jp:f>\n </rdf:Description>\n</rdf:RDF>\n")
- .apply(Serializer.Builder.class, x -> x.trimStrings())
+ .apply(Serializer.Builder.class, Builder::trimStrings)
},
{ /* 9 */
new ComboInput<>(
@@ -383,7 +384,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>T11</jp:_type>\n<jp:f>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:f>\n<rdf:Seq>\n<rdf:li>_x0020_foo_x0020_</rdf:li>\n</rdf:Seq>\n</jp:f>\n</rdf:li>\n</rdf:Seq>\n</jp:f>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>T11</jp:t>\n<jp:f>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:f>\n<rdf:Seq>\n<rdf:li>_x0020_foo_x0020_</rdf:li>\n</rdf:Seq>\n</jp:f>\n</rdf:li>\n</rdf:Seq>\n</jp:f>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>T11</jp:_type>\n <jp:f>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:f>\n <rdf:Seq>\n <rdf:li>_x0020_foo_x0020_</rdf:li>\n </rdf:Seq>\n </jp:f>\n </rdf:li>\n </rdf:Seq>\n </jp:f>\n </rdf:Description>\n</rdf:RDF>\n")
- .apply(XmlSerializer.Builder.class, x -> x.addNamespaceUrisToRoot())
+ .apply(XmlSerializer.Builder.class, org.apache.juneau.xml.XmlSerializer.Builder::addNamespaceUrisToRoot)
.apply(WriterSerializer.Builder.class, x -> x.quoteCharOverride('|'))
.apply(Serializer.Builder.class, x -> x.addBeanTypes().addRootType())
.skipTest(x -> x.startsWith("parse") || x.startsWith("verify"))
diff --git a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
index db8bca8c5..b9f168f9e 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
@@ -638,8 +638,8 @@ public class BeanStore_Test {
assertObject(b3c.createMethodFinder(C.class).find(m).run()).isNull();
}
- b1p.clear().addSupplier(A1.class, ()->new A1());
- b2p.clear().addSupplier(A1.class, ()->new A1());
+ b1p.clear().addSupplier(A1.class, A1::new);
+ b2p.clear().addSupplier(A1.class, A1::new);
for (BeanStore b : array(b1c, b2c)) {
assertObject(b.createMethodFinder(C.class, x).find("createC1").run()).isNotNull();
assertObject(b.createMethodFinder(C.class, x).find("createC2").run()).isNotNull();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
index 7323515af..bab0a479f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
@@ -27,6 +27,7 @@ import org.apache.juneau.msgpack.*;
import org.apache.juneau.oapi.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.client.*;
+import org.apache.juneau.rest.httppart.RequestHeader;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
import org.apache.juneau.testutils.pojos.*;
@@ -41,7 +42,7 @@ public class SerializedHttpEntity_Test {
public static class A extends BasicRestObject {
@RestPost
public String[] checkHeader(org.apache.juneau.rest.RestRequest req) {
- return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(x -> x.getValue()).toArray(String[]::new);
+ return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(RequestHeader::getValue).toArray(String[]::new);
}
@RestPost
public Reader checkBody(org.apache.juneau.rest.RestRequest req) throws IOException {
@@ -52,7 +53,7 @@ public class SerializedHttpEntity_Test {
@Test
public void a01_basic() throws Exception {
serializedEntity(ABean.get(),JsonSerializer.DEFAULT).assertString().is("{\"a\":1,\"b\":\"foo\"}");
- serializedEntity(()->ABean.get(),JsonSerializer.DEFAULT).assertString().is("{\"a\":1,\"b\":\"foo\"}");
+ serializedEntity(ABean::get,JsonSerializer.DEFAULT).assertString().is("{\"a\":1,\"b\":\"foo\"}");
serializedEntity(ABean.get(),null).assertString().is("{a:1,b:'foo'}");
serializedEntity(null,JsonSerializer.DEFAULT).assertString().is("null");
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
index b73d99ef8..ee22dfe67 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
@@ -24,6 +24,7 @@ import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.client.remote.*;
import org.apache.juneau.rest.config.*;
+import org.apache.juneau.rest.httppart.RequestHeader;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
import org.apache.juneau.http.*;
@@ -548,7 +549,7 @@ public class Remote_Test {
public static class F extends BasicRestObject {
@RestGet
public String[] headers(org.apache.juneau.rest.RestRequest req) {
- return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(x -> x.getValue()).toArray(String[]::new);
+ return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(RequestHeader::getValue).toArray(String[]::new);
}
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java
index 1419c90ed..7d5d1dded 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java
@@ -33,7 +33,7 @@ public class JsonConfigAnnotationTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = t -> t.toString();
+ private static final Function<Object,String> TO_STRING = Object::toString;
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java
index f3d468d7b..214f0c88c 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java
@@ -33,7 +33,7 @@ public class MsgPackConfigAnnotationTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = t -> t.toString();
+ private static final Function<Object,String> TO_STRING = Object::toString;
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java b/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
index 82161c56d..0347fcc9a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
@@ -475,7 +475,7 @@ public class ClassInfoTest {
@Test
public void getPublicNoArgConstructor() {
- check("E1()", e1.getPublicConstructor(x -> x.hasNoParams()));
+ check("E1()", e1.getPublicConstructor(ConstructorInfo::hasNoParams));
}
@Test
diff --git a/juneau-utest/src/test/java/org/apache/juneau/reflect/ConstructorInfoTest.java b/juneau-utest/src/test/java/org/apache/juneau/reflect/ConstructorInfoTest.java
index 99af4b615..2fb65253d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/reflect/ConstructorInfoTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/ConstructorInfoTest.java
@@ -108,7 +108,7 @@ public class ConstructorInfoTest {
}
static ClassInfo b = ClassInfo.of(B.class);
static ConstructorInfo
- b_c1 = b.getPublicConstructor(x -> x.hasNoParams()),
+ b_c1 = b.getPublicConstructor(ConstructorInfo::hasNoParams),
b_c2 = b.getPublicConstructor(x -> x.hasParamTypes(String.class)),
b_c3 = b.getDeclaredConstructor(x -> x.hasParamTypes(int.class)),
b_c4 = b.getPublicConstructor(x -> x.hasParamTypes(String.class, String.class));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java b/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java
index ff033fc1f..1271a6c7f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java
@@ -72,13 +72,13 @@ public class ExecutableInfoTest {
@Test
public void isConstructor() {
- assertTrue(a.getPublicConstructor(x -> x.hasNoParams()).isConstructor());
+ assertTrue(a.getPublicConstructor(ConstructorInfo::hasNoParams).isConstructor());
assertFalse(a.getPublicMethod(x -> x.hasName("foo")).isConstructor());
}
@Test
public void getDeclaringClass() {
- check("A", a.getPublicConstructor(x -> x.hasNoParams()).getDeclaringClass());
+ check("A", a.getPublicConstructor(ConstructorInfo::hasNoParams).getDeclaringClass());
check("A", a.getPublicMethod(x -> x.hasName("foo")).getDeclaringClass());
}
@@ -94,7 +94,7 @@ public class ExecutableInfoTest {
}
static ClassInfo b = ClassInfo.of(B.class);
static ExecutableInfo
- b_c1=b.getPublicConstructor(x -> x.hasNoParams()),
+ b_c1=b.getPublicConstructor(ConstructorInfo::hasNoParams),
b_c2=b.getPublicConstructor(x -> x.hasParamTypes(String.class)),
b_m1=b.getPublicMethod(x -> x.hasName("m") && x.hasNoParams()),
b_m2=b.getPublicMethod(x -> x.hasName("m") && x.hasParamTypes(String.class))
@@ -169,7 +169,7 @@ public class ExecutableInfoTest {
@Test
public void getParam_indexOutOfBounds_noCache() {
ClassInfo b = ClassInfo.of(B.class);
- assertThrown(()->b.getPublicConstructor(x -> x.hasNoParams()).getParam(0)).asMessage().is("Invalid index '0'. No parameters.");
+ assertThrown(()->b.getPublicConstructor(ConstructorInfo::hasNoParams).getParam(0)).asMessage().is("Invalid index '0'. No parameters.");
assertThrown(()->b.getPublicConstructor(x -> x.hasParamTypes(String.class)).getParam(-1)).asMessage().is("Invalid index '-1'. Parameter count: 1");
assertThrown(()->b.getPublicConstructor(x -> x.hasParamTypes(String.class)).getParam(1)).asMessage().is("Invalid index '1'. Parameter count: 1");
}
@@ -267,7 +267,7 @@ public class ExecutableInfoTest {
}
static ClassInfo c = ClassInfo.of(C.class);
static ConstructorInfo
- c_c1=c.getPublicConstructor(x -> x.hasNoParams()),
+ c_c1=c.getPublicConstructor(ConstructorInfo::hasNoParams),
c_c2=c.getPublicConstructor(x -> x.hasParamTypes(String.class)),
c_c3=c.getPublicConstructor(x -> x.hasParamTypes(int.class))
;
@@ -328,7 +328,7 @@ public class ExecutableInfoTest {
}
static ClassInfo d = ClassInfo.of(D.class);
static ExecutableInfo
- d_c=d.getPublicConstructor(x -> x.hasNoParams()),
+ d_c=d.getPublicConstructor(ConstructorInfo::hasNoParams),
d_m=d.getPublicMethod(x -> x.hasName("m"))
;
@@ -584,7 +584,7 @@ public class ExecutableInfoTest {
@Test
public void getFullName_constructor() {
- assertEquals("org.apache.juneau.reflect.ExecutableInfoTest$X()", x.getPublicConstructor(x -> x.hasNoParams()).getFullName());
+ assertEquals("org.apache.juneau.reflect.ExecutableInfoTest$X()", x.getPublicConstructor(ConstructorInfo::hasNoParams).getFullName());
assertEquals("org.apache.juneau.reflect.ExecutableInfoTest$X(java.lang.String)", x.getPublicConstructor(x -> x.hasParamTypes(String.class)).getFullName());
assertEquals("org.apache.juneau.reflect.ExecutableInfoTest$X(java.util.Map<java.lang.String,java.lang.Object>)", x.getPublicConstructor(x -> x.hasParamTypes(Map.class)).getFullName());
}
@@ -598,7 +598,7 @@ public class ExecutableInfoTest {
@Test
public void getShortName_constructor() {
- assertEquals("X()", x.getPublicConstructor(x -> x.hasNoParams()).getShortName());
+ assertEquals("X()", x.getPublicConstructor(ConstructorInfo::hasNoParams).getShortName());
assertEquals("X(String)", x.getPublicConstructor(x -> x.hasParamTypes(String.class)).getShortName());
assertEquals("X(Map)", x.getPublicConstructor(x -> x.hasParamTypes(Map.class)).getShortName());
}
@@ -612,7 +612,7 @@ public class ExecutableInfoTest {
@Test
public void getSimpleName_constructor() {
- assertEquals("X", x.getPublicConstructor(x -> x.hasNoParams()).getSimpleName());
+ assertEquals("X", x.getPublicConstructor(ConstructorInfo::hasNoParams).getSimpleName());
assertEquals("X", x.getPublicConstructor(x -> x.hasParamTypes(String.class)).getSimpleName());
assertEquals("X", x.getPublicConstructor(x -> x.hasParamTypes(Map.class)).getSimpleName());
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_DefaultRequestAttributes_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_DefaultRequestAttributes_Test.java
index a5a2e36b2..5a73f0d2e 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_DefaultRequestAttributes_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_DefaultRequestAttributes_Test.java
@@ -151,7 +151,7 @@ public class Rest_DefaultRequestAttributes_Test {
public static class B1 extends MockWriterSerializer {
public B1(MockWriterSerializer.Builder b) {
- super(b.produces("test/s1").accept("text/s1,text/s2,text/s3").function((s,o) -> out(s)).headers(s->headers(s)));
+ super(b.produces("test/s1").accept("text/s1,text/s2,text/s3").function((s,o) -> out(s)).headers(B1::headers));
}
public static String out(SerializerSession s) {
JsonMap sp = s.getSessionProperties();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
index 6c5b0b92f..553ef287b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
@@ -32,6 +32,7 @@ import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.part.*;
import org.apache.juneau.marshaller.*;
import org.apache.juneau.rest.annotation.*;
+import org.apache.juneau.rest.httppart.RequestHeader;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
import org.apache.juneau.testutils.*;
@@ -88,7 +89,7 @@ public class RestClient_BasicCalls_Test {
}
@RestOp(path="/checkHeader")
public String[] postHeader(org.apache.juneau.rest.RestRequest req) {
- return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(x -> x.getValue()).toArray(String[]::new);
+ return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(RequestHeader::getValue).toArray(String[]::new);
}
@RestOp(path="/",method="*")
public Reader echoMethod(@Method String method) {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
index 68f617ada..39b78f7bb 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
@@ -168,7 +168,7 @@ public class RestClient_Body_Test {
.assertHeader("X-Content-Type").is("application/json")
.assertContent().as(ABean.class).asJson().is("{a:1,b:'foo'}");
- SerializedEntity x3 = serializedEntity(()->ABean.get(),js,null);
+ SerializedEntity x3 = serializedEntity(ABean::get,js,null);
client().build().post("/",x3).run()
.assertHeader("X-Content-Length").isNull()
.assertHeader("X-Content-Encoding").isNull()
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java
index 24710ba58..3710d8ca1 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java
@@ -27,6 +27,7 @@ import org.apache.juneau.collections.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.rest.annotation.*;
+import org.apache.juneau.rest.httppart.RequestHeader;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
import org.apache.juneau.swap.*;
@@ -43,7 +44,7 @@ public class RestClient_Config_BeanContext_Test {
}
@RestGet
public String[] checkHeader(org.apache.juneau.rest.RestRequest req) {
- return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(x -> x.getValue()).toArray(String[]::new);
+ return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(RequestHeader::getValue).toArray(String[]::new);
}
@RestGet
public Reader checkQuery(org.apache.juneau.rest.RestRequest req) {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_OpenApi_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_OpenApi_Test.java
index 5754ab5bd..66747805c 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_OpenApi_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_OpenApi_Test.java
@@ -22,6 +22,7 @@ import java.io.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.rest.annotation.*;
+import org.apache.juneau.rest.httppart.RequestHeader;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
import org.junit.*;
@@ -37,7 +38,7 @@ public class RestClient_Config_OpenApi_Test {
}
@RestGet
public String[] checkHeader(org.apache.juneau.rest.RestRequest req) {
- return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(x -> x.getValue()).toArray(String[]::new);
+ return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(RequestHeader::getValue).toArray(String[]::new);
}
@RestGet
public Reader checkQuery(org.apache.juneau.rest.RestRequest req) {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
index cb25fa276..404f1c85d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
@@ -87,7 +87,7 @@ public class RestClient_Config_RestClient_Test {
}
@RestOp(path="/checkHeader")
public String[] getHeader(org.apache.juneau.rest.RestRequest req) {
- return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(x -> x.getValue()).toArray(String[]::new);
+ return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(RequestHeader::getValue).toArray(String[]::new);
}
}
@@ -446,7 +446,7 @@ public class RestClient_Config_RestClient_Test {
public static class A12b extends MockReaderParser {
public A12b(Builder builder) {
- super(builder.partFunction((t,s,in,c)->in(t,s,in,c)));
+ super(builder.partFunction(A12b::in));
}
private static Object in(HttpPartType type, HttpPartSchema schema, String in, ClassMeta<?> c) {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
index 1ffed1926..5c9d7b553 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
@@ -26,6 +26,7 @@ import org.apache.juneau.http.header.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.marshaller.*;
import org.apache.juneau.rest.annotation.*;
+import org.apache.juneau.rest.httppart.RequestHeader;
import org.apache.juneau.rest.logger.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
@@ -64,7 +65,7 @@ public class RestClient_Headers_Test {
public static class A extends BasicRestObject {
@RestGet
public String[] headers(org.apache.juneau.rest.RestRequest req) {
- return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(x -> x.getValue()).toArray(String[]::new);
+ return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(RequestHeader::getValue).toArray(String[]::new);
}
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
index 1da02fe9b..ee8db9e22 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
@@ -28,6 +28,7 @@ import org.apache.http.*;
import org.apache.juneau.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.rest.annotation.*;
+import org.apache.juneau.rest.httppart.RequestHeader;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
import org.junit.*;
@@ -40,7 +41,7 @@ public class RestClient_Response_Headers_Test {
@RestGet
public String echo(org.apache.juneau.rest.RestRequest req, org.apache.juneau.rest.RestResponse res) {
String c = req.getHeaderParam("Check").orElse(null);
- String[] h = req.getHeaders().getAll(c).stream().map(x -> x.getValue()).toArray(String[]::new);
+ String[] h = req.getHeaders().getAll(c).stream().map(RequestHeader::getValue).toArray(String[]::new);
if (h != null)
for (String hh : h)
res.addHeader(c, hh);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java b/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
index 10fc96a40..6da37590f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
@@ -1154,7 +1154,7 @@ public class ThirdPartyProxyTest {
@Test
public void ga07_reqBeanPath7() throws Exception {
- String r = proxy.reqBeanPath7(() -> ABean.get());
+ String r = proxy.reqBeanPath7(ABean::get);
assertEquals("OK", r);
}
@@ -1223,7 +1223,7 @@ public class ThirdPartyProxyTest {
@Test
public void gb07_reqBeanQuery7() throws Exception {
String r = proxy.reqBeanQuery7(
- () -> ABean.get()
+ ABean::get
);
assertEquals("OK", r);
}
@@ -1293,7 +1293,7 @@ public class ThirdPartyProxyTest {
@Test
public void gd07_reqBeanFormData7() throws Exception {
String r = proxy.reqBeanFormData7(
- () -> ABean.get()
+ ABean::get
);
assertEquals("OK", r);
}
@@ -1363,7 +1363,7 @@ public class ThirdPartyProxyTest {
@Test
public void gf07_reqBeanHeader7() throws Exception {
String r = proxy.reqBeanHeader7(
- () -> ABean.get()
+ ABean::get
);
assertEquals("OK", r);
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java
index adef8fd2d..dc450f67b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java
@@ -33,7 +33,7 @@ public class SoapXmlConfigAnnotationTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = t -> t.toString();
+ private static final Function<Object,String> TO_STRING = Object::toString;
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/transforms/ObjectSwapTest.java b/juneau-utest/src/test/java/org/apache/juneau/transforms/ObjectSwapTest.java
index 95fed673b..fe983eda1 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/transforms/ObjectSwapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/transforms/ObjectSwapTest.java
@@ -19,6 +19,7 @@ import org.apache.juneau.*;
import org.apache.juneau.html.*;
import org.apache.juneau.json.*;
import org.apache.juneau.serializer.*;
+import org.apache.juneau.serializer.WriterSerializer.Builder;
import org.apache.juneau.swap.*;
import org.apache.juneau.xml.*;
import org.junit.*;
@@ -75,7 +76,7 @@ public class ObjectSwapTest {
SerializerSet s = SerializerSet.create()
.add(JsonSerializer.class, XmlSerializer.class, HtmlSerializer.class)
- .forEach(WriterSerializer.Builder.class, x -> x.sq())
+ .forEach(WriterSerializer.Builder.class, Builder::sq)
.forEach(Serializer.Builder.class, x -> x.swaps(MyJsonSwap.class, MyXmlSwap.class, MyOtherSwap.class))
.build();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java
index e5abf8229..310757cc8 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java
@@ -33,7 +33,7 @@ public class UonConfigAnnotationTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = t -> t.toString();
+ private static final Function<Object,String> TO_STRING = Object::toString;
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java
index cd608b7f1..1bfea83fd 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java
@@ -33,7 +33,7 @@ public class UrlEncodingConfigAnnotationTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = t -> t.toString();
+ private static final Function<Object,String> TO_STRING = Object::toString;
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
[juneau] 27/29: [juneau-microservice-core] Use {} only when creating certain arrays
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 382cedd1bfdd527bddb454b22b94555e004819c6
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:47:59 2023 -0400
[juneau-microservice-core] Use {} only when creating certain arrays
---
.../main/java/org/apache/juneau/microservice/resources/LogParser.java | 2 +-
.../src/main/java/org/apache/juneau/rest/client/RestClient.java | 2 +-
.../src/main/java/org/apache/juneau/http/entity/ByteArrayEntity.java | 2 +-
.../src/main/java/org/apache/juneau/http/header/BasicHeader.java | 2 +-
.../src/main/java/org/apache/juneau/http/part/BasicCsvArrayPart.java | 2 +-
.../src/main/java/org/apache/juneau/rest/mock/MockRestClient.java | 2 +-
.../src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java | 2 +-
.../main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java | 2 +-
.../java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java | 2 +-
.../main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java | 2 +-
.../main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
index d35c63cc7..2e88bb777 100644
--- a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
+++ b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
@@ -215,7 +215,7 @@ public final class LogParser implements Iterable<LogParser.Entry>, Iterator<LogP
}
}
- static final String toHtml(String s) {
+ static String toHtml(String s) {
if (s.indexOf('<') != -1)
return s.replaceAll("<", "<");//$NON-NLS-2$
return s;
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 32573b3cb..96b920225 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -1051,7 +1051,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
// Static
//-------------------------------------------------------------------------------------------------------------------
- private static final RestCallInterceptor[] EMPTY_REST_CALL_INTERCEPTORS = new RestCallInterceptor[0];
+ private static final RestCallInterceptor[] EMPTY_REST_CALL_INTERCEPTORS = {};
/**
* Instantiates a new clean-slate {@link Builder} object.
diff --git a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ByteArrayEntity.java b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ByteArrayEntity.java
index 3f48bd8f4..f586cce79 100644
--- a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ByteArrayEntity.java
+++ b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ByteArrayEntity.java
@@ -35,7 +35,7 @@ public class ByteArrayEntity extends BasicHttpEntity {
// Static
//-----------------------------------------------------------------------------------------------------------------
- private static final byte[] EMPTY = new byte[0];
+ private static final byte[] EMPTY = {};
//-----------------------------------------------------------------------------------------------------------------
// Instance
diff --git a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
index 0d1d23512..028c5a6da 100644
--- a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
+++ b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
@@ -60,7 +60,7 @@ public class BasicHeader implements Header, Cloneable, Serializable {
//-----------------------------------------------------------------------------------------------------------------
private static final long serialVersionUID = 1L;
- private static final HeaderElement[] EMPTY_HEADER_ELEMENTS = new HeaderElement[] {};
+ private static final HeaderElement[] EMPTY_HEADER_ELEMENTS = {};
/**
* Static creator.
diff --git a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicCsvArrayPart.java b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicCsvArrayPart.java
index a69c81bba..834e3ae11 100644
--- a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicCsvArrayPart.java
+++ b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicCsvArrayPart.java
@@ -35,7 +35,7 @@ public class BasicCsvArrayPart extends BasicPart {
// Static
//-----------------------------------------------------------------------------------------------------------------
- private static final String[] EMPTY = new String[0];
+ private static final String[] EMPTY = {};
/**
* Static creator.
diff --git a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
index 6a4557875..1c7624b72 100644
--- a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
+++ b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
@@ -2184,7 +2184,7 @@ public class MockRestClient extends RestClient implements HttpClientConnection {
@Override /* HttpClientConnection */
public void sendRequestEntity(HttpEntityEnclosingRequest request) throws HttpException, IOException {
- byte[] body = new byte[0];
+ byte[] body = {};
HttpEntity entity = request.getEntity();
if (entity != null) {
long length = entity.getContentLength();
diff --git a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
index 50893e5a1..3b6fbd202 100644
--- a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
+++ b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
@@ -48,7 +48,7 @@ public class MockServletRequest implements HttpServletRequest {
private Map<String,String[]> headerMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
private Map<String,Object> attributeMap = map();
private String characterEncoding = "UTF-8";
- private byte[] content = new byte[0];
+ private byte[] content = {};
private String protocol = "HTTP/1.1";
private String scheme = "http";
private String serverName = "localhost";
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
index 7ede73063..09d2efb6d 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
@@ -81,7 +81,7 @@ public class RestOpAnnotation {
Class<? extends RestMatcher>[] matchers = new Class[0];
Class<? extends Encoder>[] encoders = new Class[0];
Class<? extends Serializer>[] serializers = new Class[0];
- Class<?>[] parsers=new Class<?>[0];
+ Class<?>[] parsers={};
OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
String clientVersion="", debug="", defaultAccept="", defaultCharset="", defaultContentType="", maxInput="", method="", rolesDeclared="", roleGuard="", summary="", value="";
String[] consumes={}, defaultRequestFormData={}, defaultRequestQueryData={}, defaultRequestAttributes={}, defaultRequestHeaders={}, defaultResponseHeaders={}, description={}, path={}, produces={};
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
index 221b8382e..2c8c3ad00 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
@@ -74,7 +74,7 @@ public class RestPatchAnnotation {
Class<? extends RestMatcher>[] matchers = new Class[0];
Class<? extends Encoder>[] encoders = new Class[0];
Class<? extends Serializer>[] serializers = new Class[0];
- Class<?>[] parsers=new Class<?>[0];
+ Class<?>[] parsers={};
OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
String clientVersion="", debug="", defaultAccept="", defaultCharset="", defaultContentType="", maxInput="", rolesDeclared="", roleGuard="", summary="", value="";
String[] consumes={}, defaultRequestFormData={}, defaultRequestQueryData={}, defaultRequestAttributes={}, defaultRequestHeaders={}, defaultResponseHeaders={}, description={}, path={}, produces={};
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
index 3e1e48115..79ff44c75 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
@@ -74,7 +74,7 @@ public class RestPostAnnotation {
Class<? extends RestMatcher>[] matchers = new Class[0];
Class<? extends Encoder>[] encoders = new Class[0];
Class<? extends Serializer>[] serializers = new Class[0];
- Class<?>[] parsers=new Class<?>[0];
+ Class<?>[] parsers={};
OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
String clientVersion="", debug="", defaultAccept="", defaultCharset="", defaultContentType="", maxInput="", rolesDeclared="", roleGuard="", summary="", value="";
String[] consumes={}, defaultRequestFormData={}, defaultRequestQueryData={}, defaultRequestAttributes={}, defaultRequestHeaders={}, defaultResponseHeaders={}, description={}, path={}, produces={};
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
index 96301fa75..02c89be18 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
@@ -74,7 +74,7 @@ public class RestPutAnnotation {
Class<? extends RestMatcher>[] matchers = new Class[0];
Class<? extends Encoder>[] encoders = new Class[0];
Class<? extends Serializer>[] serializers = new Class[0];
- Class<?>[] parsers=new Class<?>[0];
+ Class<?>[] parsers={};
OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
String clientVersion="", debug="", defaultAccept="", defaultCharset="", defaultContentType="", maxInput="", rolesDeclared="", roleGuard="", summary="", value="";
String[] consumes={}, defaultRequestFormData={}, defaultRequestQueryData={}, defaultRequestAttributes={}, defaultRequestHeaders={}, defaultResponseHeaders={}, description={}, path={}, produces={};
[juneau] 24/29: [juneau-utest] Remove redundant modifiers
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit c9d9bdd46b159ed868227478b9478edf5537ab9a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:37:12 2023 -0400
[juneau-utest] Remove redundant modifiers
---
.../java/org/apache/juneau/BeanConfigTest.java | 2 +-
.../java/org/apache/juneau/BeanContextTest.java | 6 +-
.../test/java/org/apache/juneau/BeanMapTest.java | 4 +-
.../test/java/org/apache/juneau/ClassMetaTest.java | 8 +-
.../test/java/org/apache/juneau/ProxyBeanTest.java | 2 +-
.../a/rttests/RoundTripAddClassAttrsTest.java | 6 +-
.../juneau/a/rttests/RoundTripBeanMapsTest.java | 8 +-
.../apache/juneau/a/rttests/RoundTripEnumTest.java | 2 +-
.../a/rttests/RoundTripObjectsAsStringsTest.java | 4 +-
.../a/rttests/RoundTripTransformBeansTest.java | 2 +-
.../apache/juneau/config/ConfigInterfaceTest.java | 190 ++++++++++-----------
.../java/org/apache/juneau/config/ConfigTest.java | 2 +-
.../org/apache/juneau/html/BasicHtml_Test.java | 6 +-
.../juneau/html/HtmlSchemaSerializerTest.java | 2 +-
.../http/remote/Remote_CommonInterfaces_Test.java | 22 +--
.../http/remote/Remote_ContentAnnotation_Test.java | 6 +-
.../remote/Remote_FormDataAnnotation_Test.java | 32 ++--
.../http/remote/Remote_HeaderAnnotation_Test.java | 28 +--
.../http/remote/Remote_PathAnnotation_Test.java | 24 +--
.../http/remote/Remote_QueryAnnotation_Test.java | 34 ++--
.../remote/Remote_RemoteOpAnnotation_Test.java | 12 +-
.../http/remote/Remote_RequestAnnotation_Test.java | 10 +-
.../remote/Remote_ResponseAnnotation_Test.java | 6 +-
.../org/apache/juneau/http/remote/Remote_Test.java | 50 +++---
.../juneau/http/remote/RrpcInterfaceTest.java | 2 +-
.../juneau/objecttools/ObjectMerger_Test.java | 2 +-
.../org/apache/juneau/reflect/ClassInfoTest.java | 32 ++--
.../apache/juneau/reflect/ExecutableInfoTest.java | 2 +-
.../org/apache/juneau/reflect/MethodInfoTest.java | 12 +-
.../org/apache/juneau/reflect/ParamInfoTest.java | 18 +-
.../Rest_AnnotationInheritance_Test.java | 11 +-
.../client/RestClient_Config_BeanContext_Test.java | 14 +-
.../rest/test/client/ThirdPartyProxyTest.java | 34 ++--
.../apache/juneau/svl/ResolvingJsonMapTest.java | 2 +-
.../juneau/transforms/BeanDictionaryComboTest.java | 4 +-
.../apache/juneau/transforms/BeanFilterTest.java | 8 +-
.../java/org/apache/juneau/xml/BasicXmlTest.java | 6 +-
.../apache/juneau/xml/XmlIgnoreCommentsTest.java | 6 +-
.../test/java/org/apache/juneau/xml/XmlTest.java | 2 +-
39 files changed, 310 insertions(+), 313 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java b/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java
index f3a2c4f43..72a0a447e 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java
@@ -540,7 +540,7 @@ public class BeanConfigTest {
fail("Failed reverse equality test of dynamic proxies beans: " + bm1 + " / " + bm2);
}
- public static interface A {
+ public interface A {
String getA();
void setA(String a);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanContextTest.java b/juneau-utest/src/test/java/org/apache/juneau/BeanContextTest.java
index 67714b109..6ec3e4c2c 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanContextTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanContextTest.java
@@ -27,9 +27,9 @@ public class BeanContextTest {
BeanContext bc = BeanContext.DEFAULT;
BeanSession bs = BeanContext.DEFAULT_SESSION;
- public static interface A1 {
- public int getF1();
- public void setF1(int f1);
+ public interface A1 {
+ int getF1();
+ void setF1(int f1);
}
@Test
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
index ea8303023..c153f2833 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
@@ -735,7 +735,7 @@ public class BeanMapTest {
assertEquals(HEnum.ONE, t7.getEnum2());
}
- public static enum HEnum {
+ public enum HEnum {
ONE, TWO, THREE
}
@@ -1356,7 +1356,7 @@ public class BeanMapTest {
assertEquals("ONE", m2.get("1"));
}
- public static enum TEnum {
+ public enum TEnum {
ONE, TWO, THREE;
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/ClassMetaTest.java b/juneau-utest/src/test/java/org/apache/juneau/ClassMetaTest.java
index d382d1685..1e39491c8 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/ClassMetaTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/ClassMetaTest.java
@@ -283,10 +283,10 @@ public class ClassMetaTest {
// Annotations
//-----------------------------------------------------------------------------------------------------------------
- @A(1) static interface CI1 {}
- @A(2) static interface CI2 extends CI1 {}
- @A(3) static interface CI3 {}
- @A(4) static interface CI4 {}
+ @A(1) interface CI1 {}
+ @A(2) interface CI2 extends CI1 {}
+ @A(3) interface CI3 {}
+ @A(4) interface CI4 {}
@A(5) static class C1 implements CI1, CI2 {}
@A(6) static class C2 extends C1 implements CI3 {}
@A(7) static class C3 extends C2 {}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/ProxyBeanTest.java b/juneau-utest/src/test/java/org/apache/juneau/ProxyBeanTest.java
index 944a2ade2..e2c28dc1e 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/ProxyBeanTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/ProxyBeanTest.java
@@ -31,7 +31,7 @@ public class ProxyBeanTest {
// testBasic
//====================================================================================================
- public static interface A {
+ public interface A {
void setFoo(int foo);
int getFoo();
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java
index 7ad777a17..1aa1b87f7 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java
@@ -128,9 +128,9 @@ public class RoundTripAddClassAttrsTest extends RoundTripTest {
assertEquals("foo", t.getF1());
}
- public static interface IA {
- public String getF1();
- public void setF1(String f1);
+ public interface IA {
+ String getF1();
+ void setF1(String f1);
}
public static abstract class AA implements IA {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
index 8db38c31e..e5d239fe8 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
@@ -146,9 +146,9 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
assertEquals(1, b.getF6());
}
- public static interface IBean {
- public String getF1();
- public void setF1(String f1);
+ public interface IBean {
+ String getF1();
+ void setF1(String f1);
}
public static abstract class ABean implements IBean {
@@ -802,7 +802,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
K t = K.create();
t = roundTrip(t, K.class);
}
- public static enum KEnum { FOO, BAR, BAZ }
+ public enum KEnum { FOO, BAR, BAZ }
public static class K {
private KEnum a, b, c;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripEnumTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripEnumTest.java
index c6b86b0d2..c4d6b555c 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripEnumTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripEnumTest.java
@@ -142,7 +142,7 @@ public class RoundTripEnumTest extends RoundTripTest {
private String val;
- private BEnum(String val) {
+ BEnum(String val) {
this.val = val;
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsAsStringsTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsAsStringsTest.java
index f6c78bfbe..f535bbfaf 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsAsStringsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsAsStringsTest.java
@@ -141,7 +141,7 @@ public class RoundTripObjectsAsStringsTest extends RoundTripTest {
}
- public static enum B1 {
+ public enum B1 {
X1(1),
X2(2),
X3(3);
@@ -152,7 +152,7 @@ public class RoundTripObjectsAsStringsTest extends RoundTripTest {
}
}
- public static enum B2 {
+ public enum B2 {
X1(1),
X2(2),
X3(3);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
index e7bf6513e..92956fe40 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
@@ -295,7 +295,7 @@ public class RoundTripTransformBeansTest extends RoundTripTest {
@Bean(dictionary={C3.class})
- public static interface C1<T> extends Serializable {
+ public interface C1<T> extends Serializable {
void setF1(T f1);
T getF1();
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java
index 926f45a48..315e897f5 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java
@@ -426,159 +426,159 @@ public class ConfigInterfaceTest {
assertObject(proxy.getEnum1d3dListMap().values().iterator().next().get(0)[0][0][0]).isType(TestEnum.class);
}
- public static interface ConfigInterface {
+ public interface ConfigInterface {
// Various primitives
- public String getString();
- public void setString(String x);
+ String getString();
+ void setString(String x);
- public int getInt();
- public void setInt(int x);
+ int getInt();
+ void setInt(int x);
- public Integer getInteger();
- public void setInteger(Integer x);
+ Integer getInteger();
+ void setInteger(Integer x);
- public boolean isBoolean();
- public void setBoolean(boolean x);
+ boolean isBoolean();
+ void setBoolean(boolean x);
- public Boolean getBooleanObject();
- public void setBooleanObject(Boolean x);
+ Boolean getBooleanObject();
+ void setBooleanObject(Boolean x);
- public float getFloat();
- public void setFloat(float x);
+ float getFloat();
+ void setFloat(float x);
- public Float getFloatObject();
- public void setFloatObject(Float x);
+ Float getFloatObject();
+ void setFloatObject(Float x);
- public int[][][] getInt3dArray();
- public void setInt3dArray(int[][][] x);
+ int[][][] getInt3dArray();
+ void setInt3dArray(int[][][] x);
- public Integer[][][] getInteger3dArray();
- public void setInteger3dArray(Integer[][][] x);
+ Integer[][][] getInteger3dArray();
+ void setInteger3dArray(Integer[][][] x);
- public String[][][] getString3dArray();
- public void setString3dArray(String[][][] x);
+ String[][][] getString3dArray();
+ void setString3dArray(String[][][] x);
- public List<Integer> getIntegerList();
- public void setIntegerList(List<Integer> x);
+ List<Integer> getIntegerList();
+ void setIntegerList(List<Integer> x);
- public List<List<List<Integer>>> getInteger3dList();
- public void setInteger3dList(List<List<List<Integer>>> x);
+ List<List<List<Integer>>> getInteger3dList();
+ void setInteger3dList(List<List<List<Integer>>> x);
- public List<Integer[][][]> getInteger1d3dList();
- public void setInteger1d3dList(List<Integer[][][]> x);
+ List<Integer[][][]> getInteger1d3dList();
+ void setInteger1d3dList(List<Integer[][][]> x);
- public List<int[][][]> getInt1d3dList();
- public void setInt1d3dList(List<int[][][]> x);
+ List<int[][][]> getInt1d3dList();
+ void setInt1d3dList(List<int[][][]> x);
- public List<String> getStringList();
- public void setStringList(List<String> x);
+ List<String> getStringList();
+ void setStringList(List<String> x);
// Beans
- public ABean getBean();
- public void setBean(ABean x);
+ ABean getBean();
+ void setBean(ABean x);
- public ABean[][][] getBean3dArray();
- public void setBean3dArray(ABean[][][] x);
+ ABean[][][] getBean3dArray();
+ void setBean3dArray(ABean[][][] x);
- public List<ABean> getBeanList();
- public void setBeanList(List<ABean> x);
+ List<ABean> getBeanList();
+ void setBeanList(List<ABean> x);
- public List<ABean[][][]> getBean1d3dList();
- public void setBean1d3dList(List<ABean[][][]> x);
+ List<ABean[][][]> getBean1d3dList();
+ void setBean1d3dList(List<ABean[][][]> x);
- public Map<String,ABean> getBeanMap();
- public void setBeanMap(Map<String,ABean> x);
+ Map<String,ABean> getBeanMap();
+ void setBeanMap(Map<String,ABean> x);
- public Map<String,List<ABean>> getBeanListMap();
- public void setBeanListMap(Map<String,List<ABean>> x);
+ Map<String,List<ABean>> getBeanListMap();
+ void setBeanListMap(Map<String,List<ABean>> x);
- public Map<String,List<ABean[][][]>> getBean1d3dListMap();
- public void setBean1d3dListMap(Map<String,List<ABean[][][]>> x);
+ Map<String,List<ABean[][][]>> getBean1d3dListMap();
+ void setBean1d3dListMap(Map<String,List<ABean[][][]>> x);
- public Map<Integer,List<ABean>> getBeanListMapIntegerKeys();
- public void setBeanListMapIntegerKeys(Map<Integer,List<ABean>> x);
+ Map<Integer,List<ABean>> getBeanListMapIntegerKeys();
+ void setBeanListMapIntegerKeys(Map<Integer,List<ABean>> x);
// Typed beans
- public TypedBean getTypedBean();
- public void setTypedBean(TypedBean x);
+ TypedBean getTypedBean();
+ void setTypedBean(TypedBean x);
- public TypedBean[][][] getTypedBean3dArray();
- public void setTypedBean3dArray(TypedBean[][][] x);
+ TypedBean[][][] getTypedBean3dArray();
+ void setTypedBean3dArray(TypedBean[][][] x);
- public List<TypedBean> getTypedBeanList();
- public void setTypedBeanList(List<TypedBean> x);
+ List<TypedBean> getTypedBeanList();
+ void setTypedBeanList(List<TypedBean> x);
- public List<TypedBean[][][]> getTypedBean1d3dList();
- public void setTypedBean1d3dList(List<TypedBean[][][]> x);
+ List<TypedBean[][][]> getTypedBean1d3dList();
+ void setTypedBean1d3dList(List<TypedBean[][][]> x);
- public Map<String,TypedBean> getTypedBeanMap();
- public void setTypedBeanMap(Map<String,TypedBean> x);
+ Map<String,TypedBean> getTypedBeanMap();
+ void setTypedBeanMap(Map<String,TypedBean> x);
- public Map<String,List<TypedBean>> getTypedBeanListMap();
- public void setTypedBeanListMap(Map<String,List<TypedBean>> x);
+ Map<String,List<TypedBean>> getTypedBeanListMap();
+ void setTypedBeanListMap(Map<String,List<TypedBean>> x);
- public Map<String,List<TypedBean[][][]>> getTypedBean1d3dListMap();
- public void setTypedBean1d3dListMap(Map<String,List<TypedBean[][][]>> x);
+ Map<String,List<TypedBean[][][]>> getTypedBean1d3dListMap();
+ void setTypedBean1d3dListMap(Map<String,List<TypedBean[][][]>> x);
- public Map<Integer,List<TypedBean>> getTypedBeanListMapIntegerKeys();
- public void setTypedBeanListMapIntegerKeys(Map<Integer,List<TypedBean>> x);
+ Map<Integer,List<TypedBean>> getTypedBeanListMapIntegerKeys();
+ void setTypedBeanListMapIntegerKeys(Map<Integer,List<TypedBean>> x);
// Swapped POJOs
- public SwappedObject getSwappedObject();
- public void setSwappedObject(SwappedObject x);
+ SwappedObject getSwappedObject();
+ void setSwappedObject(SwappedObject x);
- public SwappedObject[][][] getSwappedObject3dArray();
- public void setSwappedObject3dArray(SwappedObject[][][] x);
+ SwappedObject[][][] getSwappedObject3dArray();
+ void setSwappedObject3dArray(SwappedObject[][][] x);
- public Map<SwappedObject,SwappedObject> getSwappedObjectMap();
- public void setSwappedObjectMap(Map<SwappedObject,SwappedObject> x);
+ Map<SwappedObject,SwappedObject> getSwappedObjectMap();
+ void setSwappedObjectMap(Map<SwappedObject,SwappedObject> x);
- public Map<SwappedObject,SwappedObject[][][]> getSwappedObject3dMap();
- public void setSwappedObject3dMap(Map<SwappedObject,SwappedObject[][][]> x);
+ Map<SwappedObject,SwappedObject[][][]> getSwappedObject3dMap();
+ void setSwappedObject3dMap(Map<SwappedObject,SwappedObject[][][]> x);
// Implicit swapped POJOs
- public ImplicitSwappedObject getImplicitSwappedObject();
- public void setImplicitSwappedObject(ImplicitSwappedObject x);
+ ImplicitSwappedObject getImplicitSwappedObject();
+ void setImplicitSwappedObject(ImplicitSwappedObject x);
- public ImplicitSwappedObject[][][] getImplicitSwappedObject3dArray();
- public void setImplicitSwappedObject3dArray(ImplicitSwappedObject[][][] x);
+ ImplicitSwappedObject[][][] getImplicitSwappedObject3dArray();
+ void setImplicitSwappedObject3dArray(ImplicitSwappedObject[][][] x);
- public Map<ImplicitSwappedObject,ImplicitSwappedObject> getImplicitSwappedObjectMap();
- public void setImplicitSwappedObjectMap(Map<ImplicitSwappedObject,ImplicitSwappedObject> x);
+ Map<ImplicitSwappedObject,ImplicitSwappedObject> getImplicitSwappedObjectMap();
+ void setImplicitSwappedObjectMap(Map<ImplicitSwappedObject,ImplicitSwappedObject> x);
- public Map<ImplicitSwappedObject,ImplicitSwappedObject[][][]> getImplicitSwappedObject3dMap();
- public void setImplicitSwappedObject3dMap(Map<ImplicitSwappedObject,ImplicitSwappedObject[][][]> x);
+ Map<ImplicitSwappedObject,ImplicitSwappedObject[][][]> getImplicitSwappedObject3dMap();
+ void setImplicitSwappedObject3dMap(Map<ImplicitSwappedObject,ImplicitSwappedObject[][][]> x);
// Enums
- public TestEnum getEnum();
- public void setEnum(TestEnum x);
+ TestEnum getEnum();
+ void setEnum(TestEnum x);
- public TestEnum[][][] getEnum3d();
- public void setEnum3d(TestEnum[][][] x);
+ TestEnum[][][] getEnum3d();
+ void setEnum3d(TestEnum[][][] x);
- public List<TestEnum> getEnumList();
- public void setEnumList(List<TestEnum> x);
+ List<TestEnum> getEnumList();
+ void setEnumList(List<TestEnum> x);
- public List<List<List<TestEnum>>> getEnum3dList();
- public void setEnum3dList(List<List<List<TestEnum>>> x);
+ List<List<List<TestEnum>>> getEnum3dList();
+ void setEnum3dList(List<List<List<TestEnum>>> x);
- public List<TestEnum[][][]> getEnum1d3dList();
- public void setEnum1d3dList(List<TestEnum[][][]> x);
+ List<TestEnum[][][]> getEnum1d3dList();
+ void setEnum1d3dList(List<TestEnum[][][]> x);
- public Map<TestEnum,TestEnum> getEnumMap();
- public void setEnumMap(Map<TestEnum,TestEnum> x);
+ Map<TestEnum,TestEnum> getEnumMap();
+ void setEnumMap(Map<TestEnum,TestEnum> x);
- public Map<TestEnum,TestEnum[][][]> getEnum3dArrayMap();
- public void setEnum3dArrayMap(Map<TestEnum,TestEnum[][][]> x);
+ Map<TestEnum,TestEnum[][][]> getEnum3dArrayMap();
+ void setEnum3dArrayMap(Map<TestEnum,TestEnum[][][]> x);
- public Map<TestEnum,List<TestEnum[][][]>> getEnum1d3dListMap();
- public void setEnum1d3dListMap(Map<TestEnum,List<TestEnum[][][]>> x);
+ Map<TestEnum,List<TestEnum[][][]>> getEnum1d3dListMap();
+ void setEnum1d3dListMap(Map<TestEnum,List<TestEnum[][][]>> x);
}
}
\ No newline at end of file
diff --git a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
index e7130c3d2..6dea8c468 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
@@ -921,7 +921,7 @@ public class ConfigTest {
assertThrown(()->c.getSection("T").asInterface(ABean.class).get()).asMessage().is("Class 'org.apache.juneau.config.ConfigTest$ABean' passed to toInterface() is not an interface.");
}
- public static interface AInterface {
+ public interface AInterface {
String getFoo();
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/html/BasicHtml_Test.java b/juneau-utest/src/test/java/org/apache/juneau/html/BasicHtml_Test.java
index c6ddc1257..ecff429dd 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/html/BasicHtml_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/html/BasicHtml_Test.java
@@ -3486,9 +3486,9 @@ public class BasicHtml_Test {
}
}
- public static interface IA {
- public String getA();
- public void setA(String a);
+ public interface IA {
+ String getA();
+ void setA(String a);
}
public static abstract class AA implements IA {}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java
index ca77de8cc..063685617 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java
@@ -70,7 +70,7 @@ public class HtmlSchemaSerializerTest {
public boolean isCurrent;
}
- public static enum StateEnum {
+ public enum StateEnum {
AL,PA,NC
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
index 2f1833eaa..ee3822434 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
@@ -42,10 +42,10 @@ public class Remote_CommonInterfaces_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote
- public static interface A {
- public String putX1(@Content String b);
- public String getX2(@Query("foo") String b);
- public String getX3(@Header("foo") String b);
+ public interface A {
+ String putX1(@Content String b);
+ String getX2(@Query("foo") String b);
+ String getX3(@Header("foo") String b);
}
@Rest
@@ -81,7 +81,7 @@ public class Remote_CommonInterfaces_Test {
@Remote
@Rest
- public static interface B extends BasicJson5Config {
+ public interface B extends BasicJson5Config {
String putX1(@Content String b);
String getX2(@Query("foo") String b);
String getX3(@Header("foo") String b);
@@ -116,7 +116,7 @@ public class Remote_CommonInterfaces_Test {
@Remote
@Rest
- public static interface C extends BasicJson5Config {
+ public interface C extends BasicJson5Config {
Ok ok();
Accepted accepted();
AlreadyReported alreadyReported();
@@ -198,7 +198,7 @@ public class Remote_CommonInterfaces_Test {
@Remote
@Rest
- public static interface D extends BasicJson5Config {
+ public interface D extends BasicJson5Config {
BasicResource httpResource() throws IOException ;
}
@@ -225,7 +225,7 @@ public class Remote_CommonInterfaces_Test {
@Remote
@Rest
- public static interface E extends BasicJson5Config {
+ public interface E extends BasicJson5Config {
void badRequest() throws BadRequest;
void conflict() throws Conflict;
void expectationFailed() throws ExpectationFailed;
@@ -613,7 +613,7 @@ public class Remote_CommonInterfaces_Test {
@Remote
@Rest
- public static interface F extends BasicJson5Config {
+ public interface F extends BasicJson5Config {
BadRequest badRequest();
Conflict conflict();
ExpectationFailed expectationFailed();
@@ -828,7 +828,7 @@ public class Remote_CommonInterfaces_Test {
@Remote
@Rest
- public static interface G extends BasicJson5Config {
+ public interface G extends BasicJson5Config {
Reader reader();
InputStream inputStream();
}
@@ -857,7 +857,7 @@ public class Remote_CommonInterfaces_Test {
@Remote
@Rest
- public static interface IH extends BasicJson5Config {
+ public interface IH extends BasicJson5Config {
SeeOtherRoot seeOtherRoot();
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ContentAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ContentAnnotation_Test.java
index 90334b14b..22341386d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ContentAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ContentAnnotation_Test.java
@@ -127,7 +127,7 @@ public class Remote_ContentAnnotation_Test {
}
@Remote
- public static interface A1 {
+ public interface A1 {
String postX1(@Content int b);
String postX2(@Content float b);
String postX3(@Content Bean b);
@@ -222,7 +222,7 @@ public class Remote_ContentAnnotation_Test {
}
}
@Remote
- public static interface B1 {
+ public interface B1 {
String postX1(@Content int b);
String postX2(@Content float b);
String postX3(@Content Bean b);
@@ -303,7 +303,7 @@ public class Remote_ContentAnnotation_Test {
}
}
@Remote
- public static interface C1 {
+ public interface C1 {
String postX1(@Content int b);
String postX2(@Content float b);
String postX3(@Content Bean b);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
index 3fedad0a6..c0914416d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
@@ -78,7 +78,7 @@ public class Remote_FormDataAnnotation_Test {
}
@Remote
- public static interface A1 {
+ public interface A1 {
@RemotePost(path="a") String x1(@FormData("x") int b);
@RemotePost(path="a") String x2(@FormData("x") float b);
@RemotePost(path="a") String x3(@FormData("x") Bean b);
@@ -152,7 +152,7 @@ public class Remote_FormDataAnnotation_Test {
}
@Remote
- public static interface B1 {
+ public interface B1 {
@RemoteOp(path="/") String postX1(@FormData("x") @Schema(df="foo") String b);
@RemoteOp(path="/") String postX2(@FormData("x") @Schema(df="foo",aev=true) String b);
@RemoteOp(path="/") String postX3(@FormData("x") @Schema(df="") String b);
@@ -189,7 +189,7 @@ public class Remote_FormDataAnnotation_Test {
}
@Remote
- public static interface C1 {
+ public interface C1 {
@RemoteOp(path="/a") String postX1(@FormData("x") String...b);
@RemoteOp(path="/b") String postX2(@FormData("x") String...b);
@RemoteOp(path="/a") String postX3(@FormData("x") @Schema(cf="csv") String...b);
@@ -238,7 +238,7 @@ public class Remote_FormDataAnnotation_Test {
}
@Remote
- public static interface D1 {
+ public interface D1 {
@RemoteOp(path="/") String postX1(@FormData("x") @Schema(min="1",max="10") int b);
@RemoteOp(path="/") String postX2(@FormData("x") @Schema(min="1",max="10",emin=false,emax=false) int b);
@RemoteOp(path="/") String postX3(@FormData("x") @Schema(min="1",max="10",emin=true,emax=true) int b);
@@ -488,7 +488,7 @@ public class Remote_FormDataAnnotation_Test {
}
@Remote
- public static interface E1 {
+ public interface E1 {
@RemoteOp(path="/") String postX1(@FormData("x") @Schema(cf="pipes", mini=1,maxi=2) String...b);
@RemoteOp(path="/") String postX2(@FormData("x") @Schema(items=@Items(cf="pipes", mini=1,maxi=2)) String[]...b);
@RemoteOp(path="/") String postX3(@FormData("x") @Schema(cf="pipes",ui=false) String...b);
@@ -531,7 +531,7 @@ public class Remote_FormDataAnnotation_Test {
}
@Remote
- public static interface F1 {
+ public interface F1 {
@RemoteOp(path="/") String postX1(@FormData("x") @Schema(minl=2,maxl=3) String b);
@RemoteOp(path="/") String postX2(@FormData("x") @Schema(cf="pipes",items=@Items(minl=2,maxl=3)) String...b);
@RemoteOp(path="/") String postX3(@FormData("x") @Schema(e={"foo"}) String b);
@@ -580,7 +580,7 @@ public class Remote_FormDataAnnotation_Test {
}
@Remote
- public static interface G1 {
+ public interface G1 {
@RemoteOp(path="/") String postX1(@FormData("x") @Schema(mo="2") int b);
@RemoteOp(path="/") String postX2(@FormData("x") @Schema(mo="2") short b);
@RemoteOp(path="/") String postX3(@FormData("x") @Schema(mo="2") long b);
@@ -643,7 +643,7 @@ public class Remote_FormDataAnnotation_Test {
}
@Remote
- public static interface H1 {
+ public interface H1 {
@RemoteOp(path="/") String postX1(@FormData("x") String b);
@RemoteOp(path="/") String postX2(@FormData("x") @Schema(r=false) String b);
@RemoteOp(path="/") String postX3(@FormData("x") @Schema(r=true) String b);
@@ -671,7 +671,7 @@ public class Remote_FormDataAnnotation_Test {
}
@Remote
- public static interface I1 {
+ public interface I1 {
@RemoteOp(path="/") String postX1(@FormData("x") @Schema(aev=true) String b);
@RemoteOp(path="/") String postX2(@FormData("x") @Schema(aev=true,sie=false) String b);
@RemoteOp(path="/") String postX3(@FormData("x") @Schema(sie=true) String b);
@@ -698,7 +698,7 @@ public class Remote_FormDataAnnotation_Test {
}
@Remote
- public static interface J1 {
+ public interface J1 {
@RemoteOp(path="/") String postX1(@FormData(name="x",serializer=MockWriterSerializer.X.class) String b);
}
@@ -725,7 +725,7 @@ public class Remote_FormDataAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K1 {
+ public interface K1 {
@RemoteOp(path="/") String postX1(@Request K1a rb);
@RemoteOp(path="/") String postX2(@Request(serializer=MockWriterSerializer.X.class) K1a rb);
}
@@ -787,7 +787,7 @@ public class Remote_FormDataAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K2 {
+ public interface K2 {
@RemoteOp(path="/") String postX1(@Request K2a rb);
@RemoteOp(path="/") String postX2(@Request(serializer=MockWriterSerializer.X.class) K2a rb);
}
@@ -825,7 +825,7 @@ public class Remote_FormDataAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K3 {
+ public interface K3 {
@RemoteOp(path="/") String postX1(@Request K3a rb);
@RemoteOp(path="/") String postX2(@Request(serializer=MockWriterSerializer.X.class) K3a rb);
}
@@ -867,7 +867,7 @@ public class Remote_FormDataAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K4 {
+ public interface K4 {
String post(@Request C04_Bean rb);
}
@@ -889,7 +889,7 @@ public class Remote_FormDataAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K5 {
+ public interface K5 {
String post(@Request K5a rb);
}
@@ -911,7 +911,7 @@ public class Remote_FormDataAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K6 {
+ public interface K6 {
@RemoteOp(path="/") String postX1(@Request K6a rb);
@RemoteOp(path="/") String postX2(@Request(serializer=MockWriterSerializer.X.class) K6a rb);
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
index a0f371dfd..60bc0e071 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
@@ -63,7 +63,7 @@ public class Remote_HeaderAnnotation_Test {
}
@Remote
- public static interface A1 {
+ public interface A1 {
@RemoteOp(path="a") String getX1(@Header("x") int b);
@RemoteOp(path="a") String getX2(@Header("x") float b);
@RemoteOp(path="a") String getX3(@Header("x") Bean b);
@@ -126,7 +126,7 @@ public class Remote_HeaderAnnotation_Test {
}
@Remote
- public static interface B1 {
+ public interface B1 {
@RemoteOp(path="/") String getX1(@Header("x") @Schema(df="foo") String b);
@RemoteOp(path="/") String getX2(@Header("x") @Schema(df="foo",aev=true) String b);
@RemoteOp(path="/") String getX3(@Header("x") @Schema(df="") String b);
@@ -160,7 +160,7 @@ public class Remote_HeaderAnnotation_Test {
}
@Remote
- public static interface C1 {
+ public interface C1 {
@RemoteOp(path="/a") String getX1(@Header("x") String...b);
@RemoteOp(path="/a") String getX2(@Header("x") @Schema(cf="csv") String...b);
@RemoteOp(path="/a") String getX3(@Header("x") @Schema(cf="ssv") String...b);
@@ -196,7 +196,7 @@ public class Remote_HeaderAnnotation_Test {
}
@Remote
- public static interface D1 {
+ public interface D1 {
@RemoteOp(path="/") String getX1(@Header("x") @Schema(min="1",max="10") int b);
@RemoteOp(path="/") String getX2(@Header("x") @Schema(min="1",max="10",emin=false,emax=false) int b);
@RemoteOp(path="/") String getX3(@Header("x") @Schema(min="1",max="10",emin=true,emax=true) int b);
@@ -446,7 +446,7 @@ public class Remote_HeaderAnnotation_Test {
}
@Remote
- public static interface E1 {
+ public interface E1 {
@RemoteOp(path="/") String getX1(@Header("x") @Schema(cf="pipes",mini=1,maxi=2) String...b);
@RemoteOp(path="/") String getX2(@Header("x") @Schema(items=@Items(cf="pipes",mini=1,maxi=2)) String[]...b);
@RemoteOp(path="/") String getX3(@Header("x") @Schema(cf="pipes",ui=false) String...b);
@@ -490,7 +490,7 @@ public class Remote_HeaderAnnotation_Test {
}
@Remote
- public static interface F1 {
+ public interface F1 {
@RemoteOp(path="/") String getX1(@Header("x") @Schema(minl=2,maxl=3) String b);
@RemoteOp(path="/") String getX2(@Header("x") @Schema(cf="pipes",items=@Items(minl=2,maxl=3)) String...b);
@RemoteOp(path="/") String getX3(@Header("x") @Schema(e={"foo"}) String b);
@@ -540,7 +540,7 @@ public class Remote_HeaderAnnotation_Test {
}
@Remote
- public static interface G1 {
+ public interface G1 {
@RemoteOp(path="/") String getX1(@Header("x") @Schema(mo="2") int b);
@RemoteOp(path="/") String getX2(@Header("x") @Schema(mo="2") short b);
@RemoteOp(path="/") String getX3(@Header("x") @Schema(mo="2") long b);
@@ -604,7 +604,7 @@ public class Remote_HeaderAnnotation_Test {
}
@Remote
- public static interface H1 {
+ public interface H1 {
@RemoteOp(path="/") String getX1(@Header("x") String b);
@RemoteOp(path="/") String getX2(@Header("x") @Schema(r=false) String b);
@RemoteOp(path="/") String getX3(@Header("x") @Schema(r=true) String b);
@@ -633,7 +633,7 @@ public class Remote_HeaderAnnotation_Test {
}
@Remote
- public static interface I1 {
+ public interface I1 {
@RemoteOp(path="/") String getX1(@Header("x") @Schema(aev=true) String b);
@RemoteOp(path="/") String getX2(@Header("x") @Schema(aev=true,sie=false) String b);
@RemoteOp(path="/") String getX3(@Header("x") @Schema(sie=true) String b);
@@ -661,7 +661,7 @@ public class Remote_HeaderAnnotation_Test {
}
@Remote
- public static interface J1 {
+ public interface J1 {
@RemoteOp(path="/") String getX1(@Header(name="x",serializer=MockWriterSerializer.X.class) String b);
}
@@ -688,7 +688,7 @@ public class Remote_HeaderAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K1 {
+ public interface K1 {
@RemoteOp(path="/") String getX1(@Request K1a rb);
@RemoteOp(path="/") String getX2(@Request(serializer=MockWriterSerializer.X.class) K1a rb);
}
@@ -750,7 +750,7 @@ public class Remote_HeaderAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K2 {
+ public interface K2 {
@RemoteOp(path="/") String getX1(@Request K2a rb);
@RemoteOp(path="/") String getX2(@Request(serializer=MockWriterSerializer.X.class) K2a rb);
}
@@ -788,7 +788,7 @@ public class Remote_HeaderAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K3 {
+ public interface K3 {
@RemoteOp(path="/") String getX1(@Request K3a rb);
@RemoteOp(path="/") String getX2(@Request(serializer=MockWriterSerializer.X.class) K3a rb);
}
@@ -834,7 +834,7 @@ public class Remote_HeaderAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K4 {
+ public interface K4 {
@RemoteOp(path="/") String getX1(@Request K4a rb);
@RemoteOp(path="/") String getX2(@Request(serializer=MockWriterSerializer.X.class) K4a rb);
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
index 2958d1d1f..0252df464 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
@@ -63,7 +63,7 @@ public class Remote_PathAnnotation_Test {
}
@Remote
- public static interface A1 {
+ public interface A1 {
@RemoteOp(path="a/{x}") String getX1(@Path("x") int b);
@RemoteOp(path="a/{x}") String getX2(@Path("x") float b);
@RemoteOp(path="a/{x}") String getX3(@Path("x") Bean b);
@@ -129,7 +129,7 @@ public class Remote_PathAnnotation_Test {
}
@Remote
- public static interface B1 {
+ public interface B1 {
@RemoteOp(path="/a/{x}") String getX1(@Path("x") String...b);
@RemoteOp(path="/a/{x}") String getX2(@Path("x") @Schema(cf="csv") String...b);
@RemoteOp(path="/a/{x}") String getX3(@Path("x") @Schema(cf="ssv") String...b);
@@ -165,7 +165,7 @@ public class Remote_PathAnnotation_Test {
}
@Remote
- public static interface C1 {
+ public interface C1 {
@RemoteOp(path="/a/{x}") String getX1(@Path("x") @Schema(min="1",max="10") int b);
@RemoteOp(path="/a/{x}") String getX2(@Path("x") @Schema(min="1",max="10",emin=false,emax=false) int b);
@RemoteOp(path="/a/{x}") String getX3(@Path("x") @Schema(min="1",max="10",emin=true,emax=true) int b);
@@ -397,7 +397,7 @@ public class Remote_PathAnnotation_Test {
}
@Remote
- public static interface D1 {
+ public interface D1 {
@RemoteOp(path="/{x}") String getX1(@Path("x") @Schema(cf="pipes",mini=1,maxi=2) String...b);
@RemoteOp(path="/{x}") String getX2(@Path("x") @Schema(items=@Items(cf="pipes",mini=1,maxi=2)) String[]...b);
@RemoteOp(path="/{x}") String getX3(@Path("x") @Schema(cf="pipes",ui=false) String...b);
@@ -441,7 +441,7 @@ public class Remote_PathAnnotation_Test {
}
@Remote
- public static interface E1 {
+ public interface E1 {
@RemoteOp(path="/{x}") String getX1(@Path("x") @Schema(minl=2,maxl=3) String b);
@RemoteOp(path="/{x}") String getX2(@Path("x") @Schema(cf="pipes",items=@Items(minl=2,maxl=3)) String...b);
@RemoteOp(path="/{x}") String getX3(@Path("x") @Schema(e={"foo"}) String b);
@@ -488,7 +488,7 @@ public class Remote_PathAnnotation_Test {
}
@Remote
- public static interface F1 {
+ public interface F1 {
@RemoteOp(path="/{x}") String getX1(@Path("x") @Schema(mo="2") int b);
@RemoteOp(path="/{x}") String getX2(@Path("x") @Schema(mo="2") short b);
@RemoteOp(path="/{x}") String getX3(@Path("x") @Schema(mo="2") long b);
@@ -547,7 +547,7 @@ public class Remote_PathAnnotation_Test {
}
@Remote
- public static interface G1 {
+ public interface G1 {
@RemoteOp(path="/{x}") String getX1(@Path("x") String b);
}
@@ -571,7 +571,7 @@ public class Remote_PathAnnotation_Test {
}
@Remote
- public static interface H1 {
+ public interface H1 {
@RemoteOp(path="/{x}") String getX1(@Path(name="x",serializer=MockWriterSerializer.X.class) String b);
}
@@ -598,7 +598,7 @@ public class Remote_PathAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K1 {
+ public interface K1 {
@RemoteOp(path="/{a}/{b}/{c}/{e}/{g}/{h}") String getX1(@Request K1a rb);
@RemoteOp(path="/{a}/{b}/{c}/{e}/{g}/{h}") String getX2(@Request(serializer=MockWriterSerializer.X.class) K1a rb);
}
@@ -644,7 +644,7 @@ public class Remote_PathAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K2 {
+ public interface K2 {
@RemoteOp(path="/{a1}/{a2}/{a3}/{a4}/{b1}/{b2}/{b3}/{c1}/{c2}/{c3}/{c4}") String getX1(@Request K2a rb);
@RemoteOp(path="/{a1}/{a2}/{a3}/{a4}/{b1}/{b2}/{b3}/{c1}/{c2}/{c3}/{c4}") String getX2(@Request(serializer=MockWriterSerializer.X.class) K2a rb);
}
@@ -682,7 +682,7 @@ public class Remote_PathAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K3 {
+ public interface K3 {
@RemoteOp(path="/{a1}/{a2}/{a3}/{a4}/{b1}/{b2}/{b3}/{c1}/{c2}/{c3}/{c4}/{e1}/{e2}/{e3}/{e4}") String getX1(@Request K3a rb);
@RemoteOp(path="/{a1}/{a2}/{a3}/{a4}/{b1}/{b2}/{b3}/{c1}/{c2}/{c3}/{c4}/{e1}/{e2}/{e3}/{e4}") String getX2(@Request(serializer=MockWriterSerializer.X.class) K3a rb);
}
@@ -724,7 +724,7 @@ public class Remote_PathAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K4 {
+ public interface K4 {
@RemoteOp(path="/{a}/{b}/{c}/{d}/{f}/{g}/{h}") String getX1(@Request K4a rb);
@RemoteOp(path="/{a}/{b}/{c}/{d}/{f}/{g}/{h}") String getX2(@Request(serializer=MockWriterSerializer.X.class) K4a rb);
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
index 33214c50a..5c62bf2d4 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
@@ -65,7 +65,7 @@ public class Remote_QueryAnnotation_Test {
}
@Remote
- public static interface A1 {
+ public interface A1 {
@RemoteOp(path="a") String getX1(@Query("x") int b);
@RemoteOp(path="a") String getX2(@Query("x") float b);
@RemoteOp(path="a") String getX3(@Query("x") Bean b);
@@ -135,7 +135,7 @@ public class Remote_QueryAnnotation_Test {
}
@Remote
- public static interface B1 {
+ public interface B1 {
@RemoteOp(path="/") String getX1(@Query("x") @Schema(df="foo") String b);
@RemoteOp(path="/") String getX2(@Query("x") @Schema(df="foo",aev=true) String b);
@RemoteOp(path="/") String getX3(@Query("x") @Schema(df="") String b);
@@ -172,7 +172,7 @@ public class Remote_QueryAnnotation_Test {
}
@Remote
- public static interface C1 {
+ public interface C1 {
@RemoteOp(path="/a") String getX1(@Query("x") String...b);
@RemoteOp(path="/b") String getX2(@Query("x") String...b);
@RemoteOp(path="/a") String getX3(@Query("x") @Schema(cf="csv") String...b);
@@ -221,7 +221,7 @@ public class Remote_QueryAnnotation_Test {
}
@Remote
- public static interface D1 {
+ public interface D1 {
@RemoteOp(path="/") String getX1(@Query("x") @Schema(min="1",max="10") int b);
@RemoteOp(path="/") String getX2(@Query("x") @Schema(min="1",max="10",emin=false,emax=false) int b);
@RemoteOp(path="/") String getX3(@Query("x") @Schema(min="1",max="10",emin=true,emax=true) int b);
@@ -470,7 +470,7 @@ public class Remote_QueryAnnotation_Test {
}
@Remote
- public static interface E1 {
+ public interface E1 {
@RemoteOp(path="/") String getX1(@Query("x") @Schema(cf="pipes",mini=1,maxi=2) String...b);
@RemoteOp(path="/") String getX2(@Query("x") @Schema(items=@Items(cf="pipes",mini=1,maxi=2)) String[]...b);
@RemoteOp(path="/") String getX3(@Query("x") @Schema(cf="pipes",ui=false) String...b);
@@ -513,7 +513,7 @@ public class Remote_QueryAnnotation_Test {
}
@Remote
- public static interface F1 {
+ public interface F1 {
@RemoteOp(path="/") String getX1(@Query("x") @Schema(minl=2,maxl=3) String b);
@RemoteOp(path="/") String getX2(@Query("x") @Schema(cf="pipes",items=@Items(minl=2,maxl=3)) String...b);
@RemoteOp(path="/") String getX3(@Query("x") @Schema(e={"foo"}) String b);
@@ -562,7 +562,7 @@ public class Remote_QueryAnnotation_Test {
}
@Remote
- public static interface G1 {
+ public interface G1 {
@RemoteOp(path="/") String getX1(@Query("x") @Schema(mo="2") int b);
@RemoteOp(path="/") String getX2(@Query("x") @Schema(mo="2") short b);
@RemoteOp(path="/") String getX3(@Query("x") @Schema(mo="2") long b);
@@ -625,7 +625,7 @@ public class Remote_QueryAnnotation_Test {
}
@Remote
- public static interface H1 {
+ public interface H1 {
@RemoteOp(path="/") String getX1(@Query("x") String b);
@RemoteOp(path="/") String getX2(@Query("x") @Schema(r=false) String b);
@RemoteOp(path="/") String getX3(@Query("x") @Schema(r=true) String b);
@@ -653,7 +653,7 @@ public class Remote_QueryAnnotation_Test {
}
@Remote
- public static interface I1 {
+ public interface I1 {
@RemoteOp(path="/") String getX1(@Query("x") @Schema(aev=true) String b);
@RemoteOp(path="/") String getX2(@Query("x") @Schema(aev=true,sie=false) String b);
@RemoteOp(path="/") String getX3(@Query("x") @Schema(sie=true) String b);
@@ -680,7 +680,7 @@ public class Remote_QueryAnnotation_Test {
}
@Remote
- public static interface J1 {
+ public interface J1 {
@RemoteOp(path="/") String getX1(@Query(name="x",serializer=MockWriterSerializer.X.class) String b);
}
@@ -707,12 +707,12 @@ public class Remote_QueryAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K1 {
+ public interface K1 {
@RemoteOp(path="/") String getX1(@Request K1b rb);
@RemoteOp(path="/") String getX2(@Request(serializer=MockWriterSerializer.X.class) K1b rb);
}
- public static interface K1a {
+ public interface K1a {
@Query String getA();
@Query("b") String getX1();
@Query("c") String getX2();
@@ -752,7 +752,7 @@ public class Remote_QueryAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K2 {
+ public interface K2 {
@RemoteOp(path="/") String getX1(@Request K2a rb);
@RemoteOp(path="/") String getX2(@Request(serializer=MockWriterSerializer.X.class) K2a rb);
}
@@ -790,7 +790,7 @@ public class Remote_QueryAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K3 {
+ public interface K3 {
@RemoteOp(path="/") String getX1(@Request K3a rb);
@RemoteOp(path="/") String getX2(@Request(serializer=MockWriterSerializer.X.class) K3a rb);
}
@@ -831,7 +831,7 @@ public class Remote_QueryAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K4 {
+ public interface K4 {
String get(@Request K4a rb);
}
@@ -853,7 +853,7 @@ public class Remote_QueryAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K5 {
+ public interface K5 {
String get(@Request K5a rb);
}
@@ -875,7 +875,7 @@ public class Remote_QueryAnnotation_Test {
//-----------------------------------------------------------------------------------------------------------------
@Remote(path="/")
- public static interface K6 {
+ public interface K6 {
@RemoteOp(path="/") String getX1(@Request K6a rb);
@RemoteOp(path="/") String getX2(@Request(serializer=MockWriterSerializer.X.class) K6a rb);
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RemoteOpAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RemoteOpAnnotation_Test.java
index a68ca3ed4..30e6ce45c 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RemoteOpAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RemoteOpAnnotation_Test.java
@@ -55,7 +55,7 @@ public class Remote_RemoteOpAnnotation_Test {
}
@Remote
- public static interface A1 {
+ public interface A1 {
String doGet();
String doGET();
String doFoo();
@@ -74,7 +74,7 @@ public class Remote_RemoteOpAnnotation_Test {
}
@Remote
- public static interface A2 {
+ public interface A2 {
Future<String> doGet();
Future<String> doGET();
Future<String> doFoo();
@@ -93,7 +93,7 @@ public class Remote_RemoteOpAnnotation_Test {
}
@Remote
- public static interface A3 {
+ public interface A3 {
CompletableFuture<String> doGet();
CompletableFuture<String> doGET();
CompletableFuture<String> doFoo();
@@ -124,7 +124,7 @@ public class Remote_RemoteOpAnnotation_Test {
}
@Remote
- public static interface B1 {
+ public interface B1 {
void x1();
String x2();
HttpResponse x3();
@@ -175,7 +175,7 @@ public class Remote_RemoteOpAnnotation_Test {
}
@Remote
- public static interface C1 {
+ public interface C1 {
String postX1(@Content String foo);
HttpResponse postX2(@Content String foo);
Reader postX3(@Content String foo);
@@ -220,7 +220,7 @@ public class Remote_RemoteOpAnnotation_Test {
}
@Remote
- public static interface D1 {
+ public interface D1 {
String postX1(@Content String foo);
HttpResponse postX2(@Content String foo);
Reader postX3(@Content String foo);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RequestAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RequestAnnotation_Test.java
index 1463f4af6..1e6eaacd4 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RequestAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RequestAnnotation_Test.java
@@ -70,7 +70,7 @@ public class Remote_RequestAnnotation_Test {
}
@Remote
- public static interface A2 {
+ public interface A2 {
@RemoteOp(path="/{x}") String post(A1 req);
}
@@ -126,7 +126,7 @@ public class Remote_RequestAnnotation_Test {
}
@Remote
- public static interface B3 {
+ public interface B3 {
@RemoteOp(path="/{x}") String post(B1 req);
}
@@ -182,7 +182,7 @@ public class Remote_RequestAnnotation_Test {
}
@Remote
- public static interface C3 {
+ public interface C3 {
@RemoteOp(path="/{x}") String post(C1 req);
}
@@ -230,7 +230,7 @@ public class Remote_RequestAnnotation_Test {
}
@Remote
- public static interface D2 {
+ public interface D2 {
@RemoteOp(path="/{x}") String post(@Request D1 req);
}
@@ -279,7 +279,7 @@ public class Remote_RequestAnnotation_Test {
}
@Remote
- public static interface E2 {
+ public interface E2 {
@RemoteOp(path="/{x}") String post(E1 req);
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ResponseAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ResponseAnnotation_Test.java
index 97851a2a9..4c0902e31 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ResponseAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ResponseAnnotation_Test.java
@@ -68,7 +68,7 @@ public class Remote_ResponseAnnotation_Test {
}
@Remote
- public static interface A1b {
+ public interface A1b {
@RemoteOp A1a get();
}
@@ -86,7 +86,7 @@ public class Remote_ResponseAnnotation_Test {
}
@Remote
- public static interface A2b {
+ public interface A2b {
@RemoteOp A2a get();
}
@@ -110,7 +110,7 @@ public class Remote_ResponseAnnotation_Test {
}
@Remote
- public static interface A3b {
+ public interface A3b {
@RemoteOp A3a get();
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
index 1d968c0f1..18d167123 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
@@ -57,7 +57,7 @@ public class Remote_Test {
}
@Remote
- public static interface A1 {
+ public interface A1 {
String x1();
@RemoteOp(path="x1") String x1a();
@RemoteOp(path="/x1/") String x1b();
@@ -72,7 +72,7 @@ public class Remote_Test {
}
@Remote(path="A")
- public static interface A2 {
+ public interface A2 {
String x2();
@RemoteOp(path="x2") String x2a();
@RemoteOp(path="/x2/") String x2b();
@@ -87,7 +87,7 @@ public class Remote_Test {
}
@Remote(path="/A/")
- public static interface A3 {
+ public interface A3 {
String x2();
@RemoteOp(path="x2") String x2a();
@RemoteOp(path="/x2/") String x2b();
@@ -102,7 +102,7 @@ public class Remote_Test {
}
@Remote
- public static interface A4 {
+ public interface A4 {
String x2();
@RemoteOp(path="x2") String x2a();
@RemoteOp(path="/x2/") String x2b();
@@ -117,7 +117,7 @@ public class Remote_Test {
}
@Remote(path="A/A")
- public static interface A5 {
+ public interface A5 {
String x3();
@RemoteOp(path="x3") String x3a();
@RemoteOp(path="/x3/") String x3b();
@@ -132,7 +132,7 @@ public class Remote_Test {
}
@Remote(path="/A/A/")
- public static interface A6 {
+ public interface A6 {
String x3();
@RemoteOp(path="x3") String x3a();
@RemoteOp(path="/x3/") String x3b();
@@ -147,7 +147,7 @@ public class Remote_Test {
}
@Remote(path="A")
- public static interface A7 {
+ public interface A7 {
String x3();
@RemoteOp(path="x3") String x3a();
@RemoteOp(path="/x3/") String x3b();
@@ -162,7 +162,7 @@ public class Remote_Test {
}
@Remote(path="/A/")
- public static interface A8 {
+ public interface A8 {
String x3();
@RemoteOp(path="x3") String x3a();
@RemoteOp(path="/x3/") String x3b();
@@ -189,7 +189,7 @@ public class Remote_Test {
}
@Remote
- public static interface B1 {
+ public interface B1 {
String x1();
@RemoteOp(path="x1") String x1a();
@RemoteOp(path="/x1/") String x1b();
@@ -204,7 +204,7 @@ public class Remote_Test {
}
@Remote(path="http://localhost/B")
- public static interface B2 {
+ public interface B2 {
String x1();
@RemoteOp(path="x1") String x1a();
@RemoteOp(path="/x1/") String x1b();
@@ -219,7 +219,7 @@ public class Remote_Test {
}
@Remote
- public static interface B3 {
+ public interface B3 {
String x1();
@RemoteOp(path="http://localhost/B/x1") String x1a();
@RemoteOp(path="http://localhost/B/x1/") String x1b();
@@ -262,7 +262,7 @@ public class Remote_Test {
}
@Remote(path="/")
- public static interface C1 {
+ public interface C1 {
String x1();
@RemoteOp("GET") String x2();
@RemoteOp("GET /x3") String x3x();
@@ -301,7 +301,7 @@ public class Remote_Test {
}
@Remote(path="/")
- public static interface C3b {
+ public interface C3b {
String x1();
String getX2();
String x3();
@@ -346,7 +346,7 @@ public class Remote_Test {
}
@Remote
- public static interface C4b {
+ public interface C4b {
String x1() throws C4c;
@RemoteOp(path="x1") Future<String> x1a() throws C4c;
@RemoteOp(path="x1") CompletableFuture<String> x1b() throws C4c;
@@ -398,17 +398,17 @@ public class Remote_Test {
}
@Remote
- public static interface D1a {
+ public interface D1a {
@RemoteOp(path="/r202",returns=RemoteReturn.STATUS) int x1() throws AssertionError;
@RemoteOp(path="/r202",returns=RemoteReturn.STATUS) Integer x2() throws AssertionError;
@RemoteOp(path="/r202",returns=RemoteReturn.STATUS) boolean x3() throws AssertionError;
@RemoteOp(path="/r202",returns=RemoteReturn.STATUS) Boolean x4() throws AssertionError;
@RemoteOp(path="/r202",returns=RemoteReturn.STATUS) String x5() throws AssertionError;
- @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) public int x6() throws AssertionError;
- @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) public Integer x7() throws AssertionError;
- @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) public boolean x8() throws AssertionError;
- @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) public Boolean x9() throws AssertionError;
- @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) public String x10() throws AssertionError;
+ @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) int x6() throws AssertionError;
+ @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) Integer x7() throws AssertionError;
+ @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) boolean x8() throws AssertionError;
+ @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) Boolean x9() throws AssertionError;
+ @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) String x10() throws AssertionError;
}
@Test
@@ -439,7 +439,7 @@ public class Remote_Test {
}
@Remote
- public static interface D2a {
+ public interface D2a {
int x1() throws AssertionError;
int x2() throws AssertionError;
@RemoteOp(path="x1") Integer x1a() throws AssertionError;
@@ -554,7 +554,7 @@ public class Remote_Test {
}
@Remote(headers="Foo:bar",headerList=F1b.class,version="1.2.3")
- public static interface F1a {
+ public interface F1a {
String[] getHeaders();
}
@@ -578,7 +578,7 @@ public class Remote_Test {
}
@Remote(headerList=F2b.class)
- public static interface F2a {
+ public interface F2a {
String[] getHeaders();
}
@@ -602,7 +602,7 @@ public class Remote_Test {
public static class G extends BasicRestObject {}
@Remote
- public static interface G1 {
+ public interface G1 {
@RemoteOp(method="FOO")
String[] getHeaders();
}
@@ -626,7 +626,7 @@ public class Remote_Test {
}
@Remote
- public static interface H1 {
+ public interface H1 {
@RemoteOp(method="get") String a1();
@RemoteOp(method="put") String a2();
@RemoteOp(method="post") String a3();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java
index b26738691..ce58c4739 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java
@@ -60,7 +60,7 @@ public class RrpcInterfaceTest {
public interface InterfaceProxy {
- public static final String SWAP = "swap-~!@#$%^&*()_+`-={}[]|:;\"<,>.?/";
+ String SWAP = "swap-~!@#$%^&*()_+`-={}[]|:;\"<,>.?/";
//-------------------------------------------------------------------------------------------------------------
// Test return types.
diff --git a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectMerger_Test.java b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectMerger_Test.java
index f41679ebc..0ce8cc6ed 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectMerger_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectMerger_Test.java
@@ -63,7 +63,7 @@ public class ObjectMerger_Test {
assertEquals("2", am.getA());
}
- public static interface IA {
+ public interface IA {
String getA();
void setA(String a);
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java b/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
index 0347fcc9a..be4feaa9b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
@@ -198,10 +198,10 @@ public class ClassInfoTest {
// Parent classes and interfaces.
//-----------------------------------------------------------------------------------------------------------------
- static interface BI1 {}
- static interface BI2 extends BI1 {}
- static interface BI3 {}
- static interface BI4 {}
+ interface BI1 {}
+ interface BI2 extends BI1 {}
+ interface BI3 {}
+ interface BI4 {}
static class BC1 implements BI1, BI2 {}
static class BC2 extends BC1 implements BI3 {}
static class BC3 extends BC2 {}
@@ -288,16 +288,16 @@ public class ClassInfoTest {
// Methods
//-----------------------------------------------------------------------------------------------------------------
- static interface CI1 {
+ interface CI1 {
void i1a();
void i1b();
}
- static interface CI2 extends CI1 {
+ interface CI2 extends CI1 {
void i2b();
void i2a();
}
- static interface CI3 {}
- static interface CI4 {}
+ interface CI3 {}
+ interface CI4 {}
static abstract class CC1 implements CI1, CI2 {
@Override
public void i1a() {}
@@ -575,10 +575,10 @@ public class ClassInfoTest {
// Annotations
//-----------------------------------------------------------------------------------------------------------------
- @A(1) static interface GI1 {}
- @A(2) static interface GI2 extends GI1 {}
- @A(3) static interface GI3 {}
- @A(4) static interface GI4 {}
+ @A(1) interface GI1 {}
+ @A(2) interface GI2 extends GI1 {}
+ @A(3) interface GI3 {}
+ @A(4) interface GI4 {}
@A(5) static class G1 implements GI1, GI2 {}
@A(6) static class G2 extends G1 implements GI3 {}
@A(7) static class G3 extends G2 {}
@@ -683,10 +683,10 @@ public class ClassInfoTest {
check("@PA(10),@A(3)", g5.getAnnotationList());
}
- @A(1) @AConfig(1) static interface GBI1 {}
- @A(2) @AConfig(2) static interface GBI2 extends GBI1 {}
- @A(3) @AConfig(3) static interface GBI3 {}
- @A(4) @AConfig(4) static interface GBI4 {}
+ @A(1) @AConfig(1) interface GBI1 {}
+ @A(2) @AConfig(2) interface GBI2 extends GBI1 {}
+ @A(3) @AConfig(3) interface GBI3 {}
+ @A(4) @AConfig(4) interface GBI4 {}
@A(5) @AConfig(5) static class GB1 implements GBI1, GBI2 {}
@A(6) @AConfig(6) static class GB2 extends GB1 implements GBI3 {}
@A(7) @AConfig(7) static class GB3 extends GB2 {}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java b/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java
index 1271a6c7f..80c13da78 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java
@@ -188,7 +188,7 @@ public class ExecutableInfoTest {
check("", b_c1.getParamTypes());
}
- static enum B1 {
+ enum B1 {
FOO;
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/reflect/MethodInfoTest.java b/juneau-utest/src/test/java/org/apache/juneau/reflect/MethodInfoTest.java
index 342cd2bb8..d302b412b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/reflect/MethodInfoTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/MethodInfoTest.java
@@ -141,10 +141,10 @@ public class MethodInfoTest {
// Matching methods.
//-----------------------------------------------------------------------------------------------------------------
- public static interface B1 {
- public int foo(int x);
- public int foo(String x);
- public int foo();
+ public interface B1 {
+ int foo(int x);
+ int foo(String x);
+ int foo();
}
public static class B2 {
public int foo(int x) { return 0; }
@@ -174,7 +174,7 @@ public class MethodInfoTest {
//-----------------------------------------------------------------------------------------------------------------
@A("C1")
- public static interface C1 {
+ public interface C1 {
@A("a1") void a1();
@A("a2a") void a2();
@A("a3") void a3(CharSequence foo);
@@ -259,7 +259,7 @@ public class MethodInfoTest {
}
@A("C1") @AConfig("C1")
- public static interface CB1 {
+ public interface CB1 {
@A("a1") @AConfig("a1") void a1();
@A("a2a") @AConfig("a2a") void a2();
@A("a3") @AConfig("a3") void a3(CharSequence foo);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/reflect/ParamInfoTest.java b/juneau-utest/src/test/java/org/apache/juneau/reflect/ParamInfoTest.java
index 9b88deac8..2a3f6acb1 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/reflect/ParamInfoTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/ParamInfoTest.java
@@ -154,12 +154,12 @@ public class ParamInfoTest {
}
@CA("1") public static class C1 extends C2 {}
@CA("2") public static class C2 implements C3, C4 {}
- @CA("3") public static interface C3 {}
- @CA("4") public static interface C4 {}
+ @CA("3") public interface C3 {}
+ @CA("4") public interface C4 {}
- public static interface CB {
- public void a1(@CA("5") C1 x);
- public void a2(@CA("5") C1 x);
+ public interface CB {
+ void a1(@CA("5") C1 x);
+ void a2(@CA("5") C1 x);
}
public static class CC implements CB {
public CC(@CA("9") C1 x) {}
@@ -311,11 +311,11 @@ public class ParamInfoTest {
}
@DA("1") public static class D1 extends D2 {}
@DA("2") public static class D2 implements D3, D4 {}
- @DA("3") public static interface D3 {}
- @DA("4") public static interface D4 {}
+ @DA("3") public interface D3 {}
+ @DA("4") public interface D4 {}
- public static interface DB {
- public void a1(@DA("0") D1 x);
+ public interface DB {
+ void a1(@DA("0") D1 x);
}
public static class DC implements DB {
@Override
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java
index 77513d9e1..0fc1f5e2a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java
@@ -30,13 +30,10 @@ public class Rest_AnnotationInheritance_Test {
//------------------------------------------------------------------------------------------------------------------
@Rest(serializers=Json5Serializer.class, parsers=JsonParser.class, defaultAccept="text/json")
- public static interface IA {
- @RestPut
- public String a(@Content String b);
- @RestGet
- public String b(@Query("foo") String b);
- @RestGet
- public String c(@Header("foo") String b);
+ public interface IA {
+ @RestPut String a(@Content String b);
+ @RestGet String b(@Query("foo") String b);
+ @RestGet String c(@Header("foo") String b);
}
public static class A implements IA {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java
index 3710d8ca1..8565ca9d1 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java
@@ -143,7 +143,7 @@ public class RestClient_Config_BeanContext_Test {
assertEquals(2,x.getHeader("X").as(A3.class).get().f2);
}
- public static interface A4a {
+ public interface A4a {
int getF3();
void setF3(int f3);
}
@@ -631,9 +631,9 @@ public class RestClient_Config_BeanContext_Test {
assertThrown(()->client().disableIgnoreUnknownNullBeanProperties().build().post("/echoBody",reader("{foo:'1',bar:null}")).run().cacheContent().assertContent().isContains("{foo:'1',bar:null}").getContent().as(A18.class)).asMessages().isAny(contains("Unknown property 'bar'"));
}
- public static interface A19 {
- public String getFoo();
- public void setFoo(String foo);
+ public interface A19 {
+ String getFoo();
+ void setFoo(String foo);
}
@Test
@@ -730,7 +730,7 @@ public class RestClient_Config_BeanContext_Test {
assertEquals("1",x.foo);
}
- public static interface A24a {
+ public interface A24a {
void setFoo(int foo);
int getFoo();
}
@@ -758,7 +758,7 @@ public class RestClient_Config_BeanContext_Test {
assertTrue(x instanceof A24b);
}
- public static interface A25a {
+ public interface A25a {
void setFoo(int foo);
int getFoo();
}
@@ -991,7 +991,7 @@ public class RestClient_Config_BeanContext_Test {
assertEquals(1,x.foo);
}
- public static enum A38a {
+ public enum A38a {
ONE(1),TWO(2);
private int value;
A38a(int value) {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java b/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
index c653d2881..b3c768275 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
@@ -1432,7 +1432,7 @@ public class ThirdPartyProxyTest {
//-----------------------------------------------------------------------------------------------------------------
@Remote
- public static interface ThirdPartyProxy {
+ public interface ThirdPartyProxy {
//-------------------------------------------------------------------------------------------------------------
// Header tests
@@ -1767,7 +1767,7 @@ public class ThirdPartyProxyTest {
@Request ReqBeanPath1 rb
);
- public static interface ReqBeanPath1 {
+ public interface ReqBeanPath1 {
@Path
int getA();
@@ -1809,7 +1809,7 @@ public class ThirdPartyProxyTest {
@Request ReqBeanPath3 rb
);
- public static interface ReqBeanPath3 {
+ public interface ReqBeanPath3 {
@Path("a")
int getX();
@@ -1822,7 +1822,7 @@ public class ThirdPartyProxyTest {
@Request ReqBeanPath6 rb
);
- public static interface ReqBeanPath6 {
+ public interface ReqBeanPath6 {
@Path("*")
Map<String,Object> getX();
}
@@ -1832,7 +1832,7 @@ public class ThirdPartyProxyTest {
@Request ReqBeanPath7 rb
);
- public static interface ReqBeanPath7 {
+ public interface ReqBeanPath7 {
@Path("*")
ABean getX();
}
@@ -1846,7 +1846,7 @@ public class ThirdPartyProxyTest {
@Request ReqBeanQuery1 rb
);
- public static interface ReqBeanQuery1 {
+ public interface ReqBeanQuery1 {
@Query
int getA();
@@ -1888,7 +1888,7 @@ public class ThirdPartyProxyTest {
@Request ReqBeanQuery3 rb
);
- public static interface ReqBeanQuery3 {
+ public interface ReqBeanQuery3 {
@Query("a")
int getX();
@@ -1901,7 +1901,7 @@ public class ThirdPartyProxyTest {
@Request ReqBeanQuery6 rb
);
- public static interface ReqBeanQuery6 {
+ public interface ReqBeanQuery6 {
@Query("*")
Map<String,Object> getX();
}
@@ -1911,7 +1911,7 @@ public class ThirdPartyProxyTest {
@Request ReqBeanQuery7 rb
);
- public static interface ReqBeanQuery7 {
+ public interface ReqBeanQuery7 {
@Query("*")
ABean getX();
}
@@ -1925,7 +1925,7 @@ public class ThirdPartyProxyTest {
@Request ReqBeanFormData1 rb
);
- public static interface ReqBeanFormData1 {
+ public interface ReqBeanFormData1 {
@FormData
int getA();
@@ -1967,7 +1967,7 @@ public class ThirdPartyProxyTest {
@Request ReqBeanFormData3 rb
);
- public static interface ReqBeanFormData3 {
+ public interface ReqBeanFormData3 {
@FormData("a")
int getX();
@@ -1980,7 +1980,7 @@ public class ThirdPartyProxyTest {
@Request ReqBeanFormData6 rb
);
- public static interface ReqBeanFormData6 {
+ public interface ReqBeanFormData6 {
@FormData("*")
Map<String,Object> getX();
}
@@ -1990,7 +1990,7 @@ public class ThirdPartyProxyTest {
@Request ReqBeanFormData7 rb
);
- public static interface ReqBeanFormData7 {
+ public interface ReqBeanFormData7 {
@FormData("*")
ABean getX();
}
@@ -2004,7 +2004,7 @@ public class ThirdPartyProxyTest {
@Request ReqBeanHeader1 rb
);
- public static interface ReqBeanHeader1 {
+ public interface ReqBeanHeader1 {
@Header
int getA();
@@ -2046,7 +2046,7 @@ public class ThirdPartyProxyTest {
@Request ReqBeanHeader3 rb
);
- public static interface ReqBeanHeader3 {
+ public interface ReqBeanHeader3 {
@Header("a")
int getX();
@@ -2059,7 +2059,7 @@ public class ThirdPartyProxyTest {
@Request ReqBeanHeader6 rb
);
- public static interface ReqBeanHeader6 {
+ public interface ReqBeanHeader6 {
@Header("*")
Map<String,Object> getX();
}
@@ -2069,7 +2069,7 @@ public class ThirdPartyProxyTest {
@Request ReqBeanHeader7 rb
);
- public static interface ReqBeanHeader7 {
+ public interface ReqBeanHeader7 {
@Header("*")
ABean getX();
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/svl/ResolvingJsonMapTest.java b/juneau-utest/src/test/java/org/apache/juneau/svl/ResolvingJsonMapTest.java
index 103c4130e..704dd83d0 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/svl/ResolvingJsonMapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/svl/ResolvingJsonMapTest.java
@@ -92,7 +92,7 @@ public class ResolvingJsonMapTest {
assertObject(m.get("foo")).asJson().is("{ONE:'ONE'}");
}
- public static enum FooEnum {
+ public enum FooEnum {
ONE
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java b/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java
index 7af724a9f..c8293faae 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java
@@ -746,7 +746,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
}
@Bean(dictionary={A.class})
- public static interface IA {}
+ public interface IA {}
@Bean(typeName="A")
public static class A implements IA {
@@ -759,7 +759,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
}
@Bean(dictionary={B.class}, typePropertyName="z")
- public static interface IB {}
+ public interface IB {}
@Bean(typeName="B")
public static class B implements IB {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanFilterTest.java b/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanFilterTest.java
index 659dcf994..7f07327e9 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanFilterTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanFilterTest.java
@@ -44,12 +44,12 @@ public class BeanFilterTest {
assertNull(bm.get("f3"));
}
- public static interface A1 {
- public String getF1();
+ public interface A1 {
+ String getF1();
}
- public static interface A2 extends A1 {
- public String getF2();
+ public interface A2 extends A1 {
+ String getF2();
}
public static class A3 implements A2 {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/xml/BasicXmlTest.java b/juneau-utest/src/test/java/org/apache/juneau/xml/BasicXmlTest.java
index c0683a3db..70ac3a24f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/BasicXmlTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/BasicXmlTest.java
@@ -1635,9 +1635,9 @@ public class BasicXmlTest {
}
}
- public static interface IA {
- public String getA();
- public void setA(String a);
+ public interface IA {
+ String getA();
+ void setA(String a);
}
public static abstract class AA implements IA {}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlIgnoreCommentsTest.java b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlIgnoreCommentsTest.java
index 2856c5cfd..15df3be80 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlIgnoreCommentsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlIgnoreCommentsTest.java
@@ -1187,9 +1187,9 @@ public class XmlIgnoreCommentsTest {
}
}
- public static interface IA {
- public String getA();
- public void setA(String a);
+ public interface IA {
+ String getA();
+ void setA(String a);
}
public static abstract class AA implements IA {}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlTest.java b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlTest.java
index 3d1551afe..452348036 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlTest.java
@@ -234,7 +234,7 @@ public class XmlTest {
}
@Bean(typeName="foo")
- public static interface C1 {}
+ public interface C1 {}
public static class C2 implements C1 {}
public static class C3 extends C2 {
public int f1 = 1;
[juneau] 01/29: [juneau-marshall] Refactor to multi-catch
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 5012ee5c8a0d0aaa129fe1ae56891b1d57d61291
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 22:34:55 2023 -0400
[juneau-marshall] Refactor to multi-catch
---
.../src/main/java/org/apache/juneau/html/HtmlSerializerSession.java | 4 +---
.../src/main/java/org/apache/juneau/internal/Flag.java | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
index 00d51e176..83e5563ad 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
@@ -674,9 +674,7 @@ public class HtmlSerializerSession extends XmlSerializerSession {
out.i(i+2);
if (link != null)
out.eTag("a");
- } catch (SerializeException e) {
- throw e;
- } catch (Error e) {
+ } catch (SerializeException | Error e) {
throw e;
} catch (Throwable e) {
onBeanGetterException(pMeta, e);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/Flag.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/Flag.java
index dc061c09a..bbf9360eb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/Flag.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/Flag.java
@@ -87,9 +87,7 @@ public final class Flag {
private void runSnippet(Snippet snippet) {
try {
snippet.run();
- } catch (Error e) {
- throw e;
- } catch (RuntimeException e) {
+ } catch (Error | RuntimeException e) {
throw e;
} catch (Throwable e) {
throw asRuntimeException(e);
[juneau] 25/29: [juneau-utest-utils] Remove redundant modifiers
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit cd84f71923aa0f684e5c601cd77921b3b7980548
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:37:26 2023 -0400
[juneau-utest-utils] Remove redundant modifiers
---
.../src/main/java/org/apache/juneau/testutils/CalendarUtils.java | 2 +-
.../main/java/org/apache/juneau/testutils/pojos/TestEnumToString.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/CalendarUtils.java b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/CalendarUtils.java
index d326eaa99..300c30adc 100644
--- a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/CalendarUtils.java
+++ b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/CalendarUtils.java
@@ -32,7 +32,7 @@ public class CalendarUtils {
/**
* Valid conversion formats.
*/
- public static enum Format {
+ public enum Format {
/**
* Transform to ISO8601 date-time-local strings.
diff --git a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/pojos/TestEnumToString.java b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/pojos/TestEnumToString.java
index e6cb5f30a..bc6c98db7 100644
--- a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/pojos/TestEnumToString.java
+++ b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/pojos/TestEnumToString.java
@@ -18,7 +18,7 @@ public enum TestEnumToString {
private String val;
- private TestEnumToString(String val) {
+ TestEnumToString(String val) {
this.val = val;
}
[juneau] 11/29: [juneau-utest-utils] Use lambdas
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit bd5f3ceb8c644673e331c64fa8da5774b8a35a74
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:03:23 2023 -0400
[juneau-utest-utils] Use lambdas
---
.../java/org/apache/juneau/testutils/MockWriterSerializer.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockWriterSerializer.java b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockWriterSerializer.java
index fd54366c9..4fc3ea199 100644
--- a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockWriterSerializer.java
+++ b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockWriterSerializer.java
@@ -127,11 +127,6 @@ public class MockWriterSerializer extends WriterSerializer implements HttpPartSe
@Override
public HttpPartSerializerSession getPartSession() {
- return new HttpPartSerializerSession() {
- @Override
- public String serialize(HttpPartType type, HttpPartSchema schema, Object value) throws SerializeException, SchemaValidationException {
- return partFunction.apply(type, schema, value);
- }
- };
+ return (type, schema, value) -> partFunction.apply(type, schema, value);
}
}
[juneau] 05/29: [juneau-dto] Use lambdas
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 06e21ad4e8f2bd8aaf2ff60131d3e4a6d95a4d17
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 22:47:00 2023 -0400
[juneau-dto] Use lambdas
---
.../src/main/java/org/apache/juneau/dto/swagger/Swagger.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
index e7ff0b2e8..d0e87a94c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
@@ -40,12 +40,7 @@ public class Swagger extends SwaggerElement {
/** Represents a null swagger */
public static final Swagger NULL = new Swagger();
- private static final Comparator<String> PATH_COMPARATOR = new Comparator<>() {
- @Override /* Comparator */
- public int compare(String o1, String o2) {
- return o1.replace('{', '@').compareTo(o2.replace('{', '@'));
- }
- };
+ private static final Comparator<String> PATH_COMPARATOR = (o1, o2) -> o1.replace('{', '@').compareTo(o2.replace('{', '@'));
private String
swagger = "2.0",
[juneau] 14/29: [juneau-utest] Use "L" instead of "l" for long literals (legibility)
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 3815d954daa624874034331b137c7201eb1cf396
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:07:28 2023 -0400
[juneau-utest] Use "L" instead of "l" for long literals (legibility)
---
.../test/java/org/apache/juneau/BeanMapTest.java | 4 +-
.../a/rttests/RoundTripBeanPropertiesTest.java | 8 ++--
.../rttests/RoundTripPrimitiveObjectBeansTest.java | 4 +-
.../a/rttests/RoundTripPrimitivesBeansTest.java | 22 ++++-----
.../a/rttests/RoundTripSimpleObjectsTest.java | 28 +++++------
.../juneau/assertions/AnyAssertion_Test.java | 2 +-
.../apache/juneau/assertions/Assertions_Test.java | 4 +-
.../juneau/assertions/DateAssertion_Test.java | 4 +-
.../juneau/assertions/LongAssertion_Test.java | 56 +++++++++++-----------
.../java/org/apache/juneau/config/ConfigTest.java | 28 +++++------
.../juneau/html/HtmlSchemaSerializerTest.java | 2 +-
.../apache/juneau/http/BasicHttpResource_Test.java | 10 ++--
.../juneau/http/SerializedHttpEntity_Test.java | 2 +-
.../juneau/http/header/BasicLongHeader_Test.java | 4 +-
.../juneau/http/header/ContentLength_Test.java | 2 +-
.../remote/Remote_FormDataAnnotation_Test.java | 52 ++++++++++----------
.../http/remote/Remote_HeaderAnnotation_Test.java | 52 ++++++++++----------
.../http/remote/Remote_PathAnnotation_Test.java | 52 ++++++++++----------
.../http/remote/Remote_QueryAnnotation_Test.java | 52 ++++++++++----------
.../juneau/httppart/OpenApiPartParser_Test.java | 8 ++--
.../httppart/OpenApiPartSerializer_Test.java | 56 +++++++++++-----------
.../juneau/json/JsonSchemaSerializerTest.java | 2 +-
.../juneau/jsonschema/JsonSchemaGeneratorTest.java | 4 +-
.../apache/juneau/mstat/MethodExecStore_Test.java | 6 +--
.../org/apache/juneau/mstat/ThrownStore_Test.java | 24 +++++-----
.../java/org/apache/juneau/oapi/OpenApiTest.java | 2 +-
.../apache/juneau/objecttools/ObjectRest_Test.java | 52 ++++++++++----------
.../org/apache/juneau/reflect/ClassInfoTest.java | 2 +-
.../rest/client/RestClient_Headers_Test.java | 2 +-
.../rest/client/RestClient_Response_Body_Test.java | 6 +--
.../client/RestClient_Response_Headers_Test.java | 2 +-
.../rest/client/RestClient_Response_Test.java | 2 +-
.../juneau/transform/AutoNumberSwapTest.java | 10 ++--
33 files changed, 283 insertions(+), 283 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
index ff0bcb13b..ea8303023 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
@@ -76,7 +76,7 @@ public class BeanMapTest {
m.put("b1", null);
assertEquals(Integer.valueOf(0), m.get("i1"));
assertEquals(Short.valueOf((short)0), m.get("s1"));
- assertEquals(Long.valueOf(0l), m.get("l1"));
+ assertEquals(Long.valueOf(0L), m.get("l1"));
assertEquals(Double.valueOf(0d), m.get("d1"));
assertEquals(Float.valueOf(0f), m.get("f1"));
assertEquals(Boolean.valueOf(false), m.get("b1"));
@@ -155,7 +155,7 @@ public class BeanMapTest {
m.put("b1", null);
assertEquals(Integer.valueOf(0), m.get("i1"));
assertEquals(Short.valueOf((short)0), m.get("s1"));
- assertEquals(Long.valueOf(0l), m.get("l1"));
+ assertEquals(Long.valueOf(0L), m.get("l1"));
assertEquals(Double.valueOf(0d), m.get("d1"));
assertEquals(Float.valueOf(0f), m.get("f1"));
assertEquals(Boolean.valueOf(false), m.get("b1"));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanPropertiesTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanPropertiesTest.java
index 4e4be7c78..df1ca3b83 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanPropertiesTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanPropertiesTest.java
@@ -47,7 +47,7 @@ public class RoundTripBeanPropertiesTest extends RoundTripTest {
public void a01_arrayOfListOfLongs() throws Exception {
A01 o = new A01();
o.f1 = new List[1];
- o.f1[0] = alist(123l);
+ o.f1[0] = alist(123L);
o = roundTrip(o);
assertEquals(123, o.f1[0].get(0).intValue());
assertTrue(o.f1[0].get(0) instanceof Long);
@@ -60,7 +60,7 @@ public class RoundTripBeanPropertiesTest extends RoundTripTest {
@Test
public void a02_ListOfArrayOfLongs() throws Exception {
A02 o = new A02();
- o.f1 = CollectionUtils.<Long[]>alist(new Long[]{123l});
+ o.f1 = CollectionUtils.<Long[]>alist(new Long[]{123L});
o = roundTrip(o);
assertEquals(123, o.f1.get(0)[0].intValue());
assertTrue(o.f1.get(0)[0] instanceof Long);
@@ -74,7 +74,7 @@ public class RoundTripBeanPropertiesTest extends RoundTripTest {
public void a03_2dArrayOfListOfLongs() throws Exception {
A03 o = new A03();
o.f1 = new List[1][1];
- o.f1[0] = new List[]{alist(123l)};
+ o.f1[0] = new List[]{alist(123L)};
o = roundTrip(o);
assertEquals(123, o.f1[0][0].get(0).intValue());
assertTrue(o.f1[0][0].get(0) instanceof Long);
@@ -87,7 +87,7 @@ public class RoundTripBeanPropertiesTest extends RoundTripTest {
@Test
public void a04_ListOf2dArrayOfLongs() throws Exception {
A04 o = new A04();
- o.f1 = CollectionUtils.<Long[][]>alist(new Long[][]{new Long[]{123l}});
+ o.f1 = CollectionUtils.<Long[][]>alist(new Long[][]{new Long[]{123L}});
o = roundTrip(o);
assertEquals(123, o.f1.get(0)[0][0].intValue());
assertTrue(o.f1.get(0)[0][0] instanceof Long);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitiveObjectBeansTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitiveObjectBeansTest.java
index 445808b91..e8f45ecd3 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitiveObjectBeansTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitiveObjectBeansTest.java
@@ -109,7 +109,7 @@ public class RoundTripPrimitiveObjectBeansTest extends RoundTripTest {
assertEquals(Character.valueOf('a'), t.poalChar.get(0)[0]);
assertEquals(Short.valueOf((short)1), t.poalShort.get(0)[0]);
assertEquals(Integer.valueOf(1), t.poalInt.get(0)[0]);
- assertEquals(Long.valueOf(1l), t.poalLong.get(0)[0]);
+ assertEquals(Long.valueOf(1L), t.poalLong.get(0)[0]);
assertEquals(Float.valueOf(1f), t.poalFloat.get(0)[0]);
assertEquals(Double.valueOf(1d), t.poalDouble.get(0)[0]);
assertEquals(1, t.poalBigInteger.get(0)[0].intValue());
@@ -132,7 +132,7 @@ public class RoundTripPrimitiveObjectBeansTest extends RoundTripTest {
assertEquals(Character.valueOf('a'), t.polChar.get(0)[0]);
assertEquals(Short.valueOf((short)1), t.polShort.get(0)[0]);
assertEquals(Integer.valueOf(1), t.polInt.get(0)[0]);
- assertEquals(Long.valueOf(1l), t.polLong.get(0)[0]);
+ assertEquals(Long.valueOf(1L), t.polLong.get(0)[0]);
assertEquals(Float.valueOf(1f), t.polFloat.get(0)[0]);
assertEquals(Double.valueOf(1d), t.polDouble.get(0)[0]);
assertEquals(1, t.polBigInteger.get(0)[0].intValue());
diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitivesBeansTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitivesBeansTest.java
index d74386f4f..2957d0d5f 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitivesBeansTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitivesBeansTest.java
@@ -47,7 +47,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals('a', t.pChar);
assertEquals(2, t.pShort);
assertEquals(3, t.pInt);
- assertEquals(4l, t.pLong);
+ assertEquals(4L, t.pLong);
assertEquals(5f, t.pFloat, 0.1f);
assertEquals(6d, t.pDouble, 0.1f);
@@ -57,7 +57,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals((char)0, t.puChar);
assertEquals(0, t.puShort);
assertEquals(0, t.puInt);
- assertEquals(0l, t.puLong);
+ assertEquals(0L, t.puLong);
assertEquals(0f, t.puFloat, 0.1f);
assertEquals(0d, t.puDouble, 0.1f);
@@ -67,7 +67,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals('b', t.paChar[1][0]);
assertEquals(2, t.paShort[1][0]);
assertEquals(2, t.paInt[1][0]);
- assertEquals(2l, t.paLong[1][0]);
+ assertEquals(2L, t.paLong[1][0]);
assertEquals(2f, t.paFloat[1][0], 0.1f);
assertEquals(2d, t.paDouble[1][0], 0.1f);
assertNull(t.paBoolean[2]);
@@ -95,7 +95,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals('a', t.palChar.get(0)[0]);
assertEquals(1, t.palShort.get(0)[0]);
assertEquals(1, t.palInt.get(0)[0]);
- assertEquals(1l, t.palLong.get(0)[0]);
+ assertEquals(1L, t.palLong.get(0)[0]);
assertEquals(1f, t.palFloat.get(0)[0], 0.1f);
assertEquals(1d, t.palDouble.get(0)[0], 0.1f);
assertNull(t.palBoolean.get(1));
@@ -113,7 +113,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals('a', t.plChar.get(0)[0]);
assertEquals(1, t.plShort.get(0)[0]);
assertEquals(1, t.plInt.get(0)[0]);
- assertEquals(1l, t.plLong.get(0)[0]);
+ assertEquals(1L, t.plLong.get(0)[0]);
assertEquals(1f, t.plFloat.get(0)[0], 0.1f);
assertEquals(1d, t.plDouble.get(0)[0], 0.1f);
assertNull(t.plBoolean.get(1));
@@ -195,7 +195,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
pChar = 'a';
pShort = 2;
pInt = 3;
- pLong = 4l;
+ pLong = 4L;
pFloat = 5f;
pDouble = 6d;
@@ -266,7 +266,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals('a', t2.pChar);
assertEquals(2, t2.pShort);
assertEquals(3, t2.pInt);
- assertEquals(4l, t2.pLong);
+ assertEquals(4L, t2.pLong);
assertEquals(5f, t2.pFloat, 0.1f);
assertEquals(6d, t2.pDouble, 0.1f);
@@ -276,7 +276,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals((char)0, t2.puChar);
assertEquals(0, t2.puShort);
assertEquals(0, t2.puInt);
- assertEquals(0l, t2.puLong);
+ assertEquals(0L, t2.puLong);
assertEquals(0f, t2.puFloat, 0.1f);
assertEquals(0d, t2.puDouble, 0.1f);
@@ -286,7 +286,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals('b', t2.paChar[1][0]);
assertEquals(2, t2.paShort[1][0]);
assertEquals(2, t2.paInt[1][0]);
- assertEquals(2l, t2.paLong[1][0]);
+ assertEquals(2L, t2.paLong[1][0]);
assertEquals(2f, t2.paFloat[1][0], 0.1f);
assertEquals(2d, t2.paDouble[1][0], 0.1f);
assertNull(t2.paBoolean[2]);
@@ -314,7 +314,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals('a', t2.palChar.get(0)[0]);
assertEquals(1, t2.palShort.get(0)[0]);
assertEquals(1, t2.palInt.get(0)[0]);
- assertEquals(1l, t2.palLong.get(0)[0]);
+ assertEquals(1L, t2.palLong.get(0)[0]);
assertEquals(1f, t2.palFloat.get(0)[0], 0.1f);
assertEquals(1d, t2.palDouble.get(0)[0], 0.1f);
assertNull(t2.palBoolean.get(1));
@@ -332,7 +332,7 @@ public class RoundTripPrimitivesBeansTest extends RoundTripTest {
assertEquals('a', t2.plChar.get(0)[0]);
assertEquals(1, t2.plShort.get(0)[0]);
assertEquals(1, t2.plInt.get(0)[0]);
- assertEquals(1l, t2.plLong.get(0)[0]);
+ assertEquals(1L, t2.plLong.get(0)[0]);
assertEquals(1f, t2.plFloat.get(0)[0], 0.1f);
assertEquals(1d, t2.plDouble.get(0)[0], 0.1f);
assertNull(t2.plBoolean.get(1));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java
index 69dd550a3..8bcc63451 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripSimpleObjectsTest.java
@@ -295,9 +295,9 @@ public class RoundTripSimpleObjectsTest extends RoundTripTest {
//====================================================================================================
@Test
public void testLong() throws Exception {
- long t = 1l;
+ long t = 1L;
t = roundTrip(t, long.class);
- assertEquals(1l, t);
+ assertEquals(1L, t);
}
//====================================================================================================
@@ -305,9 +305,9 @@ public class RoundTripSimpleObjectsTest extends RoundTripTest {
//====================================================================================================
@Test
public void testLongArray() throws Exception {
- long[] t = {1l};
+ long[] t = {1L};
t = roundTrip(t, long[].class);
- assertEquals(1l, t[0]);
+ assertEquals(1L, t[0]);
}
//====================================================================================================
@@ -315,9 +315,9 @@ public class RoundTripSimpleObjectsTest extends RoundTripTest {
//====================================================================================================
@Test
public void testLong2dArray() throws Exception {
- long[][] t = {{1l},null};
+ long[][] t = {{1L},null};
t = roundTrip(t, long[][].class);
- assertEquals(1l, t[0][0]);
+ assertEquals(1L, t[0][0]);
assertNull(t[1]);
}
@@ -328,7 +328,7 @@ public class RoundTripSimpleObjectsTest extends RoundTripTest {
public void testShort() throws Exception {
short t = (short)1;
t = roundTrip(t, short.class);
- assertEquals(1l, t);
+ assertEquals(1L, t);
}
//====================================================================================================
@@ -338,7 +338,7 @@ public class RoundTripSimpleObjectsTest extends RoundTripTest {
public void testShortArray() throws Exception {
short[] t = {(short)1};
t = roundTrip(t, short[].class);
- assertEquals(1l, t[0]);
+ assertEquals(1L, t[0]);
}
//====================================================================================================
@@ -540,9 +540,9 @@ public class RoundTripSimpleObjectsTest extends RoundTripTest {
//====================================================================================================
@Test
public void testLongObject() throws Exception {
- Long t = 1l;
+ Long t = 1L;
t = roundTrip(t, Long.class);
- assertEquals(Long.valueOf(1l), t);
+ assertEquals(Long.valueOf(1L), t);
}
//====================================================================================================
@@ -550,9 +550,9 @@ public class RoundTripSimpleObjectsTest extends RoundTripTest {
//====================================================================================================
@Test
public void testLongObjectArray() throws Exception {
- Long[] t = {1l, null};
+ Long[] t = {1L, null};
t = roundTrip(t, Long[].class);
- assertEquals(Long.valueOf(1l), t[0]);
+ assertEquals(Long.valueOf(1L), t[0]);
assertNull(t[1]);
}
@@ -561,9 +561,9 @@ public class RoundTripSimpleObjectsTest extends RoundTripTest {
//====================================================================================================
@Test
public void testLongObject2dArray() throws Exception {
- Long[][] t = {{1l,null},null};
+ Long[][] t = {{1L,null},null};
t = roundTrip(t, Long[][].class);
- assertEquals(Long.valueOf(1l), t[0][0]);
+ assertEquals(Long.valueOf(1L), t[0][0]);
assertNull(t[0][1]);
assertNull(t[1]);
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java b/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
index 919dc36cc..dc54facf9 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
@@ -264,7 +264,7 @@ public class AnyAssertion_Test {
@Test
public void bb17_asLong() throws Exception {
- Long x1 = 1l, nil = null;
+ Long x1 = 1L, nil = null;
Object x2 = "";
test(x1).asLong().isString("1");
test(nil).asLong().isNull();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java b/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
index 4478eca91..e8abb99b2 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
@@ -49,7 +49,7 @@ public class Assertions_Test {
@Test
public void a03_assertLong() throws Exception {
- assertLong(2l).isGt(1l);
+ assertLong(2L).isGt(1L);
}
@Test
@@ -145,7 +145,7 @@ public class Assertions_Test {
@Test
public void a20b_assertLongArray() throws Exception {
- assertLongArray(new long[]{1l}).asLength().is(1);
+ assertLongArray(new long[]{1L}).asLength().is(1);
}
@Test
diff --git a/juneau-utest/src/test/java/org/apache/juneau/assertions/DateAssertion_Test.java b/juneau-utest/src/test/java/org/apache/juneau/assertions/DateAssertion_Test.java
index 88a3cb4c3..95ce6717c 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/assertions/DateAssertion_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/assertions/DateAssertion_Test.java
@@ -110,14 +110,14 @@ public class DateAssertion_Test {
@Test
public void bc04a_asEpochMillis() throws Exception {
Date x = MID1, nil = null;
- test(x).asEpochMillis().is(959862896000l);
+ test(x).asEpochMillis().is(959862896000L);
test(nil).asEpochMillis().isNull();
}
@Test
public void bc04b_asEpochSeconds() throws Exception {
Date x = MID1, nil = null;
- test(x).asEpochSeconds().is(959862896l);
+ test(x).asEpochSeconds().is(959862896L);
test(nil).asEpochSeconds().isNull();
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java b/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java
index 6e782d22e..73dc2baea 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java
@@ -52,14 +52,14 @@ public class LongAssertion_Test {
@Test
public void ba01a_asString() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
test(x).asString().is("1");
test(nil).asString().isNull();
}
@Test
public void ba01b_asString_wSerializer() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x).asString(s).is("1");
test(nil).asString(s).is("null");
@@ -67,33 +67,33 @@ public class LongAssertion_Test {
@Test
public void ba01c_asString_wPredicate() throws Exception {
- Long x1 = 1l;
+ Long x1 = 1L;
test(x1).asString(x -> "foo").is("foo");
}
@Test
public void ba02_asJson() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
test(x).asJson().is("1");
test(nil).asJson().is("null");
}
@Test
public void ba03_asJsonSorted() throws Exception {
- Long x1 = 1l, nil = null;
+ Long x1 = 1L, nil = null;
test(x1).asJsonSorted().is("1");
test(nil).asJsonSorted().is("null");
}
@Test
public void ba04_apply() throws Exception {
- Long x1 = 1l, x2 = 2l;
+ Long x1 = 1L, x2 = 2L;
test(x1).asTransformed(x -> x2).is(x2);
}
@Test
public void bc01_asInteger() throws Exception {
- Long x1 = 1l, nil = null;
+ Long x1 = 1L, nil = null;
test(x1).asInteger().is(1);
test(nil).asInteger().isNull();
}
@@ -104,28 +104,28 @@ public class LongAssertion_Test {
@Test
public void ca01_exists() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
test(x).isExists().isExists();
assertThrown(()->test(nil).isExists()).asMessage().is("Value was null.");
}
@Test
public void ca02_isNull() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
test(nil).isNull();
assertThrown(()->test(x).isNull()).asMessage().is("Value was not null.");
}
@Test
public void ca03_isNotNull() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
test(x).isNotNull();
assertThrown(()->test(nil).isNotNull()).asMessage().is("Value was null.");
}
@Test
public void ca04a_is_T() throws Exception {
- Long x1 = 1l, x1a = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
test(x1).is(x1);
test(x1).is(x1a);
test(nil).is(nil);
@@ -136,7 +136,7 @@ public class LongAssertion_Test {
@Test
public void ca04b_is_predicate() throws Exception {
- Long x1 = 1l;
+ Long x1 = 1L;
test(x1).is(x->x==1);
assertThrown(()->test(x1).is(x->x==2)).asMessage().asOneLine().is("Unexpected value: '1'.");
assertThrown(()->test(x1).is(ne(x1))).asMessage().asOneLine().is("Value unexpectedly matched. Value='1'.");
@@ -144,7 +144,7 @@ public class LongAssertion_Test {
@Test
public void ca05_isNot() throws Exception {
- Long x1 = 1l, x1a = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
test(x1).isNot(x2);
test(x1).isNot(nil);
test(nil).isNot(x1);
@@ -154,7 +154,7 @@ public class LongAssertion_Test {
@Test
public void ca06_isAny() throws Exception {
- Long x1 = 1l, x1a = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
test(x1).isAny(x1a, x2);
assertThrown(()->test(x1).isAny(x2)).asMessage().asOneLine().is("Expected value not found. Expect='[2]'. Actual='1'.");
assertThrown(()->test(x1).isAny()).asMessage().asOneLine().is("Expected value not found. Expect='[]'. Actual='1'.");
@@ -163,7 +163,7 @@ public class LongAssertion_Test {
@Test
public void ca07_isNotAny() throws Exception {
- Long x1 = 1l, x1a = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
test(x1).isNotAny(x2);
test(x1).isNotAny();
test(nil).isNotAny(x2);
@@ -173,7 +173,7 @@ public class LongAssertion_Test {
@Test
public void ca08_isSame() throws Exception {
- Long x1 = 1000l, x1a = 1000l, nil = null;
+ Long x1 = 1000L, x1a = 1000L, nil = null;
test(x1).isSame(x1);
test(nil).isSame(nil);
assertThrown(()->test(x1).isSame(x1a)).asMessage().asOneLine().isMatches("Not the same value. Expect='1000(Long@*)'. Actual='1000(Long@*)'.");
@@ -183,7 +183,7 @@ public class LongAssertion_Test {
@Test
public void ca09_isSameJsonAs() throws Exception {
- Long x1 = 1l, x1a = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
test(x1).isSameJsonAs(x1a);
test(nil).isSameJsonAs(nil);
assertThrown(()->test(x1a).isSameJsonAs(x2)).asMessage().asOneLine().is("Unexpected comparison. Expect='2'. Actual='1'.");
@@ -193,7 +193,7 @@ public class LongAssertion_Test {
@Test
public void ca10_isSameSortedJsonAs() throws Exception {
- Long x1 = 1l, x1a = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
test(x1).isSameSortedJsonAs(x1a);
test(nil).isSameSortedJsonAs(nil);
assertThrown(()->test(x1a).isSameSortedJsonAs(x2)).asMessage().asOneLine().is("Unexpected comparison. Expect='2'. Actual='1'.");
@@ -203,7 +203,7 @@ public class LongAssertion_Test {
@Test
public void ca11_isSameSerializedAs() throws Exception {
- Long x1 = 1l, x1a = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x1a = 1L, x2 = 2L, nil = null;
WriterSerializer s = Json5Serializer.DEFAULT;
test(x1).isSameSerializedAs(x1a, s);
test(nil).isSameSerializedAs(nil, s);
@@ -214,7 +214,7 @@ public class LongAssertion_Test {
@Test
public void ca12_isType() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
test(x).isType(Long.class);
test(x).isType(Object.class);
assertThrown(()->test(x).isType(String.class)).asMessage().asOneLine().is("Unexpected type. Expect='java.lang.String'. Actual='java.lang.Long'.");
@@ -224,7 +224,7 @@ public class LongAssertion_Test {
@Test
public void ca13_isExactType() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
test(x).isExactType(Long.class);
assertThrown(()->test(x).isExactType(Object.class)).asMessage().asOneLine().is("Unexpected type. Expect='java.lang.Object'. Actual='java.lang.Long'.");
assertThrown(()->test(x).isExactType(String.class)).asMessage().asOneLine().is("Unexpected type. Expect='java.lang.String'. Actual='java.lang.Long'.");
@@ -234,7 +234,7 @@ public class LongAssertion_Test {
@Test
public void ca14_isString() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
test(x).isString("1");
test(nil).isString(null);
assertThrown(()->test(x).isString("bad")).asMessage().asOneLine().is("String differed at position 0. Expect='bad'. Actual='1'.");
@@ -244,7 +244,7 @@ public class LongAssertion_Test {
@Test
public void ca15_isJson() throws Exception {
- Long x = 1l, nil = null;
+ Long x = 1L, nil = null;
test(x).isJson("1");
test(nil).isJson("null");
assertThrown(()->test(x).isJson("bad")).asMessage().asOneLine().is("String differed at position 0. Expect='bad'. Actual='1'.");
@@ -254,7 +254,7 @@ public class LongAssertion_Test {
@Test
public void cb01_isGt() throws Exception {
- Long x1 = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x2 = 2L, nil = null;
test(x2).isGt(x1);
assertThrown(()->test(x1).isGt(x1)).asMessage().asOneLine().is("Value was not greater than expected. Expect='1'. Actual='1'.");
assertThrown(()->test(x1).isGt(x2)).asMessage().asOneLine().is("Value was not greater than expected. Expect='2'. Actual='1'.");
@@ -264,7 +264,7 @@ public class LongAssertion_Test {
@Test
public void cb02_isGte() throws Exception {
- Long x1 = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x2 = 2L, nil = null;
test(x2).isGte(x1);
test(x1).isGte(x1);
assertThrown(()->test(x1).isGte(x2)).asMessage().asOneLine().is("Value was not greater than or equals to expected. Expect='2'. Actual='1'.");
@@ -274,7 +274,7 @@ public class LongAssertion_Test {
@Test
public void cb03_isLt() throws Exception {
- Long x1 = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x2 = 2L, nil = null;
test(x1).isLt(x2);
assertThrown(()->test(x1).isLt(x1)).asMessage().asOneLine().is("Value was not less than expected. Expect='1'. Actual='1'.");
assertThrown(()->test(x2).isLt(x1)).asMessage().asOneLine().is("Value was not less than expected. Expect='1'. Actual='2'.");
@@ -284,7 +284,7 @@ public class LongAssertion_Test {
@Test
public void cb04_isLte() throws Exception {
- Long x1 = 1l, x2 = 2l, nil = null;
+ Long x1 = 1L, x2 = 2L, nil = null;
test(x1).isLte(x2);
test(x1).isLte(x1);
assertThrown(()->test(x2).isLte(x1)).asMessage().asOneLine().is("Value was not less than or equals to expected. Expect='1'. Actual='2'.");
@@ -294,7 +294,7 @@ public class LongAssertion_Test {
@Test
public void cb05_isBetween() throws Exception {
- Long x1 = 1l, x2 = 2l, x3 = 3l, x4 = 4l, nil = null;
+ Long x1 = 1L, x2 = 2L, x3 = 3L, x4 = 4L, nil = null;
test(x1).isBetween(x1, x3);
test(x2).isBetween(x1, x3);
test(x3).isBetween(x1, x3);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
index 534b75e94..e7130c3d2 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
@@ -376,13 +376,13 @@ public class ConfigTest {
@Test
public void getLong1() throws Exception {
Config c = init("a1=1", "a2=2", "[S]", "b1=1", "b2=");
- assertLong(c.get("a1").asLong().orElse(0l)).is(1l);
- assertLong(c.get("a2").asLong().orElse(0l)).is(2l);
- assertLong(c.get("a3").asLong().orElse(0l)).is(0l);
- assertLong(c.get("S/b1").asLong().orElse(0l)).is(1l);
- assertLong(c.get("S/b2").asLong().orElse(0l)).is(0l);
- assertLong(c.get("S/b3").asLong().orElse(0l)).is(0l);
- assertLong(c.get("T/c1").asLong().orElse(0l)).is(0l);
+ assertLong(c.get("a1").asLong().orElse(0L)).is(1L);
+ assertLong(c.get("a2").asLong().orElse(0L)).is(2L);
+ assertLong(c.get("a3").asLong().orElse(0L)).is(0L);
+ assertLong(c.get("S/b1").asLong().orElse(0L)).is(1L);
+ assertLong(c.get("S/b2").asLong().orElse(0L)).is(0L);
+ assertLong(c.get("S/b3").asLong().orElse(0L)).is(0L);
+ assertLong(c.get("T/c1").asLong().orElse(0L)).is(0L);
}
@Test
@@ -400,10 +400,10 @@ public class ConfigTest {
@Test
public void getLong2() throws Exception {
Config c = init("a1=1", "a2=2", "[S]", "b1=1", "b2=");
- assertLong(c.get("a1").asLong().orElse(Long.MAX_VALUE)).is(1l);
- assertLong(c.get("a2").asLong().orElse(Long.MAX_VALUE)).is(2l);
+ assertLong(c.get("a1").asLong().orElse(Long.MAX_VALUE)).is(1L);
+ assertLong(c.get("a2").asLong().orElse(Long.MAX_VALUE)).is(2L);
assertLong(c.get("a3").asLong().orElse(Long.MAX_VALUE)).is(Long.MAX_VALUE);
- assertLong(c.get("S/b1").asLong().orElse(Long.MAX_VALUE)).is(1l);
+ assertLong(c.get("S/b1").asLong().orElse(Long.MAX_VALUE)).is(1L);
assertLong(c.get("S/b2").asLong().orElse(Long.MAX_VALUE)).is(Long.MAX_VALUE);
assertLong(c.get("S/b3").asLong().orElse(Long.MAX_VALUE)).is(Long.MAX_VALUE);
assertLong(c.get("T/c1").asLong().orElse(Long.MAX_VALUE)).is(Long.MAX_VALUE);
@@ -413,10 +413,10 @@ public class ConfigTest {
public void getLong2BadValues() throws Exception {
Config c = init("a1=foo", "a2=2.3", "a3=[1]", "a4=false");
- assertThrown(()->c.get("a1").asLong().orElse(-1l)).isType(NumberFormatException.class);
- assertThrown(()->c.get("a2").asLong().orElse(-1l)).isType(NumberFormatException.class);
- assertThrown(()->c.get("a3").asLong().orElse(-1l)).isType(NumberFormatException.class);
- assertThrown(()->c.get("a4").asLong().orElse(-1l)).isType(NumberFormatException.class);
+ assertThrown(()->c.get("a1").asLong().orElse(-1L)).isType(NumberFormatException.class);
+ assertThrown(()->c.get("a2").asLong().orElse(-1L)).isType(NumberFormatException.class);
+ assertThrown(()->c.get("a3").asLong().orElse(-1L)).isType(NumberFormatException.class);
+ assertThrown(()->c.get("a4").asLong().orElse(-1L)).isType(NumberFormatException.class);
}
//====================================================================================================
diff --git a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java
index 8c680ac5f..ca77de8cc 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java
@@ -36,7 +36,7 @@ public class HtmlSchemaSerializerTest {
assertEquals("<table><tr><td>type</td><td>integer</td></tr><tr><td>format</td><td>int16</td></tr></table>", s.serialize((short)1));
assertEquals("<table><tr><td>type</td><td>integer</td></tr><tr><td>format</td><td>int32</td></tr></table>", s.serialize(1));
- assertEquals("<table><tr><td>type</td><td>integer</td></tr><tr><td>format</td><td>int64</td></tr></table>", s.serialize(1l));
+ assertEquals("<table><tr><td>type</td><td>integer</td></tr><tr><td>format</td><td>int64</td></tr></table>", s.serialize(1L));
assertEquals("<table><tr><td>type</td><td>number</td></tr><tr><td>format</td><td>float</td></tr></table>", s.serialize(1f));
assertEquals("<table><tr><td>type</td><td>number</td></tr><tr><td>format</td><td>double</td></tr></table>", s.serialize(1d));
assertEquals("<table><tr><td>type</td><td>boolean</td></tr></table>", s.serialize(true));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
index 5ae0de926..3eb1adbd2 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
@@ -94,12 +94,12 @@ public class BasicHttpResource_Test {
assertTrue(x.isRepeatable());
x.writeTo(new ByteArrayOutputStream());
- assertLong(stringResource("foo").getContentLength()).is(3l);
- assertLong(byteArrayResource("foo".getBytes()).getContentLength()).is(3l);
- assertLong(fileResource(f).getContentLength()).is(0l);
+ assertLong(stringResource("foo").getContentLength()).is(3L);
+ assertLong(byteArrayResource("foo".getBytes()).getContentLength()).is(3L);
+ assertLong(fileResource(f).getContentLength()).is(0L);
- assertLong(readerResource(reader("foo")).getContentLength()).is(-1l);
- assertLong(readerResource(reader("foo")).setContentLength(3).getContentLength()).is(3l);
+ assertLong(readerResource(reader("foo")).getContentLength()).is(-1L);
+ assertLong(readerResource(reader("foo")).setContentLength(3).getContentLength()).is(3L);
x = stringResource("foo", contentType("text/plain")).setContentEncoding("identity");
assertString(x.getContentType().getValue()).is("text/plain");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
index 8b9c095f8..7323515af 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
@@ -86,7 +86,7 @@ public class SerializedHttpEntity_Test {
@Test
public void a07_getContentLength() throws Exception {
- assertLong(serializedEntity(ABean.get(),null).getContentLength()).is(-1l);
+ assertLong(serializedEntity(ABean.get(),null).getContentLength()).is(-1L);
}
@Test
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicLongHeader_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicLongHeader_Test.java
index 1270becf6..8434a373f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicLongHeader_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicLongHeader_Test.java
@@ -35,7 +35,7 @@ public class BasicLongHeader_Test {
private static final String HEADER = "Foo";
private static final String VALUE = "123";
- private static final Long PARSED = 123l;
+ private static final Long PARSED = 123L;
@Rest
public static class A {
@@ -72,7 +72,7 @@ public class BasicLongHeader_Test {
@Test
public void a02_assertLong() throws Exception {
- longHeader(HEADER,1l).assertLong().is(1l);
+ longHeader(HEADER,1L).assertLong().is(1L);
}
//------------------------------------------------------------------------------------------------------------------
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLength_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLength_Test.java
index 8740cc3c2..98d28ce7a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLength_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLength_Test.java
@@ -32,7 +32,7 @@ public class ContentLength_Test {
private static final String HEADER = "Content-Length";
private static final String VALUE = "123";
- private static final Long PARSED = 123l;
+ private static final Long PARSED = 123L;
@Rest
public static class A {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
index 8ce01eb85..3fedad0a6 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
@@ -311,18 +311,18 @@ public class Remote_FormDataAnnotation_Test {
assertEquals("{x:'9'}",x.postX7((short)9));
assertThrown(()->x.postX7((short)1)).asMessages().isContains("Minimum value not met.");
assertThrown(()->x.postX7((short)10)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.postX8(1l));
- assertEquals("{x:'10'}",x.postX8(10l));
- assertThrown(()->x.postX8(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.postX8(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.postX9(1l));
- assertEquals("{x:'10'}",x.postX9(10l));
- assertThrown(()->x.postX9(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.postX9(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'2'}",x.postX10(2l));
- assertEquals("{x:'9'}",x.postX10(9l));
- assertThrown(()->x.postX10(1l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.postX10(10l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.postX8(1L));
+ assertEquals("{x:'10'}",x.postX8(10L));
+ assertThrown(()->x.postX8(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.postX8(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.postX9(1L));
+ assertEquals("{x:'10'}",x.postX9(10L));
+ assertThrown(()->x.postX9(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.postX9(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'2'}",x.postX10(2L));
+ assertEquals("{x:'9'}",x.postX10(9L));
+ assertThrown(()->x.postX10(1L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.postX10(10L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{x:'1.0'}",x.postX11(1f));
assertEquals("{x:'10.0'}",x.postX11(10f));
assertThrown(()->x.postX11(0.9f)).asMessages().isContains("Minimum value not met.");
@@ -413,20 +413,20 @@ public class Remote_FormDataAnnotation_Test {
assertThrown(()->x.postX31((short)1)).asMessages().isContains("Minimum value not met.");
assertThrown(()->x.postX31((short)10)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.postX31(null));
- assertEquals("{x:'1'}",x.postX32(1l));
- assertEquals("{x:'10'}",x.postX32(10l));
- assertThrown(()->x.postX32(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.postX32(11l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.postX32(1L));
+ assertEquals("{x:'10'}",x.postX32(10L));
+ assertThrown(()->x.postX32(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.postX32(11L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.postX32(null));
- assertEquals("{x:'1'}",x.postX33(1l));
- assertEquals("{x:'10'}",x.postX33(10l));
- assertThrown(()->x.postX33(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.postX33(11l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.postX33(1L));
+ assertEquals("{x:'10'}",x.postX33(10L));
+ assertThrown(()->x.postX33(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.postX33(11L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.postX33(null));
- assertEquals("{x:'2'}",x.postX34(2l));
- assertEquals("{x:'9'}",x.postX34(9l));
- assertThrown(()->x.postX34(1l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.postX34(10l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'2'}",x.postX34(2L));
+ assertEquals("{x:'9'}",x.postX34(9L));
+ assertThrown(()->x.postX34(1L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.postX34(10L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.postX34(null));
assertEquals("{x:'1.0'}",x.postX35(1f));
assertEquals("{x:'10.0'}",x.postX35(10f));
@@ -620,8 +620,8 @@ public class Remote_FormDataAnnotation_Test {
assertThrown(()->x.postX9(5)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4'}",x.postX10((short)4));
assertThrown(()->x.postX10((short)5)).asMessages().isContains("Multiple-of not met.");
- assertEquals("{x:'4'}",x.postX11(4l));
- assertThrown(()->x.postX11(5l)).asMessages().isContains("Multiple-of not met.");
+ assertEquals("{x:'4'}",x.postX11(4L));
+ assertThrown(()->x.postX11(5L)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4.0'}",x.postX12(4f));
assertThrown(()->x.postX12(5f)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4.0'}",x.postX13(4d));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
index 1f5c6a521..a0f371dfd 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
@@ -268,18 +268,18 @@ public class Remote_HeaderAnnotation_Test {
assertEquals("{x:'9'}",x.getX6((short)9));
assertThrown(()->x.getX6((short)1)).asMessages().isContains("Minimum value not met.");
assertThrown(()->x.getX6((short)10)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.getX7(1l));
- assertEquals("{x:'10'}",x.getX7(10l));
- assertThrown(()->x.getX7(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX7(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.getX8(1l));
- assertEquals("{x:'10'}",x.getX8(10l));
- assertThrown(()->x.getX8(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX8(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'2'}",x.getX9(2l));
- assertEquals("{x:'9'}",x.getX9(9l));
- assertThrown(()->x.getX9(1l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX9(10l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX7(1L));
+ assertEquals("{x:'10'}",x.getX7(10L));
+ assertThrown(()->x.getX7(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX7(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX8(1L));
+ assertEquals("{x:'10'}",x.getX8(10L));
+ assertThrown(()->x.getX8(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX8(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'2'}",x.getX9(2L));
+ assertEquals("{x:'9'}",x.getX9(9L));
+ assertThrown(()->x.getX9(1L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX9(10L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{x:'1.0'}",x.getX10(1f));
assertEquals("{x:'10.0'}",x.getX10(10f));
assertThrown(()->x.getX10(0.9f)).asMessages().isContains("Minimum value not met.");
@@ -370,20 +370,20 @@ public class Remote_HeaderAnnotation_Test {
assertThrown(()->x.getX30((short)1)).asMessages().isContains("Minimum value not met.");
assertThrown(()->x.getX30((short)10)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.getX30(null));
- assertEquals("{x:'1'}",x.getX31(1l));
- assertEquals("{x:'10'}",x.getX31(10l));
- assertThrown(()->x.getX31(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX31(11l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX31(1L));
+ assertEquals("{x:'10'}",x.getX31(10L));
+ assertThrown(()->x.getX31(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX31(11L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.getX31(null));
- assertEquals("{x:'1'}",x.getX32(1l));
- assertEquals("{x:'10'}",x.getX32(10l));
- assertThrown(()->x.getX32(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX32(11l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX32(1L));
+ assertEquals("{x:'10'}",x.getX32(10L));
+ assertThrown(()->x.getX32(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX32(11L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.getX32(null));
- assertEquals("{x:'2'}",x.getX33(2l));
- assertEquals("{x:'9'}",x.getX33(9l));
- assertThrown(()->x.getX33(1l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX33(10l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'2'}",x.getX33(2L));
+ assertEquals("{x:'9'}",x.getX33(9L));
+ assertThrown(()->x.getX33(1L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX33(10L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.getX33(null));
assertEquals("{x:'1.0'}",x.getX34(1f));
assertEquals("{x:'10.0'}",x.getX34(10f));
@@ -580,8 +580,8 @@ public class Remote_HeaderAnnotation_Test {
assertThrown(()->x.getX9(5)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4'}",x.getX10((short)4));
assertThrown(()->x.getX10((short)5)).asMessages().isContains("Multiple-of not met.");
- assertEquals("{x:'4'}",x.getX11(4l));
- assertThrown(()->x.getX11(5l)).asMessages().isContains("Multiple-of not met.");
+ assertEquals("{x:'4'}",x.getX11(4L));
+ assertThrown(()->x.getX11(5L)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4.0'}",x.getX12(4f));
assertThrown(()->x.getX12(5f)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4.0'}",x.getX13(4d));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
index cd516de99..2958d1d1f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
@@ -237,18 +237,18 @@ public class Remote_PathAnnotation_Test {
assertEquals("{x:'9'}",x.getX6((short)9));
assertThrown(()->x.getX6((short)1)).asMessages().isContains("Minimum value not met.");
assertThrown(()->x.getX6((short)10)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.getX7(1l));
- assertEquals("{x:'10'}",x.getX7(10l));
- assertThrown(()->x.getX7(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX7(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.getX8(1l));
- assertEquals("{x:'10'}",x.getX8(10l));
- assertThrown(()->x.getX8(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX8(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'2'}",x.getX9(2l));
- assertEquals("{x:'9'}",x.getX9(9l));
- assertThrown(()->x.getX9(1l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX9(10l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX7(1L));
+ assertEquals("{x:'10'}",x.getX7(10L));
+ assertThrown(()->x.getX7(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX7(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX8(1L));
+ assertEquals("{x:'10'}",x.getX8(10L));
+ assertThrown(()->x.getX8(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX8(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'2'}",x.getX9(2L));
+ assertEquals("{x:'9'}",x.getX9(9L));
+ assertThrown(()->x.getX9(1L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX9(10L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{x:'1.0'}",x.getX10(1f));
assertEquals("{x:'10.0'}",x.getX10(10f));
assertThrown(()->x.getX10(0.9f)).asMessages().isContains("Minimum value not met.");
@@ -333,18 +333,18 @@ public class Remote_PathAnnotation_Test {
assertEquals("{x:'9'}",x.getX30((short)9));
assertThrown(()->x.getX30((short)1)).asMessages().isContains("Minimum value not met.");
assertThrown(()->x.getX30((short)10)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.getX31(1l));
- assertEquals("{x:'10'}",x.getX31(10l));
- assertThrown(()->x.getX31(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX31(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.getX32(1l));
- assertEquals("{x:'10'}",x.getX32(10l));
- assertThrown(()->x.getX32(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX32(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'2'}",x.getX33(2l));
- assertEquals("{x:'9'}",x.getX33(9l));
- assertThrown(()->x.getX33(1l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX33(10l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX31(1L));
+ assertEquals("{x:'10'}",x.getX31(10L));
+ assertThrown(()->x.getX31(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX31(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX32(1L));
+ assertEquals("{x:'10'}",x.getX32(10L));
+ assertThrown(()->x.getX32(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX32(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'2'}",x.getX33(2L));
+ assertEquals("{x:'9'}",x.getX33(9L));
+ assertThrown(()->x.getX33(1L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX33(10L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{x:'1.0'}",x.getX34(1f));
assertEquals("{x:'10.0'}",x.getX34(10f));
assertThrown(()->x.getX34(0.9f)).asMessages().isContains("Minimum value not met.");
@@ -528,8 +528,8 @@ public class Remote_PathAnnotation_Test {
assertThrown(()->x.getX9(5)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4'}",x.getX10((short)4));
assertThrown(()->x.getX10((short)5)).asMessages().isContains("Multiple-of not met.");
- assertEquals("{x:'4'}",x.getX11(4l));
- assertThrown(()->x.getX11(5l)).asMessages().isContains("Multiple-of not met.");
+ assertEquals("{x:'4'}",x.getX11(4L));
+ assertThrown(()->x.getX11(5L)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4.0'}",x.getX12(4f));
assertThrown(()->x.getX12(5f)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4.0'}",x.getX13(4d));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
index 2de0a6120..33214c50a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
@@ -293,18 +293,18 @@ public class Remote_QueryAnnotation_Test {
assertEquals("{x:'9'}",x.getX6((short)9));
assertThrown(()->x.getX6((short)1)).asMessages().isContains("Minimum value not met.");
assertThrown(()->x.getX6((short)10)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.getX7(1l));
- assertEquals("{x:'10'}",x.getX7(10l));
- assertThrown(()->x.getX7(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX7(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'1'}",x.getX8(1l));
- assertEquals("{x:'10'}",x.getX8(10l));
- assertThrown(()->x.getX8(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX8(11l)).asMessages().isContains("Maximum value exceeded.");
- assertEquals("{x:'2'}",x.getX9(2l));
- assertEquals("{x:'9'}",x.getX9(9l));
- assertThrown(()->x.getX9(1l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX9(10l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX7(1L));
+ assertEquals("{x:'10'}",x.getX7(10L));
+ assertThrown(()->x.getX7(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX7(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX8(1L));
+ assertEquals("{x:'10'}",x.getX8(10L));
+ assertThrown(()->x.getX8(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX8(11L)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'2'}",x.getX9(2L));
+ assertEquals("{x:'9'}",x.getX9(9L));
+ assertThrown(()->x.getX9(1L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX9(10L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{x:'1.0'}",x.getX10(1f));
assertEquals("{x:'10.0'}",x.getX10(10f));
assertThrown(()->x.getX10(0.9f)).asMessages().isContains("Minimum value not met.");
@@ -395,20 +395,20 @@ public class Remote_QueryAnnotation_Test {
assertThrown(()->x.getX30((short)1)).asMessages().isContains("Minimum value not met.");
assertThrown(()->x.getX30((short)10)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.getX30(null));
- assertEquals("{x:'1'}",x.getX31(1l));
- assertEquals("{x:'10'}",x.getX31(10l));
- assertThrown(()->x.getX31(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX31(11l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX31(1L));
+ assertEquals("{x:'10'}",x.getX31(10L));
+ assertThrown(()->x.getX31(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX31(11L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.getX31(null));
- assertEquals("{x:'1'}",x.getX32(1l));
- assertEquals("{x:'10'}",x.getX32(10l));
- assertThrown(()->x.getX32(0l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX32(11l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'1'}",x.getX32(1L));
+ assertEquals("{x:'10'}",x.getX32(10L));
+ assertThrown(()->x.getX32(0L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX32(11L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.getX32(null));
- assertEquals("{x:'2'}",x.getX33(2l));
- assertEquals("{x:'9'}",x.getX33(9l));
- assertThrown(()->x.getX33(1l)).asMessages().isContains("Minimum value not met.");
- assertThrown(()->x.getX33(10l)).asMessages().isContains("Maximum value exceeded.");
+ assertEquals("{x:'2'}",x.getX33(2L));
+ assertEquals("{x:'9'}",x.getX33(9L));
+ assertThrown(()->x.getX33(1L)).asMessages().isContains("Minimum value not met.");
+ assertThrown(()->x.getX33(10L)).asMessages().isContains("Maximum value exceeded.");
assertEquals("{}",x.getX33(null));
assertEquals("{x:'1.0'}",x.getX34(1f));
assertEquals("{x:'10.0'}",x.getX34(10f));
@@ -602,8 +602,8 @@ public class Remote_QueryAnnotation_Test {
assertThrown(()->x.getX9(5)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4'}",x.getX10((short)4));
assertThrown(()->x.getX10((short)5)).asMessages().isContains("Multiple-of not met.");
- assertEquals("{x:'4'}",x.getX11(4l));
- assertThrown(()->x.getX11(5l)).asMessages().isContains("Multiple-of not met.");
+ assertEquals("{x:'4'}",x.getX11(4L));
+ assertThrown(()->x.getX11(5L)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4.0'}",x.getX12(4f));
assertThrown(()->x.getX12(5f)).asMessages().isContains("Multiple-of not met.");
assertEquals("{x:'4.0'}",x.getX13(4d));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartParser_Test.java b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartParser_Test.java
index 3cb258a8a..1b66f3c06 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartParser_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartParser_Test.java
@@ -100,7 +100,7 @@ public class OpenApiPartParser_Test {
@Test
public void a05_inputValidations_minMaxLength() throws Exception {
- HttpPartSchema s = tNone().minLength(1l).maxLength(2l).allowEmptyValue().build();
+ HttpPartSchema s = tNone().minLength(1L).maxLength(2L).allowEmptyValue().build();
assertEquals(null, parse(s, null, String.class));
assertEquals("1", parse(s, "1", String.class));
@@ -108,9 +108,9 @@ public class OpenApiPartParser_Test {
assertThrown(()->parse(s, "", String.class)).asMessage().is("Minimum length of value not met.");
assertThrown(()->parse(s, "123", String.class)).asMessage().is("Maximum length of value exceeded.");
- assertThrown(()->tNone().minLength(2l).maxLength(1l).build()).asMessage().isContains("maxLength cannot be less than minLength.");
- assertThrown(()->tNone().minLength(-2l).build()).asMessage().isContains("minLength cannot be less than zero.");
- assertThrown(()->tNone().maxLength(-2l).build()).asMessage().isContains("maxLength cannot be less than zero.");
+ assertThrown(()->tNone().minLength(2L).maxLength(1L).build()).asMessage().isContains("maxLength cannot be less than minLength.");
+ assertThrown(()->tNone().minLength(-2L).build()).asMessage().isContains("minLength cannot be less than zero.");
+ assertThrown(()->tNone().maxLength(-2L).build()).asMessage().isContains("maxLength cannot be less than zero.");
}
//-----------------------------------------------------------------------------------------------------------------
diff --git a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
index 47f62d75f..f53435f9d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
@@ -90,7 +90,7 @@ public class OpenApiPartSerializer_Test {
@Test
public void a05_outputValidations_minMaxLength() throws Exception {
- HttpPartSchema ps = tNone().minLength(1l).maxLength(2l).allowEmptyValue().build();
+ HttpPartSchema ps = tNone().minLength(1L).maxLength(2L).allowEmptyValue().build();
assertEquals("null", serialize(ps, null));
assertEquals("1", serialize(ps, "1"));
@@ -529,7 +529,7 @@ public class OpenApiPartSerializer_Test {
assertEquals("1", serialize(ps, Integer.valueOf(1)));
assertEquals("1", serialize(ps, (short)1));
assertEquals("1", serialize(ps, Short.valueOf((short)1)));
- assertEquals("1", serialize(ps, 1l));
+ assertEquals("1", serialize(ps, 1L));
assertEquals("1", serialize(ps, Long.valueOf(1)));
assertEquals("1", serialize(ps, "1"));
assertEquals("1", serialize(ps, new F1(1)));
@@ -546,9 +546,9 @@ public class OpenApiPartSerializer_Test {
assertEquals("1,2", serialize(ps, new short[]{1,2}));
assertEquals("1,2,null", serialize(ps, new Short[]{1,2,null}));
assertEquals("1,2,null", serialize(ps, list(Short.valueOf((short)1),Short.valueOf((short)2),null)));
- assertEquals("1,2", serialize(ps, new long[]{1l,2l}));
- assertEquals("1,2,null", serialize(ps, new Long[]{1l,2l,null}));
- assertEquals("1,2,null", serialize(ps, list(1l,2l,null)));
+ assertEquals("1,2", serialize(ps, new long[]{1L,2L}));
+ assertEquals("1,2,null", serialize(ps, new Long[]{1L,2L,null}));
+ assertEquals("1,2,null", serialize(ps, list(1L,2L,null)));
assertEquals("1,2,null,null", serialize(ps, new String[]{"1","2","null",null}));
assertEquals("1,2,null,null", serialize(ps, list("1","2","null",null)));
assertEquals("1,2,null", serialize(ps, new Object[]{1,2,null}));
@@ -571,10 +571,10 @@ public class OpenApiPartSerializer_Test {
assertEquals("1,2|3,null|null", serialize(ps, new Short[][]{{1,2},{3,null},null}));
assertEquals("1,2|3,null|null", serialize(ps, list(new Short[]{1,2},new Short[]{3,null},null)));
assertEquals("1,2|3,null|null", serialize(ps, list(list(Short.valueOf((short)1),Short.valueOf((short)2)),list(Short.valueOf((short)3),null),null)));
- assertEquals("1,2|3|null", serialize(ps, new long[][]{{1l,2l},{3l},null}));
- assertEquals("1,2|3|null", serialize(ps, list(new long[]{1l,2l},new long[]{3l},null)));
- assertEquals("1,2|3,null|null", serialize(ps, new Long[][]{{1l,2l},{3l,null},null}));
- assertEquals("1,2|3,null|null", serialize(ps, list(new Long[]{1l,2l},new Long[]{3l,null},null)));
+ assertEquals("1,2|3|null", serialize(ps, new long[][]{{1L,2L},{3L},null}));
+ assertEquals("1,2|3|null", serialize(ps, list(new long[]{1L,2L},new long[]{3L},null)));
+ assertEquals("1,2|3,null|null", serialize(ps, new Long[][]{{1L,2L},{3L,null},null}));
+ assertEquals("1,2|3,null|null", serialize(ps, list(new Long[]{1L,2L},new Long[]{3L,null},null)));
assertEquals("1,2|3,null|null", serialize(ps, list(list(Long.valueOf(1),Long.valueOf(2)),list(Long.valueOf(3),null),null)));
assertEquals("1,2|3,null,null|null", serialize(ps, new String[][]{{"1","2"},{"3","null",null},null}));
assertEquals("1,2|3,null,null|null", serialize(ps, list(new String[]{"1","2"},new String[]{"3","null",null},null)));
@@ -596,10 +596,10 @@ public class OpenApiPartSerializer_Test {
assertEquals("1", serialize(ps, Integer.valueOf(1)));
assertEquals("1", serialize(ps, (short)1));
assertEquals("1", serialize(ps, Short.valueOf((short)1)));
- assertEquals("1", serialize(ps, 1l));
- assertEquals("1", serialize(ps, Long.valueOf(1l)));
+ assertEquals("1", serialize(ps, 1L));
+ assertEquals("1", serialize(ps, Long.valueOf(1L)));
assertEquals("1", serialize(ps, "1"));
- assertEquals("1", serialize(ps, new F3(1l)));
+ assertEquals("1", serialize(ps, new F3(1L)));
assertEquals("null", serialize(ps, null));
assertEquals("null", serialize(ps, "null"));
}
@@ -613,16 +613,16 @@ public class OpenApiPartSerializer_Test {
assertEquals("1,2", serialize(ps, new short[]{1,2}));
assertEquals("1,2,null", serialize(ps, new Short[]{1,2,null}));
assertEquals("1,2,null", serialize(ps, list((short)1,(short)2,null)));
- assertEquals("1,2", serialize(ps, new long[]{1l,2l}));
- assertEquals("1,2,null", serialize(ps, new Long[]{1l,2l,null}));
- assertEquals("1,2,null", serialize(ps, list(1l,2l,null)));
+ assertEquals("1,2", serialize(ps, new long[]{1L,2L}));
+ assertEquals("1,2,null", serialize(ps, new Long[]{1L,2L,null}));
+ assertEquals("1,2,null", serialize(ps, list(1L,2L,null)));
assertEquals("1,2,null,null", serialize(ps, new String[]{"1","2","null",null}));
assertEquals("1,2,null,null", serialize(ps, list("1","2","null",null)));
assertEquals("1,2,null", serialize(ps, new Object[]{1,2,null}));
assertEquals("1,2,null", serialize(ps, list((Object)1,(Object)2,null)));
- assertEquals("1,2,null,null", serialize(ps, new F3[]{new F3(1l),new F3(2l),new F3(null),null}));
- assertEquals("1,2,null,null", serialize(ps, list(new F3(1l),new F3(2l),new F3(null),null)));
- assertEquals("1,2,null", serialize(ps, new F4(1l,2l,null)));
+ assertEquals("1,2,null,null", serialize(ps, new F3[]{new F3(1L),new F3(2L),new F3(null),null}));
+ assertEquals("1,2,null,null", serialize(ps, list(new F3(1L),new F3(2L),new F3(null),null)));
+ assertEquals("1,2,null", serialize(ps, new F4(1L,2L,null)));
}
@Test
@@ -638,22 +638,22 @@ public class OpenApiPartSerializer_Test {
assertEquals("1,2|3,null|null", serialize(ps, new Short[][]{{1,2},{3,null},null}));
assertEquals("1,2|3,null|null", serialize(ps, list(new Short[]{1,2},new Short[]{3,null},null)));
assertEquals("1,2|3,null|null", serialize(ps, list(list((short)1,(short)2),list((short)3,null),null)));
- assertEquals("1,2|3|null", serialize(ps, new long[][]{{1l,2l},{3l},null}));
- assertEquals("1,2|3|null", serialize(ps, list(new long[]{1l,2l},new long[]{3l},null)));
- assertEquals("1,2|3,null|null", serialize(ps, new Long[][]{{1l,2l},{3l,null},null}));
- assertEquals("1,2|3,null|null", serialize(ps, list(new Long[]{1l,2l},new Long[]{3l,null},null)));
- assertEquals("1,2|3,null|null", serialize(ps, list(list(1l,2l),list(3l,null),null)));
+ assertEquals("1,2|3|null", serialize(ps, new long[][]{{1L,2L},{3L},null}));
+ assertEquals("1,2|3|null", serialize(ps, list(new long[]{1L,2L},new long[]{3L},null)));
+ assertEquals("1,2|3,null|null", serialize(ps, new Long[][]{{1L,2L},{3L,null},null}));
+ assertEquals("1,2|3,null|null", serialize(ps, list(new Long[]{1L,2L},new Long[]{3L,null},null)));
+ assertEquals("1,2|3,null|null", serialize(ps, list(list(1L,2L),list(3L,null),null)));
assertEquals("1,2|3,null,null|null", serialize(ps, new String[][]{{"1","2"},{"3","null",null},null}));
assertEquals("1,2|3,null,null|null", serialize(ps, list(new String[]{"1","2"},new String[]{"3","null",null},null)));
assertEquals("1,2|3,null,null|null", serialize(ps, list(list("1","2"),list("3","null",null),null)));
assertEquals("1,2|3,null|null", serialize(ps, new Object[][]{{1,2},{3,null},null}));
assertEquals("1,2|3,null|null", serialize(ps, list(new Object[]{1,2},new Object[]{3,null},null)));
assertEquals("1,2|3,null|null", serialize(ps, list(list((Object)1,(Object)2),list((Object)3,null),null)));
- assertEquals("1,2|3,null,null|null", serialize(ps, new F3[][]{{new F3(1l),new F3(2l)},{new F3(3l),new F3(null),null},null}));
- assertEquals("1,2|3,null,null|null", serialize(ps, list(new F3[]{new F3(1l),new F3(2l)},new F3[]{new F3(3l),new F3(null),null},null)));
- assertEquals("1,2|3,null,null|null", serialize(ps, list(list(new F3(1l),new F3(2l)),list(new F3(3l),new F3(null),null),null)));
- assertEquals("1,2|3,null|null", serialize(ps, new F4[]{new F4(1l,2l),new F4(3l,null),null}));
- assertEquals("1,2|3,null|null", serialize(ps, list(new F4(1l,2l),new F4(3l,null),null)));
+ assertEquals("1,2|3,null,null|null", serialize(ps, new F3[][]{{new F3(1L),new F3(2L)},{new F3(3L),new F3(null),null},null}));
+ assertEquals("1,2|3,null,null|null", serialize(ps, list(new F3[]{new F3(1L),new F3(2L)},new F3[]{new F3(3L),new F3(null),null},null)));
+ assertEquals("1,2|3,null,null|null", serialize(ps, list(list(new F3(1L),new F3(2L)),list(new F3(3L),new F3(null),null),null)));
+ assertEquals("1,2|3,null|null", serialize(ps, new F4[]{new F4(1L,2L),new F4(3L,null),null}));
+ assertEquals("1,2|3,null|null", serialize(ps, list(new F4(1L,2L),new F4(3L,null),null)));
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/json/JsonSchemaSerializerTest.java b/juneau-utest/src/test/java/org/apache/juneau/json/JsonSchemaSerializerTest.java
index 5146fe208..f344c45f6 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/json/JsonSchemaSerializerTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/json/JsonSchemaSerializerTest.java
@@ -34,7 +34,7 @@ public class JsonSchemaSerializerTest {
assertEquals("{type:'integer',format:'int16'}", s.serialize((short)1));
assertEquals("{type:'integer',format:'int32'}", s.serialize(1));
- assertEquals("{type:'integer',format:'int64'}", s.serialize(1l));
+ assertEquals("{type:'integer',format:'int64'}", s.serialize(1L));
assertEquals("{type:'number',format:'float'}", s.serialize(1f));
assertEquals("{type:'number',format:'double'}", s.serialize(1d));
assertEquals("{type:'boolean'}", s.serialize(true));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
index 2a4ca01f7..d6a871c6c 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
@@ -884,8 +884,8 @@ public class JsonSchemaGeneratorTest {
.example(Short.class, (short)3)
.example(int.class, 4)
.example(Integer.class, 5)
- .example(long.class, 6l)
- .example(Long.class, 7l)
+ .example(long.class, 6L)
+ .example(Long.class, 7L)
.example(float.class, 8f)
.example(Float.class, 9f)
.example(double.class, 10d)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java b/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java
index 58414a257..da972640f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java
@@ -165,7 +165,7 @@ public class MethodExecStore_Test {
MethodExecStore store = MethodExecStore.create().thrownStore(s).build();
MethodExecStats stats = store.getStats(m);
- assertLong(stats.getGuid()).isNot(0l);
+ assertLong(stats.getGuid()).isNot(0L);
assertObject(stats.getMethod()).isSame(m);
assertInteger(stats.getRuns()).is(0);
@@ -174,7 +174,7 @@ public class MethodExecStore_Test {
assertInteger(stats.getMinTime()).is(0);
assertInteger(stats.getMaxTime()).is(0);
assertInteger(stats.getAvgTime()).is(0);
- assertLong(stats.getTotalTime()).is(0l);
+ assertLong(stats.getTotalTime()).is(0L);
stats.started().finished(100*1000000).started().finished(200*1000000).started().error(new Throwable());
@@ -184,7 +184,7 @@ public class MethodExecStore_Test {
assertInteger(stats.getMinTime()).is(100);
assertInteger(stats.getMaxTime()).is(200);
assertInteger(stats.getAvgTime()).is(150);
- assertLong(stats.getTotalTime()).is(300l);
+ assertLong(stats.getTotalTime()).is(300L);
assertObject(stats).asString().isContains("300");
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java b/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
index 11a1e1e46..c27960128 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
@@ -285,28 +285,28 @@ public class ThrownStore_Test {
ThrownStore store = ThrownStore.create().build();
ThrownStats stats = store.add(t2);
- assertLong(stats.getHash()).isNot(0l);
- assertLong(stats.getGuid()).isNot(0l);
- assertLong(stats.getFirstOccurrence()).isNot(0l);
- assertLong(stats.getLastOccurrence()).isNot(0l);
+ assertLong(stats.getHash()).isNot(0L);
+ assertLong(stats.getGuid()).isNot(0L);
+ assertLong(stats.getFirstOccurrence()).isNot(0L);
+ assertLong(stats.getLastOccurrence()).isNot(0L);
assertString(stats.getFirstMessage()).is("bar");
assertObject(stats.getStackTrace()).asJson().isContains("org.apache.juneau");
assertObject(stats).asString().isContains("bar");
stats = stats.clone();
- assertLong(stats.getHash()).isNot(0l);
- assertLong(stats.getGuid()).isNot(0l);
- assertLong(stats.getFirstOccurrence()).isNot(0l);
- assertLong(stats.getLastOccurrence()).isNot(0l);
+ assertLong(stats.getHash()).isNot(0L);
+ assertLong(stats.getGuid()).isNot(0L);
+ assertLong(stats.getFirstOccurrence()).isNot(0L);
+ assertLong(stats.getLastOccurrence()).isNot(0L);
assertString(stats.getFirstMessage()).is("bar");
assertObject(stats.getStackTrace()).asJson().isContains("org.apache.juneau");
assertObject(stats).asString().isContains("bar");
stats = stats.getCausedBy().get();
- assertLong(stats.getHash()).isNot(0l);
- assertLong(stats.getGuid()).isNot(0l);
- assertLong(stats.getFirstOccurrence()).isNot(0l);
- assertLong(stats.getLastOccurrence()).isNot(0l);
+ assertLong(stats.getHash()).isNot(0L);
+ assertLong(stats.getGuid()).isNot(0L);
+ assertLong(stats.getFirstOccurrence()).isNot(0L);
+ assertLong(stats.getLastOccurrence()).isNot(0L);
assertString(stats.getFirstMessage()).is("foo");
assertObject(stats.getStackTrace()).asJson().isContains("org.apache.juneau");
assertObject(stats).asString().isContains("foo");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java b/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java
index 118214692..7aec23d8f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java
@@ -519,7 +519,7 @@ public class OpenApiTest {
@Test
public void d06_typeInteger_formatInt64_Long() throws Exception {
- Long in = 123l;
+ Long in = 123L;
HttpPartSchema ps = T_INT64;
String s = serialize(ps, in);
assertEquals("123", s);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
index f36c87d08..8f4d3ce54 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
@@ -337,7 +337,7 @@ public class ObjectRest_Test {
assertNull(model.get("f1"));
assertEquals(0, model.get("f2"));
- assertEquals(0l, model.get("f3"));
+ assertEquals(0L, model.get("f3"));
assertFalse((Boolean)model.get("f4"));
assertNull(model.get("f2a"));
assertNull(model.get("f3a"));
@@ -349,7 +349,7 @@ public class ObjectRest_Test {
assertEquals("foo", model.getWithDefault("f1", "foo"));
assertEquals(0, model.getWithDefault("f2", "foo"));
- assertEquals(0l, model.getWithDefault("f3", "foo"));
+ assertEquals(0L, model.getWithDefault("f3", "foo"));
assertEquals(false, model.getWithDefault("f4", "foo"));
assertEquals("foo", model.getWithDefault("f2a", "foo"));
assertEquals("foo", model.getWithDefault("f3a", "foo"));
@@ -419,17 +419,17 @@ public class ObjectRest_Test {
assertNull(model.getLong("f7"));
assertNull(model.getLong("f8"));
- assertEquals(1, (long)model.getLong("f1", 1l));
- assertEquals(0, (long)model.getLong("f2", 1l));
- assertEquals(0, (long)model.getLong("f3", 1l));
- assertEquals(0, (long)model.getLong("f4", 1l));
- assertEquals(1, (long)model.getLong("f2a", 1l));
- assertEquals(1, (long)model.getLong("f3a", 1l));
- assertEquals(1, (long)model.getLong("f4a", 1l));
- assertEquals(1, (long)model.getLong("f5", 1l));
- assertEquals(1, (long)model.getLong("f6", 1l));
- assertEquals(1, (long)model.getLong("f7", 1l));
- assertEquals(1, (long)model.getLong("f8", 1l));
+ assertEquals(1, (long)model.getLong("f1", 1L));
+ assertEquals(0, (long)model.getLong("f2", 1L));
+ assertEquals(0, (long)model.getLong("f3", 1L));
+ assertEquals(0, (long)model.getLong("f4", 1L));
+ assertEquals(1, (long)model.getLong("f2a", 1L));
+ assertEquals(1, (long)model.getLong("f3a", 1L));
+ assertEquals(1, (long)model.getLong("f4a", 1L));
+ assertEquals(1, (long)model.getLong("f5", 1L));
+ assertEquals(1, (long)model.getLong("f6", 1L));
+ assertEquals(1, (long)model.getLong("f7", 1L));
+ assertEquals(1, (long)model.getLong("f8", 1L));
assertNull(model.getBoolean("f1"));
assertEquals(false, model.getBoolean("f2"));
@@ -637,17 +637,17 @@ public class ObjectRest_Test {
assertThrown(()->model.getLong("f7")).isType(InvalidDataConversionException.class);
assertThrown(()->model.getInt("f8")).isType(InvalidDataConversionException.class);
- assertEquals(1, (long)model.getLong("f1", 9l));
- assertEquals(2, (long)model.getLong("f2", 9l));
- assertEquals(3, (long)model.getLong("f3", 9l));
- assertEquals(1, (long)model.getLong("f4", 9l));
- assertEquals(2, (long)model.getLong("f2a", 9l));
- assertEquals(3, (long)model.getLong("f3a", 9l));
- assertEquals(1, (long)model.getLong("f4a", 9l));
- assertThrown(()->model.getLong("f5", 9l)).isType(InvalidDataConversionException.class);
- assertThrown(()->model.getLong("f6", 9l)).isType(InvalidDataConversionException.class);
- assertThrown(()->model.getLong("f7", 9l)).isType(InvalidDataConversionException.class);
- assertThrown(()->model.getLong("f8", 9l)).isType(InvalidDataConversionException.class);
+ assertEquals(1, (long)model.getLong("f1", 9L));
+ assertEquals(2, (long)model.getLong("f2", 9L));
+ assertEquals(3, (long)model.getLong("f3", 9L));
+ assertEquals(1, (long)model.getLong("f4", 9L));
+ assertEquals(2, (long)model.getLong("f2a", 9L));
+ assertEquals(3, (long)model.getLong("f3a", 9L));
+ assertEquals(1, (long)model.getLong("f4a", 9L));
+ assertThrown(()->model.getLong("f5", 9L)).isType(InvalidDataConversionException.class);
+ assertThrown(()->model.getLong("f6", 9L)).isType(InvalidDataConversionException.class);
+ assertThrown(()->model.getLong("f7", 9L)).isType(InvalidDataConversionException.class);
+ assertThrown(()->model.getLong("f8", 9L)).isType(InvalidDataConversionException.class);
assertEquals(false, model.getBoolean("f1")); // String "1" equates to false.
assertEquals(true, model.getBoolean("f2"));
@@ -786,10 +786,10 @@ public class ObjectRest_Test {
public A init() {
f1 = "1";
f2 = 2;
- f3 = 3l;
+ f3 = 3L;
f4 = true;
f2a = 2;
- f3a = 3l;
+ f3a = 3L;
f4a = true;
try {
f5 = JsonMap.ofJson("{f5a:'a'}");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java b/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
index 76fcb12fd..82161c56d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
@@ -1233,7 +1233,7 @@ public class ClassInfoTest {
static List<Class<?>> primitives = list(boolean.class,byte.class,short.class,char.class,int.class,long.class,float.class,double.class);
static List<Class<?>> primitiveWrappers = list(Boolean.class,Byte.class,Short.class,Character.class,Integer.class,Long.class,Float.class,Double.class);
- static List<Object> primitiveDefaults = list(false,(byte)0,(short)0,(char)0,0,0l,0f,0d);
+ static List<Object> primitiveDefaults = list(false,(byte)0,(short)0,(char)0,0,0L,0f,0d);
@Test
public void hasPrimitiveWrapper() {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
index 247ca66b5..1ffed1926 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
@@ -167,7 +167,7 @@ public class RestClient_Headers_Test {
checkClient("Cache-Control").headers(new CacheControl("none")).header("X-Expect","none").build().get("/headers").run().assertContent("['none']");
checkClient("Client-Version").headers(new ClientVersion("1")).build().get("/headers").run().assertContent("['1']");
checkClient("Connection").headers(new Connection("foo")).build().get("/headers").run().assertContent("['foo']");
- checkClient("Content-Length").headers(new ContentLength(123l)).build().get("/headers").run().assertContent("['123']");
+ checkClient("Content-Length").headers(new ContentLength(123L)).build().get("/headers").run().assertContent("['123']");
checkClient("Content-Type").headers(new ContentType("foo")).build().get("/headers").run().assertContent("['foo']");
checkClient("Date").headers(new org.apache.juneau.http.header.Date(PARSEDZONEDDATETIME)).build().get("/headers").run().assertContent("['"+PARSEDZONEDDATETIME+"']");
checkClient("Date").headers(new org.apache.juneau.http.header.Date(ZONEDDATETIME)).build().get("/headers").run().assertContent("['"+PARSEDZONEDDATETIME+"']");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
index e55642be1..91e0c71f8 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
@@ -275,10 +275,10 @@ public class RestClient_Response_Body_Test {
ResponseContent x2 = testClient().entity(inputStreamEntity("foo")).get().run().getContent();
assertFalse(x2.isRepeatable());
- assertLong(x2.getContentLength()).is(-1l);
+ assertLong(x2.getContentLength()).is(-1L);
x2.cache().asString();
assertTrue(x2.isRepeatable());
- assertLong(x2.getContentLength()).is(3l);
+ assertLong(x2.getContentLength()).is(3L);
assertFalse(x2.isChunked());
@@ -310,7 +310,7 @@ public class RestClient_Response_Body_Test {
public void b02_head() throws Exception {
assertFalse(client().build().head("").run().getContent().isRepeatable());
assertFalse(client().build().head("").run().getContent().isChunked());
- assertLong(client().build().head("").run().getContent().getContentLength()).is(-1l);
+ assertLong(client().build().head("").run().getContent().getContentLength()).is(-1L);
client().build().head("").run().getContent().getContentType().assertValue().isNull();
client().build().head("").run().getContent().getContentEncoding().assertValue().isNull();
client().build().head("").run().getContent().writeTo(new ByteArrayOutputStream());
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
index 0183a9544..1da02fe9b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
@@ -167,7 +167,7 @@ public class RestClient_Response_Headers_Test {
checkFooClient().build().get("/echo").header("Foo","bar").run().getHeader("Bar").assertValue().isNull();
checkFooClient().build().get("/echo").header("Foo","123").run().getHeader("Foo").assertValue().asInteger().is(123);
checkFooClient().build().get("/echo").header("Foo","123").run().getHeader("Bar").assertValue().isNull();
- checkFooClient().build().get("/echo").header("Foo","123").run().getHeader("Foo").assertValue().asLong().is(123l);
+ checkFooClient().build().get("/echo").header("Foo","123").run().getHeader("Foo").assertValue().asLong().is(123L);
checkFooClient().build().get("/echo").header("Foo","123").run().getHeader("Bar").assertValue().asLong().isNull();
checkFooClient().build().get("/echo").header(dateHeader("Foo",ZONEDDATETIME)).run().getHeader("Foo").assertValue().asZonedDateTime().isExists();
checkFooClient().build().get("/echo").header(dateHeader("Foo",ZONEDDATETIME)).run().getHeader("Bar").assertValue().asZonedDateTime().isNull();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java
index e5f75b73c..d55d85f8f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java
@@ -148,7 +148,7 @@ public class RestClient_Response_Test {
@Test
public void c03_response_headerAssertions() throws Exception {
checkFooClient(C.class).build().get().json().header("Foo","123").run().assertHeader("Foo").asInteger().is(123);
- checkFooClient(C.class).build().get().json().header("Foo","123").run().assertHeader("Foo").asLong().is(123l);
+ checkFooClient(C.class).build().get().json().header("Foo","123").run().assertHeader("Foo").asLong().is(123L);
checkFooClient(C.class).build().get().json().header(dateHeader("Foo",ZONEDDATETIME)).run().assertHeader("Foo").asZonedDateTime().is(ZONEDDATETIME);
checkClient(C.class,"Content-Type").build().get().json().header("Content-Type","application/json;charset=iso-8859-1").run().assertCharset().is("iso-8859-1");
checkClient(C.class,"Content-Type").build().get().json().header("Content-Type","application/json;charset=iso-8859-1").run().assertHeader("Content-Type").is("application/json;charset=iso-8859-1");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/transform/AutoNumberSwapTest.java b/juneau-utest/src/test/java/org/apache/juneau/transform/AutoNumberSwapTest.java
index 266ea4c22..1fe1ef48f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/transform/AutoNumberSwapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/transform/AutoNumberSwapTest.java
@@ -63,12 +63,12 @@ public class AutoNumberSwapTest {
}
public static class A04 {
public Long toLong() {
- return 1l;
+ return 1L;
}
}
public static class A05 {
public long toLong() {
- return 1l;
+ return 1L;
}
}
public static class A06 {
@@ -222,7 +222,7 @@ public class AutoNumberSwapTest {
}
public static class B03 {
public Long toLong() {
- return 1l;
+ return 1L;
}
public static B03 fromLong(Long o) {
assertObject(o).asJson().is("1");
@@ -437,7 +437,7 @@ public class AutoNumberSwapTest {
assertObject(o).asJson().is("1");
}
public Long toLong() {
- return 1l;
+ return 1L;
}
}
public static class C04 {
@@ -446,7 +446,7 @@ public class AutoNumberSwapTest {
assertObject((Object) o).asJson().is("1");
}
public long toLong() {
- return 1l;
+ return 1L;
}
}
public static class C05 {
[juneau] 29/29: [juneau-utest] Use {} only when creating certain arrays
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 0e3806a85ad840da8dafc2f0c66768e791ef7c21
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:48:12 2023 -0400
[juneau-utest] Use {} only when creating certain arrays
---
.../test/java/org/apache/juneau/BeanConfigTest.java | 4 ++--
.../src/test/java/org/apache/juneau/BeanMapTest.java | 4 ++--
.../apache/juneau/SerializerPropertiesComboTest.java | 4 ++--
.../juneau/a/rttests/RoundTripToJsonMapsTest.java | 2 +-
.../test/java/org/apache/juneau/html/Html_Test.java | 2 +-
.../apache/juneau/http/remote/RrpcInterfaceTest.java | 18 +++++++++---------
.../test/java/org/apache/juneau/oapi/OpenApiTest.java | 12 ++++++------
.../apache/juneau/objecttools/ObjectSearcher_Test.java | 14 +++++++-------
.../rest/client/RestClient_Config_Serializer_Test.java | 2 +-
.../juneau/rest/client/RestClient_Paths_Test.java | 2 +-
.../juneau/rest/client/RestClient_Query_Test.java | 2 +-
.../java/org/apache/juneau/transforms/BeanMapTest.java | 2 +-
.../org/apache/juneau/utils/ArrayBuilder_Test.java | 2 +-
.../java/org/apache/juneau/utils/ArrayUtilsTest.java | 2 +-
14 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java b/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java
index 72a0a447e..242c4b963 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java
@@ -830,8 +830,8 @@ public class BeanConfigTest {
public class D {
public int[] f1;
private int[] f2;
- public int[] f3 = new int[]{1,2,3};
- private int[] f4 = new int[]{1,2,3};
+ public int[] f3 = {1,2,3};
+ private int[] f4 = {1,2,3};
public int[] getF2() {return f2;}
public void setF2(int[] f2) {this.f2 = f2;}
public int[] getF4() {return f4;}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
index c153f2833..848d25108 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
@@ -509,7 +509,7 @@ public class BeanMapTest {
public List<D2> lb1;
public List<D2> lb2 = new ArrayList<>();
public D2[] ab1;
- public D2[] ab2 = new D2[0];
+ public D2[] ab2 = {};
}
@Bean(typeName="D2")
@@ -566,7 +566,7 @@ public class BeanMapTest {
public List<D2c> lb1;
public List<D2c> lb2 = new ArrayList<>();
public D2c[] ab1;
- public D2c[] ab2 = new D2c[0];
+ public D2c[] ab2 = {};
}
public static class D2c {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/SerializerPropertiesComboTest.java b/juneau-utest/src/test/java/org/apache/juneau/SerializerPropertiesComboTest.java
index 229577324..a1df7dc56 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/SerializerPropertiesComboTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/SerializerPropertiesComboTest.java
@@ -447,11 +447,11 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
@Bean(typeName="T11")
public static class T11 {
- public T11a[] f = new T11a[]{new T11a()};
+ public T11a[] f = {new T11a()};
}
@Bean(typeName="T11a")
public static class T11a {
- public String[] f = new String[]{" foo "};
+ public String[] f = {" foo "};
}
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripToJsonMapsTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripToJsonMapsTest.java
index 12a84b50e..9ad61ccaf 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripToJsonMapsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripToJsonMapsTest.java
@@ -45,7 +45,7 @@ public class RoundTripToJsonMapsTest extends RoundTripTest {
assertEquals("a", a.f1);
assertEquals(2, a.f2);
- A[] aa = new A[]{a};
+ A[] aa = {a};
aa = roundTrip(aa, A[].class);
assertEquals(1, aa.length);
assertEquals("a", aa[0].f1);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/html/Html_Test.java b/juneau-utest/src/test/java/org/apache/juneau/html/Html_Test.java
index 3aa11220d..4e8843eb8 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/html/Html_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/html/Html_Test.java
@@ -432,7 +432,7 @@ public class Html_Test {
@Test
public void e01_collectionOfBeansWithBpi() throws Exception {
- E[] ee = new E[]{
+ E[] ee = {
new E(null, 2, 3),
new E(4, 5, 6)
};
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java
index ce58c4739..6b5f8102b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java
@@ -1566,7 +1566,7 @@ public class RrpcInterfaceTest {
@Test
public void m01_setMultiParamsInts() {
int x1 = 1;
- int[][][] x2 = new int[][][]{{{1,2},null},null};
+ int[][][] x2 = {{{1,2},null},null};
int[][][] x2n = null;
List<int[][][]> x3 = alist(x2,null);
List<int[][][]> x3n = null;
@@ -1577,7 +1577,7 @@ public class RrpcInterfaceTest {
public void m02_setMultiParamsInteger() {
Integer x1 = 1;
Integer x1n = null;
- Integer[][][] x2 = new Integer[][][]{{{1,null},null},null};
+ Integer[][][] x2 = {{{1,null},null},null};
Integer[][][] x2n = null;
List<Integer[][][]> x3 = alist(x2,null);
List<Integer[][][]> x3n = null;
@@ -1587,7 +1587,7 @@ public class RrpcInterfaceTest {
@Test
public void m03_setMultiParamsFloat() {
float x1 = 1;
- float[][][] x2 = new float[][][]{{{1,2},null},null};
+ float[][][] x2 = {{{1,2},null},null};
float[][][] x2n = null;
List<float[][][]> x3 = alist(x2,null);
List<float[][][]> x3n = null;
@@ -1598,7 +1598,7 @@ public class RrpcInterfaceTest {
public void m04_setMultiParamsFloatObject() {
Float x1 = 1f;
Float x1n = null;
- Float[][][] x2 = new Float[][][]{{{1f,null},null},null};
+ Float[][][] x2 = {{{1f,null},null},null};
Float[][][] x2n = null;
List<Float[][][]> x3 = alist(x2,null);
List<Float[][][]> x3n = null;
@@ -1608,7 +1608,7 @@ public class RrpcInterfaceTest {
@Test
public void m05_setMultiParamsString() {
String x1 = "foo";
- String[][][] x2 = new String[][][]{{{"foo",null},null},null};
+ String[][][] x2 = {{{"foo",null},null},null};
String[][][] x2n = null;
List<String[][][]> x3 = alist(x2,null);
List<String[][][]> x3n = null;
@@ -1618,7 +1618,7 @@ public class RrpcInterfaceTest {
@Test
public void m06_setMultiParamsBean() {
ABean x1 = ABean.get();
- ABean[][][] x2 = new ABean[][][]{{{ABean.get(),null},null},null};
+ ABean[][][] x2 = {{{ABean.get(),null},null},null};
ABean[][][] x2n = null;
List<ABean[][][]> x3 = alist(x2,null);
List<ABean[][][]> x3n = null;
@@ -1632,7 +1632,7 @@ public class RrpcInterfaceTest {
@Test
public void m07_setMultiParamsSwappedObject() {
SwappedObject x1 = new SwappedObject();
- SwappedObject[][][] x2 = new SwappedObject[][][]{{{new SwappedObject(),null},null},null};
+ SwappedObject[][][] x2 = {{{new SwappedObject(),null},null},null};
SwappedObject[][][] x2n = null;
List<SwappedObject[][][]> x3 = alist(x2,null);
List<SwappedObject[][][]> x3n = null;
@@ -1646,7 +1646,7 @@ public class RrpcInterfaceTest {
@Test
public void m08_setMultiParamsImplicitSwappedObject() {
ImplicitSwappedObject x1 = new ImplicitSwappedObject();
- ImplicitSwappedObject[][][] x2 = new ImplicitSwappedObject[][][]{{{new ImplicitSwappedObject(),null},null},null};
+ ImplicitSwappedObject[][][] x2 = {{{new ImplicitSwappedObject(),null},null},null};
ImplicitSwappedObject[][][] x2n = null;
List<ImplicitSwappedObject[][][]> x3 = alist(x2,null);
List<ImplicitSwappedObject[][][]> x3n = null;
@@ -1660,7 +1660,7 @@ public class RrpcInterfaceTest {
@Test
public void m09_setMultiParamsEnum() {
TestEnum x1 = TestEnum.TWO;
- TestEnum[][][] x2 = new TestEnum[][][]{{{TestEnum.TWO,null},null},null};
+ TestEnum[][][] x2 = {{{TestEnum.TWO,null},null},null};
TestEnum[][][] x2n = null;
List<TestEnum[][][]> x3 = alist(x2,null);
List<TestEnum[][][]> x3n = null;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java b/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java
index 7aec23d8f..4d756a8dc 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java
@@ -642,7 +642,7 @@ public class OpenApiTest {
@Test
public void f03a_tArray_IntArray() throws Exception {
- int[] in = new int[]{123};
+ int[] in = {123};
HttpPartSchema ps = T_ARRAY;
String s = serialize(ps, in);
assertEquals("123", s);
@@ -708,7 +708,7 @@ public class OpenApiTest {
@Test
public void f05a_tArrayUon_IntArray() throws Exception {
- int[] in = new int[]{123};
+ int[] in = {123};
HttpPartSchema ps = T_ARRAY_UON;
String s = serialize(ps, in);
assertEquals("@(123)", s);
@@ -741,7 +741,7 @@ public class OpenApiTest {
@Test
public void f06a_tArrayPipes_IntArray() throws Exception {
- int[] in = new int[]{123};
+ int[] in = {123};
HttpPartSchema ps = T_ARRAY_PIPES;
String s = serialize(ps, in);
assertEquals("123", s);
@@ -774,7 +774,7 @@ public class OpenApiTest {
@Test
public void f07a_tArraySsv_IntArray() throws Exception {
- int[] in = new int[]{123};
+ int[] in = {123};
HttpPartSchema ps = T_ARRAY_SSV;
String s = serialize(ps, in);
assertEquals("123", s);
@@ -807,7 +807,7 @@ public class OpenApiTest {
@Test
public void f08a_tArrayTsv_IntArray() throws Exception {
- int[] in = new int[]{123};
+ int[] in = {123};
HttpPartSchema ps = T_ARRAY_TSV;
String s = serialize(ps, in);
assertEquals("123", s);
@@ -840,7 +840,7 @@ public class OpenApiTest {
@Test
public void f09a_tArrayCsv_IntArray() throws Exception {
- int[] in = new int[]{123};
+ int[] in = {123};
HttpPartSchema ps = T_ARRAY_CSV;
String s = serialize(ps, in);
assertEquals("123", s);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectSearcher_Test.java b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectSearcher_Test.java
index b3fd8a1b6..6202a469a 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectSearcher_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectSearcher_Test.java
@@ -78,7 +78,7 @@ public class ObjectSearcher_Test {
public static List<A> A_LIST = list(A.create("foo"), A.create("bar"), A.create("baz"), A.create("q ux"), A.create("qu'ux"), null, A.create(null));
public static Set<A> A_SET = set(A.create("foo"), A.create("bar"), A.create("baz"), A.create("q ux"), A.create("qu'ux"), null, A.create(null));
- public static A[] A_ARRAY = new A[]{A.create("foo"), A.create("bar"), A.create("baz"), A.create("q ux"), A.create("qu'ux"), null, A.create(null)};
+ public static A[] A_ARRAY = {A.create("foo"), A.create("bar"), A.create("baz"), A.create("q ux"), A.create("qu'ux"), null, A.create(null)};
@Test
public void a01_stringSearch_singleWord() throws Exception {
@@ -259,7 +259,7 @@ public class ObjectSearcher_Test {
}
}
- C[] INT_BEAN_ARRAY = new C[]{C.create(-2), C.create(-1), C.create(0), C.create(1), C.create(2), C.create(3)};
+ C[] INT_BEAN_ARRAY = {C.create(-2), C.create(-1), C.create(0), C.create(1), C.create(2), C.create(3)};
@Test
public void b01_intSearch_oneNumber() throws Exception {
@@ -398,7 +398,7 @@ public class ObjectSearcher_Test {
@Test
public void b25_intSearch_badSearches() throws Exception {
- String[] ss = new String[] {
+ String[] ss = {
"f=x","(S01)",
"f=>x","(S02)",
"f=<x","(S03)",
@@ -687,7 +687,7 @@ public class ObjectSearcher_Test {
@Ignore /* TODO - Fix me */
public void c15_dateSearch_badSearches() throws Exception {
B[] in = B.create("2000-12-31");
- String[] ss = new String[] {
+ String[] ss = {
"f=X","(S01)",
"f=>X","(S02)",
"f=<X","(S03)",
@@ -787,7 +787,7 @@ public class ObjectSearcher_Test {
@Test
public void d06_d2ArrayOfObjects() throws Exception {
- Object[] in = new Object[]{
+ Object[] in = {
map("f","foo"),
map("f","bar"),
null,
@@ -927,7 +927,7 @@ public class ObjectSearcher_Test {
@Test
public void d16_d3ArrayOfArrayOfObjects() throws Exception {
- Object[][] in = new Object[][]{
+ Object[][] in = {
new Object[]{map("f","foo")},
new Object[]{map("f","bar")},
new Object[]{null},
@@ -985,7 +985,7 @@ public class ObjectSearcher_Test {
@Test
public void d20_d3ArrayOfArrayOfBeans() throws Exception {
- A[][] in = new A[][]{
+ A[][] in = {
new A[]{A.create("foo")},
new A[]{A.create("bar")},
new A[]{null},
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Serializer_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Serializer_Test.java
index 8e24d9597..4ca68e5fe 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Serializer_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Serializer_Test.java
@@ -120,7 +120,7 @@ public class RestClient_Config_Serializer_Test {
@Test
public void a07_sortCollections() throws Exception {
- String[] x = new String[]{"c","a","b"};
+ String[] x = {"c","a","b"};
client().sortCollections().build().post("/echoBody",x).run().assertContent("['a','b','c']");
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java
index 78bf0ed20..3f1e0f4e4 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java
@@ -76,7 +76,7 @@ public class RestClient_Paths_Test {
@Test
public void a05_path_String_Object_Schema() throws Exception {
- String[] a = new String[]{"foo","bar"};
+ String[] a = {"foo","bar"};
client().build().get("/echo/{x}").pathData(part("x",a,T_ARRAY_PIPES)).run().assertContent().isContains("GET /echo/foo%7Cbar HTTP/1.1");
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java
index d558e7fd0..b570058b7 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java
@@ -77,7 +77,7 @@ public class RestClient_Query_Test {
@Test
public void a07_query_String_Supplier_Schema() throws Exception {
- String[] l1 = new String[]{"foo","bar"},l2 = new String[]{"bar","baz"};
+ String[] l1 = {"foo","bar"},l2 = {"bar","baz"};
TestSupplier s = TestSupplier.of(l1);
RestClient x = client().queryData(part("foo",s,T_ARRAY_PIPES)).build();
x.get("/query").queryData(part("bar",s,T_ARRAY_PIPES)).run().assertContent().asString().asUrlDecode().is("foo=foo|bar&bar=foo|bar");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanMapTest.java b/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanMapTest.java
index 24600ea81..ce304b064 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanMapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanMapTest.java
@@ -41,7 +41,7 @@ public class BeanMapTest {
}
public static class A {
- public byte[] f1 = new byte[]{1,2,3};
+ public byte[] f1 = {1,2,3};
public byte[] f3 = null;
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayBuilder_Test.java b/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayBuilder_Test.java
index b99aee558..bd472dcac 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayBuilder_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayBuilder_Test.java
@@ -23,7 +23,7 @@ public class ArrayBuilder_Test {
@Test
public void a01_basic() {
- String[] empty = new String[0];
+ String[] empty = {};
ArrayBuilder<String> x = ArrayBuilder.of(String.class).filter(y -> y != null).size(2);
assertObject(x.orElse(empty)).asJson().is("[]");
x.add(null);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java b/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java
index deb7154f7..1f854ab23 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java
@@ -69,7 +69,7 @@ public class ArrayUtilsTest {
//====================================================================================================
@Test
public void testCombine() throws Exception {
- String[] s1 = new String[]{"a"}, s2 = new String[]{"b"};
+ String[] s1 = {"a"}, s2 = {"b"};
assertObject(combine(s1, s2)).asJson().is("['a','b']");
assertObject(combine(s1)).asJson().is("['a']");
[juneau] 10/29: [juneau-utest] Use lambdas
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 5dcc552938d1ebc41fb2783683deb2a0fdf83fea
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:03:13 2023 -0400
[juneau-utest] Use lambdas
---
.../java/org/apache/juneau/config/ConfigTest.java | 33 ++++----
.../config/store/ConfigClasspathStoreTest.java | 22 ++----
.../juneau/config/store/ConfigFileStoreTest.java | 88 ++++++++--------------
.../juneau/config/store/ConfigMemoryStoreTest.java | 22 ++----
.../juneau/html/HtmlConfigAnnotation_Test.java | 11 +--
.../juneau/html/HtmlDocConfigAnnotation_Test.java | 27 +++----
.../org/apache/juneau/http/BasicPart_Test.java | 14 +---
.../org/apache/juneau/http/HttpHeaders_Test.java | 14 +---
.../org/apache/juneau/http/remote/Remote_Test.java | 25 ++----
.../juneau/json/JsonConfigAnnotationTest.java | 7 +-
.../jsonschema/JsonSchemaConfigAnnotationTest.java | 23 +++---
.../msgpack/MsgPackConfigAnnotationTest.java | 7 +-
.../juneau/parser/ParserConfigAnnotationTest.java | 17 ++---
.../org/apache/juneau/reflect/ClassInfoTest.java | 61 +++++++--------
.../org/apache/juneau/reflect/FieldInfoTest.java | 29 ++++---
.../rest/client/RestClient_FormData_Test.java | 13 ++--
.../rest/client/RestClient_Headers_Test.java | 9 +--
.../apache/juneau/rest/client/RestClient_Test.java | 24 +-----
.../rest/test/client/ThirdPartyProxyTest.java | 76 ++++---------------
.../serializer/SerializerConfigAnnotationTest.java | 17 ++---
.../juneau/soap/SoapXmlConfigAnnotationTest.java | 7 +-
.../apache/juneau/uon/UonConfigAnnotationTest.java | 7 +-
.../UrlEncodingConfigAnnotationTest.java | 7 +-
.../apache/juneau/xml/XmlConfigAnnotationTest.java | 29 ++++---
24 files changed, 198 insertions(+), 391 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
index f211d06f4..534b75e94 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
@@ -1256,25 +1256,20 @@ public class ConfigTest {
final Set<String> changes = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
- cf.addListener(
- new ConfigEventListener() {
- @Override
- public void onConfigChange(ConfigEvents events) {
- for (ConfigEvent ce : events) {
- String key = (ce.getSection().equals("") ? "" : (ce.getSection() + '/')) + ce.getKey();
- if (ce.getType() == ConfigEventType.REMOVE_ENTRY) {
- changes.add("REMOVE_ENTRY("+key+")");
- } else if (ce.getType() == ConfigEventType.REMOVE_SECTION) {
- changes.add("REMOVE_SECTION("+ce.getSection()+")");
- } else if (ce.getType() == ConfigEventType.SET_SECTION) {
- changes.add("SET_SECTION("+ce.getSection()+")");
- } else {
- changes.add(key + '=' + ce.getValue());
- }
- }
- }
- }
- );
+ cf.addListener(events -> {
+ for (ConfigEvent ce : events) {
+ String key = (ce.getSection().equals("") ? "" : (ce.getSection() + '/')) + ce.getKey();
+ if (ce.getType() == ConfigEventType.REMOVE_ENTRY) {
+ changes.add("REMOVE_ENTRY(" + key + ")");
+ } else if (ce.getType() == ConfigEventType.REMOVE_SECTION) {
+ changes.add("REMOVE_SECTION(" + ce.getSection() + ")");
+ } else if (ce.getType() == ConfigEventType.SET_SECTION) {
+ changes.add("SET_SECTION(" + ce.getSection() + ")");
+ } else {
+ changes.add(key + '=' + ce.getValue());
+ }
+ }
+ });
// No changes until save.
changes.clear();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigClasspathStoreTest.java b/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigClasspathStoreTest.java
index 409240d21..e908725c8 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigClasspathStoreTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigClasspathStoreTest.java
@@ -70,20 +70,14 @@ public class ConfigClasspathStoreTest {
ClasspathStore fs = ClasspathStore.create().build();
final CountDownLatch latch = new CountDownLatch(2);
- fs.register("X.cfg", new ConfigStoreListener() {
- @Override
- public void onChange(String contents) {
- if ("xxx".equals(contents))
- latch.countDown();
- }
- });
- fs.register("Y.cfg", new ConfigStoreListener() {
- @Override
- public void onChange(String contents) {
- if ("yyy".equals(contents))
- latch.countDown();
- }
- });
+ fs.register("X.cfg", contents -> {
+ if ("xxx".equals(contents))
+ latch.countDown();
+ });
+ fs.register("Y.cfg", contents -> {
+ if ("yyy".equals(contents))
+ latch.countDown();
+ });
fs.update("X.cfg", "xxx");
fs.update("Y.cfg", "yyy");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java b/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java
index 66c1d1e22..a68851d6d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java
@@ -145,34 +145,22 @@ public class ConfigFileStoreTest {
FileStore fs = FileStore.create().directory(DIR).enableWatcher().watcherSensitivity(WatcherSensitivity.HIGH).build();
final CountDownLatch latch = new CountDownLatch(4);
- fs.register("X.cfg", new ConfigStoreListener() {
- @Override
- public void onChange(String contents) {
- if ("xxx".equals(contents))
- latch.countDown();
- }
- });
- fs.register("X", new ConfigStoreListener() {
- @Override
- public void onChange(String contents) {
- if ("xxx".equals(contents))
- latch.countDown();
- }
- });
- fs.register("Y.cfg", new ConfigStoreListener() {
- @Override
- public void onChange(String contents) {
- if ("yyy".equals(contents))
- latch.countDown();
- }
- });
- fs.register("Y", new ConfigStoreListener() {
- @Override
- public void onChange(String contents) {
- if ("yyy".equals(contents))
- latch.countDown();
- }
- });
+ fs.register("X.cfg", contents -> {
+ if ("xxx".equals(contents))
+ latch.countDown();
+ });
+ fs.register("X", contents -> {
+ if ("xxx".equals(contents))
+ latch.countDown();
+ });
+ fs.register("Y.cfg", contents -> {
+ if ("yyy".equals(contents))
+ latch.countDown();
+ });
+ fs.register("Y", contents -> {
+ if ("yyy".equals(contents))
+ latch.countDown();
+ });
pipe(reader("zzz"), new File(DIR, "Z.ini"));
pipe(reader("xxx"), new File(DIR, "X.cfg"));
pipe(reader("yyy"), new File(DIR, "Y.cfg"));
@@ -185,34 +173,22 @@ public class ConfigFileStoreTest {
FileStore fs = FileStore.create().directory(DIR).build();
final CountDownLatch latch = new CountDownLatch(4);
- fs.register("X.cfg", new ConfigStoreListener() {
- @Override
- public void onChange(String contents) {
- if ("xxx".equals(contents))
- latch.countDown();
- }
- });
- fs.register("X", new ConfigStoreListener() {
- @Override
- public void onChange(String contents) {
- if ("xxx".equals(contents))
- latch.countDown();
- }
- });
- fs.register("Y.cfg", new ConfigStoreListener() {
- @Override
- public void onChange(String contents) {
- if ("yyy".equals(contents))
- latch.countDown();
- }
- });
- fs.register("Y", new ConfigStoreListener() {
- @Override
- public void onChange(String contents) {
- if ("yyy".equals(contents))
- latch.countDown();
- }
- });
+ fs.register("X.cfg", contents -> {
+ if ("xxx".equals(contents))
+ latch.countDown();
+ });
+ fs.register("X", contents -> {
+ if ("xxx".equals(contents))
+ latch.countDown();
+ });
+ fs.register("Y.cfg", contents -> {
+ if ("yyy".equals(contents))
+ latch.countDown();
+ });
+ fs.register("Y", contents -> {
+ if ("yyy".equals(contents))
+ latch.countDown();
+ });
fs.update("X.cfg", "xxx");
fs.update("Y.cfg", "yyy");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigMemoryStoreTest.java b/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigMemoryStoreTest.java
index 3a574ff25..b30d64c43 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigMemoryStoreTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigMemoryStoreTest.java
@@ -53,20 +53,14 @@ public class ConfigMemoryStoreTest {
MemoryStore fs = MemoryStore.create().build();
final CountDownLatch latch = new CountDownLatch(2);
- fs.register("X", new ConfigStoreListener() {
- @Override
- public void onChange(String contents) {
- if ("xxx".equals(contents))
- latch.countDown();
- }
- });
- fs.register("Y", new ConfigStoreListener() {
- @Override
- public void onChange(String contents) {
- if ("yyy".equals(contents))
- latch.countDown();
- }
- });
+ fs.register("X", contents -> {
+ if ("xxx".equals(contents))
+ latch.countDown();
+ });
+ fs.register("Y", contents -> {
+ if ("yyy".equals(contents))
+ latch.countDown();
+ });
fs.update("X", "xxx");
fs.update("Y", "yyy");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlConfigAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlConfigAnnotation_Test.java
index 9a9c166ab..b042e5c5f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlConfigAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlConfigAnnotation_Test.java
@@ -15,6 +15,7 @@ package org.apache.juneau.html;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
+import java.util.Objects;
import java.util.function.*;
import org.apache.juneau.*;
@@ -33,14 +34,8 @@ public class HtmlConfigAnnotation_Test {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = new Function<>() {
- @Override
- public String apply(Object t) {
- if (t == null)
- return null;
- return t.toString();
- }
- };
+ private static final Function<Object,String> TO_STRING = t -> Objects.toString(t, null);
+
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotation_Test.java
index 9d48ae751..dcc47d87d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotation_Test.java
@@ -36,21 +36,18 @@ public class HtmlDocConfigAnnotation_Test {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = new Function<>() {
- @Override
- public String apply(Object t) {
- if (t.getClass().isArray())
- return apply(ArrayUtils.toList(t, Object.class));
- if (t instanceof Collection)
- return ((Collection<?>)t)
- .stream()
- .map(TO_STRING)
- .collect(Collectors.joining(","));
- if (t instanceof HtmlDocTemplate)
- return ((HtmlDocTemplate)t).getClass().getSimpleName();
- return t.toString();
- }
- };
+ private static final Function<Object,String> TO_STRING = t -> {
+ if (t.getClass().isArray())
+ return HtmlDocConfigAnnotation_Test.TO_STRING.apply(ArrayUtils.toList(t, Object.class));
+ if (t instanceof Collection)
+ return ((Collection<?>)t)
+ .stream()
+ .map(HtmlDocConfigAnnotation_Test.TO_STRING)
+ .collect(Collectors.joining(","));
+ if (t instanceof HtmlDocTemplate)
+ return ((HtmlDocTemplate)t).getClass().getSimpleName();
+ return t.toString();
+ };
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/BasicPart_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/BasicPart_Test.java
index 4b992cd7e..895d7224f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/BasicPart_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/BasicPart_Test.java
@@ -68,18 +68,8 @@ public class BasicPart_Test {
SerializedHeader x4 = serializedHeader("X4","4");
Map.Entry<String,Object> x5 = map("X5",(Object)"5").entrySet().iterator().next();
org.apache.http.message.BasicNameValuePair x6 = new org.apache.http.message.BasicNameValuePair("X6","6");
- NameValuePairable x7 = new NameValuePairable() {
- @Override
- public NameValuePair asNameValuePair() {
- return part("X7","7");
- }
- };
- Headerable x8 = new Headerable() {
- @Override
- public Header asHeader() {
- return header("X8","8");
- }
- };
+ NameValuePairable x7 = () -> part("X7","7");
+ Headerable x8 = () -> header("X8","8");
assertObject(BasicPart.cast(x1)).isType(NameValuePair.class).asJson().is("'X1=1'");
assertObject(BasicPart.cast(x2)).isType(NameValuePair.class).asJson().is("'X2=2'");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/HttpHeaders_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/HttpHeaders_Test.java
index bba48414a..b690cd4cc 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/HttpHeaders_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/HttpHeaders_Test.java
@@ -35,18 +35,8 @@ public class HttpHeaders_Test {
SerializedHeader x4 = serializedHeader("X4","4");
Map.Entry<String,Object> x5 = map("X5",(Object)"5").entrySet().iterator().next();
org.apache.http.message.BasicNameValuePair x6 = new org.apache.http.message.BasicNameValuePair("X6","6");
- NameValuePairable x7 = new NameValuePairable() {
- @Override
- public NameValuePair asNameValuePair() {
- return part("X7","7");
- }
- };
- Headerable x8 = new Headerable() {
- @Override
- public Header asHeader() {
- return header("X8","8");
- }
- };
+ NameValuePairable x7 = () -> part("X7","7");
+ Headerable x8 = () -> header("X8","8");
SerializedPart x9 = serializedPart("X9",()->"9");
assertObject(HttpHeaders.cast(x1)).isType(Header.class).asJson().is("'X1: 1'");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
index 6b969fc67..b73d99ef8 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
@@ -460,12 +460,7 @@ public class Remote_Test {
public static class E implements BasicJson5Config {
@RestOp(method=HttpMethod.RRPC)
public E1 proxy() {
- return new E1() {
- @Override
- public String echo(String body) {
- return body;
- }
- };
+ return body -> body;
}
}
@@ -506,12 +501,9 @@ public class Remote_Test {
public static class E5 implements BasicJson5Config {
@RestOp(method=HttpMethod.RRPC)
public E5b proxy() {
- return new E5b() {
- @Override
- public String echo(String body) throws E5a {
- throw new E5a("foobar");
- }
- };
+ return body -> {
+ throw new E5a("foobar");
+ };
}
}
@@ -536,12 +528,9 @@ public class Remote_Test {
public static class E6 implements BasicJson5Config {
@RestOp(method=HttpMethod.RRPC)
public E5b proxy() {
- return new E5b() {
- @Override
- public String echo(String body) throws E5a {
- throw new AssertionError("foobar");
- }
- };
+ return body -> {
+ throw new AssertionError("foobar");
+ };
}
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java
index e12930d03..1419c90ed 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java
@@ -33,12 +33,7 @@ public class JsonConfigAnnotationTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = new Function<>() {
- @Override
- public String apply(Object t) {
- return t.toString();
- }
- };
+ private static final Function<Object,String> TO_STRING = t -> t.toString();
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java
index fd6cba31a..be1f2c9e8 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java
@@ -35,19 +35,16 @@ public class JsonSchemaConfigAnnotationTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = new Function<>() {
- @Override
- public String apply(Object t) {
- if (t instanceof Collection)
- return ((Collection<?>)t)
- .stream()
- .map(TO_STRING)
- .collect(Collectors.joining(","));
- if (t instanceof BeanDefMapper)
- return ((BeanDefMapper)t).getClass().getSimpleName();
- return t.toString();
- }
- };
+ private static final Function<Object,String> TO_STRING = t -> {
+ if (t instanceof Collection)
+ return ((Collection<?>)t)
+ .stream()
+ .map(JsonSchemaConfigAnnotationTest.TO_STRING)
+ .collect(Collectors.joining(","));
+ if (t instanceof BeanDefMapper)
+ return ((BeanDefMapper)t).getClass().getSimpleName();
+ return t.toString();
+ };
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java
index 4fff29351..f3d468d7b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java
@@ -33,12 +33,7 @@ public class MsgPackConfigAnnotationTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = new Function<>() {
- @Override
- public String apply(Object t) {
- return t.toString();
- }
- };
+ private static final Function<Object,String> TO_STRING = t -> t.toString();
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java
index 7fb048e6c..01ed927d5 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java
@@ -36,16 +36,13 @@ public class ParserConfigAnnotationTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = new Function<>() {
- @Override
- public String apply(Object t) {
- if (t == null)
- return null;
- if (t instanceof AA)
- return "AA";
- return t.toString();
- }
- };
+ private static final Function<Object,String> TO_STRING = t -> {
+ if (t == null)
+ return null;
+ if (t instanceof AA)
+ return "AA";
+ return t.toString();
+ };
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java b/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
index 82f9cd041..76fcb12fd 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
@@ -90,38 +90,35 @@ public class ClassInfoTest {
}
}
- private static final Function<Object,String> TO_STRING = new Function<>() {
- @Override
- public String apply(Object t) {
- if (t == null)
- return null;
- if (t instanceof Class)
- return ((Class<?>)t).getSimpleName();
- if (t instanceof Package)
- return ((Package)t).getName();
- if (t instanceof ClassInfo)
- return ((ClassInfo)t).getSimpleName();
- if (t instanceof MethodInfo)
- return ((MethodInfo)t).getDeclaringClass().getSimpleName() + '.' + ((MethodInfo)t).getShortName();
- if (t instanceof ConstructorInfo)
- return ((ConstructorInfo)t).getShortName();
- if (t instanceof FieldInfo)
- return ((FieldInfo)t).getDeclaringClass().getSimpleName() + '.' + ((FieldInfo)t).getName();
- if (t instanceof A)
- return "@A(" + ((A)t).value() + ")";
- if (t instanceof PA)
- return "@PA(" + ((PA)t).value() + ")";
- if (t instanceof AConfig)
- return "@AConfig(" + ((AConfig)t).value() + ")";
- if (t instanceof AnnotationInfo)
- return apply(((AnnotationInfo<?>)t).inner());
- if (t instanceof AnnotationList) {
- AnnotationList al = (AnnotationList)t;
- return al.toString();
- }
- return t.toString();
- }
- };
+ private static final Function<Object,String> TO_STRING = t -> {
+ if (t == null)
+ return null;
+ if (t instanceof Class)
+ return ((Class<?>)t).getSimpleName();
+ if (t instanceof Package)
+ return ((Package)t).getName();
+ if (t instanceof ClassInfo)
+ return ((ClassInfo)t).getSimpleName();
+ if (t instanceof MethodInfo)
+ return ((MethodInfo)t).getDeclaringClass().getSimpleName() + '.' + ((MethodInfo)t).getShortName();
+ if (t instanceof ConstructorInfo)
+ return ((ConstructorInfo)t).getShortName();
+ if (t instanceof FieldInfo)
+ return ((FieldInfo)t).getDeclaringClass().getSimpleName() + '.' + ((FieldInfo)t).getName();
+ if (t instanceof A)
+ return "@A(" + ((A)t).value() + ")";
+ if (t instanceof PA)
+ return "@PA(" + ((PA)t).value() + ")";
+ if (t instanceof AConfig)
+ return "@AConfig(" + ((AConfig)t).value() + ")";
+ if (t instanceof AnnotationInfo)
+ return ClassInfoTest.TO_STRING.apply(((AnnotationInfo<?>)t).inner());
+ if (t instanceof AnnotationList) {
+ AnnotationList al = (AnnotationList)t;
+ return al.toString();
+ }
+ return t.toString();
+ };
//-----------------------------------------------------------------------------------------------------------------
// Initialization
diff --git a/juneau-utest/src/test/java/org/apache/juneau/reflect/FieldInfoTest.java b/juneau-utest/src/test/java/org/apache/juneau/reflect/FieldInfoTest.java
index 8be01ccf0..708346705 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/reflect/FieldInfoTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/FieldInfoTest.java
@@ -49,22 +49,19 @@ public class FieldInfoTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = new Function<>() {
- @Override
- public String apply(Object t) {
- if (t == null)
- return null;
- if (t instanceof A)
- return "@A(" + ((A)t).value() + ")";
- if (t instanceof ClassInfo)
- return ((ClassInfo)t).getSimpleName();
- if (t instanceof FieldInfo)
- return ((FieldInfo)t).getName();
- if (t instanceof Field)
- return ((Field)t).getName();
- return t.toString();
- }
- };
+ private static final Function<Object,String> TO_STRING = t -> {
+ if (t == null)
+ return null;
+ if (t instanceof A)
+ return "@A(" + ((A)t).value() + ")";
+ if (t instanceof ClassInfo)
+ return ((ClassInfo)t).getSimpleName();
+ if (t instanceof FieldInfo)
+ return ((FieldInfo)t).getName();
+ if (t instanceof Field)
+ return ((Field)t).getName();
+ return t.toString();
+ };
private static FieldInfo off(Class<?> c, String name) {
try {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java
index 390be2071..e39109a6a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java
@@ -146,14 +146,11 @@ public class RestClient_FormData_Test {
public static class A12 implements HttpPartSerializer {
@Override
- public HttpPartSerializerSession getPartSession() {
- return new HttpPartSerializerSession() {
- @Override
- public String serialize(HttpPartType type, HttpPartSchema schema, Object value) throws SerializeException, SchemaValidationException {
- throw new SerializeException("bad");
- }
- };
- }
+ public HttpPartSerializerSession getPartSession() {
+ return (type, schema, value) -> {
+ throw new SerializeException("bad");
+ };
+ }
}
@Test
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
index fe81036fc..247ca66b5 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
@@ -128,12 +128,9 @@ public class RestClient_Headers_Test {
public static class A12 implements HttpPartSerializer {
@Override
public HttpPartSerializerSession getPartSession() {
- return new HttpPartSerializerSession() {
- @Override
- public String serialize(HttpPartType type, HttpPartSchema schema, Object value) throws SerializeException, SchemaValidationException {
- throw new SerializeException("bad");
- }
- };
+ return (type, schema, value) -> {
+ throw new SerializeException("bad");
+ };
}
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
index 978046a31..1db594fdb 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
@@ -169,26 +169,10 @@ public class RestClient_Test {
@Test
public void c01_httpClient_interceptors() throws Exception {
- HttpRequestInterceptor x1 = new HttpRequestInterceptor() {
- @Override public void process(HttpRequest request, HttpContext context) throws HttpException,IOException {
- request.setHeader("A1","1");
- }
- };
- HttpResponseInterceptor x2 = new HttpResponseInterceptor() {
- @Override public void process(HttpResponse response, HttpContext context) throws HttpException,IOException {
- response.setHeader("B1","1");
- }
- };
- HttpRequestInterceptor x3 = new HttpRequestInterceptor() {
- @Override public void process(HttpRequest request, HttpContext context) throws HttpException,IOException {
- request.setHeader("A2","2");
- }
- };
- HttpResponseInterceptor x4 = new HttpResponseInterceptor() {
- @Override public void process(HttpResponse response, HttpContext context) throws HttpException,IOException {
- response.setHeader("B2","2");
- }
- };
+ HttpRequestInterceptor x1 = (request, context) -> request.setHeader("A1","1");
+ HttpResponseInterceptor x2 = (response, context) -> response.setHeader("B1","1");
+ HttpRequestInterceptor x3 = (request, context) -> request.setHeader("A2","2");
+ HttpResponseInterceptor x4 = (response, context) -> response.setHeader("B2","2");
client().addInterceptorFirst(x1).addInterceptorLast(x2).addInterceptorFirst(x3).addInterceptorLast(x4)
.build().get("/echo").run().assertContent().isContains("A1: 1","A2: 2").assertHeader("B1").is("1").assertHeader("B2").is("2");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java b/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
index 4ced630d8..10fc96a40 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
@@ -1147,31 +1147,16 @@ public class ThirdPartyProxyTest {
}
@Test
- public void ga06_reqBeanPath6() throws Exception {
- String r = proxy.reqBeanPath6(
- new ReqBeanPath6() {
- @Override
- public Map<String,Object> getX() {
- return map("a",1,"b","foo");
- }
-
- }
- );
- assertEquals("OK", r);
- }
+ public void ga06_reqBeanPath6() throws Exception {
+ String r = proxy.reqBeanPath6(() -> map("a", 1, "b", "foo"));
+ assertEquals("OK", r);
+ }
@Test
- public void ga07_reqBeanPath7() throws Exception {
- String r = proxy.reqBeanPath7(
- new ReqBeanPath7() {
- @Override
- public ABean getX() {
- return ABean.get();
- }
- }
- );
- assertEquals("OK", r);
- }
+ public void ga07_reqBeanPath7() throws Exception {
+ String r = proxy.reqBeanPath7(() -> ABean.get());
+ assertEquals("OK", r);
+ }
//-----------------------------------------------------------------------------------------------------------------
// @Request tests - Query
@@ -1230,13 +1215,7 @@ public class ThirdPartyProxyTest {
@Test
public void gb06_reqBeanQuery6() throws Exception {
String r = proxy.reqBeanQuery6(
- new ReqBeanQuery6() {
- @Override
- public Map<String,Object> getX() {
- return map("a",1,"b","foo");
- }
-
- }
+ () -> map("a",1,"b","foo")
);
assertEquals("OK", r);
}
@@ -1244,12 +1223,7 @@ public class ThirdPartyProxyTest {
@Test
public void gb07_reqBeanQuery7() throws Exception {
String r = proxy.reqBeanQuery7(
- new ReqBeanQuery7() {
- @Override
- public ABean getX() {
- return ABean.get();
- }
- }
+ () -> ABean.get()
);
assertEquals("OK", r);
}
@@ -1311,13 +1285,7 @@ public class ThirdPartyProxyTest {
@Test
public void gd06_reqBeanFormData6() throws Exception {
String r = proxy.reqBeanFormData6(
- new ReqBeanFormData6() {
- @Override
- public Map<String,Object> getX() {
- return map("a",1,"b","foo");
- }
-
- }
+ () -> map("a",1,"b","foo")
);
assertEquals("OK", r);
}
@@ -1325,12 +1293,7 @@ public class ThirdPartyProxyTest {
@Test
public void gd07_reqBeanFormData7() throws Exception {
String r = proxy.reqBeanFormData7(
- new ReqBeanFormData7() {
- @Override
- public ABean getX() {
- return ABean.get();
- }
- }
+ () -> ABean.get()
);
assertEquals("OK", r);
}
@@ -1392,13 +1355,7 @@ public class ThirdPartyProxyTest {
@Test
public void gf06_reqBeanHeader6() throws Exception {
String r = proxy.reqBeanHeader6(
- new ReqBeanHeader6() {
- @Override
- public Map<String,Object> getX() {
- return map("a",1,"b","foo");
- }
-
- }
+ () -> map("a",1,"b","foo")
);
assertEquals("OK", r);
}
@@ -1406,12 +1363,7 @@ public class ThirdPartyProxyTest {
@Test
public void gf07_reqBeanHeader7() throws Exception {
String r = proxy.reqBeanHeader7(
- new ReqBeanHeader7() {
- @Override
- public ABean getX() {
- return ABean.get();
- }
- }
+ () -> ABean.get()
);
assertEquals("OK", r);
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/serializer/SerializerConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/serializer/SerializerConfigAnnotationTest.java
index d4b37c0c2..839936657 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/serializer/SerializerConfigAnnotationTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/serializer/SerializerConfigAnnotationTest.java
@@ -35,16 +35,13 @@ public class SerializerConfigAnnotationTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = new Function<>() {
- @Override
- public String apply(Object t) {
- if (t == null)
- return null;
- if (t instanceof AA)
- return "AA";
- return t.toString();
- }
- };
+ private static final Function<Object,String> TO_STRING = t -> {
+ if (t == null)
+ return null;
+ if (t instanceof AA)
+ return "AA";
+ return t.toString();
+ };
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java
index f454b81f7..adef8fd2d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java
@@ -33,12 +33,7 @@ public class SoapXmlConfigAnnotationTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = new Function<>() {
- @Override
- public String apply(Object t) {
- return t.toString();
- }
- };
+ private static final Function<Object,String> TO_STRING = t -> t.toString();
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java
index 5e621925a..e5abf8229 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java
@@ -33,12 +33,7 @@ public class UonConfigAnnotationTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = new Function<>() {
- @Override
- public String apply(Object t) {
- return t.toString();
- }
- };
+ private static final Function<Object,String> TO_STRING = t -> t.toString();
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java
index 42cc19878..cd608b7f1 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java
@@ -33,12 +33,7 @@ public class UrlEncodingConfigAnnotationTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = new Function<>() {
- @Override
- public String apply(Object t) {
- return t.toString();
- }
- };
+ private static final Function<Object,String> TO_STRING = t -> t.toString();
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlConfigAnnotationTest.java
index 2360a1eb6..17588f1d9 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlConfigAnnotationTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlConfigAnnotationTest.java
@@ -38,22 +38,19 @@ public class XmlConfigAnnotationTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = new Function<>() {
- @Override
- public String apply(Object t) {
- if (t == null)
- return null;
- if (t.getClass().isArray())
- return apply(ArrayUtils.toList(t, Object.class));
- if (t instanceof AA)
- return "AA";
- if (t instanceof AB)
- return "AB";
- if (t instanceof AC)
- return "AC";
- return t.toString();
- }
- };
+ private static final Function<Object,String> TO_STRING = t -> {
+ if (t == null)
+ return null;
+ if (t.getClass().isArray())
+ return XmlConfigAnnotationTest.TO_STRING.apply(ArrayUtils.toList(t, Object.class));
+ if (t instanceof AA)
+ return "AA";
+ if (t instanceof AB)
+ return "AB";
+ if (t instanceof AC)
+ return "AC";
+ return t.toString();
+ };
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
[juneau] 15/29: [juneau-utest-utils] Use "L" instead of "l" for long literals (legibility)
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 7bfd7d565e962698008501a6ba084a5078211e4c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:07:53 2023 -0400
[juneau-utest-utils] Use "L" instead of "l" for long literals
(legibility)
---
.../org/apache/juneau/testutils/pojos/PrimitiveObjectsBean.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/pojos/PrimitiveObjectsBean.java b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/pojos/PrimitiveObjectsBean.java
index 9f173650e..981b66e60 100755
--- a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/pojos/PrimitiveObjectsBean.java
+++ b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/pojos/PrimitiveObjectsBean.java
@@ -105,7 +105,7 @@ public class PrimitiveObjectsBean {
poChar = 'a';
poShort = 2;
poInt = 3;
- poLong = 4l;
+ poLong = 4L;
poFloat = 5f;
poDouble = 6d;
poNumber = 7;
@@ -118,7 +118,7 @@ public class PrimitiveObjectsBean {
poaChar = new Character[][]{{'a'},{'b'},null};
poaShort = new Short[][]{{1},{2},null};
poaInt = new Integer[][]{{1},{2},null};
- poaLong = new Long[][]{{1l},{2l},null};
+ poaLong = new Long[][]{{1L},{2L},null};
poaFloat = new Float[][]{{1f},{2f},null};
poaDouble = new Double[][]{{1d},{2d},null};
poaNumber = new Number[][]{{1},{2},null};
@@ -131,7 +131,7 @@ public class PrimitiveObjectsBean {
poalChar = alist(new Character[]{'a'},null);
poalShort = alist(new Short[]{1},null);
poalInt = alist(new Integer[]{1},null);
- poalLong = alist(new Long[]{1l},null);
+ poalLong = alist(new Long[]{1L},null);
poalFloat = alist(new Float[]{1f},null);
poalDouble = alist(new Double[]{1d},null);
poalNumber = alist(new Integer[]{1},null);
@@ -155,7 +155,7 @@ public class PrimitiveObjectsBean {
polInt.add(new Integer[]{1});
polInt.add(null);
polLong = new ArrayList<>();
- polLong.add(new Long[]{1l});
+ polLong.add(new Long[]{1L});
polLong.add(null);
polFloat = new ArrayList<>();
polFloat.add(new Float[]{1f});
[juneau] 22/29: [juneau-marshall] Remove redundant modifiers
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 89e35a42f94409a4d85687d01ce75553119fcb5a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:36:50 2023 -0400
[juneau-marshall] Remove redundant modifiers
---
.../java/org/apache/juneau/AnnotationProvider.java | 5 ++-
.../src/main/java/org/apache/juneau/BeanMeta.java | 2 +-
.../java/org/apache/juneau/BeanPropertyMeta.java | 2 +-
.../src/main/java/org/apache/juneau/ClassMeta.java | 2 +-
.../src/main/java/org/apache/juneau/Delegate.java | 2 +-
.../main/java/org/apache/juneau/PropertyNamer.java | 2 +-
.../org/apache/juneau/collections/JsonList.java | 2 +-
.../org/apache/juneau/collections/JsonMap.java | 6 ++--
.../main/java/org/apache/juneau/cp/FileFinder.java | 8 ++---
.../apache/juneau/csv/CsvSerializerSession.java | 4 +--
.../org/apache/juneau/html/HtmlDocTemplate.java | 2 +-
.../org/apache/juneau/html/HtmlParserSession.java | 8 ++---
.../java/org/apache/juneau/html/HtmlWidget.java | 8 ++---
.../org/apache/juneau/httppart/HttpPartParser.java | 10 +++---
.../juneau/httppart/HttpPartParserSession.java | 2 +-
.../apache/juneau/httppart/HttpPartSerializer.java | 6 ++--
.../juneau/httppart/HttpPartSerializerSession.java | 2 +-
.../org/apache/juneau/internal/ArrayUtils.java | 8 ++---
.../java/org/apache/juneau/internal/DateUtils.java | 2 +-
.../org/apache/juneau/json/JsonParserSession.java | 6 ++--
.../apache/juneau/msgpack/MsgPackOutputStream.java | 36 +++++++++++-----------
.../juneau/msgpack/MsgPackSerializerSession.java | 4 +--
.../org/apache/juneau/objecttools/ObjectTool.java | 2 +-
.../java/org/apache/juneau/reflect/ClassInfo.java | 16 +++++-----
.../org/apache/juneau/reflect/ConstructorInfo.java | 10 +++---
.../java/org/apache/juneau/reflect/FieldInfo.java | 2 +-
.../java/org/apache/juneau/reflect/MethodInfo.java | 12 ++++----
.../main/java/org/apache/juneau/uon/UonReader.java | 4 +--
.../main/java/org/apache/juneau/uon/UonUtils.java | 2 +-
.../main/java/org/apache/juneau/uon/UonWriter.java | 2 +-
.../apache/juneau/xml/XmlSerializerSession.java | 6 ++--
.../main/java/org/apache/juneau/xml/XmlUtils.java | 34 ++++++++++----------
32 files changed, 109 insertions(+), 110 deletions(-)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java
index 0ab895670..47d07a1a0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java
@@ -31,13 +31,12 @@ public interface AnnotationProvider {
/**
* Disable annotation caching.
*/
- static final boolean DISABLE_ANNOTATION_CACHING = Boolean.getBoolean("juneau.disableAnnotationCaching");
+ boolean DISABLE_ANNOTATION_CACHING = Boolean.getBoolean("juneau.disableAnnotationCaching");
/**
* Default metadata provider.
*/
- @SuppressWarnings("unchecked")
- public static final AnnotationProvider DEFAULT = new AnnotationProvider() {
+ @SuppressWarnings("unchecked") AnnotationProvider DEFAULT = new AnnotationProvider() {
private final TwoKeyConcurrentCache<Class<?>,Class<? extends Annotation>,Annotation[]> classAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, Class::getAnnotationsByType);
private final TwoKeyConcurrentCache<Class<?>,Class<? extends Annotation>,Annotation[]> declaredClassAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, Class::getDeclaredAnnotationsByType);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index 3061a0ccd..13b6f6f84 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -574,7 +574,7 @@ public class BeanMeta<T> {
/**
* Possible property method types.
*/
- static enum MethodType {
+ enum MethodType {
UNKNOWN,
GETTER,
SETTER,
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
index 428d33eb8..419442531 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
@@ -612,7 +612,7 @@ public final class BeanPropertyMeta implements Comparable<BeanPropertyMeta> {
* Converts a raw bean property value to serialized form.
* Applies transforms and child property filters.
*/
- final Object toSerializedForm(BeanSession session, Object o) {
+ Object toSerializedForm(BeanSession session, Object o) {
try {
o = transform(session, o);
if (o == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
index 109f897c6..293b123bf 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
@@ -213,7 +213,7 @@ public final class ClassMeta<T> implements Type {
/**
* Causes thread to wait until constructor has exited.
*/
- final void waitForInit() {
+ void waitForInit() {
try (SimpleLock x = lock.read()) {}
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Delegate.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Delegate.java
index d95bb1dc9..fd99deaf5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Delegate.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Delegate.java
@@ -33,5 +33,5 @@ public interface Delegate<T> {
*
* @return The class type of the represented object.
*/
- public ClassMeta<T> getClassMeta();
+ ClassMeta<T> getClassMeta();
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamer.java
index 1fea1df04..2b9ed1684 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamer.java
@@ -40,5 +40,5 @@ public interface PropertyNamer {
* @param name The original bean property name.
* @return The converted property name.
*/
- public String getPropertyName(String name);
+ String getPropertyName(String name);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
index ace844a58..a0d689b06 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
@@ -1039,7 +1039,7 @@ public class JsonList extends LinkedList<Object> {
}
@Override
- public final boolean isUnmodifiable() {
+ public boolean isUnmodifiable() {
return true;
}
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
index efcf0e854..998a0661b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
@@ -1786,17 +1786,17 @@ public class JsonMap extends LinkedHashMap<String,Object> {
}
@Override
- public final Object put(String key, Object val) {
+ public Object put(String key, Object val) {
throw new UnsupportedOperationException("Not supported on read-only object.");
}
@Override
- public final Object remove(Object key) {
+ public Object remove(Object key) {
throw new UnsupportedOperationException("Not supported on read-only object.");
}
@Override
- public final boolean isUnmodifiable() {
+ public boolean isUnmodifiable() {
return true;
}
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
index d16f270bd..12465c14c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
@@ -99,7 +99,7 @@ public interface FileFinder {
* @param beanStore The bean store to use for creating beans.
* @return A new builder for this object.
*/
- public static Builder create(BeanStore beanStore) {
+ static Builder create(BeanStore beanStore) {
return new Builder(beanStore);
}
@@ -108,7 +108,7 @@ public interface FileFinder {
*
* @return A new builder for this object.
*/
- public static Builder create() {
+ static Builder create() {
return new Builder(BeanStore.INSTANCE);
}
@@ -262,7 +262,7 @@ public interface FileFinder {
* @return The resolved resource contents, or <jk>null</jk> if the resource was not found.
* @throws IOException Thrown by underlying stream.
*/
- public Optional<InputStream> getStream(String name, Locale locale) throws IOException;
+ Optional<InputStream> getStream(String name, Locale locale) throws IOException;
/**
* Returns the file with the specified name as a string.
@@ -274,5 +274,5 @@ public interface FileFinder {
* @return The contents of the file as a string. Assumes UTF-8 encoding.
* @throws IOException If file could not be read.
*/
- public Optional<String> getString(String name, Locale locale) throws IOException;
+ Optional<String> getString(String name, Locale locale) throws IOException;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
index fa3468d10..b25efffd7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
@@ -212,7 +212,7 @@ public final class CsvSerializerSession extends WriterSerializerSession {
@SuppressWarnings("rawtypes")
@Override /* SerializerSession */
- protected final void doSerialize(SerializerPipe pipe, Object o) throws IOException, SerializeException {
+ protected void doSerialize(SerializerPipe pipe, Object o) throws IOException, SerializeException {
try (CsvWriter w = getCsvWriter(pipe)) {
ClassMeta<?> cm = getClassMetaForObject(o);
@@ -274,7 +274,7 @@ public final class CsvSerializerSession extends WriterSerializerSession {
}
}
- final CsvWriter getCsvWriter(SerializerPipe out) {
+ CsvWriter getCsvWriter(SerializerPipe out) {
Object output = out.getRawOutput();
if (output instanceof CsvWriter)
return (CsvWriter)output;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java
index 271e9e2fe..e4a27fbd2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java
@@ -72,5 +72,5 @@ public interface HtmlDocTemplate {
* @param o The object being serialized.
* @throws Exception Any exception can be thrown.
*/
- public void writeTo(HtmlDocSerializerSession session, HtmlWriter w, Object o) throws Exception;
+ void writeTo(HtmlDocSerializerSession session, HtmlWriter w, Object o) throws Exception;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
index 2ddb44964..55a634b60 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
@@ -780,7 +780,7 @@ public final class HtmlParserSession extends XmlParserSession {
* @throws XMLStreamException Thrown by underlying XML stream.
*/
@Override /* XmlParserSession */
- protected final String parseText(XmlReader r) throws IOException, ParseException, XMLStreamException {
+ protected String parseText(XmlReader r) throws IOException, ParseException, XMLStreamException {
StringBuilder sb = getStringBuilder();
@@ -872,19 +872,19 @@ public final class HtmlParserSession extends XmlParserSession {
* @throws ParseException Malformed input encountered.
*/
@Override /* XmlParserSession */
- protected final String getElementText(XmlReader r) throws IOException, XMLStreamException, ParseException {
+ protected String getElementText(XmlReader r) throws IOException, XMLStreamException, ParseException {
r.next();
return parseText(r);
}
@Override /* XmlParserSession */
- protected final boolean isWhitespaceElement(XmlReader r) {
+ protected boolean isWhitespaceElement(XmlReader r) {
String s = r.getLocalName();
return whitespaceElements.contains(s);
}
@Override /* XmlParserSession */
- protected final String parseWhitespaceElement(XmlReader r) throws IOException, ParseException, XMLStreamException {
+ protected String parseWhitespaceElement(XmlReader r) throws IOException, ParseException, XMLStreamException {
HtmlTag tag = HtmlTag.forEvent(this, r);
int et = r.next();
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidget.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidget.java
index 56f9f025b..72d5ec4b0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidget.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidget.java
@@ -38,7 +38,7 @@ public interface HtmlWidget {
*
* @return A unique identifying name for this widget.
*/
- public String getName();
+ String getName();
/**
* Resolves the HTML content for this widget.
@@ -49,7 +49,7 @@ public interface HtmlWidget {
* @param session The current serializer session.
* @return The HTML content of this widget.
*/
- public String getHtml(VarResolverSession session);
+ String getHtml(VarResolverSession session);
/**
* Resolves any Javascript that should be added to the <xt><head>/<script></xt> element.
@@ -60,7 +60,7 @@ public interface HtmlWidget {
* @param session The current serializer session.
* @return The Javascript needed by this widget.
*/
- public String getScript(VarResolverSession session);
+ String getScript(VarResolverSession session);
/**
* Resolves any CSS styles that should be added to the <xt><head>/<style></xt> element.
@@ -71,5 +71,5 @@ public interface HtmlWidget {
* @param session The current serializer session.
* @return The CSS styles needed by this widget.
*/
- public String getStyle(VarResolverSession session);
+ String getStyle(VarResolverSession session);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java
index f4de5a131..4783a58e0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java
@@ -47,13 +47,13 @@ public interface HttpPartParser {
* <p>
* Used to represent the absence of a part parser in annotations.
*/
- public static interface Void extends HttpPartParser {}
+ public interface Void extends HttpPartParser {}
/**
* Instantiates a creator for a part parser.
* @return A new creator.
*/
- public static Creator creator() {
+ static Creator creator() {
return new Creator();
}
@@ -111,7 +111,7 @@ public interface HttpPartParser {
*
* @return A new parser session.
*/
- public HttpPartParserSession getPartSession();
+ HttpPartParserSession getPartSession();
/**
* Returns metadata about the specified class.
@@ -120,7 +120,7 @@ public interface HttpPartParser {
* @param c The class type.
* @return Metadata about the specified class.
*/
- public <T> ClassMeta<T> getClassMeta(Class<T> c);
+ <T> ClassMeta<T> getClassMeta(Class<T> c);
/**
* Returns metadata about the specified class.
@@ -130,5 +130,5 @@ public interface HttpPartParser {
* @param args The class type args.
* @return Metadata about the specified class.
*/
- public <T> ClassMeta<T> getClassMeta(Type t, Type...args);
+ <T> ClassMeta<T> getClassMeta(Type t, Type...args);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParserSession.java
index 7d8b18dc6..65485418c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParserSession.java
@@ -43,5 +43,5 @@ public interface HttpPartParserSession {
* @throws ParseException Malformed input encountered.
* @throws SchemaValidationException If the input or resulting HTTP part object fails schema validation.
*/
- public <T> T parse(HttpPartType partType, HttpPartSchema schema, String in, ClassMeta<T> toType) throws ParseException, SchemaValidationException;
+ <T> T parse(HttpPartType partType, HttpPartSchema schema, String in, ClassMeta<T> toType) throws ParseException, SchemaValidationException;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java
index 1b0be724b..1e9caf6f6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java
@@ -59,13 +59,13 @@ public interface HttpPartSerializer {
* <p>
* Used to represent the absence of a part serializer in annotations.
*/
- public static interface Void extends HttpPartSerializer {}
+ public interface Void extends HttpPartSerializer {}
/**
* Instantiates a creator for a part serializer.
* @return A new creator.
*/
- public static Creator creator() {
+ static Creator creator() {
return new Creator();
}
@@ -124,5 +124,5 @@ public interface HttpPartSerializer {
*
* @return A new serializer session.
*/
- public HttpPartSerializerSession getPartSession();
+ HttpPartSerializerSession getPartSession();
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializerSession.java
index fc46dfe60..5a4388863 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializerSession.java
@@ -44,5 +44,5 @@ public interface HttpPartSerializerSession {
* @throws SerializeException If a problem occurred while trying to parse the input.
* @throws SchemaValidationException If the output fails schema validation.
*/
- public String serialize(HttpPartType type, HttpPartSchema schema, Object value) throws SerializeException, SchemaValidationException;
+ String serialize(HttpPartType type, HttpPartSchema schema, Object value) throws SerializeException, SchemaValidationException;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
index 5bc0a0daa..60027ac45 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
@@ -293,7 +293,7 @@ public final class ArrayUtils {
* @param array The array to check.
* @return <jk>true</jk> if the specified array is not null and has a length greater than zero.
*/
- public static final boolean isNotEmptyArray(Object[] array) {
+ public static boolean isNotEmptyArray(Object[] array) {
return array != null && array.length > 0;
}
@@ -303,7 +303,7 @@ public final class ArrayUtils {
* @param array The array to check.
* @return <jk>true</jk> if the specified array is null or has a length of zero.
*/
- public static final boolean isEmptyArray(Object[] array) {
+ public static boolean isEmptyArray(Object[] array) {
return array == null || array.length == 0;
}
@@ -314,7 +314,7 @@ public final class ArrayUtils {
* @param array2 The array to check.
* @return <jk>true</jk> if the specified array is null or has a length of zero.
*/
- public static final boolean isEmptyArray(Object[] array1, Object[] array2) {
+ public static boolean isEmptyArray(Object[] array1, Object[] array2) {
return isEmptyArray(array1) && isEmptyArray(array2);
}
@@ -325,7 +325,7 @@ public final class ArrayUtils {
* @param array The array to reverse.
* @return The same array.
*/
- public static final <E> E[] reverse(E[] array) {
+ public static <E> E[] reverse(E[] array) {
for (int i = 0; i < array.length / 2; i++) {
E temp = array[i];
array[i] = array[array.length - i - 1];
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
index 41ef22111..0c0b3a1b4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
@@ -162,7 +162,7 @@ public final class DateUtils {
* @param in The string to pad.
* @return The padded string.
*/
- public static final String toValidISO8601DT(String in) {
+ public static String toValidISO8601DT(String in) {
// "2001-07-04T15:30:45Z"
final int
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
index 0bc7b3b9c..e46e4fd33 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
@@ -220,7 +220,7 @@ public final class JsonParserSession extends ReaderParserSession {
* @param cp The codepoint.
* @return <jk>true</jk> if the specified character is whitespace.
*/
- protected final boolean isWhitespace(int cp) {
+ protected boolean isWhitespace(int cp) {
if (isStrict())
return cp <= 0x20 && (cp == 0x09 || cp == 0x0A || cp == 0x0D || cp == 0x20);
return Character.isWhitespace(cp);
@@ -232,7 +232,7 @@ public final class JsonParserSession extends ReaderParserSession {
* @param cp The codepoint.
* @return <jk>true</jk> if the specified character is whitespace or '/'.
*/
- protected final boolean isCommentOrWhitespace(int cp) {
+ protected boolean isCommentOrWhitespace(int cp) {
if (cp == '/')
return true;
if (isStrict())
@@ -960,7 +960,7 @@ public final class JsonParserSession extends ReaderParserSession {
* <jk>true</jk> if after parsing a POJO from the input, verifies that the remaining input in
* the stream consists of only comments or whitespace.
*/
- protected final boolean isValidateEnd() {
+ protected boolean isValidateEnd() {
return ctx.isValidateEnd();
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java
index bcab3d2b6..65f3efbf0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java
@@ -58,7 +58,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Same as {@link #write(int)}.
*/
- final MsgPackOutputStream append(byte b) {
+ MsgPackOutputStream append(byte b) {
try {
os.write(b);
} catch (IOException e) {
@@ -70,7 +70,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Same as {@link #write(byte[])}.
*/
- final MsgPackOutputStream append(byte[] b) {
+ MsgPackOutputStream append(byte[] b) {
try {
os.write(b);
} catch (IOException e) {
@@ -82,7 +82,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends one byte to the stream.
*/
- final MsgPackOutputStream append1(int i) {
+ MsgPackOutputStream append1(int i) {
try {
os.write(i);
} catch (IOException e) {
@@ -94,42 +94,42 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends two bytes to the stream.
*/
- final MsgPackOutputStream append2(int i) {
+ MsgPackOutputStream append2(int i) {
return append1(i>>8).append1(i);
}
/**
* Appends four bytes to the stream.
*/
- final MsgPackOutputStream append4(int i) {
+ MsgPackOutputStream append4(int i) {
return append1(i>>24).append1(i>>16).append1(i>>8).append1(i);
}
/**
* Appends eight bytes to the stream.
*/
- final MsgPackOutputStream append8(long l) {
+ MsgPackOutputStream append8(long l) {
return append1((int)(l>>56)).append1((int)(l>>48)).append1((int)(l>>40)).append1((int)(l>>32)).append1((int)(l>>24)).append1((int)(l>>16)).append1((int)(l>>8)).append1((int)(l));
}
/**
* Appends a NULL flag to the stream.
*/
- final MsgPackOutputStream appendNull() {
+ MsgPackOutputStream appendNull() {
return append1(NIL);
}
/**
* Appends a boolean to the stream.
*/
- final MsgPackOutputStream appendBoolean(boolean b) {
+ MsgPackOutputStream appendBoolean(boolean b) {
return append1(b ? TRUE : FALSE);
}
/**
* Appends an integer to the stream.
*/
- final MsgPackOutputStream appendInt(int i) {
+ MsgPackOutputStream appendInt(int i) {
// POSFIXINT_L = 0x00, // pos fixint 0xxxxxxx 0x00 - 0x7f
// POSFIXINT_U = 0x7F,
// UINT8 = 0xCC, // uint 8 11001100 0xcc
@@ -163,7 +163,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends a long to the stream.
*/
- final MsgPackOutputStream appendLong(long l) {
+ MsgPackOutputStream appendLong(long l) {
if (l < L2X31 && l > -(L2X31))
return appendInt((int)l);
return append1(INT64).append8(l);
@@ -172,7 +172,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends a generic Number to the stream.
*/
- final MsgPackOutputStream appendNumber(Number n) {
+ MsgPackOutputStream appendNumber(Number n) {
Class<?> c = n.getClass();
if (c == Integer.class || c == Short.class || c == Byte.class || c == AtomicInteger.class)
return appendInt(n.intValue());
@@ -192,7 +192,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends a float to the stream.
*/
- final MsgPackOutputStream appendFloat(float f) {
+ MsgPackOutputStream appendFloat(float f) {
// FLOAT32 = 0xCA, // float 32 11001010 0xca
return append1(FLOAT32).append4(Float.floatToIntBits(f));
@@ -201,7 +201,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends a double to the stream.
*/
- final MsgPackOutputStream appendDouble(double d) {
+ MsgPackOutputStream appendDouble(double d) {
// FLOAT64 = 0xCB, // float 64 11001011 0xcb
return append1(FLOAT64).append8(Double.doubleToLongBits(d));
}
@@ -209,7 +209,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends a string to the stream.
*/
- final MsgPackOutputStream appendString(CharSequence cs) {
+ MsgPackOutputStream appendString(CharSequence cs) {
// fixstr stores a byte array whose length is up to 31 bytes:
// +--------+========+
@@ -258,7 +258,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends a binary field to the stream.
*/
- final MsgPackOutputStream appendBinary(byte[] b) {
+ MsgPackOutputStream appendBinary(byte[] b) {
// bin 8 stores a byte array whose length is up to (2^8)-1 bytes:
// +--------+--------+========+
// | 0xc4 |XXXXXXXX| data |
@@ -290,7 +290,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends a binary field to the stream.
*/
- final MsgPackOutputStream appendBinary(InputStream is) {
+ MsgPackOutputStream appendBinary(InputStream is) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
IOUtils.pipe(is, baos, x -> { throw new SerializeException(x); });
@@ -328,7 +328,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends an array data type flag to the stream.
*/
- final MsgPackOutputStream startArray(int size) {
+ MsgPackOutputStream startArray(int size) {
// fixarray stores an array whose length is up to 15 elements:
// +--------+~~~~~~~~~~~~~~~~~+
// |1001XXXX| N objects |
@@ -360,7 +360,7 @@ public final class MsgPackOutputStream extends OutputStream {
/**
* Appends a map data type flag to the stream.
*/
- final MsgPackOutputStream startMap(int size) {
+ MsgPackOutputStream startMap(int size) {
// fixmap stores a map whose length is up to 15 elements
// +--------+~~~~~~~~~~~~~~~~~+
// |1000XXXX| N*2 objects |
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
index 5cb3506d0..1355ff130 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
@@ -206,7 +206,7 @@ public final class MsgPackSerializerSession extends OutputStreamSerializerSessio
/*
* Converts the specified output target object to an {@link MsgPackOutputStream}.
*/
- private static final MsgPackOutputStream getMsgPackOutputStream(SerializerPipe out) throws IOException {
+ private static MsgPackOutputStream getMsgPackOutputStream(SerializerPipe out) throws IOException {
Object output = out.getRawOutput();
if (output instanceof MsgPackOutputStream)
return (MsgPackOutputStream)output;
@@ -393,7 +393,7 @@ public final class MsgPackSerializerSession extends OutputStreamSerializerSessio
//-----------------------------------------------------------------------------------------------------------------
@Override
- protected final boolean isAddBeanTypes() {
+ protected boolean isAddBeanTypes() {
return ctx.isAddBeanTypes();
}
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectTool.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectTool.java
index 7ac131746..8317cf399 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectTool.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectTool.java
@@ -33,5 +33,5 @@ public interface ObjectTool<T> {
* @param args The arguments.
* @return The output POJO.
*/
- public Object run(BeanSession session, Object input, T args);
+ Object run(BeanSession session, Object input, T args);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
index d0d07e53d..f3b35484b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
@@ -449,7 +449,7 @@ public final class ClassInfo {
* @param action An action to perform on the entry.
* @return This object.
*/
- public final ClassInfo forEachPublicMethod(Predicate<MethodInfo> filter, Consumer<MethodInfo> action) {
+ public ClassInfo forEachPublicMethod(Predicate<MethodInfo> filter, Consumer<MethodInfo> action) {
for (MethodInfo mi : _getPublicMethods())
consume(filter, action, mi);
return this;
@@ -461,7 +461,7 @@ public final class ClassInfo {
* @param filter A predicate to apply to the entries to determine if value should be used. Can be <jk>null</jk>.
* @return The first matching method, or <jk>null</jk> if no methods matched.
*/
- public final MethodInfo getPublicMethod(Predicate<MethodInfo> filter) {
+ public MethodInfo getPublicMethod(Predicate<MethodInfo> filter) {
for (MethodInfo mi : _getPublicMethods())
if (test(filter, mi))
return mi;
@@ -487,7 +487,7 @@ public final class ClassInfo {
* @param action An action to perform on the entry.
* @return This object.
*/
- public final ClassInfo forEachDeclaredMethod(Predicate<MethodInfo> filter, Consumer<MethodInfo> action) {
+ public ClassInfo forEachDeclaredMethod(Predicate<MethodInfo> filter, Consumer<MethodInfo> action) {
for (MethodInfo mi : _getDeclaredMethods())
consume(filter, action, mi);
return this;
@@ -525,7 +525,7 @@ public final class ClassInfo {
* @param action An action to perform on the entry.
* @return This object.
*/
- public final ClassInfo forEachMethod(Predicate<MethodInfo> filter, Consumer<MethodInfo> action) {
+ public ClassInfo forEachMethod(Predicate<MethodInfo> filter, Consumer<MethodInfo> action) {
for (MethodInfo mi : _getAllMethods())
consume(filter, action, mi);
return this;
@@ -563,7 +563,7 @@ public final class ClassInfo {
* @param action An action to perform on the entry.
* @return This object.
*/
- public final ClassInfo forEachAllMethodParentFirst(Predicate<MethodInfo> filter, Consumer<MethodInfo> action) {
+ public ClassInfo forEachAllMethodParentFirst(Predicate<MethodInfo> filter, Consumer<MethodInfo> action) {
for (MethodInfo mi : _getAllMethodsParentFirst())
consume(filter, action, mi);
return this;
@@ -650,7 +650,7 @@ public final class ClassInfo {
* @param action An action to perform on the entry.
* @return This object.
*/
- public final ClassInfo forEachPublicConstructor(Predicate<ConstructorInfo> filter, Consumer<ConstructorInfo> action) {
+ public ClassInfo forEachPublicConstructor(Predicate<ConstructorInfo> filter, Consumer<ConstructorInfo> action) {
for (ConstructorInfo mi : _getPublicConstructors())
consume(filter, action, mi);
return this;
@@ -687,7 +687,7 @@ public final class ClassInfo {
* @param action An action to perform on the entry.
* @return This object.
*/
- public final ClassInfo forEachDeclaredConstructor(Predicate<ConstructorInfo> filter, Consumer<ConstructorInfo> action) {
+ public ClassInfo forEachDeclaredConstructor(Predicate<ConstructorInfo> filter, Consumer<ConstructorInfo> action) {
for (ConstructorInfo mi : _getDeclaredConstructors())
consume(filter, action, mi);
return this;
@@ -785,7 +785,7 @@ public final class ClassInfo {
* @param action An action to perform on the entry.
* @return This object.
*/
- public final ClassInfo forEachPublicField(Predicate<FieldInfo> filter, Consumer<FieldInfo> action) {
+ public ClassInfo forEachPublicField(Predicate<FieldInfo> filter, Consumer<FieldInfo> action) {
for (FieldInfo mi : _getPublicFields())
consume(filter, action, mi);
return this;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
index ec5c12aa4..a1f704270 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
@@ -98,7 +98,7 @@ public final class ConstructorInfo extends ExecutableInfo implements Comparable<
* @param type The annotation to look for.
* @return The annotation if found, or <jk>null</jk> if not.
*/
- public final <A extends Annotation> A getAnnotation(Class<A> type) {
+ public <A extends Annotation> A getAnnotation(Class<A> type) {
return getAnnotation(AnnotationProvider.DEFAULT, type);
}
@@ -110,7 +110,7 @@ public final class ConstructorInfo extends ExecutableInfo implements Comparable<
* @param type The annotation to look for.
* @return The first annotation found, or <jk>null</jk> if it doesn't exist.
*/
- public final <A extends Annotation> A getAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
+ public <A extends Annotation> A getAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
Value<A> t = Value.empty();
annotationProvider.forEachAnnotation(type, c, x -> true, x -> t.set(x));
return t.orElse(null);
@@ -123,7 +123,7 @@ public final class ConstructorInfo extends ExecutableInfo implements Comparable<
* @param type The annotation to look for.
* @return <jk>true</jk> if the specified annotation is present on this constructor.
*/
- public final <A extends Annotation> boolean hasAnnotation(Class<A> type) {
+ public <A extends Annotation> boolean hasAnnotation(Class<A> type) {
return hasAnnotation(AnnotationProvider.DEFAULT, type);
}
@@ -135,7 +135,7 @@ public final class ConstructorInfo extends ExecutableInfo implements Comparable<
* @param type The annotation to look for.
* @return <jk>true</jk> if the specified annotation is present on this constructor.
*/
- public final <A extends Annotation> boolean hasAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
+ public <A extends Annotation> boolean hasAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
return annotationProvider.firstAnnotation(type, c, x -> true) != null;
}
@@ -147,7 +147,7 @@ public final class ConstructorInfo extends ExecutableInfo implements Comparable<
* @param type The annotation to look for.
* @return <jk>true</jk> if the specified annotation is not present on this constructor.
*/
- public final <A extends Annotation> boolean hasNoAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
+ public <A extends Annotation> boolean hasNoAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
return ! hasAnnotation(annotationProvider, type);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
index 480c4c8b0..3cd9070be 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
@@ -141,7 +141,7 @@ public final class FieldInfo implements Comparable<FieldInfo> {
* @param type The annotation to look for.
* @return <jk>true</jk> if the specified annotation is not present on this field.
*/
- public final <A extends Annotation> boolean hasNoAnnotation(Class<A> type) {
+ public <A extends Annotation> boolean hasNoAnnotation(Class<A> type) {
return ! hasAnnotation(type);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
index f7f792143..3ea0ea988 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
@@ -221,7 +221,7 @@ public final class MethodInfo extends ExecutableInfo implements Comparable<Metho
* @param type The annotation to look for.
* @return The annotation if found, or <jk>null</jk> if not.
*/
- public final <A extends Annotation> A getAnnotation(Class<A> type) {
+ public <A extends Annotation> A getAnnotation(Class<A> type) {
return getAnnotation(AnnotationProvider.DEFAULT, type);
}
@@ -237,7 +237,7 @@ public final class MethodInfo extends ExecutableInfo implements Comparable<Metho
* @param type The annotation to look for.
* @return The first annotation found, or <jk>null</jk> if it doesn't exist.
*/
- public final <A extends Annotation> A getAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
+ public <A extends Annotation> A getAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
if (type == null)
return null;
Value<A> t = Value.empty();
@@ -256,7 +256,7 @@ public final class MethodInfo extends ExecutableInfo implements Comparable<Metho
* @param type The annotation to look for.
* @return <jk>true</jk> if the specified annotation is present on this method.
*/
- public final <A extends Annotation> boolean hasAnnotation(Class<A> type) {
+ public <A extends Annotation> boolean hasAnnotation(Class<A> type) {
return hasAnnotation(AnnotationProvider.DEFAULT, type);
}
@@ -268,7 +268,7 @@ public final class MethodInfo extends ExecutableInfo implements Comparable<Metho
* @param type The annotation to look for.
* @return <jk>true</jk> if the specified annotation is present on this method.
*/
- public final <A extends Annotation> boolean hasAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
+ public <A extends Annotation> boolean hasAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
for (MethodInfo m2 : _getMatching())
if (annotationProvider.firstAnnotation(type, m2.inner(), x -> true) != null)
return true;
@@ -283,7 +283,7 @@ public final class MethodInfo extends ExecutableInfo implements Comparable<Metho
* @param type The annotation to look for.
* @return <jk>true</jk> if the specified annotation is not present on this method.
*/
- public final <A extends Annotation> boolean hasNoAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
+ public <A extends Annotation> boolean hasNoAnnotation(AnnotationProvider annotationProvider, Class<A> type) {
return ! hasAnnotation(annotationProvider, type);
}
@@ -294,7 +294,7 @@ public final class MethodInfo extends ExecutableInfo implements Comparable<Metho
* @param type The annotation to look for.
* @return <jk>true</jk> if the specified annotation is not present on this method.
*/
- public final <A extends Annotation> boolean hasNoAnnotation(Class<A> type) {
+ public <A extends Annotation> boolean hasNoAnnotation(Class<A> type) {
return getAnnotation(type) == null;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java
index ce3514063..bda448d75 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java
@@ -61,7 +61,7 @@ public final class UonReader extends ParserReader {
}
@Override /* Reader */
- public final int read(char[] cbuf, int off, int len) throws IOException {
+ public int read(char[] cbuf, int off, int len) throws IOException {
if (! decodeChars)
return super.read(cbuf, off, len);
@@ -194,7 +194,7 @@ public final class UonReader extends ParserReader {
}
@Override /* ParserReader */
- public final UonReader unread() throws IOException {
+ public UonReader unread() throws IOException {
super.unread();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonUtils.java
index a65bba2c0..6863a5046 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonUtils.java
@@ -37,7 +37,7 @@ public final class UonUtils {
* @param s The string to test.
* @return <jk>true</jk> if the specified string needs to be quoted per UON notation.
*/
- public static final boolean needsQuotes(String s) {
+ public static boolean needsQuotes(String s) {
char c0 = s.isEmpty() ? 0 : s.charAt(0);
return (
s.isEmpty()
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
index 84c76313d..826af8992 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
@@ -79,7 +79,7 @@ public final class UonWriter extends SerializerWriter {
* @param isTopAttrName If this is a top-level attribute name we're serializing.
* @return This object.
*/
- public final UonWriter appendObject(Object o, boolean isTopAttrName) {
+ public UonWriter appendObject(Object o, boolean isTopAttrName) {
if (o instanceof Boolean)
return appendBoolean(o);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index 589844509..44b3baaf9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -856,11 +856,11 @@ public class XmlSerializerSession extends WriterSerializerSession {
return out;
}
- static enum JsonType {
+ enum JsonType {
STRING("string"),BOOLEAN("boolean"),NUMBER("number"),ARRAY("array"),OBJECT("object"),NULL("null");
private final String value;
- private JsonType(String value) {
+ JsonType(String value) {
this.value = value;
}
@@ -881,7 +881,7 @@ public class XmlSerializerSession extends WriterSerializerSession {
* Identifies what the contents were of a serialized bean.
*/
@SuppressWarnings("javadoc")
- public static enum ContentResult {
+ public enum ContentResult {
CR_VOID, // No content...append "/>" to the start tag.
CR_EMPTY, // No content...append "/>" to the start tag if XML, "/></end>" if HTML.
CR_MIXED, // Mixed content...don't add whitespace.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
index e75e1099b..a53541be1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
@@ -45,7 +45,7 @@ public final class XmlUtils {
* @param value The object being encoded.
* @return The same writer passed in.
*/
- public static final Writer encodeElementName(Writer w, Object value) {
+ public static Writer encodeElementName(Writer w, Object value) {
try {
if (value == null)
return w.append("_x0000_");
@@ -65,7 +65,7 @@ public final class XmlUtils {
* @param value The object being encoded.
* @return The encoded element name string.
*/
- public static final String encodeElementName(Object value) {
+ public static String encodeElementName(Object value) {
if (value == null)
return "_x0000_";
String s = value.toString();
@@ -84,7 +84,7 @@ public final class XmlUtils {
return s;
}
- private static final Writer encodeElementNameInner(Writer w, String s) throws IOException {
+ private static Writer encodeElementNameInner(Writer w, String s) throws IOException {
for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
if ((c >= 'A' && c <= 'Z')
@@ -117,7 +117,7 @@ public final class XmlUtils {
return w;
}
- private static final boolean needsElementNameEncoding(String value) {
+ private static boolean needsElementNameEncoding(String value) {
// Note that this doesn't need to be perfect, just fast.
for (int i = 0; i < value.length(); i++) {
char c = value.charAt(i);
@@ -137,7 +137,7 @@ public final class XmlUtils {
* @param value The object being encoded.
* @return The encoded string.
*/
- public static final String escapeText(Object value) {
+ public static String escapeText(Object value) {
if (value == null)
return "_x0000_";
String s = value.toString();
@@ -182,7 +182,7 @@ public final class XmlUtils {
* If <jk>true</jk>, leading and trailing whitespace characters will be encoded.
* @return The same writer passed in.
*/
- public static final Writer encodeText(Writer w, Object value, boolean trim, boolean preserveWhitespace) {
+ public static Writer encodeText(Writer w, Object value, boolean trim, boolean preserveWhitespace) {
try {
if (value == null)
@@ -218,7 +218,7 @@ public final class XmlUtils {
return w;
}
- private static final boolean needsTextEncoding(String value) {
+ private static boolean needsTextEncoding(String value) {
// See if we need to convert the string.
// Conversion is somewhat expensive, so make sure we need to do so before hand.
final int len = value.length();
@@ -253,7 +253,7 @@ public final class XmlUtils {
* @return This object.
* @throws IOException If a problem occurred.
*/
- public static final Writer encodeAttrName(Writer w, Object value) throws IOException {
+ public static Writer encodeAttrName(Writer w, Object value) throws IOException {
if (value == null)
return w.append("_x0000_");
String s = value.toString();
@@ -284,7 +284,7 @@ public final class XmlUtils {
return w;
}
- private static final boolean needsAttrNameEncoding(String value) {
+ private static boolean needsAttrNameEncoding(String value) {
// Note that this doesn't need to be perfect, just fast.
for (int i = 0; i < value.length(); i++) {
char c = value.charAt(i);
@@ -314,7 +314,7 @@ public final class XmlUtils {
* If <jk>true</jk>, leading and trailing whitespace characters will be encoded.
* @return The same writer passed in.
*/
- public static final Writer encodeAttrValue(Writer w, Object value, boolean trim) {
+ public static Writer encodeAttrValue(Writer w, Object value, boolean trim) {
try {
if (value == null)
return w.append("_x0000_");
@@ -349,7 +349,7 @@ public final class XmlUtils {
return w;
}
- private static final boolean needsAttrValueEncoding(String value) {
+ private static boolean needsAttrValueEncoding(String value) {
// See if we need to convert the string.
// Conversion is somewhat expensive, so make sure we need to do so before hand.
final int len = value.length();
@@ -385,7 +385,7 @@ public final class XmlUtils {
* @param sb The string builder to use as a scratch pad.
* @return The decoded string.
*/
- public static final String decode(String value, StringBuilder sb) {
+ public static String decode(String value, StringBuilder sb) {
if (value == null)
return null;
if (value.isEmpty() || value.indexOf('_') == -1)
@@ -448,13 +448,13 @@ public final class XmlUtils {
//-----------------------------------------------------------------------------------------------------------------
// Returns true if the specified character can safely be used in XML text or an attribute.
- private static final boolean isValidXmlCharacter(char c) {
+ private static boolean isValidXmlCharacter(char c) {
return (c >= 0x20 && c <= 0xD7FF) /*|| c == 0xA || c == 0xD*/ || (c >= 0xE000 && c <= 0xFFFD);
}
// Returns true if the string at the specified position is of the form "_x####_"
// where '#' are hexadecimal characters.
- private static final boolean isEscapeSequence(String s, int i) {
+ private static boolean isEscapeSequence(String s, int i) {
return s.length() > i+6
&& s.charAt(i) == '_'
&& s.charAt(i+1) == 'x'
@@ -466,12 +466,12 @@ public final class XmlUtils {
}
// Returns true if the character is a hexadecimal character
- private static final boolean isHexCharacter(char c) {
+ private static boolean isHexCharacter(char c) {
return (c >= '0' && c <= '9') || (c >= 'A' && c <= 'F');
}
// Converts an integer to a hexadecimal string padded to 4 places.
- private static final Writer appendPaddedHexChar(Writer out, int num) throws IOException {
+ private static Writer appendPaddedHexChar(Writer out, int num) throws IOException {
out.append("_x");
for (char c : toHex4(num))
out.append(c);
@@ -553,7 +553,7 @@ public final class XmlUtils {
* @param r The XML stream reader whose current event is to be converted to a readable string.
* @return The event in human-readable form.
*/
- public static final String toReadableEvent(XMLStreamReader r) {
+ public static String toReadableEvent(XMLStreamReader r) {
int t = r.getEventType();
if (t == 1)
return "<"+r.getLocalName()+">";
[juneau] 21/29: [juneau-dto] Remove redundant modifiers
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 831ced8d17655d881ef0080f5667f3072f972774
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:36:20 2023 -0400
[juneau-dto] Remove redundant modifiers
---
.../src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
index e31ed1973..00d9c1e8f 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
@@ -54,7 +54,7 @@ public enum JsonType {
private final String value; // The serialized format of the enum.
- private JsonType(String value) {
+ JsonType(String value) {
this.value = value;
}
[juneau] 23/29: [juneau-rest-server] Remove redundant modifiers
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 8dd625d8ef9211105c6f27ae710a2291fb5aeae6
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:37:01 2023 -0400
[juneau-rest-server] Remove redundant modifiers
---
.../main/java/org/apache/juneau/rest/arg/RestOpArg.java | 2 +-
.../org/apache/juneau/rest/converter/RestConverter.java | 2 +-
.../org/apache/juneau/rest/httppart/NamedAttribute.java | 4 ++--
.../org/apache/juneau/rest/httppart/RestPartType.java | 2 +-
.../apache/juneau/rest/processor/ResponseProcessor.java | 6 +++---
.../apache/juneau/rest/servlet/BasicGroupOperations.java | 3 +--
.../apache/juneau/rest/servlet/BasicRestOperations.java | 15 +++++----------
.../org/apache/juneau/rest/staticfile/StaticFiles.java | 4 ++--
.../org/apache/juneau/rest/swagger/SwaggerProvider.java | 4 ++--
.../juneau/rest/util/BoundedServletInputStream.java | 4 ++--
10 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArg.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArg.java
index 30525a2a5..0a9fe6453 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArg.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArg.java
@@ -57,5 +57,5 @@ public interface RestOpArg {
* @return The resolved object.
* @throws Exception Generic error occurred.
*/
- public Object resolve(RestOpSession opSession) throws Exception;
+ Object resolve(RestOpSession opSession) throws Exception;
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverter.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverter.java
index 6536f0867..ef2e6da36 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverter.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverter.java
@@ -88,5 +88,5 @@ public interface RestConverter {
* @throws BasicHttpException Thrown if any errors occur during conversion.
* @throws SerializeException Generic serialization error occurred.
*/
- public Object convert(RestRequest req, Object res) throws BasicHttpException, SerializeException;
+ Object convert(RestRequest req, Object res) throws BasicHttpException, SerializeException;
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/NamedAttribute.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/NamedAttribute.java
index d59589d52..beb2a589e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/NamedAttribute.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/NamedAttribute.java
@@ -26,12 +26,12 @@ public interface NamedAttribute {
*
* @return The attribute name.
*/
- public String getName();
+ String getName();
/**
* Returns the attribute value.
*
* @return The attribute value.
*/
- public Object getValue();
+ Object getValue();
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RestPartType.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RestPartType.java
index 609d30e53..cbd105150 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RestPartType.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RestPartType.java
@@ -57,7 +57,7 @@ public enum RestPartType {
private final String value;
- private RestPartType(String value) {
+ RestPartType(String value) {
this.value = value;
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessor.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessor.java
index 06ae56b26..22bd2351b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessor.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessor.java
@@ -82,17 +82,17 @@ public interface ResponseProcessor {
/**
* Return code indicating to proceed to the next response processor in the chain.
*/
- public static final int NEXT = 0;
+ int NEXT = 0;
/**
* Return code indicating that processing is complete and to exit the chain.
*/
- public static final int FINISHED = 1;
+ int FINISHED = 1;
/**
* Return code indicating to restart processing the chain from the beginning.
*/
- public static final int RESTART = 2;
+ int RESTART = 2;
/**
* Process this response if possible.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicGroupOperations.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicGroupOperations.java
index 4b192fbc0..fd81f3203 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicGroupOperations.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicGroupOperations.java
@@ -51,6 +51,5 @@ public interface BasicGroupOperations {
* @param req The HTTP request.
* @return The bean containing links to the child resources.
*/
- @RestGet(path="/", summary="Navigation page")
- public ChildResourceDescriptions getChildren(RestRequest req);
+ @RestGet(path="/", summary="Navigation page") ChildResourceDescriptions getChildren(RestRequest req);
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicRestOperations.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicRestOperations.java
index c81778082..288cc3d39 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicRestOperations.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicRestOperations.java
@@ -114,8 +114,7 @@ public interface BasicRestOperations {
// This is a per-media-type swap that only applies to text/html requests.
SwaggerUI.class
}
- )
- public Swagger getSwagger(RestRequest req);
+ ) Swagger getSwagger(RestRequest req);
/**
* [GET /htdocs/*] - Retrieve static file.
@@ -128,8 +127,7 @@ public interface BasicRestOperations {
path="/htdocs/*",
summary="Static files",
description="Static file retrieval."
- )
- public HttpResource getHtdoc(@Path String path, Locale locale);
+ ) HttpResource getHtdoc(@Path String path, Locale locale);
/**
* [GET favicon.ico] - Retrieve favorites icon image.
@@ -140,8 +138,7 @@ public interface BasicRestOperations {
path="favicon.ico",
summary="Favorites icon.",
description="Favorites icon."
- )
- public HttpResource getFavIcon();
+ ) HttpResource getFavIcon();
/**
* [* /error] - Error occurred.
@@ -156,8 +153,7 @@ public interface BasicRestOperations {
"(such as failed authentication) and will set appropriate response parameters ",
"(such as an WWW-Authenticate response header)."
}
- )
- public void error();
+ ) void error();
/**
* [GET /stats] - Timing statistics.
@@ -183,6 +179,5 @@ public interface BasicRestOperations {
},
// Never show aside contents of page inherited from class.
aside="NONE"
- )
- public RestContextStats getStats(RestRequest req);
+ ) RestContextStats getStats(RestRequest req);
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
index 7e2c8d81d..f7ea60136 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
@@ -48,7 +48,7 @@ public interface StaticFiles extends FileFinder {
* @param beanStore The bean store to use for creating beans.
* @return A new builder for this object.
*/
- public static Builder create(BeanStore beanStore) {
+ static Builder create(BeanStore beanStore) {
return new Builder(beanStore);
}
@@ -232,5 +232,5 @@ public interface StaticFiles extends FileFinder {
* @param locale Optional locale.
* @return The resource, or <jk>null</jk> if not found.
*/
- public Optional<HttpResource> resolve(String path, Locale locale);
+ Optional<HttpResource> resolve(String path, Locale locale);
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/SwaggerProvider.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/SwaggerProvider.java
index c07fe9c56..2ca738dc1 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/SwaggerProvider.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/SwaggerProvider.java
@@ -52,7 +52,7 @@ public interface SwaggerProvider {
* @param beanStore The bean store to use for creating beans.
* @return A new builder for this object.
*/
- public static Builder create(BeanStore beanStore) {
+ static Builder create(BeanStore beanStore) {
return new Builder(beanStore);
}
@@ -224,6 +224,6 @@ public interface SwaggerProvider {
* @return A new {@link Swagger} DTO object.
* @throws Exception If an error occurred producing the Swagger.
*/
- public Swagger getSwagger(RestContext context, Locale locale) throws Exception;
+ Swagger getSwagger(RestContext context, Locale locale) throws Exception;
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/BoundedServletInputStream.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/BoundedServletInputStream.java
index f7de326be..89c617594 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/BoundedServletInputStream.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/BoundedServletInputStream.java
@@ -62,7 +62,7 @@ public final class BoundedServletInputStream extends ServletInputStream {
}
@Override /* InputStream */
- public final int read() throws IOException {
+ public int read() throws IOException {
decrement();
return is.read();
}
@@ -113,7 +113,7 @@ public final class BoundedServletInputStream extends ServletInputStream {
}
@Override /* InputStream */
- public final void close() throws IOException {
+ public void close() throws IOException {
is.close();
}
[juneau] 28/29: [juneau-microservice-core] Use {} only when creating certain arrays
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit f99028ab2459ac7c7826d058dace970503786247
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:47:59 2023 -0400
[juneau-microservice-core] Use {} only when creating certain arrays
[juneau] 13/29: [juneau-marshall] Use "L" instead of "l" for long literals (legibility)
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit d99a45fd9bb3bbab3ef1230af158caf2da5be9ff
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:07:13 2023 -0400
[juneau-marshall] Use "L" instead of "l" for long literals (legibility)
---
.../juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java | 2 +-
.../src/main/java/org/apache/juneau/reflect/ClassInfo.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index 526575a0f..e37739100 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -559,7 +559,7 @@ public class BeanSession extends ContextSession {
if (tc == Short.TYPE)
return (T)(Short.valueOf(b ? (short)1 : 0));
if (tc == Long.TYPE)
- return (T)(Long.valueOf(b ? 1l : 0));
+ return (T)(Long.valueOf(b ? 1L : 0));
if (tc == Float.TYPE)
return (T)(Float.valueOf(b ? 1f : 0));
if (tc == Double.TYPE)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
index 1d2b8e453..d0d07e53d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
@@ -1777,7 +1777,7 @@ public final class ClassInfo {
.add(Character.TYPE, (char)0)
.add(Short.TYPE, (short)0)
.add(Integer.TYPE, 0)
- .add(Long.TYPE, 0l)
+ .add(Long.TYPE, 0L)
.add(Float.TYPE, 0f)
.add(Double.TYPE, 0d)
.add(Byte.TYPE, (byte)0)
@@ -1785,7 +1785,7 @@ public final class ClassInfo {
.add(Character.class, (char)0)
.add(Short.class, (short)0)
.add(Integer.class, 0)
- .add(Long.class, 0l)
+ .add(Long.class, 0L)
.add(Float.class, 0f)
.add(Double.class, 0d)
.add(Byte.class, (byte)0)
[juneau] 26/29: [juneau-marshall] Use {} only when creating certain arrays
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit abe64f3775ccd3ac8f14ebb5b62e1665036232a0
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:47:43 2023 -0400
[juneau-marshall] Use {} only when creating certain arrays
---
.../juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java | 2 +-
.../src/main/java/org/apache/juneau/html/HtmlDocSerializer.java | 2 +-
.../src/main/java/org/apache/juneau/internal/HttpUtils.java | 4 ++--
.../src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java | 2 +-
.../src/main/java/org/apache/juneau/xml/XmlSerializer.java | 2 +-
.../src/main/java/org/apache/juneau/xml/XmlSerializerSession.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index 13b6f6f84..3ae8e5cd6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -61,7 +61,7 @@ import org.apache.juneau.reflect.*;
*/
public class BeanMeta<T> {
- private static final BeanPropertyMeta[] EMPTY_PROPERTIES = new BeanPropertyMeta[0];
+ private static final BeanPropertyMeta[] EMPTY_PROPERTIES = {};
/** The target class type that this meta object describes. */
protected final ClassMeta<T> classMeta;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index 784f60642..8415e217e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -83,7 +83,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
// Static
//-------------------------------------------------------------------------------------------------------------------
- private static final String[] EMPTY_ARRAY = new String[0];
+ private static final String[] EMPTY_ARRAY = {};
/** Default serializer, all default settings. */
public static final HtmlDocSerializer DEFAULT = new HtmlDocSerializer(create());
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/HttpUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/HttpUtils.java
index e07bbe3f1..7c1720d6f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/HttpUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/HttpUtils.java
@@ -23,8 +23,8 @@ import java.lang.reflect.*;
public class HttpUtils {
private static final String[]
- LC_METHODS = new String[]{"get","put","post","delete","options","head","connect","trace","patch"},
- UC_METHODS = new String[]{"GET","PUT","POST","DELETE","OPTIONS","HEAD","CONNECT","TRACE","PATCH"};
+ LC_METHODS = {"get","put","post","delete","options","head","connect","trace","patch"},
+ UC_METHODS = {"GET","PUT","POST","DELETE","OPTIONS","HEAD","CONNECT","TRACE","PATCH"};
/**
* Given a method name, infers the REST method name.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java
index f725e3cfb..43e93624c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java
@@ -40,7 +40,7 @@ public final class MsgPackInputStream extends ParserInputStream {
int pos = 0;
// Data type quick-lookup table.
- private static final DataType[] TYPES = new DataType[] {
+ private static final DataType[] TYPES = {
/*0x0?*/ INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,
/*0x1?*/ INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,
/*0x2?*/ INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,INT,
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
index 43bd49c36..4646b4713 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
@@ -135,7 +135,7 @@ public class XmlSerializer extends WriterSerializer implements XmlMetaProvider {
// Static
//-------------------------------------------------------------------------------------------------------------------
- private static final Namespace[] EMPTY_NAMESPACE_ARRAY = new Namespace[0];
+ private static final Namespace[] EMPTY_NAMESPACE_ARRAY = {};
/** Default serializer without namespaces. */
public static final XmlSerializer DEFAULT = new XmlSerializer(create());
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index 44b3baaf9..f4e1d3d61 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -214,7 +214,7 @@ public class XmlSerializerSession extends WriterSerializerSession {
private final XmlSerializer ctx;
private Namespace
defaultNamespace;
- private Namespace[] namespaces = new Namespace[0];
+ private Namespace[] namespaces = {};
/**
* Constructor.
[juneau] 06/29: [juneau-marshall] Use lambdas
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 4ed9c577c14f3e6b3e268b1fd9c6b23d9b8da442
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 22:49:07 2023 -0400
[juneau-marshall] Use lambdas
---
.../main/java/org/apache/juneau/MediaRanges.java | 24 +++++------
.../main/java/org/apache/juneau/StringRanges.java | 24 +++++------
.../org/apache/juneau/collections/JsonList.java | 48 ++++++++++------------
.../org/apache/juneau/reflect/AnnotationList.java | 7 +---
4 files changed, 42 insertions(+), 61 deletions(-)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRanges.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRanges.java
index cdd2f2491..afe9802bd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRanges.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRanges.java
@@ -116,20 +116,16 @@ public class MediaRanges {
* <c>MediaRanges</c> with the same types but with extensions are promoted over those same types with no
* extensions.
*/
- private static final Comparator<MediaRange> RANGE_COMPARATOR = new Comparator<>() {
- @Override
- public int compare(MediaRange o1, MediaRange o2) {
- // Compare q-values.
- int qCompare = Float.compare(o2.getQValue(), o1.getQValue());
- if (qCompare != 0)
- return qCompare;
-
- // Compare media-types.
- // Note that '*' comes alphabetically before letters, so just do a reverse-alphabetical comparison.
- int i = o2.toString().compareTo(o1.toString());
- return i;
- }
- };
+ private static final Comparator<MediaRange> RANGE_COMPARATOR = (o1, o2) -> {
+ // Compare q-values.
+ int qCompare = Float.compare(o2.getQValue(), o1.getQValue());
+ if (qCompare != 0)
+ return qCompare;
+
+ // Compare media-types.
+ // Note that '*' comes alphabetically before letters, so just do a reverse-alphabetical comparison.
+ return o2.toString().compareTo(o1.toString());
+ };
/**
* Given a list of media types, returns the best match for this <c>Accept</c> header.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRanges.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRanges.java
index d9e02b44a..e91de42e1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRanges.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRanges.java
@@ -139,20 +139,16 @@ public class StringRanges {
* Should those values be equal, the <c>type</c> is then lexicographically compared (case-insensitive) in
* ascending order, with the <js>"*"</js> type demoted last in that order.
*/
- private static final Comparator<StringRange> RANGE_COMPARATOR = new Comparator<>() {
- @Override
- public int compare(StringRange o1, StringRange o2) {
- // Compare q-values.
- int qCompare = Float.compare(o2.getQValue(), o1.getQValue());
- if (qCompare != 0)
- return qCompare;
-
- // Compare media-types.
- // Note that '*' comes alphabetically before letters, so just do a reverse-alphabetical comparison.
- int i = o2.toString().compareTo(o1.toString());
- return i;
- }
- };
+ private static final Comparator<StringRange> RANGE_COMPARATOR = (o1, o2) -> {
+ // Compare q-values.
+ int qCompare = Float.compare(o2.getQValue(), o1.getQValue());
+ if (qCompare != 0)
+ return qCompare;
+
+ // Compare media-types.
+ // Note that '*' comes alphabetically before letters, so just do a reverse-alphabetical comparison.
+ return o2.toString().compareTo(o1.toString());
+ };
/**
* Given a list of media types, returns the best match for this string range header.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
index 9e748f411..077cf55fd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
@@ -882,33 +882,27 @@ public class JsonList extends LinkedList<Object> {
* @param childType The child object type.
* @return A new <c>Iterable</c> object over this list.
*/
- public <E> Iterable<E> elements(final Class<E> childType) {
- final Iterator<?> i = iterator();
- return new Iterable<>() {
-
- @Override /* Iterable */
- public Iterator<E> iterator() {
- return new Iterator<>() {
-
- @Override /* Iterator */
- public boolean hasNext() {
- return i.hasNext();
- }
-
- @Override /* Iterator */
- public E next() {
- return bs().convertToType(i.next(), childType);
- }
-
- @Override /* Iterator */
- public void remove() {
- i.remove();
- }
-
- };
- }
- };
- }
+ public <E> Iterable<E> elements(final Class<E> childType) {
+ final Iterator<?> iterator = iterator();
+ return () -> new Iterator<>() {
+
+ @Override /* Iterator */
+ public boolean hasNext() {
+ return iterator.hasNext();
+ }
+
+ @Override /* Iterator */
+ public E next() {
+ return bs().convertToType(iterator.next(), childType);
+ }
+
+ @Override /* Iterator */
+ public void remove() {
+ iterator.remove();
+ }
+
+ };
+ }
/**
* Returns the {@link ClassMeta} of the class of the object at the specified index.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationList.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationList.java
index 376c18910..fafda0aae 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationList.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationList.java
@@ -29,12 +29,7 @@ import java.util.function.*;
public final class AnnotationList extends ArrayList<AnnotationInfo<?>> {
private static final long serialVersionUID = 1L;
- private static final Comparator<AnnotationInfo<?>> RANK_COMPARATOR = new Comparator<>() {
- @Override
- public int compare(AnnotationInfo<?> o1, AnnotationInfo<?> o2) {
- return o1.rank - o2.rank;
- }
- };
+ private static final Comparator<AnnotationInfo<?>> RANK_COMPARATOR = (o1, o2) -> o1.rank - o2.rank;
/**
* Sort the annotations in this list based on rank.
[juneau] 20/29: [juneau-common] Remove redundant modifiers
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 6ad92149bb4799ae845cb2d0eeb04e606d75650d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:36:07 2023 -0400
[juneau-common] Remove redundant modifiers
---
.../java/org/apache/juneau/common/internal/IOUtils.java | 8 ++++----
.../org/apache/juneau/common/internal/StringUtils.java | 16 ++++++++--------
.../apache/juneau/common/internal/ThrowableUtils.java | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/IOUtils.java b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/IOUtils.java
index d401af181..9c935a3eb 100644
--- a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/IOUtils.java
+++ b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/IOUtils.java
@@ -393,7 +393,7 @@ public final class IOUtils {
* @return The number of bytes written.
* @throws IOException If thrown from output stream.
*/
- public static final long pipe(byte[] in, OutputStream out, int maxBytes) throws IOException {
+ public static long pipe(byte[] in, OutputStream out, int maxBytes) throws IOException {
if (in == null || out == null)
return 0;
int length = (maxBytes < 0 || maxBytes > in.length ) ? in.length : maxBytes;
@@ -938,7 +938,7 @@ public final class IOUtils {
return null;
}
- private static final byte[] byteBuffer(int maxBytes) {
+ private static byte[] byteBuffer(int maxBytes) {
if (BYTE_BUFFER_CACHE != null) {
byte[] x = BYTE_BUFFER_CACHE.get();
if (x == null) {
@@ -953,7 +953,7 @@ public final class IOUtils {
return new byte[buffSize(maxBytes)];
}
- private static final char[] charBuffer(int maxChars) {
+ private static char[] charBuffer(int maxChars) {
if (CHAR_BUFFER_CACHE != null) {
char[] x = CHAR_BUFFER_CACHE.get();
if (x == null) {
@@ -968,7 +968,7 @@ public final class IOUtils {
return new char[buffSize(maxChars)];
}
- private static final int buffSize(long max) {
+ private static int buffSize(long max) {
return (max > 0 && max < BUFF_SIZE) ? (int)max : BUFF_SIZE;
}
}
diff --git a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
index d31e425cf..21ceaf9dc 100644
--- a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
+++ b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
@@ -1073,7 +1073,7 @@ public final class StringUtils {
* @param num The number to convert to hex.
* @return A <code><jk>char</jk>[2]</code> containing the specified characters.
*/
- public static final char[] toHex2(int num) {
+ public static char[] toHex2(int num) {
if (num < 0 || num > 255)
throw new NumberFormatException("toHex2 can only be used on numbers between 0 and 255");
char[] n = new char[2];
@@ -1092,7 +1092,7 @@ public final class StringUtils {
* @param b The number to convert to hex.
* @return A <code><jk>char</jk>[2]</code> containing the specified characters.
*/
- public static final String toHex(byte b) {
+ public static String toHex(byte b) {
char[] c = new char[2];
int v = b & 0xFF;
c[0] = hexArray[v >>> 4];
@@ -1106,7 +1106,7 @@ public final class StringUtils {
* @param b The number to convert to hex.
* @return A <code><jk>char</jk>[2]</code> containing the specified characters.
*/
- public static final String toReadableBytes(byte[] b) {
+ public static String toReadableBytes(byte[] b) {
StringBuilder sb = new StringBuilder();
for (byte b2 : b)
sb.append((b2 < ' ' || b2 > 'z') ? String.format("[%02X]", b2) : (char)b2 + " ");
@@ -1122,7 +1122,7 @@ public final class StringUtils {
* @param num The number to convert to hex.
* @return A <code><jk>char</jk>[4]</code> containing the specified characters.
*/
- public static final char[] toHex4(int num) {
+ public static char[] toHex4(int num) {
char[] n = new char[4];
int a = num%16;
n[3] = (char)(a > 9 ? 'A'+a-10 : '0'+a);
@@ -1141,7 +1141,7 @@ public final class StringUtils {
* @param num The number to convert to hex.
* @return A <code><jk>char</jk>[8]</code> containing the specified characters.
*/
- public static final char[] toHex8(long num) {
+ public static char[] toHex8(long num) {
char[] n = new char[8];
long a = num%16;
n[7] = (char)(a > 9 ? 'A'+a-10 : '0'+a);
@@ -2789,7 +2789,7 @@ public final class StringUtils {
* @return The input stream converted to GZip.
* @throws Exception Exception occurred.
*/
- public static final byte[] compress(String contents) throws Exception {
+ public static byte[] compress(String contents) throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream(contents.length()>>1);
try (GZIPOutputStream gos = new GZIPOutputStream(baos)) {
gos.write(contents.getBytes());
@@ -2806,7 +2806,7 @@ public final class StringUtils {
* @return The string.
* @throws Exception Exception occurred.
*/
- public static final String decompress(byte[] is) throws Exception {
+ public static String decompress(byte[] is) throws Exception {
return read(new GZIPInputStream(new ByteArrayInputStream(is)));
}
@@ -2816,7 +2816,7 @@ public final class StringUtils {
* @param o The object to convert.
* @return The specified object as a comma-delimited list.
*/
- public static final String cdl(Object o) {
+ public static String cdl(Object o) {
if (o == null)
return null;
if (o.getClass().isArray()) {
diff --git a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/ThrowableUtils.java b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/ThrowableUtils.java
index f6264fc64..9830be34a 100644
--- a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/ThrowableUtils.java
+++ b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/ThrowableUtils.java
@@ -88,7 +88,7 @@ public class ThrowableUtils {
@SuppressWarnings("javadoc")
@FunctionalInterface
public interface SupplierWithThrowable<T> {
- public T get() throws Throwable;
+ T get() throws Throwable;
}
/**