User entity fix previous name variable
This commit is contained in:
@@ -18,9 +18,6 @@ public class UserEntity {
|
||||
@Column(name = "id")
|
||||
private int id;
|
||||
@Basic
|
||||
@Column(name = "name")
|
||||
private String name;
|
||||
@Basic
|
||||
@Column(name = "username")
|
||||
private String username;
|
||||
@Basic
|
||||
@@ -31,7 +28,6 @@ public class UserEntity {
|
||||
private Byte admin;
|
||||
|
||||
public UserEntity(String name, String username, String password) {
|
||||
this.name = name;
|
||||
this.username = username;
|
||||
this.password = password;
|
||||
}
|
||||
@@ -69,12 +65,12 @@ public class UserEntity {
|
||||
return false;
|
||||
}
|
||||
UserEntity that = (UserEntity) o;
|
||||
return id == that.id && Objects.equals(name, that.name) && Objects.equals(username, that.username) && Objects.equals(password, that.password);
|
||||
return id == that.id && Objects.equals(username, that.username) && Objects.equals(password, that.password);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(id, name, username, password);
|
||||
return Objects.hash(id, username, password);
|
||||
}
|
||||
|
||||
public Byte getAdmin() {
|
||||
|
||||
@@ -9,8 +9,6 @@ import java.util.Optional;
|
||||
@Repository
|
||||
public interface UserRepository extends JpaRepository<UserEntity, Long> {
|
||||
|
||||
Optional<UserEntity> findUserByName(String name);
|
||||
|
||||
Optional<UserEntity> findUserByUsername(String username);
|
||||
|
||||
}
|
||||
|
||||
@@ -28,9 +28,6 @@ public class UserService {
|
||||
return userRepository.findById(id).orElse(null);
|
||||
}
|
||||
|
||||
public UserEntity getUserByName(String name){
|
||||
return userRepository.findUserByName(name).orElse(null);
|
||||
}
|
||||
|
||||
public UserEntity getUserByUsername(String username){
|
||||
return userRepository.findUserByUsername(username).orElse(null);
|
||||
@@ -47,7 +44,6 @@ public class UserService {
|
||||
public UserEntity updateUser(Long id, UserEntity user) {
|
||||
UserEntity user1 = getUserById(id);
|
||||
if (user1 != null) {
|
||||
user1.setName(user.getName());
|
||||
user1.setUsername(user.getUsername());
|
||||
user1.setPassword(user.getPassword());
|
||||
return userRepository.save(user1);
|
||||
|
||||
@@ -10,7 +10,6 @@ public class ErrorChecking {
|
||||
|
||||
public boolean checkUser(UserEntity user){
|
||||
return user != null &&
|
||||
isNotEmpty(user.getName()) &&
|
||||
isNotEmpty(user.getUsername()) &&
|
||||
isNotEmpty(user.getPassword());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user