From 6f6795371d58d5963264391511c1c72bb279078f Mon Sep 17 00:00:00 2001
From: Rob Austin <rob.austin@boundedbuffer.co.uk>
Date: Wed, 4 Mar 2020 12:45:53 +0000
Subject: [PATCH] fixed imports

---
 .../openhft/chronicle/map/ChronicleMap.java   | 27 +++++++------------
 .../chronicle/map/VanillaChronicleMap.java    |  8 ++----
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ChronicleMap.java
index f1d42cdbf..528e0dac0 100755
--- a/src/main/java/net/openhft/chronicle/map/ChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ChronicleMap.java
@@ -215,12 +215,9 @@ public interface ChronicleMap<K, V> extends ConcurrentMap<K, V>,
     Type valueType();
 
     /**
-     * @return the amount of free space in the map as  a percentage.
-     * When the free space gets low ( around 5% ) the map will automatically expand. The
-     * number of times it can automatically expand is based on the
-     * {@code net.openhft.chronicle.map.ChronicleMapBuilder#maxBloatFactor}. If the map
-     * expands you will see an increase in the available free space. It is not possible to
-     * expand the chronicle map manually.
+     * @return the amount of free space in the map as a percentage. When the free space gets low ( around 5% ) the map will automatically expand. The
+     * number of times it can automatically expand is based on the {@code net.openhft.chronicle.map.ChronicleMapBuilder#maxBloatFactor}. If the map
+     * expands you will see an increase in the available free space. NOTE: It is not possible to expand the chronicle map manually.
      *
      * see also {@see net.openhft.chronicle.map.ChronicleMap#remainingAutoResizes} as these operations are related.
      */
@@ -229,20 +226,16 @@ public interface ChronicleMap<K, V> extends ConcurrentMap<K, V>,
     }
 
     /**
-     * @return the number of times in the future the map can expand its capacity
-     * ( by expending capacity we mean the number of possible entries that
-     * Can be stored into the map), the map will expand automatically, however, there is an upper limit to the
-     * number of times the map can expand.
-     * This limit is set via the {@code net.openhft.chronicle.map.ChronicleMapBuilder#maxBloatFactor} if
-     * the {@code remainingResizes} drops to zero,
-     * then the map is no longer able to resize, if subsequently, the free space
-     * ( see  {@link net.openhft.chronicle.map.ChronicleMap#percentageFreeSpace}) if the map becomes low ( around 5% ),
-     * the map will not be able to take more entries and will fail with an {@code
-     * java.lang.IllegalStateException} for production systems it is recommended you periodically monitor this result and the both the
+     * @return the number of times in the future the map can expand its capacity ( by expending capacity we mean the number of possible entries that
+     * Can be stored into the map), the map will expand automatically. However, there is an upper limit to the number of times the map can expand.
+     * This limit is set via the {@code net.openhft.chronicle.map.ChronicleMapBuilder#maxBloatFactor} if the {@code remainingResizes} drops to zero,
+     * then the map is no longer able to resize, if subsequently, the free space ( see  {@link net.openhft.chronicle.map.ChronicleMap#percentageFreeSpace})
+     *  in the map becomes low ( around 5% ), the map will not be able to take more entries and will fail with an {@code
+     * java.lang.IllegalStateException} for production systems it is recommended you periodically monitor the remainingAutoResizes and {@link
      * {@link net.openhft.chronicle.map.ChronicleMap#percentageFreeSpace}.
      */
     default int remainingAutoResizes() {
         throw new UnsupportedOperationException("todo");
     }
+}
 
-}
\ No newline at end of file
diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
index d385f8cc6..ec9356a33 100755
--- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
@@ -16,8 +16,6 @@
 
 package net.openhft.chronicle.map;
 
-import impl.CompiledMapIterationContext;
-import impl.CompiledMapQueryContext;
 import net.openhft.chronicle.algo.bitset.ReusableBitSet;
 import net.openhft.chronicle.algo.hashing.LongHashFunction;
 import net.openhft.chronicle.bytes.Bytes;
@@ -37,9 +35,7 @@ import net.openhft.chronicle.hash.serialization.DataAccess;
 import net.openhft.chronicle.hash.serialization.SizeMarshaller;
 import net.openhft.chronicle.hash.serialization.SizedReader;
 import net.openhft.chronicle.hash.serialization.impl.SerializationBuilder;
-import net.openhft.chronicle.map.impl.IterationContext;
-import net.openhft.chronicle.map.impl.NullReturnValue;
-import net.openhft.chronicle.map.impl.QueryContextInterface;
+import net.openhft.chronicle.map.impl.*;
 import net.openhft.chronicle.map.impl.ret.InstanceReturnValue;
 import net.openhft.chronicle.set.ChronicleSet;
 import net.openhft.chronicle.wire.WireIn;
@@ -403,7 +399,7 @@ public class VanillaChronicleMap<K, V, R>
 
     public QueryContextInterface<K, V, R> mapContext() {
         //noinspection unchecked
-        return q().getContext(CompiledMapQueryContext.class,
+        return q().getContext(CompiledMapIterationContext.class,
                 // lambda is used instead of constructor reference because currently stage-compiler
                 // has issues with parsing method/constructor refs.
                 // TODO replace with constructor ref when stage-compiler is improved