You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by jl...@apache.org on 2023/01/11 12:35:19 UTC
[johnzon] 01/01: Merge pull request #97 from apache/javax-to-jakarta
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 9f85ab847905b8057575f5d2759cec601932d774
Merge: b25243b2 00c1654f
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Wed Jan 11 13:35:12 2023 +0100
Merge pull request #97 from apache/javax-to-jakarta
JOHNZON-391 JOHNZON-392 JSON-P 2.1.1 and JSON-B 3.0.0 (jakarta namespace)
.github/workflows/maven.yml | 2 +-
johnzon-core/pom.xml | 4 +-
.../johnzon/core/DefaultJsonPointerFactory.java | 4 +-
.../java/org/apache/johnzon/core/DiffBase.java | 6 +-
.../org/apache/johnzon/core/JohnzonJsonParser.java | 10 +-
.../apache/johnzon/core/JohnzonJsonParserImpl.java | 6 +-
.../apache/johnzon/core/JsonArrayBuilderImpl.java | 10 +-
.../org/apache/johnzon/core/JsonArrayImpl.java | 12 +--
.../johnzon/core/JsonBuilderFactoryImpl.java | 10 +-
.../java/org/apache/johnzon/core/JsonChars.java | 2 +-
.../org/apache/johnzon/core/JsonDoubleImpl.java | 2 +-
.../johnzon/core/JsonGeneratorFactoryImpl.java | 4 +-
.../org/apache/johnzon/core/JsonGeneratorImpl.java | 16 ++--
.../apache/johnzon/core/JsonInMemoryParser.java | 14 +--
.../org/apache/johnzon/core/JsonLocationImpl.java | 2 +-
.../java/org/apache/johnzon/core/JsonLongImpl.java | 2 +-
.../apache/johnzon/core/JsonMergePatchDiff.java | 8 +-
.../apache/johnzon/core/JsonMergePatchImpl.java | 8 +-
.../org/apache/johnzon/core/JsonNumberImpl.java | 2 +-
.../apache/johnzon/core/JsonObjectBuilderImpl.java | 10 +-
.../org/apache/johnzon/core/JsonObjectImpl.java | 12 +--
.../apache/johnzon/core/JsonParserFactoryImpl.java | 8 +-
.../apache/johnzon/core/JsonPatchBuilderImpl.java | 12 +--
.../org/apache/johnzon/core/JsonPatchDiff.java | 14 +--
.../org/apache/johnzon/core/JsonPatchImpl.java | 20 ++--
.../org/apache/johnzon/core/JsonPointerImpl.java | 18 ++--
.../org/apache/johnzon/core/JsonProviderImpl.java | 48 +++++-----
.../apache/johnzon/core/JsonReaderFactoryImpl.java | 6 +-
.../org/apache/johnzon/core/JsonReaderImpl.java | 20 ++--
.../apache/johnzon/core/JsonStreamParserImpl.java | 6 +-
.../org/apache/johnzon/core/JsonStringImpl.java | 2 +-
.../apache/johnzon/core/JsonWriterFactoryImpl.java | 6 +-
.../org/apache/johnzon/core/JsonWriterImpl.java | 12 +--
.../core/RFC4627AwareInputStreamReader.java | 2 +-
.../johnzon/core/RejectDuplicateKeysMode.java | 4 +-
.../org/apache/johnzon/core/SerializableValue.java | 6 +-
.../main/java/org/apache/johnzon/core/Snippet.java | 12 +--
.../main/java/org/apache/johnzon/core/Strings.java | 2 +-
.../johnzon/core/io/BoundedOutputStreamWriter.java | 2 +-
.../johnzon/core/spi/JsonPointerFactory.java | 4 +-
....JsonProvider => jakarta.json.spi.JsonProvider} | 0
.../org/apache/johnzon/core/BrokenDefaultTest.java | 6 +-
.../johnzon/core/BufferStrategyFactoryTest.java | 4 +-
.../johnzon/core/JsonArrayBuilderImplTest.java | 10 +-
.../org/apache/johnzon/core/JsonArrayImplTest.java | 6 +-
.../johnzon/core/JsonBuilderFactoryTest.java | 6 +-
.../org/apache/johnzon/core/JsonCollectorTest.java | 12 +--
.../johnzon/core/JsonGeneratorFactoryImplTest.java | 2 +-
.../apache/johnzon/core/JsonGeneratorImplTest.java | 14 +--
.../johnzon/core/JsonMergeBatchDiffTest.java | 6 +-
.../apache/johnzon/core/JsonMergeBatchTest.java | 12 +--
.../org/apache/johnzon/core/JsonNumberTest.java | 6 +-
.../johnzon/core/JsonObjectBuilderImplTest.java | 10 +-
.../apache/johnzon/core/JsonObjectImplTest.java | 10 +-
.../johnzon/core/JsonParserStreamingTest.java | 10 +-
.../org/apache/johnzon/core/JsonParserTest.java | 22 ++---
.../apache/johnzon/core/JsonPatchBuilderTest.java | 14 +--
.../org/apache/johnzon/core/JsonPatchDiffTest.java | 16 ++--
.../org/apache/johnzon/core/JsonPatchTest.java | 18 ++--
.../org/apache/johnzon/core/JsonPointerTest.java | 20 ++--
.../org/apache/johnzon/core/JsonProviderTest.java | 6 +-
.../apache/johnzon/core/JsonReaderImplTest.java | 22 ++---
.../johnzon/core/JsonStreamParserImplTest.java | 2 +-
.../apache/johnzon/core/JsonWriterImplTest.java | 10 +-
.../java/org/apache/johnzon/core/LocationTest.java | 10 +-
.../java/org/apache/johnzon/core/OverflowTest.java | 12 +--
.../org/apache/johnzon/core/SerializationTest.java | 10 +-
.../java/org/apache/johnzon/core/SnippetTest.java | 12 +--
johnzon-distribution/pom.xml | 20 ++--
johnzon-distribution/src/assembly/bin.xml | 2 +-
johnzon-jaxrs/pom.xml | 8 +-
.../johnzon/jaxrs/ConfigurableJohnzonProvider.java | 16 ++--
.../org/apache/johnzon/jaxrs/DelegateProvider.java | 10 +-
.../johnzon/jaxrs/JohnzonMessageBodyReader.java | 12 +--
.../johnzon/jaxrs/JohnzonMessageBodyWriter.java | 14 +--
.../org/apache/johnzon/jaxrs/JohnzonProvider.java | 6 +-
.../apache/johnzon/jaxrs/JsrMessageBodyReader.java | 18 ++--
.../apache/johnzon/jaxrs/JsrMessageBodyWriter.java | 18 ++--
.../java/org/apache/johnzon/jaxrs/JsrProvider.java | 12 +--
.../jaxrs/NoContentExceptionHandlerReader.java | 10 +-
.../jaxrs/WadlDocumentMessageBodyWriter.java | 10 +-
.../jaxrs/WildcardConfigurableJohnzonProvider.java | 16 ++--
.../johnzon/jaxrs/WildcardJohnzonProvider.java | 6 +-
.../apache/johnzon/jaxrs/WildcardJsrProvider.java | 6 +-
.../johnzon/jaxrs/xml/WadlDocumentToJson.java | 8 +-
.../jaxrs/ConfigurableJohnzonProviderTest.java | 10 +-
.../apache/johnzon/jaxrs/JohnzonProviderTest.java | 24 ++---
.../org/apache/johnzon/jaxrs/JsrProviderTest.java | 16 ++--
johnzon-json-extras/pom.xml | 6 +-
.../jsonb/extras/polymorphism/Polymorphic.java | 14 +--
.../jsonb/extras/polymorphism/PolymorphicTest.java | 12 +--
johnzon-jsonb/pom.xml | 66 +++++++++----
.../jaxrs/jsonb/jaxrs/JsonbJaxrsProvider.java | 38 ++++----
.../jsonb/DefaultPropertyVisibilityStrategy.java | 8 +-
.../org/apache/johnzon/jsonb/JohnzonBuilder.java | 32 +++----
.../org/apache/johnzon/jsonb/JohnzonJsonb.java | 18 ++--
.../org/apache/johnzon/jsonb/JohnzonProvider.java | 4 +-
.../johnzon/jsonb/JsonValueParserAdapter.java | 12 +--
.../org/apache/johnzon/jsonb/JsonbAccessMode.java | 44 ++++-----
.../jsonb/PropertyNamingStrategyFactory.java | 2 +-
.../johnzon/jsonb/adapter/JsonbEnumAdapter.java | 2 +-
.../jsonb/api/experimental/JsonbExtension.java | 6 +-
.../java/org/apache/johnzon/jsonb/cdi/CDIs.java | 2 +-
.../johnzon/jsonb/cdi/JohnzonCdiExtension.java | 8 +-
.../jsonb/converter/JohnzonJsonbAdapter.java | 4 +-
.../jsonb/converter/JsonbDateConverter.java | 2 +-
.../jsonb/converter/JsonbDateConverterBase.java | 2 +-
.../jsonb/converter/JsonbLocalDateConverter.java | 2 +-
.../converter/JsonbLocalDateTimeConverter.java | 2 +-
.../jsonb/converter/JsonbNumberConverter.java | 2 +-
.../converter/JsonbOffsetDateTimeConverter.java | 2 +-
.../converter/JsonbZonedDateTimeConverter.java | 2 +-
.../johnzon/jsonb/extension/JsonValueReader.java | 2 +-
.../johnzon/jsonb/extension/JsonValueWriter.java | 10 +-
.../jsonb/factory/CdiJohnzonAdapterFactory.java | 6 +-
.../serializer/JohnzonDeserializationContext.java | 16 ++--
.../serializer/JohnzonSerializationContext.java | 4 +-
...ion => jakarta.enterprise.inject.spi.Extension} | 0
...rovider => jakarta.json.bind.spi.JsonbProvider} | 0
.../apache/johnzon/RecursivePolymorphismTest.java | 28 +++---
.../jaxrs/jsonb/jaxrs/JsonbJaxrsProviderTest.java | 12 +--
.../java/org/apache/johnzon/jsonb/AdapterTest.java | 16 ++--
.../apache/johnzon/jsonb/AnnotationOrderTest.java | 8 +-
.../org/apache/johnzon/jsonb/CdiAdapterTest.java | 14 +--
.../apache/johnzon/jsonb/ClassConverterTest.java | 24 ++---
.../johnzon/jsonb/ConstructorVisibilityTest.java | 12 +--
.../johnzon/jsonb/CustomParameterizedTypeTest.java | 2 +-
.../org/apache/johnzon/jsonb/DateFormatTest.java | 8 +-
.../apache/johnzon/jsonb/DefaultMappingTest.java | 18 ++--
.../DefaultPropertyVisibilityStrategyTest.java | 10 +-
.../DeserializationExceptionMessagesTest.java | 6 +-
.../johnzon/jsonb/DynamicBufferResizingTest.java | 16 ++--
.../apache/johnzon/jsonb/EnumConverterTest.java | 2 +-
.../org/apache/johnzon/jsonb/ExceptionAsserts.java | 6 +-
.../johnzon/jsonb/FailOnUnknownPropertiesTest.java | 8 +-
.../apache/johnzon/jsonb/GenericAdapterTest.java | 10 +-
.../java/org/apache/johnzon/jsonb/IJsonTest.java | 8 +-
.../apache/johnzon/jsonb/InterfaceMappingTest.java | 6 +-
.../johnzon/jsonb/JohnzonConverterInJsonbTest.java | 8 +-
.../johnzon/jsonb/JohnzonIgnoreNestedTest.java | 4 +-
.../org/apache/johnzon/jsonb/JohnzonJsonbTest.java | 10 +-
.../apache/johnzon/jsonb/JohnzonProviderTest.java | 2 +-
.../johnzon/jsonb/JsonbAdapterExceptionsTest.java | 12 +--
.../org/apache/johnzon/jsonb/JsonbAdapterTest.java | 2 +-
.../jsonb/JsonbBeanConstructorExceptionsTest.java | 2 +-
.../jsonb/JsonbBeanSetterUserExceptionsTest.java | 2 +-
.../johnzon/jsonb/JsonbCreatorExceptionsTest.java | 6 +-
.../apache/johnzon/jsonb/JsonbJsonValueTest.java | 8 +-
.../org/apache/johnzon/jsonb/JsonbReadTest.java | 16 ++--
.../org/apache/johnzon/jsonb/JsonbRecordTest.java | 2 +-
.../jsonb/JsonbSerializerExceptionsTest.java | 24 ++---
.../apache/johnzon/jsonb/JsonbTransientTest.java | 10 +-
.../org/apache/johnzon/jsonb/JsonbTypesTest.java | 6 +-
.../apache/johnzon/jsonb/JsonbVisitilityTest.java | 10 +-
.../org/apache/johnzon/jsonb/JsonbWriteTest.java | 18 ++--
.../java/org/apache/johnzon/jsonb/NamingTest.java | 4 +-
.../org/apache/johnzon/jsonb/NillableTest.java | 6 +-
.../johnzon/jsonb/ObjectSerializationTest.java | 4 +-
.../java/org/apache/johnzon/jsonb/OrderTest.java | 2 +-
.../johnzon/jsonb/OverrideDefaultAdaptersTest.java | 10 +-
.../johnzon/jsonb/ParserGeneratorMappingTest.java | 6 +-
.../johnzon/jsonb/PolymorphicConfigTest.java | 8 +-
.../jsonb/PropertyNamingStrategyFactoryTest.java | 2 +-
.../org/apache/johnzon/jsonb/SerializerTest.java | 26 +++---
.../apache/johnzon/jsonb/SerializersMapTest.java | 16 ++--
.../SerializersObjectWithEmbeddedListTest.java | 8 +-
.../johnzon/jsonb/SerializersRoundTripTest.java | 28 +++---
.../apache/johnzon/jsonb/SnippetMaxLengthTest.java | 8 +-
.../jsonb/api/experimental/JsonbExtensionTest.java | 28 +++---
.../apache/johnzon/jsonb/jaxrs/JsonbJaxRsTest.java | 22 ++---
.../apache/johnzon/jsonb/model/NillableType.java | 2 +-
.../model/nillable/NotNillablePropertyModel.java | 2 +-
.../model/nillable/notnillable/package-info.java | 2 +-
.../johnzon/jsonb/model/nillable/package-info.java | 2 +-
.../model/packageformat/FormatFromClassModel.java | 2 +-
.../model/packageformat/FormatOnClassModel.java | 2 +-
.../jsonb/model/packageformat/package-info.java | 4 +-
.../serializer/DeserializationContextTest.java | 12 +--
.../org/apache/johnzon/jsonb/test/JsonbRule.java | 16 ++--
johnzon-jsonlogic/pom.xml | 2 +-
.../apache/johnzon/jsonlogic/JohnzonJsonLogic.java | 26 +++---
.../johnzon/jsonlogic/spi/AsyncOperator.java | 2 +-
.../org/apache/johnzon/jsonlogic/spi/Operator.java | 2 +-
.../johnzon/jsonlogic/JohnzonJsonLogicTest.java | 10 +-
johnzon-jsonp-strict/pom.xml | 2 +-
.../jsonp/strict/StrictJsonPointerFactory.java | 4 +-
.../jsonp/strict/StrictJsonPointerFactoryTest.java | 10 +-
johnzon-jsonschema/pom.xml | 8 +-
.../johnzon/jsonschema/JsonSchemaValidator.java | 2 +-
.../jsonschema/JsonSchemaValidatorFactory.java | 4 +-
.../jsonschema/generator/PojoGenerator.java | 8 +-
.../johnzon/jsonschema/generator/Schema.java | 8 +-
.../jsonschema/generator/SchemaProcessor.java | 21 +++--
.../johnzon/jsonschema/spi/ValidationContext.java | 4 +-
.../jsonschema/spi/ValidationExtension.java | 2 +-
.../spi/builtin/BaseNumberValidation.java | 4 +-
.../jsonschema/spi/builtin/BaseValidation.java | 10 +-
.../jsonschema/spi/builtin/ContainsValidation.java | 4 +-
.../jsonschema/spi/builtin/EnumValidation.java | 2 +-
.../spi/builtin/ExclusiveMaximumValidation.java | 4 +-
.../spi/builtin/ExclusiveMinimumValidation.java | 4 +-
.../jsonschema/spi/builtin/IntegerValidation.java | 6 +-
.../jsonschema/spi/builtin/ItemsValidation.java | 4 +-
.../jsonschema/spi/builtin/MaxItemsValidation.java | 6 +-
.../spi/builtin/MaxLengthValidation.java | 6 +-
.../spi/builtin/MaxPropertiesValidation.java | 6 +-
.../jsonschema/spi/builtin/MaximumValidation.java | 4 +-
.../jsonschema/spi/builtin/MinItemsValidation.java | 6 +-
.../spi/builtin/MinLengthValidation.java | 6 +-
.../spi/builtin/MinPropertiesValidation.java | 6 +-
.../jsonschema/spi/builtin/MinimumValidation.java | 4 +-
.../spi/builtin/MultipleOfValidation.java | 4 +-
.../jsonschema/spi/builtin/PatternValidation.java | 4 +-
.../jsonschema/spi/builtin/RequiredValidation.java | 6 +-
.../jsonschema/spi/builtin/TypeValidation.java | 6 +-
.../spi/builtin/UniqueItemsValidation.java | 4 +-
.../jsonschema/JsonSchemaValidatorTest.java | 4 +-
.../jsonschema/generator/PojoGeneratorTest.java | 8 +-
.../jsonschema/spi/builtin/EnumValidationTest.java | 4 +-
johnzon-mapper/pom.xml | 19 +++-
.../johnzon/mapper/DynamicMappingGenerator.java | 4 +-
.../apache/johnzon/mapper/ExceptionMessages.java | 14 +--
.../johnzon/mapper/FactoryCreateException.java | 2 +-
.../org/apache/johnzon/mapper/JohnzonCores.java | 10 +-
.../apache/johnzon/mapper/JsonObjectGenerator.java | 10 +-
.../java/org/apache/johnzon/mapper/Mapper.java | 24 ++---
.../org/apache/johnzon/mapper/MapperBuilder.java | 10 +-
.../org/apache/johnzon/mapper/MapperConfig.java | 4 +-
.../org/apache/johnzon/mapper/MapperException.java | 2 +-
.../apache/johnzon/mapper/MappingGenerator.java | 2 +-
.../johnzon/mapper/MappingGeneratorImpl.java | 4 +-
.../org/apache/johnzon/mapper/MappingParser.java | 2 +-
.../apache/johnzon/mapper/MappingParserImpl.java | 26 +++---
.../johnzon/mapper/MissingFactoryException.java | 2 +-
.../org/apache/johnzon/mapper/ObjectConverter.java | 2 +-
.../johnzon/mapper/SetterMappingException.java | 2 +-
.../org/apache/johnzon/mapper/SnippetFactory.java | 2 +-
.../johnzon/mapper/jsonp/RewindableJsonParser.java | 10 +-
.../johnzon/core/TestJsonGeneratorFactory.java | 2 +-
.../DeserializationExceptionMessagesTest.java | 4 +-
.../java/org/apache/johnzon/mapper/JPATest.java | 14 +--
.../johnzon/mapper/JsonpIntegrationTest.java | 12 +--
.../apache/johnzon/mapper/MapperConfigTest.java | 2 +-
.../java/org/apache/johnzon/mapper/MapperTest.java | 8 +-
.../org/apache/johnzon/mapper/NoWarningTest.java | 2 +-
.../mapper/ObjectConverterWithAnnotationTest.java | 2 +-
.../org/apache/johnzon/mapper/ObjectTypeTest.java | 2 +-
.../org/apache/johnzon/mapper/OverflowTest.java | 2 +-
johnzon-mapper/src/test/resources/JPATest.xml | 6 +-
johnzon-maven-plugin/pom.xml | 14 +--
.../johnzon/maven/plugin/ExampleToModelMojo.java | 16 ++--
.../johnzon/maven/plugin/JsonSchemaToPojoMojo.java | 8 +-
.../johnzon/maven/plugin/PojoToJsonSchemaMojo.java | 8 +-
.../src/test/resources/SomeValue.record.java | 2 +-
johnzon-osgi/pom.xml | 26 +++---
.../java/org/apache/johnzon/osgi/Activator.java | 6 +-
.../main/java/org/apache/johnzon/osgi/Config.java | 2 +-
.../johnzon/osgi/cdi/CdiExtensionFactory.java | 2 +-
.../johnzon/osgi/cdi/RegisterCdiExtension.java | 6 +-
.../org/apache/johnzon/osgi/cdi/package-info.java | 2 +-
.../java/org/apache/johnzon/osgi/package-info.java | 4 +-
johnzon-websocket/pom.xml | 23 ++++-
.../websocket/internal/TypeAwareDecoder.java | 10 +-
.../websocket/internal/jsr/FactoryLocator.java | 12 +--
.../johnzon/websocket/internal/jsr/JsrDecoder.java | 10 +-
.../johnzon/websocket/internal/jsr/JsrEncoder.java | 10 +-
.../websocket/internal/mapper/MapperLocator.java | 2 +-
.../internal/mapper/MapperLocatorDelegate.java | 6 +-
.../internal/servlet/IgnoreIfMissing.java | 4 +-
.../johnzon/websocket/jsonb/JsonbLocator.java | 2 +-
.../websocket/jsonb/JsonbLocatorDelegate.java | 10 +-
.../johnzon/websocket/jsonb/JsonbTextDecoder.java | 10 +-
.../johnzon/websocket/jsonb/JsonbTextEncoder.java | 10 +-
.../johnzon/websocket/jsr/JsrArrayDecoder.java | 4 +-
.../johnzon/websocket/jsr/JsrArrayEncoder.java | 4 +-
.../johnzon/websocket/jsr/JsrObjectDecoder.java | 6 +-
.../johnzon/websocket/jsr/JsrObjectEncoder.java | 4 +-
.../johnzon/websocket/jsr/JsrStructureDecoder.java | 6 +-
.../johnzon/websocket/jsr/JsrStructureEncoder.java | 4 +-
.../websocket/mapper/JohnzonTextDecoder.java | 14 +--
.../websocket/mapper/JohnzonTextEncoder.java | 6 +-
.../org/apache/johnzon/websocket/JsrCodecTest.java | 18 ++--
.../apache/johnzon/websocket/MapperCodecTest.java | 32 +++----
.../websocket/endpoint/ClientEndpointImpl.java | 4 +-
.../websocket/endpoint/JsrClientEndpointImpl.java | 6 +-
.../websocket/endpoint/JsrServerEndpointImpl.java | 14 +--
.../apache/johnzon/websocket/endpoint/Message.java | 2 +-
.../websocket/endpoint/ServerEndpointImpl.java | 8 +-
.../johnzon/websocket/endpoint/ServerReport.java | 12 +--
pom.xml | 103 ++++-----------------
src/site/markdown/index.md | 4 +-
291 files changed, 1340 insertions(+), 1348 deletions(-)