diff --git a/core/src/test/java/org/apache/struts2/interceptor/CspInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/CspInterceptorTest.java
index 0dabc049c..2811b289f 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/CspInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/CspInterceptorTest.java
@@ -180,7 +180,7 @@ public class CspInterceptorTest extends StrutsInternalTestCase {
         ActionContext context = ActionContext.getContext()
             .withServletRequest(request)
             .withServletResponse(response)
-            .withSession(new SessionMap<>(request))
+            .withSession(new SessionMap(request))
             .bind();
         mai.setInvocationContext(context);
         session = request.getSession();
diff --git a/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java b/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
index c8cc66934..0809ea0e2 100644
--- a/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
+++ b/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
@@ -76,7 +76,7 @@ public class DWRValidator {
             requestParams = requestParams.withExtraParams(params);
         }
         Map<String, Object> requestMap = new RequestMap(req);
-        Map<String, Object> session = new SessionMap<>(req);
+        Map<String, Object> session = new SessionMap(req);
         Map<String, Object> application = new ApplicationMap(servletContext);
         Dispatcher du = Dispatcher.getInstance();
         Map<String, Object> ctx = du.createContextMap(requestMap,