Merge branch 'master' into feature/analytics

src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java

@@ -823,6 +823,6 @@ public interface ChronicleHashBuilder<K, H extends ChronicleHash<K, ?, ?, ?>,
     /**
      * @deprecated don't use private API in the client code
      */
-    @Deprecated
+    @Deprecated(/* to be removed in x.22 */)
     Object privateAPI();
 }

src/main/java/net/openhft/chronicle/hash/VanillaGlobalMutableState$$Native.java

@@ -29,7 +29,7 @@ import net.openhft.chronicle.values.Copyable;
  * {@link net.openhft.chronicle.values.Values#nativeClassFor(Class)
  * Values.nativeClassFor(VanillaGlobalMutableState.class)}
  */
-@Deprecated
+@Deprecated(/* to be removed in x.22 */)
 public class VanillaGlobalMutableState$$Native implements VanillaGlobalMutableState, Copyable<VanillaGlobalMutableState>, BytesMarshallable, Byteable {
     private BytesStore bs;
 

src/main/java/net/openhft/chronicle/hash/serialization/impl/CharSequenceSizedReader.java

@@ -35,7 +35,7 @@ public class CharSequenceSizedReader implements SizedReader<CharSequence>,
      * @deprecated use {@link #INSTANCE} as {@code CharSequenceSizedReader} is immutable and
      * stateless
      */
-    @Deprecated
+    @Deprecated(/* to be removed in x.22 */)
     public CharSequenceSizedReader() {
     }
 

src/main/java/net/openhft/chronicle/hash/serialization/impl/CharSequenceSizedWriter.java

@@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull;
  * this class as the key or value writer should be able to read and access the map with the present
  * version of the library.
  */
-@Deprecated
+@Deprecated(/* to be removed in x.22 */)
 @SuppressWarnings("deprecation")
 public final class CharSequenceSizedWriter
         implements SizedWriter<CharSequence>, EnumMarshallable<CharSequenceSizedWriter> {

src/main/java/net/openhft/chronicle/hash/serialization/impl/IntegerDataAccess.java

@@ -35,7 +35,7 @@ import org.jetbrains.annotations.Nullable;
  * Chronicle Map library.
  */
 @SuppressWarnings("DeprecatedIsStillUsed")
-@Deprecated
+@Deprecated(/* to be removed in x.22 */)
 public final class IntegerDataAccess extends AbstractData<Integer>
         implements DataAccess<Integer>, Data<Integer> {
 

src/main/java/net/openhft/chronicle/hash/serialization/impl/WrongXxHash.java

@@ -20,7 +20,7 @@ package net.openhft.chronicle.hash.serialization.impl;
  * @deprecated this class exists for compatibility with old versions of Chronicle Map, which used
  * wrong version of xxHash.
  */
-@Deprecated
+@Deprecated(/* to be removed in x.22 */)
 public final class WrongXxHash {
 
     // xxHash constants

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

@@ -530,7 +530,7 @@ public final class ChronicleMapBuilder<K, V> implements
      * @deprecated don't use private API in the client code
      */
     @Override
-    @Deprecated
+    @Deprecated(/* to be removed in x.22 */)
     public Object privateAPI() {
         return privateAPI;
     }

src/main/java/net/openhft/chronicle/map/ReplicatedGlobalMutableState$$Native.java

@@ -29,7 +29,7 @@ import net.openhft.chronicle.values.Copyable;
  * {@link net.openhft.chronicle.values.Values#nativeClassFor(Class)
  * Values.nativeClassFor(ReplicatedGlobalMutableState.class)}
  */
-@Deprecated
+@Deprecated(/* to be removed in x.22 */)
 public class ReplicatedGlobalMutableState$$Native implements ReplicatedGlobalMutableState, Copyable<ReplicatedGlobalMutableState>, BytesMarshallable, Byteable {
     private BytesStore bs;
 

src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java

@@ -367,7 +367,7 @@ public final class ChronicleSetBuilder<K>
     /**
      * @deprecated don't use private API in the client code
      */
-    @Deprecated
+    @Deprecated(/* to be removed in x.22 */)
     @Override
     public Object privateAPI() {
         return privateAPI;