From 5004222ebaac1f6fde832d486fb645080385d8d4 Mon Sep 17 00:00:00 2001 From: Shilyaev_Dmitry Date: Thu, 20 Feb 2025 13:48:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/nto/config/WebSecurityConfig.java | 1 - .../nto/controller/EmployeeController.java | 2 -- .../java/com/example/nto/dto/AuthorityDTO.java | 8 -------- .../java/com/example/nto/entity/Employee.java | 4 ---- .../nto/service/impl/EmployeeServiceImpl.java | 1 - .../service/impl/UserDetailsServiceImpl.java | 1 - .../com/example/nto/util/AuthorityMapper.java | 17 ----------------- .../com/example/nto/util/EmployeeMapper.java | 1 - 8 files changed, 35 deletions(-) delete mode 100644 src/main/java/com/example/nto/dto/AuthorityDTO.java delete mode 100644 src/main/java/com/example/nto/util/AuthorityMapper.java diff --git a/src/main/java/com/example/nto/config/WebSecurityConfig.java b/src/main/java/com/example/nto/config/WebSecurityConfig.java index c34f180..4aba227 100644 --- a/src/main/java/com/example/nto/config/WebSecurityConfig.java +++ b/src/main/java/com/example/nto/config/WebSecurityConfig.java @@ -6,7 +6,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; diff --git a/src/main/java/com/example/nto/controller/EmployeeController.java b/src/main/java/com/example/nto/controller/EmployeeController.java index fa6ef78..ba39c0f 100644 --- a/src/main/java/com/example/nto/controller/EmployeeController.java +++ b/src/main/java/com/example/nto/controller/EmployeeController.java @@ -9,8 +9,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; import org.springframework.web.bind.annotation.*; - -import java.time.LocalDateTime; import java.util.List; @RestController diff --git a/src/main/java/com/example/nto/dto/AuthorityDTO.java b/src/main/java/com/example/nto/dto/AuthorityDTO.java deleted file mode 100644 index 4f2a227..0000000 --- a/src/main/java/com/example/nto/dto/AuthorityDTO.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.example.nto.dto; - -import lombok.Data; - -@Data -public class AuthorityDTO { - private String authority; -} diff --git a/src/main/java/com/example/nto/entity/Employee.java b/src/main/java/com/example/nto/entity/Employee.java index 32e4814..518fccc 100644 --- a/src/main/java/com/example/nto/entity/Employee.java +++ b/src/main/java/com/example/nto/entity/Employee.java @@ -1,14 +1,10 @@ package com.example.nto.entity; -import lombok.AllArgsConstructor; import lombok.Data; -import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import javax.persistence.*; import java.time.LocalDateTime; -import java.util.Collection; -import java.util.List; import java.util.Set; @Data diff --git a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java b/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java index 918c2e1..d6ff5eb 100644 --- a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java +++ b/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java @@ -18,7 +18,6 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import static org.springframework.util.Assert.hasText; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/example/nto/service/impl/UserDetailsServiceImpl.java b/src/main/java/com/example/nto/service/impl/UserDetailsServiceImpl.java index 926ee00..9e90e36 100644 --- a/src/main/java/com/example/nto/service/impl/UserDetailsServiceImpl.java +++ b/src/main/java/com/example/nto/service/impl/UserDetailsServiceImpl.java @@ -3,7 +3,6 @@ package com.example.nto.service.impl; import com.example.nto.entity.Employee; import com.example.nto.repository.EmployeeRepository; import lombok.RequiredArgsConstructor; -import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; diff --git a/src/main/java/com/example/nto/util/AuthorityMapper.java b/src/main/java/com/example/nto/util/AuthorityMapper.java deleted file mode 100644 index fb5b9de..0000000 --- a/src/main/java/com/example/nto/util/AuthorityMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.example.nto.util; - -import com.example.nto.dto.AuthorityDTO; -import com.example.nto.dto.EnterDTO; -import com.example.nto.entity.Authority; -import com.example.nto.entity.Enter; -import lombok.experimental.UtilityClass; - -@UtilityClass -public class AuthorityMapper { - public AuthorityDTO convertToDTO(Authority authority){ - AuthorityDTO authorityDTO = new AuthorityDTO(); - authorityDTO.setAuthority(authority.getAuthority()); - - return authorityDTO; - } -} diff --git a/src/main/java/com/example/nto/util/EmployeeMapper.java b/src/main/java/com/example/nto/util/EmployeeMapper.java index 70e7939..14e9537 100644 --- a/src/main/java/com/example/nto/util/EmployeeMapper.java +++ b/src/main/java/com/example/nto/util/EmployeeMapper.java @@ -1,6 +1,5 @@ package com.example.nto.util; -import com.example.nto.dto.AuthorityDTO; import com.example.nto.dto.EmployeeDTO; import com.example.nto.entity.Employee; import lombok.experimental.UtilityClass;