Skip to content

Eclipse package #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.biscuitsec</groupId>
<groupId>org.eclipse</groupId>
<artifactId>biscuit</artifactId>
<packaging>jar</packaging>
<version>4.0.1</version>
<name>biscuit-java</name>
<url>https://github.com/biscuit-auth/biscuit-java</url>
<url>https://github.com/eclipse-biscuit/biscuit-java</url>

<description>Java support for the biscuit auth token and policy language</description>

Expand Down
2 changes: 0 additions & 2 deletions src/main/java/org/biscuitsec/biscuit/error/package-info.java

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.biscuitsec.biscuit.crypto;
package org.eclipse.biscuit.crypto;

import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.Optional;
import org.biscuitsec.biscuit.token.format.ExternalSignature;
import org.eclipse.biscuit.token.format.ExternalSignature;

public final class BlockSignatureBuffer {
public static final int HEADER_SIZE = 4;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.biscuitsec.biscuit.crypto;
package org.eclipse.biscuit.crypto;

import biscuit.format.schema.Schema;
import java.security.InvalidKeyException;
Expand All @@ -14,7 +14,7 @@
import net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable;
import net.i2p.crypto.eddsa.spec.EdDSAPrivateKeySpec;
import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec;
import org.biscuitsec.biscuit.token.builder.Utils;
import org.eclipse.biscuit.token.builder.Utils;

final class Ed25519KeyPair extends KeyPair {
private static final int BUFFER_SIZE = 32;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.biscuitsec.biscuit.crypto;
package org.eclipse.biscuit.crypto;

import io.vavr.control.Option;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.biscuitsec.biscuit.crypto;
package org.eclipse.biscuit.crypto;

import biscuit.format.schema.Schema.PublicKey.Algorithm;
import java.security.InvalidKeyException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.biscuitsec.biscuit.crypto;
package org.eclipse.biscuit.crypto;

import biscuit.format.schema.Schema;
import biscuit.format.schema.Schema.PublicKey.Algorithm;
import com.google.protobuf.ByteString;
import java.util.Optional;
import java.util.Set;
import net.i2p.crypto.eddsa.EdDSAPublicKey;
import org.biscuitsec.biscuit.error.Error;
import org.biscuitsec.biscuit.token.builder.Utils;
import org.eclipse.biscuit.error.Error;
import org.eclipse.biscuit.token.builder.Utils;
import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey;

public final class PublicKey {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.biscuitsec.biscuit.crypto;
package org.eclipse.biscuit.crypto;

import biscuit.format.schema.Schema;
import java.security.InvalidKeyException;
Expand All @@ -7,7 +7,7 @@
import java.security.Security;
import java.security.Signature;
import java.security.SignatureException;
import org.biscuitsec.biscuit.token.builder.Utils;
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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.biscuitsec.biscuit.crypto;
package org.eclipse.biscuit.crypto;

import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.biscuitsec.biscuit.crypto;
package org.eclipse.biscuit.crypto;

import static io.vavr.API.Left;
import static io.vavr.API.Right;
Expand All @@ -8,7 +8,7 @@
import java.security.NoSuchAlgorithmException;
import java.security.SignatureException;
import java.util.ArrayList;
import org.biscuitsec.biscuit.error.Error;
import org.eclipse.biscuit.error.Error;

class Token {
private final ArrayList<byte[]> blocks;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.biscuitsec.biscuit.crypto;
package org.eclipse.biscuit.crypto;

import org.biscuitsec.biscuit.token.builder.Utils;
import org.eclipse.biscuit.token.builder.Utils;

/** Signature aggregation */
public final class TokenSignature {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/** Cryptographic operations for Biscuit tokens */
package org.biscuitsec.biscuit.crypto;
package org.eclipse.biscuit.crypto;
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.biscuitsec.biscuit.datalog;
package org.eclipse.biscuit.datalog;

import static biscuit.format.schema.Schema.CheckV2.Kind.All;
import static io.vavr.API.Left;
Expand All @@ -9,7 +9,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import org.biscuitsec.biscuit.error.Error;
import org.eclipse.biscuit.error.Error;

public final class Check {
public enum Kind {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.biscuitsec.biscuit.datalog;
package org.eclipse.biscuit.datalog;

import io.vavr.Tuple2;
import io.vavr.control.Option;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.biscuitsec.biscuit.datalog;
package org.eclipse.biscuit.datalog;

import static io.vavr.API.Left;
import static io.vavr.API.Right;
Expand All @@ -8,7 +8,7 @@
import java.io.Serializable;
import java.util.List;
import java.util.Objects;
import org.biscuitsec.biscuit.error.Error;
import org.eclipse.biscuit.error.Error;

public final class Fact implements Serializable {
private final Predicate predicate;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.biscuitsec.biscuit.datalog;
package org.eclipse.biscuit.datalog;

import io.vavr.Tuple2;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.biscuitsec.biscuit.datalog;
package org.eclipse.biscuit.datalog;

import io.vavr.control.Option;
import java.io.Serializable;
Expand All @@ -7,8 +7,8 @@
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import org.biscuitsec.biscuit.datalog.expressions.Expression;
import org.biscuitsec.biscuit.error.Error;
import org.eclipse.biscuit.datalog.expressions.Expression;
import org.eclipse.biscuit.error.Error;

public final class MatchedVariables implements Serializable {
private final Map<Long, Optional<Term>> variables;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.biscuitsec.biscuit.datalog;
package org.eclipse.biscuit.datalog;

import java.util.Collection;
import java.util.Collections;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.biscuitsec.biscuit.datalog;
package org.eclipse.biscuit.datalog;

import static io.vavr.API.Left;
import static io.vavr.API.Right;
Expand All @@ -11,7 +11,7 @@
import java.util.ListIterator;
import java.util.Objects;
import java.util.stream.Collectors;
import org.biscuitsec.biscuit.error.Error;
import org.eclipse.biscuit.error.Error;

public final class Predicate implements Serializable {
private final long name;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.biscuitsec.biscuit.datalog;
package org.eclipse.biscuit.datalog;

import static io.vavr.API.Left;
import static io.vavr.API.Right;
Expand All @@ -21,8 +21,8 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import org.biscuitsec.biscuit.datalog.expressions.Expression;
import org.biscuitsec.biscuit.error.Error;
import org.eclipse.biscuit.datalog.expressions.Expression;
import org.eclipse.biscuit.error.Error;

public final class Rule implements Serializable {
private final Predicate head;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.biscuitsec.biscuit.datalog;
package org.eclipse.biscuit.datalog;

import io.vavr.Tuple2;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.biscuitsec.biscuit.datalog;
package org.eclipse.biscuit.datalog;

import java.time.Duration;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package org.biscuitsec.biscuit.datalog;
package org.eclipse.biscuit.datalog;

import static io.vavr.API.Left;
import static io.vavr.API.Right;

import io.vavr.control.Either;
import java.util.List;
import org.biscuitsec.biscuit.datalog.expressions.Expression;
import org.biscuitsec.biscuit.datalog.expressions.Op;
import org.biscuitsec.biscuit.error.Error;
import org.biscuitsec.biscuit.token.format.SerializedBiscuit;
import org.eclipse.biscuit.datalog.expressions.Expression;
import org.eclipse.biscuit.datalog.expressions.Op;
import org.eclipse.biscuit.error.Error;
import org.eclipse.biscuit.token.format.SerializedBiscuit;

public final class SchemaVersion {
private boolean containsScopes;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.biscuitsec.biscuit.datalog;
package org.eclipse.biscuit.datalog;

import static io.vavr.API.Left;
import static io.vavr.API.Right;

import biscuit.format.schema.Schema;
import io.vavr.control.Either;
import org.biscuitsec.biscuit.error.Error;
import org.eclipse.biscuit.error.Error;

public final class Scope {
public enum Kind {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.biscuitsec.biscuit.datalog;
package org.eclipse.biscuit.datalog;

import io.vavr.control.Option;
import java.io.Serializable;
Expand All @@ -10,9 +10,9 @@
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import org.biscuitsec.biscuit.crypto.PublicKey;
import org.biscuitsec.biscuit.datalog.expressions.Expression;
import org.biscuitsec.biscuit.token.builder.Utils;
import org.eclipse.biscuit.crypto.PublicKey;
import org.eclipse.biscuit.datalog.expressions.Expression;
import org.eclipse.biscuit.token.builder.Utils;

public final class SymbolTable implements Serializable {
public static final short DEFAULT_SYMBOLS_OFFSET = 1024;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.biscuitsec.biscuit.datalog;
package org.eclipse.biscuit.datalog;

import static org.biscuitsec.biscuit.datalog.SymbolTable.DEFAULT_SYMBOLS_OFFSET;
import static org.eclipse.biscuit.datalog.SymbolTable.DEFAULT_SYMBOLS_OFFSET;

import io.vavr.control.Option;
import java.util.ArrayList;
Expand Down
Loading