From 819b7693790319933118544987e436601ce3b345 Mon Sep 17 00:00:00 2001 From: Ben Butler-Cole Date: Tue, 23 Feb 2016 15:03:23 +0000 Subject: [PATCH] Move and rename a server plugin class to clarify --- .../org/neo4j/server/AbstractNeoServer.java | 4 +-- .../configuration/BaseServerConfigLoader.java | 7 +---- .../server/modules/ExtensionInitializer.java | 4 +-- .../ConfigAdapter.java} | 6 ++-- .../ConfigAdapterTest.java} | 29 ++++++++++--------- .../rest/web/RestfulGraphDatabaseTest.java | 16 +++++----- 6 files changed, 32 insertions(+), 34 deletions(-) rename community/server/src/main/java/org/neo4j/server/{configuration/ConfigWrappingConfiguration.java => plugins/ConfigAdapter.java} (95%) rename community/server/src/test/java/org/neo4j/server/{configuration/ConfigWrappingConfigurationTest.java => plugins/ConfigAdapterTest.java} (70%) diff --git a/community/server/src/main/java/org/neo4j/server/AbstractNeoServer.java b/community/server/src/main/java/org/neo4j/server/AbstractNeoServer.java index 2009b9f837d9c..0f0e5647714e9 100644 --- a/community/server/src/main/java/org/neo4j/server/AbstractNeoServer.java +++ b/community/server/src/main/java/org/neo4j/server/AbstractNeoServer.java @@ -53,7 +53,7 @@ import org.neo4j.kernel.lifecycle.LifeSupport; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; -import org.neo4j.server.configuration.ConfigWrappingConfiguration; +import org.neo4j.server.plugins.ConfigAdapter; import org.neo4j.server.configuration.ServerSettings; import org.neo4j.server.database.CypherExecutor; import org.neo4j.server.database.CypherExecutorProvider; @@ -532,7 +532,7 @@ protected Collection> createDefaultInjectables() singletons.add( new DatabaseActions.Provider( databaseActions ) ); singletons.add( new GraphDatabaseServiceProvider( database ) ); singletons.add( new NeoServerProvider( this ) ); - singletons.add( providerForSingleton( new ConfigWrappingConfiguration( getConfig() ), Configuration.class ) ); + singletons.add( providerForSingleton( new ConfigAdapter( getConfig() ), Configuration.class ) ); singletons.add( providerForSingleton( getConfig(), Config.class ) ); singletons.add( new WebServerProvider( getWebServer() ) ); diff --git a/community/server/src/main/java/org/neo4j/server/configuration/BaseServerConfigLoader.java b/community/server/src/main/java/org/neo4j/server/configuration/BaseServerConfigLoader.java index 56e0f7b676bff..4c1950f60d163 100644 --- a/community/server/src/main/java/org/neo4j/server/configuration/BaseServerConfigLoader.java +++ b/community/server/src/main/java/org/neo4j/server/configuration/BaseServerConfigLoader.java @@ -58,7 +58,7 @@ public Config loadConfig( File configFile, File legacyConfigFile, Log log, Pair< overrideEmbeddedDefaults( config ); applyUserOverrides( config, configOverrides ); - config.registerSettingsClasses( getDefaultSettingsClasses() ); + config.registerSettingsClasses( asList( ServerSettings.class, GraphDatabaseSettings.class ) ); return config; } @@ -105,11 +105,6 @@ private static void overrideEmbeddedDefaults( Config config ) config.applyChanges( params ); } - protected static Iterable> getDefaultSettingsClasses() - { - return asList( ServerSettings.class, GraphDatabaseSettings.class ); - } - private static Map loadFromFile( Log log, File file ) { if ( file == null ) diff --git a/community/server/src/main/java/org/neo4j/server/modules/ExtensionInitializer.java b/community/server/src/main/java/org/neo4j/server/modules/ExtensionInitializer.java index dfac92792222d..057518cbf67aa 100644 --- a/community/server/src/main/java/org/neo4j/server/modules/ExtensionInitializer.java +++ b/community/server/src/main/java/org/neo4j/server/modules/ExtensionInitializer.java @@ -26,7 +26,7 @@ import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.configuration.Config; import org.neo4j.server.NeoServer; -import org.neo4j.server.configuration.ConfigWrappingConfiguration; +import org.neo4j.server.plugins.ConfigAdapter; import org.neo4j.server.plugins.Injectable; import org.neo4j.server.plugins.PluginLifecycle; import org.neo4j.server.plugins.SPIPluginLifecycle; @@ -62,7 +62,7 @@ public Collection> initializePackages( Iterable packageNam } else { - injectables.addAll( lifecycle.start( graphDatabaseService, new ConfigWrappingConfiguration( configuration ) ) ); + injectables.addAll( lifecycle.start( graphDatabaseService, new ConfigAdapter( configuration ) ) ); } } } diff --git a/community/server/src/main/java/org/neo4j/server/configuration/ConfigWrappingConfiguration.java b/community/server/src/main/java/org/neo4j/server/plugins/ConfigAdapter.java similarity index 95% rename from community/server/src/main/java/org/neo4j/server/configuration/ConfigWrappingConfiguration.java rename to community/server/src/main/java/org/neo4j/server/plugins/ConfigAdapter.java index 2dbe0c4baade3..bf35c332f953f 100644 --- a/community/server/src/main/java/org/neo4j/server/configuration/ConfigWrappingConfiguration.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/ConfigAdapter.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.server.configuration; +package org.neo4j.server.plugins; import java.lang.reflect.Field; import java.util.HashMap; @@ -34,11 +34,11 @@ import org.neo4j.kernel.configuration.AnnotatedFieldHarvester; import org.neo4j.kernel.configuration.Config; -public class ConfigWrappingConfiguration extends AbstractConfiguration +public class ConfigAdapter extends AbstractConfiguration { private final Config config; - public ConfigWrappingConfiguration( Config config ) + public ConfigAdapter( Config config ) { this.config = config; } diff --git a/community/server/src/test/java/org/neo4j/server/configuration/ConfigWrappingConfigurationTest.java b/community/server/src/test/java/org/neo4j/server/plugins/ConfigAdapterTest.java similarity index 70% rename from community/server/src/test/java/org/neo4j/server/configuration/ConfigWrappingConfigurationTest.java rename to community/server/src/test/java/org/neo4j/server/plugins/ConfigAdapterTest.java index bdda3e1fcfc29..53872b2a1ef9d 100644 --- a/community/server/src/test/java/org/neo4j/server/configuration/ConfigWrappingConfigurationTest.java +++ b/community/server/src/test/java/org/neo4j/server/plugins/ConfigAdapterTest.java @@ -17,28 +17,29 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.server.configuration; - -import org.junit.Test; +package org.neo4j.server.plugins; import java.net.URI; import java.util.HashMap; +import org.junit.Test; + import org.neo4j.kernel.configuration.Config; +import org.neo4j.server.configuration.ServerSettings; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; + import static org.neo4j.helpers.collection.MapUtil.stringMap; -public class ConfigWrappingConfigurationTest +public class ConfigAdapterTest { - @Test public void shouldGetDefaultPropertyByKey() throws Exception { // GIVEN - Config config = new Config( new HashMap(), BaseServerConfigLoader.getDefaultSettingsClasses() ); - ConfigWrappingConfiguration wrappingConfiguration = new ConfigWrappingConfiguration( config ); + Config config = new Config( new HashMap<>(), ServerSettings.class ); + ConfigAdapter wrappingConfiguration = new ConfigAdapter( config ); // WHEN final Object propertyValue = wrappingConfiguration.getProperty( ServerSettings.rest_api_path.name() ); @@ -51,8 +52,8 @@ public void shouldGetDefaultPropertyByKey() throws Exception public void shouldGetPropertyInRightFormat() throws Exception { // GIVEN - Config config = new Config( new HashMap(), BaseServerConfigLoader.getDefaultSettingsClasses() ); - ConfigWrappingConfiguration wrappingConfiguration = new ConfigWrappingConfiguration( config ); + Config config = new Config( new HashMap<>(), ServerSettings.class ); + ConfigAdapter wrappingConfiguration = new ConfigAdapter( config ); // WHEN wrappingConfiguration @@ -68,8 +69,8 @@ public void shouldContainAllKeysOfPropertiesWithDefaultOrUserDefinedValues() thr { // GIVEN - Config config = new Config( new HashMap(), BaseServerConfigLoader.getDefaultSettingsClasses() ); - ConfigWrappingConfiguration wrappingConfiguration = new ConfigWrappingConfiguration( config ); + Config config = new Config( new HashMap<>(), ServerSettings.class ); + ConfigAdapter wrappingConfiguration = new ConfigAdapter( config ); // THEN assertTrue( wrappingConfiguration.getKeys().hasNext() ); @@ -78,8 +79,8 @@ public void shouldContainAllKeysOfPropertiesWithDefaultOrUserDefinedValues() thr @Test public void shouldAbleToAccessRegisteredPropertyByName() { - Config config = new Config( new HashMap(), BaseServerConfigLoader.getDefaultSettingsClasses() ); - ConfigWrappingConfiguration wrappingConfiguration = new ConfigWrappingConfiguration( config ); + Config config = new Config( new HashMap<>(), ServerSettings.class ); + ConfigAdapter wrappingConfiguration = new ConfigAdapter( config ); assertEquals( 60000L, wrappingConfiguration.getProperty( ServerSettings.transaction_timeout.name() ) ); } @@ -88,7 +89,7 @@ public void shouldAbleToAccessRegisteredPropertyByName() public void shouldAbleToAccessNonRegisteredPropertyByName() { Config config = new Config( stringMap( ServerSettings.transaction_timeout.name(), "600" ) ); - ConfigWrappingConfiguration wrappingConfiguration = new ConfigWrappingConfiguration( config ); + ConfigAdapter wrappingConfiguration = new ConfigAdapter( config ); assertEquals( "600", wrappingConfiguration.getProperty( ServerSettings.transaction_timeout.name() ) ); } diff --git a/community/server/src/test/java/org/neo4j/server/rest/web/RestfulGraphDatabaseTest.java b/community/server/src/test/java/org/neo4j/server/rest/web/RestfulGraphDatabaseTest.java index 3edcd57836af9..768c76adc9ff7 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/web/RestfulGraphDatabaseTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/web/RestfulGraphDatabaseTest.java @@ -19,11 +19,6 @@ */ package org.neo4j.server.rest.web; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - import java.io.IOException; import java.net.URI; import java.util.Collection; @@ -37,6 +32,11 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; @@ -50,10 +50,10 @@ import org.neo4j.kernel.api.exceptions.Status.Statement; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.factory.GraphDatabaseFacade; -import org.neo4j.server.configuration.ConfigWrappingConfiguration; import org.neo4j.server.configuration.ServerSettings; import org.neo4j.server.database.Database; import org.neo4j.server.database.WrappedDatabase; +import org.neo4j.server.plugins.ConfigAdapter; import org.neo4j.server.rest.domain.GraphDbHelper; import org.neo4j.server.rest.domain.JsonHelper; import org.neo4j.server.rest.domain.JsonParseException; @@ -69,6 +69,7 @@ import static java.lang.Long.parseLong; import static java.util.Arrays.asList; + import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.hasItem; @@ -81,6 +82,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; + import static org.neo4j.kernel.api.exceptions.Status.Request.InvalidFormat; public class RestfulGraphDatabaseTest @@ -108,7 +110,7 @@ public static void doBefore() throws IOException config.registerSettingsClasses( asList( ServerSettings.class, GraphDatabaseSettings.class )); service = new RestfulGraphDatabase( new JsonFormat(), output, - new DatabaseActions( leaseManager, true, database.getGraph() ), new ConfigWrappingConfiguration( + new DatabaseActions( leaseManager, true, database.getGraph() ), new ConfigAdapter( config ) ); service = new TransactionWrappingRestfulGraphDatabase( graph, service ); }