From 5ad157efae259006c60dcb192cabba8cba0ae488 Mon Sep 17 00:00:00 2001 From: Anton Pinsky Date: Tue, 13 Feb 2024 01:48:39 +0100 Subject: [PATCH] [#617] First corrections after review Signed-off-by: Anton Pinsky --- .../internal/AnnotationIntrospector.java | 3 +-- .../eclipse/yasson/internal/JsonBinding.java | 23 +++++++++---------- .../yasson/adapters/model/NumberAdapter.java | 6 ++--- .../serializers/model/NumberDeserializer.java | 6 ++--- .../serializers/model/NumberSerializer.java | 6 ++--- 5 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/eclipse/yasson/internal/AnnotationIntrospector.java b/src/main/java/org/eclipse/yasson/internal/AnnotationIntrospector.java index 4111ed73..2d61af4f 100644 --- a/src/main/java/org/eclipse/yasson/internal/AnnotationIntrospector.java +++ b/src/main/java/org/eclipse/yasson/internal/AnnotationIntrospector.java @@ -241,8 +241,7 @@ JsonbCreator createJsonbCreator(Executable executable, JsonbCreator existing, Cl expectedClass.ifPresent(clazz -> { if (!ReflectionUtils.getRawType(adapterBinding.getBindingType()).isAssignableFrom(clazz)) { throw new JsonbException(Messages.getMessage(MessageKeys.ADAPTER_INCOMPATIBLE, - adapterBinding.getBindingType(), - clazz)); + adapterBinding.getBindingType(), clazz)); } }); return adapterBinding; diff --git a/src/main/java/org/eclipse/yasson/internal/JsonBinding.java b/src/main/java/org/eclipse/yasson/internal/JsonBinding.java index f8bb3385..c28980e6 100644 --- a/src/main/java/org/eclipse/yasson/internal/JsonBinding.java +++ b/src/main/java/org/eclipse/yasson/internal/JsonBinding.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -import java.util.function.Supplier; import jakarta.json.JsonStructure; import jakarta.json.bind.JsonbConfig; @@ -54,51 +53,51 @@ public class JsonBinding implements YassonJsonb { } } - private T deserialize(final Type type, final Supplier parserSupplier) { - Objects.requireNonNull(parserSupplier); - try (JsonParser parser = parserSupplier.get()) { + private T deserialize(final Type type, final JsonParser parser) { + Objects.requireNonNull(parser); + try (parser) { return new DeserializationContextImpl(jsonbContext).deserialize(type, parser); } } @Override public T fromJson(String str, Class type) throws JsonbException { - return deserialize(type, () -> jsonbContext.getJsonProvider().createParser(new StringReader(str))); + return deserialize(type, jsonbContext.getJsonProvider().createParser(new StringReader(str))); } @Override public T fromJson(String str, Type type) throws JsonbException { - return deserialize(type, () -> jsonbContext.getJsonProvider().createParser(new StringReader(str))); + return deserialize(type, jsonbContext.getJsonProvider().createParser(new StringReader(str))); } @Override public T fromJson(Reader reader, Class type) throws JsonbException { - return deserialize(type, () -> jsonbContext.getJsonProvider().createParser(reader)); + return deserialize(type, jsonbContext.getJsonProvider().createParser(reader)); } @Override public T fromJson(Reader reader, Type type) throws JsonbException { - return deserialize(type, () -> jsonbContext.getJsonProvider().createParser(reader)); + return deserialize(type, jsonbContext.getJsonProvider().createParser(reader)); } @Override public T fromJson(InputStream stream, Class clazz) throws JsonbException { - return deserialize(clazz, () -> inputStreamParser(stream)); + return deserialize(clazz, inputStreamParser(stream)); } @Override public T fromJson(InputStream stream, Type type) throws JsonbException { - return deserialize(type, () -> inputStreamParser(stream)); + return deserialize(type, inputStreamParser(stream)); } @Override public T fromJsonStructure(JsonStructure jsonStructure, Class type) throws JsonbException { - return deserialize(type, () -> new JsonStructureToParserAdapter(jsonStructure, jsonbContext.getJsonProvider())); + return deserialize(type, new JsonStructureToParserAdapter(jsonStructure, jsonbContext.getJsonProvider())); } @Override public T fromJsonStructure(JsonStructure jsonStructure, Type runtimeType) throws JsonbException { - return deserialize(runtimeType, () -> new JsonStructureToParserAdapter(jsonStructure, jsonbContext.getJsonProvider())); + return deserialize(runtimeType, new JsonStructureToParserAdapter(jsonStructure, jsonbContext.getJsonProvider())); } private JsonParser inputStreamParser(InputStream stream) { diff --git a/src/test/java/org/eclipse/yasson/adapters/model/NumberAdapter.java b/src/test/java/org/eclipse/yasson/adapters/model/NumberAdapter.java index 111d52e4..27333689 100644 --- a/src/test/java/org/eclipse/yasson/adapters/model/NumberAdapter.java +++ b/src/test/java/org/eclipse/yasson/adapters/model/NumberAdapter.java @@ -18,14 +18,14 @@ public class NumberAdapter implements JsonbAdapter { - private final static Counter counter = new Counter(); + private final static Counter COUNTER = new Counter(); public static Counter getCounter() { - return counter; + return COUNTER; } { - counter.add(); + COUNTER.add(); } @Override diff --git a/src/test/java/org/eclipse/yasson/serializers/model/NumberDeserializer.java b/src/test/java/org/eclipse/yasson/serializers/model/NumberDeserializer.java index 94d5eddb..7749da9a 100644 --- a/src/test/java/org/eclipse/yasson/serializers/model/NumberDeserializer.java +++ b/src/test/java/org/eclipse/yasson/serializers/model/NumberDeserializer.java @@ -19,14 +19,14 @@ public class NumberDeserializer implements JsonbDeserializer { - private final static Counter counter = new Counter(); + private final static Counter COUNTER = new Counter(); public static Counter getCounter() { - return counter; + return COUNTER; } { - counter.add(); + COUNTER.add(); } @Override diff --git a/src/test/java/org/eclipse/yasson/serializers/model/NumberSerializer.java b/src/test/java/org/eclipse/yasson/serializers/model/NumberSerializer.java index 1957b22d..37a37ba1 100644 --- a/src/test/java/org/eclipse/yasson/serializers/model/NumberSerializer.java +++ b/src/test/java/org/eclipse/yasson/serializers/model/NumberSerializer.java @@ -18,14 +18,14 @@ public class NumberSerializer implements JsonbSerializer { - private final static Counter counter = new Counter(); + private final static Counter COUNTER = new Counter(); public static Counter getCounter() { - return counter; + return COUNTER; } { - counter.add(); + COUNTER.add(); } @Override