Replace net.openhft.chronicle.hash.function.SerializableFunction usages with the same interface from Chronicle-Core, and delete net.openhft.chronicle.hash.function package

src/main/java/net/openhft/chronicle/hash/function/SerializableFunction.java

@@ -1,26 +0,0 @@
-/*
- *      Copyright (C) 2015  higherfrequencytrading.com
- *
- *      This program is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU Lesser General Public License as published by
- *      the Free Software Foundation, either version 3 of the License.
- *
- *      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 Lesser General Public License for more details.
- *
- *      You should have received a copy of the GNU Lesser General Public License
- *      along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.openhft.chronicle.hash.function;
-
-import java.io.Serializable;
-import java.util.function.Function;
-
-/**
- * {@link Function} + {@link Serializable}
- */
-public interface SerializableFunction<T, R> extends Function<T, R>, Serializable {
-}

src/main/java/net/openhft/chronicle/hash/function/package-info.java

@@ -1,20 +0,0 @@
-/*
- *      Copyright (C) 2015  higherfrequencytrading.com
- *
- *      This program is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU Lesser General Public License as published by
- *      the Free Software Foundation, either version 3 of the License.
- *
- *      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 Lesser General Public License for more details.
- *
- *      You should have received a copy of the GNU Lesser General Public License
- *      along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * Serializable versions of functions for convenience of anonymous implementation
- */
-package net.openhft.chronicle.hash.function;

src/main/java/net/openhft/chronicle/map/AbstractChronicleMap.java

@@ -16,7 +16,7 @@
 
 package net.openhft.chronicle.map;
 
-import net.openhft.chronicle.hash.function.SerializableFunction;
+import net.openhft.chronicle.core.util.SerializableFunction;
 import net.openhft.chronicle.hash.impl.util.CharSequences;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/net/openhft/chronicle/map/ChronicleMap.java

@@ -16,8 +16,8 @@
 
 package net.openhft.chronicle.map;
 
+import net.openhft.chronicle.core.util.SerializableFunction;
 import net.openhft.chronicle.hash.ChronicleHash;
-import net.openhft.chronicle.hash.function.SerializableFunction;
 import net.openhft.chronicle.hash.serialization.BytesReader;
 import net.openhft.lang.io.Bytes;
 import net.openhft.lang.io.serialization.BytesMarshaller;

src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java

@@ -17,7 +17,7 @@
 package net.openhft.chronicle.map;
 
 import com.google.common.primitives.Chars;
-import net.openhft.chronicle.hash.function.SerializableFunction;
+import net.openhft.chronicle.core.util.SerializableFunction;
 import net.openhft.chronicle.hash.replication.SingleChronicleHashReplication;
 import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig;
 import net.openhft.chronicle.map.fromdocs.BondVOInterface;

src/test/java/net/openhft/chronicle/map/MarkTest.java

@@ -16,7 +16,6 @@
 
 package net.openhft.chronicle.map;
 
-import net.openhft.chronicle.hash.function.SerializableFunction;
 import net.openhft.lang.MemoryUnit;
 import org.junit.Test;
 
@@ -25,6 +24,7 @@ import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
+import java.util.function.Function;
 
 import static org.junit.Assert.assertTrue;
 
@@ -34,7 +34,7 @@ public class MarkTest {
 
     @Test(timeout = 25000)
     public void inMemoryTest() {
-        test(builder -> builder.create());
+        test(ChronicleMapBuilder::create);
     }
 
     @Test
@@ -59,8 +59,9 @@ public class MarkTest {
         }
     }
 
-    private static void test(SerializableFunction<ChronicleMapBuilder<Integer, Integer>,
-                ChronicleMap<Integer, Integer>> createMap) {
+    private static void test(
+            Function<ChronicleMapBuilder<Integer, Integer>, ChronicleMap<Integer, Integer>>
+                    createMap) {
         long ms = System.currentTimeMillis();
         try (ChronicleMap<Integer, Integer> map = createMap.apply(ChronicleMapBuilder
                 .of(Integer.class, Integer.class)

src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java

@@ -17,7 +17,7 @@
 package net.openhft.chronicle.map;
 
 import net.openhft.chronicle.core.io.Closeable;
-import net.openhft.chronicle.hash.function.SerializableFunction;
+import net.openhft.chronicle.core.util.SerializableFunction;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Assert;