From 15ccf4cdb9fd2bcdbcce4117e424f25a86a5e3e5 Mon Sep 17 00:00:00 2001 From: Jonas Kalderstam Date: Fri, 18 Mar 2016 12:15:19 +0100 Subject: [PATCH] Remove Deprecated Functions.Map --- .../java/org/neo4j/function/Functions.java | 6 ------ .../graphdb/factory/GraphDatabaseBuilder.java | 3 +-- .../configuration/ConfigurationValidator.java | 3 +-- .../SystemPropertiesConfiguration.java | 3 +-- .../java/org/neo4j/helpers/FunctionsTest.java | 19 +++++++------------ .../kernel/impl/store/TestDynamicStore.java | 15 +++++++-------- .../member/HighAvailabilitySlaves.java | 5 ++--- 7 files changed, 19 insertions(+), 35 deletions(-) diff --git a/community/common/src/main/java/org/neo4j/function/Functions.java b/community/common/src/main/java/org/neo4j/function/Functions.java index 083cc93d3cb8f..7ac79d1caa50d 100644 --- a/community/common/src/main/java/org/neo4j/function/Functions.java +++ b/community/common/src/main/java/org/neo4j/function/Functions.java @@ -19,11 +19,9 @@ */ package org.neo4j.function; -import java.util.Map; import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.function.Function; -import java.util.function.Supplier; /** * Constructors for basic {@link Function} and {@link BiFunction} types @@ -31,10 +29,6 @@ */ public final class Functions { - public static Function map( final Map map ) - { - return map::get; - } public static Function withDefaults( final Function defaults, final Function f ) diff --git a/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseBuilder.java b/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseBuilder.java index 7d88412f72397..fbe74c2eecbcb 100644 --- a/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseBuilder.java +++ b/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseBuilder.java @@ -31,7 +31,6 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.config.Setting; -import static org.neo4j.function.Functions.map; import static org.neo4j.function.Functions.withDefaults; import static org.neo4j.helpers.collection.MapUtil.stringMap; @@ -71,7 +70,7 @@ public GraphDatabaseBuilder setConfig( Setting setting, String value ) { // Test if we can get this setting with an updated config Map testValue = stringMap( setting.name(), value ); - setting.apply( withDefaults( map( config ), map( testValue ) ) ); + setting.apply( withDefaults( config::get, testValue::get ) ); // No exception thrown, add it to existing config config.put( setting.name(), value ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/configuration/ConfigurationValidator.java b/community/kernel/src/main/java/org/neo4j/kernel/configuration/ConfigurationValidator.java index 860f5e6d39a96..2ea58a0b92300 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/configuration/ConfigurationValidator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/configuration/ConfigurationValidator.java @@ -23,7 +23,6 @@ import java.util.HashMap; import java.util.Map; -import org.neo4j.function.Functions; import org.neo4j.graphdb.config.Setting; import org.neo4j.helpers.collection.Pair; @@ -47,7 +46,7 @@ public void validate( Map rawConfig ) { for ( Setting setting : settings.values() ) { - setting.apply( Functions.map( rawConfig ) ); + setting.apply( rawConfig::get ); } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/configuration/SystemPropertiesConfiguration.java b/community/kernel/src/main/java/org/neo4j/kernel/configuration/SystemPropertiesConfiguration.java index 3de06f32af353..665a9d7472b50 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/configuration/SystemPropertiesConfiguration.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/configuration/SystemPropertiesConfiguration.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.function.Function; -import org.neo4j.function.Functions; import org.neo4j.graphdb.config.Setting; /** @@ -57,7 +56,7 @@ public Map apply( Map config ) // For each system property, see if it passes validation // If so, add it to result set Map result = new HashMap( config ); - Function systemPropertiesFunction = Functions.map( systemProperties ); + Function systemPropertiesFunction = systemProperties::get; for ( Map.Entry prop : System.getProperties().entrySet() ) { String key = (String) prop.getKey(); diff --git a/community/kernel/src/test/java/org/neo4j/helpers/FunctionsTest.java b/community/kernel/src/test/java/org/neo4j/helpers/FunctionsTest.java index 67f11ed95af18..04eeed6d9cea4 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/FunctionsTest.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/FunctionsTest.java @@ -19,33 +19,28 @@ */ package org.neo4j.helpers; -import org.hamcrest.CoreMatchers; -import org.junit.Test; - import java.util.function.BiFunction; import java.util.function.Function; +import org.hamcrest.CoreMatchers; +import org.junit.Test; + import org.neo4j.function.Functions; import org.neo4j.kernel.configuration.Settings; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; -import static org.neo4j.function.Functions.map; import static org.neo4j.helpers.collection.MapUtil.stringMap; public class FunctionsTest { - @Test - public void testMap() throws Exception - { - assertThat( map( stringMap( "foo", "bar" ) ).apply( "foo" ), equalTo( "bar" ) ); - } - @Test public void testWithDefaults() throws Exception { - assertThat( Functions.withDefaults( map( stringMap( "foo", "bar" ) ), Functions.nullFunction() ).apply( "foo" ), equalTo( "bar" ) ); - assertThat( Functions.withDefaults( map( stringMap( "foo", "bar" ) ), map( stringMap( "foo", "xyzzy" ) ) ).apply( "foo" ), equalTo( "xyzzy" ) ); + assertThat( Functions.withDefaults( stringMap( "foo", "bar" )::get, Functions.nullFunction() ) + .apply( "foo" ), equalTo( "bar" ) ); + assertThat( Functions.withDefaults( stringMap( "foo", "bar" )::get, stringMap( "foo", "xyzzy" )::get ) + .apply( "foo" ), equalTo( "xyzzy" ) ); } @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestDynamicStore.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestDynamicStore.java index 4656e87374ff8..c99085999a63a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestDynamicStore.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestDynamicStore.java @@ -19,11 +19,6 @@ */ package org.neo4j.kernel.impl.store; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; - import java.io.File; import java.util.ArrayList; import java.util.Collection; @@ -33,6 +28,11 @@ import java.util.Random; import java.util.Set; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + import org.neo4j.graphdb.config.InvalidSettingException; import org.neo4j.graphdb.config.Setting; import org.neo4j.graphdb.factory.GraphDatabaseSettings; @@ -49,7 +49,6 @@ import static java.util.Collections.singletonMap; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import static org.neo4j.function.Functions.map; import static org.neo4j.kernel.impl.store.record.RecordLoad.NORMAL; public class TestDynamicStore @@ -86,7 +85,7 @@ public void tearDown() public void stringStoreCannotHaveZeroBlockSize() { Setting setting = StoreFactory.Configuration.string_block_size; - setting.apply( map( singletonMap( setting.name(), "0" ) ) ); + setting.apply( singletonMap( setting.name(), "0" )::get ); fail( "Illegal blocksize should throw exception" ); } @@ -94,7 +93,7 @@ public void stringStoreCannotHaveZeroBlockSize() public void arrayStoreCannotHaveZeroBlockSize() throws Exception { Setting setting = StoreFactory.Configuration.array_block_size; - setting.apply( map( singletonMap( setting.name(), "0" ) ) ); + setting.apply( singletonMap( setting.name(), "0" )::get ); fail( "Illegal blocksize should throw exception" ); } diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/member/HighAvailabilitySlaves.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/member/HighAvailabilitySlaves.java index 188ba7d7f1092..0f654e276fc80 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/member/HighAvailabilitySlaves.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/member/HighAvailabilitySlaves.java @@ -27,9 +27,8 @@ import org.neo4j.cluster.protocol.cluster.Cluster; import org.neo4j.cluster.protocol.cluster.ClusterConfiguration; import org.neo4j.cluster.protocol.cluster.ClusterListener; -import org.neo4j.function.Functions; -import org.neo4j.kernel.ha.cluster.modeswitch.HighAvailabilityModeSwitcher; import org.neo4j.helpers.HostnamePort; +import org.neo4j.kernel.ha.cluster.modeswitch.HighAvailabilityModeSwitcher; import org.neo4j.kernel.ha.com.master.Slave; import org.neo4j.kernel.ha.com.master.SlaveFactory; import org.neo4j.kernel.ha.com.master.Slaves; @@ -86,7 +85,7 @@ public Iterable getSlaves() { // Return all cluster members which are currently SLAVEs, // are alive, and convert to Slave with a cache if possible - return map( withDefaults( slaveForMember(), Functions.map( slaves ) ), + return map( withDefaults( slaveForMember(), slaves::get ), filter( inRole( HighAvailabilityModeSwitcher.SLAVE ), clusterMembers.getAliveMembers() ) ); }