Changeset 50f2c2a for Prototype Application/Paw5/src/main/java/finki/paw5/service

Timestamp:

02/16/23 14:45:18 (17 months ago)

Author:

SazdovaEkaterina <sazdovaekaterina@…>

Branches:

main

Children:

9a180fd

Parents:

59a8941 (diff), eef07ff (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge changes from main & resolve conflicts

Location:

Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation

Files:

• AuthServiceImplementation.java (moved) (moved from Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/AuthServiceImpl.java ) (2 diffs)
• OrganisationServiceImplementation.java (moved) (moved from Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/OrganisationServiceImpl.java ) (1 diff)

Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/AuthServiceImplementation.java

@@ -17 +17 @@
 
 @Service
-public class AuthServiceImpl implements AuthService {
+public class AuthServiceImplementation implements AuthService {
 
     private final UserRepository userRepository;
@@ -23 +23 @@
     private final EmployeeRepository employeeRepository;
 
-    public AuthServiceImpl(UserRepository userRepository, AdopterRepository adopterRepository, EmployeeRepository employeeRepository) {
+    public AuthServiceImplementation(UserRepository userRepository, AdopterRepository adopterRepository, EmployeeRepository employeeRepository) {
         this.userRepository = userRepository;
         this.adopterRepository = adopterRepository;

Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/OrganisationServiceImplementation.java

@@ -8 +8 @@
 import java.util.List;
 @Service
-public class OrganisationServiceImpl implements OrganisationService {
+public class OrganisationServiceImplementation implements OrganisationService {
     private final OrganisationRepository organisationRepository;
 
-    public OrganisationServiceImpl(OrganisationRepository organisationRepository) {
+    public OrganisationServiceImplementation(OrganisationRepository organisationRepository) {
         this.organisationRepository = organisationRepository;
     }