Skip to content

Commit 33971c9

Browse files
php-coderphp-coder
committed
JdbcUserDao and JdbcUserDaoImpl renamed to UserDao and JdbcUserDao.
Addressed to #120 No functional changes.
1 parent 9a1d55c commit 33971c9

File tree

6 files changed

+31
-31
lines changed

6 files changed

+31
-31
lines changed

‎src/main/java/ru/mystamps/web/config/DaoConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ public SeriesDao getSeriesDao() {
7878
}
7979

8080
@Bean
81-
public JdbcUserDao getJdbcUserDao() {
82-
return new JdbcUserDaoImpl(jdbcTemplate);
81+
public UserDao getUserDao() {
82+
return new JdbcUserDao(jdbcTemplate);
8383
}
8484

8585
@Bean

‎src/main/java/ru/mystamps/web/config/ServicesConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public SiteService getSiteService() {
124124
@Bean
125125
public UserService getUserService() {
126126
return new UserServiceImpl(
127-
daoConfig.getJdbcUserDao(),
127+
daoConfig.getUserDao(),
128128
getUsersActivationService(),
129129
getCollectionService(),
130130
securityConfig.getPasswordEncoder()

‎src/main/java/ru/mystamps/web/dao/JdbcUserDao.java renamed to ‎src/main/java/ru/mystamps/web/dao/UserDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import ru.mystamps.web.dao.dto.AddUserDbDto;
2121
import ru.mystamps.web.dao.dto.UserDetails;
2222

23-
public interface JdbcUserDao {
23+
public interface UserDao {
2424
long countByLogin(String login);
2525
UserDetails findUserDetailsByLogin(String login);
2626
Integer add(AddUserDbDto user);

‎src/main/java/ru/mystamps/web/dao/impl/JdbcUserDaoImpl.java renamed to ‎src/main/java/ru/mystamps/web/dao/impl/JdbcUserDao.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232

3333
import lombok.RequiredArgsConstructor;
3434

35-
import ru.mystamps.web.dao.JdbcUserDao;
35+
import ru.mystamps.web.dao.UserDao;
3636
import ru.mystamps.web.dao.dto.AddUserDbDto;
3737
import ru.mystamps.web.dao.dto.UserDetails;
3838

3939
@RequiredArgsConstructor
40-
public class JdbcUserDaoImpl implements JdbcUserDao {
40+
public class JdbcUserDao implements UserDao {
4141

4242
private final NamedParameterJdbcTemplate jdbcTemplate;
4343

‎src/main/java/ru/mystamps/web/service/UserServiceImpl.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
import lombok.RequiredArgsConstructor;
3333

34-
import ru.mystamps.web.dao.JdbcUserDao;
34+
import ru.mystamps.web.dao.UserDao;
3535
import ru.mystamps.web.dao.dto.AddUserDbDto;
3636
import ru.mystamps.web.dao.dto.UserDetails;
3737
import ru.mystamps.web.dao.dto.UsersActivationDto;
@@ -44,7 +44,7 @@ public class UserServiceImpl implements UserService {
4444

4545
private static final Logger LOG = LoggerFactory.getLogger(UserServiceImpl.class);
4646

47-
private final JdbcUserDao jdbcUserDao;
47+
private final UserDao userDao;
4848
private final UsersActivationService usersActivationService;
4949
private final CollectionService collectionService;
5050
private final PasswordEncoder encoder;
@@ -91,7 +91,7 @@ public void registerUser(ActivateAccountDto dto) {
9191
user.setActivatedAt(now);
9292
user.setHash(hash);
9393

94-
Integer id = jdbcUserDao.add(user);
94+
Integer id = userDao.add(user);
9595
usersActivationService.remove(activationKey);
9696

9797
LOG.info("User #{} has been created ({})", id, user);
@@ -104,15 +104,15 @@ public void registerUser(ActivateAccountDto dto) {
104104
public UserDetails findUserDetailsByLogin(String login) {
105105
Validate.isTrue(login != null, "Login must be non null");
106106

107-
return jdbcUserDao.findUserDetailsByLogin(login);
107+
return userDao.findUserDetailsByLogin(login);
108108
}
109109

110110
@Override
111111
@Transactional(readOnly = true)
112112
public long countByLogin(String login) {
113113
Validate.isTrue(login != null, "Login should be non null");
114114

115-
return jdbcUserDao.countByLogin(login);
115+
return userDao.countByLogin(login);
116116
}
117117

118118
}

‎src/test/groovy/ru/mystamps/web/service/UserServiceImplTest.groovy

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import org.springframework.security.crypto.password.PasswordEncoder
2121

2222
import spock.lang.Specification
2323

24-
import ru.mystamps.web.dao.JdbcUserDao
24+
import ru.mystamps.web.dao.UserDao
2525
import ru.mystamps.web.dao.dto.AddUserDbDto
2626
import ru.mystamps.web.dao.dto.UserDetails
2727
import ru.mystamps.web.dao.dto.UsersActivationDto
@@ -32,7 +32,7 @@ class UserServiceImplTest extends Specification {
3232

3333
private static Integer ANY_USER_ID = TestObjects.TEST_USER_ID
3434

35-
private JdbcUserDao jdbcUserDao = Mock()
35+
private UserDao userDao = Mock()
3636
private UsersActivationService usersActivationService = Mock()
3737
private CollectionService collectionService = Mock()
3838
private PasswordEncoder encoder = Mock()
@@ -54,7 +54,7 @@ class UserServiceImplTest extends Specification {
5454
activationForm.setName(user.getName())
5555
activationForm.setActivationKey(TestObjects.TEST_ACTIVATION_KEY)
5656

57-
service = new UserServiceImpl(jdbcUserDao, usersActivationService, collectionService, encoder)
57+
service = new UserServiceImpl(userDao, usersActivationService, collectionService, encoder)
5858
}
5959

6060
//
@@ -72,7 +72,7 @@ class UserServiceImplTest extends Specification {
7272
when:
7373
service.registerUser(activationForm)
7474
then:
75-
1 * jdbcUserDao.add(_ as AddUserDbDto) >> ANY_USER_ID
75+
1 * userDao.add(_ as AddUserDbDto) >> ANY_USER_ID
7676
}
7777

7878
def "registerUser() should delete registration request"() {
@@ -86,7 +86,7 @@ class UserServiceImplTest extends Specification {
8686
return true
8787
})
8888
and:
89-
jdbcUserDao.add(_ as AddUserDbDto) >> ANY_USER_ID
89+
userDao.add(_ as AddUserDbDto) >> ANY_USER_ID
9090
}
9191

9292
def "registerUser() should throw exception when activation key is null"() {
@@ -104,7 +104,7 @@ class UserServiceImplTest extends Specification {
104104
then:
105105
usersActivationService.findByActivationKey(_ as String) >> null
106106
and:
107-
0 * jdbcUserDao.add(_ as AddUserDbDto)
107+
0 * userDao.add(_ as AddUserDbDto)
108108
and:
109109
0 * usersActivationService.remove(_ as String)
110110
}
@@ -115,7 +115,7 @@ class UserServiceImplTest extends Specification {
115115
when:
116116
service.registerUser(activationForm)
117117
then:
118-
1 * jdbcUserDao.add({ AddUserDbDto user ->
118+
1 * userDao.add({ AddUserDbDto user ->
119119
assert user?.name == expectedUserName
120120
return true
121121
}) >> ANY_USER_ID
@@ -128,7 +128,7 @@ class UserServiceImplTest extends Specification {
128128
when:
129129
service.registerUser(activationForm)
130130
then:
131-
1 * jdbcUserDao.add({ AddUserDbDto user ->
131+
1 * userDao.add({ AddUserDbDto user ->
132132
assert user?.name == expectedUserLogin
133133
return true
134134
}) >> ANY_USER_ID
@@ -142,7 +142,7 @@ class UserServiceImplTest extends Specification {
142142
when:
143143
service.registerUser(activationForm)
144144
then:
145-
1 * jdbcUserDao.add({ AddUserDbDto user ->
145+
1 * userDao.add({ AddUserDbDto user ->
146146
assert user?.name == expectedUserLogin
147147
return true
148148
}) >> ANY_USER_ID
@@ -152,7 +152,7 @@ class UserServiceImplTest extends Specification {
152152
when:
153153
service.registerUser(activationForm)
154154
then:
155-
1 * jdbcUserDao.add({ AddUserDbDto user ->
155+
1 * userDao.add({ AddUserDbDto user ->
156156
assert user?.role == UserDetails.Role.USER
157157
return true
158158
}) >> ANY_USER_ID
@@ -166,7 +166,7 @@ class UserServiceImplTest extends Specification {
166166
when:
167167
service.registerUser(activationForm)
168168
then:
169-
1 * jdbcUserDao.add({ AddUserDbDto user ->
169+
1 * userDao.add({ AddUserDbDto user ->
170170
assert user?.email == activation.email
171171
return true
172172
}) >> ANY_USER_ID
@@ -180,7 +180,7 @@ class UserServiceImplTest extends Specification {
180180
then:
181181
usersActivationService.findByActivationKey(_ as String) >> activation
182182
and:
183-
1 * jdbcUserDao.add({ AddUserDbDto user ->
183+
1 * userDao.add({ AddUserDbDto user ->
184184
assert user?.registeredAt == activation.createdAt
185185
return true
186186
}) >> ANY_USER_ID
@@ -201,7 +201,7 @@ class UserServiceImplTest extends Specification {
201201
when:
202202
service.registerUser(activationForm)
203203
then:
204-
1 * jdbcUserDao.add({ AddUserDbDto user ->
204+
1 * userDao.add({ AddUserDbDto user ->
205205
assert user?.hash == expectedHash
206206
return true
207207
}) >> ANY_USER_ID
@@ -236,7 +236,7 @@ class UserServiceImplTest extends Specification {
236236
when:
237237
service.registerUser(activationForm)
238238
then:
239-
1 * jdbcUserDao.add({ AddUserDbDto user ->
239+
1 * userDao.add({ AddUserDbDto user ->
240240
assert user?.login == expectedUserLogin
241241
return true
242242
}) >> ANY_USER_ID
@@ -246,7 +246,7 @@ class UserServiceImplTest extends Specification {
246246
when:
247247
service.registerUser(activationForm)
248248
then:
249-
1 * jdbcUserDao.add({ AddUserDbDto user ->
249+
1 * userDao.add({ AddUserDbDto user ->
250250
assert DateUtils.roughlyEqual(user?.activatedAt, new Date())
251251
return true
252252
}) >> ANY_USER_ID
@@ -257,7 +257,7 @@ class UserServiceImplTest extends Specification {
257257
Integer expectedId = 909;
258258
String expectedLogin = activationForm.getLogin()
259259
and:
260-
jdbcUserDao.add(_ as AddUserDbDto) >> expectedId
260+
userDao.add(_ as AddUserDbDto) >> expectedId
261261
when:
262262
service.registerUser(activationForm)
263263
then:
@@ -284,7 +284,7 @@ class UserServiceImplTest extends Specification {
284284
def "findUserDetailsByLogin() should call dao"() {
285285
given:
286286
UserDetails expectedUserDetails = TestObjects.createUserDetails()
287-
jdbcUserDao.findUserDetailsByLogin(_ as String) >> expectedUserDetails
287+
userDao.findUserDetailsByLogin(_ as String) >> expectedUserDetails
288288
when:
289289
UserDetails userDetails = service.findUserDetailsByLogin('any-login')
290290
then:
@@ -295,7 +295,7 @@ class UserServiceImplTest extends Specification {
295295
when:
296296
service.findUserDetailsByLogin('john')
297297
then:
298-
1 * jdbcUserDao.findUserDetailsByLogin('john')
298+
1 * userDao.findUserDetailsByLogin('john')
299299
}
300300

301301
//
@@ -311,7 +311,7 @@ class UserServiceImplTest extends Specification {
311311

312312
def "countByLogin() should call dao"() {
313313
given:
314-
jdbcUserDao.countByLogin(_ as String) >> 2L
314+
userDao.countByLogin(_ as String) >> 2L
315315
when:
316316
long result = service.countByLogin('any-login')
317317
then:
@@ -322,7 +322,7 @@ class UserServiceImplTest extends Specification {
322322
when:
323323
service.countByLogin('john')
324324
then:
325-
1 * jdbcUserDao.countByLogin('john')
325+
1 * userDao.countByLogin('john')
326326
}
327327

328328
}

0 commit comments

Comments
 (0)