optimized imports

ad-connector/src/main/java/net/jami/jams/ad/connector/service/UserProfileService.java

@@ -27,7 +27,14 @@ import com.imperva.ddc.core.language.PhraseOperator;
 import com.imperva.ddc.core.language.QueryAssembler;
 import com.imperva.ddc.core.language.Sentence;
 import com.imperva.ddc.core.language.SentenceOperator;
-import com.imperva.ddc.core.query.*;
+import com.imperva.ddc.core.query.DirectoryType;
+import com.imperva.ddc.core.query.Endpoint;
+import com.imperva.ddc.core.query.EntityResponse;
+import com.imperva.ddc.core.query.Field;
+import com.imperva.ddc.core.query.FieldType;
+import com.imperva.ddc.core.query.ObjectType;
+import com.imperva.ddc.core.query.QueryRequest;
+import com.imperva.ddc.core.query.QueryResponse;
 import lombok.extern.slf4j.Slf4j;
 import net.jami.jams.ad.connector.ADConnector;
 import net.jami.jams.common.objects.user.UserProfile;

authentication-module/src/main/java/net/jami/jams/authmodule/UserAuthenticationModule.java

@@ -38,7 +38,11 @@ import net.jami.jams.common.objects.user.User;
 import net.jami.jams.common.utils.LibraryLoader;
 import net.jami.jams.common.utils.X509Utils;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.PrivateKey;

jams-ca/src/main/java/net/jami/jams/ca/workers/csr/utils/ExtensionLibrary.java

@@ -23,7 +23,18 @@
 package net.jami.jams.ca.workers.csr.utils;
 
 import net.jami.jams.ca.JamsCA;
-import org.bouncycastle.asn1.x509.*;
+import org.bouncycastle.asn1.x509.AccessDescription;
+import org.bouncycastle.asn1.x509.AuthorityInformationAccess;
+import org.bouncycastle.asn1.x509.BasicConstraints;
+import org.bouncycastle.asn1.x509.CRLDistPoint;
+import org.bouncycastle.asn1.x509.DistributionPoint;
+import org.bouncycastle.asn1.x509.DistributionPointName;
+import org.bouncycastle.asn1.x509.ExtendedKeyUsage;
+import org.bouncycastle.asn1.x509.Extension;
+import org.bouncycastle.asn1.x509.GeneralName;
+import org.bouncycastle.asn1.x509.GeneralNames;
+import org.bouncycastle.asn1.x509.KeyPurposeId;
+import org.bouncycastle.asn1.x509.KeyUsage;
 
 public class ExtensionLibrary {
 

jams-ca/src/main/java/net/jami/jams/ca/workers/ocsp/OCSPWorker.java

@@ -35,7 +35,15 @@ import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
 import org.bouncycastle.cert.X509CRLEntryHolder;
 import org.bouncycastle.cert.X509CertificateHolder;
 import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
-import org.bouncycastle.cert.ocsp.*;
+import org.bouncycastle.cert.ocsp.BasicOCSPResp;
+import org.bouncycastle.cert.ocsp.BasicOCSPRespBuilder;
+import org.bouncycastle.cert.ocsp.CertificateID;
+import org.bouncycastle.cert.ocsp.OCSPException;
+import org.bouncycastle.cert.ocsp.OCSPReq;
+import org.bouncycastle.cert.ocsp.OCSPResp;
+import org.bouncycastle.cert.ocsp.OCSPRespBuilder;
+import org.bouncycastle.cert.ocsp.Req;
+import org.bouncycastle.cert.ocsp.RespID;
 import org.bouncycastle.operator.ContentSigner;
 import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder;
 import org.bouncycastle.operator.DigestCalculatorProvider;
@@ -51,7 +59,9 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 
-import static net.jami.jams.ca.JamsCA.*;
+import static net.jami.jams.ca.JamsCA.CA;
+import static net.jami.jams.ca.JamsCA.OCSP;
+import static net.jami.jams.ca.JamsCA.crlLifetime;
 
 @Slf4j
 public class OCSPWorker extends X509Worker<String> {

jams-common/src/main/java/net/jami/jams/common/authmodule/AuthModuleKey.java

@@ -22,7 +22,11 @@
 */
 package net.jami.jams.common.authmodule;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import net.jami.jams.common.authentication.AuthenticationSourceType;
 
 @Getter

jams-common/src/main/java/net/jami/jams/common/updater/FileDescription.java

@@ -22,7 +22,11 @@
 */
 package net.jami.jams.common.updater;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import java.math.BigDecimal;
 

jams-common/src/main/java/net/jami/jams/common/utils/X509Utils.java

@@ -34,7 +34,11 @@ import org.bouncycastle.pkcs.PKCS10CertificationRequest;
 
 import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
 import java.security.KeyFactory;
 import java.security.PrivateKey;

jams-server/src/main/java/net/jami/jams/server/core/workflows/InstallationFinalizer.java

@@ -40,7 +40,10 @@ import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.security.KeyStore;
 
-import static net.jami.jams.server.Server.*;
+import static net.jami.jams.server.Server.certificateAuthority;
+import static net.jami.jams.server.Server.dataStore;
+import static net.jami.jams.server.Server.nameServer;
+import static net.jami.jams.server.Server.userAuthenticationModule;
 
 @Slf4j
 public class InstallationFinalizer {

jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java

@@ -35,7 +35,10 @@ import net.jami.jams.dht.DeviceReceiptGenerator;
 
 import java.security.cert.X509Certificate;
 
-import static net.jami.jams.server.Server.*;
+import static net.jami.jams.server.Server.certificateAuthority;
+import static net.jami.jams.server.Server.dataStore;
+import static net.jami.jams.server.Server.nameServer;
+import static net.jami.jams.server.Server.userAuthenticationModule;
 
 @Slf4j
 public class RegisterDeviceFlow {

jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/update/UpdateServlet.java

@@ -28,7 +28,6 @@ import jakarta.servlet.annotation.WebServlet;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import lombok.extern.slf4j.Slf4j;
 import net.jami.jams.common.updater.FullSystemStatusResponse;
 
 import java.io.IOException;

jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/users/UserServlet.java

@@ -37,7 +37,9 @@ import net.jami.jams.server.core.workflows.RevokeUserFlow;
 
 import java.io.IOException;
 
-import static net.jami.jams.server.Server.*;
+import static net.jami.jams.server.Server.dataStore;
+import static net.jami.jams.server.Server.nameServer;
+import static net.jami.jams.server.Server.userAuthenticationModule;
 
 @WebServlet("/api/admin/user")
 public class UserServlet extends HttpServlet {

jams-server/src/main/java/net/jami/jams/server/servlets/filters/AdminApiFilter.java

@@ -25,7 +25,11 @@ package net.jami.jams.server.servlets.filters;
 import com.nimbusds.jose.JWSVerifier;
 import com.nimbusds.jose.crypto.RSASSAVerifier;
 import com.nimbusds.jwt.SignedJWT;
-import jakarta.servlet.*;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import jakarta.servlet.annotation.WebFilter;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;

jams-server/src/main/java/net/jami/jams/server/servlets/filters/ApiFilter.java

@@ -25,7 +25,11 @@ package net.jami.jams.server.servlets.filters;
 import com.nimbusds.jose.JWSVerifier;
 import com.nimbusds.jose.crypto.RSASSAVerifier;
 import com.nimbusds.jwt.SignedJWT;
-import jakarta.servlet.*;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import jakarta.servlet.annotation.WebFilter;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;

jams-server/src/main/java/net/jami/jams/server/servlets/filters/InstallFilter.java

@@ -25,7 +25,11 @@ package net.jami.jams.server.servlets.filters;
 import com.nimbusds.jose.JWSVerifier;
 import com.nimbusds.jose.crypto.RSASSAVerifier;
 import com.nimbusds.jwt.SignedJWT;
-import jakarta.servlet.*;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import jakarta.servlet.annotation.WebFilter;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;

ldap-connector/src/main/java/net/jami/jams/ldap/connector/service/AuthenticationService.java

@@ -25,7 +25,11 @@ package net.jami.jams.ldap.connector.service;
 import lombok.extern.slf4j.Slf4j;
 import org.ldaptive.ConnectionFactory;
 import org.ldaptive.Credential;
-import org.ldaptive.auth.*;
+import org.ldaptive.auth.AuthenticationRequest;
+import org.ldaptive.auth.AuthenticationResponse;
+import org.ldaptive.auth.Authenticator;
+import org.ldaptive.auth.FormatDnResolver;
+import org.ldaptive.auth.SimpleBindAuthenticationHandler;
 
 import static net.jami.jams.ldap.connector.LDAPConnector.settings;
 

ldap-connector/src/main/java/net/jami/jams/ldap/connector/service/UserProfileService.java

@@ -25,7 +25,12 @@ package net.jami.jams.ldap.connector.service;
 import lombok.extern.slf4j.Slf4j;
 import net.jami.jams.common.objects.user.UserProfile;
 import net.jami.jams.ldap.connector.LDAPConnector;
-import org.ldaptive.*;
+import org.ldaptive.Connection;
+import org.ldaptive.ConnectionFactory;
+import org.ldaptive.LdapEntry;
+import org.ldaptive.SearchOperation;
+import org.ldaptive.SearchRequest;
+import org.ldaptive.SearchResponse;
 
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;

updater/src/main/java/net/jami/jams/updater/UpdateCheckTask.java

@@ -24,9 +24,9 @@ package net.jami.jams.updater;
 
 import com.jsoniter.JsonIterator;
 import com.jsoniter.any.Any;
-import lombok.extern.slf4j.Slf4j;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
 import net.jami.jams.common.updater.FileDescription;
 import net.jami.jams.common.utils.VersioningUtils;
 import net.jami.jams.common.utils.X509Utils;
@@ -34,19 +34,14 @@ import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.HttpClients;
+import org.apache.http.ssl.SSLContexts;
 
-import javax.net.ssl.HttpsURLConnection;
-import java.io.IOException;
+import javax.net.ssl.SSLContext;
 import java.io.InputStream;
-import java.net.URL;
 import java.security.KeyStore;
 import java.security.cert.X509Certificate;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.TimerTask;
-import org.apache.http.ssl.SSLContexts;
-import javax.net.ssl.SSLContext;
 
 
 

updater/src/main/java/net/jami/jams/updater/UpdateDownloader.java

@@ -22,19 +22,15 @@
 */
 package net.jami.jams.updater;
 
-import com.google.common.hash.HashCode;
-import com.google.common.hash.Hashing;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.any.Any;
 import lombok.extern.slf4j.Slf4j;
 import net.jami.jams.common.updater.FileDescription;
-import net.jami.jams.common.utils.VersioningUtils;
 import net.jami.jams.common.utils.X509Utils;
 import net.jami.jams.server.licensing.LicenseService;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.ssl.SSLContexts;
 
@@ -44,18 +40,14 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.KeyStore;
-import java.security.KeyStoreException;
 import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 import java.util.HashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 
 @Slf4j
 public class UpdateDownloader {
 
-    private SSLSocketFactory sslSocketFactory;
-    private Process applicationProcess;
     private SSLContext sslContext;
     private static final String KEYSTORE_TYPE = "JKS";
     private KeyStore trustStore;