Skip to content

Commit dd2b91a

Browse files
committed
Checkstyle: naming: LocalVariableName
1 parent 6599fe5 commit dd2b91a

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

src/main/java/org/biscuitsec/biscuit/datalog/expressions/Op.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -535,11 +535,11 @@ public void evaluate(Deque<Term> stack, Map<Long, Term> variables, TemporarySymb
535535
case Intersection:
536536
if (right instanceof Term.Set && left instanceof Term.Set) {
537537
HashSet<Term> intersec = new HashSet<Term>();
538-
HashSet<Term> sRight = ((Term.Set) right).value();
539-
HashSet<Term> sLeft = ((Term.Set) left).value();
540-
for (Term lId : sRight) {
541-
if (sLeft.contains(lId)) {
542-
intersec.add(lId);
538+
HashSet<Term> setRight = ((Term.Set) right).value();
539+
HashSet<Term> setLeft = ((Term.Set) left).value();
540+
for (Term locId : setRight) {
541+
if (setLeft.contains(locId)) {
542+
intersec.add(locId);
543543
}
544544
}
545545
stack.push(new Term.Set(intersec));
@@ -548,10 +548,10 @@ public void evaluate(Deque<Term> stack, Map<Long, Term> variables, TemporarySymb
548548
case Union:
549549
if (right instanceof Term.Set && left instanceof Term.Set) {
550550
HashSet<Term> union = new HashSet<Term>();
551-
HashSet<Term> sRight = ((Term.Set) right).value();
552-
HashSet<Term> sLeft = ((Term.Set) left).value();
553-
union.addAll(sRight);
554-
union.addAll(sLeft);
551+
HashSet<Term> setRight = ((Term.Set) right).value();
552+
HashSet<Term> setLeft = ((Term.Set) left).value();
553+
union.addAll(setRight);
554+
union.addAll(setLeft);
555555
stack.push(new Term.Set(union));
556556
}
557557
break;

src/main/java/org/biscuitsec/biscuit/token/Authorizer.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,11 @@ public void updateOnToken() throws Error.FailedLogic {
139139
world.addFact(new Origin(0), convertedFact);
140140
}
141141
for (org.biscuitsec.biscuit.datalog.Rule rule : token.authority.rules()) {
142-
org.biscuitsec.biscuit.token.builder.Rule lRule =
142+
org.biscuitsec.biscuit.token.builder.Rule locRule =
143143
org.biscuitsec.biscuit.token.builder.Rule.convertFrom(rule, token.symbols);
144-
org.biscuitsec.biscuit.datalog.Rule convertedRule = lRule.convert(this.symbols);
144+
org.biscuitsec.biscuit.datalog.Rule convertedRule = locRule.convert(this.symbols);
145145

146-
Either<String, org.biscuitsec.biscuit.token.builder.Rule> res = lRule.validateVariables();
146+
Either<String, org.biscuitsec.biscuit.token.builder.Rule> res = locRule.validateVariables();
147147
if (res.isLeft()) {
148148
throw new Error.FailedLogic(
149149
new LogicError.InvalidBlockRule(0, token.symbols.formatRule(convertedRule)));
@@ -174,11 +174,11 @@ public void updateOnToken() throws Error.FailedLogic {
174174
}
175175

176176
for (org.biscuitsec.biscuit.datalog.Rule rule : block.rules()) {
177-
org.biscuitsec.biscuit.token.builder.Rule sRule =
177+
org.biscuitsec.biscuit.token.builder.Rule symRole =
178178
org.biscuitsec.biscuit.token.builder.Rule.convertFrom(rule, blockSymbols);
179-
org.biscuitsec.biscuit.datalog.Rule convertedRule = sRule.convert(this.symbols);
179+
org.biscuitsec.biscuit.datalog.Rule convertedRule = symRole.convert(this.symbols);
180180

181-
Either<String, org.biscuitsec.biscuit.token.builder.Rule> res = sRule.validateVariables();
181+
Either<String, org.biscuitsec.biscuit.token.builder.Rule> res = symRole.validateVariables();
182182
if (res.isLeft()) {
183183
throw new Error.FailedLogic(
184184
new LogicError.InvalidBlockRule(0, this.symbols.formatRule(convertedRule)));

src/main/java/org/biscuitsec/biscuit/token/builder/Fact.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ public Fact set(String name, Term term) throws Error.Language {
5858
if (this.variables.isEmpty()) {
5959
throw new Error.Language(new FailedCheck.LanguageError.UnknownVariable(name));
6060
}
61-
Map<String, Option<Term>> lVariables = this.variables.get();
62-
Option<Term> r = lVariables.get(name);
61+
Map<String, Option<Term>> localVariables = this.variables.get();
62+
Option<Term> r = localVariables.get(name);
6363
if (r != null) {
64-
lVariables.put(name, Option.some(term));
64+
localVariables.put(name, Option.some(term));
6565
} else {
6666
throw new Error.Language(new FailedCheck.LanguageError.UnknownVariable(name));
6767
}

0 commit comments

Comments
 (0)