Skip to content

Commit

Permalink
Merge pull request #6547 from eclipse/jetty-10.0.x-optimize-imports
Browse files Browse the repository at this point in the history 
Remove unused import lines
  • Loading branch information
@joakime
joakime committed Jul 27, 2021
2 parents 330fc0b + fdc210f commit a405357
Show file tree
Hide file tree
Showing 54 changed files with 2 additions and 90 deletions.
1 change: 0 additions & 1 deletion demos/embedded/src/main/java/org/eclipse/jetty/demos/OneWebAppWithJsp.java
View file
Expand Up @@ -15,7 +15,6 @@

import java.io.FileNotFoundException;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;

import org.eclipse.jetty.annotations.AnnotationConfiguration;
Expand Down
1 change: 0 additions & 1 deletion demos/embedded/src/test/java/org/eclipse/jetty/demos/LikeJettyXmlTest.java
View file
Expand Up @@ -28,7 +28,6 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assumptions.assumeTrue;

public class LikeJettyXmlTest extends AbstractEmbeddedTest
{
Expand Down
1 change: 0 additions & 1 deletion demos/embedded/src/test/java/org/eclipse/jetty/demos/OneWebAppTest.java
View file
Expand Up @@ -28,7 +28,6 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assumptions.assumeTrue;

public class OneWebAppTest extends AbstractEmbeddedTest
{
Expand Down
1 change: 0 additions & 1 deletion demos/embedded/src/test/java/org/eclipse/jetty/demos/OneWebAppWithJspTest.java
View file
Expand Up @@ -27,7 +27,6 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assumptions.assumeTrue;

public class OneWebAppWithJspTest extends AbstractEmbeddedTest
{
Expand Down
1 change: 0 additions & 1 deletion demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithAnnotationsTest.java
View file
Expand Up @@ -27,7 +27,6 @@
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.junit.jupiter.api.Assumptions.assumeTrue;

public class ServerWithAnnotationsTest extends AbstractEmbeddedTest
{
Expand Down
1 change: 0 additions & 1 deletion demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithJNDITest.java
View file
Expand Up @@ -28,7 +28,6 @@
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.junit.jupiter.api.Assumptions.assumeTrue;

public class ServerWithJNDITest extends AbstractEmbeddedTest
{
Expand Down
1 change: 0 additions & 1 deletion jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
View file
Expand Up @@ -18,7 +18,6 @@
import java.net.URI;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
Expand Down
8 changes: 0 additions & 8 deletions ...-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationConfiguration.java
View file
Expand Up @@ -16,18 +16,10 @@
import java.io.File;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.servlet.ServletContainerInitializer;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;

import org.eclipse.jetty.annotations.AnnotationConfiguration.ClassInheritanceMap;
import org.eclipse.jetty.annotations.AnnotationConfiguration.DiscoveredServletContainerInitializerHolder;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.toolchain.test.FS;
import org.eclipse.jetty.toolchain.test.JAR;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
Expand Down
1 change: 0 additions & 1 deletion jetty-client/src/test/java/org/eclipse/jetty/client/util/SPNEGOAuthenticationTest.java
View file
Expand Up @@ -49,7 +49,6 @@
import org.eclipse.jetty.util.security.Constraint;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.condition.JRE;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
import org.slf4j.Logger;
Expand Down
1 change: 0 additions & 1 deletion ...azelcast/src/main/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStore.java
View file
Expand Up @@ -24,7 +24,6 @@
import com.hazelcast.config.IndexType;
import com.hazelcast.map.IMap;
import com.hazelcast.query.Predicate;
import com.hazelcast.query.PredicateBuilder;
import com.hazelcast.query.PredicateBuilder.EntryObject;
import com.hazelcast.query.Predicates;
import org.eclipse.jetty.server.session.AbstractSessionDataStore;
Expand Down
1 change: 0 additions & 1 deletion ...t/src/main/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreFactory.java
View file
Expand Up @@ -21,7 +21,6 @@
import com.hazelcast.client.config.XmlClientConfigBuilder;
import com.hazelcast.config.Config;
import com.hazelcast.config.MapConfig;
import com.hazelcast.config.SerializationConfig;
import com.hazelcast.config.SerializerConfig;
import com.hazelcast.config.XmlConfigBuilder;
import com.hazelcast.core.Hazelcast;
Expand Down
2 changes: 0 additions & 2 deletions ...common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java
View file
Expand Up @@ -17,8 +17,6 @@
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;

import org.eclipse.jetty.server.session.AbstractSessionDataStore;
import org.eclipse.jetty.server.session.SessionData;
Expand Down
1 change: 0 additions & 1 deletion ...src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStoreFactory.java
View file
Expand Up @@ -14,7 +14,6 @@
package org.eclipse.jetty.session.infinispan;

import org.eclipse.jetty.server.session.AbstractSessionDataStoreFactory;
import org.eclipse.jetty.server.session.SessionData;
import org.eclipse.jetty.server.session.SessionDataStore;
import org.eclipse.jetty.server.session.SessionHandler;
import org.infinispan.commons.api.BasicCache;
Expand Down
1 change: 0 additions & 1 deletion ...query/src/main/java/org/eclipse/jetty/session/infinispan/EmbeddedQueryManagerFactory.java
View file
Expand Up @@ -13,7 +13,6 @@

package org.eclipse.jetty.session.infinispan;

import org.eclipse.jetty.server.session.SessionData;
import org.infinispan.Cache;
import org.infinispan.commons.api.BasicCache;

Expand Down
1 change: 0 additions & 1 deletion ...e-query/src/main/java/org/eclipse/jetty/session/infinispan/RemoteQueryManagerFactory.java
View file
Expand Up @@ -13,7 +13,6 @@

package org.eclipse.jetty.session.infinispan;

import org.eclipse.jetty.server.session.SessionData;
import org.infinispan.client.hotrod.RemoteCache;
import org.infinispan.commons.api.BasicCache;

Expand Down
2 changes: 0 additions & 2 deletions ...ery/src/test/java/org/eclipse/jetty/server/session/infinispan/RemoteQueryManagerTest.java
View file
Expand Up @@ -48,8 +48,6 @@
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
import org.testcontainers.junit.jupiter.Testcontainers;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

@Testcontainers(disabledWithoutDocker = true)
Expand Down
3 changes: 0 additions & 3 deletions jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/AbstractLoginModule.java
View file
Expand Up @@ -14,8 +14,6 @@
package org.eclipse.jetty.jaas.spi;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
Expand All @@ -32,7 +30,6 @@
import org.eclipse.jetty.jaas.JAASRole;
import org.eclipse.jetty.jaas.callback.ObjectCallback;
import org.eclipse.jetty.security.UserPrincipal;
import org.eclipse.jetty.util.thread.AutoLock;

/**
* AbstractLoginModule
Expand Down
3 changes: 0 additions & 3 deletions jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/PropertyFileLoginModule.java
View file
Expand Up @@ -16,7 +16,6 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
Expand All @@ -26,8 +25,6 @@
import org.eclipse.jetty.security.PropertyUserStore;
import org.eclipse.jetty.security.RolePrincipal;
import org.eclipse.jetty.security.UserPrincipal;
import org.eclipse.jetty.server.UserIdentity;
import org.eclipse.jetty.util.security.Credential;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
1 change: 0 additions & 1 deletion ...en-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractUnassembledWebAppMojo.java
View file
Expand Up @@ -17,7 +17,6 @@
import java.io.IOException;
import java.nio.file.Path;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;

Expand Down
1 change: 0 additions & 1 deletion jetty-osgi/test-jetty-osgi-webapp-resources/src/main/java/com/acme/HelloWorld.java
View file
Expand Up @@ -16,7 +16,6 @@
import java.io.IOException;
import java.net.URL;
import java.util.Enumeration;
import java.util.Set;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
Expand Down
1 change: 0 additions & 1 deletion ...t-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiAnnotationParser.java
View file
Expand Up @@ -16,7 +16,6 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
Expand Down
2 changes: 0 additions & 2 deletions ...jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiClasspathResources.java
View file
Expand Up @@ -23,7 +23,6 @@
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.ContentResponse;
import org.eclipse.jetty.http.HttpStatus;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
Expand All @@ -38,7 +37,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;

/**
* TestJettyOSGiClasspathResources
Expand Down
2 changes: 0 additions & 2 deletions jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
View file
Expand Up @@ -25,7 +25,6 @@
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.options.WrappedUrlProvisionOption.OverwriteMode;
import org.ops4j.pax.tinybundles.core.TinyBundle;
import org.ops4j.pax.tinybundles.core.TinyBundles;
import org.osgi.framework.Bundle;
Expand All @@ -38,7 +37,6 @@
import static org.junit.Assert.assertTrue;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;

/**
* Helper methods for pax-exam tests
Expand Down
1 change: 0 additions & 1 deletion jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusDescriptorProcessor.java
View file
Expand Up @@ -18,7 +18,6 @@
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;

import org.eclipse.jetty.jndi.NamingUtil;
import org.eclipse.jetty.plus.annotation.Injection;
Expand Down
1 change: 0 additions & 1 deletion ...plus/src/test/java/org/eclipse/jetty/plus/annotation/LifeCycleCallbackCollectionTest.java
View file
Expand Up @@ -16,7 +16,6 @@
import java.lang.reflect.Method;
import javax.servlet.http.HttpServlet;

import org.eclipse.jetty.plus.webapp.PlusDecorator;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
Expand Down
1 change: 0 additions & 1 deletion jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ConnectHandler.java
View file
Expand Up @@ -47,7 +47,6 @@
import org.eclipse.jetty.server.HttpTransport;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.handler.HandlerWrapper;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.HostPort;
import org.eclipse.jetty.util.Promise;
Expand Down
1 change: 0 additions & 1 deletion jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
View file
Expand Up @@ -29,7 +29,6 @@
import org.eclipse.jetty.client.api.Result;
import org.eclipse.jetty.client.util.AsyncRequestContent;
import org.eclipse.jetty.client.util.InputStreamRequestContent;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.util.Callback;

/**
Expand Down
3 changes: 2 additions & 1 deletion jetty-runner/src/it/test-jar-manifest/postbuild.groovy
View file
@@ -1,4 +1,5 @@
import java.util.jar.*
import java.util.jar.Attributes
import java.util.jar.JarFile

File artifact = new File( basedir, "target/jetty-runner.jar" )
assert artifact.exists()
Expand Down
3 changes: 0 additions & 3 deletions jetty-security/src/test/java/org/eclipse/jetty/security/TestLoginService.java
View file
Expand Up @@ -13,11 +13,8 @@

package org.eclipse.jetty.security;

import java.util.ArrayList;
import java.util.List;
import java.util.Set;

import org.eclipse.jetty.server.UserIdentity;
import org.eclipse.jetty.util.security.Credential;

/**
Expand Down
1 change: 0 additions & 1 deletion jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContextEvent.java
View file
Expand Up @@ -15,7 +15,6 @@

import javax.servlet.AsyncContext;
import javax.servlet.AsyncEvent;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
Expand Down
2 changes: 0 additions & 2 deletions jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java
View file
Expand Up @@ -28,7 +28,6 @@
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
Expand All @@ -39,7 +38,6 @@

import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.ByteArrayOutputStream2;
import org.eclipse.jetty.util.LazyList;
import org.eclipse.jetty.util.MultiException;
import org.eclipse.jetty.util.MultiMap;
import org.eclipse.jetty.util.QuotedStringTokenizer;
Expand Down
1 change: 0 additions & 1 deletion jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
View file
Expand Up @@ -67,7 +67,6 @@
import org.eclipse.jetty.http.BadMessageException;
import org.eclipse.jetty.http.ComplianceViolation;
import org.eclipse.jetty.http.HostPortHttpField;
import org.eclipse.jetty.http.HttpCompliance;
import org.eclipse.jetty.http.HttpCookie;
import org.eclipse.jetty.http.HttpCookie.SetCookieHttpField;
import org.eclipse.jetty.http.HttpField;
Expand Down
8 changes: 0 additions & 8 deletions jetty-server/src/test/java/org/eclipse/jetty/server/BlockingTest.java
View file
Expand Up @@ -14,7 +14,6 @@
package org.eclipse.jetty.server;

import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
Expand All @@ -23,13 +22,10 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.BrokenBarrierException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Predicate;
import java.util.zip.GZIPOutputStream;
import javax.servlet.AsyncContext;
import javax.servlet.DispatcherType;
import javax.servlet.ServletException;
Expand All @@ -41,14 +37,10 @@
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.server.handler.gzip.GzipHandler;
import org.hamcrest.Matchers;
import org.hamcrest.core.Is;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import static org.hamcrest.MatcherAssert.assertThat;
Expand Down
1 change: 0 additions & 1 deletion jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
View file
Expand Up @@ -47,7 +47,6 @@
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.condition.JRE;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
1 change: 0 additions & 1 deletion jetty-server/src/test/java/org/eclipse/jetty/server/session/HouseKeeperTest.java
View file
Expand Up @@ -20,7 +20,6 @@
import org.eclipse.jetty.util.thread.Scheduler;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNotSame;
Expand Down
1 change: 0 additions & 1 deletion jetty-server/src/test/java/org/eclipse/jetty/server/session/SessionHandlerTest.java
View file
Expand Up @@ -17,7 +17,6 @@
import java.util.Collections;
import java.util.HashSet;
import javax.servlet.SessionTrackingMode;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;

Expand Down
1 change: 0 additions & 1 deletion jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLReadEOFAfterResponseTest.java
View file
Expand Up @@ -34,7 +34,6 @@
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.JRE;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
Expand Down
1 change: 0 additions & 1 deletion jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ListenerHolder.java
View file
Expand Up @@ -15,7 +15,6 @@

import java.util.EventListener;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;

import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.util.thread.AutoLock;
Expand Down
1 change: 0 additions & 1 deletion jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletRequestLogTest.java
View file
Expand Up @@ -42,7 +42,6 @@
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.server.handler.ErrorHandler;
import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.toolchain.test.IO;
import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.params.ParameterizedTest;
Expand Down

0 comments on commit a405357

Please sign in to comment.