Skip to content
Snippets Groups Projects
Commit 8b9622df authored by Diana Gulčíková's avatar Diana Gulčíková
Browse files

Merge branch 'client_to_call_endpoints' into 'milestone_2'

added client into common module + fixed race module

See merge request !36
parents b536503f 5a6ca85f
No related branches found
No related tags found
2 merge requests!60Docker,!36added client into common module + fixed race module
Pipeline #
Showing with 39 additions and 9 deletions
package cz.muni.pa165.common_library.client;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.client.ClientHttpRequestFactory;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.web.client.RestTemplate;
@Configuration
public class ClientConfig {
@Bean
public RestTemplate restTemplate() {
return new RestTemplate(getClientHttpRequestFactory());
}
private ClientHttpRequestFactory getClientHttpRequestFactory() {
int timeout = 5000;
HttpComponentsClientHttpRequestFactory clientHttpRequestFactory
= new HttpComponentsClientHttpRequestFactory();
clientHttpRequestFactory.setConnectTimeout(timeout);
return clientHttpRequestFactory;
}
}
package cz.muni.pa165.race.data.model; package cz.muni.pa165.common_library.dtos;
/** /**
* Enum for all F1 locations. * Enum for all F1 locations.
......
package cz.muni.pa165.common_library.dtos; package cz.muni.pa165.common_library.dtos;
import cz.muni.pa165.common_library.racecomponents.Location;
import cz.muni.pa165.common_library.racecomponents.Race;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
package cz.muni.pa165.race; package cz.muni.pa165.race;
import cz.muni.pa165.car.data.model.Car; import cz.muni.pa165.car.data.model.Car;
import cz.muni.pa165.common_library.client.ClientConfig;
import cz.muni.pa165.common_library.exception.RestExceptionHandler; import cz.muni.pa165.common_library.exception.RestExceptionHandler;
import cz.muni.pa165.driver.data.model.Driver; import cz.muni.pa165.driver.data.model.Driver;
import cz.muni.pa165.race.data.model.Race; import cz.muni.pa165.race.data.model.Race;
...@@ -19,7 +20,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; ...@@ -19,7 +20,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableJpaRepositories(basePackages = "cz.muni.pa165.race.data.repository") @EnableJpaRepositories(basePackages = "cz.muni.pa165.race.data.repository")
@EnableTransactionManagement @EnableTransactionManagement
@EntityScan(basePackageClasses = {Race.class, Season.class, Car.class, Driver.class}) @EntityScan(basePackageClasses = {Race.class, Season.class, Car.class, Driver.class})
@Import(RestExceptionHandler.class) @Import({RestExceptionHandler.class, ClientConfig.class})
public class App { public class App {
public static void main(String[] args) { public static void main(String[] args) {
......
package cz.muni.pa165.race.data.model; package cz.muni.pa165.race.data.model;
import cz.muni.pa165.car.data.model.Car; import cz.muni.pa165.car.data.model.Car;
import cz.muni.pa165.common_library.dtos.Location;
import cz.muni.pa165.driver.data.model.Driver; import cz.muni.pa165.driver.data.model.Driver;
import jakarta.persistence.CascadeType; import jakarta.persistence.CascadeType;
import jakarta.persistence.Column; import jakarta.persistence.Column;
......
package cz.muni.pa165.race.data.repository; package cz.muni.pa165.race.data.repository;
import cz.muni.pa165.common_library.racecomponents.Car; import cz.muni.pa165.car.data.model.Car;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
......
package cz.muni.pa165.race.data.repository; package cz.muni.pa165.race.data.repository;
import cz.muni.pa165.common_library.racecomponents.Driver;
import cz.muni.pa165.driver.data.model.Driver;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
......
package cz.muni.pa165.race.data.repository; package cz.muni.pa165.race.data.repository;
import cz.muni.pa165.race.data.model.Location; import cz.muni.pa165.common_library.dtos.Location;
import cz.muni.pa165.race.data.model.Race; import cz.muni.pa165.race.data.model.Race;
import java.util.List; import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
......
package cz.muni.pa165.race.service; package cz.muni.pa165.race.service;
import cz.muni.pa165.car.data.model.Car;
import cz.muni.pa165.common_library.dtos.RaceDriverCarDto; import cz.muni.pa165.common_library.dtos.RaceDriverCarDto;
import cz.muni.pa165.common_library.dtos.RaceDto; import cz.muni.pa165.common_library.dtos.RaceDto;
import cz.muni.pa165.common_library.exception.DatabaseException; import cz.muni.pa165.common_library.exception.DatabaseException;
import cz.muni.pa165.common_library.racecomponents.Car; import cz.muni.pa165.driver.data.model.Driver;
import cz.muni.pa165.common_library.racecomponents.Driver;
import cz.muni.pa165.race.data.model.Race; import cz.muni.pa165.race.data.model.Race;
import cz.muni.pa165.race.data.repository.CarRepository; import cz.muni.pa165.race.data.repository.CarRepository;
import cz.muni.pa165.race.data.repository.DriverRepository; import cz.muni.pa165.race.data.repository.DriverRepository;
import cz.muni.pa165.race.data.repository.RaceRepository; import cz.muni.pa165.race.data.repository.RaceRepository;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
/** /**
* Service for managing races. * Service for managing races.
...@@ -23,6 +25,9 @@ public class RaceService { ...@@ -23,6 +25,9 @@ public class RaceService {
CarRepository carRepository; CarRepository carRepository;
DriverRepository driverRepository; DriverRepository driverRepository;
@Autowired
RestTemplate client;
RaceService(RaceRepository raceRepository, CarRepository carRepository, RaceService(RaceRepository raceRepository, CarRepository carRepository,
DriverRepository driverRepository) { DriverRepository driverRepository) {
this.raceRepository = raceRepository; this.raceRepository = raceRepository;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment