GP-83 update pom and dao

Author: shryhus

3-0-spring-framework/3-2-1-account-rest-api/README.MD

@@ -1,4 +1,4 @@
-# <img src="https://raw.githubusercontent.com/bobocode-projects/resources/master/image/logo_transparent_background.png" height=50/>Account REST API exercise :muscle:
+# <img src="https://raw.githubusercontent.com/bobocode-projects/resources/master/image/logo_transparent_background.png" height=50/>Account REST API exercise 💪
 Improve your *Spring MVC* configuration and rest mapping skills
 ### Task
 This webapp provides a **simple REST API for `Account`**. The data is stored using in-memory fake DAO. Your job is to 
@@ -8,14 +8,14 @@ This webapp provides a **simple REST API for `Account`**. The data is stored usi
 To verify your configuration, run `AccountRestControllerTest.java` :white_check_mark:
 
 
-### Pre-conditions :heavy_exclamation_mark:
+### Pre-conditions ❗
 You're supposed to be familiar with *Spring MVC*
 
-### How to start :question:
+### How to start ❓
 * Just clone the repository and start implementing the **todo** section, verify your changes by running tests
 * If you don't have enough knowledge about this domain, check out the [links below](#related-materials-information_source)
 * Don't worry if you got stuck, checkout the **exercise/completed** branch and see the final implementation
 
-### Related materials :information_source:
- * [Spring REST basics tutorial](https://github.com/bobocode-projects/spring-framework-tutorial/tree/master/rest-basics)<img src="https://raw.githubusercontent.com/bobocode-projects/resources/master/image/logo_transparent_background.png" height=20/>
+### Related materials ℹ
+ * todo
 

3-0-spring-framework/3-2-1-account-rest-api/pom.xml

@@ -43,12 +43,22 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.9.7</version>
+            <version>2.12.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.7</version>
+            <version>2.12.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path-assert</artifactId>
+            <version>2.3.0</version>
         </dependency>
     </dependencies>
 

3-0-spring-framework/3-2-1-account-rest-api/src/main/java/com/bobocode/config/WebConfig.java

@@ -8,5 +8,4 @@
  * todo: 3. Enable component scanning for package "web" using annotation value
  */
 public class WebConfig {
-
 }

3-0-spring-framework/3-2-1-account-rest-api/src/main/java/com/bobocode/dao/impl/InMemoryAccountDao.java

@@ -48,5 +48,6 @@ public void remove(Account account) {
 
     public void clear() {
         accountMap.clear();
+        idSequence = 1L;
     }
 }

3-0-spring-framework/3-2-1-account-rest-api/src/test/java/com/bobocode/AccountRestControllerTest.java

@@ -25,8 +25,8 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@SpringJUnitWebConfig(classes = {RootConfig.class, WebConfig.class})
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+@SpringJUnitWebConfig(classes = {RootConfig.class, WebConfig.class})
 class AccountRestControllerTest {
     @Autowired
     private WebApplicationContext applicationContext;
@@ -65,8 +65,8 @@ void accountRestControllerRequestMapping() {
     @Test
     @Order(3)
     @DisplayName("AccountDao is injected using constructor")
-    void accountDaoInjection() throws NoSuchMethodException {
-        Constructor<AccountRestController> constructor = AccountRestController.class.getConstructor();
+    void accountDaoInjection() {
+        Constructor<?> constructor = AccountRestController.class.getConstructors()[0];
 
         assertThat(constructor.getParameterTypes()).contains(AccountDao.class);
     }
@@ -140,24 +140,25 @@ private Account create(String firstName, String lastName, String email) {
 
     @Test
     @Order(9)
-    @DisplayName("Removing account is implemented")
-    void removeAccount() throws Exception {
+    @DisplayName("Updating account is implemented")
+    void updateAccount() throws Exception {
         Account account = create("Johnny", "Boy", "jboy@gmail.com");
         accountDao.save(account);
 
-        mockMvc.perform(delete(String.format("/accounts/%d", account.getId())))
+        mockMvc.perform(put(String.format("/accounts/%d", account.getId())).contentType(MediaType.APPLICATION_JSON)
+                .content(String.format("{\"id\":\"%d\", \"firstName\":\"Johnny\", \"lastName\":\"Boy\", \"email\":\"johnny.boy@gmail.com\"}", account.getId())))
                 .andExpect(status().isNoContent());
     }
 
     @Test
     @Order(10)
-    @DisplayName("Updating account is implemented")
-    void updateAccount() throws Exception {
+    @DisplayName("Removing account is implemented")
+    void removeAccount() throws Exception {
         Account account = create("Johnny", "Boy", "jboy@gmail.com");
         accountDao.save(account);
 
-        mockMvc.perform(put(String.format("/accounts/%d", account.getId())).contentType(MediaType.APPLICATION_JSON)
-                .content(String.format("{\"id\":\"%d\", \"firstName\":\"Johnny\", \"lastName\":\"Boy\", \"email\":\"johnny.boy@gmail.com\"}", account.getId())))
+        mockMvc.perform(delete(String.format("/accounts/%d", account.getId())))
                 .andExpect(status().isNoContent());
     }
 }
+