Reapply spotless

Author: preuss-adam

src/main/java/org/eclipse/biscuit/crypto/Ed25519KeyPair.java

@@ -6,13 +6,13 @@
 package org.eclipse.biscuit.crypto;
 
 import java.security.SecureRandom;
-import org.eclipse.biscuit.token.builder.Utils;
 import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
 import org.bouncycastle.crypto.generators.Ed25519KeyPairGenerator;
 import org.bouncycastle.crypto.params.Ed25519KeyGenerationParameters;
 import org.bouncycastle.crypto.params.Ed25519PrivateKeyParameters;
 import org.bouncycastle.crypto.params.Ed25519PublicKeyParameters;
 import org.bouncycastle.crypto.signers.Ed25519Signer;
+import org.eclipse.biscuit.token.builder.Utils;
 
 final class Ed25519KeyPair extends KeyPair {
   public static final int SIGNATURE_LENGTH = 64;

src/main/java/org/eclipse/biscuit/crypto/SECP256R1KeyPair.java

@@ -11,7 +11,6 @@
 import java.security.Security;
 import java.security.Signature;
 import java.security.SignatureException;
-import org.eclipse.biscuit.token.builder.Utils;
 import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey;
 import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey;
 import org.bouncycastle.jce.ECNamedCurveTable;
@@ -20,6 +19,7 @@
 import org.bouncycastle.jce.spec.ECPrivateKeySpec;
 import org.bouncycastle.jce.spec.ECPublicKeySpec;
 import org.bouncycastle.util.BigIntegers;
+import org.eclipse.biscuit.token.builder.Utils;
 
 @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
 final class SECP256R1KeyPair extends KeyPair {

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

@@ -37,10 +37,10 @@
 import org.eclipse.biscuit.error.LogicError;
 import org.eclipse.biscuit.token.builder.Check;
 import org.eclipse.biscuit.token.builder.Expression;
-import org.eclipse.biscuit.token.builder.Term;
-import org.eclipse.biscuit.token.builder.Utils;
 import org.eclipse.biscuit.token.builder.Fact;
 import org.eclipse.biscuit.token.builder.Rule;
+import org.eclipse.biscuit.token.builder.Term;
+import org.eclipse.biscuit.token.builder.Utils;
 import org.eclipse.biscuit.token.builder.parser.Parser;
 
 /** Token verification class */
@@ -142,13 +142,11 @@ public void updateOnToken() throws Error.FailedLogic {
 
       for (org.eclipse.biscuit.datalog.Fact fact : token.authority.getFacts()) {
         org.eclipse.biscuit.datalog.Fact convertedFact =
-            Fact.convertFrom(fact, token.symbolTable)
-                .convert(this.symbolTable);
+            Fact.convertFrom(fact, token.symbolTable).convert(this.symbolTable);
         world.addFact(new Origin(0), convertedFact);
       }
       for (org.eclipse.biscuit.datalog.Rule rule : token.authority.getRules()) {
-        Rule locRule =
-            Rule.convertFrom(rule, token.symbolTable);
+        Rule locRule = Rule.convertFrom(rule, token.symbolTable);
         org.eclipse.biscuit.datalog.Rule convertedRule = locRule.convert(this.symbolTable);
 
         Either<String, Rule> res = locRule.validateVariables();
@@ -176,18 +174,15 @@ public void updateOnToken() throws Error.FailedLogic {
 
         for (org.eclipse.biscuit.datalog.Fact fact : block.getFacts()) {
           org.eclipse.biscuit.datalog.Fact convertedFact =
-              Fact.convertFrom(fact, blockSymbolTable)
-                  .convert(this.symbolTable);
+              Fact.convertFrom(fact, blockSymbolTable).convert(this.symbolTable);
           world.addFact(new Origin(i + 1), convertedFact);
         }
 
         for (org.eclipse.biscuit.datalog.Rule rule : block.getRules()) {
-          Rule syRole =
-              Rule.convertFrom(rule, blockSymbolTable);
+          Rule syRole = Rule.convertFrom(rule, blockSymbolTable);
           org.eclipse.biscuit.datalog.Rule convertedRule = syRole.convert(this.symbolTable);
 
-          Either<String, Rule> res =
-              syRole.validateVariables();
+          Either<String, Rule> res = syRole.validateVariables();
           if (res.isLeft()) {
             throw new Error.FailedLogic(
                 new LogicError.InvalidBlockRule(0, this.symbolTable.formatRule(convertedRule)));
@@ -223,8 +218,7 @@ public Either<Map<Integer, List<Error>>, Authorizer> addDatalog(String s) {
         result = Parser.datalogComponents(s);
 
     if (result.isLeft()) {
-      Map<Integer, List<org.eclipse.biscuit.token.builder.parser.Error>> errors =
-          result.getLeft();
+      Map<Integer, List<org.eclipse.biscuit.token.builder.parser.Error>> errors = result.getLeft();
       Map<Integer, List<Error>> errorMap = new HashMap<>();
       for (Map.Entry<Integer, List<org.eclipse.biscuit.token.builder.parser.Error>> entry :
           errors.entrySet()) {
@@ -264,10 +258,8 @@ public Authorizer addFact(Fact fact) {
   }
 
   public Authorizer addFact(String s) throws Error.Parser {
-    Either<
-            org.eclipse.biscuit.token.builder.parser.Error,
-            Tuple2<String, Fact>>
-        res = Parser.fact(s);
+    Either<org.eclipse.biscuit.token.builder.parser.Error, Tuple2<String, Fact>> res =
+        Parser.fact(s);
 
     if (res.isLeft()) {
       throw new Error.Parser(res.getLeft());
@@ -288,10 +280,8 @@ public Authorizer addRule(Rule rule) {
   }
 
   public Authorizer addRule(String s) throws Error.Parser {
-    Either<
-            org.eclipse.biscuit.token.builder.parser.Error,
-            Tuple2<String, Rule>>
-        res = Parser.rule(s);
+    Either<org.eclipse.biscuit.token.builder.parser.Error, Tuple2<String, Rule>> res =
+        Parser.rule(s);
 
     if (res.isLeft()) {
       throw new Error.Parser(res.getLeft());
@@ -313,10 +303,8 @@ public Authorizer addCheck(Check check) {
   }
 
   public Authorizer addCheck(String s) throws Error.Parser {
-    Either<
-            org.eclipse.biscuit.token.builder.parser.Error,
-            Tuple2<String, Check>>
-        res = Parser.check(s);
+    Either<org.eclipse.biscuit.token.builder.parser.Error, Tuple2<String, Check>> res =
+        Parser.check(s);
 
     if (res.isLeft()) {
       throw new Error.Parser(res.getLeft());
@@ -410,16 +398,13 @@ public Authorizer addScope(Scope s) {
     return this;
   }
 
-  public Set<Fact> query(
-      Rule query) throws Error {
+  public Set<Fact> query(Rule query) throws Error {
     return this.query(query, new RunLimits());
   }
 
   public Set<Fact> query(String s) throws Error {
-    Either<
-            org.eclipse.biscuit.token.builder.parser.Error,
-            Tuple2<String, Rule>>
-        res = Parser.rule(s);
+    Either<org.eclipse.biscuit.token.builder.parser.Error, Tuple2<String, Rule>> res =
+        Parser.rule(s);
 
     if (res.isLeft()) {
       throw new Error.Parser(res.getLeft());
@@ -430,8 +415,7 @@ public Set<Fact> query(String s) throws Error {
     return query(t._2);
   }
 
-  public Set<Fact> query(
-          Rule query, RunLimits limits) throws Error {
+  public Set<Fact> query(Rule query, RunLimits limits) throws Error {
     world.run(limits, symbolTable);
 
     org.eclipse.biscuit.datalog.Rule rule = query.convert(symbolTable);
@@ -446,20 +430,17 @@ public Set<Fact> query(
     Set<Fact> s = new HashSet<>();
 
     for (Iterator<org.eclipse.biscuit.datalog.Fact> it = facts.stream().iterator();
-         it.hasNext(); ) {
+        it.hasNext(); ) {
       org.eclipse.biscuit.datalog.Fact f = it.next();
       s.add(Fact.convertFrom(f, symbolTable));
     }
 
     return s;
   }
 
-  public Set<Fact> query(String s, RunLimits limits)
-      throws Error {
-    Either<
-            org.eclipse.biscuit.token.builder.parser.Error,
-            Tuple2<String, Rule>>
-        res = Parser.rule(s);
+  public Set<Fact> query(String s, RunLimits limits) throws Error {
+    Either<org.eclipse.biscuit.token.builder.parser.Error, Tuple2<String, Rule>> res =
+        Parser.rule(s);
 
     if (res.isLeft()) {
       throw new Error.Parser(res.getLeft());
@@ -529,9 +510,7 @@ public Long authorize(RunLimits limits) throws Error {
       for (int j = 0; j < token.authority.getChecks().size(); j++) {
         boolean successful = false;
 
-        Check c =
-            Check.convertFrom(
-                token.authority.getChecks().get(j), token.symbolTable);
+        Check c = Check.convertFrom(token.authority.getChecks().get(j), token.symbolTable);
         org.eclipse.biscuit.datalog.Check check = c.convert(symbolTable);
 
         for (int k = 0; k < check.queries().size(); k++) {
@@ -608,9 +587,7 @@ public Long authorize(RunLimits limits) throws Error {
         for (int j = 0; j < b.getChecks().size(); j++) {
           boolean successful = false;
 
-          Check c =
-              Check.convertFrom(
-                  b.getChecks().get(j), blockSymbolTable);
+          Check c = Check.convertFrom(b.getChecks().get(j), blockSymbolTable);
           org.eclipse.biscuit.datalog.Check check = c.convert(symbolTable);
 
           for (int k = 0; k < check.queries().size(); k++) {

src/main/java/org/eclipse/biscuit/token/Biscuit.java

@@ -34,8 +34,7 @@ public final class Biscuit extends UnverifiedBiscuit {
    * @param root root private key
    * @return
    */
-  public static org.eclipse.biscuit.token.builder.Biscuit builder(
-      final Signer root) {
+  public static org.eclipse.biscuit.token.builder.Biscuit builder(final Signer root) {
     return new org.eclipse.biscuit.token.builder.Biscuit(new SecureRandom(), root);
   }
 
@@ -61,9 +60,7 @@ public static org.eclipse.biscuit.token.builder.Biscuit builder(
    * @return
    */
   public static org.eclipse.biscuit.token.builder.Biscuit builder(
-      final SecureRandom rng,
-      final Signer root,
-      final Option<Integer> rootKeyId) {
+      final SecureRandom rng, final Signer root, final Option<Integer> rootKeyId) {
     return new org.eclipse.biscuit.token.builder.Biscuit(rng, root, rootKeyId);
   }
 
@@ -75,10 +72,7 @@ public static org.eclipse.biscuit.token.builder.Biscuit builder(
    * @param authority authority block
    * @return Biscuit
    */
-  public static Biscuit make(
-      final SecureRandom rng,
-      final Signer root,
-      final Block authority)
+  public static Biscuit make(final SecureRandom rng, final Signer root, final Block authority)
       throws Error.FormatError {
     return Biscuit.make(rng, root, Option.none(), authority);
   }
@@ -92,10 +86,7 @@ public static Biscuit make(
    * @return Biscuit
    */
   public static Biscuit make(
-      final SecureRandom rng,
-      final Signer root,
-      final Integer rootKeyId,
-      final Block authority)
+      final SecureRandom rng, final Signer root, final Integer rootKeyId, final Block authority)
       throws Error.FormatError {
     return Biscuit.make(rng, root, Option.of(rootKeyId), authority);
   }
@@ -315,9 +306,7 @@ public Biscuit attenuate(org.eclipse.biscuit.token.builder.Block block, Algorith
   }
 
   public Biscuit attenuate(
-      final SecureRandom rng,
-      final KeyPair keypair,
-      org.eclipse.biscuit.token.builder.Block block)
+      final SecureRandom rng, final KeyPair keypair, org.eclipse.biscuit.token.builder.Block block)
       throws Error {
     SymbolTable builderSymbols = new SymbolTable(this.symbolTable);
     return attenuate(rng, keypair, block.build(builderSymbols));

src/main/java/org/eclipse/biscuit/token/builder/Biscuit.java

@@ -43,10 +43,7 @@ public Biscuit(final SecureRandom rng, final Signer root) {
     this.rootKeyId = Option.none();
   }
 
-  public Biscuit(
-      final SecureRandom rng,
-      final Signer root,
-      Option<Integer> rootKeyId) {
+  public Biscuit(final SecureRandom rng, final Signer root, Option<Integer> rootKeyId) {
     this.rng = rng;
     this.root = root;
     this.context = "";
@@ -72,18 +69,15 @@ public Biscuit(
     this.scopes = block.scopes();
   }
 
-  public Biscuit addAuthorityFact(Fact f)
-      throws Error.Language {
+  public Biscuit addAuthorityFact(Fact f) throws Error.Language {
     f.validate();
     this.facts.add(f);
     return this;
   }
 
   public Biscuit addAuthorityFact(String s) throws Error.Parser, Error.Language {
-    Either<
-            org.eclipse.biscuit.token.builder.parser.Error,
-            Tuple2<String, Fact>>
-        res = Parser.fact(s);
+    Either<org.eclipse.biscuit.token.builder.parser.Error, Tuple2<String, Fact>> res =
+        Parser.fact(s);
 
     if (res.isLeft()) {
       throw new Error.Parser(res.getLeft());
@@ -100,10 +94,8 @@ public Biscuit addAuthorityRule(Rule rule) {
   }
 
   public Biscuit addAuthorityRule(String s) throws Error.Parser {
-    Either<
-            org.eclipse.biscuit.token.builder.parser.Error,
-            Tuple2<String, Rule>>
-        res = Parser.rule(s);
+    Either<org.eclipse.biscuit.token.builder.parser.Error, Tuple2<String, Rule>> res =
+        Parser.rule(s);
 
     if (res.isLeft()) {
       throw new Error.Parser(res.getLeft());
@@ -120,10 +112,8 @@ public Biscuit addAuthorityCheck(Check c) {
   }
 
   public Biscuit addAuthorityCheck(String s) throws Error.Parser {
-    Either<
-            org.eclipse.biscuit.token.builder.parser.Error,
-            Tuple2<String, Check>>
-        res = Parser.check(s);
+    Either<org.eclipse.biscuit.token.builder.parser.Error, Tuple2<String, Check>> res =
+        Parser.check(s);
 
     if (res.isLeft()) {
       throw new Error.Parser(res.getLeft());

src/main/java/org/eclipse/biscuit/token/builder/Block.java

@@ -51,10 +51,8 @@ public Block addFact(Fact f) {
   }
 
   public Block addFact(String s) throws Error.Parser {
-    Either<
-            org.eclipse.biscuit.token.builder.parser.Error,
-            Tuple2<String, Fact>>
-        res = Parser.fact(s);
+    Either<org.eclipse.biscuit.token.builder.parser.Error, Tuple2<String, Fact>> res =
+        Parser.fact(s);
 
     if (res.isLeft()) {
       throw new Error.Parser(res.getLeft());
@@ -71,10 +69,8 @@ public Block addRule(Rule rule) {
   }
 
   public Block addRule(String s) throws Error.Parser {
-    Either<
-            org.eclipse.biscuit.token.builder.parser.Error,
-            Tuple2<String, Rule>>
-        res = Parser.rule(s);
+    Either<org.eclipse.biscuit.token.builder.parser.Error, Tuple2<String, Rule>> res =
+        Parser.rule(s);
 
     if (res.isLeft()) {
       throw new Error.Parser(res.getLeft());
@@ -91,10 +87,8 @@ public Block addCheck(Check check) {
   }
 
   public Block addCheck(String s) throws Error.Parser {
-    Either<
-            org.eclipse.biscuit.token.builder.parser.Error,
-            Tuple2<String, Check>>
-        res = Parser.check(s);
+    Either<org.eclipse.biscuit.token.builder.parser.Error, Tuple2<String, Check>> res =
+        Parser.check(s);
 
     if (res.isLeft()) {
       throw new Error.Parser(res.getLeft());

src/main/java/org/eclipse/biscuit/token/builder/Expression.java

@@ -14,16 +14,15 @@
 
 public abstract class Expression {
 
-  public final org.eclipse.biscuit.datalog.expressions.Expression convert(
-      SymbolTable symbolTable) {
+  public final org.eclipse.biscuit.datalog.expressions.Expression convert(SymbolTable symbolTable) {
     ArrayList<org.eclipse.biscuit.datalog.expressions.Op> ops = new ArrayList<>();
     this.toOpcodes(symbolTable, ops);
 
     return new org.eclipse.biscuit.datalog.expressions.Expression(ops);
   }
 
   public static Expression convertFrom(
-          org.eclipse.biscuit.datalog.expressions.Expression e, SymbolTable symbolTable) {
+      org.eclipse.biscuit.datalog.expressions.Expression e, SymbolTable symbolTable) {
     ArrayList<Op> ops = new ArrayList<>();
     Deque<Expression> stack = new ArrayDeque<Expression>(16);
     for (org.eclipse.biscuit.datalog.expressions.Op op : e.getOps()) {

src/main/java/org/eclipse/biscuit/token/builder/Predicate.java

@@ -39,7 +39,7 @@ public org.eclipse.biscuit.datalog.Predicate convert(SymbolTable symbolTable) {
   }
 
   public static Predicate convertFrom(
-          org.eclipse.biscuit.datalog.Predicate p, SymbolTable symbolTable) {
+      org.eclipse.biscuit.datalog.Predicate p, SymbolTable symbolTable) {
     String name = symbolTable.formatSymbol((int) p.name());
     List<Term> terms = new ArrayList<>();
     for (org.eclipse.biscuit.datalog.Term t : p.terms()) {