chore(import): fix invalid imports

lib/src/main/java/zeroecho/core/alg/aes/AesCipherContext.java

@@ -33,8 +33,8 @@
  ******************************************************************************/
 package zeroecho.core.alg.aes;
 
-import java.io.IOException;
 import java.io.FilterInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.security.GeneralSecurityException;
 import java.security.SecureRandom;

lib/src/main/java/zeroecho/core/alg/bike/BikeAlgorithm.java

@@ -44,8 +44,8 @@ import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.security.Security;
 import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Arrays;
 import java.security.spec.X509EncodedKeySpec;
+import java.util.Arrays;
 
 import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
 import org.bouncycastle.pqc.jcajce.spec.BIKEParameterSpec;

lib/src/main/java/zeroecho/core/alg/cmce/CmceAlgorithm.java

@@ -44,8 +44,8 @@ import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.security.Security;
 import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Arrays;
 import java.security.spec.X509EncodedKeySpec;
+import java.util.Arrays;
 
 import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
 import org.bouncycastle.pqc.jcajce.spec.CMCEParameterSpec;

lib/src/main/java/zeroecho/core/alg/frodo/FrodoAlgorithm.java

@@ -44,8 +44,8 @@ import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.security.Security;
 import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Arrays;
 import java.security.spec.X509EncodedKeySpec;
+import java.util.Arrays;
 
 import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
 import org.bouncycastle.pqc.jcajce.spec.FrodoParameterSpec;

lib/src/main/java/zeroecho/core/alg/hmac/HmacKeyImportSpec.java

@@ -33,8 +33,8 @@
  ******************************************************************************/
 package zeroecho.core.alg.hmac;
 
-import java.util.Base64;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.HexFormat;
 import java.util.Objects;
 import java.util.concurrent.locks.ReentrantLock;

lib/src/main/java/zeroecho/core/alg/hqc/HqcAlgorithm.java

@@ -44,8 +44,8 @@ import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.security.Security;
 import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Arrays;
 import java.security.spec.X509EncodedKeySpec;
+import java.util.Arrays;
 
 import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
 import org.bouncycastle.pqc.jcajce.spec.HQCParameterSpec;

lib/src/main/java/zeroecho/core/alg/kyber/KyberAlgorithm.java

@@ -44,8 +44,8 @@ import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.security.Security;
 import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Arrays;
 import java.security.spec.X509EncodedKeySpec;
+import java.util.Arrays;
 
 import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
 import org.bouncycastle.pqc.jcajce.spec.KyberParameterSpec;

lib/src/main/java/zeroecho/core/alg/ntru/NtruAlgorithm.java

@@ -44,8 +44,8 @@ import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.security.Security;
 import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Arrays;
 import java.security.spec.X509EncodedKeySpec;
+import java.util.Arrays;
 
 import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
 import org.bouncycastle.pqc.jcajce.spec.NTRUParameterSpec;

lib/src/main/java/zeroecho/core/alg/ntruprime/NtrulPrimeAlgorithm.java

@@ -44,8 +44,8 @@ import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.security.Security;
 import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Arrays;
 import java.security.spec.X509EncodedKeySpec;
+import java.util.Arrays;
 
 import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
 import org.bouncycastle.pqc.jcajce.spec.NTRULPRimeParameterSpec;

lib/src/main/java/zeroecho/core/alg/ntruprime/SntruPrimeAlgorithm.java

@@ -44,8 +44,8 @@ import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.security.Security;
 import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Arrays;
 import java.security.spec.X509EncodedKeySpec;
+import java.util.Arrays;
 
 import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
 import org.bouncycastle.pqc.jcajce.spec.SNTRUPrimeParameterSpec;

lib/src/main/java/zeroecho/core/alg/saber/SaberAlgorithm.java

@@ -44,8 +44,8 @@ import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.security.Security;
 import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Arrays;
 import java.security.spec.X509EncodedKeySpec;
+import java.util.Arrays;
 
 import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
 

lib/src/main/java/zeroecho/core/storage/KeyringStore.java

@@ -11,12 +11,12 @@ import java.io.DataOutputStream;
 import java.io.EOFException;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.CodingErrorAction;
-import java.nio.charset.StandardCharsets;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 import java.nio.channels.OverlappingFileLockException;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.CodingErrorAction;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.AtomicMoveNotSupportedException;
 import java.nio.file.FileStore;
 import java.nio.file.Files;

lib/src/main/java/zeroecho/core/tag/TagEngineBuilder.java

@@ -48,8 +48,8 @@ import zeroecho.core.alg.ecdsa.EcdsaCurveSpec;
 import zeroecho.core.alg.hmac.HmacSpec;
 import zeroecho.core.alg.rsa.RsaSigSpec;
 import zeroecho.core.spec.ContextSpec;
-import zeroecho.sdk.ZeroEchoSession;
 import zeroecho.core.spec.VoidSpec;
+import zeroecho.sdk.ZeroEchoSession;
 
 /**
  * Factory-style builder that supplies fresh {@link TagEngine} instances on

lib/src/main/java/zeroecho/sdk/ZeroEchoSession.java

@@ -35,9 +35,9 @@ package zeroecho.sdk;
 
 import java.security.Key;
 import java.security.KeyPair;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -48,9 +48,9 @@ import zeroecho.core.CryptoAlgorithm;
 import zeroecho.core.CryptoAlgorithms;
 import zeroecho.core.KeyUsage;
 import zeroecho.core.audit.AuditListener;
+import zeroecho.core.audit.AuditListeners;
 import zeroecho.core.audit.AuditMode;
 import zeroecho.core.audit.AuditedContexts;
-import zeroecho.core.audit.AuditListeners;
 import zeroecho.core.context.AgreementContext;
 import zeroecho.core.context.CryptoContext;
 import zeroecho.core.context.DigestContext;

lib/src/main/java/zeroecho/sdk/builders/HybridKexBuilder.java

@@ -33,8 +33,6 @@
  ******************************************************************************/
 package zeroecho.sdk.builders;
 
-import zeroecho.sdk.ZeroEchoSession;
-
 import java.io.IOException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
@@ -45,6 +43,7 @@ import zeroecho.core.alg.common.agreement.KeyPairKey;
 import zeroecho.core.context.AgreementContext;
 import zeroecho.core.context.MessageAgreementContext;
 import zeroecho.core.spec.ContextSpec;
+import zeroecho.sdk.ZeroEchoSession;
 import zeroecho.sdk.hybrid.kex.HybridKexContext;
 import zeroecho.sdk.hybrid.kex.HybridKexExporter;
 import zeroecho.sdk.hybrid.kex.HybridKexPolicy;

lib/src/main/java/zeroecho/sdk/builders/SignatureTrailerDataContentBuilder.java

@@ -33,8 +33,6 @@
  ******************************************************************************/
 package zeroecho.sdk.builders;
 
-import zeroecho.sdk.ZeroEchoSession;
-
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.Signature;
@@ -46,6 +44,7 @@ import conflux.Key;
 import zeroecho.core.KeyUsage;
 import zeroecho.core.spec.ContextSpec;
 import zeroecho.core.tag.TagEngine;
+import zeroecho.sdk.ZeroEchoSession;
 import zeroecho.sdk.builders.core.DataContentBuilder;
 import zeroecho.sdk.content.api.DataContent;
 import zeroecho.sdk.hybrid.signature.HybridSignatureContexts;

lib/src/main/java/zeroecho/sdk/builders/alg/AesDataContentBuilder.java

@@ -33,8 +33,6 @@
  ******************************************************************************/
 package zeroecho.sdk.builders.alg;
 
-import zeroecho.sdk.ZeroEchoSession;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.GeneralSecurityException;
@@ -55,6 +53,7 @@ import zeroecho.core.alg.aes.AesKeyImportSpec;
 import zeroecho.core.alg.aes.AesSpec;
 import zeroecho.core.context.EncryptionContext;
 import zeroecho.core.spi.ContextAware;
+import zeroecho.sdk.ZeroEchoSession;
 import zeroecho.sdk.builders.core.DataContentBuilder;
 import zeroecho.sdk.content.api.DataContent;
 import zeroecho.sdk.content.api.EncryptedContent;

lib/src/main/java/zeroecho/sdk/builders/alg/ChaChaDataContentBuilder.java

@@ -33,8 +33,6 @@
  ******************************************************************************/
 package zeroecho.sdk.builders.alg;
 
-import zeroecho.sdk.ZeroEchoSession;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.GeneralSecurityException;
@@ -56,6 +54,7 @@ import zeroecho.core.alg.chacha.ChaChaSpec;
 import zeroecho.core.context.EncryptionContext;
 import zeroecho.core.spec.ContextSpec;
 import zeroecho.core.spi.ContextAware;
+import zeroecho.sdk.ZeroEchoSession;
 import zeroecho.sdk.builders.core.DataContentBuilder;
 import zeroecho.sdk.content.api.DataContent;
 import zeroecho.sdk.content.api.EncryptedContent;

lib/src/main/java/zeroecho/sdk/builders/alg/DigestDataContentBuilder.java

@@ -33,8 +33,6 @@
  ******************************************************************************/
 package zeroecho.sdk.builders.alg;
 
-import zeroecho.sdk.ZeroEchoSession;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -50,6 +48,7 @@ import zeroecho.core.NullKey;
 import zeroecho.core.alg.digest.DigestSpec;
 import zeroecho.core.context.DigestContext;
 import zeroecho.core.io.TailStrippingInputStream;
+import zeroecho.sdk.ZeroEchoSession;
 import zeroecho.sdk.builders.core.DataContentBuilder;
 import zeroecho.sdk.content.api.DataContent;
 import zeroecho.sdk.content.api.PlainContent;

lib/src/main/java/zeroecho/sdk/builders/alg/ElgamalEncDataContentBuilder.java

@@ -33,8 +33,6 @@
  ******************************************************************************/
 package zeroecho.sdk.builders.alg;
 
-import zeroecho.sdk.ZeroEchoSession;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.GeneralSecurityException;
@@ -50,6 +48,7 @@ import zeroecho.core.alg.elgamal.ElgamalParamSpec;
 import zeroecho.core.alg.elgamal.ElgamalPrivateKeySpec;
 import zeroecho.core.alg.elgamal.ElgamalPublicKeySpec;
 import zeroecho.core.context.EncryptionContext;
+import zeroecho.sdk.ZeroEchoSession;
 import zeroecho.sdk.builders.core.DataContentBuilder;
 import zeroecho.sdk.content.api.DataContent;
 import zeroecho.sdk.content.api.EncryptedContent;

lib/src/main/java/zeroecho/sdk/builders/alg/HmacDataContentBuilder.java

@@ -33,8 +33,6 @@
  ******************************************************************************/
 package zeroecho.sdk.builders.alg;
 
-import zeroecho.sdk.ZeroEchoSession;
-
 import java.io.ByteArrayInputStream;
 import java.io.FilterInputStream;
 import java.io.IOException;
@@ -52,6 +50,7 @@ import zeroecho.core.alg.hmac.HmacKeyImportSpec;
 import zeroecho.core.alg.hmac.HmacSpec;
 import zeroecho.core.context.MacContext;
 import zeroecho.core.io.TailStrippingInputStream;
+import zeroecho.sdk.ZeroEchoSession;
 import zeroecho.sdk.builders.core.DataContentBuilder;
 import zeroecho.sdk.content.api.DataContent;
 import zeroecho.sdk.content.api.PlainContent;

lib/src/main/java/zeroecho/sdk/builders/alg/KemDataContentBuilder.java

@@ -33,8 +33,6 @@
  ******************************************************************************/
 package zeroecho.sdk.builders.alg;
 
-import zeroecho.sdk.ZeroEchoSession;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -55,6 +53,7 @@ import zeroecho.core.context.KemContext;
 import zeroecho.core.context.KemContext.KemResult;
 import zeroecho.core.io.Util;
 import zeroecho.core.spec.VoidSpec;
+import zeroecho.sdk.ZeroEchoSession;
 import zeroecho.sdk.builders.core.DataContentBuilder;
 import zeroecho.sdk.content.api.DataContent;
 import zeroecho.sdk.content.api.EncryptedContent;

lib/src/main/java/zeroecho/sdk/builders/alg/RsaEncDataContentBuilder.java

@@ -33,8 +33,6 @@
  ******************************************************************************/
 package zeroecho.sdk.builders.alg;
 
-import zeroecho.sdk.ZeroEchoSession;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.GeneralSecurityException;
@@ -49,6 +47,7 @@ import zeroecho.core.alg.rsa.RsaKeyGenSpec;
 import zeroecho.core.alg.rsa.RsaPrivateKeySpec;
 import zeroecho.core.alg.rsa.RsaPublicKeySpec;
 import zeroecho.core.context.EncryptionContext;
+import zeroecho.sdk.ZeroEchoSession;
 import zeroecho.sdk.builders.core.DataContentBuilder;
 import zeroecho.sdk.content.api.DataContent;
 import zeroecho.sdk.content.api.EncryptedContent;

lib/src/main/java/zeroecho/sdk/builders/alg/RsaSigDataContentBuilder.java

@@ -33,8 +33,6 @@
  ******************************************************************************/
 package zeroecho.sdk.builders.alg;
 
-import zeroecho.sdk.ZeroEchoSession;
-
 import java.io.ByteArrayInputStream;
 import java.io.FilterInputStream;
 import java.io.IOException;
@@ -56,6 +54,7 @@ import zeroecho.core.alg.rsa.RsaPublicKeySpec;
 import zeroecho.core.alg.rsa.RsaSigSpec;
 import zeroecho.core.context.SignatureContext;
 import zeroecho.core.io.TailStrippingInputStream;
+import zeroecho.sdk.ZeroEchoSession;
 import zeroecho.sdk.builders.core.DataContentBuilder;
 import zeroecho.sdk.content.api.DataContent;
 import zeroecho.sdk.content.api.PlainContent;

lib/src/main/java/zeroecho/sdk/content/builtin/SecretPassword.java

@@ -45,8 +45,8 @@ import java.util.concurrent.locks.ReentrantLock;
 
 import javax.security.auth.Destroyable;
 
-import zeroecho.sdk.content.api.SecretContent;
 import zeroecho.sdk.content.api.DataContent;
+import zeroecho.sdk.content.api.SecretContent;
 import zeroecho.sdk.util.Password;
 
 /**

lib/src/main/java/zeroecho/sdk/guard/EncCtxOpener.java

@@ -33,8 +33,6 @@
  ******************************************************************************/
 package zeroecho.sdk.guard;
 
-import zeroecho.sdk.ZeroEchoSession;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -44,6 +42,7 @@ import java.util.Objects;
 
 import zeroecho.core.KeyUsage;
 import zeroecho.core.context.EncryptionContext;
+import zeroecho.sdk.ZeroEchoSession;
 
 /**
  * Reusable opener for {@code CTX-ENC:<algorithm>} entries.

lib/src/main/java/zeroecho/sdk/guard/Encryptor.java

@@ -48,11 +48,11 @@ import javax.crypto.spec.SecretKeySpec;
 import javax.security.auth.DestroyFailedException;
 
 import zeroecho.core.io.Util;
+import zeroecho.core.util.RandomSupport;
 import zeroecho.sdk.builders.alg.AesDataContentBuilder;
 import zeroecho.sdk.builders.alg.ChaChaDataContentBuilder;
 import zeroecho.sdk.content.api.DataContent;
 import zeroecho.sdk.content.api.EncryptedContent;
-import zeroecho.core.util.RandomSupport;
 
 /**
  * Encrypting stage that emits the recipient table followed by the symmetric

lib/src/main/java/zeroecho/sdk/guard/KemCtxOpener.java

@@ -33,8 +33,6 @@
  ******************************************************************************/
 package zeroecho.sdk.guard;
 
-import zeroecho.sdk.ZeroEchoSession;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
@@ -46,6 +44,7 @@ import javax.crypto.AEADBadTagException;
 import zeroecho.core.KeyUsage;
 import zeroecho.core.context.KemContext;
 import zeroecho.core.io.Util;
+import zeroecho.sdk.ZeroEchoSession;
 
 /**
  * Reusable opener for {@code KEM:<algorithm>:GCM-WRAP} entries.

lib/src/main/java/zeroecho/sdk/guard/PasswordRecipient.java

@@ -43,8 +43,8 @@ import java.util.concurrent.locks.ReentrantLock;
 import javax.security.auth.Destroyable;
 
 import zeroecho.core.io.Util;
-import zeroecho.sdk.Pbkdf2Limits;
 import zeroecho.core.util.RandomSupport;
+import zeroecho.sdk.Pbkdf2Limits;
 
 /**
  * Password recipient that derives a KEK via PBKDF2(HMAC-SHA-256) and wraps the

lib/src/main/java/zeroecho/sdk/hybrid/kex/HybridKexContexts.java

@@ -33,8 +33,6 @@
  ******************************************************************************/
 package zeroecho.sdk.hybrid.kex;
 
-import zeroecho.sdk.ZeroEchoSession;
-
 import java.io.IOException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
@@ -45,6 +43,7 @@ import zeroecho.core.context.AgreementContext;
 import zeroecho.core.context.CryptoContext;
 import zeroecho.core.context.MessageAgreementContext;
 import zeroecho.core.spec.ContextSpec;
+import zeroecho.sdk.ZeroEchoSession;
 
 /**
  * Factory utilities for constructing hybrid key exchange (KEX) contexts.

lib/src/main/java/zeroecho/sdk/hybrid/signature/HybridSignatureContext.java

@@ -33,8 +33,6 @@
  ******************************************************************************/
 package zeroecho.sdk.hybrid.signature;
 
-import zeroecho.sdk.ZeroEchoSession;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -55,6 +53,7 @@ import zeroecho.core.err.VerificationException;
 import zeroecho.core.io.TailStrippingInputStream;
 import zeroecho.core.spec.ContextSpec;
 import zeroecho.core.tag.ThrowingBiPredicate.VerificationBiPredicate;
+import zeroecho.sdk.ZeroEchoSession;
 
 /**
  * Package-private {@link SignatureContext} that composes two signature engines.