Changeset 838441d

Timestamp:

01/18/26 16:18:58 (6 months ago)

Author:

Filip Gavrilovski <filipgavrilovski28@…>

Branches:

main

Children:

8952345

Parents:

f6ce33a

Message:

fix lombok ide error

Location:

finkwave

Files:

• pom.xml (modified) (1 diff)
• src/main/java/com/ukim/finki/develop/finkwave/controller/UserController.java (moved) (moved from finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/UsersController.java ) (2 diffs)
• src/main/java/com/ukim/finki/develop/finkwave/model/Admin.java (modified) (1 diff)
• src/main/java/com/ukim/finki/develop/finkwave/model/NonAdminUser.java (modified) (1 diff)
• src/main/java/com/ukim/finki/develop/finkwave/model/User.java (added)
• src/main/java/com/ukim/finki/develop/finkwave/model/Users.java (deleted)
• src/main/java/com/ukim/finki/develop/finkwave/repository/UserRepository.java (moved) (moved from finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/UsersRepository.java ) (1 diff)
• src/main/java/com/ukim/finki/develop/finkwave/service/UserService.java (added)
• src/main/java/com/ukim/finki/develop/finkwave/service/UsersService.java (deleted)

finkwave/pom.xml

@@ -73 +73 @@
                                                         <groupId>org.projectlombok</groupId>
                                                         <artifactId>lombok</artifactId>
+                                                        <version>${lombok.version}</version>
                                                 </path>
                                         </annotationProcessorPaths>

finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/UserController.java

@@ -1 +1 @@
 package com.ukim.finki.develop.finkwave.controller;
 
-import com.ukim.finki.develop.finkwave.model.Users;
-import com.ukim.finki.develop.finkwave.service.UsersService;
+import com.ukim.finki.develop.finkwave.model.User;
+import com.ukim.finki.develop.finkwave.service.UserService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.ResponseEntity;
@@ -13 +14 @@
 @RestController
 @CrossOrigin("*")
-public class UsersController {
-    private final UsersService usersService;
-
-    public UsersController(UsersService usersService) {
-        this.usersService = usersService;
-    }
+@RequiredArgsConstructor
+public class UserController {
+    private final UserService usersService;
 
     @GetMapping
-    public HttpEntity<List<Users>> getAllUsers(){
+    public HttpEntity<List<User>> getAllUsers(){
         return ResponseEntity.ok(usersService.getAll());
     }

finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/Admin.java

@@ -15 +15 @@
     @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")
-    private Users users;
+    private User users;
 
 }

finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/NonAdminUser.java

@@ -17 +17 @@
     @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")
-    private Users users;
+    private User users;
 
 }

finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/UserRepository.java

@@ -1 +1 @@
 package com.ukim.finki.develop.finkwave.repository;
 
-import com.ukim.finki.develop.finkwave.model.Users;
+import com.ukim.finki.develop.finkwave.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface UsersRepository extends JpaRepository<Users, Long> {
+public interface UserRepository extends JpaRepository<User, Long> {
 }