Skip to content

Commit 598cefb

Browse files
committed
capitalize
1 parent dfb6ae3 commit 598cefb

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorImplementer.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ private TypeName choseStateType() {
140140
if (false == initReturn.isPrimitive()) {
141141
return initReturn;
142142
}
143-
String simpleName = firstUpper(initReturn.toString());
143+
String simpleName = capitalize(initReturn.toString());
144144
if (warnExceptions.isEmpty()) {
145145
return ClassName.get("org.elasticsearch.compute.aggregation", simpleName + "State");
146146
}
@@ -193,7 +193,7 @@ static ClassName valueVectorType(ExecutableElement init, ExecutableElement combi
193193
};
194194
}
195195

196-
public static String firstUpper(String s) {
196+
public static String capitalize(String s) {
197197
return Character.toUpperCase(s.charAt(0)) + s.substring(1);
198198
}
199199

@@ -438,7 +438,7 @@ private MethodSpec addRawBlock(boolean masked) {
438438
String arrayType = valueTypeString();
439439
builder.addStatement("$L[] valuesArray = new $L[end - start]", arrayType, arrayType);
440440
builder.beginControlFlow("for (int i = start; i < end; i++)");
441-
builder.addStatement("valuesArray[i-start] = $L.get$L(i)", "block", firstUpper(arrayType));
441+
builder.addStatement("valuesArray[i-start] = $L.get$L(i)", "block", capitalize(arrayType));
442442
builder.endControlFlow();
443443
combineRawInputForArray(builder, "valuesArray");
444444
} else {
@@ -473,7 +473,7 @@ private void combineRawInputForPrimitive(TypeName returnType, MethodSpec.Builder
473473
declarationType,
474474
returnType,
475475
blockVariable,
476-
firstUpper(combine.getParameters().get(1).asType().toString())
476+
capitalize(combine.getParameters().get(1).asType().toString())
477477
);
478478
}
479479

@@ -486,7 +486,7 @@ private void combineRawInputForVoid(MethodSpec.Builder builder, String blockVari
486486
"$T.combine(state, $L.get$L(i))",
487487
declarationType,
488488
blockVariable,
489-
firstUpper(combine.getParameters().get(1).asType().toString())
489+
capitalize(combine.getParameters().get(1).asType().toString())
490490
);
491491
}
492492

x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/GroupingAggregatorImplementer.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import javax.lang.model.util.Elements;
3333

3434
import static java.util.stream.Collectors.joining;
35-
import static org.elasticsearch.compute.gen.AggregatorImplementer.firstUpper;
35+
import static org.elasticsearch.compute.gen.AggregatorImplementer.capitalize;
3636
import static org.elasticsearch.compute.gen.AggregatorImplementer.valueBlockType;
3737
import static org.elasticsearch.compute.gen.AggregatorImplementer.valueVectorType;
3838
import static org.elasticsearch.compute.gen.Methods.findMethod;
@@ -136,7 +136,7 @@ private TypeName choseStateType() {
136136
if (false == initReturn.isPrimitive()) {
137137
return initReturn;
138138
}
139-
String simpleName = firstUpper(initReturn.toString());
139+
String simpleName = capitalize(initReturn.toString());
140140
if (warnExceptions.isEmpty()) {
141141
return ClassName.get("org.elasticsearch.compute.aggregation", simpleName + "ArrayState");
142142
}
@@ -401,7 +401,7 @@ private MethodSpec addRawInputLoop(TypeName groupsType, TypeName valuesType) {
401401
String arrayType = valueTypeString();
402402
builder.addStatement("$L[] valuesArray = new $L[valuesEnd - valuesStart]", arrayType, arrayType);
403403
builder.beginControlFlow("for (int v = valuesStart; v < valuesEnd; v++)");
404-
builder.addStatement("valuesArray[v-valuesStart] = $L.get$L(v)", "values", firstUpper(arrayType));
404+
builder.addStatement("valuesArray[v-valuesStart] = $L.get$L(v)", "values", capitalize(arrayType));
405405
builder.endControlFlow();
406406
combineRawInputForArray(builder, "valuesArray");
407407
} else {
@@ -447,7 +447,7 @@ private void combineRawInputForPrimitive(MethodSpec.Builder builder, String bloc
447447
"state.set(groupId, $T.combine(state.getOrDefault(groupId), $L.get$L($L)))",
448448
declarationType,
449449
blockVariable,
450-
firstUpper(valueTypeName().toString()),
450+
capitalize(valueTypeName().toString()),
451451
offsetVariable
452452
);
453453
}
@@ -461,13 +461,13 @@ private void combineRawInputForVoid(MethodSpec.Builder builder, String blockVari
461461
"$T.combine(state, groupId, $L.get$L($L))",
462462
declarationType,
463463
blockVariable,
464-
firstUpper(valueTypeName().toString()),
464+
capitalize(valueTypeName().toString()),
465465
offsetVariable
466466
);
467467
}
468468

469469
private void combineRawInputWithTimestamp(MethodSpec.Builder builder, String offsetVariable) {
470-
String blockType = firstUpper(valueTypeName().toString());
470+
String blockType = capitalize(valueTypeName().toString());
471471
if (offsetVariable.contains(" + ")) {
472472
builder.addStatement("var valuePosition = $L", offsetVariable);
473473
offsetVariable = "valuePosition";

0 commit comments

Comments
 (0)