Skip to content

Commit 83f027f

Browse files
authored
Code style and Java language level adoptions (#982)
* Replace `Arrays.asList()` with single element with `List.of()` * enhanced switch expression * pattern variable * Use String.repeat() * Use `.isEmpty()` * Remove unused `ParseError` * Remove unused function in TypeErrors * Remove duplicate `if`
1 parent 52186d0 commit 83f027f

44 files changed

Lines changed: 530 additions & 926 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎conformance/src/test/java/org/projectnessie/cel/conformance/SimpleConformanceTest.java‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -619,16 +619,12 @@ private static Val exprValueToRefValue(TypeAdapter adapter, dev.cel.expr.ExprVal
619619
}
620620

621621
private static Val exprValueToRefValue(TypeAdapter adapter, ExprValue ev) {
622-
switch (ev.getKindCase()) {
623-
case VALUE:
624-
return valueToRefValue(adapter, ev.getValue());
625-
case ERROR:
626-
return newErr("XXX add details later");
627-
case UNKNOWN:
628-
return unknownOf(ev.getUnknown().getExprs(0));
629-
default:
630-
throw new IllegalArgumentException("unknown ExprValue kind " + ev.getKindCase());
631-
}
622+
return switch (ev.getKindCase()) {
623+
case VALUE -> valueToRefValue(adapter, ev.getValue());
624+
case ERROR -> newErr("XXX add details later");
625+
case UNKNOWN -> unknownOf(ev.getUnknown().getExprs(0));
626+
default -> throw new IllegalArgumentException("unknown ExprValue kind " + ev.getKindCase());
627+
};
632628
}
633629

634630
private static Val valueToRefValue(TypeAdapter adapter, Value v) {

‎core/src/jmh/java/org/projectnessie/cel/CompileBuildBench.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@ public static class CompileState {
5151
public String expression;
5252

5353
String source() {
54-
switch (expression) {
55-
case "simplePredicate":
56-
return "resource == 'projects/p1' && user == 'alice'";
57-
case "deepSelectors":
58-
return "request.auth.claims.email.endsWith('@example.com')"
59-
+ " && request.resource.labels['env'] == 'prod'";
60-
case "macroPipeline":
61-
return "items.filter(i, i.score > 10).map(i, i.name).exists(n, n.startsWith('a'))";
62-
default:
63-
throw new IllegalArgumentException("Unknown compile benchmark expression: " + expression);
64-
}
54+
return switch (expression) {
55+
case "simplePredicate" -> "resource == 'projects/p1' && user == 'alice'";
56+
case "deepSelectors" ->
57+
"request.auth.claims.email.endsWith('@example.com')"
58+
+ " && request.resource.labels['env'] == 'prod'";
59+
case "macroPipeline" ->
60+
"items.filter(i, i.score > 10).map(i, i.name).exists(n, n.startsWith('a'))";
61+
default ->
62+
throw new IllegalArgumentException(
63+
"Unknown compile benchmark expression: " + expression);
64+
};
6565
}
6666
}
6767

‎core/src/jmh/java/org/projectnessie/cel/common/types/AdapterAllocationBench.java‎

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -87,30 +87,19 @@ public void nativeToValue(NativeValueState state, Blackhole blackhole) {
8787
}
8888

8989
private static Object value(String kind, int size) {
90-
switch (kind) {
91-
case "arrayList":
92-
return list(size);
93-
case "linkedHashSet":
94-
return set(size);
95-
case "objectArray":
96-
return list(size).toArray();
97-
case "stringArray":
98-
return stringArray(size);
99-
case "intArray":
100-
return intArray(size);
101-
case "longArray":
102-
return longArray(size);
103-
case "doubleArray":
104-
return doubleArray(size);
105-
case "mapStringInt":
106-
return mapStringInt(size);
107-
case "mapValVal":
108-
return mapValVal(size);
109-
case "listValue":
110-
return listValue(size);
111-
default:
112-
throw new IllegalArgumentException("Unknown native value kind: " + kind);
113-
}
90+
return switch (kind) {
91+
case "arrayList" -> list(size);
92+
case "linkedHashSet" -> set(size);
93+
case "objectArray" -> list(size).toArray();
94+
case "stringArray" -> stringArray(size);
95+
case "intArray" -> intArray(size);
96+
case "longArray" -> longArray(size);
97+
case "doubleArray" -> doubleArray(size);
98+
case "mapStringInt" -> mapStringInt(size);
99+
case "mapValVal" -> mapValVal(size);
100+
case "listValue" -> listValue(size);
101+
default -> throw new IllegalArgumentException("Unknown native value kind: " + kind);
102+
};
114103
}
115104

116105
private static List<Long> list(int size) {

‎core/src/main/java/org/projectnessie/cel/Env.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,8 @@ public Env extend(List<EnvOption> opts) {
281281
// be immutable. Since it is possible to set the TypeProvider separately
282282
// from the TypeAdapter, the possible configurations which could use a
283283
// TypeRegistry as the base implementation are captured below.
284-
if (this.adapter instanceof TypeRegistry && this.provider instanceof TypeRegistry) {
285-
TypeRegistry adapterReg = (TypeRegistry) this.adapter;
286-
TypeRegistry providerReg = (TypeRegistry) this.provider;
284+
if (this.adapter instanceof TypeRegistry adapterReg
285+
&& this.provider instanceof TypeRegistry providerReg) {
287286
TypeRegistry reg = providerReg.copy();
288287
provider = reg;
289288
// If the adapter and provider are the same object, set the adapter

‎core/src/main/java/org/projectnessie/cel/EnvOption.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,11 @@ static EnvOption abbrevs(String... qualifiedNames) {
229229
*/
230230
static EnvOption types(List<Object> addTypes) {
231231
return e -> {
232-
if (!(e.provider instanceof TypeRegistry)) {
232+
if (!(e.provider instanceof TypeRegistry reg)) {
233233
throw new RuntimeException(
234234
String.format(
235235
"custom types not supported by provider: %s", e.provider.getClass().getName()));
236236
}
237-
TypeRegistry reg = (TypeRegistry) e.provider;
238237
for (Object t : addTypes) {
239238
reg.register(t);
240239
}

‎core/src/main/java/org/projectnessie/cel/checker/Printer.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@ static final class SemanticAdorner implements Adorner {
3535

3636
@Override
3737
public String getMetadata(Object elem) {
38-
if (!(elem instanceof Expr)) {
38+
if (!(elem instanceof Expr e)) {
3939
return "";
4040
}
4141
StringBuilder result = new StringBuilder();
42-
Expr e = (Expr) elem;
4342
Type t = checks.getTypeMapMap().get(e.getId());
4443
if (t != null) {
4544
result.append("~");

‎core/src/main/java/org/projectnessie/cel/checker/TypeErrors.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,6 @@ void typeMismatch(Location l, Type expected, Type actual) {
117117
formatCheckedType(actual));
118118
}
119119

120-
public void unknownType(Location l, String info) {
121-
// reportError(l, "unknown type%s", info != null ? " for: " + info : "");
122-
}
123-
124120
static String formatFunction(Type resultType, List<Type> argTypes, boolean isInstance) {
125121
StringBuilder result = new StringBuilder();
126122
formatFunction(result, resultType, argTypes, isInstance);

‎core/src/main/java/org/projectnessie/cel/checker/Types.java‎

Lines changed: 56 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -62,22 +62,17 @@ public static String formatCheckedType(Type t) {
6262
case kindNull:
6363
return "null";
6464
case kindPrimitive:
65-
switch (t.getPrimitive()) {
66-
case UINT64:
67-
return "uint";
68-
case INT64:
69-
return "int";
70-
case BOOL:
71-
return "bool";
72-
case BYTES:
73-
return "bytes";
74-
case DOUBLE:
75-
return "double";
76-
case STRING:
77-
return "string";
78-
}
79-
// unrecognizes & not-specified - ignore above
80-
return t.getPrimitive().toString().toLowerCase(Locale.ROOT).trim();
65+
return switch (t.getPrimitive()) {
66+
case UINT64 -> "uint";
67+
case INT64 -> "int";
68+
case BOOL -> "bool";
69+
case BYTES -> "bytes";
70+
case DOUBLE -> "double";
71+
case STRING -> "string";
72+
default ->
73+
// unrecognizes & not-specified - ignore above
74+
t.getPrimitive().toString().toLowerCase(Locale.ROOT).trim();
75+
};
8176
case kindWellKnown:
8277
switch (t.getWellKnown()) {
8378
case ANY:
@@ -196,14 +191,11 @@ private static void formatCheckedTypePrimitive(StringBuilder sb, Type.PrimitiveT
196191
static boolean isDyn(Type t) {
197192
// Note: object type values that are well-known and map to a DYN value in practice
198193
// are sanitized prior to being added to the environment.
199-
switch (kindOf(t)) {
200-
case kindDyn:
201-
return true;
202-
case kindWellKnown:
203-
return t.getWellKnown() == WellKnownType.ANY;
204-
default:
205-
return false;
206-
}
194+
return switch (kindOf(t)) {
195+
case kindDyn -> true;
196+
case kindWellKnown -> t.getWellKnown() == WellKnownType.ANY;
197+
default -> false;
198+
};
207199
}
208200

209201
/** isDynOrError returns true if the input is either an Error, DYN, or well-known ANY message. */
@@ -356,28 +348,22 @@ static boolean internalIsAssignable(Mapping m, Type t1, Type t2) {
356348
}
357349

358350
// Test for when the types must agree.
359-
switch (kind1) {
351+
return switch (kind1) {
360352
// ERROR, TYPE_PARAM, and DYN handled above.
361-
case kindAbstract:
362-
return internalIsAssignableAbstractType(m, t1.getAbstractType(), t2.getAbstractType());
363-
case kindFunction:
364-
return internalIsAssignableFunction(m, t1.getFunction(), t2.getFunction());
365-
case kindList:
366-
return internalIsAssignable(
367-
m, t1.getListType().getElemType(), t2.getListType().getElemType());
368-
case kindMap:
369-
return internalIsAssignableMap(m, t1.getMapType(), t2.getMapType());
370-
case kindObject:
371-
return t1.getMessageType().equals(t2.getMessageType());
372-
case kindType:
373-
// A type is a type is a type, any additional parameterization of the
374-
// type cannot affect method resolution or assignability.
375-
return true;
376-
case kindWellKnown:
377-
return t1.getWellKnown() == t2.getWellKnown();
378-
default:
379-
return false;
380-
}
353+
case kindAbstract ->
354+
internalIsAssignableAbstractType(m, t1.getAbstractType(), t2.getAbstractType());
355+
case kindFunction -> internalIsAssignableFunction(m, t1.getFunction(), t2.getFunction());
356+
case kindList ->
357+
internalIsAssignable(m, t1.getListType().getElemType(), t2.getListType().getElemType());
358+
case kindMap -> internalIsAssignableMap(m, t1.getMapType(), t2.getMapType());
359+
case kindObject -> t1.getMessageType().equals(t2.getMessageType());
360+
case kindType ->
361+
// A type is a type is a type, any additional parameterization of the
362+
// type cannot affect method resolution or assignability.
363+
true;
364+
case kindWellKnown -> t1.getWellKnown() == t2.getWellKnown();
365+
default -> false;
366+
};
381367
}
382368

383369
/**
@@ -429,31 +415,22 @@ static boolean internalIsAssignableMap(Mapping m, MapType m1, MapType m2) {
429415

430416
/** internalIsAssignableNull returns true if the type is nullable. */
431417
static boolean internalIsAssignableNull(Type t) {
432-
switch (kindOf(t)) {
433-
case kindAbstract:
434-
case kindObject:
435-
case kindNull:
436-
case kindWellKnown:
437-
case kindWrapper:
438-
return true;
439-
default:
440-
return false;
441-
}
418+
return switch (kindOf(t)) {
419+
case kindAbstract, kindObject, kindNull, kindWellKnown, kindWrapper -> true;
420+
default -> false;
421+
};
442422
}
443423

444424
/**
445425
* internalIsAssignablePrimitive returns true if the target type is the same or if it is a wrapper
446426
* for the primitive type.
447427
*/
448428
static boolean internalIsAssignablePrimitive(PrimitiveType p, Type target) {
449-
switch (kindOf(target)) {
450-
case kindPrimitive:
451-
return p == target.getPrimitive();
452-
case kindWrapper:
453-
return p == target.getWrapper();
454-
default:
455-
return false;
456-
}
429+
return switch (kindOf(target)) {
430+
case kindPrimitive -> p == target.getPrimitive();
431+
case kindWrapper -> p == target.getWrapper();
432+
default -> false;
433+
};
457434
}
458435

459436
/** isAssignable returns an updated type substitution mapping if t1 is assignable to t2. */
@@ -479,35 +456,22 @@ static Kind kindOf(Type t) {
479456
if (t == null || t.getTypeKindCase() == TypeKindCase.TYPEKIND_NOT_SET) {
480457
return Kind.kindUnknown;
481458
}
482-
switch (t.getTypeKindCase()) {
483-
case ERROR:
484-
return Kind.kindError;
485-
case FUNCTION:
486-
return Kind.kindFunction;
487-
case DYN:
488-
return Kind.kindDyn;
489-
case PRIMITIVE:
490-
return Kind.kindPrimitive;
491-
case WELL_KNOWN:
492-
return Kind.kindWellKnown;
493-
case WRAPPER:
494-
return Kind.kindWrapper;
495-
case NULL:
496-
return Kind.kindNull;
497-
case ABSTRACT_TYPE:
498-
return Kind.kindAbstract;
499-
case TYPE:
500-
return Kind.kindType;
501-
case LIST_TYPE:
502-
return Kind.kindList;
503-
case MAP_TYPE:
504-
return Kind.kindMap;
505-
case MESSAGE_TYPE:
506-
return Kind.kindObject;
507-
case TYPE_PARAM:
508-
return Kind.kindTypeParam;
509-
}
510-
return Kind.kindUnknown;
459+
return switch (t.getTypeKindCase()) {
460+
case ERROR -> Kind.kindError;
461+
case FUNCTION -> Kind.kindFunction;
462+
case DYN -> Kind.kindDyn;
463+
case PRIMITIVE -> Kind.kindPrimitive;
464+
case WELL_KNOWN -> Kind.kindWellKnown;
465+
case WRAPPER -> Kind.kindWrapper;
466+
case NULL -> Kind.kindNull;
467+
case ABSTRACT_TYPE -> Kind.kindAbstract;
468+
case TYPE -> Kind.kindType;
469+
case LIST_TYPE -> Kind.kindList;
470+
case MAP_TYPE -> Kind.kindMap;
471+
case MESSAGE_TYPE -> Kind.kindObject;
472+
case TYPE_PARAM -> Kind.kindTypeParam;
473+
default -> Kind.kindUnknown;
474+
};
511475
}
512476

513477
/** mostGeneral returns the more general of two types which are known to unify. */

‎core/src/main/java/org/projectnessie/cel/common/CELError.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,7 @@ public String toDisplayString(Source source) {
102102
// sophisticated way, maybe use jline's WCWidth, but that one is also quite rudimentary wrt
103103
// code-blocks (e.g. doesn't know about emojis).
104104
result.append("\n | ");
105-
for (int i = 0; i < location.column(); i++) {
106-
result.append(dot);
107-
}
105+
result.append(String.valueOf(dot).repeat(Math.max(0, location.column())));
108106
result.append(ind);
109107
}
110108
return result.toString();

‎core/src/main/java/org/projectnessie/cel/common/debug/Debug.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -363,9 +363,7 @@ void appendFormat(String f, Object... args) {
363363
void doIndent() {
364364
if (lineStart) {
365365
lineStart = false;
366-
for (int i = 0; i < indent; i++) {
367-
buffer.append(" ");
368-
}
366+
buffer.append(" ".repeat(Math.max(0, indent)));
369367
}
370368
}
371369

0 commit comments

Comments
 (0)