Skip to content

Commit ea4c64e

Browse files
committed
Polish ProfilesParser internals
1 parent de113f1 commit ea4c64e

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

spring-core/src/main/java/org/springframework/core/env/ProfilesParser.java

+7-8
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ private static Profiles parseTokens(String expression, StringTokenizer tokens, C
7171
}
7272
switch (token) {
7373
case "(" -> {
74-
Profiles contents = parseTokens(expression, tokens, Context.BRACKET);
75-
if (context == Context.INVERT) {
74+
Profiles contents = parseTokens(expression, tokens, Context.PARENTHESIS);
75+
if (context == Context.NEGATE) {
7676
return contents;
7777
}
7878
elements.add(contents);
@@ -85,10 +85,10 @@ private static Profiles parseTokens(String expression, StringTokenizer tokens, C
8585
assertWellFormed(expression, operator == null || operator == Operator.OR);
8686
operator = Operator.OR;
8787
}
88-
case "!" -> elements.add(not(parseTokens(expression, tokens, Context.INVERT)));
88+
case "!" -> elements.add(not(parseTokens(expression, tokens, Context.NEGATE)));
8989
case ")" -> {
9090
Profiles merged = merge(expression, elements, operator);
91-
if (context == Context.BRACKET) {
91+
if (context == Context.PARENTHESIS) {
9292
return merged;
9393
}
9494
elements.clear();
@@ -97,7 +97,7 @@ private static Profiles parseTokens(String expression, StringTokenizer tokens, C
9797
}
9898
default -> {
9999
Profiles value = equals(token);
100-
if (context == Context.INVERT) {
100+
if (context == Context.NEGATE) {
101101
return value;
102102
}
103103
elements.add(value);
@@ -141,10 +141,9 @@ private static Predicate<Profiles> isMatch(Predicate<String> activeProfile) {
141141
}
142142

143143

144-
private enum Operator {AND, OR}
144+
private enum Operator { AND, OR }
145145

146-
147-
private enum Context {NONE, INVERT, BRACKET}
146+
private enum Context { NONE, NEGATE, PARENTHESIS }
148147

149148

150149
private static class ParsedProfiles implements Profiles {

0 commit comments

Comments
 (0)