From 61a2e6f49b9f138277249dfc42d84be110b2a0d0 Mon Sep 17 00:00:00 2001 From: Felix Sidokhine <felix.sidokhine@randstad.ca> Date: Fri, 5 Jun 2020 19:03:42 +0300 Subject: [PATCH] removed useless imports --- .../net/jami/jams/ca/workers/crl/CRLWorker.java | 2 -- .../jams/common/objects/user/UserProfile.java | 2 -- jams-server/pom.xml | 17 ----------------- .../jami/jams/server/core/TomcatLauncher.java | 1 - .../jami/jams/server/servlets/LoginServlet.java | 3 --- .../api/install/StartInstallServlet.java | 1 - 6 files changed, 26 deletions(-) diff --git a/jams-ca/src/main/java/net/jami/jams/ca/workers/crl/CRLWorker.java b/jams-ca/src/main/java/net/jami/jams/ca/workers/crl/CRLWorker.java index cfd80cd0..d215d0fd 100644 --- a/jams-ca/src/main/java/net/jami/jams/ca/workers/crl/CRLWorker.java +++ b/jams-ca/src/main/java/net/jami/jams/ca/workers/crl/CRLWorker.java @@ -28,7 +28,6 @@ import lombok.extern.slf4j.Slf4j; import net.jami.jams.ca.JamsCA; import net.jami.jams.ca.workers.X509Worker; import net.jami.jams.common.objects.requests.RevocationRequest; -import net.jami.jams.common.serialization.fs.FileStorage; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x509.CRLReason; import org.bouncycastle.cert.X509CRLHolder; @@ -36,7 +35,6 @@ import org.bouncycastle.cert.X509v2CRLBuilder; import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; import java.io.File; -import java.io.SyncFailedException; import java.security.PrivateKey; import java.security.cert.X509Certificate; import java.util.Date; diff --git a/jams-common/src/main/java/net/jami/jams/common/objects/user/UserProfile.java b/jams-common/src/main/java/net/jami/jams/common/objects/user/UserProfile.java index 718a4ab9..9c6d99d0 100644 --- a/jams-common/src/main/java/net/jami/jams/common/objects/user/UserProfile.java +++ b/jams-common/src/main/java/net/jami/jams/common/objects/user/UserProfile.java @@ -29,10 +29,8 @@ import ezvcard.VCardVersion; import ezvcard.parameter.EmailType; import ezvcard.parameter.ImageType; import ezvcard.parameter.TelephoneType; -import ezvcard.property.Organization; import ezvcard.property.Photo; import ezvcard.property.StructuredName; -import ezvcard.property.Telephone; import lombok.Getter; import lombok.Setter; import org.bouncycastle.util.encoders.Base64; diff --git a/jams-server/pom.xml b/jams-server/pom.xml index 1d0134cc..279ea341 100644 --- a/jams-server/pom.xml +++ b/jams-server/pom.xml @@ -65,23 +65,6 @@ <build> <plugins> - <plugin> - <groupId>net.wasdev.maven.plugins</groupId> - <artifactId>swaggerdocgen-maven-plugin</artifactId> - <version>1.2</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>create</goal> - </goals> - </execution> - </executions> - <configuration> - <warFile>${project.build.directory}/jams-server-2.0.jar</warFile> - <outputFile>${project.build.directory}/swagger.json</outputFile> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> diff --git a/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java b/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java index 1cf9e9d2..8cbc6cb1 100644 --- a/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java +++ b/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java @@ -31,7 +31,6 @@ import org.apache.catalina.startup.Tomcat; import org.apache.catalina.webresources.DirResourceSet; import org.apache.catalina.webresources.JarResourceSet; import org.apache.catalina.webresources.StandardRoot; -import org.apache.catalina.webresources.WarResourceSet; import org.apache.tomcat.util.descriptor.web.ErrorPage; import java.awt.*; diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java index e129305e..36af1dab 100644 --- a/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java +++ b/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java @@ -24,15 +24,12 @@ package net.jami.jams.server.servlets; import com.jsoniter.JsonIterator; import com.jsoniter.output.JsonStream; -import jakarta.servlet.ServletException; import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import net.jami.jams.common.authmodule.AuthTokenResponse; -import net.jami.jams.common.objects.user.UserProfile; import net.jami.jams.server.servlets.api.auth.login.LoginRequest; -import net.minidev.json.JSONObject; import java.io.IOException; import java.security.cert.X509Certificate; diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/install/StartInstallServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/install/StartInstallServlet.java index af847d6e..7c9d6780 100644 --- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/install/StartInstallServlet.java +++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/install/StartInstallServlet.java @@ -39,7 +39,6 @@ import net.jami.jams.common.objects.user.AccessLevel; import net.jami.jams.common.objects.user.User; import java.io.IOException; -import java.util.List; import static net.jami.jams.server.Server.dataStore; import static net.jami.jams.server.servlets.api.auth.login.AuthRequestProcessor.processUsernamePasswordAuth; -- GitLab