Skip to content

Commit 594ba7c

Browse files
committed
Fix new Sonar smells
1 parent d44dec6 commit 594ba7c

File tree

2 files changed

+26
-33
lines changed
  • spring-amqp/src/main/java/org/springframework/amqp/core
  • spring-rabbit-junit/src/main/java/org/springframework/amqp/rabbit/junit

2 files changed

+26
-33
lines changed

spring-amqp/src/main/java/org/springframework/amqp/core/Queue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public final void setMasterLocator(@Nullable String locator) {
176176
}
177177

178178
@Override
179-
public Object clone() {
179+
public Object clone() { // NOSONAR
180180
Queue queue = new Queue(this.name, this.durable, this.exclusive, this.autoDelete,
181181
new HashMap<>(this.arguments));
182182
queue.setActualName(this.actualName);

spring-rabbit-junit/src/main/java/org/springframework/amqp/rabbit/junit/JUnitUtils.java

Lines changed: 25 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
* Utility methods for JUnit rules and conditions.
3636
*
3737
* @author Gary Russell
38+
* @author Artem Bilan
39+
*
3840
* @since 2.2
3941
*
4042
*/
@@ -52,7 +54,7 @@ private JUnitUtils() {
5254
* @return the parsed property value if it exists, false otherwise.
5355
*/
5456
public static boolean parseBooleanProperty(String property) {
55-
for (String value: new String[] { System.getenv(property), System.getProperty(property) }) {
57+
for (String value : new String[] { System.getenv(property), System.getProperty(property) }) {
5658
if (Boolean.parseBoolean(value)) {
5759
return true;
5860
}
@@ -108,17 +110,16 @@ public static LevelsContainer adjustLogLevels(String methodName, List<Class<?>>
108110
ctx.updateLoggers();
109111

110112
Map<String, ch.qos.logback.classic.Level> oldLbLevels = new HashMap<>();
111-
categories.stream()
112-
.forEach(cat -> {
113-
ch.qos.logback.classic.Logger lbLogger = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(cat);
114-
oldLbLevels.put(cat, lbLogger.getLevel());
115-
lbLogger.setLevel(ch.qos.logback.classic.Level.toLevel(level.name()));
116-
});
113+
categories.forEach(cat -> {
114+
ch.qos.logback.classic.Logger lbLogger = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(cat);
115+
oldLbLevels.put(cat, lbLogger.getLevel());
116+
lbLogger.setLevel(ch.qos.logback.classic.Level.toLevel(level.name()));
117+
});
117118
LOGGER.info("++++++++++++++++++++++++++++ "
118119
+ "Overridden log level setting for: "
119120
+ classes.stream()
120-
.map(Class::getSimpleName)
121-
.collect(Collectors.toList())
121+
.map(Class::getSimpleName)
122+
.collect(Collectors.toList())
122123
+ " and " + categories.toString()
123124
+ " for test " + methodName);
124125
return new LevelsContainer(classLevels, categoryLevels, oldLbLevels);
@@ -127,35 +128,27 @@ public static LevelsContainer adjustLogLevels(String methodName, List<Class<?>>
127128
public static void revertLevels(String methodName, LevelsContainer container) {
128129
LOGGER.info("++++++++++++++++++++++++++++ "
129130
+ "Restoring log level setting for test " + methodName);
130-
container.oldCatLevels.entrySet()
131-
.stream()
132-
.forEach(entry -> {
133-
if (!entry.getKey().contains("BrokerRunning")) {
134-
((Logger) LogManager.getLogger(entry.getKey())).setLevel(entry.getValue());
135-
}
136-
});
137-
container.oldLevels.entrySet()
138-
.stream()
139-
.forEach(entry -> {
140-
if (!entry.getKey().equals(BrokerRunning.class)) {
141-
((Logger) LogManager.getLogger(entry.getKey())).setLevel(entry.getValue());
142-
}
143-
});
144-
container.oldLbLevels.entrySet()
145-
.stream()
146-
.forEach(entry -> {
147-
((ch.qos.logback.classic.Logger) LoggerFactory.getLogger(entry.getKey()))
148-
.setLevel(entry.getValue());
149-
});
131+
container.oldCatLevels.forEach((key, value) -> {
132+
if (!key.contains("BrokerRunning")) {
133+
((Logger) LogManager.getLogger(key)).setLevel(value);
134+
}
135+
});
136+
container.oldLevels.forEach((key, value) -> {
137+
if (!key.equals(BrokerRunning.class)) {
138+
((Logger) LogManager.getLogger(key)).setLevel(value);
139+
}
140+
});
141+
container.oldLbLevels.forEach((key, value) ->
142+
((ch.qos.logback.classic.Logger) LoggerFactory.getLogger(key)).setLevel(value));
150143
}
151144

152145
public static class LevelsContainer {
153146

154-
final Map<Class<?>, Level> oldLevels;
147+
private final Map<Class<?>, Level> oldLevels;
155148

156-
final Map<String, Level> oldCatLevels;
149+
private final Map<String, Level> oldCatLevels;
157150

158-
final Map<String, ch.qos.logback.classic.Level> oldLbLevels;
151+
private final Map<String, ch.qos.logback.classic.Level> oldLbLevels;
159152

160153
public LevelsContainer(Map<Class<?>, Level> oldLevels, Map<String, Level> oldCatLevels,
161154
Map<String, ch.qos.logback.classic.Level> oldLbLevels) {

0 commit comments

Comments
 (0)