diff --git a/airports-flight-service/src/main/java/cz/muni/fi/pa165/Application.java b/airports-flight-service/src/main/java/cz/muni/fi/pa165/Application.java index 92759612d154935f626bf49a1ca30fdf880c52df..9f03e63f0b31deae82f27016092ff7798c40287f 100644 --- a/airports-flight-service/src/main/java/cz/muni/fi/pa165/Application.java +++ b/airports-flight-service/src/main/java/cz/muni/fi/pa165/Application.java @@ -1,13 +1,7 @@ package cz.muni.fi.pa165; -import cz.muni.fi.pa165.dao.IssueReport; -import cz.muni.fi.pa165.repository.IssueReportRepository; -import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; - -import java.util.List; @SpringBootApplication public class Application { diff --git a/airports-flight-service/src/main/java/cz/muni/fi/pa165/DataInitializer.java b/airports-flight-service/src/main/java/cz/muni/fi/pa165/DataInitializer.java index 31ecb1529dc3389ae5e6ddf3b8477c4957881612..0a56a04e6da54cfcb763bedd34cbd3eacd8484dd 100644 --- a/airports-flight-service/src/main/java/cz/muni/fi/pa165/DataInitializer.java +++ b/airports-flight-service/src/main/java/cz/muni/fi/pa165/DataInitializer.java @@ -37,32 +37,32 @@ public class DataInitializer implements ApplicationRunner { public void generateFlightData() { System.out.println("Generate Flight Running"); for (int i = 0; i < 10; i++) { - Flight flight = new Flight(); + Flight flight = new Flight(); - flight.setDestination(UUID.randomUUID()); - flight.setOrigin(UUID.randomUUID()); - flight.setPlaneId(UUID.randomUUID()); - flight.setOrigin(UUID.randomUUID()); - flight.setId(UUID.randomUUID()); + flight.setDestination(UUID.randomUUID()); + flight.setOrigin(UUID.randomUUID()); + flight.setPlaneId(UUID.randomUUID()); + flight.setOrigin(UUID.randomUUID()); + flight.setId(UUID.randomUUID()); - flightRepository.save(flight); + flightRepository.save(flight); - FlightRealization flightRealization = new FlightRealization(); - flightRealization.setDepartureTime(LocalDateTime.now()); - flightRealization.setArrivalTime(LocalDateTime.now()); - flightRealization.setFlightId(flight.getId()); - flightRealization.setReport("report"); - flightRealization.setDuration(Duration.ofHours(1)); - flightRealization.setKilometersFlown(850); + FlightRealization flightRealization = new FlightRealization(); + flightRealization.setDepartureTime(LocalDateTime.now()); + flightRealization.setArrivalTime(LocalDateTime.now()); + flightRealization.setFlightId(flight.getId()); + flightRealization.setReport("report"); + flightRealization.setDuration(Duration.ofHours(1)); + flightRealization.setKilometersFlown(850); - flightRealizationRepository.save(flightRealization); + flightRealizationRepository.save(flightRealization); - IssueReport issueReport = new IssueReport(); - issueReport.setPlaneId(flight.getPlaneId()); - issueReport.setFlightEncountered(new UUID(0x1, 0xf)); - issueReport.setDescription("description"); + IssueReport issueReport = new IssueReport(); + issueReport.setPlaneId(flight.getPlaneId()); + issueReport.setFlightEncountered(new UUID(0x1, 0xf)); + issueReport.setDescription("description"); - issueReportRepository.save(issueReport); + issueReportRepository.save(issueReport); } } } diff --git a/airports-flight-service/src/main/java/cz/muni/fi/pa165/dao/Flight.java b/airports-flight-service/src/main/java/cz/muni/fi/pa165/dao/Flight.java index ffbc325ed6e3f2fe0ab02827fd155b7578b299c5..18dc42c909ac8f20e0e98b3f867b9866c8a96e92 100644 --- a/airports-flight-service/src/main/java/cz/muni/fi/pa165/dao/Flight.java +++ b/airports-flight-service/src/main/java/cz/muni/fi/pa165/dao/Flight.java @@ -1,12 +1,10 @@ package cz.muni.fi.pa165.dao; import cz.muni.fi.pa165.Constants; -import cz.muni.fi.pa165.api.employee.Steward; import lombok.Data; import javax.persistence.*; import java.io.Serializable; -import java.util.List; import java.util.Set; import java.util.UUID; diff --git a/airports-flight-service/src/main/java/cz/muni/fi/pa165/dao/IssueReport.java b/airports-flight-service/src/main/java/cz/muni/fi/pa165/dao/IssueReport.java index 49c38e525de368c057bb04d37fb10e13e77e8a93..17e670faf36e2e7d7c71952e16913b040ffa470b 100644 --- a/airports-flight-service/src/main/java/cz/muni/fi/pa165/dao/IssueReport.java +++ b/airports-flight-service/src/main/java/cz/muni/fi/pa165/dao/IssueReport.java @@ -1,7 +1,6 @@ package cz.muni.fi.pa165.dao; import cz.muni.fi.pa165.Constants; -import lombok.AllArgsConstructor; import lombok.Data; import javax.persistence.*; diff --git a/airports-flight-service/src/main/java/cz/muni/fi/pa165/exception/IssueReportNotFoundException.java b/airports-flight-service/src/main/java/cz/muni/fi/pa165/exception/IssueReportNotFoundException.java index 1525f21da3bd360c1519aed9631ac49097a672cc..f45b3fa4fbf684a115733d26178717dff605715e 100644 --- a/airports-flight-service/src/main/java/cz/muni/fi/pa165/exception/IssueReportNotFoundException.java +++ b/airports-flight-service/src/main/java/cz/muni/fi/pa165/exception/IssueReportNotFoundException.java @@ -1,6 +1,6 @@ package cz.muni.fi.pa165.exception; -public class IssueReportNotFoundException extends RuntimeException{ +public class IssueReportNotFoundException extends RuntimeException { public IssueReportNotFoundException() { } diff --git a/airports-flight-service/src/main/java/cz/muni/fi/pa165/facade/FlightFacade.java b/airports-flight-service/src/main/java/cz/muni/fi/pa165/facade/FlightFacade.java index 27218c81a56054994cb30c2e9165677bbcf9f11a..cf1a12ec9334f5b7beed97b7c90c6e58af85da29 100644 --- a/airports-flight-service/src/main/java/cz/muni/fi/pa165/facade/FlightFacade.java +++ b/airports-flight-service/src/main/java/cz/muni/fi/pa165/facade/FlightFacade.java @@ -3,7 +3,6 @@ package cz.muni.fi.pa165.facade; import cz.muni.fi.pa165.api.flight.Flight; import cz.muni.fi.pa165.api.flight.requests.FlightRequest; -import cz.muni.fi.pa165.repository.FlightRepository; import cz.muni.fi.pa165.service.FlightService; import lombok.RequiredArgsConstructor; import org.modelmapper.ModelMapper; @@ -19,29 +18,29 @@ public class FlightFacade { private final FlightService flightService; private final ModelMapper modelMapper = new ModelMapper(); - public List<Flight> getFlights( int page, int size ){ + public List<Flight> getFlights(int page, int size) { var result = flightService.getAllFlights(page, size); return result.stream().map(p -> modelMapper.map(p, cz.muni.fi.pa165.api.flight.Flight.class)).toList(); } - public Flight getFlight(UUID id){ + public Flight getFlight(UUID id) { var result = flightService.getFlight(id); return modelMapper.map(result, Flight.class); } - public Flight createFlight(FlightRequest flightRequest){ - var result = flightService.createFlight( modelMapper.map(flightRequest, cz.muni.fi.pa165.dao.Flight.class)); - return modelMapper.map(result,Flight.class); + public Flight createFlight(FlightRequest flightRequest) { + var result = flightService.createFlight(modelMapper.map(flightRequest, cz.muni.fi.pa165.dao.Flight.class)); + return modelMapper.map(result, Flight.class); } - public Flight updateFlight(UUID id, FlightRequest flightRequest){ + public Flight updateFlight(UUID id, FlightRequest flightRequest) { var result = flightService.updateFlight(id, modelMapper.map(flightRequest, cz.muni.fi.pa165.dao.Flight.class)); return modelMapper.map(result, Flight.class); } - public void deleteFlight(UUID id){ + public void deleteFlight(UUID id) { flightService.deleteFlight(id); } } diff --git a/airports-flight-service/src/main/java/cz/muni/fi/pa165/facade/FlightRealizationFacade.java b/airports-flight-service/src/main/java/cz/muni/fi/pa165/facade/FlightRealizationFacade.java index 897887556e6bd394c04ae4beac2c23c05a274e4c..cd0d2663b28acc163e34c21d5789779c89f199cc 100644 --- a/airports-flight-service/src/main/java/cz/muni/fi/pa165/facade/FlightRealizationFacade.java +++ b/airports-flight-service/src/main/java/cz/muni/fi/pa165/facade/FlightRealizationFacade.java @@ -1,12 +1,11 @@ package cz.muni.fi.pa165.facade; -import cz.muni.fi.pa165.api.flight.requests.FlightRealizationRequest; import cz.muni.fi.pa165.api.flight.FlightRealization; +import cz.muni.fi.pa165.api.flight.requests.FlightRealizationRequest; import cz.muni.fi.pa165.service.FlightRealizationService; import lombok.RequiredArgsConstructor; import org.modelmapper.ModelMapper; import org.springframework.stereotype.Service; -import org.modelmapper.ModelMapper; import java.util.List; import java.util.UUID; @@ -18,29 +17,29 @@ public class FlightRealizationFacade { private final FlightRealizationService flightRealizationService; private final ModelMapper modelMapper = new ModelMapper(); - public List<FlightRealization> getAllFlightRealizations(){ + public List<FlightRealization> getAllFlightRealizations() { var result = flightRealizationService.getAllFlightRealizations(); return result.stream().map(p -> modelMapper.map(p, FlightRealization.class)).toList(); } - public FlightRealization getFlightRealization(UUID id){ + public FlightRealization getFlightRealization(UUID id) { var result = flightRealizationService.getFlightRealizationById(id); return modelMapper.map(result, FlightRealization.class); } - public FlightRealization createFlightRealization(FlightRealizationRequest flightRealizationRequest){ + public FlightRealization createFlightRealization(FlightRealizationRequest flightRealizationRequest) { var result = flightRealizationService.createFlightRealization(modelMapper.map(flightRealizationRequest, cz.muni.fi.pa165.dao.FlightRealization.class)); return modelMapper.map(result, FlightRealization.class); } - public FlightRealization updateFlightRealization(UUID id, FlightRealizationRequest flightRealizationRequest){ + public FlightRealization updateFlightRealization(UUID id, FlightRealizationRequest flightRealizationRequest) { var result = flightRealizationService.updateFlightRealization(id, modelMapper.map(flightRealizationRequest, cz.muni.fi.pa165.dao.FlightRealization.class)); return modelMapper.map(result, FlightRealization.class); } - public void deleteFlightRealization(UUID id){ + public void deleteFlightRealization(UUID id) { flightRealizationService.deleteFlightRealization(id); } diff --git a/airports-flight-service/src/main/java/cz/muni/fi/pa165/facade/IssueReportFacade.java b/airports-flight-service/src/main/java/cz/muni/fi/pa165/facade/IssueReportFacade.java index d07c4c6053403d10e83308b82fa73612ac55c56a..b95626460533b9a5f7ca498b1f0ef2b5231e7405 100644 --- a/airports-flight-service/src/main/java/cz/muni/fi/pa165/facade/IssueReportFacade.java +++ b/airports-flight-service/src/main/java/cz/muni/fi/pa165/facade/IssueReportFacade.java @@ -1,11 +1,11 @@ package cz.muni.fi.pa165.facade; -import cz.muni.fi.pa165.api.flight.requests.IssueReportRequest; import cz.muni.fi.pa165.api.flight.IssueReport; +import cz.muni.fi.pa165.api.flight.requests.IssueReportRequest; import cz.muni.fi.pa165.service.IssueReportService; import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; import org.modelmapper.ModelMapper; +import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; import java.util.List; @@ -41,21 +41,22 @@ public class IssueReportFacade { var result = issueReportService.getAllIssueReports(); return result.stream().map(p -> modelMapper.map(p, IssueReport.class)).toList(); } + public IssueReport getIssueReport(UUID id) { cz.muni.fi.pa165.dao.IssueReport result = issueReportService.get(id); return modelMapper.map(result, IssueReport.class); } - public IssueReport createIssueReport(IssueReportRequest issueReportRequest){ + public IssueReport createIssueReport(IssueReportRequest issueReportRequest) { var issue = modelMapper.map(issueReportRequest, cz.muni.fi.pa165.dao.IssueReport.class); var result = issueReportService.createIssueReport(issue); return modelMapper.map(result, IssueReport.class); } - public IssueReport updateIssueReport(UUID id, IssueReportRequest issueReportRequest){ - var result = issueReportService.updateIssueReport(id, modelMapper.map( issueReportRequest, cz.muni.fi.pa165.dao.IssueReport.class ) ); - return modelMapper.map(result, IssueReport.class); + public IssueReport updateIssueReport(UUID id, IssueReportRequest issueReportRequest) { + var result = issueReportService.updateIssueReport(id, modelMapper.map(issueReportRequest, cz.muni.fi.pa165.dao.IssueReport.class)); + return modelMapper.map(result, IssueReport.class); } diff --git a/airports-flight-service/src/main/java/cz/muni/fi/pa165/repository/FlightRealizationRepository.java b/airports-flight-service/src/main/java/cz/muni/fi/pa165/repository/FlightRealizationRepository.java index 1c1e15278fa1a709c39b1cbe65f4b1c6138c29a6..42d2d831e77f20568749ffa4b9498720d59128c3 100644 --- a/airports-flight-service/src/main/java/cz/muni/fi/pa165/repository/FlightRealizationRepository.java +++ b/airports-flight-service/src/main/java/cz/muni/fi/pa165/repository/FlightRealizationRepository.java @@ -2,7 +2,6 @@ package cz.muni.fi.pa165.repository; import cz.muni.fi.pa165.dao.FlightRealization; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; import java.util.UUID; diff --git a/airports-flight-service/src/main/java/cz/muni/fi/pa165/repository/FlightRepository.java b/airports-flight-service/src/main/java/cz/muni/fi/pa165/repository/FlightRepository.java index 9c8f80ffd4e03616823674d42f420ad3940c7c5e..1c3979fbeca854f9b0b2e91eb0f4fc20d2c14d59 100644 --- a/airports-flight-service/src/main/java/cz/muni/fi/pa165/repository/FlightRepository.java +++ b/airports-flight-service/src/main/java/cz/muni/fi/pa165/repository/FlightRepository.java @@ -4,7 +4,6 @@ import cz.muni.fi.pa165.dao.Flight; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; import java.util.UUID; diff --git a/airports-flight-service/src/main/java/cz/muni/fi/pa165/repository/IssueReportRepository.java b/airports-flight-service/src/main/java/cz/muni/fi/pa165/repository/IssueReportRepository.java index 696c9b28b100675dce3c8749a09016c6d8ec8277..fbfd7afcc9af06a35bc93e89e32e9d33449752a4 100644 --- a/airports-flight-service/src/main/java/cz/muni/fi/pa165/repository/IssueReportRepository.java +++ b/airports-flight-service/src/main/java/cz/muni/fi/pa165/repository/IssueReportRepository.java @@ -2,7 +2,6 @@ package cz.muni.fi.pa165.repository; import cz.muni.fi.pa165.dao.IssueReport; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; import java.util.UUID; diff --git a/airports-flight-service/src/main/java/cz/muni/fi/pa165/rest/FlightController.java b/airports-flight-service/src/main/java/cz/muni/fi/pa165/rest/FlightController.java index 57cf35aa220da94362b8f684d7f2b66c0b69c40a..4d5da93b2845c5189837167a254cdacbdfeb7309 100644 --- a/airports-flight-service/src/main/java/cz/muni/fi/pa165/rest/FlightController.java +++ b/airports-flight-service/src/main/java/cz/muni/fi/pa165/rest/FlightController.java @@ -2,11 +2,8 @@ package cz.muni.fi.pa165.rest; import cz.muni.fi.pa165.api.flight.Flight; import cz.muni.fi.pa165.api.flight.requests.FlightRequest; -//import cz.muni.fi.pa165.dao.Flight; import cz.muni.fi.pa165.exception.FlightNotFoundException; -import cz.muni.fi.pa165.exception.FlightRealizationNotFoundException; import cz.muni.fi.pa165.facade.FlightFacade; -import cz.muni.fi.pa165.repository.FlightRepository; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -31,7 +28,7 @@ public class FlightController { ) { List<Flight> flights = flightFacade.getFlights(page, size); - if( flights.isEmpty() ) { + if (flights.isEmpty()) { return new ResponseEntity<>(flights, HttpStatus.NO_CONTENT); } @@ -42,13 +39,14 @@ public class FlightController { public Flight getFlight(@PathVariable UUID id) { return flightFacade.getFlight(id); } + @PostMapping public Flight createFlight(@RequestBody FlightRequest flightRequest) { return flightFacade.createFlight(flightRequest); } @PostMapping("/{id}") - public Flight update(@PathVariable UUID id, @RequestBody FlightRequest flightRequest){ + public Flight update(@PathVariable UUID id, @RequestBody FlightRequest flightRequest) { return flightFacade.updateFlight(id, flightRequest); } diff --git a/airports-flight-service/src/main/java/cz/muni/fi/pa165/rest/FlightRealizationController.java b/airports-flight-service/src/main/java/cz/muni/fi/pa165/rest/FlightRealizationController.java index f39c33cf50c8e61bf3021aab721a1267722e6d2d..f3079b79784b966a1c64639fff7821e9b6fd9fb7 100644 --- a/airports-flight-service/src/main/java/cz/muni/fi/pa165/rest/FlightRealizationController.java +++ b/airports-flight-service/src/main/java/cz/muni/fi/pa165/rest/FlightRealizationController.java @@ -3,9 +3,7 @@ package cz.muni.fi.pa165.rest; import cz.muni.fi.pa165.api.flight.FlightRealization; import cz.muni.fi.pa165.api.flight.requests.FlightRealizationRequest; import cz.muni.fi.pa165.exception.FlightRealizationNotFoundException; -import cz.muni.fi.pa165.exception.IssueReportNotFoundException; import cz.muni.fi.pa165.facade.FlightRealizationFacade; -import cz.muni.fi.pa165.repository.FlightRealizationRepository; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -13,7 +11,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Optional; import java.util.UUID; @RestController diff --git a/airports-flight-service/src/main/java/cz/muni/fi/pa165/service/FlightRealizationService.java b/airports-flight-service/src/main/java/cz/muni/fi/pa165/service/FlightRealizationService.java index e9c9163a7b6ce5db305cd3a26a234f844d0836f4..2149196fd51f1f4077efab73ea0f0b87fa58bf05 100644 --- a/airports-flight-service/src/main/java/cz/muni/fi/pa165/service/FlightRealizationService.java +++ b/airports-flight-service/src/main/java/cz/muni/fi/pa165/service/FlightRealizationService.java @@ -1,16 +1,12 @@ package cz.muni.fi.pa165.service; -import cz.muni.fi.pa165.dao.Flight; import cz.muni.fi.pa165.dao.FlightRealization; -import cz.muni.fi.pa165.exception.FlightNotFoundException; import cz.muni.fi.pa165.exception.FlightRealizationNotFoundException; import cz.muni.fi.pa165.repository.FlightRealizationRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Iterator; import java.util.List; -import java.util.Optional; import java.util.UUID; @Service @@ -35,13 +31,13 @@ public class FlightRealizationService { // Update an existing flight realization public FlightRealization updateFlightRealization(UUID id, FlightRealization flightRealization) { FlightRealization existingFlightRealization = flightRealizationRepository.findById(id).orElseThrow(FlightRealizationNotFoundException::new); - existingFlightRealization.setArrivalTime( flightRealization.getArrivalTime() ); + existingFlightRealization.setArrivalTime(flightRealization.getArrivalTime()); existingFlightRealization.setDuration(flightRealization.getDuration()); existingFlightRealization.setDepartureTime(flightRealization.getDepartureTime()); existingFlightRealization.setKilometersFlown(flightRealization.getKilometersFlown()); existingFlightRealization.setReport(flightRealization.getReport()); - FlightRealization updateFlightRealization = flightRealizationRepository.save(existingFlightRealization); + FlightRealization updateFlightRealization = flightRealizationRepository.save(existingFlightRealization); return updateFlightRealization; } diff --git a/airports-flight-service/src/main/java/cz/muni/fi/pa165/service/IssueReportService.java b/airports-flight-service/src/main/java/cz/muni/fi/pa165/service/IssueReportService.java index a621546ca0e635efae3d617381dbfc1ab5fbb7a7..3b53694203ec48fc571796e77903bf5196dd4671 100644 --- a/airports-flight-service/src/main/java/cz/muni/fi/pa165/service/IssueReportService.java +++ b/airports-flight-service/src/main/java/cz/muni/fi/pa165/service/IssueReportService.java @@ -3,13 +3,11 @@ package cz.muni.fi.pa165.service; import cz.muni.fi.pa165.dao.IssueReport; import cz.muni.fi.pa165.exception.IssueReportNotFoundException; import cz.muni.fi.pa165.repository.IssueReportRepository; -import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Optional; import java.util.UUID; @Service @@ -36,10 +34,11 @@ public class IssueReportService { existingIssueReport.setDescription(issueReport.getDescription()); existingIssueReport.setFlightEncountered(issueReport.getFlightEncountered()); - IssueReport updateIssueReport = issueReportRepository.save(existingIssueReport); + IssueReport updateIssueReport = issueReportRepository.save(existingIssueReport); return updateIssueReport; } + public void deleteIssueReport(UUID id) { issueReportRepository.deleteById(id); } diff --git a/airports-flight-service/src/test/java/cz/muni/fi/pa165/facade/FlightFacadeTest.java b/airports-flight-service/src/test/java/cz/muni/fi/pa165/facade/FlightFacadeTest.java index 81c2a6b1bb7aca2870a035c50d8d9aaf40556a5b..b55d340e3bbef15b23cde02baf29950118f56b30 100644 --- a/airports-flight-service/src/test/java/cz/muni/fi/pa165/facade/FlightFacadeTest.java +++ b/airports-flight-service/src/test/java/cz/muni/fi/pa165/facade/FlightFacadeTest.java @@ -1,22 +1,21 @@ package cz.muni.fi.pa165.facade; import cz.muni.fi.pa165.api.flight.requests.FlightRequest; -import cz.muni.fi.pa165.api.plane.requests.PlaneRequest; import cz.muni.fi.pa165.exception.FlightNotFoundException; import cz.muni.fi.pa165.service.FlightService; import cz.muni.fi.pa165.utils.TestApiFactory; import cz.muni.fi.pa165.utils.TestDaoFactory; -import org.junit.jupiter.api.Test; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; import java.util.UUID; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.*; @ExtendWith(MockitoExtension.class) diff --git a/airports-flight-service/src/test/java/cz/muni/fi/pa165/facade/FlightRealizationFacadeTest.java b/airports-flight-service/src/test/java/cz/muni/fi/pa165/facade/FlightRealizationFacadeTest.java index 7e41d0668a401ca9beb1d155ac79db05bc860c4e..e4de58e19593dc94332bcc418fb1127ef30f2caf 100644 --- a/airports-flight-service/src/test/java/cz/muni/fi/pa165/facade/FlightRealizationFacadeTest.java +++ b/airports-flight-service/src/test/java/cz/muni/fi/pa165/facade/FlightRealizationFacadeTest.java @@ -1,8 +1,6 @@ package cz.muni.fi.pa165.facade; import cz.muni.fi.pa165.service.FlightService; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; diff --git a/airports-flight-service/src/test/java/cz/muni/fi/pa165/facade/IssueReportFacadeTest.java b/airports-flight-service/src/test/java/cz/muni/fi/pa165/facade/IssueReportFacadeTest.java index bad358e80a5dcff416836a9017ff9320f7e3fec3..f5e74d83cff9ef5d31eef884a5821b0d5870be52 100644 --- a/airports-flight-service/src/test/java/cz/muni/fi/pa165/facade/IssueReportFacadeTest.java +++ b/airports-flight-service/src/test/java/cz/muni/fi/pa165/facade/IssueReportFacadeTest.java @@ -1,14 +1,12 @@ package cz.muni.fi.pa165.facade; -import cz.muni.fi.pa165.api.employee.requests.StewardRequest; import cz.muni.fi.pa165.api.flight.requests.IssueReportRequest; -import cz.muni.fi.pa165.service.FlightService; +import cz.muni.fi.pa165.dao.IssueReport; import cz.muni.fi.pa165.service.IssueReportService; import cz.muni.fi.pa165.utils.TestApiFactory; import cz.muni.fi.pa165.utils.TestDaoFactory; import org.junit.jupiter.api.BeforeEach; -import cz.muni.fi.pa165.dao.*; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/airports-flight-service/src/test/java/cz/muni/fi/pa165/rest/FlightControllerTest.java b/airports-flight-service/src/test/java/cz/muni/fi/pa165/rest/FlightControllerTest.java index f34ae20da256d2ba7cee464a59fc1ef53d078883..a5838f946dc3a5f0ae7dd463fe2d2a358c2630e4 100644 --- a/airports-flight-service/src/test/java/cz/muni/fi/pa165/rest/FlightControllerTest.java +++ b/airports-flight-service/src/test/java/cz/muni/fi/pa165/rest/FlightControllerTest.java @@ -6,11 +6,6 @@ import cz.muni.fi.pa165.exception.FlightNotFoundException; import cz.muni.fi.pa165.facade.FlightFacade; import cz.muni.fi.pa165.utils.ObjectConverter; import cz.muni.fi.pa165.utils.TestApiFactory; - - -import org.springframework.test.web.servlet.RequestBuilder; -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; - import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; @@ -19,20 +14,11 @@ import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; - -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; import java.util.Collections; -import java.util.List; import java.util.UUID; - - import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -172,4 +158,4 @@ public class FlightControllerTest { Mockito.verify(flightFacade, Mockito.times(1)).deleteFlight(id); } - } +} diff --git a/airports-flight-service/src/test/java/cz/muni/fi/pa165/rest/IssueReportControllerTest.java b/airports-flight-service/src/test/java/cz/muni/fi/pa165/rest/IssueReportControllerTest.java index 4f94515255cf42aa925581612c0f445b53198aab..670e82f81e474fed669e2355ece9edfdbb9d667f 100644 --- a/airports-flight-service/src/test/java/cz/muni/fi/pa165/rest/IssueReportControllerTest.java +++ b/airports-flight-service/src/test/java/cz/muni/fi/pa165/rest/IssueReportControllerTest.java @@ -1,13 +1,11 @@ package cz.muni.fi.pa165.rest; -import cz.muni.fi.pa165.api.employee.requests.EmployeeRequest; import cz.muni.fi.pa165.api.flight.IssueReport; import cz.muni.fi.pa165.api.flight.requests.IssueReportRequest; import cz.muni.fi.pa165.exception.IssueReportNotFoundException; import cz.muni.fi.pa165.facade.IssueReportFacade; import cz.muni.fi.pa165.utils.ObjectConverter; import cz.muni.fi.pa165.utils.TestApiFactory; - import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; @@ -21,14 +19,13 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import java.nio.charset.StandardCharsets; import java.util.UUID; - import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@WebMvcTest( controllers = {IssueReportController.class}) +@WebMvcTest(controllers = {IssueReportController.class}) public class IssueReportControllerTest { @Autowired @@ -76,15 +73,15 @@ public class IssueReportControllerTest { String requestJson = "{" + - "\"id\":\""+ id +"\"," + - "\"planeId\":\"" + id + "\"," + - "\"flightEncountered\":\"" +id+ "\"," + - "\"description\":\"description\"" + - "}"; + "\"id\":\"" + id + "\"," + + "\"planeId\":\"" + id + "\"," + + "\"flightEncountered\":\"" + id + "\"," + + "\"description\":\"description\"" + + "}"; String responseJson = mockMvc.perform(put("/issuereports/{id}", id) .contentType(MediaType.APPLICATION_JSON) - .content(requestJson) - ) + .content(requestJson) + ) .andExpect(status().isOk()) .andReturn() .getResponse() @@ -102,9 +99,9 @@ public class IssueReportControllerTest { String requestJson = "{" + - "\"id\":\""+ id +"\"," + + "\"id\":\"" + id + "\"," + "\"planeId\":\"" + id + "\"," + - "\"flightEncountered\":\"" +id+ "\"," + + "\"flightEncountered\":\"" + id + "\"," + "\"description\":\"description\"" + "}"; @@ -119,7 +116,6 @@ public class IssueReportControllerTest { } - @Test public void deleteIssueReport_IssueReportFound() throws Exception { UUID id = UUID.randomUUID(); diff --git a/airports-flight-service/src/test/java/cz/muni/fi/pa165/service/FlightRealizationServiceTest.java b/airports-flight-service/src/test/java/cz/muni/fi/pa165/service/FlightRealizationServiceTest.java index 2549a4d7288aba7f78506b2d60ac3b5f6eed4507..a7c4eb2272946a12ad3fc80a0c8ed86a7855ee4f 100644 --- a/airports-flight-service/src/test/java/cz/muni/fi/pa165/service/FlightRealizationServiceTest.java +++ b/airports-flight-service/src/test/java/cz/muni/fi/pa165/service/FlightRealizationServiceTest.java @@ -16,7 +16,6 @@ import java.time.Duration; import java.util.Optional; import java.util.UUID; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/airports-flight-service/src/test/java/cz/muni/fi/pa165/service/FlightServiceTest.java b/airports-flight-service/src/test/java/cz/muni/fi/pa165/service/FlightServiceTest.java index 5236e30e559aa2f4067f558757477eaeb4d3b70f..f0bf78f6f8cc4dc4a4902cb8e86adad11e1040e3 100644 --- a/airports-flight-service/src/test/java/cz/muni/fi/pa165/service/FlightServiceTest.java +++ b/airports-flight-service/src/test/java/cz/muni/fi/pa165/service/FlightServiceTest.java @@ -12,9 +12,6 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import java.time.LocalDateTime; -import java.util.HashSet; -import java.util.List; import java.util.Optional; import java.util.UUID; diff --git a/airports-flight-service/src/test/java/cz/muni/fi/pa165/service/IssueReportTest.java b/airports-flight-service/src/test/java/cz/muni/fi/pa165/service/IssueReportTest.java index c5b09c903180000ee6e409eb87d7ea0aeaa83537..640bdcadaa89e932f2bf67e15022ab59e53528a8 100644 --- a/airports-flight-service/src/test/java/cz/muni/fi/pa165/service/IssueReportTest.java +++ b/airports-flight-service/src/test/java/cz/muni/fi/pa165/service/IssueReportTest.java @@ -1,8 +1,6 @@ package cz.muni.fi.pa165.service; -import cz.muni.fi.pa165.dao.FlightRealization; import cz.muni.fi.pa165.dao.IssueReport; -import cz.muni.fi.pa165.exception.FlightRealizationNotFoundException; import cz.muni.fi.pa165.exception.IssueReportNotFoundException; import cz.muni.fi.pa165.repository.IssueReportRepository; import cz.muni.fi.pa165.utils.TestDaoFactory; @@ -14,7 +12,6 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import java.time.Duration; import java.util.Optional; import java.util.UUID; diff --git a/airports-flight-service/src/test/java/cz/muni/fi/pa165/utils/TestApiFactory.java b/airports-flight-service/src/test/java/cz/muni/fi/pa165/utils/TestApiFactory.java index e24afc240154989209e77d140e66d1da50540b2e..5fd3b7e3e96d4884d69a18a4bb6ab81eb13cecfc 100644 --- a/airports-flight-service/src/test/java/cz/muni/fi/pa165/utils/TestApiFactory.java +++ b/airports-flight-service/src/test/java/cz/muni/fi/pa165/utils/TestApiFactory.java @@ -10,13 +10,15 @@ import org.springframework.stereotype.Component; import java.time.Duration; import java.time.LocalDateTime; -import java.util.*; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; @Component public class TestApiFactory { - public static Flight getFlightEntity() { + public static Flight getFlightEntity() { UUID id = new UUID(0x1, 0xf); Flight flight = new Flight(); flight.setPlaneId(id); diff --git a/airports-flight-service/src/test/java/cz/muni/fi/pa165/utils/TestDaoFactory.java b/airports-flight-service/src/test/java/cz/muni/fi/pa165/utils/TestDaoFactory.java index cdffb6c85aabd2f6d0698e02d980fd21691aabe2..cdcb865ba0c1b3d3c066ec0ed0e89670098b1beb 100644 --- a/airports-flight-service/src/test/java/cz/muni/fi/pa165/utils/TestDaoFactory.java +++ b/airports-flight-service/src/test/java/cz/muni/fi/pa165/utils/TestDaoFactory.java @@ -14,7 +14,7 @@ import java.util.UUID; @Component public class TestDaoFactory { - public static Flight getFlightEntity() { + public static Flight getFlightEntity() { Flight flight = new Flight(); flight.setId(new UUID(0x1, 0xf)); flight.setPlaneId(new UUID(0x2, 0xf));