mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '3.0.x' into 3.1.x
This commit is contained in:
commit
5d6a507142
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2023 the original author or authors.
|
* Copyright 2023-2023 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.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2021 the original author or authors.
|
* Copyright 2012-2023 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.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2019 the original author or authors.
|
* Copyright 2012-2023 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.
|
||||||
|
@ -137,6 +137,13 @@ public class LoggersEndpoint {
|
|||||||
|
|
||||||
private final Map<String, GroupLoggerLevelsDescriptor> groups;
|
private final Map<String, GroupLoggerLevelsDescriptor> groups;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new {@link LoggersDescriptor} instance.
|
||||||
|
* @param levels the levels
|
||||||
|
* @param loggers the loggers
|
||||||
|
* @param groups the groups
|
||||||
|
*/
|
||||||
|
@Deprecated(since = "3.2.0", forRemoval = true)
|
||||||
public LoggersDescriptor(NavigableSet<LogLevel> levels, Map<String, LoggerLevelsDescriptor> loggers,
|
public LoggersDescriptor(NavigableSet<LogLevel> levels, Map<String, LoggerLevelsDescriptor> loggers,
|
||||||
Map<String, GroupLoggerLevelsDescriptor> groups) {
|
Map<String, GroupLoggerLevelsDescriptor> groups) {
|
||||||
this.levels = levels;
|
this.levels = levels;
|
||||||
@ -165,6 +172,11 @@ public class LoggersEndpoint {
|
|||||||
|
|
||||||
private final String configuredLevel;
|
private final String configuredLevel;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new {@link LoggerLevelsDescriptor} instance.
|
||||||
|
* @param configuredLevel the configured level
|
||||||
|
*/
|
||||||
|
@Deprecated(since = "3.2.0", forRemoval = true)
|
||||||
public LoggerLevelsDescriptor(LogLevel configuredLevel) {
|
public LoggerLevelsDescriptor(LogLevel configuredLevel) {
|
||||||
this.configuredLevel = (configuredLevel != null) ? configuredLevel.name() : null;
|
this.configuredLevel = (configuredLevel != null) ? configuredLevel.name() : null;
|
||||||
}
|
}
|
||||||
@ -173,6 +185,11 @@ public class LoggersEndpoint {
|
|||||||
this.configuredLevel = (directConfiguration != null) ? directConfiguration.getName() : null;
|
this.configuredLevel = (directConfiguration != null) ? directConfiguration.getName() : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param level
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Deprecated(since = "3.2.0", forRemoval = true)
|
||||||
protected final String getName(LogLevel level) {
|
protected final String getName(LogLevel level) {
|
||||||
return (level != null) ? level.name() : null;
|
return (level != null) ? level.name() : null;
|
||||||
}
|
}
|
||||||
@ -190,6 +207,11 @@ public class LoggersEndpoint {
|
|||||||
|
|
||||||
private final List<String> members;
|
private final List<String> members;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param configuredLevel
|
||||||
|
* @param members
|
||||||
|
*/
|
||||||
|
@Deprecated(since = "3.2.0", forRemoval = true)
|
||||||
public GroupLoggerLevelsDescriptor(LogLevel configuredLevel, List<String> members) {
|
public GroupLoggerLevelsDescriptor(LogLevel configuredLevel, List<String> members) {
|
||||||
super(configuredLevel);
|
super(configuredLevel);
|
||||||
this.members = members;
|
this.members = members;
|
||||||
@ -208,6 +230,10 @@ public class LoggersEndpoint {
|
|||||||
|
|
||||||
private final String effectiveLevel;
|
private final String effectiveLevel;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param configuration
|
||||||
|
*/
|
||||||
|
@Deprecated(since = "3.2.0", forRemoval = true)
|
||||||
public SingleLoggerLevelsDescriptor(LoggerConfiguration configuration) {
|
public SingleLoggerLevelsDescriptor(LoggerConfiguration configuration) {
|
||||||
super(configuration.getLevelConfiguration(ConfigurationScope.DIRECT));
|
super(configuration.getLevelConfiguration(ConfigurationScope.DIRECT));
|
||||||
this.effectiveLevel = configuration.getLevelConfiguration().getName();
|
this.effectiveLevel = configuration.getLevelConfiguration().getName();
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2022 the original author or authors.
|
* Copyright 2012-2023 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.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2022 the original author or authors.
|
* Copyright 2012-2023 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.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2022 the original author or authors.
|
* Copyright 2012-2023 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.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2022 the original author or authors.
|
* Copyright 2012-2023 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.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2022 the original author or authors.
|
* Copyright 2012-2023 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.
|
||||||
|
Loading…
Reference in New Issue
Block a user