Remove unused imports

wiremock · Dec 15, 2016 · 73afdec · 73afdec
1 parent 1cece0a
commit 73afdec
Show file tree

Hide file tree

Showing 50 changed files with 0 additions and 122 deletions.
diff --git a/src/main/java/com/github/tomakehurst/wiremock/admin/model/PathParams.java b/src/main/java/com/github/tomakehurst/wiremock/admin/model/PathParams.java
@@ -16,7 +16,6 @@
 package com.github.tomakehurst.wiremock.admin.model;
 
 import java.util.LinkedHashMap;
-import java.util.UUID;
 
 public class PathParams extends LinkedHashMap<String, String> {
 

diff --git a/src/main/java/com/github/tomakehurst/wiremock/admin/tasks/CreateStubMappingTask.java b/src/main/java/com/github/tomakehurst/wiremock/admin/tasks/CreateStubMappingTask.java
@@ -18,14 +18,11 @@
 import com.github.tomakehurst.wiremock.admin.AdminTask;
 import com.github.tomakehurst.wiremock.admin.model.PathParams;
 import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
-import com.github.tomakehurst.wiremock.common.Json;
 import com.github.tomakehurst.wiremock.core.Admin;
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
 import com.github.tomakehurst.wiremock.stubbing.StubMapping;
 
-import java.net.HttpURLConnection;
-
 import static java.net.HttpURLConnection.HTTP_CREATED;
 
 public class CreateStubMappingTask implements AdminTask {

diff --git a/src/main/java/com/github/tomakehurst/wiremock/admin/tasks/GetStubMappingTask.java b/src/main/java/com/github/tomakehurst/wiremock/admin/tasks/GetStubMappingTask.java
@@ -17,12 +17,10 @@
 
 import com.github.tomakehurst.wiremock.admin.AdminTask;
 import com.github.tomakehurst.wiremock.admin.model.PathParams;
-import com.github.tomakehurst.wiremock.admin.model.SingleItemResult;
 import com.github.tomakehurst.wiremock.admin.model.SingleStubMappingResult;
 import com.github.tomakehurst.wiremock.core.Admin;
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
-import com.github.tomakehurst.wiremock.stubbing.StubMapping;
 
 import java.util.UUID;
 

diff --git a/src/main/java/com/github/tomakehurst/wiremock/admin/tasks/RemoveStubMappingTask.java b/src/main/java/com/github/tomakehurst/wiremock/admin/tasks/RemoveStubMappingTask.java
@@ -21,12 +21,9 @@
 import com.github.tomakehurst.wiremock.core.Admin;
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
-import com.github.tomakehurst.wiremock.stubbing.StubMapping;
 
 import java.util.UUID;
 
-import static java.util.Collections.emptyMap;
-
 public class RemoveStubMappingTask implements AdminTask {
 
     @Override

diff --git a/src/main/java/com/github/tomakehurst/wiremock/admin/tasks/ResetRequestsTask.java b/src/main/java/com/github/tomakehurst/wiremock/admin/tasks/ResetRequestsTask.java
@@ -6,8 +6,6 @@
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
 
-import static java.util.Collections.emptyMap;
-
 public class ResetRequestsTask implements AdminTask {
 
     @Override

diff --git a/src/main/java/com/github/tomakehurst/wiremock/admin/tasks/ResetStubMappingsTask.java b/src/main/java/com/github/tomakehurst/wiremock/admin/tasks/ResetStubMappingsTask.java
@@ -6,8 +6,6 @@
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
 
-import static java.util.Collections.emptyMap;
-
 public class ResetStubMappingsTask implements AdminTask {
 
     @Override

diff --git a/src/main/java/com/github/tomakehurst/wiremock/client/BasicCredentials.java b/src/main/java/com/github/tomakehurst/wiremock/client/BasicCredentials.java
@@ -19,7 +19,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.tomakehurst.wiremock.matching.MultiValuePattern;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.equalToIgnoreCase;
 import static com.github.tomakehurst.wiremock.common.Encoding.encodeBase64;
 

diff --git a/src/main/java/com/github/tomakehurst/wiremock/client/BasicMappingBuilder.java b/src/main/java/com/github/tomakehurst/wiremock/client/BasicMappingBuilder.java
@@ -22,14 +22,12 @@
 import com.github.tomakehurst.wiremock.matching.*;
 import com.github.tomakehurst.wiremock.stubbing.StubMapping;
 
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.collect.Maps.newLinkedHashMap;
 
 class BasicMappingBuilder implements ScenarioMappingBuilder {

diff --git a/src/main/java/com/github/tomakehurst/wiremock/client/WireMock.java b/src/main/java/com/github/tomakehurst/wiremock/client/WireMock.java
@@ -20,7 +20,6 @@
 import com.github.tomakehurst.wiremock.common.FileSource;
 import com.github.tomakehurst.wiremock.common.SingleRootFileSource;
 import com.github.tomakehurst.wiremock.core.Admin;
-import com.github.tomakehurst.wiremock.core.WireMockApp;
 import com.github.tomakehurst.wiremock.extension.Parameters;
 import com.github.tomakehurst.wiremock.global.GlobalSettings;
 import com.github.tomakehurst.wiremock.global.GlobalSettingsHolder;
@@ -32,16 +31,13 @@
 import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
 import com.github.tomakehurst.wiremock.stubbing.StubMapping;
 import com.github.tomakehurst.wiremock.verification.*;
-import com.google.common.base.Predicate;
-import com.google.common.collect.FluentIterable;
 
 import java.io.File;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import static com.github.tomakehurst.wiremock.core.WireMockApp.MAPPINGS_ROOT;
 import static com.github.tomakehurst.wiremock.matching.RequestPattern.thatMatch;
 import static com.github.tomakehurst.wiremock.matching.RequestPatternBuilder.allRequests;
 import static com.google.common.collect.FluentIterable.from;

diff --git a/src/main/java/com/github/tomakehurst/wiremock/common/AbstractFileSource.java b/src/main/java/com/github/tomakehurst/wiremock/common/AbstractFileSource.java
@@ -28,7 +28,6 @@
 import static com.google.common.base.Charsets.UTF_8;
 import static com.google.common.collect.Iterables.transform;
 import static com.google.common.collect.Lists.newArrayList;
-import static java.util.Arrays.asList;
 
 public abstract class AbstractFileSource implements FileSource {
 

diff --git a/src/main/java/com/github/tomakehurst/wiremock/common/ContentTypes.java b/src/main/java/com/github/tomakehurst/wiremock/common/ContentTypes.java
@@ -19,11 +19,8 @@
 import com.github.tomakehurst.wiremock.http.ContentTypeHeader;
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-import org.apache.commons.lang3.StringUtils;
 
 import java.net.URI;
-import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 

diff --git a/src/main/java/com/github/tomakehurst/wiremock/common/Json.java b/src/main/java/com/github/tomakehurst/wiremock/common/Json.java
@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.tomakehurst.wiremock.extension.Parameters;
 
 import java.io.IOException;
 import java.util.Map;

diff --git a/src/main/java/com/github/tomakehurst/wiremock/common/UniqueFilenameGenerator.java b/src/main/java/com/github/tomakehurst/wiremock/common/UniqueFilenameGenerator.java
@@ -17,9 +17,6 @@
 
 import com.github.tomakehurst.wiremock.http.Request;
 import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
-import com.google.common.collect.FluentIterable;
-import com.google.common.collect.Iterables;
 
 import java.net.URI;
 

diff --git a/src/main/java/com/github/tomakehurst/wiremock/common/Urls.java b/src/main/java/com/github/tomakehurst/wiremock/common/Urls.java
@@ -16,7 +16,6 @@
 package com.github.tomakehurst.wiremock.common;
 
 import com.github.tomakehurst.wiremock.http.QueryParameter;
-import com.google.common.base.Function;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableListMultimap;
@@ -30,8 +29,6 @@
 import java.util.Map;
 
 import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;
-import static com.google.common.collect.Iterables.transform;
-import static java.util.Arrays.asList;
 
 public class Urls {
 

diff --git a/src/main/java/com/github/tomakehurst/wiremock/core/Admin.java b/src/main/java/com/github/tomakehurst/wiremock/core/Admin.java
@@ -23,7 +23,6 @@
 import com.github.tomakehurst.wiremock.verification.FindRequestsResult;
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
 import com.github.tomakehurst.wiremock.verification.VerificationResult;
-import com.google.common.base.Optional;
 
 import java.util.UUID;
 

diff --git a/src/main/java/com/github/tomakehurst/wiremock/core/WireMockConfiguration.java b/src/main/java/com/github/tomakehurst/wiremock/core/WireMockConfiguration.java
@@ -19,9 +19,6 @@
 import com.github.tomakehurst.wiremock.extension.Extension;
 import com.github.tomakehurst.wiremock.extension.ExtensionLoader;
 import com.github.tomakehurst.wiremock.http.CaseInsensitiveKey;
-import com.github.tomakehurst.wiremock.http.trafficlistener.DoNothingWiremockNetworkTrafficListener;
-import com.github.tomakehurst.wiremock.http.HttpServerFactory;
-import com.github.tomakehurst.wiremock.http.trafficlistener.WiremockNetworkTrafficListener;
 import com.github.tomakehurst.wiremock.http.HttpServerFactory;
 import com.github.tomakehurst.wiremock.http.trafficlistener.DoNothingWiremockNetworkTrafficListener;
 import com.github.tomakehurst.wiremock.http.trafficlistener.WiremockNetworkTrafficListener;

diff --git a/src/main/java/com/github/tomakehurst/wiremock/http/AdminRequestHandler.java b/src/main/java/com/github/tomakehurst/wiremock/http/AdminRequestHandler.java
@@ -22,11 +22,9 @@
 import com.github.tomakehurst.wiremock.admin.model.PathParams;
 import com.github.tomakehurst.wiremock.core.Admin;
 import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
-import com.github.tomakehurst.wiremock.extension.PostServeAction;
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
 
 import java.net.URI;
-import java.util.Collections;
 
 import static com.github.tomakehurst.wiremock.common.LocalNotifier.notifier;
 import static com.github.tomakehurst.wiremock.core.WireMockApp.ADMIN_CONTEXT_ROOT;

diff --git a/src/main/java/com/github/tomakehurst/wiremock/http/Fault.java b/src/main/java/com/github/tomakehurst/wiremock/http/Fault.java
@@ -17,10 +17,6 @@
 
 import com.github.tomakehurst.wiremock.core.FaultInjector;
 
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.net.Socket;
-
 public enum Fault {
 
 	EMPTY_RESPONSE {

diff --git a/src/main/java/com/github/tomakehurst/wiremock/http/HttpClientFactory.java b/src/main/java/com/github/tomakehurst/wiremock/http/HttpClientFactory.java
@@ -17,7 +17,6 @@
 
 import com.github.tomakehurst.wiremock.common.KeyStoreSettings;
 import com.github.tomakehurst.wiremock.common.ProxySettings;
-import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.client.methods.*;
 import org.apache.http.config.SocketConfig;
@@ -27,10 +26,8 @@
 import org.apache.http.conn.ssl.TrustStrategy;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
 
 import javax.net.ssl.SSLContext;
-import java.io.IOException;
 import java.security.KeyStore;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
@@ -40,7 +37,6 @@
 import static com.github.tomakehurst.wiremock.common.LocalNotifier.notifier;
 import static com.github.tomakehurst.wiremock.common.ProxySettings.NO_PROXY;
 import static com.github.tomakehurst.wiremock.http.RequestMethod.*;
-import static com.github.tomakehurst.wiremock.http.RequestMethod.PATCH;
 
 public class HttpClientFactory {
 

diff --git a/src/main/java/com/github/tomakehurst/wiremock/http/HttpHeaders.java b/src/main/java/com/github/tomakehurst/wiremock/http/HttpHeaders.java
@@ -17,8 +17,6 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.google.common.base.Function;
-import com.google.common.base.Functions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;

diff --git a/src/main/java/com/github/tomakehurst/wiremock/http/ProxyResponseRenderer.java b/src/main/java/com/github/tomakehurst/wiremock/http/ProxyResponseRenderer.java
@@ -33,15 +33,9 @@
 import java.util.List;
 
 import static com.github.tomakehurst.wiremock.common.HttpClientUtils.getEntityAsByteArrayAndCloseStream;
-import static com.github.tomakehurst.wiremock.common.LocalNotifier.notifier;
-import static com.github.tomakehurst.wiremock.http.RequestMethod.DELETE;
-import static com.github.tomakehurst.wiremock.http.RequestMethod.GET;
-import static com.github.tomakehurst.wiremock.http.RequestMethod.HEAD;
-import static com.github.tomakehurst.wiremock.http.RequestMethod.OPTIONS;
 import static com.github.tomakehurst.wiremock.http.RequestMethod.POST;
 import static com.github.tomakehurst.wiremock.http.RequestMethod.PUT;
 import static com.github.tomakehurst.wiremock.http.RequestMethod.PATCH;
-import static com.github.tomakehurst.wiremock.http.RequestMethod.TRACE;
 import static com.github.tomakehurst.wiremock.http.Response.response;
 
 public class ProxyResponseRenderer implements ResponseRenderer {

diff --git a/src/main/java/com/github/tomakehurst/wiremock/http/ResponseDefinition.java b/src/main/java/com/github/tomakehurst/wiremock/http/ResponseDefinition.java
@@ -20,8 +20,6 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize.Inclusion;
 import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
 import com.github.tomakehurst.wiremock.common.Json;
 import com.github.tomakehurst.wiremock.extension.AbstractTransformer;

diff --git a/src/main/java/com/github/tomakehurst/wiremock/jetty9/CustomizedSslContextFactory.java b/src/main/java/com/github/tomakehurst/wiremock/jetty9/CustomizedSslContextFactory.java
@@ -17,20 +17,6 @@
 
 
 import javax.net.ssl.*;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.security.GeneralSecurityException;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
 
 /**
  * Created by agupt13 on 6/9/16.

diff --git a/src/main/java/com/github/tomakehurst/wiremock/jetty9/JettyHttpServer.java b/src/main/java/com/github/tomakehurst/wiremock/jetty9/JettyHttpServer.java
@@ -20,8 +20,6 @@
 
 import java.net.Socket;
 import java.nio.ByteBuffer;
-import java.io.IOException;
-import java.net.URL;
 import java.util.EnumSet;
 
 import javax.servlet.DispatcherType;

diff --git a/src/main/java/com/github/tomakehurst/wiremock/matching/EqualToPattern.java b/src/main/java/com/github/tomakehurst/wiremock/matching/EqualToPattern.java
@@ -16,8 +16,6 @@
 package com.github.tomakehurst.wiremock.matching;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.tomakehurst.wiremock.extension.Parameters;
-import com.google.common.base.Strings;
 
 import java.util.Objects;
 

diff --git a/src/main/java/com/github/tomakehurst/wiremock/matching/MatchResult.java b/src/main/java/com/github/tomakehurst/wiremock/matching/MatchResult.java
@@ -19,7 +19,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
 
 import java.util.List;
 

diff --git a/src/main/java/com/github/tomakehurst/wiremock/servlet/WireMockHttpServletRequestAdapter.java b/src/main/java/com/github/tomakehurst/wiremock/servlet/WireMockHttpServletRequestAdapter.java
@@ -22,7 +22,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
-import java.net.URI;
 import java.util.*;
 
 import static com.github.tomakehurst.wiremock.common.Encoding.encodeBase64;

diff --git a/src/main/java/com/github/tomakehurst/wiremock/servlet/WireMockWebContextListener.java b/src/main/java/com/github/tomakehurst/wiremock/servlet/WireMockWebContextListener.java
@@ -16,21 +16,15 @@
 package com.github.tomakehurst.wiremock.servlet;
 
 import com.github.tomakehurst.wiremock.common.Notifier;
-import com.github.tomakehurst.wiremock.common.ServletContextFileSource;
 import com.github.tomakehurst.wiremock.common.Slf4jNotifier;
-import com.github.tomakehurst.wiremock.core.MappingsSaver;
 import com.github.tomakehurst.wiremock.core.WireMockApp;
-import com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformer;
 import com.github.tomakehurst.wiremock.http.AdminRequestHandler;
 import com.github.tomakehurst.wiremock.http.StubRequestHandler;
-import com.github.tomakehurst.wiremock.matching.RequestMatcherExtension;
-import com.github.tomakehurst.wiremock.standalone.JsonFileMappingsSource;
 import com.google.common.base.Optional;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
-import java.util.Collections;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 

diff --git a/src/main/java/com/github/tomakehurst/wiremock/standalone/RemoteMappingsLoader.java b/src/main/java/com/github/tomakehurst/wiremock/standalone/RemoteMappingsLoader.java
@@ -9,7 +9,6 @@
 import com.github.tomakehurst.wiremock.http.ContentTypeHeader;
 import com.github.tomakehurst.wiremock.http.HttpHeaders;
 import com.github.tomakehurst.wiremock.stubbing.StubMapping;
-import org.apache.commons.lang3.StringUtils;
 
 import static com.github.tomakehurst.wiremock.core.WireMockApp.FILES_ROOT;
 import static com.github.tomakehurst.wiremock.core.WireMockApp.MAPPINGS_ROOT;

diff --git a/src/main/java/com/github/tomakehurst/wiremock/stubbing/StubMapping.java b/src/main/java/com/github/tomakehurst/wiremock/stubbing/StubMapping.java
@@ -16,13 +16,11 @@
 package com.github.tomakehurst.wiremock.stubbing;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.github.tomakehurst.wiremock.common.Json;
 import com.github.tomakehurst.wiremock.extension.Parameters;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
 import com.github.tomakehurst.wiremock.matching.RequestPattern;
-import com.google.common.annotations.VisibleForTesting;
 
 import java.util.Map;
 import java.util.Objects;

diff --git a/src/test/java/com/github/tomakehurst/wiremock/AcceptanceTestBase.java b/src/test/java/com/github/tomakehurst/wiremock/AcceptanceTestBase.java
@@ -17,7 +17,6 @@
 
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.core.Options;
-import com.github.tomakehurst.wiremock.core.WireMockApp;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
 import com.github.tomakehurst.wiremock.junit.Stubbing;
 import com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;
@@ -28,7 +27,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 
 import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;
 import static com.github.tomakehurst.wiremock.core.WireMockApp.FILES_ROOT;