From b9221656ccb079636b4e4ad1415d5b69b8f15b92 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 14 Jun 2023 22:27:07 +0200 Subject: [PATCH] Declare ClassLoader for DeserializingConverter constructor as nullable Closes gh-30670 --- .../core/serializer/DefaultDeserializer.java | 3 ++- .../core/serializer/support/DeserializingConverter.java | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java b/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java index ddc87f3133..07bf246b05 100644 --- a/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java +++ b/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,6 +50,7 @@ public class DefaultDeserializer implements Deserializer { /** * Create a {@code DefaultDeserializer} for using an {@link ObjectInputStream} * with the given {@code ClassLoader}. + * @param classLoader the ClassLoader to use * @since 4.2.1 * @see ConfigurableObjectInputStream#ConfigurableObjectInputStream(InputStream, ClassLoader) */ diff --git a/spring-core/src/main/java/org/springframework/core/serializer/support/DeserializingConverter.java b/spring-core/src/main/java/org/springframework/core/serializer/support/DeserializingConverter.java index 7412907159..782ddc901b 100644 --- a/spring-core/src/main/java/org/springframework/core/serializer/support/DeserializingConverter.java +++ b/spring-core/src/main/java/org/springframework/core/serializer/support/DeserializingConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,7 @@ import java.io.ByteArrayInputStream; import org.springframework.core.convert.converter.Converter; import org.springframework.core.serializer.DefaultDeserializer; import org.springframework.core.serializer.Deserializer; +import org.springframework.lang.Nullable; import org.springframework.util.Assert; /** @@ -50,10 +51,11 @@ public class DeserializingConverter implements Converter { /** * Create a {@code DeserializingConverter} for using an {@link java.io.ObjectInputStream} * with the given {@code ClassLoader}. + * @param classLoader the ClassLoader to use * @since 4.2.1 * @see DefaultDeserializer#DefaultDeserializer(ClassLoader) */ - public DeserializingConverter(ClassLoader classLoader) { + public DeserializingConverter(@Nullable ClassLoader classLoader) { this.deserializer = new DefaultDeserializer(classLoader); }