Skip to content

Commit 4a2d2f7

Browse files
committed
made a user service
1 parent c781472 commit 4a2d2f7

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

src/main/java/mate/academy/Main.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,22 @@
1111
import mate.academy.service.MovieService;
1212
import mate.academy.service.MovieSessionService;
1313
import mate.academy.service.UserService;
14+
import mate.academy.util.HashUtil;
1415

1516
public class Main {
1617
private static final Injector injector
1718
= Injector.getInstance("mate.academy");
1819

1920
public static void main(String[] args) {
20-
UserService userService = (UserService) injector.getInstance(UserService.class);
2121
User user = new User();
22-
user.setEmail("username@.com");
23-
user.setPassword("password1111");
22+
user.setEmail("username@example.com");
23+
user.setSalt(HashUtil.getSalt());
24+
user.setPassword(HashUtil.hashPassword("password1111", user.getSalt()));
25+
UserService userService = (UserService) injector.getInstance(UserService.class);
2426
userService.add(user);
2527

26-
MovieService movieService
27-
= (MovieService) injector.getInstance(MovieService.class);
28+
MovieService movieService =
29+
(MovieService) injector.getInstance(MovieService.class);
2830
Movie fastAndFurious = new Movie("Fast and Furious");
2931
fastAndFurious.setDescription("An action film about street racing, heists, and spies.");
3032
movieService.add(fastAndFurious);
@@ -39,8 +41,8 @@ public static void main(String[] args) {
3941
secondCinemaHall.setCapacity(200);
4042
secondCinemaHall.setDescription("second hall with capacity 200");
4143

42-
CinemaHallService cinemaHallService
43-
= (CinemaHallService) injector.getInstance(CinemaHallService.class);
44+
CinemaHallService cinemaHallService =
45+
(CinemaHallService) injector.getInstance(CinemaHallService.class);
4446
cinemaHallService.add(firstCinemaHall);
4547
cinemaHallService.add(secondCinemaHall);
4648

@@ -57,8 +59,8 @@ public static void main(String[] args) {
5759
yesterdayMovieSession.setMovie(fastAndFurious);
5860
yesterdayMovieSession.setShowTime(LocalDateTime.now().minusDays(1L));
5961

60-
MovieSessionService movieSessionService
61-
= (MovieSessionService) injector.getInstance(MovieSessionService.class);
62+
MovieSessionService movieSessionService =
63+
(MovieSessionService) injector.getInstance(MovieSessionService.class);
6264
movieSessionService.add(tomorrowMovieSession);
6365
movieSessionService.add(yesterdayMovieSession);
6466

src/main/java/mate/academy/model/User.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public String toString() {
5656
return "User{"
5757
+ "id=" + id
5858
+ ", email='" + email + '\''
59-
+ ", password='" + password + '\''
6059
+ '}';
6160
}
6261
}

src/main/java/mate/academy/util/HashUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77
public class HashUtil {
88
private static final String CRYPTO_ALGORITHM = "SHA-512";
9-
private static final int ARREY_SIZE = 16;
9+
private static final int ARRAY_SIZE = 16;
1010

1111
private HashUtil() {
1212
}
1313

1414
public static byte[] getSalt() {
1515
SecureRandom secureRandom = new SecureRandom();
16-
byte[] salt = new byte[ARREY_SIZE];
16+
byte[] salt = new byte[ARRAY_SIZE];
1717
secureRandom.nextBytes(salt);
1818
return salt;
1919
}

0 commit comments

Comments
 (0)