Struts 6.7.0 버전업 - 하위 프로젝트 수정 (#10)

* 하위 프로젝트들의 패키지를 바꿔서 테스트를 수행

Author: fp024

annotations/annotations-struts/src/main/java/org/fp024/struts2/study/register/action/HelloAction.java

@@ -1,9 +1,9 @@
 package org.fp024.struts2.study.register.action;
 
-import com.opensymphony.xwork2.ActionSupport;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.struts2.ActionSupport;
 import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Result;
 

annotations/annotations-struts/src/main/java/org/fp024/struts2/study/register/action/RegisterAction.java

@@ -1,10 +1,10 @@
 package org.fp024.struts2.study.register.action;
 
-import com.opensymphony.xwork2.ActionSupport;
 import java.io.Serial;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.struts2.ActionSupport;
 import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Result;
 import org.fp024.struts2.study.register.model.Person;
@@ -18,16 +18,17 @@
 @Component
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class RegisterAction extends ActionSupport {
-  private final RegisterService registerService;
+  private final transient RegisterService registerService;
 
   public RegisterAction(RegisterService registerService) {
     this.registerService = registerService;
   }
 
   @Serial private static final long serialVersionUID = 1L;
 
-  @Getter @Setter private Person personBean;
+  @Getter @Setter private transient Person personBean;
 
+  @Override
   @Action(
       value = "/register-input",
       results = {@Result(name = INPUT, location = "register-input.jsp")})

annotations/annotations-struts/src/main/java/org/fp024/struts2/study/register/model/Person.java

@@ -1,16 +1,13 @@
 package org.fp024.struts2.study.register.model;
 
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 @Getter
 @Setter

annotations/annotations-struts/src/test/java/org/fp024/struts2/study/register/action/RegisterActionTest.java

@@ -1,18 +1,17 @@
 package org.fp024.struts2.study.register.action;
 
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ActionSupport;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+
+import javax.transaction.Transactional;
+import org.apache.struts2.ActionProxy;
+import org.apache.struts2.ActionSupport;
 import org.apache.struts2.StrutsSpringJUnit5TestCase;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
-import javax.transaction.Transactional;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-
 /** StrutsSpringJUnit5TestCase<테스트할 액션 클래스> 를 상속 받아 테스트 클래스를 만듦. */
 @SpringJUnitConfig(locations = {"classpath:applicationContext.xml"})
 class RegisterActionTest extends StrutsSpringJUnit5TestCase<RegisterAction> {

coding-actions/coding-actions-struts/src/main/java/org/fp024/struts2/study/helloworld/action/HelloWorldAction.java

@@ -1,24 +1,23 @@
 package org.fp024.struts2.study.helloworld.action;
 
-import com.opensymphony.xwork2.ActionSupport;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.struts2.ActionSupport;
 import org.fp024.struts2.study.helloworld.model.MessageStore;
 
 /**
- * ActionSupport가 Serializable를 구현해서 Eclipse에서는 아래 경고가 노출된다.
- * The serializable class HelloWorldAction does not declare a static final serialVersionUID field of type long
- * <p>
- * 액션 클래스에 대해 직렬화/역직렬화가 일어나진 않을 것이여서, 무시하는 어노테이션을 붙여도 될 것 같은데...
- * IntelliJ 에서는 이런 경고를 노출하지 않는다.
- * <p>
- * 그런데, struts-example의 helloworld 예제를 보면 아래 항목이 붙어있다. 일단 붙여보자.
- * private static final long serialVersionUID = 1L;
+ * ActionSupport가 Serializable를 구현해서 Eclipse에서는 아래 경고가 노출된다. The serializable class HelloWorldAction
+ * does not declare a static final serialVersionUID field of type long
+ *
+ * <p>액션 클래스에 대해 직렬화/역직렬화가 일어나진 않을 것이여서, 무시하는 어노테이션을 붙여도 될 것 같은데... IntelliJ 에서는 이런 경고를 노출하지 않는다.
+ *
+ * <p>그런데, struts-example의 helloworld 예제를 보면 아래 항목이 붙어있다. 일단 붙여보자. private static final long
+ * serialVersionUID = 1L;
  */
 public class HelloWorldAction extends ActionSupport {
   private static final long serialVersionUID = 1L;
 
-  @Getter private MessageStore messageStore;
+  @Getter private transient MessageStore messageStore;
 
   @Getter @Setter private String userName;
 

control-tags/control-tags-struts/src/main/java/org/fp024/struts2/study/edit/action/EditAction.java

@@ -1,15 +1,14 @@
 package org.fp024.struts2.study.edit.action;
 
-import com.opensymphony.xwork2.ActionSupport;
+import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.struts2.ActionSupport;
 import org.fp024.struts2.study.edit.model.Person;
 import org.fp024.struts2.study.edit.model.State;
 import org.fp024.struts2.study.edit.service.EditService;
 import org.fp024.struts2.study.edit.service.EditServiceInMemory;
 
-import java.util.List;
-
 /**
  * Person 편집과 관련된 액션을 처리하는 컨트롤러 역할을 합니다.
  *
@@ -18,16 +17,16 @@
 public class EditAction extends ActionSupport {
   private static final long serialVersionUID = 1L;
 
-  private final EditService editService = new EditServiceInMemory();
+  private final transient EditService editService = new EditServiceInMemory();
 
-  @Getter @Setter private Person personBean;
+  @Getter @Setter private transient Person personBean;
 
   @Getter private final List<String> sports = List.of("football", "baseball", "basketball");
 
   @Getter private final List<String> genders = List.of("male", "female", "not sure");
 
   @Getter
-  private final List<State> states =
+  private final transient List<State> states =
       List.of(
           new State("AZ", "Arizona"),
           new State("CA", "California"),

control-tags/control-tags-struts/src/test/java/org/fp024/struts2/study/edit/action/EditActionTest.java

@@ -1,20 +1,19 @@
 package org.fp024.struts2.study.edit.action;
 
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionProxy;
-import org.apache.struts2.StrutsJUnit5TestCase;
-import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-
-import javax.servlet.ServletException;
-import java.io.UnsupportedEncodingException;
-
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 
+import java.io.UnsupportedEncodingException;
+import javax.servlet.ServletException;
+import org.apache.struts2.ActionProxy;
+import org.apache.struts2.StrutsJUnit5TestCase;
+import org.apache.struts2.action.Action;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
 /**
  * StrutsJUnit5TestCase<테스트할 액션 클래스> 를 상속 받아 테스트 클래스를 만듦. <br>
  * 이번에 hamcrest 라이브러리를 추가했으니, 해당 Matcher 메서드를 사용해보자! <br>

debugging-struts/debugging-struts/src/main/java/org/fp024/struts2/study/helloworld/action/HelloWorldAction.java

@@ -1,8 +1,8 @@
 package org.fp024.struts2.study.helloworld.action;
 
-import com.opensymphony.xwork2.ActionSupport;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.struts2.ActionSupport;
 import org.fp024.struts2.study.helloworld.model.MessageStore;
 
 /**
@@ -20,7 +20,7 @@ public class HelloWorldAction extends ActionSupport {
 
   private static final long serialVersionUID = 1L;
 
-  @Getter private MessageStore messageStore;
+  @Getter private transient MessageStore messageStore;
 
   @Getter @Setter private String userName;
 

debugging-struts/debugging-struts/src/main/java/org/fp024/struts2/study/register/action/Register.java

@@ -1,15 +1,15 @@
 package org.fp024.struts2.study.register.action;
 
-import com.opensymphony.xwork2.ActionSupport;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.struts2.ActionSupport;
 import org.fp024.struts2.study.register.exceptions.SecurityBreachException;
 import org.fp024.struts2.study.register.model.Person;
 
 public class Register extends ActionSupport {
   private static final long serialVersionUID = 1L;
 
-  @Getter @Setter private Person personBean;
+  @Getter @Setter private transient Person personBean;
 
   @Override
   public String execute() throws Exception {
@@ -22,8 +22,7 @@ public void throwException() throws Exception {
   }
 
   public void throwNullPointerException() throws NullPointerException {
-    throw new NullPointerException(
-        "Null Pointer Exception thrown from " + Register.class);
+    throw new NullPointerException("Null Pointer Exception thrown from " + Register.class);
   }
 
   public void throwSecurityException() throws SecurityBreachException {

exception-handling/exception-handling-struts/src/main/java/org/fp024/struts2/study/helloworld/action/HelloWorldAction.java

@@ -1,8 +1,8 @@
 package org.fp024.struts2.study.helloworld.action;
 
-import com.opensymphony.xwork2.ActionSupport;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.struts2.ActionSupport;
 import org.fp024.struts2.study.helloworld.model.MessageStore;
 
 /**
@@ -20,7 +20,7 @@ public class HelloWorldAction extends ActionSupport {
 
   private static final long serialVersionUID = 1L;
 
-  @Getter private MessageStore messageStore;
+  @Getter private transient MessageStore messageStore;
 
   @Getter @Setter private String userName;