From 6ee1e6415123793f4c0119ecb5588a26f5b28002 Mon Sep 17 00:00:00 2001 From: Ben Butler-Cole Date: Tue, 9 Feb 2016 10:27:46 +0000 Subject: [PATCH] Rename 'property'->'config' where appropriate --- .../consistency/ConsistencyCheckTool.java | 20 ++-- .../consistency/ConsistencyCheckToolTest.java | 22 ++-- .../consistency/ConsistencyCheckTool.java | 20 ++-- .../consistency/ConsistencyCheckToolTest.java | 29 ++--- .../org/neo4j/server/ServerTestUtils.java | 37 +++---- .../BaseServerConfigLoaderTest.java | 10 +- ...ileBuilder.java => ConfigFileBuilder.java} | 18 ++-- .../DatabaseTuningPropertyFileBuilder.java | 85 --------------- .../configuration/ServerConfigLoaderTest.java | 8 +- .../helpers/CommunityServerBuilder.java | 9 +- .../neo4j/shell/BigLabelStoreGenerator.java | 10 +- .../org/neo4j/shell/DontShutdownClient.java | 10 +- .../neo4j/shell/DontShutdownLocalServer.java | 7 +- .../org/neo4j/shell/TestRmiPublication.java | 15 +-- .../java/org/neo4j/backup/BackupTool.java | 22 ++-- .../java/org/neo4j/backup/BackupToolTest.java | 14 +-- .../server/enterprise/ServerTestUtils.java | 102 ------------------ .../enterprise/jmx/ServerManagementTest.java | 2 +- .../neo4j/desktop/config/Installation.java | 4 +- .../config/portable/PortableInstallation.java | 2 +- .../desktop/config/unix/UnixInstallation.java | 2 +- .../config/windows/WindowsInstallation.java | 11 +- .../runtime/DesktopConfiguratorTest.java | 6 +- 23 files changed, 130 insertions(+), 335 deletions(-) rename community/server/src/test/java/org/neo4j/server/configuration/{PropertyFileBuilder.java => ConfigFileBuilder.java} (79%) delete mode 100644 community/server/src/test/java/org/neo4j/server/configuration/DatabaseTuningPropertyFileBuilder.java delete mode 100644 enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/ServerTestUtils.java diff --git a/community/consistency-check-legacy/src/main/java/org/neo4j/legacy/consistency/ConsistencyCheckTool.java b/community/consistency-check-legacy/src/main/java/org/neo4j/legacy/consistency/ConsistencyCheckTool.java index 73517ee1a1860..65d408aa7f580 100644 --- a/community/consistency-check-legacy/src/main/java/org/neo4j/legacy/consistency/ConsistencyCheckTool.java +++ b/community/consistency-check-legacy/src/main/java/org/neo4j/legacy/consistency/ConsistencyCheckTool.java @@ -84,7 +84,7 @@ public void run( String... args ) throws ToolFailureException, IOException { Args arguments = Args.withFlags( RECOVERY, PROP_OWNER ).parse( args ); File storeDir = determineStoreDirectory( arguments ); - Config tuningConfiguration = readTuningConfiguration( arguments ); + Config tuningConfiguration = readConfiguration( arguments ); attemptRecoveryOrCheckStateOfLogicalLogs( arguments, storeDir, tuningConfiguration ); @@ -143,25 +143,25 @@ private File determineStoreDirectory( Args arguments ) throws ToolFailureExcepti return storeDir; } - private Config readTuningConfiguration( Args arguments ) throws ToolFailureException + private Config readConfiguration( Args arguments ) throws ToolFailureException { - Map specifiedProperties = stringMap(); + Map specifiedConfig = stringMap(); - String propertyFilePath = arguments.get( CONFIG, null ); - if ( propertyFilePath != null ) + String configFilePath = arguments.get( CONFIG, null ); + if ( configFilePath != null ) { - File propertyFile = new File( propertyFilePath ); + File configFile = new File( configFilePath ); try { - specifiedProperties = MapUtil.load( propertyFile ); + specifiedConfig = MapUtil.load( configFile ); } catch ( IOException e ) { - throw new ToolFailureException( String.format( "Could not read configuration properties file [%s]", - propertyFilePath ), e ); + throw new ToolFailureException( String.format( "Could not read configuration file [%s]", + configFilePath ), e ); } } - return new Config( specifiedProperties, GraphDatabaseSettings.class, ConsistencyCheckSettings.class ); + return new Config( specifiedConfig, GraphDatabaseSettings.class, ConsistencyCheckSettings.class ); } private String usage() diff --git a/community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/ConsistencyCheckToolTest.java b/community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/ConsistencyCheckToolTest.java index c8a5af8ef7613..f4819acbdce2c 100644 --- a/community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/ConsistencyCheckToolTest.java +++ b/community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/ConsistencyCheckToolTest.java @@ -19,16 +19,16 @@ */ package org.neo4j.legacy.consistency; -import org.junit.Rule; -import org.junit.Test; -import org.mockito.ArgumentCaptor; - import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintStream; import java.util.Properties; +import org.junit.Rule; +import org.junit.Test; +import org.mockito.ArgumentCaptor; + import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.GraphDatabaseFactory; @@ -113,12 +113,12 @@ public void passesOnConfigurationIfProvided() throws Exception { // given File storeDir = storeDirectory.directory(); - File propertyFile = storeDirectory.file( "neo4j.conf" ); + File configFile = storeDirectory.file( "neo4j.conf" ); Properties properties = new Properties(); properties.setProperty( ConsistencyCheckSettings.consistency_check_property_owners.name(), "true" ); - properties.store( new FileWriter( propertyFile ), null ); + properties.store( new FileWriter( configFile ), null ); - String[] args = {storeDir.getPath(), "-config", propertyFile.getPath()}; + String[] args = {storeDir.getPath(), "-config", configFile.getPath()}; ConsistencyCheckService service = mock( ConsistencyCheckService.class ); PrintStream systemOut = mock( PrintStream.class ); @@ -154,11 +154,11 @@ public void exitWithFailureIndicatingCorrectUsageIfNoArgumentsSupplied() throws } @Test - public void exitWithFailureIfConfigSpecifiedButPropertiesFileDoesNotExist() throws Exception + public void exitWithFailureIfConfigSpecifiedButConfigFileDoesNotExist() throws Exception { // given - File propertyFile = storeDirectory.file( "nonexistent_file" ); - String[] args = {storeDirectory.directory().getPath(), "-config", propertyFile.getPath()}; + File configFile = storeDirectory.file( "nonexistent_file" ); + String[] args = {storeDirectory.directory().getPath(), "-config", configFile.getPath()}; ConsistencyCheckService service = mock( ConsistencyCheckService.class ); PrintStream systemOut = mock( PrintStream.class ); ConsistencyCheckTool ConsistencyCheckTool = newConsistencyCheckToolWith( service, systemOut ); @@ -172,7 +172,7 @@ public void exitWithFailureIfConfigSpecifiedButPropertiesFileDoesNotExist() thro catch ( ConsistencyCheckTool.ToolFailureException e ) { // then - assertThat( e.getMessage(), containsString( "Could not read configuration properties file" ) ); + assertThat( e.getMessage(), containsString( "Could not read configuration file" ) ); assertThat( e.getCause(), instanceOf( IOException.class ) ); } diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckTool.java b/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckTool.java index 69045542e464c..675b1a254bafa 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckTool.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckTool.java @@ -103,7 +103,7 @@ void run( String... args ) throws ToolFailureException, IOException } File storeDir = determineStoreDirectory( arguments ); - Config tuningConfiguration = readTuningConfiguration( arguments ); + Config tuningConfiguration = readConfiguration( arguments ); boolean verbose = isVerbose( arguments ); attemptRecoveryOrCheckStateOfLogicalLogs( arguments, storeDir, tuningConfiguration ); @@ -201,25 +201,25 @@ private File determineStoreDirectory( Args arguments ) throws ToolFailureExcepti return storeDir; } - private Config readTuningConfiguration( Args arguments ) throws ToolFailureException + private Config readConfiguration( Args arguments ) throws ToolFailureException { - Map specifiedProperties = stringMap(); + Map specifiedConfig = stringMap(); - String propertyFilePath = arguments.get( CONFIG, null ); - if ( propertyFilePath != null ) + String configFilePath = arguments.get( CONFIG, null ); + if ( configFilePath != null ) { - File propertyFile = new File( propertyFilePath ); + File configFile = new File( configFilePath ); try { - specifiedProperties = MapUtil.load( propertyFile ); + specifiedConfig = MapUtil.load( configFile ); } catch ( IOException e ) { - throw new ToolFailureException( String.format( "Could not read configuration properties file [%s]", - propertyFilePath ), e ); + throw new ToolFailureException( String.format( "Could not read configuration file [%s]", + configFilePath ), e ); } } - return new Config( specifiedProperties, GraphDatabaseSettings.class, ConsistencyCheckSettings.class ); + return new Config( specifiedConfig, GraphDatabaseSettings.class, ConsistencyCheckSettings.class ); } private String usage() diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckToolTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckToolTest.java index e40aa4b5e80ff..8bc2bae59dbf1 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckToolTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckToolTest.java @@ -19,13 +19,6 @@ */ package org.neo4j.consistency; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; -import org.mockito.ArgumentCaptor; - import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -34,6 +27,13 @@ import java.util.Collection; import java.util.Properties; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; +import org.mockito.ArgumentCaptor; + import org.neo4j.consistency.ConsistencyCheckTool.ToolFailureException; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Transaction; @@ -66,6 +66,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; + import static org.neo4j.consistency.ConsistencyCheckTool.USE_LEGACY_CHECKER; import static org.neo4j.graphdb.Label.label; import static org.neo4j.helpers.ArrayUtil.concat; @@ -142,12 +143,12 @@ public void passesOnConfigurationIfProvided() throws Exception assumeFalse( "This test runs with mocked ConsistencyCheckService, doesn't work with the legacy checker " + "since it creates its own", useLegacyChecker ); File storeDir = storeDirectory.directory(); - File propertyFile = storeDirectory.file( "neo4j.conf" ); + File configFile = storeDirectory.file( "neo4j.conf" ); Properties properties = new Properties(); properties.setProperty( ConsistencyCheckSettings.consistency_check_property_owners.name(), "true" ); - properties.store( new FileWriter( propertyFile ), null ); + properties.store( new FileWriter( configFile ), null ); - String[] args = {storeDir.getPath(), "-config", propertyFile.getPath()}; + String[] args = {storeDir.getPath(), "-config", configFile.getPath()}; ConsistencyCheckService service = mock( ConsistencyCheckService.class ); PrintStream systemOut = mock( PrintStream.class ); @@ -184,11 +185,11 @@ public void exitWithFailureIndicatingCorrectUsageIfNoArgumentsSupplied() throws } @Test - public void exitWithFailureIfConfigSpecifiedButPropertiesFileDoesNotExist() throws Exception + public void exitWithFailureIfConfigSpecifiedButConfigFileDoesNotExist() throws Exception { // given - File propertyFile = storeDirectory.file( "nonexistent_file" ); - String[] args = {storeDirectory.directory().getPath(), "-config", propertyFile.getPath()}; + File configFile = storeDirectory.file( "nonexistent_file" ); + String[] args = {storeDirectory.directory().getPath(), "-config", configFile.getPath()}; ConsistencyCheckService service = mock( ConsistencyCheckService.class ); PrintStream systemOut = mock( PrintStream.class ); @@ -201,7 +202,7 @@ public void exitWithFailureIfConfigSpecifiedButPropertiesFileDoesNotExist() thro catch ( ConsistencyCheckTool.ToolFailureException e ) { // then - assertThat( e.getMessage(), containsString( "Could not read configuration properties file" ) ); + assertThat( e.getMessage(), containsString( "Could not read configuration file" ) ); assertThat( e.getCause(), instanceOf( IOException.class ) ); } diff --git a/community/server/src/test/java/org/neo4j/server/ServerTestUtils.java b/community/server/src/test/java/org/neo4j/server/ServerTestUtils.java index ee73e8745580b..49f20358ca748 100644 --- a/community/server/src/test/java/org/neo4j/server/ServerTestUtils.java +++ b/community/server/src/test/java/org/neo4j/server/ServerTestUtils.java @@ -47,7 +47,7 @@ public static File getSharedTestTemporaryFolder() { try { - return createTempPropertyFile().getParentFile(); + return createTempConfigFile().getParentFile(); } catch ( Exception e ) { @@ -55,9 +55,9 @@ public static File getSharedTestTemporaryFolder() } } - public static File createTempPropertyFile() throws IOException + public static File createTempConfigFile() throws IOException { - File file = File.createTempFile( "neo4j", "properties" ); + File file = File.createTempFile( "neo4j", "conf" ); file.delete(); return file; } @@ -96,20 +96,14 @@ private static void addRelativeProperty( File temporaryFolder, Map properties, - File propertyFile ) + public static void writeConfigToFile( Map properties, File file ) { - writePropertyToFile( outerPropertyName, asOneLine( properties ), propertyFile ); - } - - public static void writePropertiesToFile( Map properties, File propertyFile ) - { - Properties props = loadProperties( propertyFile ); + Properties props = loadProperties( file ); for ( Map.Entry entry : properties.entrySet() ) { props.setProperty( entry.getKey(), entry.getValue() ); } - storeProperties( propertyFile, props ); + storeProperties( file, props ); } public static String asOneLine( Map properties ) @@ -123,19 +117,12 @@ public static String asOneLine( Map properties ) return builder.toString(); } - public static void writePropertyToFile( String name, String value, File propertyFile ) - { - Properties properties = loadProperties( propertyFile ); - properties.setProperty( name, value ); - storeProperties( propertyFile, properties ); - } - - private static void storeProperties( File propertyFile, Properties properties ) + private static void storeProperties( File file, Properties properties ) { OutputStream out = null; try { - out = new FileOutputStream( propertyFile ); + out = new FileOutputStream( file ); properties.store( out, "" ); } catch ( IOException e ) @@ -148,15 +135,15 @@ private static void storeProperties( File propertyFile, Properties properties ) } } - private static Properties loadProperties( File propertyFile ) + private static Properties loadProperties( File file ) { Properties properties = new Properties(); - if ( propertyFile.exists() ) + if ( file.exists() ) { InputStream in = null; try { - in = new FileInputStream( propertyFile ); + in = new FileInputStream( file ); properties.load( in ); } catch ( IOException e ) @@ -186,7 +173,7 @@ private static void safeClose( Closeable closeable ) } } - public static File createTempPropertyFile( File parentDir ) throws IOException + public static File createTempConfigFile( File parentDir ) throws IOException { File file = new File( parentDir, "test-" + new Random().nextInt() + ".properties" ); file.deleteOnExit(); diff --git a/community/server/src/test/java/org/neo4j/server/configuration/BaseServerConfigLoaderTest.java b/community/server/src/test/java/org/neo4j/server/configuration/BaseServerConfigLoaderTest.java index 569c0f081b62d..2492929dc7576 100644 --- a/community/server/src/test/java/org/neo4j/server/configuration/BaseServerConfigLoaderTest.java +++ b/community/server/src/test/java/org/neo4j/server/configuration/BaseServerConfigLoaderTest.java @@ -51,14 +51,14 @@ public class BaseServerConfigLoaderTest public void shouldRetainRegistrationOrderOfThirdPartyJaxRsPackages() throws IOException { // given - File propertyFile = PropertyFileBuilder.builder( folder.getRoot() ) + File configFile = ConfigFileBuilder.builder( folder.getRoot() ) .withNameValue( ServerSettings.third_party_packages.name(), "org.neo4j.extension.extension1=/extension1,org.neo4j.extension.extension2=/extension2," + "org.neo4j.extension.extension3=/extension3" ) .build(); // when - Config config = configLoader.loadConfig( null, propertyFile, log ); + Config config = configLoader.loadConfig( null, configFile, log ); // then List thirdpartyJaxRsPackages = config.get( ServerSettings.third_party_packages ); @@ -71,13 +71,13 @@ public void shouldRetainRegistrationOrderOfThirdPartyJaxRsPackages() throws IOEx } @Test - public void shouldWorkFineWhenSpecifiedPropertiesFileDoesNotExist() + public void shouldWorkFineWhenSpecifiedConfigFileDoesNotExist() { // Given - File nonExistentFilePropertiesFile = new File( "/tmp/" + System.currentTimeMillis() ); + File nonExistentConfigFile = new File( "/tmp/" + System.currentTimeMillis() ); // When - Config config = configLoader.loadConfig( null, nonExistentFilePropertiesFile, log ); + Config config = configLoader.loadConfig( null, nonExistentConfigFile, log ); // Then assertNotNull( config ); diff --git a/community/server/src/test/java/org/neo4j/server/configuration/PropertyFileBuilder.java b/community/server/src/test/java/org/neo4j/server/configuration/ConfigFileBuilder.java similarity index 79% rename from community/server/src/test/java/org/neo4j/server/configuration/PropertyFileBuilder.java rename to community/server/src/test/java/org/neo4j/server/configuration/ConfigFileBuilder.java index a9a6cbf3dcd1c..64e7746882e7c 100644 --- a/community/server/src/test/java/org/neo4j/server/configuration/PropertyFileBuilder.java +++ b/community/server/src/test/java/org/neo4j/server/configuration/ConfigFileBuilder.java @@ -27,7 +27,7 @@ import org.neo4j.helpers.collection.MapUtil; import org.neo4j.server.ServerTestUtils; -public class PropertyFileBuilder +public class ConfigFileBuilder { private final ArrayList nameValuePairs = new ArrayList<>(); private final File directory; @@ -44,12 +44,12 @@ public Tuple( String name, String value ) public String value; } - public static PropertyFileBuilder builder( File directory ) + public static ConfigFileBuilder builder( File directory ) { - return new PropertyFileBuilder( directory ); + return new ConfigFileBuilder( directory ); } - private PropertyFileBuilder( File directory ) + private ConfigFileBuilder( File directory ) { this.directory = directory; } @@ -57,18 +57,18 @@ private PropertyFileBuilder( File directory ) public File build() throws IOException { File file = new File( directory, "config" ); - Map properties = MapUtil.stringMap( + Map config = MapUtil.stringMap( ServerSettings.legacy_db_location.name(), directory.getAbsolutePath(), ServerSettings.management_api_path.name(), "http://localhost:7474/db/manage/", ServerSettings.rest_api_path.name(), "http://localhost:7474/db/data/" ); - properties.put( ServerSettings.webserver_port.name(), "7474" ); + config.put( ServerSettings.webserver_port.name(), "7474" ); for ( Tuple t : nameValuePairs ) - properties.put( t.name, t.value ); - ServerTestUtils.writePropertiesToFile( properties, file ); + config.put( t.name, t.value ); + ServerTestUtils.writeConfigToFile( config, file ); return file; } - public PropertyFileBuilder withNameValue( String name, String value ) + public ConfigFileBuilder withNameValue( String name, String value ) { nameValuePairs.add( new Tuple( name, value ) ); return this; diff --git a/community/server/src/test/java/org/neo4j/server/configuration/DatabaseTuningPropertyFileBuilder.java b/community/server/src/test/java/org/neo4j/server/configuration/DatabaseTuningPropertyFileBuilder.java deleted file mode 100644 index f0f2ccdcf4e0d..0000000000000 --- a/community/server/src/test/java/org/neo4j/server/configuration/DatabaseTuningPropertyFileBuilder.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (c) 2002-2016 "Neo Technology," - * Network Engine for Objects in Lund AB [http://neotechnology.com] - * - * This file is part of Neo4j. - * - * Neo4j is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 java.io.File; -import java.io.IOException; -import java.util.Map; - -import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.helpers.collection.MapUtil; - -import static org.neo4j.server.ServerTestUtils.writePropertiesToFile; - -public class DatabaseTuningPropertyFileBuilder -{ - private File parentDirectory = null; - private String mappedMemory = null; - private String kernelId; - - public static DatabaseTuningPropertyFileBuilder builder( File directory ) - { - return new DatabaseTuningPropertyFileBuilder( directory ); - } - - private DatabaseTuningPropertyFileBuilder( File directory ) - { - this.parentDirectory = directory; - } - - public File build() throws IOException - { - File temporaryConfigFile = new File( parentDirectory, "neo4j.conf" ); - Map properties = MapUtil.stringMap( - "neostore.relationshipstore.db.mapped_memory", "50M", - "neostore.propertystore.db.mapped_memory", "90M", - "neostore.propertystore.db.strings.mapped_memory", "130M", - "neostore.propertystore.db.arrays.mapped_memory", "150M" ); - if ( mappedMemory == null ) - { - properties.put( "neostore.nodestore.db.mapped_memory", "25M" ); - } - else - { - properties.put( "neostore.nodestore.db.mapped_memory", mappedMemory ); - } - - - if(kernelId != null) - { - properties.put( GraphDatabaseSettings.forced_kernel_id.name(), kernelId ); - } - - writePropertiesToFile( properties, temporaryConfigFile ); - return temporaryConfigFile; - } - - public DatabaseTuningPropertyFileBuilder mappedMemory( int i ) - { - this.mappedMemory = String.valueOf( i ) + "M"; - return this; - } - - public DatabaseTuningPropertyFileBuilder withKernelId(String kernelId) - { - this.kernelId = kernelId; - return this; - } -} diff --git a/community/server/src/test/java/org/neo4j/server/configuration/ServerConfigLoaderTest.java b/community/server/src/test/java/org/neo4j/server/configuration/ServerConfigLoaderTest.java index 3cdd9504883a1..f4408dd5db66e 100644 --- a/community/server/src/test/java/org/neo4j/server/configuration/ServerConfigLoaderTest.java +++ b/community/server/src/test/java/org/neo4j/server/configuration/ServerConfigLoaderTest.java @@ -49,7 +49,7 @@ public class ServerConfigLoaderTest public void shouldProvideAConfiguration() throws IOException { // given - File configFile = PropertyFileBuilder.builder( folder.getRoot() ) + File configFile = ConfigFileBuilder.builder( folder.getRoot() ) .build(); // when @@ -63,7 +63,7 @@ public void shouldProvideAConfiguration() throws IOException public void shouldUseSpecifiedConfigFile() throws Exception { // given - File configFile = PropertyFileBuilder.builder( folder.getRoot() ) + File configFile = ConfigFileBuilder.builder( folder.getRoot() ) .withNameValue( "foo", "bar" ) .build(); @@ -79,7 +79,7 @@ public void shouldUseSpecifiedConfigFile() throws Exception public void shouldAcceptDuplicateKeysWithSameValue() throws IOException { // given - File configFile = PropertyFileBuilder.builder( folder.getRoot() ) + File configFile = ConfigFileBuilder.builder( folder.getRoot() ) .withNameValue( "foo", "bar" ) .withNameValue( "foo", "bar" ) .build(); @@ -97,7 +97,7 @@ public void shouldAcceptDuplicateKeysWithSameValue() throws IOException public void shouldFindThirdPartyJaxRsPackages() throws IOException { // given - File file = ServerTestUtils.createTempPropertyFile( folder.getRoot() ); + File file = ServerTestUtils.createTempConfigFile( folder.getRoot() ); try(BufferedWriter out = new BufferedWriter( new FileWriter( file, true ) )) { diff --git a/community/server/src/test/java/org/neo4j/server/helpers/CommunityServerBuilder.java b/community/server/src/test/java/org/neo4j/server/helpers/CommunityServerBuilder.java index 46e5812d58c97..aad678f7cd8ec 100644 --- a/community/server/src/test/java/org/neo4j/server/helpers/CommunityServerBuilder.java +++ b/community/server/src/test/java/org/neo4j/server/helpers/CommunityServerBuilder.java @@ -55,7 +55,6 @@ import static org.neo4j.helpers.Clock.SYSTEM_CLOCK; import static org.neo4j.helpers.collection.MapUtil.stringMap; import static org.neo4j.server.ServerTestUtils.asOneLine; -import static org.neo4j.server.ServerTestUtils.createTempPropertyFile; import static org.neo4j.server.database.LifecycleManagingDatabase.lifecycleManagingDatabase; public class CommunityServerBuilder @@ -116,12 +115,12 @@ protected CommunityNeoServer build( File configFile, Config config, return new TestCommunityNeoServer( config, configFile, dependencies, logProvider ); } - public File createPropertiesFiles() throws IOException + public File createConfigFiles() throws IOException { - File temporaryConfigFile = createTempPropertyFile(); + File temporaryConfigFile = ServerTestUtils.createTempConfigFile(); File temporaryFolder = temporaryConfigFile.getParentFile(); - ServerTestUtils.writePropertiesToFile( createConfiguration( temporaryFolder ), temporaryConfigFile ); + ServerTestUtils.writeConfigToFile( createConfiguration( temporaryFolder ), temporaryConfigFile ); return temporaryConfigFile; } @@ -334,7 +333,7 @@ protected DatabaseActions createDatabaseActionsObject( Database database, Config protected File buildBefore() throws IOException { - File configFile = createPropertiesFiles(); + File configFile = createConfigFiles(); if ( preflightTasks == null ) { diff --git a/community/shell/src/main/java/org/neo4j/shell/BigLabelStoreGenerator.java b/community/shell/src/main/java/org/neo4j/shell/BigLabelStoreGenerator.java index 67b397ddd27ec..0c90cfe3955f4 100644 --- a/community/shell/src/main/java/org/neo4j/shell/BigLabelStoreGenerator.java +++ b/community/shell/src/main/java/org/neo4j/shell/BigLabelStoreGenerator.java @@ -102,15 +102,15 @@ private static GraphDatabaseService createGraphDatabaseService( String graphDbPa { GraphDatabaseFactory factory = new GraphDatabaseFactory(); GraphDatabaseBuilder graphBuilder = factory.newEmbeddedDatabaseBuilder( graphDbPath ); - File propertiesFile = new File( graphDbPath, "neo4j.conf"); - if ( propertiesFile.exists() && propertiesFile.isFile() && propertiesFile.canRead() ) + File configFile = new File( graphDbPath, "neo4j.conf"); + if ( configFile.exists() && configFile.isFile() && configFile.canRead() ) { - System.out.println( format( "# Loading properties file '%s'", propertiesFile.getAbsolutePath() ) ); - graphBuilder.loadPropertiesFromFile( propertiesFile.getAbsolutePath() ); + System.out.println( format( "# Loading config file '%s'", configFile.getAbsolutePath() ) ); + graphBuilder.loadPropertiesFromFile( configFile.getAbsolutePath() ); } else { - System.out.println( format( "# No properties file found at '%s'", propertiesFile.getAbsolutePath() ) ); + System.out.println( format( "# No config file found at '%s'", configFile.getAbsolutePath() ) ); } return graphBuilder.newGraphDatabase(); } diff --git a/community/shell/src/test/java/org/neo4j/shell/DontShutdownClient.java b/community/shell/src/test/java/org/neo4j/shell/DontShutdownClient.java index 911f7b6097900..dfa49d473927f 100644 --- a/community/shell/src/test/java/org/neo4j/shell/DontShutdownClient.java +++ b/community/shell/src/test/java/org/neo4j/shell/DontShutdownClient.java @@ -20,24 +20,22 @@ package org.neo4j.shell; import java.io.File; -import java.io.Serializable; import java.util.HashMap; import org.neo4j.shell.impl.SameJvmClient; import org.neo4j.shell.impl.SystemOutput; import org.neo4j.shell.kernel.GraphDatabaseShellServer; -import static org.neo4j.shell.TestRmiPublication.createDefaultPropertiesFile; +import static org.neo4j.shell.TestRmiPublication.createDefaultConfigFile; public class DontShutdownClient { public static void main( String[] args ) throws Exception { String path = args[0]; - File propsFile = createDefaultPropertiesFile( path ); - GraphDatabaseShellServer server = new GraphDatabaseShellServer( - path, false, propsFile.getAbsolutePath() ); - new SameJvmClient( new HashMap(), server, + File configFile = createDefaultConfigFile( path ); + GraphDatabaseShellServer server = new GraphDatabaseShellServer( path, false, configFile.getAbsolutePath() ); + new SameJvmClient( new HashMap<>(), server, /* Temporary, switch back to SilentOutput once flaky test is resolved. */ new SystemOutput(), InterruptSignalHandler.getHandler() ); server.shutdown(); diff --git a/community/shell/src/test/java/org/neo4j/shell/DontShutdownLocalServer.java b/community/shell/src/test/java/org/neo4j/shell/DontShutdownLocalServer.java index 61d76eda56232..69bc3a8edc3c5 100644 --- a/community/shell/src/test/java/org/neo4j/shell/DontShutdownLocalServer.java +++ b/community/shell/src/test/java/org/neo4j/shell/DontShutdownLocalServer.java @@ -23,16 +23,15 @@ import org.neo4j.shell.kernel.GraphDatabaseShellServer; -import static org.neo4j.shell.TestRmiPublication.createDefaultPropertiesFile; +import static org.neo4j.shell.TestRmiPublication.createDefaultConfigFile; public class DontShutdownLocalServer { public static void main( String[] args ) throws Exception { String path = args[0]; - File propsFile = createDefaultPropertiesFile( path ); - GraphDatabaseShellServer server = new GraphDatabaseShellServer( - path, false, propsFile.getAbsolutePath() ); + File configFile = createDefaultConfigFile( path ); + new GraphDatabaseShellServer( path, false, configFile.getAbsolutePath() ); // Intentionally don't shutdown the server } } diff --git a/community/shell/src/test/java/org/neo4j/shell/TestRmiPublication.java b/community/shell/src/test/java/org/neo4j/shell/TestRmiPublication.java index 2afbfd3b0198f..c2d56147f8b3a 100644 --- a/community/shell/src/test/java/org/neo4j/shell/TestRmiPublication.java +++ b/community/shell/src/test/java/org/neo4j/shell/TestRmiPublication.java @@ -19,9 +19,6 @@ */ package org.neo4j.shell; -import org.junit.Rule; -import org.junit.Test; - import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -29,26 +26,30 @@ import java.lang.reflect.Field; import java.util.Properties; +import org.junit.Rule; +import org.junit.Test; + import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.test.ProcessStreamHandler; import org.neo4j.test.TargetDirectory; import static java.lang.Runtime.getRuntime; import static java.lang.System.getProperty; + import static org.junit.Assert.assertEquals; public class TestRmiPublication { - public static File createDefaultPropertiesFile( String path ) throws IOException + public static File createDefaultConfigFile( String path ) throws IOException { - File propsFile = new File( path, "neo4j.conf" ); + File configFile = new File( path, "neo4j.conf" ); Properties config = new Properties(); config.setProperty( GraphDatabaseSettings.pagecache_memory.name(), "8m" ); - try ( Writer writer = new FileWriter( propsFile ) ) + try ( Writer writer = new FileWriter( configFile ) ) { config.store( writer, "" ); } - return propsFile; + return configFile; } @Test diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/BackupTool.java b/enterprise/backup/src/main/java/org/neo4j/backup/BackupTool.java index 0dbd0f4fab169..f105d8a04bebf 100644 --- a/enterprise/backup/src/main/java/org/neo4j/backup/BackupTool.java +++ b/enterprise/backup/src/main/java/org/neo4j/backup/BackupTool.java @@ -143,7 +143,7 @@ private BackupOutcome runBackupWithLegacyArgs( Args args ) throws ToolFailureExc { String from = args.get( FROM ).trim(); String to = args.get( TO ).trim(); - Config tuningConfiguration = readTuningConfiguration( args ); + Config tuningConfiguration = readConfiguration( args ); boolean forensics = args.getBoolean( FORENSICS, false, true ); ConsistencyCheck consistencyCheck = parseConsistencyChecker( args ); @@ -173,7 +173,7 @@ private BackupOutcome runBackup( Args args ) throws ToolFailureException String host = args.get( HOST ).trim(); int port = args.getNumber( PORT, BackupServer.DEFAULT_PORT ).intValue(); String to = args.get( TO ).trim(); - Config tuningConfiguration = readTuningConfiguration( args ); + Config tuningConfiguration = readConfiguration( args ); boolean forensics = args.getBoolean( FORENSICS, false, true ); ConsistencyCheck consistencyCheck = parseConsistencyChecker( args ); @@ -257,25 +257,25 @@ private BackupOutcome doBackup( HostnamePort hostnamePort, File to, ConsistencyC } } - private static Config readTuningConfiguration( Args arguments ) throws ToolFailureException + private static Config readConfiguration( Args arguments ) throws ToolFailureException { - Map specifiedProperties = stringMap(); + Map specifiedConfig = stringMap(); - String propertyFilePath = arguments.get( CONFIG, null ); - if ( propertyFilePath != null ) + String configFilePath = arguments.get( CONFIG, null ); + if ( configFilePath != null ) { - File propertyFile = new File( propertyFilePath ); + File configFile = new File( configFilePath ); try { - specifiedProperties = MapUtil.load( propertyFile ); + specifiedConfig = MapUtil.load( configFile ); } catch ( IOException e ) { - throw new ToolFailureException( String.format( "Could not read configuration properties file [%s]", - propertyFilePath ), e ); + throw new ToolFailureException( String.format( "Could not read configuration file [%s]", + configFilePath ), e ); } } - return new Config( specifiedProperties, GraphDatabaseSettings.class, ConsistencyCheckSettings.class ); + return new Config( specifiedConfig, GraphDatabaseSettings.class, ConsistencyCheckSettings.class ); } private static URI resolveBackupUri( String from, Args arguments, Config config ) throws ToolFailureException diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolTest.java b/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolTest.java index 7f1bbd26a138e..00115b45a26e4 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolTest.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/BackupToolTest.java @@ -179,12 +179,12 @@ public void appliesDefaultTuningConfigurationForConsistencyChecker() throws Exce public void passesOnConfigurationIfProvided() throws Exception { // given - File propertyFile = testDirectory.file( "neo4j.conf" ); + File configFile = testDirectory.file( "neo4j.conf" ); Properties properties = new Properties(); properties.setProperty( ConsistencyCheckSettings.consistency_check_property_owners.name(), "true" ); - properties.store( new FileWriter( propertyFile ), null ); + properties.store( new FileWriter( configFile ), null ); - String[] args = new String[]{"-host", "localhost", "-to", "my_backup", "-config", propertyFile.getPath()}; + String[] args = new String[]{"-host", "localhost", "-to", "my_backup", "-config", configFile.getPath()}; BackupService service = mock( BackupService.class ); PrintStream systemOut = mock( PrintStream.class ); @@ -199,11 +199,11 @@ public void passesOnConfigurationIfProvided() throws Exception } @Test - public void exitWithFailureIfConfigSpecifiedButPropertiesFileDoesNotExist() throws Exception + public void exitWithFailureIfConfigSpecifiedButConfigFileDoesNotExist() throws Exception { // given - File propertyFile = testDirectory.file( "nonexistent_file" ); - String[] args = new String[]{"-host", "localhost", "-to", "my_backup", "-config", propertyFile.getPath()}; + File configFile = testDirectory.file( "nonexistent_file" ); + String[] args = new String[]{"-host", "localhost", "-to", "my_backup", "-config", configFile.getPath()}; BackupService service = mock( BackupService.class ); PrintStream systemOut = mock( PrintStream.class ); BackupTool backupTool = new BackupTool( service, systemOut ); @@ -217,7 +217,7 @@ public void exitWithFailureIfConfigSpecifiedButPropertiesFileDoesNotExist() thro catch ( BackupTool.ToolFailureException e ) { // then - assertThat( e.getMessage(), containsString( "Could not read configuration properties file" ) ); + assertThat( e.getMessage(), containsString( "Could not read configuration file" ) ); assertThat( e.getCause(), instanceOf( IOException.class ) ); } diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/ServerTestUtils.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/ServerTestUtils.java deleted file mode 100644 index f4129fb5935de..0000000000000 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/ServerTestUtils.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (c) 2002-2016 "Neo Technology," - * Network Engine for Objects in Lund AB [http://neotechnology.com] - * - * This file is part of Neo4j. - * - * Neo4j is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.neo4j.server.enterprise; - -import java.io.Closeable; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.Properties; -import java.util.Random; - -public class ServerTestUtils -{ - public static void writePropertyToFile( String name, String value, File propertyFile ) - { - Properties properties = loadProperties( propertyFile ); - properties.setProperty( name, value ); - storeProperties( propertyFile, properties ); - } - - private static void storeProperties( File propertyFile, - Properties properties ) - { - OutputStream out = null; - try - { - out = new FileOutputStream( propertyFile ); - properties.store( out, "" ); - } - catch ( IOException e ) - { - throw new RuntimeException( e ); - } - finally - { - safeClose( out ); - } - } - - private static Properties loadProperties( File propertyFile ) - { - Properties properties = new Properties(); - if ( propertyFile.exists() ) - { - InputStream in = null; - try - { - in = new FileInputStream( propertyFile ); - properties.load( in ); - } - catch ( IOException e ) - { - throw new RuntimeException( e ); - } - finally - { - safeClose( in ); - } - } - return properties; - } - - private static void safeClose( Closeable closeable ) - { - if ( closeable != null ) - { - try - { - closeable.close(); - } - catch ( IOException e ) - { - e.printStackTrace(); - } - } - } - - public static File createTempPropertyFile( File parentDir ) throws IOException - { - return new File( parentDir, "test-" + new Random().nextInt() + ".properties" ); - } -} diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/jmx/ServerManagementTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/jmx/ServerManagementTest.java index aa14ee7c0c999..d7b23354ec2cc 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/jmx/ServerManagementTest.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/jmx/ServerManagementTest.java @@ -61,7 +61,7 @@ public void shouldBeAbleToRestartServer() throws Exception .server() .withDefaultDatabaseTuning() .usingDatabaseDir( dbDirectory1 ) - .createPropertiesFiles(), NullLog.getInstance() ); + .createConfigFiles(), NullLog.getInstance() ); // When NeoServer server = cleanup.add( new EnterpriseNeoServer( config, graphDbDependencies(), NullLogProvider diff --git a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/Installation.java b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/Installation.java index 9740464bd33ed..8a26f3b668eb3 100644 --- a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/Installation.java +++ b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/Installation.java @@ -30,9 +30,9 @@ */ public interface Installation { - String NEO4J_PROPERTIES_FILENAME = "neo4j.conf"; + String NEO4J_CONFIG_FILENAME = "neo4j.conf"; String NEO4J_VMOPTIONS_FILENAME = "neo4j-community.vmoptions"; - String DEFAULT_SERVER_CONFIG_RESOURCE_NAME = "/org/neo4j/desktop/config/neo4j-default.conf"; + String DEFAULT_CONFIG_RESOURCE_NAME = "/org/neo4j/desktop/config/neo4j-default.conf"; String DEFAULT_VMOPTIONS_TEMPLATE_RESOURCE_NAME = "/org/neo4j/desktop/config/vmoptions.template"; String INSTALL_PROPERTIES_FILENAME = "install.properties"; diff --git a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/portable/PortableInstallation.java b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/portable/PortableInstallation.java index bac5a1cce8b97..10bd85ad36992 100644 --- a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/portable/PortableInstallation.java +++ b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/portable/PortableInstallation.java @@ -83,7 +83,7 @@ public void initialize() throws Exception @Override public InputStream getDefaultDatabaseConfiguration() { - return getResourceStream( DEFAULT_SERVER_CONFIG_RESOURCE_NAME ); + return getResourceStream( DEFAULT_CONFIG_RESOURCE_NAME ); } @Override diff --git a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/unix/UnixInstallation.java b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/unix/UnixInstallation.java index 1767c20eee3ec..400d52009fdbc 100644 --- a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/unix/UnixInstallation.java +++ b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/unix/UnixInstallation.java @@ -49,7 +49,7 @@ public File getVmOptionsFile() @Override public File getConfigurationsFile() { - return new File( getConfigurationDirectory(), "." + NEO4J_PROPERTIES_FILENAME ); + return new File( getConfigurationDirectory(), "." + NEO4J_CONFIG_FILENAME ); } @Override diff --git a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/windows/WindowsInstallation.java b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/windows/WindowsInstallation.java index d3fd9e99034d2..3d8070389ac9d 100644 --- a/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/windows/WindowsInstallation.java +++ b/packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/config/windows/WindowsInstallation.java @@ -31,15 +31,12 @@ public class WindowsInstallation extends PortableInstallation { private final WindowsEnvironment environment; - private final Properties installProperties; + private final Properties config = new Properties(); public WindowsInstallation() throws Exception { - installProperties = new Properties(); environment = new WindowsEnvironment(); - - File installPropertiesFile = new File( getInstallationBinDirectory(), INSTALL_PROPERTIES_FILENAME ); - installProperties.load( new FileInputStream( installPropertiesFile ) ); + config.load( new FileInputStream( new File( getInstallationBinDirectory(), INSTALL_PROPERTIES_FILENAME ) ) ); } @Override @@ -58,7 +55,7 @@ protected File getDefaultDirectory() public File getConfigurationDirectory() { File appData = new File( System.getenv( "APPDATA" ) ); - return new File( appData, installProperties.getProperty( "win.appdata.subdir" ) ); + return new File( appData, config.getProperty( "win.appdata.subdir" ) ); } @Override @@ -70,6 +67,6 @@ public File getVmOptionsFile() @Override public File getConfigurationsFile() { - return new File( getConfigurationDirectory(), NEO4J_PROPERTIES_FILENAME ); + return new File( getConfigurationDirectory(), NEO4J_CONFIG_FILENAME ); } } diff --git a/packaging/neo4j-desktop/src/test/java/org/neo4j/desktop/runtime/DesktopConfiguratorTest.java b/packaging/neo4j-desktop/src/test/java/org/neo4j/desktop/runtime/DesktopConfiguratorTest.java index d3fd1461ec7f2..c2fbe6ed15c24 100644 --- a/packaging/neo4j-desktop/src/test/java/org/neo4j/desktop/runtime/DesktopConfiguratorTest.java +++ b/packaging/neo4j-desktop/src/test/java/org/neo4j/desktop/runtime/DesktopConfiguratorTest.java @@ -19,12 +19,12 @@ */ package org.neo4j.desktop.runtime; +import java.io.File; + import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.io.File; - import org.neo4j.desktop.config.Installation; import org.neo4j.server.configuration.ServerSettings; @@ -49,7 +49,7 @@ public void tearDown() } @Test - public void dbPropertiesShouldContainStoreDirProperty() throws Exception + public void configShouldContainStoreDirSetting() throws Exception { // Given Installation installation = mock( Installation.class );