Fixes ugly Argon initialization by delegating ArgonConfig method instead

Author: Zylquinal

README.md

@@ -9,26 +9,14 @@ An [argon2](https://github.com/P-H-C/phc-winner-argon2) binding using Java Forei
 
 ```java
 
-import com.zylquinal.argon2.*;
+import com.zylquinal.argon2.api.*;
 
 public class Example {
 
     public static void main(String[] args) {
-        Argon2 argon2 = Argon2.create(2, 65536, 1);
-        
-        byte[] rawHash = argon2.hashRaw("password".getBytes(), "randomsalt".getBytes());
-        String encodedHash = argon2.hashEncoded("password".getBytes(), "randomsalt".getBytes());
-
-        rawHash = ArgonContext.builder()
-                .password("password".getBytes())
-                .salt("randomsalt".getBytes())
-                .memoryCost(65536)
-                .iterations(2)
-                .parallelism(1)
-                .hashLength(32)
-                .flag(ArgonFlag.CLEAR_ALL)
-                .version(ArgonVersion.VERSION_13)
-                .hash(ArgonVariant.ARGON_2ID);
+        ArgonConfig config = ArgonConfig.of(65536, 1, 2);
+        Argon argon = Argon.of(config);
+        byte[] rawHash = argon.rawHash("password".getBytes(), "randomsalt".getBytes());
     }
 
 }

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'com.zylquinal.argon2'
-version '2.0-SNAPSHOT'
+version '2.1-SNAPSHOT'
 
 repositories {
     mavenCentral()
@@ -16,7 +16,6 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
     testImplementation 'de.mkammerer:argon2-jvm:2.11'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
-
 }
 
 tasks.withType(JavaCompile).configureEach {

src/main/java/com/zylquinal/argon2/api/Argon.java

@@ -1,14 +1,18 @@
 package com.zylquinal.argon2.api;
 
-import com.zylquinal.argon2.api.enumeration.ArgonFlag;
-import com.zylquinal.argon2.api.enumeration.ArgonVariant;
-import com.zylquinal.argon2.api.enumeration.ArgonVersion;
 import com.zylquinal.argon2.api.exception.ArgonException;
+import lombok.experimental.Delegate;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public record Argon(ArgonConfig config, int iterations, int memoryCost, int parallelism, int hashLength, ArgonVersion version,
-                    ArgonFlag flat, ArgonVariant variant) {
+public class Argon {
+
+    @Delegate
+    private final ArgonConfig config;
+
+    private Argon(ArgonConfig config) {
+        this.config = config;
+    }
 
     /**
      * Hashes the given password using the given salt.
@@ -46,8 +50,9 @@ public ComputedHash hash(byte @NotNull [] password, byte @NotNull [] salt, byte
      * @throws ArgonException if the hash could not be computed
      */
     public ComputedHash hash(byte @NotNull [] password, byte @NotNull [] salt, byte @Nullable [] secret, byte @Nullable [] associatedData) {
-        byte[] rawHash = ArgonDirect.rawHash(password, salt, secret, associatedData, hashLength, memoryCost, parallelism, iterations, version, flat, variant);
-        return ComputedHash.of(rawHash, salt, config());
+        byte[] rawHash = ArgonDirect.rawHash(password, salt, secret, associatedData, hashLength(), memoryCost(), parallelism(),
+                iterations(), version(), flag(), variant());
+        return ComputedHash.of(rawHash, salt, config);
     }
 
     /**
@@ -86,7 +91,8 @@ public byte[] rawHash(byte[] password, byte[] salt, byte @Nullable [] secret) {
      * @throws ArgonException if the hash could not be computed
      */
     public byte[] rawHash(byte @NotNull [] password, byte @NotNull [] salt, byte @Nullable [] secret, byte @Nullable [] associatedData) {
-        return ArgonDirect.rawHash(password, salt, secret, associatedData, hashLength, memoryCost, parallelism, iterations, version, flat, variant);
+        return ArgonDirect.rawHash(password, salt, secret, associatedData, hashLength(), memoryCost(), parallelism(),
+                iterations(), version(), flag(), variant());
     }
 
     /**
@@ -125,7 +131,7 @@ public boolean verify(@NotNull String encodedHash, byte @NotNull  [] password, b
      * @throws ArgonException if the hash could not be computed
      */
     public boolean verify(@NotNull String encodedHash, byte @NotNull  [] password, byte @Nullable [] secret, byte @Nullable [] associatedData) {
-        return ArgonDirect.verify(encodedHash, password, secret, associatedData, flat);
+        return ArgonDirect.verify(encodedHash, password, secret, associatedData, flag());
     }
 
     /**
@@ -188,7 +194,8 @@ public boolean verify(@NotNull ComputedHash hash, byte @NotNull [] password, byt
      * @throws ArgonException if the hash could not be computed
      */
     public boolean verify(byte @NotNull [] hash, byte @NotNull [] password, byte @NotNull [] salt, byte @Nullable [] secret, byte @Nullable [] associatedData) {
-        return ArgonDirect.verify(hash, password, salt, secret, associatedData, hashLength, memoryCost, parallelism, iterations, version, flat, variant);
+        return ArgonDirect.verify(hash, password, salt, secret, associatedData, hashLength(), memoryCost(), parallelism(),
+                iterations(), version(), flag(), variant());
     }
 
     /**
@@ -198,8 +205,7 @@ public boolean verify(byte @NotNull [] hash, byte @NotNull [] password, byte @No
      * @return a new {@link Argon} instance
      */
     public static Argon of(ArgonConfig config) {
-        return new Argon(config, config.iterations(), config.memoryCost(), config.parallelism(), config.hashLength(),
-                config.version(), config.flag(), config.variant());
+        return new Argon(config);
     }
 
 }