Skip to content

Commit 80024c8

Browse files
dshubhadeepHaarolean
dshubhadeep
and
Haarolean
authored
BE: Fix sonar code smells (#3971)
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
1 parent 0d6f293 commit 80024c8

27 files changed

+183
-159
lines changed

‎kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CorsGlobalConfiguration.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
import org.springframework.http.HttpStatus;
88
import org.springframework.http.server.reactive.ServerHttpRequest;
99
import org.springframework.http.server.reactive.ServerHttpResponse;
10-
import org.springframework.web.reactive.config.CorsRegistry;
11-
import org.springframework.web.reactive.config.WebFluxConfigurer;
1210
import org.springframework.web.server.ServerWebExchange;
1311
import org.springframework.web.server.WebFilter;
1412
import org.springframework.web.server.WebFilterChain;

‎kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/WebclientProperties.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.provectus.kafka.ui.config;
22

33
import com.provectus.kafka.ui.exception.ValidationException;
4-
import java.beans.Transient;
54
import javax.annotation.PostConstruct;
65
import lombok.Data;
76
import org.springframework.boot.context.properties.ConfigurationProperties;

‎kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/AuthenticatedUser.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.provectus.kafka.ui.config.auth;
22

33
import java.util.Collection;
4-
import lombok.Value;
54

65
public record AuthenticatedUser(String principal, Collection<String> groups) {
76

‎kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacOAuth2User.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.Collection;
44
import java.util.Map;
5-
import lombok.Value;
65
import org.springframework.security.core.GrantedAuthority;
76
import org.springframework.security.oauth2.core.user.OAuth2User;
87

‎kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacOidcUser.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.Collection;
44
import java.util.Map;
5-
import lombok.Value;
65
import org.springframework.security.core.GrantedAuthority;
76
import org.springframework.security.oauth2.core.oidc.OidcIdToken;
87
import org.springframework.security.oauth2.core.oidc.OidcUserInfo;

‎kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AccessController.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import java.util.Collections;
1414
import java.util.List;
1515
import java.util.Objects;
16-
import java.util.stream.Collectors;
1716
import javax.annotation.Nullable;
1817
import lombok.RequiredArgsConstructor;
1918
import lombok.extern.slf4j.Slf4j;
@@ -38,7 +37,7 @@ public Mono<ResponseEntity<AuthenticationInfoDTO>> getUserAuthInfo(ServerWebExch
3837
.filter(role -> user.groups().contains(role.getName()))
3938
.map(role -> mapPermissions(role.getPermissions(), role.getClusters()))
4039
.flatMap(Collection::stream)
41-
.collect(Collectors.toList())
40+
.toList()
4241
)
4342
.switchIfEmpty(Mono.just(Collections.emptyList()));
4443

@@ -70,10 +69,10 @@ private List<UserPermissionDTO> mapPermissions(List<Permission> permissions, Lis
7069
.map(String::toUpperCase)
7170
.map(this::mapAction)
7271
.filter(Objects::nonNull)
73-
.collect(Collectors.toList()));
72+
.toList());
7473
return dto;
7574
})
76-
.collect(Collectors.toList());
75+
.toList();
7776
}
7877

7978
@Nullable

‎kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
@RequiredArgsConstructor
2727
@Slf4j
2828
public class BrokersController extends AbstractController implements BrokersApi {
29+
private static final String BROKER_ID = "brokerId";
30+
2931
private final BrokerService brokerService;
3032
private final ClusterMapper clusterMapper;
3133

@@ -89,7 +91,7 @@ public Mono<ResponseEntity<Flux<BrokerConfigDTO>>> getBrokerConfig(String cluste
8991
.cluster(clusterName)
9092
.clusterConfigActions(ClusterConfigAction.VIEW)
9193
.operationName("getBrokerConfig")
92-
.operationParams(Map.of("brokerId", id))
94+
.operationParams(Map.of(BROKER_ID, id))
9395
.build();
9496

9597
return validateAccess(context).thenReturn(
@@ -108,7 +110,7 @@ public Mono<ResponseEntity<Void>> updateBrokerTopicPartitionLogDir(String cluste
108110
.cluster(clusterName)
109111
.clusterConfigActions(ClusterConfigAction.VIEW, ClusterConfigAction.EDIT)
110112
.operationName("updateBrokerTopicPartitionLogDir")
111-
.operationParams(Map.of("brokerId", id))
113+
.operationParams(Map.of(BROKER_ID, id))
112114
.build();
113115

114116
return validateAccess(context).then(
@@ -128,7 +130,7 @@ public Mono<ResponseEntity<Void>> updateBrokerConfigByName(String clusterName,
128130
.cluster(clusterName)
129131
.clusterConfigActions(ClusterConfigAction.VIEW, ClusterConfigAction.EDIT)
130132
.operationName("updateBrokerConfigByName")
131-
.operationParams(Map.of("brokerId", id))
133+
.operationParams(Map.of(BROKER_ID, id))
132134
.build();
133135

134136
return validateAccess(context).then(

‎kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.util.Map;
2323
import java.util.Optional;
2424
import java.util.function.Supplier;
25-
import java.util.stream.Collectors;
2625
import lombok.RequiredArgsConstructor;
2726
import lombok.extern.slf4j.Slf4j;
2827
import org.springframework.beans.factory.annotation.Value;
@@ -200,7 +199,7 @@ private ConsumerGroupsPageResponseDTO convertPage(ConsumerGroupService.ConsumerG
200199
.consumerGroups(consumerGroupConsumerGroupsPage.consumerGroups()
201200
.stream()
202201
.map(ConsumerGroupMapper::toDto)
203-
.collect(Collectors.toList()));
202+
.toList());
204203
}
205204

206205
}

‎kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
public class KafkaConnectController extends AbstractController implements KafkaConnectApi {
3737
private static final Set<ConnectorActionDTO> RESTART_ACTIONS
3838
= Set.of(RESTART, RESTART_FAILED_TASKS, RESTART_ALL_TASKS);
39+
private static final String CONNECTOR_NAME = "connectorName";
3940

4041
private final KafkaConnectService kafkaConnectService;
4142

@@ -112,7 +113,7 @@ public Mono<ResponseEntity<Void>> deleteConnector(String clusterName, String con
112113
.connect(connectName)
113114
.connectActions(ConnectAction.VIEW, ConnectAction.EDIT)
114115
.operationName("deleteConnector")
115-
.operationParams(Map.of("connectorName", connectName))
116+
.operationParams(Map.of(CONNECTOR_NAME, connectName))
116117
.build();
117118

118119
return validateAccess(context).then(
@@ -180,7 +181,7 @@ public Mono<ResponseEntity<ConnectorDTO>> setConnectorConfig(String clusterName,
180181
.connect(connectName)
181182
.connectActions(ConnectAction.VIEW, ConnectAction.EDIT)
182183
.operationName("setConnectorConfig")
183-
.operationParams(Map.of("connectorName", connectorName))
184+
.operationParams(Map.of(CONNECTOR_NAME, connectorName))
184185
.build();
185186

186187
return validateAccess(context).then(
@@ -207,7 +208,7 @@ public Mono<ResponseEntity<Void>> updateConnectorState(String clusterName, Strin
207208
.connect(connectName)
208209
.connectActions(connectActions)
209210
.operationName("updateConnectorState")
210-
.operationParams(Map.of("connectorName", connectorName))
211+
.operationParams(Map.of(CONNECTOR_NAME, connectorName))
211212
.build();
212213

213214
return validateAccess(context).then(
@@ -227,7 +228,7 @@ public Mono<ResponseEntity<Flux<TaskDTO>>> getConnectorTasks(String clusterName,
227228
.connect(connectName)
228229
.connectActions(ConnectAction.VIEW)
229230
.operationName("getConnectorTasks")
230-
.operationParams(Map.of("connectorName", connectorName))
231+
.operationParams(Map.of(CONNECTOR_NAME, connectorName))
231232
.build();
232233

233234
return validateAccess(context).thenReturn(
@@ -247,7 +248,7 @@ public Mono<ResponseEntity<Void>> restartConnectorTask(String clusterName, Strin
247248
.connect(connectName)
248249
.connectActions(ConnectAction.VIEW, ConnectAction.RESTART)
249250
.operationName("restartConnectorTask")
250-
.operationParams(Map.of("connectorName", connectorName))
251+
.operationParams(Map.of(CONNECTOR_NAME, connectorName))
251252
.build();
252253

253254
return validateAccess(context).then(

‎kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import com.provectus.kafka.ui.service.SchemaRegistryService;
1616
import java.util.List;
1717
import java.util.Map;
18-
import java.util.stream.Collectors;
1918
import javax.validation.Valid;
2019
import lombok.RequiredArgsConstructor;
2120
import lombok.extern.slf4j.Slf4j;
@@ -235,7 +234,7 @@ public Mono<ResponseEntity<SchemaSubjectsResponseDTO>> getSchemas(String cluster
235234
List<String> subjectsToRender = filteredSubjects.stream()
236235
.skip(subjectToSkip)
237236
.limit(pageSize)
238-
.collect(Collectors.toList());
237+
.toList();
239238
return schemaRegistryService.getAllLatestVersionSchemas(getCluster(clusterName), subjectsToRender)
240239
.map(subjs -> subjs.stream().map(kafkaSrMapper::toDto).toList())
241240
.map(subjs -> new SchemaSubjectsResponseDTO().pageCount(totalPages).schemas(subjs));

0 commit comments

Comments
 (0)