Skip to content

Commit f23b657

Browse files
committed
Sonar fixes
1 parent 609af75 commit f23b657

22 files changed

Lines changed: 33 additions & 53 deletions

src/main/java/ee/bitweb/core/api/ControllerAdvisor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ private void log(ControllerAdvisorProperties.Level level, String message, Throwa
343343
case DEBUG -> log.debug(message);
344344
case TRACE -> log.trace(message);
345345
case OFF -> {
346+
// nothing to do, logging has been turned off
346347
}
347348
}
348349
}

src/main/java/ee/bitweb/core/audit/AuditLogFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public void doFilter(
3333
ServletResponse response,
3434
FilterChain chain
3535
) throws IOException, ServletException {
36-
if (request instanceof HttpServletRequest) {
37-
if (isBlacklisted((HttpServletRequest) request)) {
36+
if (request instanceof HttpServletRequest httpRequest) {
37+
if (isBlacklisted(httpRequest)) {
3838
log.debug("Request is blacklisted for request logging, will skip further processing.");
3939
chain.doFilter(request, response);
4040

src/main/java/ee/bitweb/core/audit/mappers/RequestForwardingDataMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ private String createHeaderValues(HttpServletRequest request, String key) {
8080
if (!headerValues.hasMoreElements()) return null;
8181

8282
while (headerValues.hasMoreElements()) {
83-
if (builder.length() != 0) {
83+
if (!builder.isEmpty()) {
8484
builder.append("|");
8585
}
8686
String headerValue = headerValues.nextElement();

src/main/java/ee/bitweb/core/audit/mappers/RequestHeadersMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ private String createHeaderValues(HttpServletRequest request, String key) {
5151
if (!headerValues.hasMoreElements()) return null;
5252

5353
while (headerValues.hasMoreElements()) {
54-
if (builder.length() != 0) {
54+
if (!builder.isEmpty()) {
5555
builder.append("|");
5656
}
5757
String headerValue = headerValues.nextElement();

src/main/java/ee/bitweb/core/audit/writers/AuditLogLoggerWriterAdapter.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ public void write(Map<String, String> container) {
4848

4949
private void log(Map<String, String> container) {
5050
MDC.setContextMap(container);
51+
52+
if (!log.isInfoEnabled()) {
53+
return;
54+
}
55+
5156
log.info(
5257
"Method({}), URL({}) Status({}) ResponseSize({}) Duration({} ms)",
5358
get(container, RequestMethodMapper.KEY),

src/main/java/ee/bitweb/core/trace/invoker/amqp/AmqpTraceAdvisor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
2323
log.debug("Attempting to resolve trace id from Incoming message.");
2424

2525
for (Object argument : invocation.getArguments()) {
26-
if (argument instanceof Message) {
26+
if (argument instanceof Message message) {
2727
log.debug("Found Message object argument list, invoking trace resolution.");
28-
resolver.resolve((Message) argument);
28+
resolver.resolve(message);
2929
}
3030
}
3131
try {

src/main/java/ee/bitweb/core/trace/thread/MDCTaskDecorator.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/test/java/ee/bitweb/core/TestSpringApplication.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package ee.bitweb.core;
22

3-
43
import tools.jackson.databind.json.JsonMapper;
54
import ee.bitweb.core.trace.creator.TraceIdCreator;
65
import org.springframework.boot.SpringApplication;
@@ -64,7 +63,7 @@ public String generate(String traceId) {
6463
public static class SecurityConfiguration {
6564

6665
@Bean
67-
protected SecurityFilterChain configure(HttpSecurity httpSecurity) throws Exception {
66+
protected SecurityFilterChain configure(HttpSecurity httpSecurity) {
6867
// Configure security to allow any request other than actuator requests
6968

7069
return httpSecurity

src/test/java/ee/bitweb/core/amqp/AmqpMessageListenerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class AmqpMessageListenerTests {
3737
private AmqpTestHelper amqpTestHelper;
3838

3939
@AfterEach
40-
public void cleanup() {
40+
void cleanup() {
4141
amqpTestHelper.clear(AmqpConfig.COMMAND_QUEUE_NAME);
4242
amqpTestHelper.clear(AmqpConfig.COMMAND_QUEUE_SIMPLE_NAME);
4343
amqpTestHelper.clear(AmqpConfig.COMMAND_DEAD_LETTER_EXCHANGE_NAME);

src/test/java/ee/bitweb/core/amqp/testcomponents/util/AmqpParsedMessage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
@Getter
88
@AllArgsConstructor
9-
public class AmqpParsedMessage<Body> {
9+
public class AmqpParsedMessage<B> {
1010

1111
private Message message;
12-
private Body body;
12+
private B body;
1313
}

0 commit comments

Comments
 (0)