Skip to content

Commit e2e91e2

Browse files
committed
Switch LogAccessor argument order to have message supplier last
Closes gh-22726
1 parent 5922642 commit e2e91e2

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

spring-core/src/main/java/org/springframework/core/log/LogAccessor.java

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ public void fatal(CharSequence message) {
8080

8181
/**
8282
* Log an error with fatal log level.
83+
* @param cause the exception to log
8384
* @param message the message to log
84-
* @param t log this cause
8585
*/
86-
public void fatal(CharSequence message, Throwable t) {
87-
this.log.fatal(message, t);
86+
public void fatal(Throwable cause, CharSequence message) {
87+
this.log.fatal(message, cause);
8888
}
8989

9090
/**
@@ -97,11 +97,11 @@ public void error(CharSequence message) {
9797

9898
/**
9999
* Log an error with error log level.
100+
* @param cause the exception to log
100101
* @param message the message to log
101-
* @param t log this cause
102102
*/
103-
public void error(CharSequence message, Throwable t) {
104-
this.log.error(message, t);
103+
public void error(Throwable cause, CharSequence message) {
104+
this.log.error(message, cause);
105105
}
106106

107107
/**
@@ -114,11 +114,11 @@ public void warn(CharSequence message) {
114114

115115
/**
116116
* Log an error with warn log level.
117+
* @param cause the exception to log
117118
* @param message the message to log
118-
* @param t log this cause
119119
*/
120-
public void warn(CharSequence message, Throwable t) {
121-
this.log.warn(message, t);
120+
public void warn(Throwable cause, CharSequence message) {
121+
this.log.warn(message, cause);
122122
}
123123

124124
/**
@@ -131,11 +131,11 @@ public void info(CharSequence message) {
131131

132132
/**
133133
* Log an error with info log level.
134+
* @param cause the exception to log
134135
* @param message the message to log
135-
* @param t log this cause
136136
*/
137-
public void info(CharSequence message, Throwable t) {
138-
this.log.info(message, t);
137+
public void info(Throwable cause, CharSequence message) {
138+
this.log.info(message, cause);
139139
}
140140

141141
/**
@@ -148,11 +148,11 @@ public void debug(CharSequence message) {
148148

149149
/**
150150
* Log an error with debug log level.
151+
* @param cause the exception to log
151152
* @param message the message to log
152-
* @param t log this cause
153153
*/
154-
public void debug(CharSequence message, Throwable t) {
155-
this.log.debug(message, t);
154+
public void debug(Throwable cause, CharSequence message) {
155+
this.log.debug(message, cause);
156156
}
157157

158158
/**
@@ -165,11 +165,11 @@ public void trace(CharSequence message) {
165165

166166
/**
167167
* Log an error with trace log level.
168+
* @param cause the exception to log
168169
* @param message the message to log
169-
* @param t log this cause
170170
*/
171-
public void trace(CharSequence message, Throwable t) {
172-
this.log.trace(message, t);
171+
public void trace(Throwable cause, CharSequence message) {
172+
this.log.trace(message, cause);
173173
}
174174

175175

@@ -185,11 +185,11 @@ public void fatal(Supplier<? extends CharSequence> messageSupplier) {
185185

186186
/**
187187
* Log an error with fatal log level.
188+
* @param cause the exception to log
188189
* @param messageSupplier a lazy supplier for the message to log
189-
* @param t log this cause
190190
*/
191-
public void fatal(Supplier<? extends CharSequence> messageSupplier, Throwable t) {
192-
this.log.fatal(new LogMessage(messageSupplier), t);
191+
public void fatal(Throwable cause, Supplier<? extends CharSequence> messageSupplier) {
192+
this.log.fatal(new LogMessage(messageSupplier), cause);
193193
}
194194

195195
/**
@@ -202,11 +202,11 @@ public void error(Supplier<? extends CharSequence> messageSupplier) {
202202

203203
/**
204204
* Log an error with error log level.
205+
* @param cause the exception to log
205206
* @param messageSupplier a lazy supplier for the message to log
206-
* @param t log this cause
207207
*/
208-
public void error(Supplier<? extends CharSequence> messageSupplier, Throwable t) {
209-
this.log.error(new LogMessage(messageSupplier), t);
208+
public void error(Throwable cause, Supplier<? extends CharSequence> messageSupplier) {
209+
this.log.error(new LogMessage(messageSupplier), cause);
210210
}
211211

212212
/**
@@ -219,11 +219,11 @@ public void warn(Supplier<? extends CharSequence> messageSupplier) {
219219

220220
/**
221221
* Log an error with warn log level.
222+
* @param cause the exception to log
222223
* @param messageSupplier a lazy supplier for the message to log
223-
* @param t log this cause
224224
*/
225-
public void warn(Supplier<? extends CharSequence> messageSupplier, Throwable t) {
226-
this.log.warn(new LogMessage(messageSupplier), t);
225+
public void warn(Throwable cause, Supplier<? extends CharSequence> messageSupplier) {
226+
this.log.warn(new LogMessage(messageSupplier), cause);
227227
}
228228

229229
/**
@@ -236,11 +236,11 @@ public void info(Supplier<? extends CharSequence> messageSupplier) {
236236

237237
/**
238238
* Log an error with info log level.
239+
* @param cause the exception to log
239240
* @param messageSupplier a lazy supplier for the message to log
240-
* @param t log this cause
241241
*/
242-
public void info(Supplier<? extends CharSequence> messageSupplier, Throwable t) {
243-
this.log.info(new LogMessage(messageSupplier), t);
242+
public void info(Throwable cause, Supplier<? extends CharSequence> messageSupplier) {
243+
this.log.info(new LogMessage(messageSupplier), cause);
244244
}
245245

246246
/**
@@ -253,11 +253,11 @@ public void debug(Supplier<? extends CharSequence> messageSupplier) {
253253

254254
/**
255255
* Log an error with debug log level.
256+
* @param cause the exception to log
256257
* @param messageSupplier a lazy supplier for the message to log
257-
* @param t log this cause
258258
*/
259-
public void debug(Supplier<? extends CharSequence> messageSupplier, Throwable t) {
260-
this.log.debug(new LogMessage(messageSupplier), t);
259+
public void debug(Throwable cause, Supplier<? extends CharSequence> messageSupplier) {
260+
this.log.debug(new LogMessage(messageSupplier), cause);
261261
}
262262

263263
/**
@@ -270,11 +270,11 @@ public void trace(Supplier<? extends CharSequence> messageSupplier) {
270270

271271
/**
272272
* Log an error with trace log level.
273+
* @param cause the exception to log
273274
* @param messageSupplier a lazy supplier for the message to log
274-
* @param t log this cause
275275
*/
276-
public void trace(Supplier<? extends CharSequence> messageSupplier, Throwable t) {
277-
this.log.trace(new LogMessage(messageSupplier), t);
276+
public void trace(Throwable cause, Supplier<? extends CharSequence> messageSupplier) {
277+
this.log.trace(new LogMessage(messageSupplier), cause);
278278
}
279279

280280
}

0 commit comments

Comments
 (0)