This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-ognl.git
The following commit(s) were added to refs/heads/master by this push:
new afc1f9b Use String.replace() instead of replaceAll() when we don't
need a Regex.
afc1f9b is described below
commit afc1f9beccc1beee119bee3722efdf876bb77d4b
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Feb 28 18:41:48 2021 -0500
Use String.replace() instead of replaceAll() when we don't need a Regex.
---
src/main/java/org/apache/commons/ognl/ASTAdd.java | 6 +++---
.../java/org/apache/commons/ognl/ListPropertyAccessor.java | 6 +++---
src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java | 4 ++--
.../java/org/apache/commons/ognl/ObjectPropertyAccessor.java | 10 +++++-----
src/main/java/org/apache/commons/ognl/OgnlRuntime.java | 4 ++--
.../apache/commons/ognl/test/objects/BeanProviderAccessor.java | 4 ++--
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/apache/commons/ognl/ASTAdd.java
b/src/main/java/org/apache/commons/ognl/ASTAdd.java
index 5fde25d..bcf6c9e 100644
--- a/src/main/java/org/apache/commons/ognl/ASTAdd.java
+++ b/src/main/java/org/apache/commons/ognl/ASTAdd.java
@@ -255,7 +255,7 @@ class ASTAdd
if ( context.getCurrentType() != null &&
context.getCurrentType() == Character.class
&& ASTConst.class.isInstance( children[i] ) )
{
- expr = expr.replaceAll( "'", "\"" );
+ expr = expr.replace( "'", "\"" );
context.setCurrentType( String.class );
}
else
@@ -274,8 +274,8 @@ class ASTAdd
if ( lastType != null &&
String.class.isAssignableFrom( lastType.getGetterClass() ) )
{
// System.out.println("Input expr >>" + expr +
"<<");
- expr = expr.replaceAll( """, "\"" );
- expr = expr.replaceAll( "\"", "'" );
+ expr = expr.replace( """, "\"" );
+ expr = expr.replace( "\"", "'" );
expr = format( "\"%s\"", expr );
// System.out.println("Expr now >>" + expr +
"<<");
}
diff --git a/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
b/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
index db05704..cfc955d 100644
--- a/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
+++ b/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
@@ -154,7 +154,7 @@ public class ListPropertyAccessor
{
if ( index instanceof String )
{
- String key = ( (String) index ).replaceAll( "\"", "" );
+ String key = ( (String) index ).replace( "\"", "" );
if ( "size".equals( key ) )
{
return int.class;
@@ -181,7 +181,7 @@ public class ListPropertyAccessor
@Override
public String getSourceAccessor( OgnlContext context, Object target,
Object index )
{
- String indexStr = index.toString().replaceAll( "\"", "" );
+ String indexStr = index.toString().replace( "\"", "" );
if ( String.class.isInstance( index ) )
{
@@ -213,7 +213,7 @@ public class ListPropertyAccessor
@Override
public String getSourceSetter( OgnlContext context, Object target, Object
index )
{
- String indexStr = index.toString().replaceAll( "\"", "" );
+ String indexStr = index.toString().replace( "\"", "" );
// TODO: This feels really inefficient, must be some better way
// check if the index string represents a method on a custom class
implementing java.util.List instead..
diff --git a/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
b/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
index 2e92e27..af16434 100644
--- a/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
+++ b/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
@@ -120,7 +120,7 @@ public class MapPropertyAccessor
if ( String.class.isInstance( index ) && !indexedAccess )
{
- String key = indexStr.replaceAll( "\"", "" );
+ String key = indexStr.replace( "\"", "" );
if ( "size".equals( key ) )
{
@@ -156,7 +156,7 @@ public class MapPropertyAccessor
if ( String.class.isInstance( index ) )
{
- String key = indexStr.replaceAll( "\"", "" );
+ String key = indexStr.replace( "\"", "" );
if ( "size".equals( key ) || "keys".equals( key ) ||
"keySet".equals( key ) || "values".equals( key )
|| "isEmpty".equals( key ) )
diff --git a/src/main/java/org/apache/commons/ognl/ObjectPropertyAccessor.java
b/src/main/java/org/apache/commons/ognl/ObjectPropertyAccessor.java
index 0c51728..39d52e9 100644
--- a/src/main/java/org/apache/commons/ognl/ObjectPropertyAccessor.java
+++ b/src/main/java/org/apache/commons/ognl/ObjectPropertyAccessor.java
@@ -187,7 +187,7 @@ public class ObjectPropertyAccessor
if ( String.class.isAssignableFrom( index.getClass() ) &&
!target.getClass().isArray() )
{
- String key = ( (String) index ).replaceAll( "\"", "" );
+ String key = ( (String) index ).replace( "\"", "" );
try
{
Field f = target.getClass().getField( key );
@@ -220,7 +220,7 @@ public class ObjectPropertyAccessor
try
{
- String methodName = index.toString().replaceAll( "\"", "" );
+ String methodName = index.toString().replace( "\"", "" );
Method m = OgnlRuntime.getReadMethod( target.getClass(),
methodName );
// try last ditch effort of checking if they were trying to do
reflection via a return method value
@@ -229,7 +229,7 @@ public class ObjectPropertyAccessor
{
m =
OgnlRuntime.getReadMethod( target.getClass(),
-
context.getCurrentObject().toString().replaceAll( "\"", "" ) );
+
context.getCurrentObject().toString().replace( "\"", "" ) );
}
// System.out.println("tried to get read method from target: " +
target.getClass() + " with methodName:" +
// methodName + " result: " + m);
@@ -278,14 +278,14 @@ public class ObjectPropertyAccessor
try
{
- String methodName = index.toString().replaceAll( "\"", "" );
+ String methodName = index.toString().replace( "\"", "" );
Method m = OgnlRuntime.getWriteMethod( target.getClass(),
methodName );
if ( m == null && context.getCurrentObject() != null &&
context.getCurrentObject().toString() != null )
{
m =
OgnlRuntime.getWriteMethod( target.getClass(),
-
context.getCurrentObject().toString().replaceAll( "\"", "" ) );
+
context.getCurrentObject().toString().replace( "\"", "" ) );
}
if ( m == null || m.getParameterTypes() == null ||
m.getParameterTypes().length <= 0 )
diff --git a/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
b/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
index 0554887..e670817 100644
--- a/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
+++ b/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
@@ -1838,7 +1838,7 @@ public class OgnlRuntime
{
try
{
- name = name.replaceAll( "\"", "" ).toLowerCase();
+ name = name.replace( "\"", "" ).toLowerCase();
BeanInfo info = Introspector.getBeanInfo( target );
MethodDescriptor[] methodDescriptors = info.getMethodDescriptors();
@@ -1937,7 +1937,7 @@ public class OgnlRuntime
{
try
{
- name = name.replaceAll( "\"", "" );
+ name = name.replace( "\"", "" );
BeanInfo info = Introspector.getBeanInfo( target );
MethodDescriptor[] methods = info.getMethodDescriptors();
diff --git
a/src/test/java/org/apache/commons/ognl/test/objects/BeanProviderAccessor.java
b/src/test/java/org/apache/commons/ognl/test/objects/BeanProviderAccessor.java
index cf2dfb6..b07ee9b 100644
---
a/src/test/java/org/apache/commons/ognl/test/objects/BeanProviderAccessor.java
+++
b/src/test/java/org/apache/commons/ognl/test/objects/BeanProviderAccessor.java
@@ -58,7 +58,7 @@ public class BeanProviderAccessor
throws OgnlException
{
BeanProvider provider = (BeanProvider) target;
- String beanName = ( (String) oname ).replaceAll( "\"", "" );
+ String beanName = ( (String) oname ).replace( "\"", "" );
return provider.getBean( beanName ) != null;
}
@@ -67,7 +67,7 @@ public class BeanProviderAccessor
public String getSourceAccessor( OgnlContext context, Object target,
Object name )
{
BeanProvider provider = (BeanProvider) target;
- String beanName = ( (String) name ).replaceAll( "\"", "" );
+ String beanName = ( (String) name ).replace( "\"", "" );
if ( provider.getBean( beanName ) != null )
{
