Skip to content

Commit b4ab316

Browse files
MarineLeMMarineLeM
committed
[frontend/backend] feat : apply spotless + correct eslint
Signed-off-by: Marine LM <[email protected]>
1 parent 09c1c87 commit b4ab316

28 files changed

+486
-382
lines changed

‎openaev-api/src/main/java/io/openaev/api/xtm_composer/XtmComposerApi.java‎

Lines changed: 44 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,20 @@
66
import io.openaev.api.xtm_composer.dto.XtmComposerRegisterInput;
77
import io.openaev.api.xtm_composer.dto.XtmComposerUpdateStatusInput;
88
import io.openaev.database.model.Action;
9+
import io.openaev.database.model.ConnectorInstance;
10+
import io.openaev.database.model.ConnectorInstanceLog;
911
import io.openaev.database.model.ResourceType;
12+
import io.openaev.rest.connector_instance.dto.ConnectorInstanceHealthInput;
13+
import io.openaev.rest.connector_instance.dto.ConnectorInstanceLogsInput;
1014
import io.openaev.rest.helper.RestBehavior;
11-
import io.openaev.service.ConnectorOrchestrationService;
12-
import io.openaev.service.XtmComposerService;
15+
import io.openaev.service.connectors.ConnectorOrchestrationService;
16+
import io.openaev.service.connectors.XtmComposerService;
1317
import io.swagger.v3.oas.annotations.Operation;
1418
import io.swagger.v3.oas.annotations.responses.ApiResponse;
1519
import io.swagger.v3.oas.annotations.responses.ApiResponses;
1620
import io.swagger.v3.oas.annotations.tags.Tag;
1721
import jakarta.validation.Valid;
1822
import jakarta.validation.constraints.NotBlank;
19-
20-
import java.time.Instant;
2123
import java.time.LocalDateTime;
2224
import java.util.List;
2325
import lombok.RequiredArgsConstructor;
@@ -55,11 +57,10 @@ public XtmComposerOutput refreshConnectivity(@Valid @RequestBody String composer
5557
return xtmComposerService.refreshConnectivity(composerId, LocalDateTime.now());
5658
}
5759

58-
@GetMapping(value=XTMCOMPOSER_URI+"/reachable")
60+
@GetMapping(value = XTMCOMPOSER_URI + "/reachable")
5961
@Operation(
60-
summary = "Check if XtmComposer is reachable and registered in OpenAEV",
61-
description = "Returns true if XtmComposer is reachable, false otherwise"
62-
)
62+
summary = "Check if XtmComposer is reachable and registered in OpenAEV",
63+
description = "Returns true if XtmComposer is reachable, false otherwise")
6364
@RBAC(actionPerformed = Action.READ, resourceType = ResourceType.CATALOG)
6465
public boolean isXtmComposerReachable() {
6566
try {
@@ -95,4 +96,39 @@ public XtmComposerInstanceOutput updateConnectorInstanceStatus(
9596
return orchestrationService.updateConnectorInstanceStatus(
9697
xtmComposerId, connectorInstanceId, input.getCurrentStatus());
9798
}
99+
100+
@PostMapping(
101+
value = XTMCOMPOSER_URI + "/{xtmComposerId}/connector-instances/{connectorInstanceId}/logs")
102+
@Operation(
103+
summary = "Received connector instance logs",
104+
description = "Receive logs from connector instances")
105+
@RBAC(actionPerformed = Action.WRITE, resourceType = ResourceType.CATALOG)
106+
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Successful reception")})
107+
public ConnectorInstanceLog receiveConnectorInstanceLogs(
108+
@PathVariable @NotBlank final String xtmComposerId,
109+
@PathVariable @NotBlank final String connectorInstanceId,
110+
@Valid @RequestBody ConnectorInstanceLogsInput input) {
111+
return orchestrationService.pushLogsByConnectorInstance(
112+
xtmComposerId, connectorInstanceId, input.getLogs());
113+
}
114+
115+
@PutMapping(
116+
value =
117+
XTMCOMPOSER_URI
118+
+ "/{xtmComposerId}/connector-instances/{connectorInstanceId}/health-check")
119+
@Operation(
120+
summary = "Health check of connector instance",
121+
description = "Receive health check of connector instances from xtm composer")
122+
@RBAC(actionPerformed = Action.WRITE, resourceType = ResourceType.CATALOG)
123+
@ApiResponses(
124+
value = {
125+
@ApiResponse(responseCode = "200", description = "Successful health check reception")
126+
})
127+
public ConnectorInstance receiveConnectorInstanceHealthCheck(
128+
@PathVariable @NotBlank final String xtmComposerId,
129+
@PathVariable @NotBlank final String connectorInstanceId,
130+
@Valid @RequestBody ConnectorInstanceHealthInput input) {
131+
return orchestrationService.patchConnectorInstanceHealthCheck(
132+
xtmComposerId, connectorInstanceId, input);
133+
}
98134
}

‎openaev-api/src/main/java/io/openaev/executors/ExecutorService.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
import io.openaev.database.repository.ExecutorRepository;
1212
import io.openaev.rest.catalog_connector.dto.ConnectorIds;
1313
import io.openaev.rest.executor.form.ExecutorOutput;
14-
import io.openaev.service.connector_instances.ConnectorInstanceService;
1514
import io.openaev.service.FileService;
1615
import io.openaev.service.catalog_connectors.CatalogConnectorService;
16+
import io.openaev.service.connector_instances.ConnectorInstanceService;
1717
import io.openaev.service.connectors.AbstractConnectorService;
1818
import io.openaev.utils.mapper.CatalogConnectorMapper;
1919
import io.openaev.utils.mapper.ExecutorMapper;
@@ -22,7 +22,6 @@
2222
import java.io.InputStream;
2323
import java.util.List;
2424
import java.util.Optional;
25-
2625
import org.springframework.beans.factory.annotation.Autowired;
2726
import org.springframework.stereotype.Service;
2827

‎openaev-api/src/main/java/io/openaev/migration/V4_55__Update_catalog_connector_configuration_type.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,24 @@ public class V4_55__Update_catalog_connector_configuration_type extends BaseJava
1111
public void migrate(Context context) throws Exception {
1212
try (Statement select = context.getConnection().createStatement()) {
1313
select.execute(
14-
"""
14+
"""
1515
CREATE TYPE connector_configuration_type AS ENUM ('ARRAY', 'BOOLEAN', 'INTEGER', 'OBJECT', 'STRING');
1616
CREATE TYPE connector_configuration_format AS ENUM ('DATE', 'DATETIME', 'DURATION', 'EMAIL', 'PASSWORD', 'URI');
17-
17+
1818
ALTER TABLE catalog_connectors_configuration
1919
DROP COLUMN IF EXISTS connector_configuration_type,
2020
DROP COLUMN IF EXISTS connector_configuration_format
2121
""");
2222

2323
select.execute(
24-
"""
24+
"""
2525
ALTER TABLE catalog_connectors_configuration
2626
ADD COLUMN connector_configuration_type connector_configuration_type,
2727
ADD COLUMN connector_configuration_format connector_configuration_format
2828
""");
2929

3030
select.execute(
31-
"""
31+
"""
3232
ALTER TABLE connector_instance_logs
3333
RENAME COLUMN connector_configuration_created_at TO connector_instance_log_created_at;
3434
""");

‎openaev-api/src/main/java/io/openaev/rest/catalog_connector/CatalogConnectorApi.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import io.openaev.database.model.CatalogConnectorConfiguration;
66
import io.openaev.database.model.ResourceType;
77
import io.openaev.rest.catalog_connector.dto.CatalogConnectorOutput;
8-
import io.openaev.rest.exception.ElementNotFoundException;
98
import io.openaev.rest.helper.RestBehavior;
109
import io.openaev.service.FileService;
1110
import io.openaev.service.catalog_connectors.CatalogConnectorService;

‎openaev-api/src/main/java/io/openaev/rest/collector/service/CollectorService.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
import io.openaev.rest.catalog_connector.dto.ConnectorIds;
1515
import io.openaev.rest.collector.form.CollectorOutput;
1616
import io.openaev.rest.exception.ElementNotFoundException;
17-
import io.openaev.service.connector_instances.ConnectorInstanceService;
1817
import io.openaev.service.FileService;
1918
import io.openaev.service.catalog_connectors.CatalogConnectorService;
19+
import io.openaev.service.connector_instances.ConnectorInstanceService;
2020
import io.openaev.service.connectors.AbstractConnectorService;
2121
import io.openaev.utils.mapper.CatalogConnectorMapper;
2222
import io.openaev.utils.mapper.CollectorMapper;
@@ -52,9 +52,7 @@ public CollectorService(
5252
CollectorMapper collectorMapper,
5353
CatalogConnectorMapper catalogConnectorMapper) {
5454
super(
55-
connectorInstanceConfigurationRepository,
56-
catalogConnectorService,
57-
catalogConnectorMapper);
55+
connectorInstanceConfigurationRepository, catalogConnectorService, catalogConnectorMapper);
5856
this.collectorRepository = collectorRepository;
5957
this.fileService = fileService;
6058
this.connectorInstanceService = connectorInstanceService;
@@ -125,8 +123,10 @@ public ConnectorIds getCollectorRelationsId(String collectorId) {
125123
}
126124

127125
public Collector collectorByType(String type) {
128-
return findCollectorByType(type).orElseThrow(() -> new ElementNotFoundException("Collector not found with type: " + type));
126+
return findCollectorByType(type)
127+
.orElseThrow(() -> new ElementNotFoundException("Collector not found with type: " + type));
129128
}
129+
130130
public Optional<Collector> findCollectorByType(String type) {
131131
return collectorRepository.findByType(type);
132132
}

‎openaev-api/src/main/java/io/openaev/rest/connector_instance/ConnectorInstanceApi.java‎

Lines changed: 29 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import io.openaev.database.model.*;
55
import io.openaev.rest.connector_instance.dto.*;
66
import io.openaev.rest.helper.RestBehavior;
7-
import io.openaev.service.ConnectorInstanceLogService;
7+
import io.openaev.service.connector_instances.ConnectorInstanceLogService;
88
import io.openaev.service.connector_instances.ConnectorInstanceService;
9-
import io.openaev.service.ConnectorOrchestrationService;
9+
import io.openaev.service.connectors.ConnectorOrchestrationService;
1010
import io.swagger.v3.oas.annotations.Operation;
1111
import io.swagger.v3.oas.annotations.media.ArraySchema;
1212
import io.swagger.v3.oas.annotations.media.Content;
@@ -16,11 +16,10 @@
1616
import io.swagger.v3.oas.annotations.tags.Tag;
1717
import jakarta.validation.Valid;
1818
import jakarta.validation.constraints.NotBlank;
19-
import lombok.RequiredArgsConstructor;
20-
import org.springframework.web.bind.annotation.*;
21-
2219
import java.util.List;
2320
import java.util.Set;
21+
import lombok.RequiredArgsConstructor;
22+
import org.springframework.web.bind.annotation.*;
2423

2524
@RestController
2625
@RequiredArgsConstructor
@@ -65,75 +64,49 @@ public ConnectorInstanceOutput getConnectorInstance(
6564
@Operation(summary = "Retrieve connector Instance configuratiosn by instance id")
6665
@RBAC(actionPerformed = Action.READ, resourceType = ResourceType.CATALOG)
6766
@ApiResponse(
68-
responseCode = "200",
69-
content =
67+
responseCode = "200",
68+
content =
7069
@Content(
71-
mediaType = "application/json",
72-
array = @ArraySchema(schema = @Schema(implementation = ConnectorInstanceConfiguration.class))))
70+
mediaType = "application/json",
71+
array =
72+
@ArraySchema(
73+
schema = @Schema(implementation = ConnectorInstanceConfiguration.class))))
7374
public Set<ConnectorInstanceConfiguration> getConnectorInstanceConfiguration(
74-
@PathVariable @NotBlank final String connectorInstanceId) {
75+
@PathVariable @NotBlank final String connectorInstanceId) {
7576
return connectorInstanceService.getConnectorInstanceConfigurations(connectorInstanceId);
7677
}
7778

7879
@PutMapping(value = CONNECTOR_INSTANCE_URI + "/{connectorInstanceId}/configurations")
79-
@Operation(
80-
summary = "Update connector instance configuration")
80+
@Operation(summary = "Update connector instance configuration")
8181
@RBAC(actionPerformed = Action.WRITE, resourceType = ResourceType.CATALOG)
8282
@ApiResponse(
83-
responseCode = "200",
84-
content =
83+
responseCode = "200",
84+
content =
8585
@Content(
86-
mediaType = "application/json",
87-
array = @ArraySchema(schema = @Schema(implementation = ConnectorInstanceConfiguration.class))))
86+
mediaType = "application/json",
87+
array =
88+
@ArraySchema(
89+
schema = @Schema(implementation = ConnectorInstanceConfiguration.class))))
8890
public List<ConnectorInstanceConfiguration> updateConnectorInstanceConfigurations(
89-
@PathVariable @NotBlank final String connectorInstanceId,
90-
@Valid @RequestBody CreateConnectorInstanceInput input) {
91+
@PathVariable @NotBlank final String connectorInstanceId,
92+
@Valid @RequestBody CreateConnectorInstanceInput input) {
9193
return orchestrationService.updateConnectorInstanceConfiguration(connectorInstanceId, input);
9294
}
9395

9496
@GetMapping(value = CONNECTOR_INSTANCE_URI + "/{connectorInstanceId}/logs")
95-
@Operation(
96-
summary = "Retrieve connector instance logs")
97+
@Operation(summary = "Retrieve connector instance logs")
9798
@RBAC(actionPerformed = Action.READ, resourceType = ResourceType.CATALOG)
9899
@ApiResponse(
99-
responseCode = "200",
100-
content =
100+
responseCode = "200",
101+
content =
101102
@Content(
102-
mediaType = "application/json",
103-
array = @ArraySchema(schema = @Schema(implementation = ConnectorInstanceLog.class))))
104-
public List<ConnectorInstanceLog> retrieveConnectorInstanceLogs(@PathVariable @NotBlank final String connectorInstanceId) {
103+
mediaType = "application/json",
104+
array = @ArraySchema(schema = @Schema(implementation = ConnectorInstanceLog.class))))
105+
public List<ConnectorInstanceLog> retrieveConnectorInstanceLogs(
106+
@PathVariable @NotBlank final String connectorInstanceId) {
105107
return connectorInstanceLogService.findLogsByConnectorInstanceId(connectorInstanceId);
106108
}
107109

108-
// TODO should be inside XTMComposerAPI
109-
@PostMapping(value = CONNECTOR_INSTANCE_URI + "/{connectorInstanceId}/logs")
110-
@Operation(
111-
summary = "Received connector instance logs",
112-
description = "Receive logs from connector instances")
113-
@RBAC(actionPerformed = Action.WRITE, resourceType = ResourceType.CATALOG)
114-
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Successful reception")})
115-
public ConnectorInstanceLog receiveConnectorInstanceLogs(
116-
@PathVariable @NotBlank final String connectorInstanceId,
117-
@Valid @RequestBody ConnectorInstanceLogsInput input) {
118-
return connectorInstanceService.pushLogsByConnectorInstance(connectorInstanceId, input.getLogs());
119-
}
120-
121-
// TODO should be inside XTMComposerAPI
122-
@PutMapping(value = CONNECTOR_INSTANCE_URI + "/{connectorInstanceId}/health-check")
123-
@Operation(
124-
summary = "Health check of connector instance",
125-
description = "Receive health check of connector instances from xtm composer")
126-
@RBAC(actionPerformed = Action.WRITE, resourceType = ResourceType.CATALOG)
127-
@ApiResponses(
128-
value = {
129-
@ApiResponse(responseCode = "200", description = "Successful health check reception")
130-
})
131-
public void receiveConnectorInstanceHealthCheck(
132-
@PathVariable @NotBlank final String connectorInstanceId,
133-
@Valid @RequestBody ConnectorInstanceHealthInput input) {
134-
connectorInstanceService.patchConnectorInstanceHealthCheck(connectorInstanceId, input);
135-
}
136-
137110
@PutMapping(value = CONNECTOR_INSTANCE_URI + "/{connectorInstanceId}/requested-status")
138111
@Operation(
139112
summary = "Update requested status",
@@ -146,7 +119,8 @@ public void receiveConnectorInstanceHealthCheck(
146119
public ConnectorInstance updateRequestedStatus(
147120
@PathVariable @NotBlank final String connectorInstanceId,
148121
@Valid @RequestBody UpdateConnectorInstanceRequestedStatus input) {
149-
return orchestrationService.updateRequestedStatus(connectorInstanceId, input.getRequestedStatus());
122+
return orchestrationService.updateRequestedStatus(
123+
connectorInstanceId, input.getRequestedStatus());
150124
}
151125

152126
@DeleteMapping(value = CONNECTOR_INSTANCE_URI + "/{connectorInstanceId}")

‎openaev-api/src/main/java/io/openaev/rest/connector_instance/dto/ConnectorInstanceOutput.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
@Builder
1111
@Data
1212
public class ConnectorInstanceOutput {
13-
@JsonProperty("connector_instance_id")
14-
@NotBlank
15-
private String id;
13+
@JsonProperty("connector_instance_id")
14+
@NotBlank
15+
private String id;
1616

17-
@JsonProperty("connector_instance_current_status")
18-
@NotNull
19-
private ConnectorInstance.CURRENT_STATUS_TYPE currentStatus;
17+
@JsonProperty("connector_instance_current_status")
18+
@NotNull
19+
private ConnectorInstance.CURRENT_STATUS_TYPE currentStatus;
2020

21-
@JsonProperty("connector_instance_requested_status")
22-
private ConnectorInstance.REQUESTED_STATUS_TYPE requestedStatus;
21+
@JsonProperty("connector_instance_requested_status")
22+
private ConnectorInstance.REQUESTED_STATUS_TYPE requestedStatus;
2323
}

‎openaev-api/src/main/java/io/openaev/service/catalog_connectors/CatalogConnectorIngestionService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import io.openaev.database.model.ConnectorInstance;
77
import io.openaev.database.model.ConnectorInstanceConfiguration;
88
import io.openaev.database.repository.ConnectorInstanceConfigurationRepository;
9-
import io.openaev.service.connector_instances.ConnectorInstanceService;
109
import io.openaev.service.FileService;
10+
import io.openaev.service.connector_instances.ConnectorInstanceService;
1111
import io.openaev.utils.TimeUtils;
1212
import java.io.ByteArrayInputStream;
1313
import java.io.InputStream;

‎openaev-api/src/main/java/io/openaev/service/catalog_connectors/CatalogConnectorService.java‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,26 @@ public class CatalogConnectorService {
2525
public List<CatalogConnectorOutput> catalogConnectors() {
2626
List<ConnectorInstance> instances = connectorInstanceService.connectorInstances();
2727
return fromIterable(catalogConnectorRepository.findAll()).stream()
28-
.map(c-> {
29-
List<ConnectorInstance> instancesMatching = instances.stream().filter(i -> i.getCatalogConnector().getId().equals(c.getId())).toList();
30-
return catalogConnectorMapper.toCatalogConnectorOutput(c, instancesMatching.size());
31-
})
28+
.map(
29+
c -> {
30+
List<ConnectorInstance> instancesMatching =
31+
instances.stream()
32+
.filter(i -> i.getCatalogConnector().getId().equals(c.getId()))
33+
.toList();
34+
return catalogConnectorMapper.toCatalogConnectorOutput(c, instancesMatching.size());
35+
})
3236
.toList();
3337
}
3438

3539
public CatalogConnectorOutput catalogConnectorOutput(String catalogConnectorId) {
36-
List<ConnectorInstance> instances = connectorInstanceService.findAllByCatalogConnectorId(catalogConnectorId);
40+
List<ConnectorInstance> instances =
41+
connectorInstanceService.findAllByCatalogConnectorId(catalogConnectorId);
3742

3843
return this.findById(catalogConnectorId)
39-
.map(c-> catalogConnectorMapper.toCatalogConnectorOutput(c, instances.size()))
40-
.orElseThrow(
41-
() -> new ElementNotFoundException("Connector not found with id: " + catalogConnectorId));
44+
.map(c -> catalogConnectorMapper.toCatalogConnectorOutput(c, instances.size()))
45+
.orElseThrow(
46+
() ->
47+
new ElementNotFoundException("Connector not found with id: " + catalogConnectorId));
4248
}
4349

4450
public List<CatalogConnector> saveAll(List<CatalogConnector> connectors) {

0 commit comments

Comments
 (0)