Skip to content

Commit c9d8aad

Browse files
Dugong42Dugong42
committed
Fix code formatting and typos
1 parent 2c8f054 commit c9d8aad

File tree

5 files changed

+61
-51
lines changed

5 files changed

+61
-51
lines changed

‎api/src/main/java/io/kafbat/ui/client/RetryingKafkaConnectClient.java‎

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,17 @@ public class RetryingKafkaConnectClient extends KafkaConnectClientApi {
3434
private static final Duration RETRIES_DELAY = Duration.ofMillis(200);
3535

3636
public RetryingKafkaConnectClient(ClustersProperties.ConnectCluster config,
37-
@Nullable ClustersProperties.TruststoreConfig truststoreConfig,
38-
DataSize maxBuffSize) {
37+
@Nullable ClustersProperties.TruststoreConfig truststoreConfig,
38+
DataSize maxBuffSize) {
3939
super(new RetryingApiClient(config, truststoreConfig, maxBuffSize));
4040
}
4141

4242
private static Retry conflictCodeRetry() {
4343
return Retry
4444
.fixedDelay(MAX_RETRIES, RETRIES_DELAY)
4545
.filter(e -> e instanceof WebClientResponseException.Conflict)
46-
.onRetryExhaustedThrow((spec, signal) ->
47-
new KafkaConnectConflictReponseException(
48-
(WebClientResponseException.Conflict) signal.failure()));
46+
.onRetryExhaustedThrow((spec, signal) -> new KafkaConnectConflictReponseException(
47+
(WebClientResponseException.Conflict) signal.failure()));
4948
}
5049

5150
private static <T> Mono<T> withRetryOnConflict(Mono<T> publisher) {
@@ -58,25 +57,23 @@ private static <T> Flux<T> withRetryOnConflict(Flux<T> publisher) {
5857

5958
private static <T> Mono<T> withBadRequestErrorHandling(Mono<T> publisher) {
6059
return publisher
61-
.onErrorResume(WebClientResponseException.BadRequest.class, e ->
62-
Mono.error(new ValidationException("Invalid configuration")))
63-
.onErrorResume(WebClientResponseException.InternalServerError.class, e ->
64-
Mono.error(new ValidationException("Invalid configuration")));
60+
.onErrorResume(WebClientResponseException.BadRequest.class,
61+
e -> Mono.error(new ValidationException("Invalid configuration")))
62+
.onErrorResume(WebClientResponseException.InternalServerError.class,
63+
e -> Mono.error(new ValidationException("Invalid configuration")));
6564
}
6665

6766
@Override
6867
public Mono<Connector> createConnector(NewConnector newConnector) throws RestClientException {
6968
return withBadRequestErrorHandling(
70-
super.createConnector(newConnector)
71-
);
69+
super.createConnector(newConnector));
7270
}
7371

7472
@Override
7573
public Mono<Connector> setConnectorConfig(String connectorName, Map<String, Object> requestBody)
7674
throws RestClientException {
7775
return withBadRequestErrorHandling(
78-
super.setConnectorConfig(connectorName, requestBody)
79-
);
76+
super.setConnectorConfig(connectorName, requestBody));
8077
}
8178

8279
@Override
@@ -96,7 +93,6 @@ public Mono<ResponseEntity<Void>> deleteConnectorWithHttpInfo(String connectorNa
9693
return withRetryOnConflict(super.deleteConnectorWithHttpInfo(connectorName));
9794
}
9895

99-
10096
@Override
10197
public Mono<Connector> getConnector(String connectorName) throws WebClientResponseException {
10298
return withRetryOnConflict(super.getConnector(connectorName));
@@ -208,7 +204,7 @@ public Mono<Void> restartConnector(String connectorName, Boolean includeTasks, B
208204

209205
@Override
210206
public Mono<ResponseEntity<Void>> restartConnectorWithHttpInfo(String connectorName, Boolean includeTasks,
211-
Boolean onlyFailed) throws WebClientResponseException {
207+
Boolean onlyFailed) throws WebClientResponseException {
212208
return withRetryOnConflict(super.restartConnectorWithHttpInfo(connectorName, includeTasks, onlyFailed));
213209
}
214210

@@ -236,14 +232,14 @@ public Mono<ResponseEntity<Void>> resumeConnectorWithHttpInfo(String connectorNa
236232

237233
@Override
238234
public Mono<ResponseEntity<Connector>> setConnectorConfigWithHttpInfo(String connectorName,
239-
Map<String, Object> requestBody)
235+
Map<String, Object> requestBody)
240236
throws WebClientResponseException {
241237
return withRetryOnConflict(super.setConnectorConfigWithHttpInfo(connectorName, requestBody));
242238
}
243239

244240
@Override
245241
public Mono<ConnectorPluginConfigValidationResponse> validateConnectorPluginConfig(String pluginName,
246-
Map<String, Object> requestBody)
242+
Map<String, Object> requestBody)
247243
throws WebClientResponseException {
248244
return withRetryOnConflict(super.validateConnectorPluginConfig(pluginName, requestBody));
249245
}
@@ -257,29 +253,26 @@ public Mono<ResponseEntity<ConnectorPluginConfigValidationResponse>> validateCon
257253
private static class RetryingApiClient extends ApiClient {
258254

259255
public RetryingApiClient(ClustersProperties.ConnectCluster config,
260-
ClustersProperties.TruststoreConfig truststoreConfig,
261-
DataSize maxBuffSize) {
256+
ClustersProperties.TruststoreConfig truststoreConfig,
257+
DataSize maxBuffSize) {
262258
super(buildWebClient(maxBuffSize, config, truststoreConfig), null, null);
263259
setBasePath(config.getAddress());
264260
setUsername(config.getUsername());
265261
setPassword(config.getPassword());
266262
}
267263

268264
public static WebClient buildWebClient(DataSize maxBuffSize,
269-
ClustersProperties.ConnectCluster config,
270-
ClustersProperties.TruststoreConfig truststoreConfig) {
265+
ClustersProperties.ConnectCluster config,
266+
ClustersProperties.TruststoreConfig truststoreConfig) {
271267
return new WebClientConfigurator()
272268
.configureSsl(
273269
truststoreConfig,
274270
new ClustersProperties.KeystoreConfig(
275271
config.getKeystoreLocation(),
276-
config.getKeystorePassword()
277-
)
278-
)
272+
config.getKeystorePassword()))
279273
.configureBasicAuth(
280274
config.getUsername(),
281-
config.getPassword()
282-
)
275+
config.getPassword())
283276
.configureBufferSize(maxBuffSize)
284277
.build();
285278
}

‎api/src/main/java/io/kafbat/ui/controller/KafkaConnectController.java‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ public Mono<ResponseEntity<Flux<String>>> getConnectors(String clusterName, Stri
6262

6363
return validateAccess(context)
6464
.thenReturn(
65-
ResponseEntity.ok(kafkaConnectService.getConnectorNames(getCluster(clusterName), connectName)))
65+
ResponseEntity.ok(kafkaConnectService.getConnectorNames(
66+
getCluster(clusterName), connectName)))
6667
.doOnEach(sig -> audit(context, sig));
6768
}
6869

@@ -135,7 +136,8 @@ public Mono<ResponseEntity<Flux<FullConnectorInfoDTO>>> getAllConnectors(
135136
: getConnectorsComparator(orderBy).reversed();
136137

137138
Flux<FullConnectorInfoDTO> job = kafkaConnectService.getAllConnectors(getCluster(clusterName), search)
138-
.filterWhen(dto -> accessControlService.isConnectAccessible(dto.getConnect(), clusterName))
139+
.filterWhen(dto -> accessControlService.isConnectAccessible(dto.getConnect(),
140+
clusterName))
139141
.sort(comparator);
140142

141143
return Mono.just(ResponseEntity.ok(job))
@@ -176,7 +178,8 @@ public Mono<ResponseEntity<ConnectorDTO>> setConnectorConfig(String clusterName,
176178

177179
return validateAccess(context).then(
178180
kafkaConnectService
179-
.setConnectorConfig(getCluster(clusterName), connectName, connectorName, requestBody)
181+
.setConnectorConfig(getCluster(clusterName), connectName, connectorName,
182+
requestBody)
180183
.map(ResponseEntity::ok))
181184
.doOnEach(sig -> audit(context, sig));
182185
}
@@ -202,7 +205,8 @@ public Mono<ResponseEntity<Void>> updateConnectorState(String clusterName, Strin
202205

203206
return validateAccess(context).then(
204207
kafkaConnectService
205-
.updateConnectorState(getCluster(clusterName), connectName, connectorName, action)
208+
.updateConnectorState(getCluster(clusterName), connectName,
209+
connectorName, action)
206210
.map(ResponseEntity::ok))
207211
.doOnEach(sig -> audit(context, sig));
208212
}
@@ -222,7 +226,8 @@ public Mono<ResponseEntity<Flux<TaskDTO>>> getConnectorTasks(String clusterName,
222226
return validateAccess(context).thenReturn(
223227
ResponseEntity
224228
.ok(kafkaConnectService
225-
.getConnectorTasks(getCluster(clusterName), connectName, connectorName)))
229+
.getConnectorTasks(getCluster(clusterName), connectName,
230+
connectorName)))
226231
.doOnEach(sig -> audit(context, sig));
227232
}
228233

@@ -240,7 +245,8 @@ public Mono<ResponseEntity<Void>> restartConnectorTask(String clusterName, Strin
240245

241246
return validateAccess(context).then(
242247
kafkaConnectService
243-
.restartConnectorTask(getCluster(clusterName), connectName, connectorName, taskId)
248+
.restartConnectorTask(getCluster(clusterName), connectName,
249+
connectorName, taskId)
244250
.map(ResponseEntity::ok))
245251
.doOnEach(sig -> audit(context, sig));
246252
}
@@ -258,13 +264,15 @@ public Mono<ResponseEntity<Flux<ConnectorPluginDTO>>> getConnectorPlugins(
258264
return validateAccess(context).then(
259265
Mono.just(
260266
ResponseEntity.ok(
261-
kafkaConnectService.getConnectorPlugins(getCluster(clusterName), connectName))))
267+
kafkaConnectService.getConnectorPlugins(
268+
getCluster(clusterName), connectName))))
262269
.doOnEach(sig -> audit(context, sig));
263270
}
264271

265272
@Override
266273
public Mono<ResponseEntity<ConnectorPluginConfigValidationResponseDTO>> validateConnectorPluginConfig(
267-
String clusterName, String connectName, String pluginName, @Valid Mono<Map<String, Object>> requestBody,
274+
String clusterName, String connectName, String pluginName,
275+
@Valid Mono<Map<String, Object>> requestBody,
268276
ServerWebExchange exchange) {
269277
return kafkaConnectService
270278
.validateConnectorPluginConfig(
@@ -280,7 +288,8 @@ private Comparator<FullConnectorInfoDTO> getConnectorsComparator(ConnectorColumn
280288
return switch (orderBy) {
281289
case CONNECT -> Comparator.comparing(FullConnectorInfoDTO::getConnect);
282290
case TYPE -> Comparator.comparing(FullConnectorInfoDTO::getType);
283-
case STATUS -> Comparator.comparing(fullConnectorInfoDTO -> fullConnectorInfoDTO.getStatus().getState());
291+
case STATUS -> Comparator
292+
.comparing(fullConnectorInfoDTO -> fullConnectorInfoDTO.getStatus().getState());
284293
default -> defaultComparator;
285294
};
286295
}
@@ -302,7 +311,8 @@ public Mono<ResponseEntity<Void>> resetConnectorOffsets(String clusterName, Stri
302311

303312
return validateAccess(context).then(
304313
kafkaConnectService
305-
.resetConnectorOffsets(getCluster(clusterName), connectName, connectorName)
314+
.resetConnectorOffsets(getCluster(clusterName), connectName,
315+
connectorName)
306316
.map(ResponseEntity::ok))
307317
.doOnEach(sig -> audit(context, sig));
308318
}

‎frontend/src/components/Connect/Details/Actions/Actions.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ const Actions: React.FC = () => {
111111
Stop
112112
</ActionDropdownItem>
113113
)}
114-
{(connector?.status.state === ConnectorState.PAUSED || connector?.status.state === ConnectorState.STOPPED) && (
114+
{(connector?.status.state === ConnectorState.PAUSED ||
115+
connector?.status.state === ConnectorState.STOPPED) && (
115116
<ActionDropdownItem
116117
onClick={resumeConnectorHandler}
117118
disabled={isMutating}
@@ -161,7 +162,9 @@ const Actions: React.FC = () => {
161162
<Dropdown>
162163
<ActionDropdownItem
163164
onClick={resetConnectorOffsetsHandler}
164-
disabled={isMutating || connector?.status.state !== ConnectorState.STOPPED}
165+
disabled={
166+
isMutating || connector?.status.state !== ConnectorState.STOPPED
167+
}
165168
danger
166169
permission={{
167170
resource: ResourceType.CONNECT,

‎frontend/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ describe('Actions', () => {
8484
expect(screen.getByText('Resume')).toBeInTheDocument();
8585
expect(screen.queryByText('Pause')).not.toBeInTheDocument();
8686
expect(screen.queryByText('Stop')).not.toBeInTheDocument();
87-
expect(screen.queryByText('Reset Connector Offsets')).toBeInTheDocument();
88-
expect(screen.getByText('Reset Connector Offsets')).toBeDisabled();
87+
expect(screen.queryByText('Reset Offsets')).toBeInTheDocument();
88+
expect(screen.getByText('Reset Offsets')).toBeDisabled();
8989
expectActionButtonsExists();
9090
});
9191

@@ -99,8 +99,8 @@ describe('Actions', () => {
9999
expect(screen.getByText('Resume')).toBeInTheDocument();
100100
expect(screen.queryByText('Pause')).not.toBeInTheDocument();
101101
expect(screen.queryByText('Stop')).not.toBeInTheDocument();
102-
expect(screen.queryByText('Reset Connector Offsets')).toBeInTheDocument();
103-
expect(screen.getByText('Reset Connector Offsets')).not.toBeDisabled();
102+
expect(screen.queryByText('Reset Offsets')).toBeInTheDocument();
103+
expect(screen.getByText('Reset Offsets')).toBeEnabled();
104104
expectActionButtonsExists();
105105
});
106106

@@ -114,8 +114,8 @@ describe('Actions', () => {
114114
expect(screen.queryByText('Resume')).not.toBeInTheDocument();
115115
expect(screen.queryByText('Pause')).not.toBeInTheDocument();
116116
expect(screen.queryByText('Stop')).not.toBeInTheDocument();
117-
expect(screen.queryByText('Reset Connector Offsets')).toBeInTheDocument();
118-
expect(screen.getByText('Reset Connector Offsets')).toBeDisabled();
117+
expect(screen.queryByText('Reset Offsets')).toBeInTheDocument();
118+
expect(screen.getByText('Reset Offsets')).toBeDisabled();
119119
expectActionButtonsExists();
120120
});
121121

@@ -129,8 +129,8 @@ describe('Actions', () => {
129129
expect(screen.queryByText('Resume')).not.toBeInTheDocument();
130130
expect(screen.queryByText('Pause')).not.toBeInTheDocument();
131131
expect(screen.queryByText('Stop')).not.toBeInTheDocument();
132-
expect(screen.queryByText('Reset Connector Offsets')).toBeInTheDocument();
133-
expect(screen.getByText('Reset Connector Offsets')).toBeDisabled();
132+
expect(screen.queryByText('Reset Offsets')).toBeInTheDocument();
133+
expect(screen.getByText('Reset Offsets')).toBeDisabled();
134134
expectActionButtonsExists();
135135
});
136136

@@ -144,8 +144,8 @@ describe('Actions', () => {
144144
expect(screen.queryByText('Resume')).not.toBeInTheDocument();
145145
expect(screen.getByText('Pause')).toBeInTheDocument();
146146
expect(screen.getByText('Stop')).toBeInTheDocument();
147-
expect(screen.queryByText('Reset Connector Offsets')).toBeInTheDocument();
148-
expect(screen.getByText('Reset Connector Offsets')).toBeDisabled();
147+
expect(screen.queryByText('Reset Offsets')).toBeInTheDocument();
148+
expect(screen.getByText('Reset Offsets')).toBeDisabled();
149149
expectActionButtonsExists();
150150
});
151151

@@ -169,7 +169,9 @@ describe('Actions', () => {
169169
renderComponent();
170170
await afterClickDropDownButton();
171171
await waitFor(async () =>
172-
userEvent.click(screen.getByRole('menuitem', { name: 'Reset Offsets' }))
172+
userEvent.click(
173+
screen.getByRole('menuitem', { name: 'Reset Offsets' })
174+
)
173175
);
174176
expect(screen.getByRole('dialog')).toBeInTheDocument();
175177
});

‎frontend/src/components/Connect/List/ActionsCell.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ const ActionsCell: React.FC<CellContext<FullConnectorInfo, unknown>> = ({
8181

8282
return (
8383
<Dropdown>
84-
{(status.state === ConnectorState.PAUSED || status.state === ConnectorState.STOPPED) && (
84+
{(status.state === ConnectorState.PAUSED ||
85+
status.state === ConnectorState.STOPPED) && (
8586
<ActionDropdownItem
8687
onClick={resumeConnectorHandler}
8788
disabled={isMutating}
@@ -172,7 +173,8 @@ const ActionsCell: React.FC<CellContext<FullConnectorInfo, unknown>> = ({
172173
resource: ResourceType.CONNECT,
173174
action: Action.DELETE,
174175
value: connect,
175-
}}>
176+
}}
177+
>
176178
Delete
177179
</ActionDropdownItem>
178180
</Dropdown>

0 commit comments

Comments
 (0)