Skip to content

Commit 6c00e61

Browse files
jhoellerjhoeller
committed
Merge branch '6.0.x'
# Conflicts: # framework-platform/framework-platform.gradle # spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java
2 parents 4287417 + 1e78cc3 commit 6c00e61

File tree

5 files changed

+46
-17
lines changed

5 files changed

+46
-17
lines changed

‎framework-platform/framework-platform.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ dependencies {
1414
api(platform("io.projectreactor:reactor-bom:2023.0.0-RC1"))
1515
api(platform("io.rsocket:rsocket-bom:1.1.3"))
1616
api(platform("org.apache.groovy:groovy-bom:4.0.15"))
17-
api(platform("org.apache.logging.log4j:log4j-bom:2.20.0"))
18-
api(platform("org.eclipse.jetty:jetty-bom:12.0.2"))
19-
api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.2"))
17+
api(platform("org.apache.logging.log4j:log4j-bom:2.21.1"))
18+
api(platform("org.eclipse.jetty:jetty-bom:12.0.3"))
19+
api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.3"))
2020
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
2121
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.0"))
2222
api(platform("org.junit:junit-bom:5.10.1"))
23-
api(platform("org.mockito:mockito-bom:5.6.0"))
23+
api(platform("org.mockito:mockito-bom:5.7.0"))
2424

2525
constraints {
2626
api("com.fasterxml:aalto-xml:1.3.2")
@@ -54,9 +54,9 @@ dependencies {
5454
api("io.r2dbc:r2dbc-spi:1.0.0.RELEASE")
5555
api("io.reactivex.rxjava3:rxjava:3.1.6")
5656
api("io.smallrye.reactive:mutiny:1.9.0")
57-
api("io.undertow:undertow-core:2.3.8.Final")
58-
api("io.undertow:undertow-servlet:2.3.8.Final")
59-
api("io.undertow:undertow-websockets-jsr:2.3.8.Final")
57+
api("io.undertow:undertow-core:2.3.10.Final")
58+
api("io.undertow:undertow-servlet:2.3.10.Final")
59+
api("io.undertow:undertow-websockets-jsr:2.3.10.Final")
6060
api("io.vavr:vavr:0.10.4")
6161
api("jakarta.activation:jakarta.activation-api:2.0.1")
6262
api("jakarta.annotation:jakarta.annotation-api:2.0.0")
@@ -102,10 +102,10 @@ dependencies {
102102
api("org.apache.httpcomponents.client5:httpclient5:5.2.1")
103103
api("org.apache.httpcomponents.core5:httpcore5-reactive:5.2.2")
104104
api("org.apache.poi:poi-ooxml:5.2.3")
105-
api("org.apache.tomcat.embed:tomcat-embed-core:10.1.14")
106-
api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.14")
107-
api("org.apache.tomcat:tomcat-util:10.1.14")
108-
api("org.apache.tomcat:tomcat-websocket:10.1.14")
105+
api("org.apache.tomcat.embed:tomcat-embed-core:10.1.15")
106+
api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.15")
107+
api("org.apache.tomcat:tomcat-util:10.1.15")
108+
api("org.apache.tomcat:tomcat-websocket:10.1.15")
109109
api("org.aspectj:aspectjrt:1.9.20.1")
110110
api("org.aspectj:aspectjtools:1.9.20.1")
111111
api("org.aspectj:aspectjweaver:1.9.20.1")
@@ -115,7 +115,7 @@ dependencies {
115115
api("org.codehaus.jettison:jettison:1.5.4")
116116
api("org.crac:crac:1.4.0")
117117
api("org.dom4j:dom4j:2.1.4")
118-
api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.0")
118+
api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.1")
119119
api("org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.4")
120120
api("org.eclipse:yasson:2.0.4")
121121
api("org.ehcache:ehcache:3.10.8")

‎spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,12 @@ private static class Log4jLog implements Log, Serializable {
145145
private static final LoggerContext loggerContext =
146146
LogManager.getContext(Log4jLog.class.getClassLoader(), false);
147147

148-
private final ExtendedLogger logger;
148+
private final String name;
149+
150+
private final transient ExtendedLogger logger;
149151

150152
public Log4jLog(String name) {
153+
this.name = name;
151154
LoggerContext context = loggerContext;
152155
if (context == null) {
153156
// Circular call in early-init scenario -> static field not initialized yet
@@ -261,6 +264,10 @@ private void log(Level level, Object message, Throwable exception) {
261264
this.logger.logIfEnabled(FQCN, level, null, message, exception);
262265
}
263266
}
267+
268+
protected Object readResolve() {
269+
return new Log4jLog(this.name);
270+
}
264271
}
265272

266273

‎spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package org.springframework.jdbc.core.metadata;
1818

19-
import java.sql.DatabaseMetaData;
2019
import java.util.ArrayList;
2120
import java.util.HashSet;
2221
import java.util.LinkedHashMap;
@@ -434,14 +433,14 @@ protected List<SqlParameter> reconcileParameters(List<SqlParameter> parameters)
434433
if (paramNameToUse == null) {
435434
paramNameToUse = "";
436435
}
437-
if (meta.getParameterType() == DatabaseMetaData.procedureColumnOut) {
436+
if (meta.isOutParameter()) {
438437
workParams.add(provider.createDefaultOutParameter(paramNameToUse, meta));
439438
outParamNames.add(paramNameToUse);
440439
if (logger.isDebugEnabled()) {
441440
logger.debug("Added meta-data out parameter for '" + paramNameToUse + "'");
442441
}
443442
}
444-
else if (meta.getParameterType() == DatabaseMetaData.procedureColumnInOut) {
443+
else if (meta.isInOutParameter()) {
445444
workParams.add(provider.createDefaultInOutParameter(paramNameToUse, meta));
446445
outParamNames.add(paramNameToUse);
447446
if (logger.isDebugEnabled()) {

‎spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallParameterMetaData.java

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 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.
@@ -97,6 +97,28 @@ public boolean isReturnParameter() {
9797
this.parameterType == DatabaseMetaData.procedureColumnResult));
9898
}
9999

100+
/**
101+
* Determine whether the declared parameter qualifies as an 'out' parameter
102+
* for our purposes: type {@link DatabaseMetaData#procedureColumnOut},
103+
* or in case of a function, {@link DatabaseMetaData#functionColumnOut}.
104+
* @since 5.3.31
105+
*/
106+
public boolean isOutParameter() {
107+
return (this.function ? this.parameterType == DatabaseMetaData.functionColumnOut :
108+
this.parameterType == DatabaseMetaData.procedureColumnOut);
109+
}
110+
111+
/**
112+
* Determine whether the declared parameter qualifies as an 'in-out' parameter
113+
* for our purposes: type {@link DatabaseMetaData#procedureColumnInOut},
114+
* or in case of a function, {@link DatabaseMetaData#functionColumnInOut}.
115+
* @since 5.3.31
116+
*/
117+
public boolean isInOutParameter() {
118+
return (this.function ? this.parameterType == DatabaseMetaData.functionColumnInOut :
119+
this.parameterType == DatabaseMetaData.procedureColumnInOut);
120+
}
121+
100122
/**
101123
* Return the parameter SQL type.
102124
*/

‎spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ protected boolean isStoresLowerCaseIdentifiers() {
273273
}
274274

275275

276+
@Nullable
276277
private String identifierNameToUse(@Nullable String identifierName) {
277278
if (identifierName == null) {
278279
return null;

0 commit comments

Comments
 (0)