Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OAP-203 oap-template: NPE for the default implementation of Ext #325

Merged
merged 1 commit into from
Sep 9, 2024
Merged

OAP-203 oap-template: NPE for the default implementation of Ext #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 47 additions & 42 deletions oap-formats/oap-template/src/main/java/oap/template/render/TemplateAstUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import oap.template.TemplateGrammarExpression;
import oap.template.TemplateLexerExpression;
import oap.template.ThrowingErrorListener;
import oap.template.tree.Element;
import oap.template.tree.Elements;
import oap.template.tree.Expr;
import oap.template.tree.Expression;
Expand Down Expand Up @@ -64,7 +65,7 @@ public static TemplateType findExpressionResultType( TemplateType rootTemplateTy
if( exprs.concatenation != null ) return new TemplateType( String.class, false );

try {
var currentType = rootTemplateType;
TemplateType currentType = rootTemplateType;
ArrayList<Expr> exprArrayList = exprs.exprs;
for( int i = 0; i < exprArrayList.size(); i++ ) {
Expr expr = exprArrayList.get( i );
Expand All @@ -75,18 +76,20 @@ public static TemplateType findExpressionResultType( TemplateType rootTemplateTy
} else if( currentType.isInstanceOf( Map.class ) ) {
currentType = currentType.getActualTypeArguments1();
} else if( !expr.method ) {
var parentClass = currentType.getTypeClass();
var field = findField( parentClass, expr.name );
Class<?> parentClass = currentType.getTypeClass();
Field field = findField( parentClass, expr.name );

var fieldType = new TemplateType( field.getGenericType(), field.isAnnotationPresent( Nullable.class ) );
TemplateType fieldType = new TemplateType( field.getGenericType(), field.isAnnotationPresent( Nullable.class ) );
if( fieldType.isInstanceOf( Ext.class ) ) {
var extClass = ExtDeserializer.extensionOf( parentClass, expr.name );
fieldType = new TemplateType( extClass, fieldType.nullable );
Class<?> extClass = ExtDeserializer.extensionOf( parentClass, expr.name );
if( extClass != null ) {
fieldType = new TemplateType( extClass, fieldType.nullable );
}
}
currentType = fieldType;
} else {
var parentClass = currentType.getTypeClass();
var method = Arrays
Class<?> parentClass = currentType.getTypeClass();
Method method = Arrays
.find( c -> c.getName().equals( expr.name ), parentClass.getMethods() )
.orElse( null );
if( method == null )
Expand All @@ -110,18 +113,18 @@ static Field findField( Class<?> clazz, String fieldName ) throws NoSuchFieldExc
return clazz.getField( fieldName );
} catch( NoSuchFieldException e ) {

var fields = clazz.getFields();
for( var field : fields ) {
var jsonPropertyAnnotation = field.getAnnotation( JsonProperty.class );
Field[] fields = clazz.getFields();
for( Field field : fields ) {
JsonProperty jsonPropertyAnnotation = field.getAnnotation( JsonProperty.class );
if( jsonPropertyAnnotation != null ) {
var jsonFieldName = jsonPropertyAnnotation.value();
String jsonFieldName = jsonPropertyAnnotation.value();
if( fieldName.equals( jsonFieldName ) ) return field;
}

var jsonAliasAnnotation = field.getAnnotation( JsonAlias.class );
JsonAlias jsonAliasAnnotation = field.getAnnotation( JsonAlias.class );
if( jsonAliasAnnotation != null ) {
var jsonFieldNames = jsonAliasAnnotation.value();
for( var jsonFieldName : jsonFieldNames ) {
String[] jsonFieldNames = jsonAliasAnnotation.value();
for( String jsonFieldName : jsonFieldNames ) {
if( fieldName.equals( jsonFieldName ) ) return field;
}
}
Expand All @@ -136,7 +139,7 @@ static Field findField( Class<?> clazz, String fieldName ) throws NoSuchFieldExc

static AstRender toAst( Expression expression, TemplateType templateType, String castType, String defaultValue,
Map<String, List<Method>> builtInFunction, ErrorStrategy errorStrategy ) throws ClassNotFoundException {
var orAst = new ArrayList<AstRender>();
ArrayList<AstRender> orAst = new ArrayList<AstRender>();

TemplateType lastTemplateType = null;

Expand All @@ -145,8 +148,8 @@ static AstRender toAst( Expression expression, TemplateType templateType, String

TemplateType expressionResultType = TemplateAstUtils.findExpressionResultType( templateType, item, errorStrategy );

var itemErrorStrategy = i < expression.or.size() - 1 ? IGNORE : errorStrategy;
var itemAst = TemplateAstUtils.toAst( item,
ErrorStrategy itemErrorStrategy = i < expression.or.size() - 1 ? IGNORE : errorStrategy;
AstRender itemAst = TemplateAstUtils.toAst( item,
expression.or.size() == 1 ? expression.function : null,
templateType, expressionResultType, castType, defaultValue, builtInFunction, itemErrorStrategy );
orAst.add( itemAst );
Expand All @@ -164,9 +167,9 @@ static AstRender toAst( Expression expression, TemplateType templateType, String
if( expression.comment != null ) list.add( new AstRenderComment( templateType, expression.comment ) );

if( orAst.size() > 1 ) {
var castFieldType = FieldType.parse( castType != null ? castType : lastTemplateType.getTypeName() );
FieldType castFieldType = FieldType.parse( castType != null ? castType : lastTemplateType.getTypeName() );

var ast = new AstRenderOr( templateType, orAst );
AstRenderOr ast = new AstRenderOr( templateType, orAst );
ast.elseAstRender = new AstRenderPrintValue( lastTemplateType, defaultValue, castFieldType );
if( expression.function != null ) {
AstRender astRenderFunction = getFunction( expression.function.name, expression.function.arguments, builtInFunction, errorStrategy );
Expand All @@ -193,16 +196,16 @@ private static TemplateType findLastsTemplateType( AstRender astRender ) {
@SuppressWarnings( { "checkstyle:ModifiedControlVariable", "checkstyle:UnnecessaryParentheses", "checkstyle:OverloadMethodsDeclarationOrder" } )
private static AstRender toAst( Exprs exprs, Func function, TemplateType templateType, TemplateType resultType,
String castType, String defaultValue, Map<String, List<Method>> builtInFunction, ErrorStrategy errorStrategy ) {
var currentTemplateType = templateType;
TemplateType currentTemplateType = templateType;
Chain result = new Chain();

try {
var castFieldType = FieldType.parse( castType != null ? castType : resultType.getTypeName() );
FieldType castFieldType = FieldType.parse( castType != null ? castType : resultType.getTypeName() );

for( int i = 0; i < exprs.exprs.size(); i++ ) {
Expr expr = exprs.exprs.get( i );
if( currentTemplateType.isInstanceOf( Optional.class ) ) {
var valueType = currentTemplateType.getActualTypeArguments0();
TemplateType valueType = currentTemplateType.getActualTypeArguments0();
AstRenderOptional ast = new AstRenderOptional( valueType );
ast.elseAstRender = new AstRenderPrintValue( resultType, defaultValue, castFieldType );

Expand All @@ -211,7 +214,7 @@ private static AstRender toAst( Exprs exprs, Func function, TemplateType templat
result.add( ast );
currentTemplateType = valueType;
} else if( currentTemplateType.nullable ) {
var newType = new TemplateType( currentTemplateType.type, false );
TemplateType newType = new TemplateType( currentTemplateType.type, false );
AstRenderNullable ast = new AstRenderNullable( newType );
ast.elseAstRender = new AstRenderPrintValue( resultType, defaultValue, castFieldType );

Expand All @@ -220,32 +223,34 @@ private static AstRender toAst( Exprs exprs, Func function, TemplateType templat
result.add( ast );
currentTemplateType = newType;
} else if( currentTemplateType.isInstanceOf( Map.class ) ) {
var valueType = currentTemplateType.getActualTypeArguments1( true );
TemplateType valueType = currentTemplateType.getActualTypeArguments1( true );
AstRenderMap ast = new AstRenderMap( expr.name, valueType );

result.add( ast );
currentTemplateType = valueType;
} else if( !expr.method ) {
var parentClass = currentTemplateType.getTypeClass();
var field = findField( parentClass, expr.name );
Class<?> parentClass = currentTemplateType.getTypeClass();
Field field = findField( parentClass, expr.name );

boolean nullable = field.isAnnotationPresent( Nullable.class )
|| ( !field.getType().isPrimitive() && !field.isAnnotationPresent( Nonnull.class ) );
var fieldType = new TemplateType( field.getGenericType(), nullable );
TemplateType fieldType = new TemplateType( field.getGenericType(), nullable );
boolean forceCast = false;
if( fieldType.isInstanceOf( Ext.class ) ) {
var extClass = ExtDeserializer.extensionOf( parentClass, expr.name );
fieldType = new TemplateType( extClass, fieldType.nullable );
forceCast = true;
Class<?> extClass = ExtDeserializer.extensionOf( parentClass, expr.name );
if( extClass != null ) {
fieldType = new TemplateType( extClass, fieldType.nullable );
forceCast = true;
}
}
AstRenderField ast = new AstRenderField( field.getName(), fieldType, forceCast,
i < exprs.exprs.size() - 1 || exprs.concatenation != null ? null : castFieldType );

result.add( ast );
currentTemplateType = fieldType;
} else {
var parentClass = currentTemplateType.getTypeClass();
var method = Arrays
Class<?> parentClass = currentTemplateType.getTypeClass();
Method method = Arrays
.find( c -> c.getName().equals( expr.name ), parentClass.getMethods() )
.orElse( null );
if( method == null )
Expand Down Expand Up @@ -291,7 +296,7 @@ private static AstRender wrap( Exprs exprs, Func function, TemplateType parentTe
if( exprs.concatenation != null ) {
ArrayList<AstRender> items = new ArrayList<>();

for( var item : exprs.concatenation.items ) {
for( Object item : exprs.concatenation.items ) {
if( item instanceof String si ) items.add( new AstRenderText( si ) );
else if( item instanceof Expr ei )
items.add( toAst( new Exprs( List.of( ei ) ), function, parentTemplateType, resultType, Object.class.getTypeName(),
Expand All @@ -300,7 +305,7 @@ else if( item instanceof Expr ei )
throw new TemplateException( "Unknown concatenation item " + item.getClass() );
}

var ast = new AstRenderConcatenation( parentTemplateType, items );
AstRenderConcatenation ast = new AstRenderConcatenation( parentTemplateType, items );
list.add( ast );

parentTemplateType = new TemplateType( String.class, false );
Expand All @@ -318,7 +323,7 @@ else if( item instanceof Expr ei )
list.add( astRender );
}

var ast = new AstRenderPrintField( parentTemplateType );
AstRenderPrintField ast = new AstRenderPrintField( parentTemplateType );
list.add( ast );


Expand All @@ -328,19 +333,19 @@ else if( item instanceof Expr ei )
@SuppressWarnings( "checkstyle:OverloadMethodsDeclarationOrder" )
public static AstRenderRoot toAst( Elements elements, TemplateType templateType, Map<String, List<Method>> builtInFunction, ErrorStrategy errorStrategy ) {
AstRenderRoot astRoot = new AstRenderRoot( templateType );
for( var element : elements.elements ) {
for( Element element : elements.elements ) {
AstRender astRender;
if( element instanceof TextElement t ) {
astRender = new AstRenderText( t.text );
} else if( element instanceof ExpressionElement e ) {
try {
var lexer = new TemplateLexerExpression( CharStreams.fromString( e.expression ) );
var grammar = new TemplateGrammarExpression( new BufferedTokenStream( lexer ), builtInFunction, errorStrategy );
TemplateLexerExpression lexer = new TemplateLexerExpression( CharStreams.fromString( e.expression ) );
TemplateGrammarExpression grammar = new TemplateGrammarExpression( new BufferedTokenStream( lexer ), builtInFunction, errorStrategy );
if( errorStrategy == ErrorStrategy.ERROR ) {
lexer.addErrorListener( ThrowingErrorListener.INSTANCE );
grammar.addErrorListener( ThrowingErrorListener.INSTANCE );
}
var tree = grammar.expression().ret;
Expression tree = grammar.expression().ret;
log.trace( e.expression + "\n" + tree.print() );

astRender = new AstRenderComment( templateType, "// " + e.expression );
Expand All @@ -357,13 +362,13 @@ public static AstRenderRoot toAst( Elements elements, TemplateType templateType,
}

public static AstRender getFunction( String name, List<String> args, Map<String, List<Method>> builtInFunction, ErrorStrategy errorStrategy ) {
var list = builtInFunction.get( name );
List<Method> list = builtInFunction.get( name );
if( list == null ) {
if( errorStrategy == ErrorStrategy.ERROR ) throw new TemplateException( "function " + name + "(" + String.join( ", ", args ) + ") not found" );
return new AstRenderPathNotFound( "function " + name + "(" + String.join( ", ", args ) + ") not found" );
}

var method = Lists.find2( list, m -> m.getParameters().length == args.size() + 1 );
Method method = Lists.find2( list, m -> m.getParameters().length == args.size() + 1 );
if( method == null ) {
if( errorStrategy == ErrorStrategy.ERROR ) throw new TemplateException( "function " + name + "(" + String.join( ", ", args ) + ") not found" );
return new AstRenderPathNotFound( "function " + name + "(" + String.join( ", ", args ) + ") not found" );
Expand Down
8 changes: 8 additions & 0 deletions oap-formats/oap-template/src/test/java/oap/template/TemplateEngineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,14 @@ public void testExt() {
.isEqualTo( "ev" );
}

@Test
public void testDefaultExt() {
var c = new TestTemplateClass();
c.ext3.a = "123";
assertThat( engine.getTemplate( testMethodName, new TypeRef<TestTemplateClass>() {}, "${ext2.a|ext3.a}", STRING, null ).render( c ).get() )
.isEqualTo( "123" );
}

@Test
public void testConcatenation() {
var c = new TestTemplateClass();
Expand Down
1 change: 1 addition & 0 deletions oap-formats/oap-template/src/test/java/oap/template/TestTemplateClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public class TestTemplateClass {
@Nullable
public Ext ext;
public ITestTemplateClassExt ext2;
public TestTemplateClassExt ext3 = new TestTemplateClassExt();
@Nullable
public List<Integer> list;
@Nullable
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
</distributionManagement>

<properties>
<oap.project.version>22.4.14</oap.project.version>
<oap.project.version>22.4.15</oap.project.version>

<oap.deps.config.version>21.0.0</oap.deps.config.version>
<oap.deps.oap-teamcity.version>21.0.1</oap.deps.oap-teamcity.version>
Expand Down
Loading