Move and rename a server plugin class to clarify

neo4j · Feb 26, 2016 · 819b769 · 819b769
1 parent ac261b8
commit 819b769
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 34 deletions.
diff --git 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<InjectableProvider<?>> 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
@@ -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<Class<?>> getDefaultSettingsClasses()
-    {
-        return asList( ServerSettings.class, GraphDatabaseSettings.class );
-    }
-
     private static Map<String,String> 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
@@ -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<Injectable<?>> initializePackages( Iterable<String> packageNam
                 }
                 else
                 {
-                    injectables.addAll( lifecycle.start( graphDatabaseService, new ConfigWrappingConfiguration( configuration ) ) );
+                    injectables.addAll( lifecycle.start( graphDatabaseService, new ConfigAdapter( configuration ) ) );
                 }
             }
         }

diff --git a/...guration/ConfigWrappingConfiguration.java → ...g/neo4j/server/plugins/ConfigAdapter.java b/...guration/ConfigWrappingConfiguration.java → ...g/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 <http://www.gnu.org/licenses/>.
  */
-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/...tion/ConfigWrappingConfigurationTest.java → ...o4j/server/plugins/ConfigAdapterTest.java b/...tion/ConfigWrappingConfigurationTest.java → ...o4j/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 <http://www.gnu.org/licenses/>.
  */
-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<String,String>(), 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<String,String>(), 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<String,String>(), 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<String,String>(), 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
@@ -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 );
     }