fix

slovpunk · slovpunk · commit 6ac0d802a311 · 2022-04-27T13:59:12.000+03:00
diff --git a/backend/src/main/java/com/booking/backend/controller/OrganizationController.java b/backend/src/main/java/com/booking/backend/controller/OrganizationController.java
@@ -12,7 +12,7 @@
 @RestController
 public class OrganizationController {
 
-    private final OrganizationService organizationService;
+    private OrganizationService organizationService;
 
     @GetMapping("/organization/pageNo={pageNo},pageSize={pageSize},sortBy={sortBy}")
     public List<OrganizationDto> getAll(@PathVariable Integer pageNo,
diff --git a/backend/src/main/java/com/booking/backend/mapper/BookingMapper.java b/backend/src/main/java/com/booking/backend/mapper/BookingMapper.java
@@ -3,12 +3,14 @@
 import com.booking.backend.dto.BookingDto;
 import com.booking.backend.entity.Booking;
 import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
 import org.springframework.stereotype.Component;
 
-@Mapper
-@Component
+@Mapper(componentModel = "spring")
 public interface BookingMapper {
 
+    BookingMapper INSTANCE = Mappers.getMapper(BookingMapper.class);
+
     BookingDto convert (Booking booking);
 
     Booking convert(BookingDto bookingDto);
diff --git a/backend/src/main/java/com/booking/backend/mapper/OrganizationMapper.java b/backend/src/main/java/com/booking/backend/mapper/OrganizationMapper.java
@@ -3,10 +3,10 @@
 import com.booking.backend.dto.OrganizationDto;
 import com.booking.backend.entity.Organization;
 import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
 import org.springframework.stereotype.Component;
 
-@Mapper
-@Component
+@Mapper(componentModel = "spring")
 public interface OrganizationMapper {
 
     OrganizationDto convert(Organization organization);
diff --git a/backend/src/main/java/com/booking/backend/mapper/PersonMapper.java b/backend/src/main/java/com/booking/backend/mapper/PersonMapper.java
@@ -3,12 +3,12 @@
 import com.booking.backend.dto.PersonDto;
 import com.booking.backend.entity.Person;
 import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
 import org.springframework.stereotype.Component;
 
 import java.util.Optional;
 
-@Mapper
-@Component
+@Mapper(componentModel = "spring")
 public interface PersonMapper {
 
     Person convert(PersonDto personDto);
diff --git a/backend/src/main/java/com/booking/backend/mapper/ReservationMapper.java b/backend/src/main/java/com/booking/backend/mapper/ReservationMapper.java
@@ -5,10 +5,10 @@
 import com.booking.backend.entity.Person;
 import com.booking.backend.entity.Reservation;
 import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
 import org.springframework.stereotype.Component;
 
-@Mapper
-@Component
+@Mapper(componentModel = "spring")
 public interface ReservationMapper {
 
     Reservation convert (ReservationDto reservationDto);
diff --git a/backend/src/main/java/com/booking/backend/mapper/SomeObjectMapper.java b/backend/src/main/java/com/booking/backend/mapper/SomeObjectMapper.java
@@ -5,8 +5,10 @@
 import com.booking.backend.entity.Person;
 import com.booking.backend.entity.SomeObject;
 import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+import org.springframework.stereotype.Component;
 
-@Mapper
+@Mapper(componentModel = "spring")
 public interface SomeObjectMapper {
 
     SomeObject convert(SomeObjectDto someObjectDto);
diff --git a/backend/src/main/java/com/booking/backend/service/OrganizationServiceImpl.java b/backend/src/main/java/com/booking/backend/service/OrganizationServiceImpl.java
@@ -5,6 +5,7 @@
 import com.booking.backend.mapper.OrganizationMapper;
 import com.booking.backend.repository.OrganizationRepository;
 import lombok.RequiredArgsConstructor;
+import org.mapstruct.factory.Mappers;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -19,8 +20,8 @@
 @Service
 public class OrganizationServiceImpl implements OrganizationService {
 
-    private final OrganizationRepository organizationRepository;
-    private final OrganizationMapper organizationMapper;
+    private OrganizationRepository organizationRepository;
+    private OrganizationMapper organizationMapper;
 
 
 
