Upgrade to SF 5.1; Remove Deprecated Code
Polishing - PR Comments Remove direct log4j usage in tests - hazelcast depends on it; retain the dependency just in jmx Fix hazelcast logger type
This commit is contained in:
Gary Russell
committed by
Artem Bilan
Artem Bilan
parent
27318c7ee5
commit
b940e3872b
@@ -1,112 +0,0 @@
|
||||
/*
|
||||
* Copyright 2015-2018 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.integration.test.rule;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.log4j.Level;
|
||||
import org.apache.log4j.LogManager;
|
||||
import org.junit.rules.MethodRule;
|
||||
import org.junit.runners.model.FrameworkMethod;
|
||||
import org.junit.runners.model.Statement;
|
||||
|
||||
/**
|
||||
* A JUnit method @Rule that changes the logger level for a set of classes
|
||||
* or packages
|
||||
* while a test method is running. Useful for performance or scalability tests
|
||||
* where we don't want to generate a large log in a tight inner loop, or
|
||||
* enabling debug logging for a test case.
|
||||
*
|
||||
* @author Dave Syer
|
||||
* @author Gary Russell
|
||||
*
|
||||
* @deprecated since 5.0.1 in favor of {@link Log4j2LevelAdjuster}.
|
||||
* Will be removed in 5.1.
|
||||
*
|
||||
*/
|
||||
@Deprecated
|
||||
@SuppressWarnings("deprecation")
|
||||
public class Log4jLevelAdjuster implements MethodRule {
|
||||
|
||||
private static final Log logger =
|
||||
LogFactory.getLog(org.springframework.integration.test.rule.Log4jLevelAdjuster.class);
|
||||
|
||||
private final Class<?>[] classes;
|
||||
|
||||
private final Level level;
|
||||
|
||||
private final String[] categories;
|
||||
|
||||
public Log4jLevelAdjuster(Level level, Class<?>... classes) {
|
||||
this.level = level;
|
||||
this.classes = classes;
|
||||
this.categories = new String[0];
|
||||
}
|
||||
|
||||
public Log4jLevelAdjuster(Level level, String... categories) {
|
||||
this.level = level;
|
||||
this.classes = new Class<?>[0];
|
||||
Set<String> cats = new LinkedHashSet<String>(Arrays.asList(categories));
|
||||
cats.add(getClass().getPackage().getName());
|
||||
this.categories = new ArrayList<String>(cats).toArray(new String[cats.size()]);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Statement apply(final Statement base, final FrameworkMethod method, Object target) {
|
||||
return new Statement() {
|
||||
@Override
|
||||
public void evaluate() throws Throwable {
|
||||
Map<Class<?>, Level> oldLevels = new HashMap<Class<?>, Level>();
|
||||
for (Class<?> cls : classes) {
|
||||
oldLevels.put(cls, LogManager.getLogger(cls).getEffectiveLevel());
|
||||
LogManager.getLogger(cls).setLevel(level);
|
||||
}
|
||||
Map<String, Level> oldCatLevels = new HashMap<String, Level>();
|
||||
for (String category : categories) {
|
||||
oldCatLevels.put(category, LogManager.getLogger(category).getEffectiveLevel());
|
||||
LogManager.getLogger(category).setLevel(level);
|
||||
}
|
||||
logger.debug("++++++++++++++++++++++++++++ "
|
||||
+ "Overridden log level setting for: " + Arrays.asList(classes) + " and "
|
||||
+ Arrays.asList(categories) + " for test " + method.getName());
|
||||
try {
|
||||
base.evaluate();
|
||||
}
|
||||
finally {
|
||||
logger.debug("++++++++++++++++++++++++++++ "
|
||||
+ "Restoring log level setting for: " + Arrays.asList(classes) + " and "
|
||||
+ Arrays.asList(categories) + " for test " + method.getName());
|
||||
// raw Class type used to avoid http://bugs.sun.com/view_bug.do?bug_id=6682380
|
||||
for (@SuppressWarnings("rawtypes") Class cls : classes) {
|
||||
LogManager.getLogger(cls).setLevel(oldLevels.get(cls));
|
||||
}
|
||||
for (String category : categories) {
|
||||
LogManager.getLogger(category).setLevel(oldCatLevels.get(category));
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,92 +0,0 @@
|
||||
/*
|
||||
* Copyright 2015-2018 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.integration.test.support;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Iterator;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.log4j.Level;
|
||||
import org.apache.log4j.LogManager;
|
||||
import org.apache.log4j.Logger;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.rules.TestName;
|
||||
|
||||
/**
|
||||
* Base class for module tests where logging is set to TRACE for the duration
|
||||
* of the test and reverted to the previous value. Also logs a start/end
|
||||
* message. Duplicated in s-i-core/src/test for use there, to avoid circular dep.
|
||||
*
|
||||
* @author Artem Bilan
|
||||
* @author Gary Russell
|
||||
*
|
||||
* @since 4.2.2
|
||||
*
|
||||
* @deprecated since 5.0.1 in favor of {@link org.springframework.integration.test.rule.Log4j2LevelAdjuster}.
|
||||
* Will be removed in 5.1.
|
||||
*
|
||||
*/
|
||||
@Deprecated
|
||||
public class LogAdjustingTestSupport {
|
||||
|
||||
/*
|
||||
* If you make changes here, consider doing the same in the core version.
|
||||
*/
|
||||
|
||||
@Rule
|
||||
public TestName testName = new TestName();
|
||||
|
||||
protected final Log logger = LogFactory.getLog(this.getClass());
|
||||
|
||||
private final Collection<Logger> loggersToAdjust = new ArrayList<Logger>();
|
||||
|
||||
private final Collection<Level> oldCategories = new ArrayList<Level>();
|
||||
|
||||
|
||||
public LogAdjustingTestSupport() {
|
||||
this("org.springframework.integration");
|
||||
}
|
||||
|
||||
public LogAdjustingTestSupport(String... loggersToAdjust) {
|
||||
for (String loggerToAdjust : loggersToAdjust) {
|
||||
this.loggersToAdjust.add(LogManager.getLogger(loggerToAdjust));
|
||||
}
|
||||
}
|
||||
|
||||
@Before
|
||||
public void beforeTest() {
|
||||
for (Logger loggerToAdjust : this.loggersToAdjust) {
|
||||
this.oldCategories.add(loggerToAdjust.getEffectiveLevel());
|
||||
loggerToAdjust.setLevel(Level.TRACE);
|
||||
}
|
||||
this.logger.warn("!!!! Starting test: " + this.testName.getMethodName() + " !!!!");
|
||||
}
|
||||
|
||||
@After
|
||||
public void afterTest() {
|
||||
logger.warn("!!!! Finished test: " + this.testName.getMethodName() + " !!!!");
|
||||
Iterator<Level> oldCategory = this.oldCategories.iterator();
|
||||
for (Logger loggerToAdjust : this.loggersToAdjust) {
|
||||
loggerToAdjust.setLevel(oldCategory.next());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user