From b23ba3b92a3a955dcd1db65ece09e6afc83c4d8f Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 12 May 2025 15:59:39 +0900 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/co/jp/app/service/UserService.java | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/src/main/java/co/jp/app/service/UserService.java b/src/main/java/co/jp/app/service/UserService.java index f5b749d..7af06bd 100644 --- a/src/main/java/co/jp/app/service/UserService.java +++ b/src/main/java/co/jp/app/service/UserService.java @@ -1,15 +1,5 @@ package co.jp.app.service; -<<<<<<< HEAD -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Service; - -import co.jp.app.entity.UserEntity; -import co.jp.app.repository.userRepository; -import jakarta.transaction.Transactional; - -======= import java.util.Collection; import java.util.Collections; @@ -27,28 +17,16 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; ->>>>>>> 34de018ef0606dec4f6de48c8cc5c3f073a1fdc6 @Service public class UserService implements UserDetailsService { -<<<<<<< HEAD - private final userRepository userEntityRepository; - - @Autowired - public UserService(userRepository userEntityRepository, PasswordEncoder passwordEncoder ) - { - this.userEntityRepository = userEntityRepository; - this.passwordEncoder= passwordEncoder; - -======= private final UserRepository userRepository; private final PasswordEncoder passwordEncoder; public UserService(UserRepository userRepository, PasswordEncoder passwordEncoder) { this.userRepository = userRepository; this.passwordEncoder = passwordEncoder; ->>>>>>> 34de018ef0606dec4f6de48c8cc5c3f073a1fdc6 } @Transactional