Skip to content

Commit 2a8789f

Browse files
l46kokcopybara-github
l46kok
authored and
copybara-github
committed
Variable name cleanups from removing create modifier
PiperOrigin-RevId: 631214133
1 parent c30f417 commit 2a8789f

File tree

22 files changed

+221
-227
lines changed

22 files changed

+221
-227
lines changed

‎bundle/src/test/java/dev/cel/bundle/CelImplTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -486,9 +486,9 @@ public void compile_withOptionalTypes() throws Exception {
486486

487487
CelAbstractSyntaxTree ast = cel.compile("[?a]").getAst();
488488

489-
CelList createList = ast.getExpr().list();
490-
assertThat(createList.optionalIndices()).containsExactly(0);
491-
assertThat(createList.elements()).containsExactly(CelExpr.ofIdent(2, "a"));
489+
CelList list = ast.getExpr().list();
490+
assertThat(list.optionalIndices()).containsExactly(0);
491+
assertThat(list.elements()).containsExactly(CelExpr.ofIdent(2, "a"));
492492
}
493493

494494
@Test

‎checker/src/main/java/dev/cel/checker/ExprChecker.java

+20-22
Original file line numberDiff line numberDiff line change
@@ -355,10 +355,10 @@ private CelExpr visit(CelExpr expr, CelExpr.CelCall call) {
355355
}
356356

357357
@CheckReturnValue
358-
private CelExpr visit(CelExpr expr, CelExpr.CelStruct createStruct) {
358+
private CelExpr visit(CelExpr expr, CelExpr.CelStruct struct) {
359359
// Determine the type of the message.
360360
CelType messageType = SimpleType.ERROR;
361-
CelIdentDecl decl = env.lookupIdent(getPosition(expr), inContainer, createStruct.messageName());
361+
CelIdentDecl decl = env.lookupIdent(getPosition(expr), inContainer, struct.messageName());
362362
env.setRef(expr, CelReference.newBuilder().setName(decl.name()).build());
363363
CelType type = decl.type();
364364
if (type.kind() != CelKind.ERROR) {
@@ -383,7 +383,7 @@ private CelExpr visit(CelExpr expr, CelExpr.CelStruct createStruct) {
383383
}
384384

385385
// Check the field initializers.
386-
ImmutableList<CelExpr.CelStruct.Entry> entriesList = createStruct.entries();
386+
ImmutableList<CelExpr.CelStruct.Entry> entriesList = struct.entries();
387387
for (int i = 0; i < entriesList.size(); i++) {
388388
CelExpr.CelStruct.Entry entry = entriesList.get(i);
389389
CelExpr visitedValueExpr = visit(entry.value());
@@ -414,10 +414,10 @@ private CelExpr visit(CelExpr expr, CelExpr.CelStruct createStruct) {
414414
}
415415

416416
@CheckReturnValue
417-
private CelExpr visit(CelExpr expr, CelExpr.CelMap createMap) {
417+
private CelExpr visit(CelExpr expr, CelExpr.CelMap map) {
418418
CelType mapKeyType = null;
419419
CelType mapValueType = null;
420-
ImmutableList<CelExpr.CelMap.Entry> entriesList = createMap.entries();
420+
ImmutableList<CelExpr.CelMap.Entry> entriesList = map.entries();
421421
for (int i = 0; i < entriesList.size(); i++) {
422422
CelExpr.CelMap.Entry entry = entriesList.get(i);
423423
CelExpr visitedMapKeyExpr = visit(entry.key());
@@ -455,10 +455,10 @@ private CelExpr visit(CelExpr expr, CelExpr.CelMap createMap) {
455455
}
456456

457457
@CheckReturnValue
458-
private CelExpr visit(CelExpr expr, CelExpr.CelList createList) {
458+
private CelExpr visit(CelExpr expr, CelExpr.CelList list) {
459459
CelType elemsType = null;
460-
ImmutableList<CelExpr> elementsList = createList.elements();
461-
HashSet<Integer> optionalIndices = new HashSet<>(createList.optionalIndices());
460+
ImmutableList<CelExpr> elementsList = list.elements();
461+
HashSet<Integer> optionalIndices = new HashSet<>(list.optionalIndices());
462462
for (int i = 0; i < elementsList.size(); i++) {
463463
CelExpr visitedElem = visit(elementsList.get(i));
464464
if (namespacedDeclarations && !visitedElem.equals(elementsList.get(i))) {
@@ -853,27 +853,25 @@ private static CelExpr replaceListElementSubtree(CelExpr expr, CelExpr element,
853853
}
854854

855855
private static CelExpr replaceStructEntryValueSubtree(CelExpr expr, CelExpr newValue, int index) {
856-
CelExpr.CelStruct createStruct = expr.struct();
856+
CelExpr.CelStruct struct = expr.struct();
857857
CelExpr.CelStruct.Entry newEntry =
858-
createStruct.entries().get(index).toBuilder().setValue(newValue).build();
859-
createStruct = createStruct.toBuilder().setEntry(index, newEntry).build();
860-
return expr.toBuilder().setStruct(createStruct).build();
858+
struct.entries().get(index).toBuilder().setValue(newValue).build();
859+
struct = struct.toBuilder().setEntry(index, newEntry).build();
860+
return expr.toBuilder().setStruct(struct).build();
861861
}
862862

863863
private static CelExpr replaceMapEntryKeySubtree(CelExpr expr, CelExpr newKey, int index) {
864-
CelExpr.CelMap createMap = expr.map();
865-
CelExpr.CelMap.Entry newEntry =
866-
createMap.entries().get(index).toBuilder().setKey(newKey).build();
867-
createMap = createMap.toBuilder().setEntry(index, newEntry).build();
868-
return expr.toBuilder().setMap(createMap).build();
864+
CelExpr.CelMap map = expr.map();
865+
CelExpr.CelMap.Entry newEntry = map.entries().get(index).toBuilder().setKey(newKey).build();
866+
map = map.toBuilder().setEntry(index, newEntry).build();
867+
return expr.toBuilder().setMap(map).build();
869868
}
870869

871870
private static CelExpr replaceMapEntryValueSubtree(CelExpr expr, CelExpr newValue, int index) {
872-
CelExpr.CelMap createMap = expr.map();
873-
CelExpr.CelMap.Entry newEntry =
874-
createMap.entries().get(index).toBuilder().setValue(newValue).build();
875-
createMap = createMap.toBuilder().setEntry(index, newEntry).build();
876-
return expr.toBuilder().setMap(createMap).build();
871+
CelExpr.CelMap map = expr.map();
872+
CelExpr.CelMap.Entry newEntry = map.entries().get(index).toBuilder().setValue(newValue).build();
873+
map = map.toBuilder().setEntry(index, newEntry).build();
874+
return expr.toBuilder().setMap(map).build();
877875
}
878876

879877
private static CelExpr replaceComprehensionAccuInitSubtree(CelExpr expr, CelExpr newAccuInit) {

‎common/src/main/java/dev/cel/common/ast/CelExpr.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public CelStruct struct() {
112112
/**
113113
* {@inheritDoc}
114114
*
115-
* @throws UnsupportedOperationException if expression is not {@link Kind#createMap}.
115+
* @throws UnsupportedOperationException if expression is not {@link Kind#MAP}.
116116
*/
117117
@Override
118118
public CelMap map() {

‎common/src/main/java/dev/cel/common/ast/CelExprConverter.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ public static Expr fromCelExpr(CelExpr celExpr) {
6969
celCall.target().ifPresent(target -> callBuilder.setTarget(fromCelExpr(target)));
7070
return expr.setCallExpr(callBuilder).build();
7171
case LIST:
72-
CelExpr.CelList celCreateList = celExprKind.list();
72+
CelExpr.CelList celList = celExprKind.list();
7373
return expr.setListExpr(
7474
CreateList.newBuilder()
75-
.addAllElements(fromCelExprList(celCreateList.elements()))
76-
.addAllOptionalIndices(celCreateList.optionalIndices()))
75+
.addAllElements(fromCelExprList(celList.elements()))
76+
.addAllOptionalIndices(celList.optionalIndices()))
7777
.build();
7878
case STRUCT:
7979
return expr.setStructExpr(celStructToExprStruct(celExprKind.struct())).build();
@@ -270,9 +270,9 @@ public static Constant celConstantToExprConstant(CelConstant celConstant) {
270270
throw new IllegalStateException("unsupported constant case: " + celConstant.getKind());
271271
}
272272

273-
private static CreateStruct celStructToExprStruct(CelExpr.CelStruct celCreateStruct) {
273+
private static CreateStruct celStructToExprStruct(CelExpr.CelStruct celStruct) {
274274
ImmutableList.Builder<CreateStruct.Entry> entries = ImmutableList.builder();
275-
for (CelExpr.CelStruct.Entry celStructExprEntry : celCreateStruct.entries()) {
275+
for (CelExpr.CelStruct.Entry celStructExprEntry : celStruct.entries()) {
276276
entries.add(
277277
CreateStruct.Entry.newBuilder()
278278
.setId(celStructExprEntry.id())
@@ -283,14 +283,14 @@ private static CreateStruct celStructToExprStruct(CelExpr.CelStruct celCreateStr
283283
}
284284

285285
return CreateStruct.newBuilder()
286-
.setMessageName(celCreateStruct.messageName())
286+
.setMessageName(celStruct.messageName())
287287
.addAllEntries(entries.build())
288288
.build();
289289
}
290290

291-
private static CreateStruct celMapToExprStruct(CelExpr.CelMap celCreateMap) {
291+
private static CreateStruct celMapToExprStruct(CelExpr.CelMap celMap) {
292292
ImmutableList.Builder<CreateStruct.Entry> entries = ImmutableList.builder();
293-
for (CelExpr.CelMap.Entry celMapEntry : celCreateMap.entries()) {
293+
for (CelExpr.CelMap.Entry celMapEntry : celMap.entries()) {
294294
CreateStruct.Entry exprMapEntry =
295295
CreateStruct.Entry.newBuilder()
296296
.setId(celMapEntry.id())

‎common/src/main/java/dev/cel/common/ast/CelExprFormatter.java

+13-13
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ private void formatExpr(CelExpr celExpr) {
5252
appendCall(celExpr.call());
5353
break;
5454
case LIST:
55-
appendCreateList(celExpr.list());
55+
appendList(celExpr.list());
5656
break;
5757
case STRUCT:
58-
appendCreateStruct(celExpr.struct());
58+
appendStruct(celExpr.struct());
5959
break;
6060
case MAP:
61-
appendCreateMap(celExpr.map());
61+
appendMap(celExpr.map());
6262
break;
6363
case COMPREHENSION:
6464
appendComprehension(celExpr.comprehension());
@@ -152,23 +152,23 @@ private void appendCall(CelExpr.CelCall celCall) {
152152
outdent();
153153
}
154154

155-
private void appendCreateList(CelExpr.CelList celCreateList) {
155+
private void appendList(CelExpr.CelList celList) {
156156
indent();
157157
append("elements: {");
158158
indent();
159-
for (CelExpr expr : celCreateList.elements()) {
159+
for (CelExpr expr : celList.elements()) {
160160
appendNewline();
161161
formatExpr(expr);
162162
}
163163
outdent();
164164
appendNewline();
165165
append("}");
166-
if (!celCreateList.optionalIndices().isEmpty()) {
166+
if (!celList.optionalIndices().isEmpty()) {
167167
appendNewline();
168168
append("optional_indices: [");
169-
for (int i = 0; i < celCreateList.optionalIndices().size(); i++) {
169+
for (int i = 0; i < celList.optionalIndices().size(); i++) {
170170
appendWithoutIndent(String.valueOf(i));
171-
if (i != celCreateList.optionalIndices().size() - 1) {
171+
if (i != celList.optionalIndices().size() - 1) {
172172
appendWithoutIndent(", ");
173173
}
174174
}
@@ -177,12 +177,12 @@ private void appendCreateList(CelExpr.CelList celCreateList) {
177177
outdent();
178178
}
179179

180-
private void appendCreateStruct(CelExpr.CelStruct celCreateStruct) {
180+
private void appendStruct(CelExpr.CelStruct celStruct) {
181181
indent();
182-
appendWithNewline("name: " + celCreateStruct.messageName());
182+
appendWithNewline("name: " + celStruct.messageName());
183183
append("entries: {");
184184
indent();
185-
for (CelExpr.CelStruct.Entry entry : celCreateStruct.entries()) {
185+
for (CelExpr.CelStruct.Entry entry : celStruct.entries()) {
186186
appendNewline();
187187
appendWithNewline(String.format("ENTRY [%d] {", entry.id()));
188188
indent();
@@ -205,10 +205,10 @@ private void appendCreateStruct(CelExpr.CelStruct celCreateStruct) {
205205
outdent();
206206
}
207207

208-
private void appendCreateMap(CelExpr.CelMap celCreateMap) {
208+
private void appendMap(CelExpr.CelMap celMap) {
209209
indent();
210210
boolean firstLine = true;
211-
for (CelExpr.CelMap.Entry entry : celCreateMap.entries()) {
211+
for (CelExpr.CelMap.Entry entry : celMap.entries()) {
212212
if (!firstLine) {
213213
appendNewline();
214214
} else {

‎common/src/main/java/dev/cel/common/ast/CelExprV1Alpha1Converter.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ public static Expr fromCelExpr(CelExpr celExpr) {
6969
celCall.target().ifPresent(target -> callBuilder.setTarget(fromCelExpr(target)));
7070
return expr.setCallExpr(callBuilder).build();
7171
case LIST:
72-
CelExpr.CelList celCreateList = celExprKind.list();
72+
CelExpr.CelList celList = celExprKind.list();
7373
return expr.setListExpr(
7474
CreateList.newBuilder()
75-
.addAllElements(fromCelExprList(celCreateList.elements()))
76-
.addAllOptionalIndices(celCreateList.optionalIndices()))
75+
.addAllElements(fromCelExprList(celList.elements()))
76+
.addAllOptionalIndices(celList.optionalIndices()))
7777
.build();
7878
case STRUCT:
7979
return expr.setStructExpr(celStructToExprStruct(celExprKind.struct())).build();
@@ -270,9 +270,9 @@ public static Constant celConstantToExprConstant(CelConstant celConstant) {
270270
throw new IllegalStateException("unsupported constant case: " + celConstant.getKind());
271271
}
272272

273-
private static CreateStruct celStructToExprStruct(CelExpr.CelStruct celCreateStruct) {
273+
private static CreateStruct celStructToExprStruct(CelExpr.CelStruct celStruct) {
274274
ImmutableList.Builder<CreateStruct.Entry> entries = ImmutableList.builder();
275-
for (CelExpr.CelStruct.Entry celStructExprEntry : celCreateStruct.entries()) {
275+
for (CelExpr.CelStruct.Entry celStructExprEntry : celStruct.entries()) {
276276
entries.add(
277277
CreateStruct.Entry.newBuilder()
278278
.setId(celStructExprEntry.id())
@@ -283,14 +283,14 @@ private static CreateStruct celStructToExprStruct(CelExpr.CelStruct celCreateStr
283283
}
284284

285285
return Expr.CreateStruct.newBuilder()
286-
.setMessageName(celCreateStruct.messageName())
286+
.setMessageName(celStruct.messageName())
287287
.addAllEntries(entries.build())
288288
.build();
289289
}
290290

291-
private static CreateStruct celMapToExprStruct(CelExpr.CelMap celCreateMap) {
291+
private static CreateStruct celMapToExprStruct(CelExpr.CelMap celMap) {
292292
ImmutableList.Builder<CreateStruct.Entry> entries = ImmutableList.builder();
293-
for (CelExpr.CelMap.Entry celMapEntry : celCreateMap.entries()) {
293+
for (CelExpr.CelMap.Entry celMapEntry : celMap.entries()) {
294294
CreateStruct.Entry exprMapEntry =
295295
CreateStruct.Entry.newBuilder()
296296
.setId(celMapEntry.id())

‎common/src/main/java/dev/cel/common/ast/CelExprVisitor.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -108,23 +108,23 @@ protected void visit(CelExpr expr, CelCall call) {
108108
}
109109

110110
/** Visit a {@code CelStruct} expression. */
111-
protected void visit(CelExpr expr, CelStruct createStruct) {
112-
for (CelStruct.Entry entry : createStruct.entries()) {
111+
protected void visit(CelExpr expr, CelStruct struct) {
112+
for (CelStruct.Entry entry : struct.entries()) {
113113
visit(entry.value());
114114
}
115115
}
116116

117117
/** Visit a {@code CelMap} expression. */
118-
protected void visit(CelExpr expr, CelMap createMap) {
119-
for (CelMap.Entry entry : createMap.entries()) {
118+
protected void visit(CelExpr expr, CelMap map) {
119+
for (CelMap.Entry entry : map.entries()) {
120120
visit(entry.key());
121121
visit(entry.value());
122122
}
123123
}
124124

125125
/** Visit a {@code CelList} expression. */
126-
protected void visit(CelExpr expr, CelList createList) {
127-
for (CelExpr elem : createList.elements()) {
126+
protected void visit(CelExpr expr, CelList list) {
127+
for (CelExpr elem : list.elements()) {
128128
visit(elem);
129129
}
130130
}

‎common/src/main/java/dev/cel/common/ast/CelMutableExpr.java

+18-18
Original file line numberDiff line numberDiff line change
@@ -973,28 +973,28 @@ public static CelMutableExpr ofCall(long id, CelMutableCall mutableCall) {
973973
return new CelMutableExpr(id, mutableCall);
974974
}
975975

976-
public static CelMutableExpr ofList(CelMutableList mutableCreateList) {
977-
return ofList(0, mutableCreateList);
976+
public static CelMutableExpr ofList(CelMutableList mutableList) {
977+
return ofList(0, mutableList);
978978
}
979979

980-
public static CelMutableExpr ofList(long id, CelMutableList mutableCreateList) {
981-
return new CelMutableExpr(id, mutableCreateList);
980+
public static CelMutableExpr ofList(long id, CelMutableList mutableList) {
981+
return new CelMutableExpr(id, mutableList);
982982
}
983983

984-
public static CelMutableExpr ofStruct(CelMutableStruct mutableCreateStruct) {
985-
return ofStruct(0, mutableCreateStruct);
984+
public static CelMutableExpr ofStruct(CelMutableStruct mutableStruct) {
985+
return ofStruct(0, mutableStruct);
986986
}
987987

988-
public static CelMutableExpr ofStruct(long id, CelMutableStruct mutableCreateStruct) {
989-
return new CelMutableExpr(id, mutableCreateStruct);
988+
public static CelMutableExpr ofStruct(long id, CelMutableStruct mutableStruct) {
989+
return new CelMutableExpr(id, mutableStruct);
990990
}
991991

992-
public static CelMutableExpr ofMap(CelMutableMap mutableCreateMap) {
993-
return ofMap(0, mutableCreateMap);
992+
public static CelMutableExpr ofMap(CelMutableMap mutableMap) {
993+
return ofMap(0, mutableMap);
994994
}
995995

996-
public static CelMutableExpr ofMap(long id, CelMutableMap mutableCreateMap) {
997-
return new CelMutableExpr(id, mutableCreateMap);
996+
public static CelMutableExpr ofMap(long id, CelMutableMap mutableMap) {
997+
return new CelMutableExpr(id, mutableMap);
998998
}
999999

10001000
public static CelMutableExpr ofComprehension(
@@ -1027,19 +1027,19 @@ private CelMutableExpr(long id, CelMutableCall mutableCall) {
10271027
setCall(mutableCall);
10281028
}
10291029

1030-
private CelMutableExpr(long id, CelMutableList mutableCreateList) {
1030+
private CelMutableExpr(long id, CelMutableList mutableList) {
10311031
this.id = id;
1032-
setList(mutableCreateList);
1032+
setList(mutableList);
10331033
}
10341034

1035-
private CelMutableExpr(long id, CelMutableStruct mutableCreateStruct) {
1035+
private CelMutableExpr(long id, CelMutableStruct mutableStruct) {
10361036
this.id = id;
1037-
setStruct(mutableCreateStruct);
1037+
setStruct(mutableStruct);
10381038
}
10391039

1040-
private CelMutableExpr(long id, CelMutableMap mutableCreateMap) {
1040+
private CelMutableExpr(long id, CelMutableMap mutableMap) {
10411041
this.id = id;
1042-
setMap(mutableCreateMap);
1042+
setMap(mutableMap);
10431043
}
10441044

10451045
private CelMutableExpr(long id, CelMutableComprehension mutableComprehension) {

0 commit comments

Comments
 (0)