From 071437ffa4a2883d3354da8ea88218bba1d36f85 Mon Sep 17 00:00:00 2001
From: lgcareer <18610854716@163.com>
Date: Sat, 4 Jul 2020 15:50:50 +0800
Subject: [PATCH] add PropertyPlaceholderHelper on license (#3129)

* update license header location

* add PropertyPlaceholderHelper on license
---
 LICENSE                                        |  1 +
 NOTICE                                         | 14 +++++++++++++-
 .../interceptor/LoginHandlerInterceptor.java   | 18 ++++--------------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/LICENSE b/LICENSE
index dba3bc528..9a0c6aa66 100644
--- a/LICENSE
+++ b/LICENSE
@@ -215,3 +215,4 @@ The following components are provided under the Apache License. See project link
 The text of each license is the standard Apache 2.0 license.
     ScriptRunner from https://github.com/mybatis/mybatis-3 Apache 2.0
     mvnw files from https://github.com/takari/maven-wrapper Apache 2.0
+    PropertyPlaceholderHelper from https://github.com/spring-projects/spring-framework Apache 2.0
diff --git a/NOTICE b/NOTICE
index 63b57af8c..3e5695849 100644
--- a/NOTICE
+++ b/NOTICE
@@ -72,4 +72,16 @@ Refactored SqlBuilder class (SQL, AbstractSQL)
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
+   limitations under the License.
+
+Spring Framework ${version}
+Copyright (c) 2002-${copyright} Pivotal, Inc.
+
+This product is licensed to you under the Apache License, Version 2.0
+(the "License"). You may not use this product except in compliance with
+the License.
+
+This product may include a number of subcomponents with separate
+copyright notices and license terms. Your use of the source code for
+these subcomponents is subject to the terms and conditions of the
+subcomponent's license, as noted in the license.txt file.
\ No newline at end of file
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/LoginHandlerInterceptor.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/LoginHandlerInterceptor.java
index 98bac42f7..9af7f0b43 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/LoginHandlerInterceptor.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/LoginHandlerInterceptor.java
@@ -48,20 +48,10 @@ public class LoginHandlerInterceptor implements HandlerInterceptor {
 
   /**
    * Intercept the execution of a handler. Called after HandlerMapping determined
-   * an appropriate handler object, but before HandlerAdapter invokes the handler.
-   * <p>DispatcherServlet processes a handler in an execution chain, consisting
-   * of any number of interceptors, with the handler itself at the end.
-   * With this method, each interceptor can decide to abort the execution chain,
-   * typically sending a HTTP error or writing a custom response.
-   * <p><strong>Note:</strong> special considerations apply for asynchronous
-   * request processing. For more details see
-   * {@link org.springframework.web.servlet.AsyncHandlerInterceptor}.
-   * @param request current HTTP request
-   * @param response current HTTP response
-   * @param handler chosen handler to execute, for type and/or instance evaluation
-   * @return {@code true} if the execution chain should proceed with the
-   * next interceptor or the handler itself. Else, DispatcherServlet assumes
-   * that this interceptor has already dealt with the response itself.
+   * @param request   current HTTP request
+   * @param response  current HTTP response
+   * @param handler   chosen handler to execute, for type and/or instance evaluation
+   * @return boolean true or false
    */
   @Override
   public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
-- 
GitLab