You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ki...@apache.org on 2021/02/03 14:09:43 UTC
[incubator-dolphinscheduler] branch dev updated: [Improvement][Api]
Use WebUtils.getCookie instead of BaseService.getCookie (#4559)
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 424497e [Improvement][Api] Use WebUtils.getCookie instead of BaseService.getCookie (#4559)
424497e is described below
commit 424497ecbab6fc07e3919fe7f2543679de3c54c7
Author: Shiwen Cheng <ch...@gmail.com>
AuthorDate: Wed Feb 3 22:09:31 2021 +0800
[Improvement][Api] Use WebUtils.getCookie instead of BaseService.getCookie (#4559)
---
.../api/interceptor/LocaleChangeInterceptor.java | 4 ++--
.../dolphinscheduler/api/service/BaseService.java | 21 ---------------------
.../api/service/impl/SessionServiceImpl.java | 3 ++-
.../api/service/BaseServiceTest.java | 14 --------------
4 files changed, 4 insertions(+), 38 deletions(-)
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/LocaleChangeInterceptor.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/LocaleChangeInterceptor.java
index 3fe236e..2ed4e6f 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/LocaleChangeInterceptor.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/LocaleChangeInterceptor.java
@@ -17,7 +17,6 @@
package org.apache.dolphinscheduler.api.interceptor;
-import org.apache.dolphinscheduler.api.service.BaseService;
import org.apache.dolphinscheduler.common.Constants;
import java.util.Locale;
@@ -30,12 +29,13 @@ import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.lang.Nullable;
import org.springframework.util.StringUtils;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+import org.springframework.web.util.WebUtils;
public class LocaleChangeInterceptor extends HandlerInterceptorAdapter {
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
- Cookie cookie = BaseService.getCookie(request, Constants.LOCALE_LANGUAGE);
+ Cookie cookie = WebUtils.getCookie(request, Constants.LOCALE_LANGUAGE);
if (cookie != null) {
// Proceed in cookie
return true;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java
index c61cd1e..55826bf 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java
@@ -113,27 +113,6 @@ public class BaseService {
return false;
}
-
- /**
- * get cookie info by name
- *
- * @param request request
- * @param name 'sessionId'
- * @return get cookie info
- */
- public static Cookie getCookie(HttpServletRequest request, String name) {
- Cookie[] cookies = request.getCookies();
- if (cookies != null && cookies.length > 0) {
- for (Cookie cookie : cookies) {
- if (StringUtils.isNotEmpty(name) && name.equalsIgnoreCase(cookie.getName())) {
- return cookie;
- }
- }
- }
-
- return null;
- }
-
/**
* create tenant dir if not exists
*
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SessionServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SessionServiceImpl.java
index 8aaefda..917ebdf 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SessionServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SessionServiceImpl.java
@@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.util.WebUtils;
/**
* session service implement
@@ -60,7 +61,7 @@ public class SessionServiceImpl extends BaseService implements SessionService {
String sessionId = request.getHeader(Constants.SESSION_ID);
if (StringUtils.isBlank(sessionId)) {
- Cookie cookie = getCookie(request, Constants.SESSION_ID);
+ Cookie cookie = WebUtils.getCookie(request, Constants.SESSION_ID);
if (cookie != null) {
sessionId = cookie.getValue();
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/BaseServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/BaseServiceTest.java
index 95083dd..968dd47 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/BaseServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/BaseServiceTest.java
@@ -94,20 +94,6 @@ public class BaseServiceTest {
baseService.putMsg(result,Status.PROJECT_NOT_FOUNT,"test");
}
@Test
- public void testGetCookie(){
-
- MockHttpServletRequest request = new MockHttpServletRequest();
- MockCookie mockCookie = new MockCookie("userId","1");
- request.setCookies(mockCookie);
- //cookie is not null
- Cookie cookie = BaseService.getCookie(request,"userId");
- Assert.assertNotNull(cookie);
- //cookie is null
- cookie = BaseService.getCookie(request,"userName");
- Assert.assertNull(cookie);
-
- }
- @Test
public void testCreateTenantDirIfNotExists(){
PowerMockito.mockStatic(HadoopUtils.class);