Merge pull request #52 from CleverCloud/biscuit-java-v4

biscuit-java 4.0.1

Author: KannarFr

.gitignore

@@ -1,6 +1,6 @@
 # Compiled class file
 *.class
-
+target/
 .idea/
 
 # Log file

pom.xml

@@ -23,9 +23,9 @@
     <maven-compiler-plugin.version>3.10.0</maven-compiler-plugin.version>
 
     <!-- dependencies -->
-    <biscuit-java.version>3.0.1</biscuit-java.version>
-    <logback-classic.version>1.2.13</logback-classic.version>
-    <slf4j-reload4j.version>1.7.36</slf4j-reload4j.version>
+    <biscuit-java.version>4.0.1</biscuit-java.version>
+    <logback.version>1.5.17</logback.version>
+    <slf4j.version>2.0.17</slf4j.version>
     <protobuf.version>3.25.5</protobuf.version>
     <pulsar.version>3.2.1</pulsar.version>
     <vavr.version>0.10.3</vavr.version>
@@ -201,10 +201,21 @@
       <version>${pulsar.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <version>${logback.version}</version>
+    </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>${logback-classic.version}</version>
+      <version>${logback.version}</version>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
     </dependency>
 
     <dependency>

src/main/resources/logback.xml

@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <layout class="ch.qos.logback.classic.PatternLayout">
-      <pattern>
-        %d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n
-      </pattern>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
     </layout>
   </appender>
 
-  <logger name="com.clevercloud" level="info" additivity="false">
-    <appender-ref ref="STDOUT"/>
-  </logger>
-
-  <root level="error">
-    <appender-ref ref="STDOUT"/>
+  <root level="INFO">
+    <appender-ref ref="STDOUT" />
   </root>
-
-</configuration>
+</configuration>

src/test/java/com/clevercloud/biscuitpulsar/AuthenticationProviderBiscuitTest.java

@@ -42,12 +42,12 @@ public void testAuthSecretKeyPair() throws Exception {
 
         SymbolTable symbols = Biscuit.default_symbol_table();
 
-        Block authority_builder = new Block(0, symbols);
-        authority_builder.add_fact(fact("right", Arrays.asList(s("topic"), s("public"), s("default"), s("test"), s("produce"))));
+        Block authorityBuilder = new Block();
+        authorityBuilder.add_fact(fact("right", Arrays.asList(s("topic"), s("public"), s("default"), s("test"), s("produce"))));
 
         byte[] seed = {0, 0, 0, 0};
         SecureRandom rng = new SecureRandom(seed);
-        Biscuit b = Biscuit.make(rng, root, Biscuit.default_symbol_table(), authority_builder.build());
+        Biscuit b = Biscuit.make(rng, root, authorityBuilder.build(symbols));
 
         AuthenticationProviderBiscuit provider = new AuthenticationProviderBiscuit();
 
@@ -126,12 +126,12 @@ public void testTokenFromHttpParams() throws Exception {
 
         SymbolTable symbols = Biscuit.default_symbol_table();
 
-        Block authority_builder = new Block(0, symbols);
-        authority_builder.add_fact(fact("right", Arrays.asList(s("topic"), s("public"), s("default"), s("test"), s("produce"))));
+        Block authorityBuilder = new Block();
+        authorityBuilder.add_fact(fact("right", Arrays.asList(s("topic"), s("public"), s("default"), s("test"), s("produce"))));
 
         byte[] seed = {0, 0, 0, 0};
         SecureRandom rng = new SecureRandom(seed);
-        Biscuit b = Biscuit.make(rng, root, Biscuit.default_symbol_table(), authority_builder.build());
+        Biscuit b = Biscuit.make(rng, root, authorityBuilder.build(symbols));
 
         HttpServletRequest servletRequest = mock(HttpServletRequest.class);
         doReturn(b.serialize_b64url()).when(servletRequest).getParameter("token");
@@ -161,12 +161,12 @@ public void testTokenFromHttpHeaders() throws Exception {
 
         SymbolTable symbols = Biscuit.default_symbol_table();
 
-        Block authority_builder = new Block(0, symbols);
-        authority_builder.add_fact(fact("right", Arrays.asList(s("topic"), s("public"), s("default"), s("test"), s("produce"))));
+        Block authorityBuilder = new Block();
+        authorityBuilder.add_fact(fact("right", Arrays.asList(s("topic"), s("public"), s("default"), s("test"), s("produce"))));
 
         byte[] seed = {0, 0, 0, 0};
         SecureRandom rng = new SecureRandom(seed);
-        Biscuit b = Biscuit.make(rng, root, Biscuit.default_symbol_table(), authority_builder.build());
+        Biscuit b = Biscuit.make(rng, root, authorityBuilder.build(symbols));
         HttpServletRequest servletRequest = mock(HttpServletRequest.class);
         doReturn("Bearer " + b.serialize_b64url()).when(servletRequest).getHeader("Authorization");
         doReturn("127.0.0.1").when(servletRequest).getRemoteAddr();
@@ -191,12 +191,12 @@ public void testWrongKeyPair() throws Exception {
 
         SymbolTable symbols = Biscuit.default_symbol_table();
 
-        Block authority_builder = new Block(0, symbols);
-        authority_builder.add_fact(fact("right", Arrays.asList(s("topic"), s("public"), s("default"), s("test"), s("produce"))));
+        Block authorityBuilder = new Block();
+        authorityBuilder.add_fact(fact("right", Arrays.asList(s("topic"), s("public"), s("default"), s("test"), s("produce"))));
 
         byte[] seed = {0, 0, 0, 0};
         SecureRandom rng = new SecureRandom(seed);
-        Biscuit b = Biscuit.make(rng, wrongRoot, Biscuit.default_symbol_table(), authority_builder.build());
+        Biscuit b = Biscuit.make(rng, wrongRoot, authorityBuilder.build(symbols));
 
         AuthenticationProviderBiscuit provider = new AuthenticationProviderBiscuit();