@@ -1399,6 +1399,31 @@ public void optimize_groupField_throwsUnsupportedOperationException(
13991399 assertThat (e ).hasMessageThat ().contains ("Optimization of Group fields is unsupported" );
14001400 }
14011401
1402+ @ Test
1403+ public void optimize_jsonFieldNames_throwsUnsupportedOperationException (
1404+ @ TestParameter ({
1405+ "msg.singleInt64" ,
1406+ "has(msg.singleInt64)" ,
1407+ "msg.?singleInt64" ,
1408+ "msg.singleNestedMessage.bb"
1409+ })
1410+ String expression )
1411+ throws Exception {
1412+ Cel jsonCel =
1413+ cel .toCelBuilder ()
1414+ .setOptions (CEL_OPTIONS .toBuilder ().enableJsonFieldNames (true ).build ())
1415+ .build ();
1416+ CelAbstractSyntaxTree ast = jsonCel .compile (expression ).getAst ();
1417+ SelectOptimizer optimizer = SelectOptimizer .newInstance ();
1418+
1419+ UnsupportedOperationException e =
1420+ assertThrows (UnsupportedOperationException .class , () -> optimizer .optimize (ast , jsonCel ));
1421+
1422+ assertThat (e )
1423+ .hasMessageThat ()
1424+ .isEqualTo ("Optimization of json_name field selection is unsupported." );
1425+ }
1426+
14021427 @ Test
14031428 public void newInstance_fileDescriptorsVarargs_defaultOptions_success () throws Exception {
14041429 FileDescriptor fd = PROTO2_TEST_ALL_TYPES_DESCRIPTOR .getFile ();
@@ -2093,6 +2118,30 @@ public void optimize_afterConstantFolding_preservesMacroCalls() throws Exception
20932118 + " [2, \" single_int64\" , 3]], -64) + 2)" );
20942119 }
20952120
2121+ @ Test
2122+ public void optimize_afterSubexpressionOptimizer_rewritesBlockAndBody () throws Exception {
2123+ CelOptimizer optimizer =
2124+ CelOptimizerFactory .standardCelOptimizerBuilder (cel )
2125+ .addAstOptimizers (
2126+ SubexpressionOptimizer .getInstance (),
2127+ SelectOptimizer .newInstance (
2128+ PROTO2_TEST_ALL_TYPES_DESCRIPTOR .getFile (),
2129+ NestedTestAllTypes .getDescriptor ().getFile ()))
2130+ .build ();
2131+ CelAbstractSyntaxTree ast =
2132+ cel .compile ("nested_msg.child.payload.single_int32 + nested_msg.child.payload.single_int64" )
2133+ .getAst ();
2134+
2135+ CelAbstractSyntaxTree optimizedAst = optimizer .optimize (ast );
2136+
2137+ assertThat (CEL_UNPARSER .unparse (optimizedAst ))
2138+ .isEqualTo (
2139+ "cel.@block([cel.@attribute(nested_msg, [[1, \" child\" , 11], [2, \" payload\" , 11]],"
2140+ + " cel.expr.conformance.proto2.TestAllTypes{})],"
2141+ + " cel.@attribute(@index0, [[1, \" single_int32\" , 5]], -32)"
2142+ + " + cel.@attribute(@index0, [[2, \" single_int64\" , 3]], -64))" );
2143+ }
2144+
20962145 private static CelOptimizer newSelectOptimizer (Cel cel ) {
20972146 return CelOptimizerFactory .standardCelOptimizerBuilder (cel )
20982147 .addAstOptimizers (
0 commit comments