group and cleanup (#3027)

* move security content from spring-security-rest-full

* swagger update

* move query language to new module

* rename spring-security-rest-full to spring-rest-full

* group persistence modules

* group testing modules

* try fix conflict

* cleanup

* group and cleanup

struts-2/src/main/java/com/baeldung/struts/CarAction.java

@@ -0,0 +1,37 @@
+package com.baeldung.struts;
+
+import org.apache.struts2.convention.annotation.Action;
+import org.apache.struts2.convention.annotation.Namespace;
+import org.apache.struts2.convention.annotation.Result;
+
+@Namespace("/tutorial")
+@Action("/car")
+@Result(name = "success", location = "/result.jsp")
+public class CarAction { 
+    private String carName;
+    private String carMessage;
+    private CarMessageService carMessageService = new CarMessageService();
+
+    public String execute() {
+        System.out.println("inside execute(): carName is" + carName);
+        this.setCarMessage(this.carMessageService.getMessage(carName));
+        return "success";
+    }
+
+    public String getCarName() {
+        return carName;
+    }
+
+    public void setCarName(String carName) {
+        this.carName = carName;
+    }
+
+    public String getCarMessage() {
+        return carMessage;
+    }
+
+    public void setCarMessage(String carMessage) {
+        this.carMessage = carMessage;
+    }
+
+}

struts-2/src/main/java/com/baeldung/struts/CarMessageService.java

@@ -0,0 +1,18 @@
+package com.baeldung.struts;
+
+public class CarMessageService {
+
+    public String getMessage(String carName) {
+        System.out.println("inside getMessage()" + carName);
+        if (carName.equalsIgnoreCase("ferrari")){
+            return "Ferrari Fan!";
+        }
+        else if (carName.equalsIgnoreCase("bmw")){
+            return "BMW Fan!";
+        }
+        else{
+            return "please choose ferrari Or bmw";
+        }
+    }
+
+}

struts-2/src/test/java/com/baeldung/struts/test/CarActionTest.java

@@ -0,0 +1,29 @@
+//package com.baeldung.struts.test;
+//
+//import org.apache.struts2.StrutsTestCase;
+//import org.junit.Test;
+//
+//import com.baeldung.struts.CarAction;
+//import com.opensymphony.xwork2.ActionProxy;
+//
+//public class CarActionTest extends StrutsTestCase {
+//
+//	public void testgivenCarOptions_WhenferrariSelected_ThenShowMessage() throws Exception {
+//		request.setParameter("carName", "ferrari");
+//		ActionProxy proxy = getActionProxy("/tutorial/car.action");
+//		CarAction carAction = (CarAction) proxy.getAction();
+//		String result = proxy.execute();
+//		assertEquals(result, "success");
+//		assertEquals(carAction.getCarMessage(), "Ferrari Fan!");
+//	}
+//
+//	public void testgivenCarOptions_WhenbmwSelected_ThenShowMessage() throws Exception {
+//		request.setParameter("carName", "bmw");
+//		ActionProxy proxy = getActionProxy("/tutorial/car.action");
+//		CarAction carAction = (CarAction) proxy.getAction();
+//		String result = proxy.execute();
+//		assertEquals(result, "success");
+//		assertEquals(carAction.getCarMessage(), "BMW Fan!");
+//	}
+//
+//}