diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ChronicleMap.java index 2f429f4d4..78a8aa20a 100755 --- a/src/main/java/net/openhft/chronicle/map/ChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/ChronicleMap.java @@ -199,58 +199,6 @@ public interface ChronicleMap extends ConcurrentMap, */ void putAll(File fromFile) throws IOException; - /** - * Creates an empty value instance, which can be used with the - * following methods : - * - * {@link ChronicleMap#getUsing(Object, Object) } - * {@link ChronicleMap#acquireUsing(Object, Object) } - * {@link ChronicleMap#acquireContext(Object, Object)} - * - * for example like this : - * - * 
{@code
-     * V value = map.newValueInstance();
-     * try (ReadMapContext rc = map.getUsingLocked(key, value)) {
-     *  // add your logic here
-     * } // the read lock is released here
-     * }
- * - * - * @return a new empty instance based on the Value type - * @see ChronicleMap#getUsing(Object, Object) - * @see ChronicleMap#acquireUsing(Object, Object) - * @see ChronicleMap#acquireContext(Object, Object) - */ - V newValueInstance(); - - /** - * Creates an empty value instance, which can be used with the - * following methods : - * - * {@link ChronicleMap#getUsing(Object, Object) } - * {@link ChronicleMap#acquireUsing(Object, Object)} - * {@link ChronicleMap#acquireContext(Object, Object)} - * - * for example like this : - * - * 
{@code
-     * K key = map.newKeyInstance();
-     * key.setMyStringField("some key");
-     *
-     * try (ReadMapContext rc = map.getUsingLocked(key, value)) {
-     *  // add your logic here
-     * } // the read lock is released here
-     * }
- * - * - * @return a new empty instance based on the Key type - * @see ChronicleMap#getUsing(Object, Object) - * @see ChronicleMap#acquireUsing(Object, Object) - * @see ChronicleMap#acquireContext(Object, Object) - */ - K newKeyInstance(); - /** * @return the class of {@code } */ diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java index 43423f0af..e2f050fad 100755 --- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java @@ -142,18 +142,6 @@ public class VanillaChronicleMap return (V) value; } - @Override - public V newValueInstance() { - if (vClass == CharSequence.class || vClass == StringBuilder.class) - return (V) new StringBuilder(); - return newInstance(vClass, false); - } - - @Override - public K newKeyInstance() { - return newInstance(kClass, true); - } - @Override public Class keyClass() { return kClass; diff --git a/src/test/java/eg/OffHeapByteArrayExampleTest.java b/src/test/java/eg/OffHeapByteArrayExampleTest.java index ff042e12c..5406f285e 100644 --- a/src/test/java/eg/OffHeapByteArrayExampleTest.java +++ b/src/test/java/eg/OffHeapByteArrayExampleTest.java @@ -59,8 +59,8 @@ public class OffHeapByteArrayExampleTest { // this objects will be reused ByteValue byteValue = Values.newHeapInstance(ByteValue.class); - ByteArray value = chm.newValueInstance(); - LongValue key = chm.newKeyInstance(); + ByteArray value = Values.newHeapInstance(ByteArray.class); + LongValue key = Values.newHeapInstance(LongValue.class); key.setValue(1); diff --git a/src/test/java/eg/TestNesterInterfaceMarshal.java b/src/test/java/eg/TestNesterInterfaceMarshal.java index df0a40903..96000e587 100644 --- a/src/test/java/eg/TestNesterInterfaceMarshal.java +++ b/src/test/java/eg/TestNesterInterfaceMarshal.java @@ -21,6 +21,7 @@ import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig; import net.openhft.chronicle.set.Builder; import net.openhft.chronicle.map.ChronicleMap; import net.openhft.chronicle.map.ChronicleMapBuilder; +import net.openhft.chronicle.values.Values; import org.junit.Assert; import org.junit.Test; @@ -64,7 +65,8 @@ public class TestNesterInterfaceMarshal { .entries(5000L).averageKeySize(10) .replication((byte) 2, tcpTransportAndNetworkConfig1).create()) { //Store some data into MAP1 - TestInstrumentVOInterface intrumentVOInterface = map.newValueInstance(); + TestInstrumentVOInterface intrumentVOInterface = + Values.newNativeReference(TestInstrumentVOInterface.class); try (Closeable c = map.acquireContext("KEY1", intrumentVOInterface)) { diff --git a/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java b/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java index c85ecd259..e03db5e8c 100644 --- a/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java +++ b/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java @@ -32,6 +32,8 @@ import net.openhft.chronicle.map.fromdocs.BondVOInterface; import net.openhft.chronicle.values.Array; import net.openhft.chronicle.values.MaxUtf8Length; import net.openhft.chronicle.values.Range; +import net.openhft.chronicle.values.Values; +import net.openhft.lang.values.DoubleArray; import org.jetbrains.annotations.NotNull; import org.junit.After; import org.junit.Assert; @@ -365,14 +367,14 @@ public class CHMUseCasesTest { try (ChronicleMap map = newInstance(builder)) { { - final I1 i1 = map.newValueInstance(); + final I1 i1 = Values.newHeapInstance(I1.class); i1.setStrAt(1, "Hello"); i1.setStrAt(2, "World"); map.put("Key1", i1); } { - final I1 i1 = map.newValueInstance(); + final I1 i1 = Values.newHeapInstance(I1.class); i1.setStrAt(1, "Hello2"); i1.setStrAt(2, "World2"); map.put("Key2", i1); @@ -447,7 +449,7 @@ public class CHMUseCasesTest { .averageKeySize(10); try (ChronicleMap chm = newInstance(builder)) { - BondVOInterface bondVO = chm.newValueInstance(); + BondVOInterface bondVO = Values.newNativeReference(BondVOInterface.class); try (net.openhft.chronicle.core.io.Closeable c = chm.acquireContext("369604103", bondVO)) { bondVO.setIssueDate(parseYYYYMMDD("20130915")); @@ -693,7 +695,7 @@ public class CHMUseCasesTest { try (ChronicleMap map = newInstance(builder)) { - CharSequence using = map.newValueInstance(); + CharSequence using = new StringBuilder(); try (net.openhft.chronicle.core.io.Closeable c = map.acquireContext("1", using)) { assertTrue(using instanceof StringBuilder); @@ -733,7 +735,7 @@ public class CHMUseCasesTest { try (ChronicleMap map = newInstance(builder)) { - IntValue using = map.newKeyInstance(); + IntValue using = Values.newHeapInstance(IntValue.class); using.setValue(1); try (Closeable c = map.acquireContext(using, "")) { @@ -756,10 +758,10 @@ public class CHMUseCasesTest { try (ChronicleMap map = newInstance(builder)) { - IntValue key = map.newKeyInstance(); + IntValue key = Values.newHeapInstance(IntValue.class); key.setValue(1); - StringBuilder using = map.newValueInstance(); + StringBuilder using = new StringBuilder(); try (net.openhft.chronicle.core.io.Closeable c = map.acquireContext(key, using)) { using.append("Hello"); @@ -779,10 +781,10 @@ public class CHMUseCasesTest { try (ChronicleMap map = newInstance(builder)) { - IntValue key = map.newKeyInstance(); + IntValue key = Values.newHeapInstance(IntValue.class); key.setValue(1); - CharSequence using = map.newValueInstance(); + CharSequence using = new StringBuilder(); try (net.openhft.chronicle.core.io.Closeable c = map.acquireContext(key, using)) { key.setValue(3); @@ -817,10 +819,10 @@ public class CHMUseCasesTest { .entries(10); try (ChronicleMap map = newInstance(builder)) { - StringValue key1 = map.newKeyInstance(); - StringValue key2 = map.newKeyInstance(); - StringValue value1 = map.newValueInstance(); - StringValue value2 = map.newValueInstance(); + StringValue key1 = Values.newHeapInstance(StringValue.class); + StringValue key2 = Values.newHeapInstance(StringValue.class); + StringValue value1 = Values.newHeapInstance(StringValue.class); + StringValue value2 = Values.newHeapInstance(StringValue.class); key1.setValue(new StringBuilder("1")); value1.setValue("11"); @@ -1346,10 +1348,10 @@ public class CHMUseCasesTest { // this may change due to alignment // assertEquals(8, entrySize(map)); assertEquals(1, ((VanillaChronicleMap) map).maxChunksPerEntry); - IntValue key1 = map.newKeyInstance(); - IntValue key2 = map.newKeyInstance(); - IntValue value1 = map.newValueInstance(); - IntValue value2 = map.newValueInstance(); + IntValue key1 = Values.newHeapInstance(IntValue.class); + IntValue key2 = Values.newHeapInstance(IntValue.class); + IntValue value1 = Values.newHeapInstance(IntValue.class); + IntValue value2 = Values.newHeapInstance(IntValue.class); key1.setValue(1); @@ -1456,18 +1458,18 @@ public class CHMUseCasesTest { try (ChronicleMap map = newInstance(builder)) { assertEquals(1, ((VanillaChronicleMap) map).maxChunksPerEntry); - UnsignedIntValue key1 = map.newKeyInstance(); - UnsignedIntValue value1 = map.newValueInstance(); + UnsignedIntValue key1 = Values.newHeapInstance(UnsignedIntValue.class); + UnsignedIntValue value1 = Values.newHeapInstance(UnsignedIntValue.class); key1.setValue(1); value1.setValue(11); map.put(key1, value1); assertEquals(value1, map.get(key1)); - key1 = map.newKeyInstance(); - UnsignedIntValue key2 = map.newKeyInstance(); - value1 = map.newValueInstance(); - UnsignedIntValue value2 = map.newValueInstance(); + key1 = Values.newHeapInstance(UnsignedIntValue.class); + UnsignedIntValue key2 = Values.newHeapInstance(UnsignedIntValue.class); + value1 = Values.newHeapInstance(UnsignedIntValue.class); + UnsignedIntValue value2 = Values.newHeapInstance(UnsignedIntValue.class); key1.setValue(1); value1.setValue(11); @@ -1577,10 +1579,10 @@ public class CHMUseCasesTest { // assertEquals(1, ((VanillaChronicleMap) map).maxChunksPerEntry); - IntValue key1 = map.newKeyInstance(); - IntValue key2 = map.newKeyInstance(); - ShortValue value1 = map.newValueInstance(); - ShortValue value2 = map.newValueInstance(); + IntValue key1 = Values.newHeapInstance(IntValue.class); + IntValue key2 = Values.newHeapInstance(IntValue.class); + ShortValue value1 = Values.newHeapInstance(ShortValue.class); + ShortValue value2 = Values.newHeapInstance(ShortValue.class); key1.setValue(1); value1.setValue((short) 11); @@ -1689,10 +1691,10 @@ public class CHMUseCasesTest { // this may change due to alignment // assertEquals(8, entrySize(map)); assertEquals(1, ((VanillaChronicleMap) map).maxChunksPerEntry); - IntValue key1 = map.newKeyInstance(); - IntValue key2 = map.newKeyInstance(); - UnsignedShortValue value1 = map.newValueInstance(); - UnsignedShortValue value2 = map.newValueInstance(); + IntValue key1 = Values.newHeapInstance(IntValue.class); + IntValue key2 = Values.newHeapInstance(IntValue.class); + UnsignedShortValue value1 = Values.newHeapInstance(UnsignedShortValue.class); + UnsignedShortValue value2 = Values.newHeapInstance(UnsignedShortValue.class); key1.setValue(1); value1.setValue(11); @@ -1792,10 +1794,10 @@ public class CHMUseCasesTest { assertEquals(1, ((VanillaChronicleMap) map).maxChunksPerEntry); - IntValue key1 = map.newKeyInstance(); - IntValue key2 = map.newKeyInstance(); - CharValue value1 = map.newValueInstance(); - CharValue value2 = map.newValueInstance(); + IntValue key1 = Values.newHeapInstance(IntValue.class); + IntValue key2 = Values.newHeapInstance(IntValue.class); + CharValue value1 = Values.newHeapInstance(CharValue.class); + CharValue value2 = Values.newHeapInstance(CharValue.class); key1.setValue(1); value1.setValue((char) 11); @@ -1902,10 +1904,10 @@ public class CHMUseCasesTest { //assertEquals(8, entrySize(map)); this may change due to alignmented assertEquals(1, ((VanillaChronicleMap) map).maxChunksPerEntry); - IntValue key1 = map.newKeyInstance(); - IntValue key2 = map.newKeyInstance(); - UnsignedByteValue value1 = map.newValueInstance(); - UnsignedByteValue value2 = map.newValueInstance(); + IntValue key1 = Values.newHeapInstance(IntValue.class); + IntValue key2 = Values.newHeapInstance(IntValue.class); + UnsignedByteValue value1 = Values.newHeapInstance(UnsignedByteValue.class); + UnsignedByteValue value2 = Values.newHeapInstance(UnsignedByteValue.class); key1.setValue(1); @@ -2006,10 +2008,10 @@ public class CHMUseCasesTest { assertEquals(1, ((VanillaChronicleMap) map).maxChunksPerEntry); - IntValue key1 = map.newKeyInstance(); - IntValue key2 = map.newKeyInstance(); - BooleanValue value1 = map.newValueInstance(); - BooleanValue value2 = map.newValueInstance(); + IntValue key1 = Values.newHeapInstance(IntValue.class); + IntValue key2 = Values.newHeapInstance(IntValue.class); + BooleanValue value1 = Values.newHeapInstance(BooleanValue.class); + BooleanValue value2 = Values.newHeapInstance(BooleanValue.class); key1.setValue(1); @@ -2109,10 +2111,10 @@ public class CHMUseCasesTest { assertEquals(1, ((VanillaChronicleMap) map).maxChunksPerEntry); - FloatValue key1 = map.newKeyInstance(); - FloatValue key2 = map.newKeyInstance(); - FloatValue value1 = map.newValueInstance(); - FloatValue value2 = map.newValueInstance(); + FloatValue key1 = Values.newHeapInstance(FloatValue.class); + FloatValue key2 = Values.newHeapInstance(FloatValue.class); + FloatValue value1 = Values.newHeapInstance(FloatValue.class); + FloatValue value2 = Values.newHeapInstance(FloatValue.class); key1.setValue(1); @@ -2216,10 +2218,10 @@ public class CHMUseCasesTest { assertEquals(1, ((VanillaChronicleMap) map).maxChunksPerEntry); - DoubleValue key1 = map.newKeyInstance(); - DoubleValue key2 = map.newKeyInstance(); - DoubleValue value1 = map.newValueInstance(); - DoubleValue value2 = map.newValueInstance(); + DoubleValue key1 = Values.newHeapInstance(DoubleValue.class); + DoubleValue key2 = Values.newHeapInstance(DoubleValue.class); + DoubleValue value1 = Values.newHeapInstance(DoubleValue.class); + DoubleValue value2 = Values.newHeapInstance(DoubleValue.class); key1.setValue(1); @@ -2323,10 +2325,10 @@ public class CHMUseCasesTest { // assertEquals(16, entrySize(map)); assertEquals(1, ((VanillaChronicleMap) map).maxChunksPerEntry); - LongValue key1 = map.newKeyInstance(); - LongValue key2 = map.newKeyInstance(); - LongValue value1 = map.newValueInstance(); - LongValue value2 = map.newValueInstance(); + LongValue key1 = Values.newHeapInstance(LongValue.class); + LongValue key2 = Values.newHeapInstance(LongValue.class); + LongValue value1 = Values.newHeapInstance(LongValue.class); + LongValue value2 = Values.newHeapInstance(LongValue.class); key1.setValue(1); @@ -2625,7 +2627,7 @@ public class CHMUseCasesTest { .of(String.class, IBean.class).averageKeySize(5).entries(1000); try (ChronicleMap map = newInstance(builder)) { - IBean iBean = map.newValueInstance(); + IBean iBean = Values.newNativeReference(IBean.class); try (net.openhft.chronicle.core.io.Closeable c = map.acquireContext("1", iBean)) { iBean.setDouble(1.2); iBean.setLong(2); @@ -2644,13 +2646,11 @@ public class CHMUseCasesTest { public void testBytesMarshallable() throws IOException { ChronicleMapBuilder builder = ChronicleMapBuilder .of(IData.class, IData.class) - // TODO if the keyMarshaller is set, the map.newKeyInstance() blows up. -// .keyMarshaller(new BytesMarshallableMarshaller<>(IData.class)) .entries(1000); try (ChronicleMap map = newInstance(builder)) { for (int i = 0; i < 100; i++) { - IData key = map.newKeyInstance(); - IData value = map.newValueInstance(); + IData key = Values.newHeapInstance(IData.class); + IData value = Values.newHeapInstance(IData.class); key.setText("key-" + i); key.setNumber(i); value.setNumber(i); @@ -2672,8 +2672,8 @@ public class CHMUseCasesTest { .entries(1000); try (ChronicleMap map = newInstance(builder)) { for (int i = 0; i < 100; i++) { - Data key = map.newKeyInstance(); - Data value = map.newValueInstance(); + Data key = new Data(); + Data value = new Data(); key.setText("key-" + i); key.setNumber(i); value.setNumber(i); diff --git a/src/test/java/net/openhft/chronicle/map/ChronicleMapImportExportTest.java b/src/test/java/net/openhft/chronicle/map/ChronicleMapImportExportTest.java index 8e8e41fa9..c99f6e330 100644 --- a/src/test/java/net/openhft/chronicle/map/ChronicleMapImportExportTest.java +++ b/src/test/java/net/openhft/chronicle/map/ChronicleMapImportExportTest.java @@ -21,6 +21,7 @@ import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver; import net.openhft.chronicle.core.io.Closeable; import net.openhft.chronicle.core.values.LongValue; import net.openhft.chronicle.map.fromdocs.BondVOInterface; +import net.openhft.chronicle.values.Values; import org.junit.Assert; import org.junit.Test; @@ -228,7 +229,7 @@ public class ChronicleMapImportExportTest { .averageKeySize("one".length()) .entries(1000); try (ChronicleMap expected = builder.create()) { - LongValue value = expected.newValueInstance(); + LongValue value = Values.newNativeReference(LongValue.class); // this will add the entry try (Closeable c = @@ -264,7 +265,7 @@ public class ChronicleMapImportExportTest { try (ChronicleMap expected = builder.create()) { - final BondVOInterface value = expected.newValueInstance(); + final BondVOInterface value = Values.newNativeReference(BondVOInterface.class); // this will add the entry try (Closeable c = expected.acquireContext("one", value)) { diff --git a/src/test/java/net/openhft/chronicle/map/KeyValueInstanceTest.java b/src/test/java/net/openhft/chronicle/map/KeyValueInstanceTest.java deleted file mode 100644 index c73ceefdc..000000000 --- a/src/test/java/net/openhft/chronicle/map/KeyValueInstanceTest.java +++ /dev/null @@ -1,110 +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 . - */ - -package net.openhft.chronicle.map; - -import org.junit.Test; - -import java.util.HashMap; -import java.util.Map; - -import static net.openhft.chronicle.values.ValueModel.$$HEAP; -import static org.junit.Assert.assertTrue; - -/** - * @author Rob Austin. - */ -public class KeyValueInstanceTest { - - @Test(expected = IllegalStateException.class) - public void testLongNewKeyValueInstance() { - try (ChronicleMap map = ChronicleMapBuilder - .of(Long.class, Long.class) - .create()) { - - map.newKeyInstance(); - map.newValueInstance(); - } - } - - - @Test(expected = IllegalStateException.class) - public void testNewKeyValueInstanceWithMapType() { - try (ChronicleMap map = ChronicleMapBuilder - .of(Map.class, Map.class) - .create()) { - - map.newKeyInstance(); - map.newValueInstance(); - } - } - - @Test - public void testNewKeyValueInstanceWithHahMapType() { - try (ChronicleMap map = ChronicleMap.of(HashMap.class, HashMap.class) - .entries(1) - .averageKey(new HashMap()).averageValue(new HashMap()) - .create()) { - - Object key = map.newKeyInstance(); - Object value = map.newValueInstance(); - - } - } - - - interface IBean { - long getLong(); - - void setLong(long num); - - double getDouble(); - - void setDouble(double d); - - int getInt(); - - void setInt(int i); - } - - @Test - public void testNewKeyValueInstanceWithListType() { - try (ChronicleMap map = ChronicleMap.of(HashMap.class, IBean.class) - .entries(1) - .averageKey(new HashMap()) - .create()) { - - map.newKeyInstance(); - Object value = map.newValueInstance(); - - assertTrue(value.getClass().getCanonicalName().endsWith($$HEAP)); - - - } - } - - - @Test(expected = IllegalStateException.class) - public void testNewKeyValueInstanceWithByteArray() { - try (ChronicleMap map = ChronicleMapBuilder - .of(byte[].class, byte[].class) - .create()) { - - map.newKeyInstance(); - map.newValueInstance(); - } - } -} diff --git a/src/test/java/net/openhft/chronicle/map/LataTest.java b/src/test/java/net/openhft/chronicle/map/LataTest.java index 25f1a8880..f82506b97 100644 --- a/src/test/java/net/openhft/chronicle/map/LataTest.java +++ b/src/test/java/net/openhft/chronicle/map/LataTest.java @@ -18,6 +18,7 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.values.MaxUtf8Length; +import net.openhft.chronicle.values.Values; public class LataTest { @@ -42,11 +43,11 @@ public class LataTest { ChronicleMap map = builder.create(); StringValue[] keys = new StringValue[300]; for (int i = 0; i < keys.length; i++) { - keys[i] = map.newKeyInstance(); + keys[i] = Values.newHeapInstance(StringValue.class); keys[i].setValue("" + i); } - IData value = map.newValueInstance(); - IData dataValue = map.newValueInstance(); + IData value = Values.newHeapInstance(IData.class); + IData dataValue = Values.newHeapInstance(IData.class); for (int index = 0; index < run; index++) { currentRun++; startTime = System.nanoTime(); diff --git a/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java b/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java index d5bbafd02..2a03911ff 100644 --- a/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java +++ b/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java @@ -234,16 +234,6 @@ public class ReplicationCheckingMap implements ChronicleMap { throw new UnsupportedOperationException(); } - @Override - public V newValueInstance() { - throw new UnsupportedOperationException(); - } - - @Override - public K newKeyInstance() { - throw new UnsupportedOperationException(); - } - @Override public Class keyClass() { return map1.keyClass(); diff --git a/src/test/java/net/openhft/chronicle/map/TcpReplicationWithAcquireContextTest.java b/src/test/java/net/openhft/chronicle/map/TcpReplicationWithAcquireContextTest.java index 048ba8e7c..f7c0170d1 100644 --- a/src/test/java/net/openhft/chronicle/map/TcpReplicationWithAcquireContextTest.java +++ b/src/test/java/net/openhft/chronicle/map/TcpReplicationWithAcquireContextTest.java @@ -18,6 +18,7 @@ package net.openhft.chronicle.map; import eg.TestInstrumentVOInterface; import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig; +import net.openhft.chronicle.values.Values; import org.junit.Assert; import org.junit.Test; @@ -61,7 +62,8 @@ public class TcpReplicationWithAcquireContextTest { map2a = map2; //Store some data into MAP1 - TestInstrumentVOInterface instrumentVOInterface = map1.newValueInstance(); + TestInstrumentVOInterface instrumentVOInterface = + Values.newNativeReference(TestInstrumentVOInterface.class); try (net.openhft.chronicle.core.io.Closeable c = @@ -120,7 +122,8 @@ public class TcpReplicationWithAcquireContextTest { map2a = map2; //Store some data into MAP1 - TestInstrumentVOInterface instrumentVOInterface = map1.newValueInstance(); + TestInstrumentVOInterface instrumentVOInterface = + Values.newHeapInstance(TestInstrumentVOInterface.class); map2a.put("hello", instrumentVOInterface); @@ -173,7 +176,8 @@ public class TcpReplicationWithAcquireContextTest { map2a = map2; //Store some data into MAP1 - TestInstrumentVOInterface instrumentVOInterface = map1.newValueInstance(); + TestInstrumentVOInterface instrumentVOInterface = + Values.newHeapInstance(TestInstrumentVOInterface.class); instrumentVOInterface.setSymbol("Flyer"); map2a.put("hello", instrumentVOInterface); diff --git a/src/test/java/net/openhft/chronicle/map/example/LotsOfEntriesMain.java b/src/test/java/net/openhft/chronicle/map/example/LotsOfEntriesMain.java index f18c68e53..7631c11c2 100755 --- a/src/test/java/net/openhft/chronicle/map/example/LotsOfEntriesMain.java +++ b/src/test/java/net/openhft/chronicle/map/example/LotsOfEntriesMain.java @@ -19,6 +19,7 @@ package net.openhft.chronicle.map.example; import net.openhft.chronicle.map.ChronicleMap; import net.openhft.chronicle.map.ChronicleMapBuilder; import net.openhft.chronicle.values.Array; +import net.openhft.chronicle.values.Values; import java.io.File; import java.io.IOException; @@ -64,7 +65,7 @@ public class LotsOfEntriesMain { public void run() { Random rand = new Random(startI); StringBuilder sb = new StringBuilder(); - MyFloats mf = map.newValueInstance(); + MyFloats mf = Values.newHeapInstance(MyFloats.class); if (add) for (int i = 0; i < 6; i++) mf.setValueAt(i, i); diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/OpenJDKAndHashMapExamplesTest.java b/src/test/java/net/openhft/chronicle/map/fromdocs/OpenJDKAndHashMapExamplesTest.java index 8db63e7a0..ccc2e2e86 100644 --- a/src/test/java/net/openhft/chronicle/map/fromdocs/OpenJDKAndHashMapExamplesTest.java +++ b/src/test/java/net/openhft/chronicle/map/fromdocs/OpenJDKAndHashMapExamplesTest.java @@ -19,6 +19,7 @@ package net.openhft.chronicle.map.fromdocs; import net.openhft.chronicle.map.ChronicleMap; import net.openhft.chronicle.map.ChronicleMapBuilder; import net.openhft.chronicle.map.ExternalMapQueryContext; +import net.openhft.chronicle.values.Values; import org.junit.Test; import java.io.File; @@ -57,7 +58,7 @@ public class OpenJDKAndHashMapExamplesTest { .entries(1000) .createPersistedTo(file); - BondVOInterface bondVO = chm.newValueInstance(); + BondVOInterface bondVO = Values.newNativeReference(BondVOInterface.class); try (net.openhft.chronicle.core.io.Closeable c = chm.acquireContext("369604103", bondVO)) { bondVO.setIssueDate(parseYYYYMMDD("20130915")); @@ -95,7 +96,7 @@ public class OpenJDKAndHashMapExamplesTest { } } - BondVOInterface bond = chm.newValueInstance(); + BondVOInterface bond = Values.newNativeReference(BondVOInterface.class); // lookup the key and give me a reference I can update in a thread safe way. try (net.openhft.chronicle.core.io.Closeable c = chm.acquireContext("369604103", bond)) {