From b8bd3b198d7a2badc8bcd446ad9661b5b33cbd27 Mon Sep 17 00:00:00 2001
From: Oto Stanko <493068@fi.muni.cz>
Date: Sun, 16 Apr 2023 18:24:20 +0200
Subject: [PATCH] Checkstyle repairs, again
---
.../car/rest/CarComponentPairController.java | 14 ++++++++------
.../cz/muni/pa165/car/restemplate/DbGetter.java | 16 +++++++++++-----
.../dtos/CarComponentRequestDto.java | 3 +--
.../component/rest/ComponentController.java | 3 ++-
.../component/service/ComponentService.java | 4 ++--
5 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/car/src/main/java/cz/muni/pa165/car/rest/CarComponentPairController.java b/car/src/main/java/cz/muni/pa165/car/rest/CarComponentPairController.java
index c7c2e8fa..43cf40b0 100644
--- a/car/src/main/java/cz/muni/pa165/car/rest/CarComponentPairController.java
+++ b/car/src/main/java/cz/muni/pa165/car/rest/CarComponentPairController.java
@@ -5,7 +5,6 @@ import cz.muni.pa165.car.service.CarComponentPairService;
import cz.muni.pa165.common_library.dtos.CarComponentResponseDto;
import cz.muni.pa165.common_library.dtos.CarResponseDto;
import io.swagger.v3.oas.annotations.Operation;
-
import java.util.ArrayList;
import java.util.List;
import org.springframework.http.MediaType;
@@ -70,7 +69,8 @@ public class CarComponentPairController {
@Operation(summary = "Get all components of a car")
@GetMapping(path = "/getcomponents",
produces = MediaType.APPLICATION_JSON_VALUE)
- public ResponseEntity<List<CarComponentResponseDto>> getAllComponentsOfCar(@RequestParam Long carId) {
+ public ResponseEntity<List<CarComponentResponseDto>>
+ getAllComponentsOfCar(@RequestParam Long carId) {
return ResponseEntity.ok(carComponentService.getAllComponentsOfCar(carId));
}
@@ -85,13 +85,14 @@ public class CarComponentPairController {
@Operation(summary = "Get all components from component repo")
@GetMapping(path = "/getsparecomponents",
produces = MediaType.APPLICATION_JSON_VALUE)
- public ResponseEntity<List<CarComponentResponseDto>> getAllCarComponents(@RequestParam Long carId, @RequestParam Long componentId) {
+ public ResponseEntity<List<CarComponentResponseDto>>
+ getAllCarComponents(@RequestParam Long carId, @RequestParam Long componentId) {
List<CarComponentResponseDto> allComponents = DbGetter.getAllComponentsFromDb();
var carComponentsResponse = getAllComponentsOfCar(carId);
var carComponents = carComponentsResponse.getBody();
CarComponentResponseDto requestedComponent = null;
assert carComponents != null;
- for (CarComponentResponseDto carComponent: allComponents) {
+ for (CarComponentResponseDto carComponent : allComponents) {
if (carComponent.getId().equals(componentId)) {
requestedComponent = carComponent;
break;
@@ -99,8 +100,9 @@ public class CarComponentPairController {
}
assert requestedComponent != null;
List<CarComponentResponseDto> allViableReplacements = new ArrayList<>();
- for (CarComponentResponseDto carComponent: allComponents) {
- if (carComponent.getName().equals(requestedComponent.getName()) && !carComponent.getId().equals(componentId)) {
+ for (CarComponentResponseDto carComponent : allComponents) {
+ if (carComponent.getName().equals(requestedComponent.getName())
+ && !carComponent.getId().equals(componentId)) {
allViableReplacements.add(carComponent);
}
}
diff --git a/car/src/main/java/cz/muni/pa165/car/restemplate/DbGetter.java b/car/src/main/java/cz/muni/pa165/car/restemplate/DbGetter.java
index 434c6a58..81c03804 100644
--- a/car/src/main/java/cz/muni/pa165/car/restemplate/DbGetter.java
+++ b/car/src/main/java/cz/muni/pa165/car/restemplate/DbGetter.java
@@ -2,13 +2,12 @@ package cz.muni.pa165.car.restemplate;
import cz.muni.pa165.common_library.dtos.CarComponentResponseDto;
import cz.muni.pa165.common_library.dtos.DriverInsightDto;
+import java.util.Arrays;
+import java.util.List;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
-import java.util.Arrays;
-import java.util.List;
-
/**
* Class for retrieving data from other modules using RestTemplate.
*/
@@ -41,13 +40,20 @@ public class DbGetter {
*/
public static CarComponentResponseDto getComponentFromDb(Long id) {
String url = GET_COMPONENT_URL + id;
- ResponseEntity<CarComponentResponseDto> response = client.getForEntity(url, CarComponentResponseDto.class);
+ ResponseEntity<CarComponentResponseDto> response =
+ client.getForEntity(url, CarComponentResponseDto.class);
return response.getBody();
}
+ /**
+ * Calls endpoint of the CarComponent module and retrieves all the car components in db.
+ *
+ * @return List of all car components in database.
+ */
public static List<CarComponentResponseDto> getAllComponentsFromDb() {
String url = GET_ALL_COMPONENTS;
- var response = client.getForEntity(url, CarComponentResponseDto[].class);
+ var response =
+ client.getForEntity(url, CarComponentResponseDto[].class);
CarComponentResponseDto[] carComponents = response.getBody();
assert carComponents != null;
return Arrays.stream(carComponents).toList();
diff --git a/common_library/src/main/java/cz/muni/pa165/common_library/dtos/CarComponentRequestDto.java b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/CarComponentRequestDto.java
index 9b2adc19..24e80878 100644
--- a/common_library/src/main/java/cz/muni/pa165/common_library/dtos/CarComponentRequestDto.java
+++ b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/CarComponentRequestDto.java
@@ -2,13 +2,12 @@ package cz.muni.pa165.common_library.dtos;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
+import java.math.BigDecimal;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import java.math.BigDecimal;
-
/**
* Data Transfer object for CarComponent class.
*/
diff --git a/component/src/main/java/cz/muni/pa165/component/rest/ComponentController.java b/component/src/main/java/cz/muni/pa165/component/rest/ComponentController.java
index ac335cd0..9fa71ac3 100644
--- a/component/src/main/java/cz/muni/pa165/component/rest/ComponentController.java
+++ b/component/src/main/java/cz/muni/pa165/component/rest/ComponentController.java
@@ -49,7 +49,8 @@ public class ComponentController {
@Operation(summary = "Get a car component")
@GetMapping(path = "/id",
produces = MediaType.APPLICATION_JSON_VALUE)
- public ResponseEntity<CarComponentResponseDto> getComponent(@Valid @RequestParam long componentId) {
+ public ResponseEntity<CarComponentResponseDto>
+ getComponent(@Valid @RequestParam long componentId) {
return ResponseEntity.ok(componentService.getCarComponentById(componentId));
}
diff --git a/component/src/main/java/cz/muni/pa165/component/service/ComponentService.java b/component/src/main/java/cz/muni/pa165/component/service/ComponentService.java
index c5628c6f..bc08b230 100644
--- a/component/src/main/java/cz/muni/pa165/component/service/ComponentService.java
+++ b/component/src/main/java/cz/muni/pa165/component/service/ComponentService.java
@@ -25,7 +25,7 @@ public class ComponentService implements ComponentServiceInterface {
public CarComponentResponseDto postCarComponent(CarComponentRequestDto carComponentDto) {
return carComponentConverter(componentRepository.save(
- carComponentDtoConverterWithoutID(carComponentDto)));
+ carComponentDtoConverterWithoutId(carComponentDto)));
}
/**
@@ -62,7 +62,7 @@ public class ComponentService implements ComponentServiceInterface {
return "Car component with id: " + carComponentId + "was successfully deleted";
}
- CarComponent carComponentDtoConverterWithoutID(CarComponentRequestDto carComponentDto) {
+ CarComponent carComponentDtoConverterWithoutId(CarComponentRequestDto carComponentDto) {
return CarComponent.builder()
.id(null)
.weight(carComponentDto.getWeight())
--
GitLab