Imports

systay · Sep 9, 2012 · 4995b58 · 4995b58
1 parent 517ca16
commit 4995b58
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 33 deletions.
diff --git a/kernel/src/main/java/org/neo4j/kernel/configuration/ConfigurationDefaults.java b/kernel/src/main/java/org/neo4j/kernel/configuration/ConfigurationDefaults.java
@@ -29,7 +29,6 @@
 import org.neo4j.graphdb.factory.Default;
 import org.neo4j.graphdb.factory.GraphDatabaseSetting;
 import org.neo4j.helpers.Pair;
-import org.neo4j.helpers.collection.Iterables;
 
 /**
  * Provides defaults for database settings.

diff --git a/kernel/src/main/java/org/neo4j/kernel/configuration/RestartOnChange.java b/kernel/src/main/java/org/neo4j/kernel/configuration/RestartOnChange.java
@@ -20,19 +20,18 @@
 
 package org.neo4j.kernel.configuration;
 
+import static org.neo4j.helpers.Specifications.or;
+import static org.neo4j.helpers.collection.Iterables.map;
+
 import java.lang.reflect.Field;
 import java.util.Arrays;
 
 import org.neo4j.graphdb.factory.GraphDatabaseSetting;
 import org.neo4j.helpers.Function;
 import org.neo4j.helpers.Specification;
 import org.neo4j.helpers.Specifications;
-import org.neo4j.helpers.collection.Iterables;
 import org.neo4j.kernel.lifecycle.Lifecycle;
 
-import static org.neo4j.helpers.Specifications.*;
-import static org.neo4j.helpers.collection.Iterables.*;
-
 /**
 * When a specified change happens, restart the given LifeSupport instance.
  * 

diff --git a/kernel/src/main/java/org/neo4j/kernel/configuration/SystemPropertiesConfiguration.java b/kernel/src/main/java/org/neo4j/kernel/configuration/SystemPropertiesConfiguration.java
@@ -24,8 +24,8 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+
 import org.neo4j.graphdb.factory.GraphDatabaseSetting;
-import org.neo4j.helpers.collection.Iterables;
 
 /**
  * Collect settings from System.getProperties(). For the given settings classes, using the GraphDatabaseSetting pattern,

diff --git a/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestGrowingFileMemoryMapping.java b/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestGrowingFileMemoryMapping.java
@@ -28,7 +28,6 @@
 import java.io.File;
 
 import org.junit.Test;
-import org.neo4j.graphdb.factory.GraphDatabaseSetting;
 import org.neo4j.kernel.DefaultFileSystemAbstraction;
 import org.neo4j.kernel.DefaultIdGeneratorFactory;
 import org.neo4j.kernel.DefaultLastCommittedTxIdSetter;

diff --git a/server/src/main/java/org/neo4j/server/NeoServer.java b/server/src/main/java/org/neo4j/server/NeoServer.java
@@ -20,15 +20,10 @@
 package org.neo4j.server;
 
 import java.net.URI;
-import java.util.Collection;
-import java.util.List;
 
 import org.apache.commons.configuration.Configuration;
 import org.neo4j.server.configuration.Configurator;
-import org.neo4j.server.database.CypherExecutor;
 import org.neo4j.server.database.Database;
-import org.neo4j.server.database.InjectableProvider;
-import org.neo4j.server.plugins.Injectable;
 import org.neo4j.server.plugins.PluginManager;
 
 public interface NeoServer

diff --git a/server/src/main/java/org/neo4j/server/modules/DiscoveryModule.java b/server/src/main/java/org/neo4j/server/modules/DiscoveryModule.java
@@ -21,13 +21,11 @@
 
 import static org.neo4j.server.JAXRSHelper.listFrom;
 
-import java.util.Collection;
 import java.util.List;
 
 import org.neo4j.kernel.impl.util.StringLogger;
 import org.neo4j.server.configuration.Configurator;
 import org.neo4j.server.logging.Logger;
-import org.neo4j.server.plugins.Injectable;
 import org.neo4j.server.web.WebServer;
 
 public class DiscoveryModule implements ServerModule

diff --git a/server/src/main/java/org/neo4j/server/modules/ManagementApiModule.java b/server/src/main/java/org/neo4j/server/modules/ManagementApiModule.java
@@ -24,14 +24,12 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
-import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.configuration.Configuration;
 import org.neo4j.kernel.impl.util.StringLogger;
 import org.neo4j.server.configuration.Configurator;
 import org.neo4j.server.logging.Logger;
-import org.neo4j.server.plugins.Injectable;
 import org.neo4j.server.web.WebServer;
 
 public class ManagementApiModule implements ServerModule

diff --git a/server/src/main/java/org/neo4j/server/modules/RESTApiModule.java b/server/src/main/java/org/neo4j/server/modules/RESTApiModule.java
@@ -24,7 +24,6 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.configuration.Configuration;
@@ -34,7 +33,6 @@
 import org.neo4j.server.database.Database;
 import org.neo4j.server.guard.GuardingRequestFilter;
 import org.neo4j.server.logging.Logger;
-import org.neo4j.server.plugins.Injectable;
 import org.neo4j.server.plugins.PluginManager;
 import org.neo4j.server.web.WebServer;
 

diff --git a/server/src/main/java/org/neo4j/server/rest/repr/RepresentationFormatRepository.java b/server/src/main/java/org/neo4j/server/rest/repr/RepresentationFormatRepository.java
@@ -29,7 +29,6 @@
 
 import org.neo4j.helpers.Service;
 import org.neo4j.server.AbstractNeoServer;
-import org.neo4j.server.plugins.PluginInvocatorProvider;
 import org.neo4j.server.plugins.PluginManager;
 import org.neo4j.server.rest.repr.formats.JsonFormat;
 

diff --git a/server/src/main/java/org/neo4j/server/web/NeoServletContainer.java b/server/src/main/java/org/neo4j/server/web/NeoServletContainer.java
@@ -22,19 +22,7 @@
 import java.util.Collection;
 import java.util.Set;
 
-import org.neo4j.server.NeoServer;
-import org.neo4j.server.NeoServerProvider;
-import org.neo4j.server.CommunityNeoServer;
-import org.neo4j.server.configuration.ConfigurationProvider;
 import org.neo4j.server.database.InjectableProvider;
-import org.neo4j.server.database.DatabaseProvider;
-import org.neo4j.server.database.GraphDatabaseServiceProvider;
-import org.neo4j.server.plugins.PluginInvocatorProvider;
-import org.neo4j.server.rest.paging.LeaseManagerProvider;
-import org.neo4j.server.rest.repr.InputFormatProvider;
-import org.neo4j.server.rest.repr.OutputFormatProvider;
-import org.neo4j.server.rest.repr.RepresentationFormatRepository;
-import org.neo4j.server.rrd.RrdDbProvider;
 
 import com.sun.jersey.api.core.ResourceConfig;
 import com.sun.jersey.spi.container.WebApplication;

diff --git a/server/src/main/java/org/neo4j/server/web/WebServer.java b/server/src/main/java/org/neo4j/server/web/WebServer.java
@@ -30,7 +30,6 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.neo4j.kernel.guard.Guard;
-import org.neo4j.server.NeoServer;
 import org.neo4j.server.database.InjectableProvider;
 import org.neo4j.server.plugins.Injectable;
 import org.neo4j.server.rest.security.SecurityRule;

diff --git a/server/src/test/java/org/neo4j/server/modules/ManagementApiModuleTest.java b/server/src/test/java/org/neo4j/server/modules/ManagementApiModuleTest.java
@@ -22,7 +22,6 @@
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyCollection;
 import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.isNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;