Skip to content

Commit 589098f

Browse files
author
zxBCN Valeriu_Tuguran,Constantin (IT EDP) EXTERNAL
committed
Fix sonar complaints.
1 parent 478027b commit 589098f

6 files changed

Lines changed: 331 additions & 331 deletions

File tree

‎api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ComponentsResponseFactory.java‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
package org.opendevstack.apiservice.project.controller;
2-
3-
import org.opendevstack.apiservice.project.model.CreateComponentResponse;
4-
import org.springframework.http.HttpStatus;
5-
import org.springframework.http.ResponseEntity;
6-
7-
public class ComponentsResponseFactory {
8-
9-
private ComponentsResponseFactory() {
10-
}
11-
12-
public static CreateComponentResponse error(String projectId) {
13-
CreateComponentResponse response = new CreateComponentResponse();
14-
response.setErrorCode(HttpStatus.INTERNAL_SERVER_ERROR.value());
15-
response.setMessage("Failed to create component for project '" + projectId + "'");
16-
return response;
17-
}
18-
19-
public static CreateComponentResponse entityCreated(String projectId, String componentName) {
20-
CreateComponentResponse response = new CreateComponentResponse();
21-
response.setErrorCode(HttpStatus.CREATED.value());
22-
response.setMessage(componentName + " component created successfully in project " + projectId);
23-
return response;
24-
}
25-
26-
public static ResponseEntity<CreateComponentResponse> toResponseEntity(CreateComponentResponse response) {
27-
return new ResponseEntity<>(response, HttpStatus.valueOf(response.getErrorCode()));
28-
}
29-
}
1+
package org.opendevstack.apiservice.project.controller;
2+
3+
import org.opendevstack.apiservice.project.model.CreateComponentResponse;
4+
import org.springframework.http.HttpStatus;
5+
import org.springframework.http.ResponseEntity;
6+
7+
public class ComponentsResponseFactory {
8+
9+
private ComponentsResponseFactory() {
10+
}
11+
12+
public static CreateComponentResponse error(String projectId) {
13+
CreateComponentResponse response = new CreateComponentResponse();
14+
response.setErrorCode(HttpStatus.INTERNAL_SERVER_ERROR.value());
15+
response.setMessage("Failed to create component for project '" + projectId + "'");
16+
return response;
17+
}
18+
19+
public static CreateComponentResponse entityCreated(String projectId, String componentName) {
20+
CreateComponentResponse response = new CreateComponentResponse();
21+
response.setErrorCode(HttpStatus.CREATED.value());
22+
response.setMessage(componentName + " component created successfully in project " + projectId);
23+
return response;
24+
}
25+
26+
public static ResponseEntity<CreateComponentResponse> toResponseEntity(CreateComponentResponse response) {
27+
return new ResponseEntity<>(response, HttpStatus.valueOf(response.getErrorCode()));
28+
}
29+
}

‎api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ProjectComponentsController.java‎

Lines changed: 51 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,51 @@
1-
package org.opendevstack.apiservice.project.controller;
2-
3-
import lombok.AllArgsConstructor;
4-
import lombok.extern.slf4j.Slf4j;
5-
import org.opendevstack.apiservice.project.api.ProjectComponentsApi;
6-
import org.opendevstack.apiservice.project.model.Component;
7-
import org.opendevstack.apiservice.project.model.CreateComponentRequest;
8-
import org.opendevstack.apiservice.project.model.CreateComponentResponse;
9-
import org.opendevstack.apiservice.project.service.ComponentsService;
10-
import org.springframework.http.HttpStatus;
11-
import org.springframework.http.ResponseEntity;
12-
import org.springframework.web.bind.annotation.RestController;
13-
14-
import static org.opendevstack.apiservice.project.controller.ComponentsResponseFactory.toResponseEntity;
15-
16-
@RestController
17-
@AllArgsConstructor
18-
@Slf4j
19-
public class ProjectComponentsController implements ProjectComponentsApi {
20-
21-
private final ComponentsService componentsService;
22-
23-
@Override
24-
public ResponseEntity<CreateComponentResponse> createProjectComponent(String projectId, CreateComponentRequest createComponentRequest) {
25-
try {
26-
Component component = componentsService.createProjectComponent(projectId, createComponentRequest);
27-
if (component == null) {
28-
log.error("Failed to create component for project '{}'", projectId);
29-
return toResponseEntity(ComponentsResponseFactory.error(projectId));
30-
}
31-
return toResponseEntity(ComponentsResponseFactory.entityCreated(projectId, component.getName()));
32-
} catch (Exception e) {
33-
log.error("Error while trying to create component for project '" + projectId + "': " + e.getMessage(), e);
34-
return toResponseEntity(ComponentsResponseFactory.error(projectId));
35-
}
36-
}
37-
38-
@Override
39-
public ResponseEntity<Component> getProjectComponent(String projectId, String componentId) {
40-
try {
41-
Component component = componentsService.getProjectComponent(projectId, componentId);
42-
return component != null ?
43-
ResponseEntity.ok(component) : ResponseEntity.notFound().build();
44-
} catch (Exception e) {
45-
log.error("Error retrieving component '{}' for project '{}': {}", componentId, projectId, e.getMessage(), e);
46-
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR.value()).build();
47-
}
48-
}
49-
}
1+
package org.opendevstack.apiservice.project.controller;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.extern.slf4j.Slf4j;
5+
import org.opendevstack.apiservice.project.api.ProjectComponentsApi;
6+
import org.opendevstack.apiservice.project.model.Component;
7+
import org.opendevstack.apiservice.project.model.CreateComponentRequest;
8+
import org.opendevstack.apiservice.project.model.CreateComponentResponse;
9+
import org.opendevstack.apiservice.project.service.ComponentsService;
10+
import org.springframework.http.HttpStatus;
11+
import org.springframework.http.ResponseEntity;
12+
import org.springframework.web.bind.annotation.RestController;
13+
14+
import static org.opendevstack.apiservice.project.controller.ComponentsResponseFactory.toResponseEntity;
15+
16+
@RestController
17+
@AllArgsConstructor
18+
@Slf4j
19+
public class ProjectComponentsController implements ProjectComponentsApi {
20+
21+
private final ComponentsService componentsService;
22+
23+
@Override
24+
public ResponseEntity<CreateComponentResponse> createProjectComponent(String projectId, CreateComponentRequest createComponentRequest) {
25+
try {
26+
Component component = componentsService.createProjectComponent(projectId, createComponentRequest);
27+
if (component == null) {
28+
log.error("Failed to create component for project '{}'", projectId);
29+
return toResponseEntity(ComponentsResponseFactory.error(projectId));
30+
}
31+
return toResponseEntity(ComponentsResponseFactory.entityCreated(projectId, component.getName()));
32+
} catch (Exception e) {
33+
log.error("Error while trying to create component for project '" + projectId + "': " + e.getMessage(), e);
34+
return toResponseEntity(ComponentsResponseFactory.error(projectId));
35+
}
36+
}
37+
38+
@Override
39+
public ResponseEntity<Component> getProjectComponent(String projectId, String componentId) {
40+
try {
41+
Component component = componentsService.getProjectComponent(projectId, componentId);
42+
if (component == null) {
43+
return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
44+
}
45+
return ResponseEntity.status(HttpStatus.OK).body(component);
46+
} catch (Exception e) {
47+
log.error("Error retrieving component '{}' for project '{}': {}", componentId, projectId, e.getMessage(), e);
48+
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
49+
}
50+
}
51+
}

‎api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/service/ComponentsService.java‎

Lines changed: 43 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,43 @@
1-
package org.opendevstack.apiservice.project.service;
2-
3-
import lombok.AllArgsConstructor;
4-
import lombok.extern.slf4j.Slf4j;
5-
import org.opendevstack.apiservice.externalservice.api.ExternalService;
6-
import org.opendevstack.apiservice.project.model.Component;
7-
import org.opendevstack.apiservice.project.model.CreateComponentRequest;
8-
import org.springframework.stereotype.Service;
9-
10-
@Service
11-
@AllArgsConstructor
12-
@Slf4j
13-
public class ComponentsService {
14-
15-
private final MarketplaceExternalServicePlaceholder marketplaceExternalService;
16-
17-
public Component getProjectComponent(String projectId, String componentId) {
18-
return marketplaceExternalService.getProjectComponent(projectId, componentId);
19-
}
20-
21-
public Component createProjectComponent(String projectId, CreateComponentRequest createComponentRequest) {
22-
return marketplaceExternalService.createProjectComponent(projectId, createComponentRequest);
23-
}
24-
25-
//TODO replace this with actual external service implementations and remove the placeholder
26-
@Service
27-
class MarketplaceExternalServicePlaceholder implements ExternalService {
28-
29-
@Override
30-
public boolean isHealthy() {
31-
return false;
32-
}
33-
34-
public Component getProjectComponent(String projectId, String componentId) {
35-
log.info("Get component with id '" + componentId + "' for project '" + projectId + "'");
36-
return null;
37-
}
38-
39-
public Component createProjectComponent(String projectId, CreateComponentRequest createComponentRequest) {
40-
log.info("Creating component for project '" + projectId + "'" + " with request: " + createComponentRequest);
41-
return null;
42-
}
43-
}
44-
}
1+
package org.opendevstack.apiservice.project.service;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.extern.slf4j.Slf4j;
5+
import org.opendevstack.apiservice.externalservice.api.ExternalService;
6+
import org.opendevstack.apiservice.project.model.Component;
7+
import org.opendevstack.apiservice.project.model.CreateComponentRequest;
8+
import org.springframework.stereotype.Service;
9+
10+
@Service
11+
@AllArgsConstructor
12+
@Slf4j
13+
public class ComponentsService {
14+
15+
private final MarketplaceExternalServicePlaceholder marketplaceExternalService;
16+
17+
public Component getProjectComponent(String projectId, String componentId) {
18+
return marketplaceExternalService.getProjectComponent(projectId, componentId);
19+
}
20+
21+
public Component createProjectComponent(String projectId, CreateComponentRequest createComponentRequest) {
22+
return marketplaceExternalService.createProjectComponent(projectId, createComponentRequest);
23+
}
24+
25+
@Service
26+
class MarketplaceExternalServicePlaceholder implements ExternalService {
27+
28+
@Override
29+
public boolean isHealthy() {
30+
return false;
31+
}
32+
33+
public Component getProjectComponent(String projectId, String componentId) {
34+
log.info("Get component with id '" + componentId + "' for project '" + projectId + "'");
35+
return null;
36+
}
37+
38+
public Component createProjectComponent(String projectId, CreateComponentRequest createComponentRequest) {
39+
log.info("Creating component for project '" + projectId + "'" + " with request: " + createComponentRequest);
40+
return null;
41+
}
42+
}
43+
}

0 commit comments

Comments
 (0)