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 6bc0e3f Javadoc @see tags do not need to use a FQCN for classes in
java.lang
6bc0e3f is described below
commit 6bc0e3f8be55731fbf3cb3c79bc3db10fac24faf
Author: Gary Gregory <ggreg...@rocketsoftware.com>
AuthorDate: Mon Aug 29 07:21:31 2022 -0400
Javadoc @see tags do not need to use a FQCN for classes in java.lang
---
src/main/java/org/apache/commons/ognl/ASTAnd.java | 484 ++++++++++-----------
.../apache/commons/ognl/test/objects/Bean3.java | 218 +++++-----
2 files changed, 351 insertions(+), 351 deletions(-)
diff --git a/src/main/java/org/apache/commons/ognl/ASTAnd.java
b/src/main/java/org/apache/commons/ognl/ASTAnd.java
index ff21a5e..a9dbd75 100644
--- a/src/main/java/org/apache/commons/ognl/ASTAnd.java
+++ b/src/main/java/org/apache/commons/ognl/ASTAnd.java
@@ -1,242 +1,242 @@
-package org.apache.commons.ognl;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software 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.
- */
-
-import org.apache.commons.ognl.enhance.ExpressionCompiler;
-import org.apache.commons.ognl.enhance.UnsupportedCompilationException;
-
-import static java.lang.String.format;
-
-/**
- * $Id$
- */
-public class ASTAnd
- extends BooleanExpression
-{
- /** Serial */
- private static final long serialVersionUID = -4585941425250141812L;
-
- /**
- * TODO: javadoc
- * @param id the id
- */
- public ASTAnd( int id )
- {
- super( id );
- }
-
- /**
- * TODO: javadoc
- * @param p the parser
- * @param id the id
- */
- public ASTAnd( OgnlParser p, int id )
- {
- super( p, id );
- }
-
- /* (non-Javadoc)
- * @see org.apache.commons.ognl.SimpleNode#jjtClose()
- */
- public void jjtClose()
- {
- flattenTree();
- }
-
- /* (non-Javadoc)
- * @see
org.apache.commons.ognl.SimpleNode#getValueBody(org.apache.commons.ognl.OgnlContext,
java.lang.Object)
- */
- protected Object getValueBody( OgnlContext context, Object source )
- throws OgnlException
- {
- Object result = null;
- int last = children.length - 1;
- for ( int i = 0; i <= last; ++i )
- {
- result = children[i].getValue( context, source );
-
- if ( i != last && !OgnlOps.booleanValue( result ) )
- {
- break;
- }
- }
-
- return result;
- }
-
- /* (non-Javadoc)
- * @see
org.apache.commons.ognl.SimpleNode#setValueBody(org.apache.commons.ognl.OgnlContext,
java.lang.Object, java.lang.Object)
- */
- protected void setValueBody( OgnlContext context, Object target, Object
value )
- throws OgnlException
- {
- int last = children.length - 1;
-
- for ( int i = 0; i < last; ++i )
- {
- Object v = children[i].getValue( context, target );
-
- if ( !OgnlOps.booleanValue( v ) )
- {
- return;
- }
- }
-
- children[last].setValue( context, target, value );
- }
-
- /* (non-Javadoc)
- * @see org.apache.commons.ognl.ExpressionNode#getExpressionOperator(int)
- */
- public String getExpressionOperator( int index )
- {
- return "&&";
- }
-
- /* (non-Javadoc)
- * @see org.apache.commons.ognl.BooleanExpression#getGetterClass()
- */
- public Class getGetterClass()
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see
org.apache.commons.ognl.BooleanExpression#toGetSourceString(org.apache.commons.ognl.OgnlContext,
java.lang.Object)
- */
- public String toGetSourceString( OgnlContext context, Object target )
- {
- if ( children.length != 2 )
- {
- throw new UnsupportedCompilationException(
- "Can only compile boolean expressions with two children." );
- }
-
- String result = "";
-
- try
- {
-
- String first = OgnlRuntime.getChildSource( context, target,
children[0] );
- if ( !OgnlOps.booleanValue( context.getCurrentObject() ) )
- {
- throw new UnsupportedCompilationException(
- "And expression can't be compiled until all conditions are
true." );
- }
-
- if ( !OgnlRuntime.isBoolean( first ) &&
!context.getCurrentType().isPrimitive() )
- {
- first = OgnlRuntime.getCompiler( context
).createLocalReference( context, first, context.getCurrentType() );
- }
-
- String second = OgnlRuntime.getChildSource( context, target,
children[1] );
- if ( !OgnlRuntime.isBoolean( second ) &&
!context.getCurrentType().isPrimitive() )
- {
- second = OgnlRuntime.getCompiler( context
).createLocalReference( context, second, context.getCurrentType() );
- }
-
- result += format(
"(org.apache.commons.ognl.OgnlOps.booleanValue(%s) ? ($w) (%s) : ($w) (%s))",
first, second, first );
-
- context.setCurrentObject( target );
- context.setCurrentType( Object.class );
- }
- catch ( NullPointerException e )
- {
-
- throw new UnsupportedCompilationException( "evaluation resulted in
null expression." );
- }
- catch ( Throwable t )
- {
- throw OgnlOps.castToRuntime( t );
- }
-
- return result;
- }
-
- /* (non-Javadoc)
- * @see
org.apache.commons.ognl.ExpressionNode#toSetSourceString(org.apache.commons.ognl.OgnlContext,
java.lang.Object)
- */
- public String toSetSourceString( OgnlContext context, Object target )
- {
- if ( children.length != 2 )
- {
- throw new UnsupportedCompilationException( "Can only compile
boolean expressions with two children." );
- }
-
- String pre = (String) context.get( "_currentChain" );
- if ( pre == null )
- {
- pre = "";
- }
-
- String result = "";
-
- try
- {
-
- if ( !OgnlOps.booleanValue( children[0].getValue( context, target
) ) )
- {
- throw new UnsupportedCompilationException(
- "And expression can't be compiled until all conditions are
true." );
- }
-
- String first =
- ExpressionCompiler.getRootExpression( children[0],
context.getRoot(), context ) + pre
- + children[0].toGetSourceString( context, target );
-
- children[1].getValue( context, target );
-
- String second =
- ExpressionCompiler.getRootExpression( children[1],
context.getRoot(), context ) + pre
- + children[1].toSetSourceString( context, target );
-
- if ( !OgnlRuntime.isBoolean( first ) )
- {
- result += "if(org.apache.commons.ognl.OgnlOps.booleanValue(" +
first + ")){";
- }
- else
- {
- result += "if(" + first + "){";
- }
-
- result += second;
- result += "; } ";
-
- context.setCurrentObject( target );
- context.setCurrentType( Object.class );
-
- }
- catch ( Throwable t )
- {
- throw OgnlOps.castToRuntime( t );
- }
-
- return result;
- }
-
- /* (non-Javadoc)
- * @see
org.apache.commons.ognl.Node#accept(org.apache.commons.ognl.NodeVisitor,
java.lang.Object)
- */
- public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
- throws OgnlException
- {
- return visitor.visit( this, data );
- }
-}
+package org.apache.commons.ognl;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software 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.
+ */
+
+import org.apache.commons.ognl.enhance.ExpressionCompiler;
+import org.apache.commons.ognl.enhance.UnsupportedCompilationException;
+
+import static java.lang.String.format;
+
+/**
+ * $Id$
+ */
+public class ASTAnd
+ extends BooleanExpression
+{
+ /** Serial */
+ private static final long serialVersionUID = -4585941425250141812L;
+
+ /**
+ * TODO: javadoc
+ * @param id the id
+ */
+ public ASTAnd( int id )
+ {
+ super( id );
+ }
+
+ /**
+ * TODO: javadoc
+ * @param p the parser
+ * @param id the id
+ */
+ public ASTAnd( OgnlParser p, int id )
+ {
+ super( p, id );
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.commons.ognl.SimpleNode#jjtClose()
+ */
+ public void jjtClose()
+ {
+ flattenTree();
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.commons.ognl.SimpleNode#getValueBody(org.apache.commons.ognl.OgnlContext,
Object)
+ */
+ protected Object getValueBody( OgnlContext context, Object source )
+ throws OgnlException
+ {
+ Object result = null;
+ int last = children.length - 1;
+ for ( int i = 0; i <= last; ++i )
+ {
+ result = children[i].getValue( context, source );
+
+ if ( i != last && !OgnlOps.booleanValue( result ) )
+ {
+ break;
+ }
+ }
+
+ return result;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.commons.ognl.SimpleNode#setValueBody(org.apache.commons.ognl.OgnlContext,
Object, Object)
+ */
+ protected void setValueBody( OgnlContext context, Object target, Object
value )
+ throws OgnlException
+ {
+ int last = children.length - 1;
+
+ for ( int i = 0; i < last; ++i )
+ {
+ Object v = children[i].getValue( context, target );
+
+ if ( !OgnlOps.booleanValue( v ) )
+ {
+ return;
+ }
+ }
+
+ children[last].setValue( context, target, value );
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.commons.ognl.ExpressionNode#getExpressionOperator(int)
+ */
+ public String getExpressionOperator( int index )
+ {
+ return "&&";
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.commons.ognl.BooleanExpression#getGetterClass()
+ */
+ public Class getGetterClass()
+ {
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.commons.ognl.BooleanExpression#toGetSourceString(org.apache.commons.ognl.OgnlContext,
Object)
+ */
+ public String toGetSourceString( OgnlContext context, Object target )
+ {
+ if ( children.length != 2 )
+ {
+ throw new UnsupportedCompilationException(
+ "Can only compile boolean expressions with two children." );
+ }
+
+ String result = "";
+
+ try
+ {
+
+ String first = OgnlRuntime.getChildSource( context, target,
children[0] );
+ if ( !OgnlOps.booleanValue( context.getCurrentObject() ) )
+ {
+ throw new UnsupportedCompilationException(
+ "And expression can't be compiled until all conditions are
true." );
+ }
+
+ if ( !OgnlRuntime.isBoolean( first ) &&
!context.getCurrentType().isPrimitive() )
+ {
+ first = OgnlRuntime.getCompiler( context
).createLocalReference( context, first, context.getCurrentType() );
+ }
+
+ String second = OgnlRuntime.getChildSource( context, target,
children[1] );
+ if ( !OgnlRuntime.isBoolean( second ) &&
!context.getCurrentType().isPrimitive() )
+ {
+ second = OgnlRuntime.getCompiler( context
).createLocalReference( context, second, context.getCurrentType() );
+ }
+
+ result += format(
"(org.apache.commons.ognl.OgnlOps.booleanValue(%s) ? ($w) (%s) : ($w) (%s))",
first, second, first );
+
+ context.setCurrentObject( target );
+ context.setCurrentType( Object.class );
+ }
+ catch ( NullPointerException e )
+ {
+
+ throw new UnsupportedCompilationException( "evaluation resulted in
null expression." );
+ }
+ catch ( Throwable t )
+ {
+ throw OgnlOps.castToRuntime( t );
+ }
+
+ return result;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.commons.ognl.ExpressionNode#toSetSourceString(org.apache.commons.ognl.OgnlContext,
Object)
+ */
+ public String toSetSourceString( OgnlContext context, Object target )
+ {
+ if ( children.length != 2 )
+ {
+ throw new UnsupportedCompilationException( "Can only compile
boolean expressions with two children." );
+ }
+
+ String pre = (String) context.get( "_currentChain" );
+ if ( pre == null )
+ {
+ pre = "";
+ }
+
+ String result = "";
+
+ try
+ {
+
+ if ( !OgnlOps.booleanValue( children[0].getValue( context, target
) ) )
+ {
+ throw new UnsupportedCompilationException(
+ "And expression can't be compiled until all conditions are
true." );
+ }
+
+ String first =
+ ExpressionCompiler.getRootExpression( children[0],
context.getRoot(), context ) + pre
+ + children[0].toGetSourceString( context, target );
+
+ children[1].getValue( context, target );
+
+ String second =
+ ExpressionCompiler.getRootExpression( children[1],
context.getRoot(), context ) + pre
+ + children[1].toSetSourceString( context, target );
+
+ if ( !OgnlRuntime.isBoolean( first ) )
+ {
+ result += "if(org.apache.commons.ognl.OgnlOps.booleanValue(" +
first + ")){";
+ }
+ else
+ {
+ result += "if(" + first + "){";
+ }
+
+ result += second;
+ result += "; } ";
+
+ context.setCurrentObject( target );
+ context.setCurrentType( Object.class );
+
+ }
+ catch ( Throwable t )
+ {
+ throw OgnlOps.castToRuntime( t );
+ }
+
+ return result;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.commons.ognl.Node#accept(org.apache.commons.ognl.NodeVisitor, Object)
+ */
+ public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P
data )
+ throws OgnlException
+ {
+ return visitor.visit( this, data );
+ }
+}
diff --git a/src/test/java/org/apache/commons/ognl/test/objects/Bean3.java
b/src/test/java/org/apache/commons/ognl/test/objects/Bean3.java
index 46073f2..989de1c 100644
--- a/src/test/java/org/apache/commons/ognl/test/objects/Bean3.java
+++ b/src/test/java/org/apache/commons/ognl/test/objects/Bean3.java
@@ -1,109 +1,109 @@
-/*
- * $Id$
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software 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.
- */
-package org.apache.commons.ognl.test.objects;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class Bean3
-{
- private int value = 100;
-
- private final Map<String, String> map;
- {
- map = new HashMap<String, String>();
- map.put( "foo", "bar" );
- map.put( "bar", "baz" );
- }
-
- private String _nullValue;
-
- private Object _indexValue;
-
- public int getValue()
- {
- return value;
- }
-
- public void setValue( int value )
- {
- this.value = value;
- }
-
- public Object getIndexedValue( int index )
- {
- return _indexValue;
- }
-
- public void setIndexedValue( int index, Object value )
- {
- _indexValue = value;
- }
-
- public Map<String, String> getMap()
- {
- return map;
- }
-
- public void setNullValue( String value )
- {
- _nullValue = value;
- }
-
- public String getNullValue()
- {
- return _nullValue;
- }
-
- /*
- * (non-Javadoc)
- * @see java.lang.Object#hashCode()
- */
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- result = prime * result + ( ( _indexValue == null ) ? 0 :
_indexValue.hashCode() );
- return result;
- }
-
- /*
- * (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals( Object obj )
- {
- if ( this == obj )
- return true;
- if ( obj == null )
- return false;
- if ( getClass() != obj.getClass() )
- return false;
- final Bean3 other = (Bean3) obj;
- if ( _indexValue == null )
- {
- if ( other._indexValue != null )
- return false;
- }
- else if ( !_indexValue.equals( other._indexValue ) )
- return false;
- return true;
- }
-}
+/*
+ * $Id$
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software 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.
+ */
+package org.apache.commons.ognl.test.objects;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Bean3
+{
+ private int value = 100;
+
+ private final Map<String, String> map;
+ {
+ map = new HashMap<String, String>();
+ map.put( "foo", "bar" );
+ map.put( "bar", "baz" );
+ }
+
+ private String _nullValue;
+
+ private Object _indexValue;
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public void setValue( int value )
+ {
+ this.value = value;
+ }
+
+ public Object getIndexedValue( int index )
+ {
+ return _indexValue;
+ }
+
+ public void setIndexedValue( int index, Object value )
+ {
+ _indexValue = value;
+ }
+
+ public Map<String, String> getMap()
+ {
+ return map;
+ }
+
+ public void setNullValue( String value )
+ {
+ _nullValue = value;
+ }
+
+ public String getNullValue()
+ {
+ return _nullValue;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see Object#hashCode()
+ */
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ( ( _indexValue == null ) ? 0 :
_indexValue.hashCode() );
+ return result;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see Object#equals(Object)
+ */
+ public boolean equals( Object obj )
+ {
+ if ( this == obj )
+ return true;
+ if ( obj == null )
+ return false;
+ if ( getClass() != obj.getClass() )
+ return false;
+ final Bean3 other = (Bean3) obj;
+ if ( _indexValue == null )
+ {
+ if ( other._indexValue != null )
+ return false;
+ }
+ else if ( !_indexValue.equals( other._indexValue ) )
+ return false;
+ return true;
+ }
+}
