From 61cccf1793e8b3b9784cf6a0778d18f0f2c8ca8b Mon Sep 17 00:00:00 2001
From: Rob Austin <rob.austin@boundedbuffer.co.uk>
Date: Tue, 10 Mar 2015 18:32:15 +0000
Subject: [PATCH] changed "string" to enum

---
 .../map/StatelessWiredConnector.java          | 122 ++++++++++--------
 1 file changed, 71 insertions(+), 51 deletions(-)

diff --git a/src/main/java/net/openhft/chronicle/map/StatelessWiredConnector.java b/src/main/java/net/openhft/chronicle/map/StatelessWiredConnector.java
index 4b1b097a1..6d80d6514 100644
--- a/src/main/java/net/openhft/chronicle/map/StatelessWiredConnector.java
+++ b/src/main/java/net/openhft/chronicle/map/StatelessWiredConnector.java
@@ -30,6 +30,7 @@ import net.openhft.chronicle.hash.replication.ReplicationHub;
 import net.openhft.chronicle.wire.TextWire;
 import net.openhft.chronicle.wire.ValueIn;
 import net.openhft.chronicle.wire.Wire;
+import net.openhft.chronicle.wire.WireKey;
 import net.openhft.lang.io.ByteBufferBytes;
 import net.openhft.lang.io.DirectStore;
 import net.openhft.lang.io.IByteBufferBytes;
@@ -60,6 +61,24 @@ import static java.nio.channels.SelectionKey.OP_WRITE;
 class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarshallable> {
 
     private static final Logger LOG = LoggerFactory.getLogger(StatelessWiredConnector.class);
+
+    public enum Fields implements WireKey {
+        HAS_NEXT,
+        TIME_STAMP,
+        CHANNEL_ID,
+        METHOD_NAME,
+        TRANSACTION_ID,
+        RESULT,
+        RESULT_KEY,
+        RESULT_VALUE,
+        ARG_1,
+        ARG_2,
+        ARG_3,
+        IS_EXCEPTION,
+        EXCEPTION,
+        RESULT_IS_NULL
+    }
+
     private final NativeBytes inLangBytes = new NativeBytes(0, 0);
 
     @NotNull
@@ -88,7 +107,7 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
 
         @Override
         public void accept(Iterator<byte[]> iterator) {
-            outWire.write(() -> "RESULT");
+            outWire.write(Fields.RESULT);
             outWire.bytes().write(iterator.next());
         }
     };
@@ -100,10 +119,10 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
 
             final Map.Entry<byte[], byte[]> entry = iterator.next();
 
-            outWire.write(() -> "RESULT_KEY");
+            outWire.write(Fields.RESULT_KEY);
             outWire.bytes().write(entry.getKey());
 
-            outWire.write(() -> "RESULT_VALUE");
+            outWire.write(Fields.RESULT_VALUE);
             outWire.bytes().write(entry.getValue());
         }
     };
@@ -277,12 +296,12 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
         out = () -> {
 
             // each chunk has its own transaction-id
-            outWire.write(() -> "TRANSACTION_ID").int64(transactionId);
+            outWire.write(Fields.TRANSACTION_ID).int64(transactionId);
 
             write(map -> {
 
                 boolean hasNext = iterator.hasNext();
-                outWire.write(() -> "HAS_NEXT").bool(hasNext);
+                outWire.write(Fields.HAS_NEXT).bool(hasNext);
 
                 if (hasNext)
                     c.accept(iterator);
@@ -301,14 +320,14 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
     void onEvent() {
 
         // it is assumed by this point that the buffer has all the bytes in it for this message
-        long transactionId = inWire.read(() -> "TRANSACTION_ID").int64();
-        timestamp = inWire.read(() -> "TIME_STAMP").int64();
-        channelId = inWire.read(() -> "CHANNEL_ID").int16();
-        inWire.read(() -> "METHOD_NAME").text(methodName);
+        long transactionId = inWire.read(Fields.TRANSACTION_ID).int64();
+        timestamp = inWire.read(Fields.TIME_STAMP).int64();
+        channelId = inWire.read(Fields.CHANNEL_ID).int16();
+        inWire.read(Fields.METHOD_NAME).text(methodName);
 
         if ("PUT_WITHOUT_ACC".contentEquals(methodName)) {
             writeVoid(bytesMap -> {
-                final net.openhft.lang.io.Bytes reader = toReader(inWire, "ARG_1", "ARG_2");
+                final net.openhft.lang.io.Bytes reader = toReader(inWire, Fields.ARG_1, Fields.ARG_2);
                 bytesMap.put(reader, reader, timestamp, identifier());
             });
             return;
@@ -346,7 +365,7 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
             if ("CREATE_CHANNEL".contentEquals(methodName)) {
 
                 writeVoid(() -> {
-                    short channelId1 = inWire.read(() -> "ARG_1").int16();
+                    short channelId1 = inWire.read(Fields.ARG_1).int16();
                     chronicleHashInstanceBuilder.replicatedViaChannel(hub.createChannel(channelId1)).create();
                     return null;
                 });
@@ -355,47 +374,47 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
 
 
             if ("REMOTE_IDENTIFIER".contentEquals(methodName)) {
-                this.remoteIdentifier = inWire.read(() -> "RESULT").int8();
+                this.remoteIdentifier = inWire.read(Fields.RESULT).int8();
                 return;
             }
 
             if ("LONG_SIZE".contentEquals(methodName)) {
-                write(b -> outWire.write(() -> "RESULT").int64(b.longSize()));
+                write(b -> outWire.write(Fields.RESULT).int64(b.longSize()));
                 return;
             }
 
             if ("IS_EMPTY".contentEquals(methodName)) {
-                write(b -> outWire.write(() -> "RESULT").bool(b.isEmpty()));
+                write(b -> outWire.write(Fields.RESULT).bool(b.isEmpty()));
                 return;
             }
 
             if ("CONTAINS_KEY".contentEquals(methodName)) {
-                write(b -> outWire.write(() -> "RESULT").
-                        bool(b.containsKey(toReader(inWire, "ARG_1"))));
+                write(b -> outWire.write(Fields.RESULT).
+                        bool(b.containsKey(toReader(inWire, Fields.ARG_1))));
                 return;
             }
 
             if ("CONTAINS_VALUE".contentEquals(methodName)) {
-                write(b -> outWire.write(() -> "RESULT").
-                        bool(b.containsKey(toReader(inWire, "ARG_1"))));
+                write(b -> outWire.write(Fields.RESULT).
+                        bool(b.containsKey(toReader(inWire, Fields.ARG_1))));
                 return;
             }
 
             if ("GET".contentEquals(methodName)) {
-                writeValue(b -> b.get(toReader(inWire, "ARG_1")));
+                writeValue(b -> b.get(toReader(inWire, Fields.ARG_1)));
                 return;
             }
 
             if ("PUT".contentEquals(methodName)) {
                 writeValue(bytesMap -> {
-                    final net.openhft.lang.io.Bytes reader = toReader(inWire, "ARG_1", "ARG_2");
+                    final net.openhft.lang.io.Bytes reader = toReader(inWire, Fields.ARG_1, Fields.ARG_2);
                     bytesMap.put(reader, reader, timestamp, identifier());
                 });
                 return;
             }
 
             if ("REMOVE".contentEquals(methodName)) {
-                writeValue(b -> b.remove(toReader(inWire, "ARG_1")));
+                writeValue(b -> b.remove(toReader(inWire, Fields.ARG_1)));
                 return;
             }
 
@@ -406,7 +425,7 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
 
             if ("REPLACE".contentEquals(methodName)) {
                 writeValue(bytesMap -> {
-                    final net.openhft.lang.io.Bytes reader = toReader(inWire, "ARG_1", "ARG_2");
+                    final net.openhft.lang.io.Bytes reader = toReader(inWire, Fields.ARG_1, Fields.ARG_2);
                     bytesMap.replace(reader, reader);
                 });
                 return;
@@ -414,7 +433,7 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
 
             if ("REPLACE_WITH_OLD_AND_NEW_VALUE".contentEquals(methodName)) {
                 writeValue(bytesMap -> {
-                    final net.openhft.lang.io.Bytes reader = toReader(inWire, "ARG_1", "ARG_2", "ARG_3");
+                    final net.openhft.lang.io.Bytes reader = toReader(inWire, Fields.ARG_1, Fields.ARG_2, Fields.ARG_3);
                     bytesMap.replace(reader, reader, reader);
                 });
                 return;
@@ -422,7 +441,7 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
 
             if ("PUT_IF_ABSENT".contentEquals(methodName)) {
                 writeValue(bytesMap -> {
-                    final net.openhft.lang.io.Bytes reader = toReader(inWire, "ARG_1", "ARG_2");
+                    final net.openhft.lang.io.Bytes reader = toReader(inWire, Fields.ARG_1, Fields.ARG_2);
                     bytesMap.putIfAbsent(reader, reader, timestamp, identifier());
                 });
                 return;
@@ -430,34 +449,33 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
 
             if ("REMOVE_WITH_VALUE".contentEquals(methodName)) {
                 writeValue(bytesMap -> {
-                    final net.openhft.lang.io.Bytes reader = toReader(inWire, "ARG_1", "ARG_2");
+                    final net.openhft.lang.io.Bytes reader = toReader(inWire, Fields.ARG_1, Fields.ARG_2);
                     bytesMap.remove(reader, reader, timestamp, identifier());
                 });
                 return;
             }
 
             if ("TO_STRING".contentEquals(methodName)) {
-                write(b -> outWire.write(() -> "RESULT").text(b.toString()));
+                write(b -> outWire.write(Fields.RESULT).text(b.toString()));
                 return;
             }
 
             if ("APPLICATION_VERSION".contentEquals(methodName)) {
-                write(b -> outWire.write(() -> "RESULT").text(applicationVersion()));
+                write(b -> outWire.write(Fields.RESULT).text(applicationVersion()));
                 return;
             }
 
             if ("PERSISTED_DATA_VERSION".contentEquals(methodName)) {
-                write(b -> outWire.write(() -> "RESULT").text(persistedDataVersion()));
+                write(b -> outWire.write(Fields.RESULT).text(persistedDataVersion()));
 
                 return;
             }
 
             if ("HASH_CODE".contentEquals(methodName)) {
-                write(b -> outWire.write(() -> "RESULT").int32(b.hashCode()));
+                write(b -> outWire.write(Fields.RESULT).int32(b.hashCode()));
                 return;
             }
 
-
             throw new IllegalStateException("unsupported event=" + methodName);
 
         } finally {
@@ -478,10 +496,12 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
 
     }
 
-    private byte[] toBytes(String fieldName) {
+    private byte[] toBytes(WireKey fieldName) {
 
         Wire wire = inWire;
-        ValueIn read = wire.read(() -> fieldName);
+        System.out.println(Bytes.toDebugString(inWire.bytes()));
+
+        ValueIn read = wire.read(fieldName);
 
         long l = read.readLength();
         if (l > Integer.MAX_VALUE)
@@ -527,18 +547,18 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
 
             @Override
             public void run() {
-                if (inWire.read(() -> "HAS_NEXT").bool()) {
-                    collectData.put(toBytes("ARG_1"), toBytes("ARG_2"));
+                if (inWire.read(Fields.HAS_NEXT).bool()) {
+                    collectData.put(toBytes(Fields.ARG_1), toBytes(Fields.ARG_2));
                 } else {
                     // the old code assumed that all the data would fit into a single buffer
                     // this assumption is invalid
                     if (!collectData.isEmpty()) {
                         bytesMap.delegate.putAll((Map) collectData);
                         incompleteWork.remove(transactionId);
-                        outWire.write(() -> "TRANSACTION_ID").int64(transactionId);
+                        outWire.write(Fields.TRANSACTION_ID).int64(transactionId);
 
                         // todo handle the case where there is an exception
-                        outWire.write(() -> "IS_EXCEPTION").bool(false);
+                        outWire.write(Fields.IS_EXCEPTION).bool(false);
 
                         nofityDataWritten();
                     }
@@ -577,15 +597,15 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
      * @param args the key names of the {@code wire} args
      * @return a new lang buffer containing the bytes of the args
      */
-    private net.openhft.lang.io.Bytes toReader(@NotNull Wire wire, @NotNull String... args) {
+    private net.openhft.lang.io.Bytes toReader(@NotNull Wire wire, @NotNull WireKey... args) {
 
         long inSize = wire.bytes().limit();
         final net.openhft.lang.io.Bytes bytes = DirectStore.allocate(inSize).bytes();
 
         // copy the bytes to the reader
-        for (final String field : args) {
+        for (final WireKey field : args) {
 
-            ValueIn read = wire.read(() -> field);
+            ValueIn read = wire.read(field);
             long fieldLength = read.readLength();
 
             long endPos = wire.bytes().position() + fieldLength;
@@ -626,7 +646,6 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
     @NotNull
     private ReplicatedChronicleMap map(short channelId) {
 
-
         // todo this cast is a bit of a hack, improve later
         final ReplicatedChronicleMap replicas =
                 (ReplicatedChronicleMap) channelList.get(channelId);
@@ -688,8 +707,8 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
 
             // the idea of wire is that is platform independent,
             // so we wil have to send the exception as a String
-            outWire.write(() -> "IS_EXCEPTION").bool(true);
-            outWire.write(() -> "EXCEPTION").text(toString(e));
+            outWire.write(Fields.IS_EXCEPTION).bool(true);
+            outWire.write(Fields.EXCEPTION).text(toString(e));
             LOG.error("", e);
             return;
         }
@@ -712,7 +731,7 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
 
         bytesMap.output = null;
         outWire.bytes().mark();
-        outWire.write(() -> "IS_EXCEPTION").bool(false);
+        outWire.write(Fields.IS_EXCEPTION).bool(false);
 
         try {
             c.accept(bytesMap);
@@ -720,8 +739,8 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
             outWire.bytes().reset();
             // the idea of wire is that is platform independent,
             // so we wil have to send the exception as a String
-            outWire.write(() -> "IS_EXCEPTION").bool(true);
-            outWire.write(() -> "EXCEPTION").text(toString(e));
+            outWire.write(Fields.IS_EXCEPTION).bool(true);
+            outWire.write(Fields.EXCEPTION).text(toString(e));
             LOG.error("", e);
             return;
         }
@@ -742,7 +761,7 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
 
         bytesMap.output = null;
         outWire.bytes().mark();
-        outWire.write(() -> "IS_EXCEPTION").bool(false);
+        outWire.write(Fields.IS_EXCEPTION).bool(false);
 
         try {
             r.call();
@@ -750,8 +769,8 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
             outWire.bytes().reset();
             // the idea of wire is that is platform independent,
             // so we wil have to send the exception as a String
-            outWire.write(() -> "IS_EXCEPTION").bool(true);
-            outWire.write(() -> "EXCEPTION").text(toString(e));
+            outWire.write(Fields.IS_EXCEPTION).bool(true);
+            outWire.write(Fields.EXCEPTION).text(toString(e));
             LOG.error("", e);
             return;
         }
@@ -812,6 +831,7 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
      */
     private static class OutMessageAdapter {
 
+
         @NotNull
         private final IByteBufferBytes outLangBytes = ByteBufferBytes.wrap(ByteBuffer.allocate(1024));
         private Bytes outChronBytes = Bytes.wrap(outLangBytes.buffer());
@@ -868,7 +888,7 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
          */
         void accept(@NotNull Wire wire) {
 
-            wire.write(() -> "IS_EXCEPTION").bool(false);
+            wire.write(Fields.IS_EXCEPTION).bool(false);
 
             // flips calls flip on this message so that we can read it
             flipMessage();
@@ -883,10 +903,10 @@ class StatelessWiredConnector<K extends BytesMarshallable, V extends BytesMarsha
             // read the size - not used
             outChronBytes.readStopBit();
 
-            wire.write(() -> "RESULT_IS_NULL").bool(isNull);
+            wire.write(Fields.RESULT_IS_NULL).bool(isNull);
             if (!isNull) {
                 // write the result
-                wire.write(() -> "RESULT");
+                wire.write(Fields.RESULT);
                 wire.bytes().write(outChronBytes);
             }
         }