From 2f03b7125239750091e2963759212e8eed989bdc Mon Sep 17 00:00:00 2001
From: Peter Lawrey <peter.lawrey@higherfrequencytrading.com>
Date: Wed, 4 Dec 2019 09:23:33 +0000
Subject: [PATCH] Split AbstractMarshallable into SelfDescribingMarshallable
 and BytesInBinaryMarshallable, closes
 https://github.com/OpenHFT/Chronicle-Wire/issues/151

---
 .../chronicle/map/AbstractMarshallableKeyValueTest.java   | 8 ++++----
 .../java/net/openhft/chronicle/map/SerializableTest.java  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/test/java/net/openhft/chronicle/map/AbstractMarshallableKeyValueTest.java b/src/test/java/net/openhft/chronicle/map/AbstractMarshallableKeyValueTest.java
index a59fed5f7..d22d6731b 100644
--- a/src/test/java/net/openhft/chronicle/map/AbstractMarshallableKeyValueTest.java
+++ b/src/test/java/net/openhft/chronicle/map/AbstractMarshallableKeyValueTest.java
@@ -16,7 +16,7 @@
 
 package net.openhft.chronicle.map;
 
-import net.openhft.chronicle.wire.AbstractMarshallable;
+import net.openhft.chronicle.wire.SelfDescribingMarshallable;
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -34,11 +34,11 @@ public final class AbstractMarshallableKeyValueTest {
         assertThat(map.get(new Key()).number, is(new Value().number));
     }
 
-    private static final class Key extends AbstractMarshallable {
+    private static final class Key extends SelfDescribingMarshallable {
         private String k = "key";
     }
 
-    private static final class Value extends AbstractMarshallable {
-        private Integer number = Integer.valueOf(17);
+    private static final class Value extends SelfDescribingMarshallable {
+        private Integer number = 17;
     }
 }
diff --git a/src/test/java/net/openhft/chronicle/map/SerializableTest.java b/src/test/java/net/openhft/chronicle/map/SerializableTest.java
index 6fcdf44fc..969dbe92b 100755
--- a/src/test/java/net/openhft/chronicle/map/SerializableTest.java
+++ b/src/test/java/net/openhft/chronicle/map/SerializableTest.java
@@ -1,7 +1,7 @@
 package net.openhft.chronicle.map;
 
-import net.openhft.chronicle.wire.AbstractBytesMarshallable;
-import net.openhft.chronicle.wire.AbstractMarshallable;
+import net.openhft.chronicle.wire.BytesInBinaryMarshallable;
+import net.openhft.chronicle.wire.SelfDescribingMarshallable;
 import org.junit.Test;
 
 import java.io.Serializable;
@@ -108,7 +108,7 @@ public class SerializableTest {
         }
     }
 
-    static class Bar extends AbstractBytesMarshallable {
+    static class Bar extends BytesInBinaryMarshallable {
 
         final String x;
 
@@ -117,7 +117,7 @@ public class SerializableTest {
         }
     }
 
-    static class Bar2 extends AbstractMarshallable {
+    static class Bar2 extends SelfDescribingMarshallable {
 
         final String x;