diff --git a/core/src/main/java/cz/muni/fi/pa165/core/common/DomainFacade.java b/core/src/main/java/cz/muni/fi/pa165/core/common/DomainFacade.java index 0dfa42ea618de588839655c97073ad1a1984758a..408ecd5f9add5267e0b2cf87cc737547ae874468 100644 --- a/core/src/main/java/cz/muni/fi/pa165/core/common/DomainFacade.java +++ b/core/src/main/java/cz/muni/fi/pa165/core/common/DomainFacade.java @@ -2,7 +2,6 @@ package cz.muni.fi.pa165.core.common; import cz.muni.fi.pa165.model.dto.common.DomainObjectDto; import cz.muni.fi.pa165.model.dto.common.Result; -import org.springframework.transaction.annotation.Transactional; import org.springframework.data.domain.Pageable; import java.util.List; @@ -16,7 +15,6 @@ import java.util.List; * @param <C> the DTO type representing a create operation for the entity * @param <U> the DTO type representing an update operation for the entity */ -@Transactional public abstract class DomainFacade<E extends DomainObject, T extends DomainObjectDto, C extends DomainObjectDto, @@ -49,7 +47,6 @@ public abstract class DomainFacade<E extends DomainObject, * @param id the ID of the entity to find * @return the DTO representation of the found entity */ - @Transactional(readOnly = true) public T findById(String id) { return mapper.toDto(service.findById(id)); } @@ -60,7 +57,6 @@ public abstract class DomainFacade<E extends DomainObject, * @param pageable the pagination information * @return a list of DTO representations of the found entities */ - @Transactional(readOnly = true) public List<T> findAllPageable(Pageable pageable) { return mapper.toDtoList((List<E>) service.findAllPageable(pageable)); } @@ -71,7 +67,6 @@ public abstract class DomainFacade<E extends DomainObject, * @param page the page number to retrieve * @return a {@code Result} object containing pagination and entity information */ - @Transactional(readOnly = true) public Result<T> findAll(int page) { return mapper.toResult(service.findAllPageableInt(page)); } @@ -82,7 +77,6 @@ public abstract class DomainFacade<E extends DomainObject, * * @return a list of DTO representations of the found entities */ - @Transactional(readOnly = true) public List<T> findAll() { return mapper.toDtoList(service.findAll()); } @@ -93,7 +87,6 @@ public abstract class DomainFacade<E extends DomainObject, * @param createDto the DTO representation of the create operation for the entity * @return the DTO representation of the created entity */ - @Transactional public T create(C createDto) { return mapper.toDto(service.create(mapper.fromCreateDto(createDto))); } @@ -105,7 +98,6 @@ public abstract class DomainFacade<E extends DomainObject, * @param id ID of the entity to be updated. * @return DTO representing the updated entity. */ - @Transactional public T updateById(U updateDto, String id) { return mapper.toDto(service.update(mapper.fromUpdateDto(updateDto), id)); } @@ -116,7 +108,6 @@ public abstract class DomainFacade<E extends DomainObject, * @param id ID of the entity to be deleted. * @return DTO representing the deleted entity. */ - @Transactional public T deleteById(String id) { return mapper.toDto(service.deleteById(id)); } diff --git a/core/src/main/java/cz/muni/fi/pa165/core/company/CompanyFacade.java b/core/src/main/java/cz/muni/fi/pa165/core/company/CompanyFacade.java index 1bbb82c6ae938b014c6fdc62498c709aa0f83fff..7755b3fab2d19d38b3e5d60aedc23d10fb6c1062 100644 --- a/core/src/main/java/cz/muni/fi/pa165/core/company/CompanyFacade.java +++ b/core/src/main/java/cz/muni/fi/pa165/core/company/CompanyFacade.java @@ -6,11 +6,9 @@ import cz.muni.fi.pa165.model.dto.company.CompanyDto; import cz.muni.fi.pa165.model.dto.company.CompanyUpdateDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; @Component -@Transactional public class CompanyFacade extends DomainFacade<Company, CompanyDto, CompanyCreateDto, CompanyUpdateDto> { private final CompanyService companyService; // For the "CompanyService" specific methods diff --git a/core/src/main/java/cz/muni/fi/pa165/core/device/DeviceFacade.java b/core/src/main/java/cz/muni/fi/pa165/core/device/DeviceFacade.java index b3c6496920ca07df17c7f5c8786fa5038df86415..83ebcbe6ddd4c713c3731e5ca6f29df9b8e3d131 100644 --- a/core/src/main/java/cz/muni/fi/pa165/core/device/DeviceFacade.java +++ b/core/src/main/java/cz/muni/fi/pa165/core/device/DeviceFacade.java @@ -6,12 +6,8 @@ import cz.muni.fi.pa165.model.dto.device.DeviceDto; import cz.muni.fi.pa165.model.dto.device.DeviceUpdateDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; @Component -@Transactional public class DeviceFacade extends DomainFacade<Device, DeviceDto, DeviceCreateDto, DeviceUpdateDto> { private final DeviceService deviceService; // For the "DeviceService" specific methods diff --git a/core/src/main/java/cz/muni/fi/pa165/core/house/HouseFacade.java b/core/src/main/java/cz/muni/fi/pa165/core/house/HouseFacade.java index 82085354438e3ef168162a827a1397952a49c6c4..e36736bdd45381b2003a04a17eedac50ddc55621 100644 --- a/core/src/main/java/cz/muni/fi/pa165/core/house/HouseFacade.java +++ b/core/src/main/java/cz/muni/fi/pa165/core/house/HouseFacade.java @@ -6,11 +6,9 @@ import cz.muni.fi.pa165.model.dto.house.HouseDto; import cz.muni.fi.pa165.model.dto.house.HouseUpdateDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; @Component -@Transactional public class HouseFacade extends DomainFacade<House, HouseDto, HouseCreateDto, HouseUpdateDto> { private final HouseService houseService; // For the "HouseService" specific methods diff --git a/core/src/main/java/cz/muni/fi/pa165/core/manufacturer/ManufacturerFacade.java b/core/src/main/java/cz/muni/fi/pa165/core/manufacturer/ManufacturerFacade.java index d92ee7a2ae69f9da4e44797902daee25fa8518cc..bbf439a62eb99eb15f264461a9d1a4de5b98fa21 100644 --- a/core/src/main/java/cz/muni/fi/pa165/core/manufacturer/ManufacturerFacade.java +++ b/core/src/main/java/cz/muni/fi/pa165/core/manufacturer/ManufacturerFacade.java @@ -6,10 +6,8 @@ import cz.muni.fi.pa165.model.dto.manufacturer.ManufacturerDto; import cz.muni.fi.pa165.model.dto.manufacturer.ManufacturerUpdateDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; @Component -@Transactional public class ManufacturerFacade extends DomainFacade<Manufacturer, ManufacturerDto, ManufacturerCreateDto, diff --git a/core/src/main/java/cz/muni/fi/pa165/core/metrics/MetricsFacade.java b/core/src/main/java/cz/muni/fi/pa165/core/metrics/MetricsFacade.java index 23174ce35ffaedae8fd5395cbf9a7517c22e95e4..e6e112aded8af539aaea8131a9c4bf9878cc06c1 100644 --- a/core/src/main/java/cz/muni/fi/pa165/core/metrics/MetricsFacade.java +++ b/core/src/main/java/cz/muni/fi/pa165/core/metrics/MetricsFacade.java @@ -6,10 +6,8 @@ import cz.muni.fi.pa165.model.dto.metrics.MetricsDto; import cz.muni.fi.pa165.model.dto.metrics.MetricsUpdateDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; @Component -@Transactional public class MetricsFacade extends DomainFacade<Metrics, MetricsDto, MetricsCreateDto, diff --git a/core/src/main/java/cz/muni/fi/pa165/core/smartmeter/SmartMeterFacade.java b/core/src/main/java/cz/muni/fi/pa165/core/smartmeter/SmartMeterFacade.java index 92abf24cf7d1b66a132bc951a6cbd5041006e66b..4312f57c888b5f412535cf896fbfb8de8ae0f5d5 100644 --- a/core/src/main/java/cz/muni/fi/pa165/core/smartmeter/SmartMeterFacade.java +++ b/core/src/main/java/cz/muni/fi/pa165/core/smartmeter/SmartMeterFacade.java @@ -6,10 +6,8 @@ import cz.muni.fi.pa165.model.dto.smartDevice.SmartMeterDto; import cz.muni.fi.pa165.model.dto.smartDevice.SmartMeterUpdateDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; @Component -@Transactional public class SmartMeterFacade extends DomainFacade<SmartMeter, SmartMeterDto, SmartMeterCreateDto,