新增原生Servlet获取接口

magic-api-servlet/magic-api-servlet-jakarta/src/main/java/org/ssssssss/magicapi/servlet/jakarta/MagicJakartaCookie.java

@@ -21,7 +21,8 @@ public class MagicJakartaCookie implements MagicCookie {
 		return cookie.getValue();
 	}
 
-	public Cookie getOriginCookie(){
-		return cookie;
+	@Override
+	public <T> T getCookie() {
+		return (T) cookie;
 	}
 }

magic-api-servlet/magic-api-servlet-jakarta/src/main/java/org/ssssssss/magicapi/servlet/jakarta/MagicJakartaHttpServletRequest.java

@@ -116,6 +116,11 @@ public class MagicJakartaHttpServletRequest implements MagicHttpServletRequest {
 		return request.getUserPrincipal();
 	}
 
+	@Override
+	public <T> T getRequest() {
+		return (T) request;
+	}
+
 
 	public static class ArgumentsResolver implements HandlerMethodArgumentResolver {
 

magic-api-servlet/magic-api-servlet-jakarta/src/main/java/org/ssssssss/magicapi/servlet/jakarta/MagicJakartaHttpServletResponse.java

@@ -39,8 +39,7 @@ public class MagicJakartaHttpServletResponse implements MagicHttpServletResponse
 
 	@Override
 	public void addCookie(MagicCookie cookie) {
-		MagicJakartaCookie javaEECookie = (MagicJakartaCookie) cookie;
-		response.addCookie(javaEECookie.getOriginCookie());
+		response.addCookie(cookie.getCookie());
 	}
 
 	@Override
@@ -53,6 +52,11 @@ public class MagicJakartaHttpServletResponse implements MagicHttpServletResponse
 		return response.getHeaderNames();
 	}
 
+	@Override
+	public <T> T getResponse() {
+		return (T) response;
+	}
+
 	public static class ArgumentsResolver implements HandlerMethodArgumentResolver {
 
 		@Override

magic-api-servlet/magic-api-servlet-jakarta/src/main/java/org/ssssssss/magicapi/servlet/jakarta/MagicJakartaHttpSession.java

@@ -6,7 +6,7 @@ import org.ssssssss.magicapi.core.servlet.MagicHttpSession;
 
 public class MagicJakartaHttpSession implements MagicHttpSession {
 
-	private HttpSession session;
+	private final HttpSession session;
 
 	public MagicJakartaHttpSession(HttpSession session) {
 		this.session = session;
@@ -21,4 +21,9 @@ public class MagicJakartaHttpSession implements MagicHttpSession {
 	public void setAttribute(String key, Object value) {
 		session.setAttribute(key, value);
 	}
+
+	@Override
+	public <T> T getSession() {
+		return (T) session;
+	}
 }

magic-api-servlet/magic-api-servlet-javaee/src/main/java/org/ssssssss/magicapi/servlet/javaee/MagicJavaEECookie.java

@@ -22,7 +22,8 @@ public class MagicJavaEECookie implements MagicCookie {
 		return cookie.getValue();
 	}
 
-	public Cookie getOriginCookie() {
-		return cookie;
+	@Override
+	public <T> T getCookie() {
+		return (T) cookie;
 	}
 }

magic-api-servlet/magic-api-servlet-javaee/src/main/java/org/ssssssss/magicapi/servlet/javaee/MagicJavaEEHttpServletRequest.java

@@ -116,6 +116,11 @@ public class MagicJavaEEHttpServletRequest implements MagicHttpServletRequest {
 		return request.getUserPrincipal();
 	}
 
+	@Override
+	public <T> T getRequest() {
+		return (T) request;
+	}
+
 	public static class ArgumentsResolver implements HandlerMethodArgumentResolver {
 
 		@Override

magic-api-servlet/magic-api-servlet-javaee/src/main/java/org/ssssssss/magicapi/servlet/javaee/MagicJavaEEHttpServletResponse.java

@@ -39,8 +39,7 @@ public class MagicJavaEEHttpServletResponse implements MagicHttpServletResponse
 
 	@Override
 	public void addCookie(MagicCookie cookie) {
-		MagicJavaEECookie javaEECookie = (MagicJavaEECookie) cookie;
-		response.addCookie(javaEECookie.getOriginCookie());
+		response.addCookie(cookie.getCookie());
 	}
 
 	@Override
@@ -53,6 +52,11 @@ public class MagicJavaEEHttpServletResponse implements MagicHttpServletResponse
 		return response.getHeaderNames();
 	}
 
+	@Override
+	public <T> T getResponse() {
+		return (T) response;
+	}
+
 
 	public static class ArgumentsResolver implements HandlerMethodArgumentResolver {
 

magic-api-servlet/magic-api-servlet-javaee/src/main/java/org/ssssssss/magicapi/servlet/javaee/MagicJavaEEHttpSession.java

@@ -6,7 +6,7 @@ import javax.servlet.http.HttpSession;
 
 public class MagicJavaEEHttpSession implements MagicHttpSession {
 
-	private HttpSession session;
+	private final HttpSession session;
 
 	public MagicJavaEEHttpSession(HttpSession session) {
 		this.session = session;
@@ -21,4 +21,9 @@ public class MagicJavaEEHttpSession implements MagicHttpSession {
 	public void setAttribute(String key, Object value) {
 		session.setAttribute(key, value);
 	}
+
+	@Override
+	public <T> T getSession() {
+		return (T) session;
+	}
 }

magic-api/src/main/java/org/ssssssss/magicapi/core/servlet/MagicCookie.java

@@ -5,4 +5,6 @@ public interface MagicCookie {
 	String getName();
 
 	String getValue();
+
+	<T> T getCookie();
 }

magic-api/src/main/java/org/ssssssss/magicapi/core/servlet/MagicHttpServletRequest.java

@@ -41,6 +41,8 @@ public interface MagicHttpServletRequest {
 	MultipartRequest resolveMultipart();
 
 	Principal getUserPrincipal();
+
+	<T> T getRequest();
 }
 
 

magic-api/src/main/java/org/ssssssss/magicapi/core/servlet/MagicHttpServletResponse.java

@@ -17,4 +17,6 @@ public interface MagicHttpServletResponse {
 	public OutputStream getOutputStream() throws IOException;
 
 	public Collection<String> getHeaderNames();
+
+	public <T> T getResponse();
 }

magic-api/src/main/java/org/ssssssss/magicapi/core/servlet/MagicHttpSession.java

@@ -5,4 +5,6 @@ public interface MagicHttpSession {
 	Object getAttribute(String key);
 
 	void setAttribute(String key, Object value);
+
+	<T> T getSession();
 }