From commits-return-19506-archive-asf-public=cust-asf.ponee.io@struts.apache.org Sun Jan 10 10:51:54 2021 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mxout1-he-de.apache.org (mxout1-he-de.apache.org [95.216.194.37]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id 2FC37180645 for ; Sun, 10 Jan 2021 11:51:54 +0100 (CET) Received: from mail.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mxout1-he-de.apache.org (ASF Mail Server at mxout1-he-de.apache.org) with SMTP id E8C14658A6 for ; Sun, 10 Jan 2021 10:51:51 +0000 (UTC) Received: (qmail 90694 invoked by uid 500); 10 Jan 2021 10:51:50 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 90675 invoked by uid 99); 10 Jan 2021 10:51:50 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 10 Jan 2021 10:51:50 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 617CE82118; Sun, 10 Jan 2021 10:51:50 +0000 (UTC) Date: Sun, 10 Jan 2021 10:51:50 +0000 To: "commits@struts.apache.org" Subject: [struts] 01/01: Merge pull request #464 from apache/WW-5000-constants MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: lukaszlenart@apache.org In-Reply-To: <161027590968.19440.16317823918146648540@gitbox.apache.org> References: <161027590968.19440.16317823918146648540@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: struts X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: b3483e37d8fa35c9837db5bd63ddc9f4bac1f7a7 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20210110105150.617CE82118@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit b3483e37d8fa35c9837db5bd63ddc9f4bac1f7a7 Merge: 059b287 83838d1 Author: Lukasz Lenart AuthorDate: Sun Jan 10 11:51:42 2021 +0100 Merge pull request #464 from apache/WW-5000-constants [WW-5000] Extracts string literals as constants .../com/opensymphony/xwork2/ObjectFactory.java | 3 ++- .../xwork2/config/impl/DefaultConfiguration.java | 2 +- .../StrutsDefaultConfigurationProvider.java | 2 +- .../xwork2/interceptor/ChainingInterceptor.java | 13 ++++++----- .../opensymphony/xwork2/ognl/OgnlValueStack.java | 2 +- .../ognl/accessor/XWorkListPropertyAccessor.java | 6 ----- .../java/org/apache/struts2/StrutsConstants.java | 19 +++++++++++++-- .../struts2/config/entities/ConstantConfig.java | 2 +- .../accessor/XWorkListPropertyAccessorTest.java | 19 --------------- .../org/apache/struts2/cdi/CdiObjectFactory.java | 5 ++-- .../struts2/views/java/JavaTemplateConstants.java | 27 ++++++++++++++++++++++ .../struts2/views/java/JavaTemplateEngine.java | 4 ++-- .../interceptor/OValValidationInterceptor.java | 5 +++- 13 files changed, 66 insertions(+), 43 deletions(-)