Skip to content

Commit 5ebbb3f

Browse files
jhoellerjhoeller
committed
Merge branch '6.0.x'
# Conflicts: # spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java # spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java # spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java
2 parents 3c02ab8 + bbde68c commit 5ebbb3f

File tree

17 files changed

+21
-21
lines changed

17 files changed

+21
-21
lines changed

Diff for: ‎spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ protected void setPropertyValue(PropertyTokenHolder tokens, PropertyValue pv) th
279279
}
280280
}
281281

282-
@SuppressWarnings({"unchecked", "rawtypes"})
282+
@SuppressWarnings({"rawtypes", "unchecked"})
283283
private void processKeyedProperty(PropertyTokenHolder tokens, PropertyValue pv) {
284284
Object propValue = getPropertyHoldingValue(tokens);
285285
PropertyHandler ph = getLocalPropertyHandler(tokens.actualName);
@@ -615,7 +615,7 @@ public Object getPropertyValue(String propertyName) throws BeansException {
615615
return nestedPa.getPropertyValue(tokens);
616616
}
617617

618-
@SuppressWarnings({"unchecked", "rawtypes"})
618+
@SuppressWarnings({"rawtypes", "unchecked"})
619619
@Nullable
620620
protected Object getPropertyValue(PropertyTokenHolder tokens) throws BeansException {
621621
String propertyName = tokens.canonicalName;

Diff for: ‎spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ private void handleProcessError(Resource resource, IOException ex) {
230230
}
231231
}
232232

233-
@SuppressWarnings({ "unchecked", "rawtypes" })
233+
@SuppressWarnings({"rawtypes", "unchecked"})
234234
private Map<String, Object> asMap(Object object) {
235235
// YAML can have numbers as keys
236236
Map<String, Object> result = new LinkedHashMap<>();
@@ -309,7 +309,7 @@ protected final Map<String, Object> getFlattenedMap(Map<String, Object> source)
309309
return result;
310310
}
311311

312-
@SuppressWarnings({ "rawtypes", "unchecked" })
312+
@SuppressWarnings({"rawtypes", "unchecked"})
313313
private void buildFlattenedMap(Map<String, Object> result, Map<String, Object> source, @Nullable String path) {
314314
source.forEach((key, value) -> {
315315
if (StringUtils.hasText(path)) {

Diff for: ‎spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2137,7 +2137,7 @@ public Stream<Object> orderedStream() {
21372137
return resolveStream(true);
21382138
}
21392139

2140-
@SuppressWarnings({ "unchecked", "rawtypes" })
2140+
@SuppressWarnings({"rawtypes", "unchecked"})
21412141
private Stream<Object> resolveStream(boolean ordered) {
21422142
DependencyDescriptor descriptorToUse = new StreamDependencyDescriptor(this.descriptor, ordered);
21432143
Object result = doResolveDependency(descriptorToUse, this.beanName, null, null);

Diff for: ‎spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public void validate(Object target, Errors errors, Object... validationHints) {
114114
}
115115
}
116116

117-
@SuppressWarnings({ "unchecked", "rawtypes" })
117+
@SuppressWarnings({"rawtypes", "unchecked"})
118118
@Override
119119
public void validateValue(
120120
Class<?> targetType, String fieldName, @Nullable Object value, Errors errors, Object... validationHints) {

Diff for: ‎spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ public static Mono<DataBuffer> join(Publisher<? extends DataBuffer> dataBuffers)
588588
* @throws DataBufferLimitException if maxByteCount is exceeded
589589
* @since 5.1.11
590590
*/
591-
@SuppressWarnings({ "unchecked", "rawtypes" })
591+
@SuppressWarnings({"rawtypes", "unchecked"})
592592
public static Mono<DataBuffer> join(Publisher<? extends DataBuffer> buffers, int maxByteCount) {
593593
Assert.notNull(buffers, "'buffers' must not be null");
594594

Diff for: ‎spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public boolean canCompare(@Nullable Object left, @Nullable Object right) {
5353
}
5454

5555
@Override
56-
@SuppressWarnings({ "unchecked", "rawtypes" })
56+
@SuppressWarnings({"rawtypes", "unchecked"})
5757
public int compare(@Nullable Object left, @Nullable Object right) throws SpelEvaluationException {
5858
// If one is null, check if the other is
5959
if (left == null) {

Diff for: ‎spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public static SqlParameterSource[] createBatch(Object... candidates) {
5959
* @see BeanPropertySqlParameterSource
6060
* @see NamedParameterJdbcTemplate#batchUpdate(String, SqlParameterSource[])
6161
*/
62-
@SuppressWarnings({ "unchecked", "rawtypes" })
62+
@SuppressWarnings({"rawtypes", "unchecked"})
6363
public static SqlParameterSource[] createBatch(Collection<?> candidates) {
6464
SqlParameterSource[] batch = new SqlParameterSource[candidates.size()];
6565
int i = 0;

Diff for: ‎spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ protected String getDefaultListenerMethod() {
197197
* @throws JMSException if thrown by JMS API methods
198198
*/
199199
@Override
200-
@SuppressWarnings({ "unchecked", "rawtypes" })
200+
@SuppressWarnings({"rawtypes", "unchecked"})
201201
public void onMessage(Message message, @Nullable Session session) throws JMSException {
202202
// Check whether the delegate is a MessageListener impl itself.
203203
// In that case, the adapter will simply act as a pass-through.

Diff for: ‎spring-jms/src/main/java/org/springframework/jms/support/converter/MessagingMessageConverter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public jakarta.jms.Message toMessage(Object object, Session session) throws JMSE
113113
}
114114

115115
@Override
116-
@SuppressWarnings({ "unchecked", "rawtypes" })
116+
@SuppressWarnings({"rawtypes", "unchecked"})
117117
public Object fromMessage(jakarta.jms.Message message) throws JMSException, MessageConversionException {
118118
Map<String, Object> mappedHeaders = extractHeaders(message);
119119
Object convertedObject = extractPayload(message);

Diff for: ‎spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/ConnectionFactoryUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ private static boolean connectionEquals(ConnectionHolder conHolder, Connection p
301301
* @return the innermost target Connection, or the passed-in one if not wrapped
302302
* @see Wrapped#unwrap()
303303
*/
304-
@SuppressWarnings({ "unchecked", "rawtypes" })
304+
@SuppressWarnings({"rawtypes", "unchecked"})
305305
public static Connection getTargetConnection(Connection con) {
306306
Object conToUse = con;
307307
while (conToUse instanceof Wrapped wrapped) {

Diff for: ‎spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ private static class ExpandedQuery implements PreparedOperation<String> {
513513
this.parameterSource = parameterSource;
514514
}
515515

516-
@SuppressWarnings({ "unchecked", "rawtypes" })
516+
@SuppressWarnings({"rawtypes", "unchecked"})
517517
public void bind(BindTarget target, String identifier, Parameter parameter) {
518518
List<BindMarker> bindMarkers = getBindMarkers(identifier);
519519
if (bindMarkers == null) {

Diff for: ‎spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ private Flux<DataBuffer> encodePartValues(
241241
.concatMap(value -> encodePart(boundary, name, value, bufferFactory));
242242
}
243243

244-
@SuppressWarnings({ "unchecked", "rawtypes" })
244+
@SuppressWarnings({"rawtypes", "unchecked"})
245245
private <T> Flux<DataBuffer> encodePart(byte[] boundary, String name, T value, DataBufferFactory factory) {
246246
MultipartHttpOutputMessage message = new MultipartHttpOutputMessage(factory);
247247
HttpHeaders headers = message.getHeaders();

Diff for: ‎spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -71,7 +71,7 @@ public HttpMessageConverterExtractor(Type responseType, List<HttpMessageConverte
7171
this(responseType, messageConverters, LogFactory.getLog(HttpMessageConverterExtractor.class));
7272
}
7373

74-
@SuppressWarnings({ "unchecked", "rawtypes" })
74+
@SuppressWarnings({"rawtypes", "unchecked"})
7575
HttpMessageConverterExtractor(Type responseType, List<HttpMessageConverter<?>> messageConverters, Log logger) {
7676
Assert.notNull(responseType, "'responseType' must not be null");
7777
Assert.notEmpty(messageConverters, "'messageConverters' must not be empty");
@@ -84,7 +84,7 @@ public HttpMessageConverterExtractor(Type responseType, List<HttpMessageConverte
8484

8585

8686
@Override
87-
@SuppressWarnings({"unchecked", "rawtypes", "resource"})
87+
@SuppressWarnings({"rawtypes", "unchecked", "resource"})
8888
public T extractData(ClientHttpResponse response) throws IOException {
8989
IntrospectingClientHttpResponse responseWrapper = new IntrospectingClientHttpResponse(response);
9090
if (!responseWrapper.hasMessageBody() || responseWrapper.hasEmptyMessageBody()) {

Diff for: ‎spring-web/src/main/java/org/springframework/web/client/RestTemplate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1044,7 +1044,7 @@ else if (requestBody != null) {
10441044
}
10451045

10461046
@Override
1047-
@SuppressWarnings({ "unchecked", "rawtypes" })
1047+
@SuppressWarnings({"rawtypes", "unchecked"})
10481048
public void doWithRequest(ClientHttpRequest httpRequest) throws IOException {
10491049
super.doWithRequest(httpRequest);
10501050
Object requestBody = this.requestEntity.getBody();

Diff for: ‎spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ protected Mono<Void> writeBody(@Nullable Object body, MethodParameter bodyParame
122122
* @return indicates completion or error
123123
* @since 5.0.2
124124
*/
125-
@SuppressWarnings({"unchecked", "rawtypes", "ConstantConditions"})
125+
@SuppressWarnings({"rawtypes", "unchecked", "ConstantConditions"})
126126
protected Mono<Void> writeBody(@Nullable Object body, MethodParameter bodyParameter,
127127
@Nullable MethodParameter actualParam, ServerWebExchange exchange) {
128128

Diff for: ‎spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultAsyncServerResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ private DeferredResult<ServerResponse> createDeferredResult(HttpServletRequest r
168168
return result;
169169
}
170170

171-
@SuppressWarnings({"unchecked", "rawtypes"})
171+
@SuppressWarnings({"rawtypes", "unchecked"})
172172
public static AsyncServerResponse create(Object obj, @Nullable Duration timeout) {
173173
Assert.notNull(obj, "Argument to async must not be null");
174174

Diff for: ‎spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ protected <T> Object readWithMessageConverters(NativeWebRequest webRequest, Meth
139139
* @throws HttpMediaTypeNotSupportedException if no suitable message converter is found
140140
*/
141141
@Nullable
142-
@SuppressWarnings({ "unchecked", "rawtypes" })
142+
@SuppressWarnings({"rawtypes", "unchecked"})
143143
protected <T> Object readWithMessageConverters(HttpInputMessage inputMessage, MethodParameter parameter,
144144
Type targetType) throws IOException, HttpMediaTypeNotSupportedException, HttpMessageNotReadableException {
145145

0 commit comments

Comments
 (0)