Merge pull request #77 from biscuit-auth/rename-package

rename the package

src/main/java/com/clevercloud/biscuit/crypto/KeyDelegate.java → src/main/java/org/biscuitsec/biscuit/crypto/KeyDelegate.java

@@ -1,4 +1,4 @@
-package com.clevercloud.biscuit.crypto;
+package org.biscuitsec.biscuit.crypto;
 
 import io.vavr.control.Option;
 

src/main/java/com/clevercloud/biscuit/crypto/KeyPair.java → src/main/java/org/biscuitsec/biscuit/crypto/KeyPair.java

@@ -1,8 +1,8 @@
-package com.clevercloud.biscuit.crypto;
+package org.biscuitsec.biscuit.crypto;
 
 
 import biscuit.format.schema.Schema;
-import com.clevercloud.biscuit.token.builder.Utils;
+import org.biscuitsec.biscuit.token.builder.Utils;
 import net.i2p.crypto.eddsa.EdDSAPrivateKey;
 import net.i2p.crypto.eddsa.EdDSAPublicKey;
 import net.i2p.crypto.eddsa.spec.*;

src/main/java/com/clevercloud/biscuit/crypto/PublicKey.java → src/main/java/org/biscuitsec/biscuit/crypto/PublicKey.java

@@ -1,18 +1,14 @@
-package com.clevercloud.biscuit.crypto;
+package org.biscuitsec.biscuit.crypto;
 
 import biscuit.format.schema.Schema;
 import biscuit.format.schema.Schema.PublicKey.Algorithm;
-import com.clevercloud.biscuit.datalog.Scope;
-import com.clevercloud.biscuit.error.Error;
-import com.clevercloud.biscuit.token.builder.Utils;
+import org.biscuitsec.biscuit.error.Error;
+import org.biscuitsec.biscuit.token.builder.Utils;
 import com.google.protobuf.ByteString;
-import io.vavr.control.Either;
 import net.i2p.crypto.eddsa.EdDSAPublicKey;
 import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec;
 
-import static com.clevercloud.biscuit.crypto.KeyPair.ed25519;
-import static io.vavr.API.Left;
-import static io.vavr.API.Right;
+import static org.biscuitsec.biscuit.crypto.KeyPair.ed25519;
 
 public class PublicKey {
 

src/main/java/com/clevercloud/biscuit/crypto/Token.java → src/main/java/org/biscuitsec/biscuit/crypto/Token.java

@@ -1,6 +1,6 @@
-package com.clevercloud.biscuit.crypto;
+package org.biscuitsec.biscuit.crypto;
 
-import com.clevercloud.biscuit.error.Error;
+import org.biscuitsec.biscuit.error.Error;
 import io.vavr.control.Either;
 import net.i2p.crypto.eddsa.EdDSAEngine;
 
@@ -9,7 +9,6 @@
 import java.security.*;
 import java.util.ArrayList;
 
-import static com.clevercloud.biscuit.crypto.KeyPair.ed25519;
 import static io.vavr.API.Left;
 import static io.vavr.API.Right;
 
@@ -20,7 +19,7 @@ class Token {
     public final KeyPair next;
 
     public Token(KeyPair rootKeyPair, byte[] message, KeyPair next) throws NoSuchAlgorithmException, InvalidKeyException, SignatureException {
-        Signature sgr = new EdDSAEngine(MessageDigest.getInstance(ed25519.getHashAlgorithm()));
+        Signature sgr = new EdDSAEngine(MessageDigest.getInstance(KeyPair.ed25519.getHashAlgorithm()));
         ByteBuffer algo_buf = ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN);
         algo_buf.putInt(Integer.valueOf(next.public_key().algorithm.getNumber()));
         algo_buf.flip();
@@ -49,7 +48,7 @@ public Token(final ArrayList<byte[]> blocks, final ArrayList<PublicKey> keys, fi
     }
 
     public Token append(KeyPair keyPair, byte[] message) throws NoSuchAlgorithmException, SignatureException, InvalidKeyException {
-        Signature sgr = new EdDSAEngine(MessageDigest.getInstance(ed25519.getHashAlgorithm()));
+        Signature sgr = new EdDSAEngine(MessageDigest.getInstance(KeyPair.ed25519.getHashAlgorithm()));
         sgr.initSign(this.next.private_key);
         ByteBuffer algo_buf = ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN);
         algo_buf.putInt(Integer.valueOf(next.public_key().algorithm.getNumber()));
@@ -77,7 +76,7 @@ public Either<Error, Void> verify(PublicKey root) throws NoSuchAlgorithmExceptio
             byte[] signature = this.signatures.get(i);
 
             System.out.println("verifying block "+i+" with current key "+current_key.toHex()+" block "+block+" next key "+next_key.toHex()+" signature "+signature);
-            Signature sgr = new EdDSAEngine(MessageDigest.getInstance(ed25519.getHashAlgorithm()));
+            Signature sgr = new EdDSAEngine(MessageDigest.getInstance(KeyPair.ed25519.getHashAlgorithm()));
             ByteBuffer algo_buf = ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN);
             algo_buf.putInt(Integer.valueOf(next.public_key().algorithm.getNumber()));
             algo_buf.flip();

src/main/java/com/clevercloud/biscuit/crypto/TokenSignature.java → src/main/java/org/biscuitsec/biscuit/crypto/TokenSignature.java

@@ -1,17 +1,6 @@
-package com.clevercloud.biscuit.crypto;
+package org.biscuitsec.biscuit.crypto;
 
-import biscuit.format.schema.Schema;
-import com.clevercloud.biscuit.error.Error;
-import com.google.protobuf.ByteString;
-import io.vavr.control.Either;
-
-import java.security.MessageDigest;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.List;
-
-import static io.vavr.API.Left;
-import static io.vavr.API.Right;
+import org.biscuitsec.biscuit.token.builder.Utils;
 
 /**
  * Signature aggregation
@@ -191,6 +180,6 @@ static public String hex(byte[] byteArray) {
     }
 
     public static byte[] fromHex(String s) {
-        return com.clevercloud.biscuit.token.builder.Utils.hexStringToByteArray(s);
+        return Utils.hexStringToByteArray(s);
     }
 }

src/main/java/com/clevercloud/biscuit/crypto/package-info.java → src/main/java/org/biscuitsec/biscuit/crypto/package-info.java

@@ -1,4 +1,4 @@
 /**
  * Cryptographic operations for Biscuit tokens
  */
-package com.clevercloud.biscuit.crypto;
+package org.biscuitsec.biscuit.crypto;

src/main/java/com/clevercloud/biscuit/datalog/Check.java → src/main/java/org/biscuitsec/biscuit/datalog/Check.java

@@ -1,15 +1,14 @@
-package com.clevercloud.biscuit.datalog;
+package org.biscuitsec.biscuit.datalog;
 
 import biscuit.format.schema.Schema;
-import com.clevercloud.biscuit.error.Error;
+import org.biscuitsec.biscuit.error.Error;
 import io.vavr.control.Either;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
 import static biscuit.format.schema.Schema.CheckV2.Kind.All;
-import static biscuit.format.schema.Schema.CheckV2.Kind.One;
 import static io.vavr.API.Left;
 import static io.vavr.API.Right;
 

src/main/java/com/clevercloud/biscuit/datalog/Combinator.java → src/main/java/org/biscuitsec/biscuit/datalog/Combinator.java

@@ -1,4 +1,4 @@
-package com.clevercloud.biscuit.datalog;
+package org.biscuitsec.biscuit.datalog;
 
 import io.vavr.Tuple2;
 import io.vavr.control.Option;

src/main/java/com/clevercloud/biscuit/datalog/Fact.java → src/main/java/org/biscuitsec/biscuit/datalog/Fact.java

@@ -1,7 +1,7 @@
-package com.clevercloud.biscuit.datalog;
+package org.biscuitsec.biscuit.datalog;
 
 import biscuit.format.schema.Schema;
-import com.clevercloud.biscuit.error.Error;
+import org.biscuitsec.biscuit.error.Error;
 import io.vavr.control.Either;
 
 import java.io.Serializable;

src/main/java/com/clevercloud/biscuit/datalog/FactSet.java → src/main/java/org/biscuitsec/biscuit/datalog/FactSet.java

@@ -1,4 +1,4 @@
-package com.clevercloud.biscuit.datalog;
+package org.biscuitsec.biscuit.datalog;
 
 import io.vavr.Tuple2;
 

src/main/java/com/clevercloud/biscuit/datalog/MatchedVariables.java → src/main/java/org/biscuitsec/biscuit/datalog/MatchedVariables.java

@@ -1,6 +1,6 @@
-package com.clevercloud.biscuit.datalog;
+package org.biscuitsec.biscuit.datalog;
 
-import com.clevercloud.biscuit.datalog.expressions.Expression;
+import org.biscuitsec.biscuit.datalog.expressions.Expression;
 import io.vavr.control.Option;
 
 import java.io.Serializable;

src/main/java/com/clevercloud/biscuit/datalog/Origin.java → src/main/java/org/biscuitsec/biscuit/datalog/Origin.java

@@ -1,4 +1,4 @@
-package com.clevercloud.biscuit.datalog;
+package org.biscuitsec.biscuit.datalog;
 
 import java.util.*;
 

src/main/java/com/clevercloud/biscuit/datalog/Predicate.java → src/main/java/org/biscuitsec/biscuit/datalog/Predicate.java

@@ -1,7 +1,7 @@
-package com.clevercloud.biscuit.datalog;
+package org.biscuitsec.biscuit.datalog;
 
 import biscuit.format.schema.Schema;
-import com.clevercloud.biscuit.error.Error;
+import org.biscuitsec.biscuit.error.Error;
 import io.vavr.control.Either;
 
 import java.io.Serializable;

src/main/java/com/clevercloud/biscuit/datalog/Rule.java → src/main/java/org/biscuitsec/biscuit/datalog/Rule.java

@@ -1,9 +1,8 @@
-package com.clevercloud.biscuit.datalog;
+package org.biscuitsec.biscuit.datalog;
 
 import biscuit.format.schema.Schema;
-import com.clevercloud.biscuit.datalog.expressions.Expression;
-import com.clevercloud.biscuit.error.Error;
-import com.clevercloud.biscuit.error.Error.InvalidType;
+import org.biscuitsec.biscuit.datalog.expressions.Expression;
+import org.biscuitsec.biscuit.error.Error;
 import io.vavr.Tuple2;
 import io.vavr.Tuple3;
 import io.vavr.control.Either;
@@ -66,7 +65,7 @@ public Stream<Either<Error, Tuple2<Origin, Fact>>> apply(
                           }
                           // continue evaluating if true
                        } else {
-                          return Either.left(new InvalidType());
+                          return Either.left(new Error.InvalidType());
                        }
                     }
                  }
@@ -131,7 +130,7 @@ public boolean find_match(final FactSet facts, Long origin, TrustedOrigins scope
    }
 
    // verifies that the expressions return true for every matching set of facts
-   public boolean check_match_all(final FactSet facts, TrustedOrigins scope, SymbolTable symbols) throws InvalidType {
+   public boolean check_match_all(final FactSet facts, TrustedOrigins scope, SymbolTable symbols) throws Error.InvalidType {
       MatchedVariables variables = variablesSet();
 
       if(this.body.isEmpty()) {
@@ -159,7 +158,7 @@ public boolean check_match_all(final FactSet facts, TrustedOrigins scope, Symbol
                     }
                     // continue evaluating if true
                  } else {
-                    throw new InvalidType();
+                    throw new Error.InvalidType();
                  }
               }
            }

src/main/java/com/clevercloud/biscuit/datalog/RuleSet.java → src/main/java/org/biscuitsec/biscuit/datalog/RuleSet.java

@@ -1,4 +1,4 @@
-package com.clevercloud.biscuit.datalog;
+package org.biscuitsec.biscuit.datalog;
 
 import io.vavr.Tuple2;
 

src/main/java/com/clevercloud/biscuit/datalog/RunLimits.java → src/main/java/org/biscuitsec/biscuit/datalog/RunLimits.java

@@ -1,4 +1,4 @@
-package com.clevercloud.biscuit.datalog;
+package org.biscuitsec.biscuit.datalog;
 
 import java.time.Duration;
 

src/main/java/com/clevercloud/biscuit/datalog/SchemaVersion.java → src/main/java/org/biscuitsec/biscuit/datalog/SchemaVersion.java

@@ -1,14 +1,13 @@
-package com.clevercloud.biscuit.datalog;
+package org.biscuitsec.biscuit.datalog;
 
-import com.clevercloud.biscuit.datalog.expressions.Expression;
-import com.clevercloud.biscuit.datalog.expressions.Op;
-import com.clevercloud.biscuit.error.Error;
+import org.biscuitsec.biscuit.datalog.expressions.Expression;
+import org.biscuitsec.biscuit.datalog.expressions.Op;
+import org.biscuitsec.biscuit.error.Error;
 import io.vavr.control.Either;
+import org.biscuitsec.biscuit.token.format.SerializedBiscuit;
 
 import java.util.List;
 
-import static com.clevercloud.biscuit.datalog.Check.Kind.All;
-import static com.clevercloud.biscuit.token.format.SerializedBiscuit.MIN_SCHEMA_VERSION;
 import static io.vavr.API.Left;
 import static io.vavr.API.Right;
 
@@ -41,7 +40,7 @@ public SchemaVersion(List<Fact> facts, List<Rule> rules, List<Check> checks, Lis
 
         containsCheckAll = false;
         for (Check check : checks) {
-            if (check.kind() == All) {
+            if (check.kind() == Check.Kind.All) {
                 containsCheckAll = true;
                 break;
             }
@@ -62,7 +61,7 @@ public int version() {
         if (containsScopes || containsV4 || containsCheckAll) {
             return 4;
         } else {
-            return MIN_SCHEMA_VERSION;
+            return SerializedBiscuit.MIN_SCHEMA_VERSION;
         }
     }
 

src/main/java/com/clevercloud/biscuit/datalog/Scope.java → src/main/java/org/biscuitsec/biscuit/datalog/Scope.java

@@ -1,7 +1,7 @@
-package com.clevercloud.biscuit.datalog;
+package org.biscuitsec.biscuit.datalog;
 
 import biscuit.format.schema.Schema;
-import com.clevercloud.biscuit.error.Error;
+import org.biscuitsec.biscuit.error.Error;
 import io.vavr.control.Either;
 
 

src/main/java/com/clevercloud/biscuit/datalog/SymbolTable.java → src/main/java/org/biscuitsec/biscuit/datalog/SymbolTable.java

@@ -1,9 +1,9 @@
-package com.clevercloud.biscuit.datalog;
+package org.biscuitsec.biscuit.datalog;
 
-import com.clevercloud.biscuit.crypto.PublicKey;
-import com.clevercloud.biscuit.crypto.TokenSignature;
-import com.clevercloud.biscuit.datalog.expressions.Expression;
-import com.clevercloud.biscuit.token.builder.Utils;
+import org.biscuitsec.biscuit.crypto.PublicKey;
+import org.biscuitsec.biscuit.crypto.TokenSignature;
+import org.biscuitsec.biscuit.datalog.expressions.Expression;
+import org.biscuitsec.biscuit.token.builder.Utils;
 import io.vavr.control.Option;
 
 import java.io.Serializable;

src/main/java/com/clevercloud/biscuit/datalog/TemporarySymbolTable.java → src/main/java/org/biscuitsec/biscuit/datalog/TemporarySymbolTable.java

@@ -1,11 +1,11 @@
-package com.clevercloud.biscuit.datalog;
+package org.biscuitsec.biscuit.datalog;
 
 import io.vavr.control.Option;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.clevercloud.biscuit.datalog.SymbolTable.DEFAULT_SYMBOLS_OFFSET;
+import static org.biscuitsec.biscuit.datalog.SymbolTable.DEFAULT_SYMBOLS_OFFSET;
 
 public class TemporarySymbolTable {
     SymbolTable base;