INT-3784: Use acknowledge="transacted" by Default

JIRA: https://jira.spring.io/browse/INT-3784

Also

- suppress WARN log when priority mapping fails
- rework extract payload tests to use a single context

Make a new `JmsMessageDrivenEndpoint` as `private` because it makes sense only for XML `BeanDefinition` variant.
This commit is contained in:
Gary Russell
2015-07-31 14:37:31 -04:00
committed by Artem Bilan
parent 4cca684f36
commit fd35d43aba
11 changed files with 308 additions and 157 deletions

View File

@@ -61,11 +61,13 @@ public class Log4jLevelAdjuster implements MethodRule {
}
@Override
public Statement apply(final Statement base, FrameworkMethod method, Object target) {
public Statement apply(final Statement base, final FrameworkMethod method, Object target) {
return new Statement() {
@Override
public void evaluate() throws Throwable {
logger.debug("Overriding log level setting for: " + Arrays.asList(classes));
logger.debug("++++++++++++++++++++++++++++ "
+ "Overriding log level setting for: " + Arrays.asList(classes) + " for test "
+ method.getName());
Map<Class<?>, Level> oldLevels = new HashMap<Class<?>, Level>();
for (Class<?> cls : classes) {
oldLevels.put(cls, LogManager.getLogger(cls).getEffectiveLevel());
@@ -80,8 +82,9 @@ public class Log4jLevelAdjuster implements MethodRule {
base.evaluate();
}
finally {
logger.debug("Restoring log level setting for: " + Arrays.asList(classes) + " and "
+ Arrays.asList(categories));
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));