Skip to content

Commit 5894abc

Browse files
gabriel-pezegabriel-peze
committed
[frontend/backend] Spotless/lint/api-types
1 parent ff41e73 commit 5894abc

File tree

6 files changed

+52
-44
lines changed

6 files changed

+52
-44
lines changed

‎openaev-api/src/main/java/io/openaev/healthcheck/utils/HealthCheckUtils.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import io.openaev.healthcheck.enums.ExternalServiceDependency;
2121
import io.openaev.helper.InjectModelHelper;
2222
import io.openaev.rest.inject.output.AgentsAndAssetsAgentless;
23-
import io.openaev.rest.inject.output.InjectOutput;
2423
import jakarta.validation.constraints.NotNull;
2524
import java.util.*;
2625
import java.util.function.Function;
@@ -186,15 +185,15 @@ public List<HealthCheck> runInjectsChecksFor(
186185
HealthCheck.Detail detail,
187186
HealthCheck.Status status,
188187
List<HealthCheck> injectsHealthChecks) {
189-
List<HealthCheck> result = new ArrayList<>();
188+
List<HealthCheck> result = new ArrayList<>();
190189

191190
if (injectsHealthChecks.stream()
192191
.anyMatch(
193192
healthCheck ->
194193
Objects.equals(type, healthCheck.getType())
195194
&& Objects.equals(detail, healthCheck.getDetail())
196195
&& Objects.equals(status, healthCheck.getStatus()))) {
197-
result.add(new HealthCheck(type, detail, status, now()));
196+
result.add(new HealthCheck(type, detail, status, now()));
198197
}
199198

200199
return result;

‎openaev-api/src/main/java/io/openaev/rest/inject/ScenarioInjectApi.java‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ public class ScenarioInjectApi extends RestBehavior {
4444
private final InjectService injectService;
4545
private final InjectDuplicateService injectDuplicateService;
4646
private final ScenarioInjectService scenarioInjectService;
47-
private final InjectMapper injectMapper;
48-
private final HealthCheckUtils healthCheckUtils;
47+
private final InjectMapper injectMapper;
48+
private final HealthCheckUtils healthCheckUtils;
4949

50-
@GetMapping(SCENARIO_URI + "/{scenarioId}/injects/simple")
50+
@GetMapping(SCENARIO_URI + "/{scenarioId}/injects/simple")
5151
@RBAC(
5252
resourceId = "#scenarioId",
5353
actionPerformed = Action.READ,
@@ -91,7 +91,7 @@ public Iterable<InjectOutput> scenarioInjectsSimple(
9191
public InjectOutput createInjectForScenario(
9292
@PathVariable @NotBlank final String scenarioId, @Valid @RequestBody InjectInput input) {
9393
Scenario scenario = this.scenarioService.scenario(scenarioId);
94-
Inject createdInject = this.injectService.createInject(null, scenario, input);
94+
Inject createdInject = this.injectService.createInject(null, scenario, input);
9595
return injectMapper.toInjectOutput(createdInject, injectService.runChecks(createdInject));
9696
}
9797

@@ -108,10 +108,11 @@ public List<InjectOutput> generateInjectsForScenario(
108108
@PathVariable @NotBlank final String scenarioId,
109109
@Valid @RequestBody InjectAssistantInput input) {
110110
Scenario scenario = this.scenarioService.scenario(scenarioId);
111-
return injectService.saveAll(
112-
this.injectAssistantService.generateInjectsForScenario(scenario, input)).stream()
113-
.map(inject -> injectMapper.toInjectOutput(inject, injectService.runChecks(inject)))
114-
.toList();
111+
return injectService
112+
.saveAll(this.injectAssistantService.generateInjectsForScenario(scenario, input))
113+
.stream()
114+
.map(inject -> injectMapper.toInjectOutput(inject, injectService.runChecks(inject)))
115+
.toList();
115116
}
116117

117118
@PostMapping(SCENARIO_URI + "/{scenarioId}/injects/{injectId}")
@@ -122,9 +123,10 @@ public List<InjectOutput> generateInjectsForScenario(
122123
public InjectOutput duplicateInjectForScenario(
123124
@PathVariable @NotBlank final String scenarioId,
124125
@PathVariable @NotBlank final String injectId) {
125-
Inject duplicatedInject = injectDuplicateService.duplicateInjectForScenarioWithDuplicateWordInTitle(
126-
scenarioId, injectId);
127-
return injectMapper.toInjectOutput(duplicatedInject, injectService.runChecks(duplicatedInject));
126+
Inject duplicatedInject =
127+
injectDuplicateService.duplicateInjectForScenarioWithDuplicateWordInTitle(
128+
scenarioId, injectId);
129+
return injectMapper.toInjectOutput(duplicatedInject, injectService.runChecks(duplicatedInject));
128130
}
129131

130132
@GetMapping(SCENARIO_URI + "/{scenarioId}/injects")
@@ -196,7 +198,7 @@ public InjectOutput updateInjectActivationForScenario(
196198
@PathVariable @NotBlank final String injectId,
197199
@Valid @RequestBody InjectUpdateActivationInput input) {
198200
Inject updatedInject = injectService.updateInjectActivation(injectId, input);
199-
return injectMapper.toInjectOutput(updatedInject, injectService.runChecks(updatedInject));
201+
return injectMapper.toInjectOutput(updatedInject, injectService.runChecks(updatedInject));
200202
}
201203

202204
@Transactional(rollbackFor = Exception.class)

‎openaev-api/src/main/java/io/openaev/rest/inject/SimulationInjectApi.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ public class SimulationInjectApi extends RestBehavior {
6969
private final InjectDuplicateService injectDuplicateService;
7070
private final InjectStatusService injectStatusService;
7171
private final SimulationInjectService simulationInjectService;
72-
private final InjectMapper injectMapper;
72+
private final InjectMapper injectMapper;
7373

74-
@Operation(summary = "Retrieved injects for an exercise")
74+
@Operation(summary = "Retrieved injects for an exercise")
7575
@ApiResponses(
7676
value = {
7777
@ApiResponse(
@@ -127,7 +127,7 @@ public Iterable<InjectOutput> exerciseInjectsSimple(
127127
public Iterable<InjectOutput> exerciseInjects(@PathVariable @NotBlank final String exerciseId) {
128128
return injectRepository.findByExerciseId(exerciseId).stream()
129129
.sorted(Inject.executionComparator)
130-
.map(inject -> injectMapper.toInjectOutput(inject, injectService.runChecks(inject)))
130+
.map(inject -> injectMapper.toInjectOutput(inject, injectService.runChecks(inject)))
131131
.toList();
132132
}
133133

@@ -160,7 +160,8 @@ public List<InjectResultOutput> exerciseInjectsResults(@PathVariable final Strin
160160
resourceId = "#exerciseId",
161161
actionPerformed = Action.READ,
162162
resourceType = ResourceType.SIMULATION)
163-
public InjectOutput exerciseInject(@PathVariable String exerciseId, @PathVariable String injectId) {
163+
public InjectOutput exerciseInject(
164+
@PathVariable String exerciseId, @PathVariable String injectId) {
164165
Inject inject = injectRepository.findById(injectId).orElseThrow(ElementNotFoundException::new);
165166
return injectMapper.toInjectOutput(inject, injectService.runChecks(inject));
166167
}
@@ -203,7 +204,7 @@ public InjectOutput createInjectForExercise(
203204
Exercise exercise =
204205
exerciseRepository.findById(exerciseId).orElseThrow(ElementNotFoundException::new);
205206
Inject createdInject = this.injectService.createInject(exercise, null, input);
206-
return injectMapper.toInjectOutput(createdInject, injectService.runChecks(createdInject));
207+
return injectMapper.toInjectOutput(createdInject, injectService.runChecks(createdInject));
207208
}
208209

209210
@PostMapping(EXERCISE_URI + "/{exerciseId}/injects/{injectId}")
@@ -214,8 +215,9 @@ public InjectOutput createInjectForExercise(
214215
public InjectOutput duplicateInjectForExercise(
215216
@PathVariable @NotBlank final String exerciseId,
216217
@PathVariable @NotBlank final String injectId) {
217-
Inject duplicatedInject = injectDuplicateService.duplicateInjectForExerciseWithDuplicateWordInTitle(
218-
exerciseId, injectId);
218+
Inject duplicatedInject =
219+
injectDuplicateService.duplicateInjectForExerciseWithDuplicateWordInTitle(
220+
exerciseId, injectId);
219221
return injectMapper.toInjectOutput(duplicatedInject, injectService.runChecks(duplicatedInject));
220222
}
221223

@@ -318,7 +320,7 @@ public InjectOutput setInjectStatus(
318320
@PathVariable String injectId,
319321
@Valid @RequestBody InjectUpdateStatusInput input) {
320322
Inject updatedInject = injectStatusService.updateInjectStatus(injectId, input);
321-
return injectMapper.toInjectOutput(updatedInject, injectService.runChecks(updatedInject));
323+
return injectMapper.toInjectOutput(updatedInject, injectService.runChecks(updatedInject));
322324
}
323325

324326
@PutMapping(EXERCISE_URI + "/{exerciseId}/injects/{injectId}/teams")

‎openaev-api/src/main/java/io/openaev/service/InjectSearchService.java‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -242,27 +242,32 @@ private List<InjectOutput> execInject(TypedQuery<Tuple> query) {
242242
.orElse(new ArrayList<>()));
243243
inject.setAssets(
244244
ofNullable(tuple.get("inject_assets", String[].class))
245-
.map(ids -> Arrays.stream(ids)
246-
.map(
245+
.map(
246+
ids ->
247+
Arrays.stream(ids)
248+
.map(
247249
id -> {
248-
Asset asset = new Asset();
249-
asset.setId(id);
250-
return asset;
250+
Asset asset = new Asset();
251+
asset.setId(id);
252+
return asset;
251253
})
252-
.collect(Collectors.toList()))
254+
.collect(Collectors.toList()))
253255
.orElse(new ArrayList<>()));
254256
inject.setAssetGroups(
255257
ofNullable(tuple.get("inject_asset_groups", String[].class))
256-
.map(ids -> Arrays.stream(ids)
257-
.map(
258+
.map(
259+
ids ->
260+
Arrays.stream(ids)
261+
.map(
258262
id -> {
259-
AssetGroup assetGroup = new AssetGroup();
260-
assetGroup.setId(id);
261-
return assetGroup;
263+
AssetGroup assetGroup = new AssetGroup();
264+
assetGroup.setId(id);
265+
return assetGroup;
262266
})
263-
.collect(Collectors.toList()))
267+
.collect(Collectors.toList()))
264268
.orElse(new ArrayList<>()));
265-
// Check only for content checks because this result is only used to display the inject list on scenario
269+
// Check only for content checks because this result is only used to display the
270+
// inject list on scenario
266271
return injectMapper.toInjectOutput(inject, healthCheckUtils.runContentChecks(inject));
267272
})
268273
.toList();

‎openaev-front/src/admin/components/common/injects/Injects.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ const Injects: FunctionComponent<Props> = ({
180180
injectLabel = t('Missing content');
181181
injectTooltip = inject.inject_healthchecks
182182
? `${t('Missing content')} : ${inject.inject_healthchecks.filter(healthcheck => 'MANDATORY_CONTENT' === healthcheck.detail)
183-
.map(healthcheck => t(`healthcheck.description.${healthcheck.type}.${healthcheck.detail}`))
184-
.join(', ')}`
183+
.map(healthcheck => t(`healthcheck.description.${healthcheck.type}.${healthcheck.detail}`))
184+
.join(', ')}`
185185
: '';
186186
}
187187
return (

‎openaev-front/src/utils/api-types.d.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2600,7 +2600,7 @@ export interface GroupUpdateUsersInput {
26002600
group_users?: string[];
26012601
}
26022602

2603-
/** Healthchecks of the inject */
2603+
/** Healthcheck of the inject */
26042604
export interface HealthCheck {
26052605
/**
26062606
* Date when the failure have been found
@@ -2798,7 +2798,7 @@ export interface InjectBulkUpdateOperation {
27982798
values?: string[];
27992799
}
28002800

2801-
/** Dependencies of the inject */
2801+
/** Dependency of the inject */
28022802
export interface InjectDependency {
28032803
dependency_condition?: InjectDependencyCondition;
28042804
/** @format date-time */
@@ -3049,12 +3049,12 @@ export interface InjectOutput {
30493049
inject_collect_status?: "COLLECTING" | "COMPLETED";
30503050
inject_communications?: string[];
30513051
/**
3052-
* Communications not ack size of the inject
3052+
* Communications not ack count of the inject
30533053
* @format int64
30543054
*/
30553055
inject_communications_not_ack_number?: number;
30563056
/**
3057-
* Communications size of the inject
3057+
* Communications count of the inject
30583058
* @format int64
30593059
*/
30603060
inject_communications_number?: number;
@@ -3124,7 +3124,7 @@ export interface InjectOutput {
31243124
/** User of the inject */
31253125
inject_user?: string;
31263126
/**
3127-
* Number of users tageted by the inject
3127+
* Count of users targeted by the inject
31283128
* @format int64
31293129
*/
31303130
inject_users_number?: number;
@@ -3533,7 +3533,7 @@ export interface JsonApiDocumentResourceObject {
35333533

35343534
export type JsonNode = object;
35353535

3536-
/** Kill chain phases of the inject */
3536+
/** Kill chain phase of the inject */
35373537
export interface KillChainPhase {
35383538
listened?: boolean;
35393539
/** @format date-time */

0 commit comments

Comments
 (0)