root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch '6.1.x' 

# Conflicts:
#	spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
This commit is contained in:
Juergen Hoeller 2024-03-16 23:24:51 +01:00
parent 10e8039de8 eb8b7c4331
commit 89d563097f
7 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
View File

@ -30,7 +30,6 @@ import java.util.stream.Stream;
import org.springframework.core.MethodParameter; import org.springframework.core.MethodParameter;
import org.springframework.core.ResolvableType; import org.springframework.core.ResolvableType;
import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
@ -751,7 +750,7 @@ public class TypeDescriptor implements Serializable {
private final Annotation[] annotations; private final Annotation[] annotations;
private AnnotatedElementAdapter(@NonNull Annotation[] annotations) { private AnnotatedElementAdapter(Annotation[] annotations) {
this.annotations = annotations; this.annotations = annotations;
} }

6
spring-core/src/main/java/org/springframework/core/metrics/jfr/FlightRecorderStartupStep.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -21,10 +21,10 @@ import java.util.function.Consumer;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.springframework.core.metrics.StartupStep; import org.springframework.core.metrics.StartupStep;
import org.springframework.lang.NonNull;
/** /**
* {@link StartupStep} implementation for the Java Flight Recorder. * {@link StartupStep} implementation for the Java Flight Recorder.
*
* <p>This variant delegates to a {@link FlightRecorderStartupEvent JFR event extension} * <p>This variant delegates to a {@link FlightRecorderStartupEvent JFR event extension}
* to collect and record data in Java Flight Recorder. * to collect and record data in Java Flight Recorder.
* *
@ -114,12 +114,12 @@ class FlightRecorderStartupStep implements StartupStep {
add(key, value.get()); add(key, value.get());
} }
@NonNull
@Override @Override
public Iterator<Tag> iterator() { public Iterator<Tag> iterator() {
return new TagsIterator(); return new TagsIterator();
} }
private class TagsIterator implements Iterator<Tag> { private class TagsIterator implements Iterator<Tag> {
private int idx = 0; private int idx = 0;

5
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -63,7 +63,6 @@ import jakarta.servlet.http.Part;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.LinkedCaseInsensitiveMap; import org.springframework.util.LinkedCaseInsensitiveMap;
@ -1020,7 +1019,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
} }
} }
private static String encodeCookies(@NonNull Cookie... cookies) { private static String encodeCookies(Cookie... cookies) {
return Arrays.stream(cookies) return Arrays.stream(cookies)
.map(c -> c.getName() + '=' + (c.getValue() == null ? "" : c.getValue())) .map(c -> c.getName() + '=' + (c.getValue() == null ? "" : c.getValue()))
.collect(Collectors.joining("; ")); .collect(Collectors.joining("; "));

4
spring-test/src/main/java/org/springframework/test/context/jdbc/SqlScriptsTestExecutionListener.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -35,7 +35,6 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.test.context.TestContext; import org.springframework.test.context.TestContext;
import org.springframework.test.context.TestContextAnnotationUtils; import org.springframework.test.context.TestContextAnnotationUtils;
@ -363,7 +362,6 @@ public class SqlScriptsTestExecutionListener extends AbstractTestExecutionListen
} }
} }
@NonNull
private ResourceDatabasePopulator createDatabasePopulator(MergedSqlConfig mergedSqlConfig) { private ResourceDatabasePopulator createDatabasePopulator(MergedSqlConfig mergedSqlConfig) {
ResourceDatabasePopulator populator = new ResourceDatabasePopulator(); ResourceDatabasePopulator populator = new ResourceDatabasePopulator();
populator.setSqlScriptEncoding(mergedSqlConfig.getEncoding()); populator.setSqlScriptEncoding(mergedSqlConfig.getEncoding());

7
spring-web/src/main/java/org/springframework/http/DefaultHttpStatusCode.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -18,7 +18,6 @@ package org.springframework.http;
import java.io.Serializable; import java.io.Serializable;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
/** /**
@ -80,8 +79,8 @@ final class DefaultHttpStatusCode implements HttpStatusCode, Comparable<HttpStat
@Override @Override
public int compareTo(@NonNull HttpStatusCode o) { public int compareTo(HttpStatusCode other) {
return Integer.compare(this.value, o.value()); return Integer.compare(this.value, other.value());
} }
@Override @Override

5
spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -63,7 +63,6 @@ import jakarta.servlet.http.Part;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.LinkedCaseInsensitiveMap; import org.springframework.util.LinkedCaseInsensitiveMap;
@ -1020,7 +1019,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
} }
} }
private static String encodeCookies(@NonNull Cookie... cookies) { private static String encodeCookies(Cookie... cookies) {
return Arrays.stream(cookies) return Arrays.stream(cookies)
.map(c -> c.getName() + '=' + (c.getValue() == null ? "" : c.getValue())) .map(c -> c.getName() + '=' + (c.getValue() == null ? "" : c.getValue()))
.collect(Collectors.joining("; ")); .collect(Collectors.joining("; "));

5
spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
View File

@ -60,7 +60,6 @@ import org.springframework.http.converter.GenericHttpMessageConverter;
import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.server.RequestPath; import org.springframework.http.server.RequestPath;
import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.http.server.ServletServerHttpRequest;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
@ -522,7 +521,7 @@ class DefaultServerRequest implements ServerRequest {
} }
@Override @Override
public boolean addAll(@NonNull Collection<? extends Entry<String, Object>> c) { public boolean addAll(Collection<? extends Entry<String, Object>> c) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@ -537,7 +536,7 @@ class DefaultServerRequest implements ServerRequest {
} }
@Override @Override
public boolean retainAll(@NonNull Collection<?> c) { public boolean retainAll(Collection<?> c) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }