Spring 6.1 버전업

- 버전업 후 발생된 오류 수정
mklinkj · Nov 22, 2023 · cc88486 · mklinkj · Nov 22, 2023 · mklinkj
1 parent 485f646
commit cc88486
Show file tree

Hide file tree

Showing 32 changed files with 169 additions and 34 deletions.
diff --git a/chap19/pro19/src/main/resources/application-context.xml b/chap19/pro19/src/main/resources/application-context.xml
@@ -39,15 +39,16 @@
 
   <bean id="dbDataInitializer" class="org.mklinkj.taojwp.common.util.DBDataInitializer"
     init-method="resetDB" primary="true">
+    <constructor-arg name="dataSource" ref="dataSource"/>
     <constructor-arg name="initSqlScript" value="sql/mysql/init-sql.sql"/>
     <!-- <constructor-arg name="initSqlScript" value="sql/oracle/init-sql.sql"/> -->
   </bean>
 
-  <bean name="mySqlBoardDAO" class="org.mklinkj.taojwp.board.MySqlBoardDAO" />
-  <bean name="mySqlMemberDAO" class="org.mklinkj.taojwp.member.MySqlMemberDAO" />
+  <bean name="mySqlBoardDAO" class="org.mklinkj.taojwp.board.MySqlBoardDAO"/>
+  <bean name="mySqlMemberDAO" class="org.mklinkj.taojwp.member.MySqlMemberDAO"/>
 
-<!--  <bean class="org.mklinkj.taojwp.member.OracleMemberDAO" />-->
-<!--  <bean class="org.mklinkj.taojwp.board.OracleBoardDAO" />-->
+  <!--  <bean class="org.mklinkj.taojwp.member.OracleMemberDAO" />-->
+  <!--  <bean class="org.mklinkj.taojwp.board.OracleBoardDAO" />-->
 
   <bean class="org.mklinkj.taojwp.common.listener.JDBCDriverCleaner" depends-on="dataSource"/>
 

diff --git a/chap19/pro19/src/test/resources/application-context.xml b/chap19/pro19/src/test/resources/application-context.xml
@@ -9,7 +9,7 @@
   <context:component-scan base-package="org.mklinkj.taojwp"/>
 
   <bean id="hikariConfig" class="com.zaxxer.hikari.HikariConfig">
-<!--    <constructor-arg value="/db-oracle.properties"/>-->
+    <!--    <constructor-arg value="/db-oracle.properties"/>-->
     <constructor-arg value="/db-mysql.properties"/>
     <property name="dataSourceProperties">
       <props>
@@ -38,17 +38,18 @@
   </bean>
 
   <bean id="dbDataInitializer" class="org.mklinkj.taojwp.common.util.DBDataInitializer">
-     <constructor-arg name="initSqlScript" value="sql/mysql/init-sql.sql" />
-     <!-- <constructor-arg name="initSqlScript" value="sql/oracle/init-sql.sql" /> -->
+    <constructor-arg name="dataSource" ref="dataSource"/>
+    <constructor-arg name="initSqlScript" value="sql/mysql/init-sql.sql"/>
+    <!-- <constructor-arg name="initSqlScript" value="sql/oracle/init-sql.sql" /> -->
   </bean>
 
   <!-- MySQL DAO -->
-  <bean name="mySqlBoardDAO" class="org.mklinkj.taojwp.board.MySqlBoardDAO" />
-  <bean name="mySqlMemberDAO" class="org.mklinkj.taojwp.member.MySqlMemberDAO" />
+  <bean name="mySqlBoardDAO" class="org.mklinkj.taojwp.board.MySqlBoardDAO"/>
+  <bean name="mySqlMemberDAO" class="org.mklinkj.taojwp.member.MySqlMemberDAO"/>
 
   <!-- Oracle DAO  -->
-<!--  <bean name="oracleMemberDAO" class="org.mklinkj.taojwp.member.OracleMemberDAO" />-->
-<!--  <bean name="oracleBoardDAO" class="org.mklinkj.taojwp.board.OracleBoardDAO" />-->
+  <!--  <bean name="oracleMemberDAO" class="org.mklinkj.taojwp.member.OracleMemberDAO" />-->
+  <!--  <bean name="oracleBoardDAO" class="org.mklinkj.taojwp.board.OracleBoardDAO" />-->
 
   <tx:annotation-driven/>
 </beans>
diff --git a/chap20/pro20/src/main/resources/application-context-mysql.xml b/chap20/pro20/src/main/resources/application-context-mysql.xml
@@ -38,6 +38,7 @@
 
   <bean id="dbDataInitializer" class="org.mklinkj.taojwp.common.util.DBDataInitializer"
     init-method="resetDB" primary="true">
+    <constructor-arg name="dataSource" ref="dataSource"/>
     <constructor-arg name="initSqlScript" value="sql/mysql/init-sql.sql"/>
   </bean>
 

diff --git a/chap20/pro20/src/main/resources/application-context-oracle.xml b/chap20/pro20/src/main/resources/application-context-oracle.xml
@@ -38,6 +38,7 @@
 
   <bean id="dbDataInitializer" class="org.mklinkj.taojwp.common.util.DBDataInitializer"
     init-method="resetDB" primary="true">
+    <constructor-arg name="dataSource" ref="dataSource"/>
     <constructor-arg name="initSqlScript" value="sql/oracle/init-sql.sql"/>
   </bean>
 

diff --git a/chap20/pro20/src/test/resources/application-context.xml b/chap20/pro20/src/test/resources/application-context.xml
@@ -37,11 +37,14 @@
     <property name="dataSource" ref="dataSource"/>
   </bean>
 
-  <bean id="dbDataInitializer" class="org.mklinkj.taojwp.common.util.DBDataInitializer">
-     <constructor-arg name="initSqlScript" value="sql/mysql/init-sql.sql" />
-     <!-- <constructor-arg name="initSqlScript" value="sql/oracle/init-sql.sql" /> -->
+  <bean id="dbDataInitializer" class="org.mklinkj.taojwp.common.util.DBDataInitializer"
+    init-method="resetDB" primary="true">
+    <constructor-arg name="dataSource" ref="dataSource"/>
+    <constructor-arg name="initSqlScript" value="sql/mysql/init-sql.sql"/>
+    <!-- <constructor-arg name="initSqlScript" value="sql/oracle/init-sql.sql" /> -->
   </bean>
 
+
   <!-- MySQL DAO -->
   <bean name="mySqlBoardDAO" class="org.mklinkj.taojwp.board.MySqlBoardDAO" />
   <bean name="mySqlMemberDAO" class="org.mklinkj.taojwp.member.MySqlMemberDAO" />

diff --git a/chap23/pro23/src/main/java/org/mklinkj/taojwp/member/controller/MemberController.java b/chap23/pro23/src/main/java/org/mklinkj/taojwp/member/controller/MemberController.java
@@ -114,7 +114,7 @@ public String modMember(
   }
 
   @PostMapping("/delMember.do")
-  public String delMember(String id) {
+  public String delMember(@RequestParam("id") String id) {
     memberService.delMember(id);
     return "redirect:/member/listMembers.do";
   }

diff --git a/chap23/pro23/src/main/java/org/mklinkj/taojwp/member/dto/SearchDTO.java b/chap23/pro23/src/main/java/org/mklinkj/taojwp/member/dto/SearchDTO.java
@@ -1,8 +1,12 @@
 package org.mklinkj.taojwp.member.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@NoArgsConstructor
+@AllArgsConstructor
 @Data
 @Builder
 public class SearchDTO {

diff --git a/chap23/pro23/src/test/java/org/mklinkj/taojwp/member/controller/MemberControllerTests.java b/chap23/pro23/src/test/java/org/mklinkj/taojwp/member/controller/MemberControllerTests.java
@@ -64,6 +64,20 @@ void testListMembersDo() throws Exception {
         .andExpect(forwardedUrl("/WEB-INF/views/member/listMembers.jsp"));
   }
 
+  @Test
+  void testListMembersDo_with_Params() throws Exception {
+    mockMvc
+        .perform(
+            get("/member/listMembers.do") //
+                .param("type", "ID")
+                .param("keyword", "lee"))
+        .andDo(print())
+        .andExpect(status().isOk())
+        .andExpect(model().attributeExists("memberList"))
+        .andExpect(view().name("member/listMembers"))
+        .andExpect(forwardedUrl("/WEB-INF/views/member/listMembers.jsp"));
+  }
+
   @Test
   void testMemberFormDo() throws Exception {
     mockMvc

diff --git a/chap24/pro24/src/main/java/org/mklinkj/taojwp/member/controller/MemberController.java b/chap24/pro24/src/main/java/org/mklinkj/taojwp/member/controller/MemberController.java
@@ -114,7 +114,7 @@ public String modMember(
   }
 
   @PostMapping("/delMember.do")
-  public String delMember(String id) {
+  public String delMember(@RequestParam("id") String id) {
     memberService.delMember(id);
     return "redirect:/member/listMembers.do";
   }

diff --git a/chap24/pro24/src/main/java/org/mklinkj/taojwp/member/dto/SearchDTO.java b/chap24/pro24/src/main/java/org/mklinkj/taojwp/member/dto/SearchDTO.java
@@ -1,10 +1,14 @@
 package org.mklinkj.taojwp.member.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.ibatis.type.Alias;
 
 @Alias("searchDTO")
+@NoArgsConstructor
+@AllArgsConstructor
 @Data
 @Builder
 public class SearchDTO {

diff --git a/chap25/pro25/src/main/java/org/mklinkj/taojwp/member/controller/MemberController.java b/chap25/pro25/src/main/java/org/mklinkj/taojwp/member/controller/MemberController.java
@@ -114,7 +114,7 @@ public String modMember(
   }
 
   @PostMapping("/delMember.do")
-  public String delMember(String id) {
+  public String delMember(@RequestParam("id") String id) {
     memberService.delMember(id);
     return "redirect:/member/listMembers.do";
   }

diff --git a/chap25/pro25/src/main/java/org/mklinkj/taojwp/member/dto/SearchDTO.java b/chap25/pro25/src/main/java/org/mklinkj/taojwp/member/dto/SearchDTO.java
@@ -1,10 +1,14 @@
 package org.mklinkj.taojwp.member.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.ibatis.type.Alias;
 
 @Alias("searchDTO")
+@NoArgsConstructor // ✨ 파라미터가 없는 생성자가 반드시 필요하다.
+@AllArgsConstructor
 @Data
 @Builder
 public class SearchDTO {

diff --git a/chap25/pro25/src/test/java/org/mklinkj/taojwp/member/controller/MemberControllerTests.java b/chap25/pro25/src/test/java/org/mklinkj/taojwp/member/controller/MemberControllerTests.java
@@ -57,6 +57,21 @@ void testListMembersDo() throws Exception {
         .andExpect(forwardedUrl("/WEB-INF/views/member/listMembers.jsp"));
   }
 
+  // ✨ 파라미터를 넣어 조회하는 테스트도 필요함.
+  @Test
+  void testListMembersDo_with_Params() throws Exception {
+    mockMvc
+        .perform(
+            get("/member/listMembers.do") //
+                .param("type", "ID")
+                .param("keyword", "hong"))
+        .andDo(print())
+        .andExpect(status().isOk())
+        .andExpect(model().attributeExists("memberList"))
+        .andExpect(view().name("member/listMembers"))
+        .andExpect(forwardedUrl("/WEB-INF/views/member/listMembers.jsp"));
+  }
+
   @Test
   void testMemberFormDo() throws Exception {
     mockMvc

diff --git a/chap26/pro26/src/main/java/org/mklinkj/taojwp/member/controller/MemberController.java b/chap26/pro26/src/main/java/org/mklinkj/taojwp/member/controller/MemberController.java
@@ -114,7 +114,7 @@ public String modMember(
   }
 
   @PostMapping("/delMember.do")
-  public String delMember(String id) {
+  public String delMember(@RequestParam("id") String id) {
     memberService.delMember(id);
     return "redirect:/member/listMembers.do";
   }

diff --git a/chap26/pro26/src/main/java/org/mklinkj/taojwp/member/dto/SearchDTO.java b/chap26/pro26/src/main/java/org/mklinkj/taojwp/member/dto/SearchDTO.java
@@ -1,10 +1,14 @@
 package org.mklinkj.taojwp.member.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.ibatis.type.Alias;
 
 @Alias("searchDTO")
+@NoArgsConstructor
+@AllArgsConstructor
 @Data
 @Builder
 public class SearchDTO {

diff --git a/chap26/pro26/src/test/java/org/mklinkj/taojwp/member/controller/MemberControllerTests.java b/chap26/pro26/src/test/java/org/mklinkj/taojwp/member/controller/MemberControllerTests.java
@@ -62,6 +62,20 @@ void testListMembersDo() throws Exception {
         .andExpect(forwardedUrl("/WEB-INF/views/member/listMembers.jsp"));
   }
 
+  @Test
+  void testListMembersDo_with_Params() throws Exception {
+    mockMvc
+        .perform(
+            get("/member/listMembers.do") //
+                .param("type", "ID")
+                .param("keyword", "choi"))
+        .andDo(print())
+        .andExpect(status().isOk())
+        .andExpect(model().attributeExists("memberList"))
+        .andExpect(view().name("member/listMembers"))
+        .andExpect(forwardedUrl("/WEB-INF/views/member/listMembers.jsp"));
+  }
+
   @Test
   void testMemberFormDo() throws Exception {
     mockMvc

diff --git a/chap27/pro27-maven/src/main/java/org/mklinkj/taojwp/common/controller/WebJarsController.java b/chap27/pro27-maven/src/main/java/org/mklinkj/taojwp/common/controller/WebJarsController.java
@@ -34,7 +34,7 @@ public class WebJarsController {
   @ResponseBody
   @GetMapping("/webjars_locator/{webjar}/**")
   public ResponseEntity<Resource> locateWebjarAsset(
-      @PathVariable String webjar, HttpServletRequest request) {
+      @PathVariable("webjar") String webjar, HttpServletRequest request) {
 
     try {
       String mvcPrefix = String.format("/webjars_locator/%s/", webjar);

diff --git a/chap27/pro27/src/main/java/org/mklinkj/taojwp/common/controller/WebJarsController.java b/chap27/pro27/src/main/java/org/mklinkj/taojwp/common/controller/WebJarsController.java
@@ -34,7 +34,7 @@ public class WebJarsController {
   @ResponseBody
   @GetMapping("/webjars_locator/{webjar}/**")
   public ResponseEntity<Resource> locateWebjarAsset(
-      @PathVariable String webjar, HttpServletRequest request) {
+      @PathVariable("webjar") String webjar, HttpServletRequest request) {
 
     try {
       String mvcPrefix = String.format("/webjars_locator/%s/", webjar);

diff --git a/chap27/pro27/src/main/java/org/mklinkj/taojwp/member/controller/MemberController.java b/chap27/pro27/src/main/java/org/mklinkj/taojwp/member/controller/MemberController.java
@@ -114,7 +114,7 @@ public String modMember(
   }
 
   @PostMapping("/delMember.do")
-  public String delMember(String id) {
+  public String delMember(@RequestParam("id") String id) {
     memberService.delMember(id);
     return "redirect:/member/listMembers.do";
   }

diff --git a/chap27/pro27/src/main/java/org/mklinkj/taojwp/member/dto/SearchDTO.java b/chap27/pro27/src/main/java/org/mklinkj/taojwp/member/dto/SearchDTO.java
@@ -1,10 +1,14 @@
 package org.mklinkj.taojwp.member.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.ibatis.type.Alias;
 
 @Alias("searchDTO")
+@NoArgsConstructor
+@AllArgsConstructor
 @Data
 @Builder
 public class SearchDTO {

diff --git a/chap27/pro27/src/test/java/org/mklinkj/taojwp/member/controller/MemberControllerTests.java b/chap27/pro27/src/test/java/org/mklinkj/taojwp/member/controller/MemberControllerTests.java
@@ -60,6 +60,19 @@ void testListMembersDo() throws Exception {
         .andExpect(view().name("member/listMembers"));
   }
 
+  @Test
+  void testListMembersDo_with_Params() throws Exception {
+    mockMvc
+        .perform(
+            get("/member/listMembers.do") //
+                .param("type", "NAME")
+                .param("keyword", "홍길동"))
+        .andDo(print())
+        .andExpect(status().isOk())
+        .andExpect(model().attributeExists("memberList"))
+        .andExpect(view().name("member/listMembers"));
+  }
+
   @Test
   void testMemberFormDo() throws Exception {
     mockMvc

diff --git a/chap28/pro28/src/main/java/org/mklinkj/taojwp/member/controller/MemberController.java b/chap28/pro28/src/main/java/org/mklinkj/taojwp/member/controller/MemberController.java
@@ -114,7 +114,7 @@ public String modMember(
   }
 
   @PostMapping("/delMember.do")
-  public String delMember(String id) {
+  public String delMember(@RequestParam("id") String id) {
     memberService.delMember(id);
     return "redirect:/member/listMembers.do";
   }

diff --git a/chap28/pro28/src/main/java/org/mklinkj/taojwp/member/dto/SearchDTO.java b/chap28/pro28/src/main/java/org/mklinkj/taojwp/member/dto/SearchDTO.java
@@ -1,10 +1,14 @@
 package org.mklinkj.taojwp.member.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.ibatis.type.Alias;
 
 @Alias("searchDTO")
+@NoArgsConstructor
+@AllArgsConstructor
 @Data
 @Builder
 public class SearchDTO {

diff --git a/chap28/pro28/src/test/java/org/mklinkj/taojwp/member/controller/MemberControllerTests.java b/chap28/pro28/src/test/java/org/mklinkj/taojwp/member/controller/MemberControllerTests.java
@@ -59,6 +59,19 @@ void testListMembersDo() throws Exception {
         .andExpect(view().name("member/listMembers"));
   }
 
+  @Test
+  void testListMembersDo_with_Params() throws Exception {
+    mockMvc
+        .perform(
+            get("/member/listMembers.do") //
+                .param("type", "NAME")
+                .param("keyword", ""))
+        .andDo(print())
+        .andExpect(status().isOk())
+        .andExpect(model().attributeExists("memberList"))
+        .andExpect(view().name("member/listMembers"));
+  }
+
   @Test
   void testMemberFormDo() throws Exception {
     mockMvc

diff --git a/...0/my-board-boot2/src/main/java/org/mklinkj/taojwp/member/controller/MemberController.java b/...0/my-board-boot2/src/main/java/org/mklinkj/taojwp/member/controller/MemberController.java
@@ -114,7 +114,7 @@ public String modMember(
   }
 
   @PostMapping("/delMember.do")
-  public String delMember(String id) {
+  public String delMember(@RequestParam("id") String id) {
     memberService.delMember(id);
     return "redirect:/member/listMembers.do";
   }

diff --git a/chap30/my-board-boot2/src/main/java/org/mklinkj/taojwp/member/dto/SearchDTO.java b/chap30/my-board-boot2/src/main/java/org/mklinkj/taojwp/member/dto/SearchDTO.java
@@ -1,10 +1,14 @@
 package org.mklinkj.taojwp.member.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.ibatis.type.Alias;
 
 @Alias("searchDTO")
+@NoArgsConstructor
+@AllArgsConstructor
 @Data
 @Builder
 public class SearchDTO {

diff --git a/...board-boot2/src/test/java/org/mklinkj/taojwp/member/controller/MemberControllerTests.java b/...board-boot2/src/test/java/org/mklinkj/taojwp/member/controller/MemberControllerTests.java
@@ -56,6 +56,20 @@ void testListMembersDo() throws Exception {
         .andExpect(forwardedUrl("/WEB-INF/views/common/layout.jsp"));
   }
 
+  @Test
+  void testListMembersDo_with_Params() throws Exception {
+    mockMvc
+        .perform(
+            get("/member/listMembers.do") //
+                .param("type", "NAME")
+                .param("keyword", "홍길동"))
+        .andDo(print())
+        .andExpect(status().isOk())
+        .andExpect(model().attributeExists("memberList"))
+        .andExpect(view().name("member/listMembers"))
+        .andExpect(forwardedUrl("/WEB-INF/views/common/layout.jsp"));
+  }
+
   @Test
   void testMemberFormDo() throws Exception {
     mockMvc