fix

slovpunk · slovpunk · commit fc5ed702eeee · 2022-04-27T14:00:43.000+03:00
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -72,6 +72,12 @@
             <artifactId>mapstruct</artifactId>
             <version>1.4.2.Final</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-processor</artifactId>
+            <version>1.4.2.Final</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -88,23 +94,6 @@
                     <target>17</target>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
-                <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>org.mapstruct</groupId>
-                            <artifactId>mapstruct-processor</artifactId>
-                            <version>1.4.2.Final</version>
-                        </path>
-                    </annotationProcessorPaths>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/backend/src/main/java/com/booking/backend/controller/OrganizationController.java b/backend/src/main/java/com/booking/backend/controller/OrganizationController.java
@@ -10,9 +10,10 @@
 
 @RequiredArgsConstructor
 @RestController
+@RequiredArgsConstructor
 public class OrganizationController {
 
-    private OrganizationService organizationService;
+    private final 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
@@ -9,8 +9,6 @@
 @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/service/BookingServiceImpl.java b/backend/src/main/java/com/booking/backend/service/BookingServiceImpl.java
@@ -5,6 +5,7 @@
 import com.booking.backend.repository.BookingRepository;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/backend/src/main/java/com/booking/backend/service/OrganizationServiceImpl.java b/backend/src/main/java/com/booking/backend/service/OrganizationServiceImpl.java
@@ -16,14 +16,12 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-@RequiredArgsConstructor
 @Service
+@RequiredArgsConstructor
 public class OrganizationServiceImpl implements OrganizationService {
 
-    private OrganizationRepository organizationRepository;
-    private OrganizationMapper organizationMapper;
-
-
+    private final OrganizationRepository organizationRepository;
+    private final OrganizationMapper organizationMapper;
 
     @Override
     public List<OrganizationDto> getSortedOrganization(Integer pageNo, Integer pageSize, String sortBy) {
diff --git a/backend/src/main/java/com/booking/backend/service/PersonServiceImpl.java b/backend/src/main/java/com/booking/backend/service/PersonServiceImpl.java
@@ -8,6 +8,7 @@
 
 @RequiredArgsConstructor
 @Service
+@RequiredArgsConstructor
 public class PersonServiceImpl implements PersonService {
     private final PersonRepository personRepository;
     private final PersonMapper mapper;
diff --git a/backend/src/main/java/com/booking/backend/service/ReservationServiceImpl.java b/backend/src/main/java/com/booking/backend/service/ReservationServiceImpl.java
@@ -10,18 +10,12 @@
 
 
 @Service
+@RequiredArgsConstructor
 public class ReservationServiceImpl implements ReservationService {
 
-    private ReservationRepository reservationRepository;
-    private ReservationMapper reservationMapper;
-    private BookingService bookingService;
-
-    public ReservationServiceImpl(ReservationRepository reservationRepository,
-                                  ReservationMapper reservationMapper, BookingService bookingService) {
-        this.reservationRepository = reservationRepository;
-        this.reservationMapper = reservationMapper;
-        this.bookingService = bookingService;
-    }
+    private final ReservationRepository reservationRepository;
+    private final ReservationMapper reservationMapper;
+    private final BookingService bookingService;
 
     @Override
     @Transactional
diff --git a/backend/src/test/java/com/booking/backend/BackendApplicationTests.java b/backend/src/test/java/com/booking/backend/BackendApplicationTests.java
