11_9_fix

JavaWebinar · JavaWebinar · commit 45fa69fbe1d4 · 2018-02-05T22:28:36.000+03:00
diff --git a/persist/src/main/java/ru/javaops/masterjava/persist/dao/UserDao.java b/persist/src/main/java/ru/javaops/masterjava/persist/dao/UserDao.java
@@ -18,7 +18,7 @@ public User insert(User user) {
             int id = insertGeneratedId(user);
             user.setId(id);
         } else {
-            insertWitId(user);
+            insertWithId(user);
         }
         return user;
     }
@@ -38,7 +38,7 @@ public int getSeqAndSkip(int step) {
     abstract int insertGeneratedId(@BindBean User user);
 
     @SqlUpdate("INSERT INTO users (id, full_name, email, flag, city_ref) VALUES (:id, :fullName, :email, CAST(:flag AS USER_FLAG), :cityRef) ")
-    abstract void insertWitId(@BindBean User user);
+    abstract void insertWithId(@BindBean User user);
 
     @SqlQuery("SELECT * FROM users ORDER BY full_name, email LIMIT :it")
     public abstract List<User> getWithLimit(@Bind int limit);
diff --git a/persist/src/test/java/ru/javaops/masterjava/persist/UserTestData.java b/persist/src/test/java/ru/javaops/masterjava/persist/UserTestData.java
@@ -16,7 +16,7 @@ public class UserTestData {
     public static User USER1;
     public static User USER2;
     public static User USER3;
-    public static List<User> FIST5_USERS;
+    public static List<User> FIRST5_USERS;
 
     public static void init() {
         CityTestData.init();
@@ -28,14 +28,14 @@ public static void init() {
         USER1 = new User("User1", "user1@gmail.com", UserFlag.active, MOSCOW.getRef());
         USER2 = new User("User2", "user2@yandex.ru", UserFlag.active, KIEV.getRef());
         USER3 = new User("User3", "user3@yandex.ru", UserFlag.active, MINSK.getRef());
-        FIST5_USERS = ImmutableList.of(ADMIN, DELETED, FULL_NAME, USER1, USER2);
+        FIRST5_USERS = ImmutableList.of(ADMIN, DELETED, FULL_NAME, USER1, USER2);
     }
 
     public static void setUp() {
         UserDao dao = DBIProvider.getDao(UserDao.class);
         dao.clean();
         DBIProvider.getDBI().useTransaction((conn, status) -> {
-            FIST5_USERS.forEach(dao::insert);
+            FIRST5_USERS.forEach(dao::insert);
             dao.insert(USER3);
         });
     }
diff --git a/persist/src/test/java/ru/javaops/masterjava/persist/dao/UserDaoTest.java b/persist/src/test/java/ru/javaops/masterjava/persist/dao/UserDaoTest.java
@@ -9,7 +9,7 @@
 
 import java.util.List;
 
-import static ru.javaops.masterjava.persist.UserTestData.FIST5_USERS;
+import static ru.javaops.masterjava.persist.UserTestData.FIRST5_USERS;
 
 public class UserDaoTest extends AbstractDaoTest<UserDao> {
 
@@ -30,13 +30,13 @@ public void setUp() throws Exception {
     @Test
     public void getWithLimit() {
         List<User> users = dao.getWithLimit(5);
-        Assert.assertEquals(FIST5_USERS, users);
+        Assert.assertEquals(FIRST5_USERS, users);
     }
 
     @Test
     public void insertBatch() throws Exception {
         dao.clean();
-        dao.insertBatch(FIST5_USERS, 3);
+        dao.insertBatch(FIRST5_USERS, 3);
         Assert.assertEquals(5, dao.getWithLimit(100).size());
     }
 
