Merge pull request #51 from swarwick/master

 Issue #47 and Issue #48

Author: iamolever

core/build.gradle

@@ -1,5 +1,5 @@
 group 'com.epam.cme'
-version '2.0.2'
+version '2.1.0'
 
 apply plugin: 'java'
 

core/src/main/java/com/epam/cme/mdp3/MdpPacket.java

@@ -14,7 +14,6 @@
 
 import com.epam.cme.mdp3.sbe.message.SbeBuffer;
 import com.epam.cme.mdp3.sbe.message.SbeBufferImpl;
-import com.epam.cme.mdp3.sbe.message.SbeConstants;
 import com.epam.cme.mdp3.sbe.message.SbeMessage;
 
 import java.nio.ByteBuffer;

core/src/main/java/com/epam/cme/mdp3/core/channel/MdpFeedException.java

@@ -12,8 +12,10 @@
 
 package com.epam.cme.mdp3.core.channel;
 
-public class
-MdpFeedException extends Exception {
+public class MdpFeedException extends Exception {
+
+    private static final long serialVersionUID = -6425092985801210129L;
+
     public MdpFeedException() {
         super();
     }

core/src/main/java/com/epam/cme/mdp3/core/channel/MdpFeedWorker.java

@@ -37,8 +37,6 @@
 
 public class MdpFeedWorker implements Runnable {
     private static final Logger logger = LoggerFactory.getLogger(MdpFeedWorker.class);
-    private static final int ACTIVE_MARK = 1;
-    private static final int SHUTDOWN_MARK = 2;
     public static final int RCV_BUFFER_SIZE = 4*1024*1024;
 
     private final ConnectionCfg cfg;
@@ -167,7 +165,7 @@ public void run() {
 
     private void select(final ByteBuffer byteBuffer, final MdpPacket mdpPacket) throws IOException {
         if (selector.select() > 0) {
-            Iterator selectedKeys = selector.selectedKeys().iterator();
+            Iterator<?> selectedKeys = selector.selectedKeys().iterator();
             while (selectedKeys.hasNext()) {
                 final SelectionKey key = (SelectionKey) selectedKeys.next();
                 selectedKeys.remove();

core/src/main/java/com/epam/cme/mdp3/sbe/message/SbeBuffer.java

@@ -26,11 +26,11 @@ public interface SbeBuffer {
      */
     void wrapForParse(final ByteBuffer bb);
 
-    void copyTo(BytesStore store);
+    void copyTo(BytesStore<?, ?> store);
 
-    void copyTo(int offset, BytesStore store, int len);
+    void copyTo(int offset, BytesStore<?, ?> store, int len);
 
-    void copyFrom(BytesStore store);
+    void copyFrom(BytesStore<?, ?> store);
 
     void copyFrom(SbeBuffer buffer);
 

core/src/main/java/com/epam/cme/mdp3/sbe/message/SbeBufferImpl.java

@@ -19,7 +19,7 @@
 
 public class SbeBufferImpl extends AbstractSbeBuffer implements SbeBuffer {
     public static final byte BYTE_MASK = (byte) 0xff;
-    protected BytesStore bytes;
+    protected BytesStore<?, ?> bytes;
 
     @Override
     public void wrap(final SbeBuffer sb) {
@@ -31,17 +31,17 @@ public void wrap(final SbeBuffer sb) {
     }
 
     @Override
-    public void copyTo(final BytesStore store) {
+    public void copyTo(final BytesStore<?, ?> store) {
         store.write(0, this.bytes, 0, this.length());
     }
 
     @Override
-    public void copyTo(final int offset, final BytesStore store, final int len) {
+    public void copyTo(final int offset, final BytesStore<?, ?> store, final int len) {
         store.write(0, this.bytes, offset, len);
     }
 
     @Override
-    public void copyFrom(BytesStore store) {
+    public void copyFrom(BytesStore<?, ?> store) {
         this.bytes.write(0, store, 0, store.length());
         this.length = store.length();
     }

core/src/main/java/com/epam/cme/mdp3/sbe/message/meta/SbePrimitiveType.java

@@ -86,6 +86,10 @@ public long getMaxValue() {
     public long getNullValue() {
         return nullValue;
     }
+    
+    public String getJavaType() {
+        return javaType;
+    }
 
     public boolean isNull(final long value) {
         return value == this.nullValue;

core/src/main/java/com/epam/cme/mdp3/sbe/schema/MdpMessageTypeBuildException.java

@@ -13,6 +13,8 @@
 package com.epam.cme.mdp3.sbe.schema;
 
 public class MdpMessageTypeBuildException extends Exception {
+    private static final long serialVersionUID = -6385550323191516252L;
+
     public MdpMessageTypeBuildException() {
         super();
     }

core/src/main/java/com/epam/cme/mdp3/sbe/schema/SchemaUnmarshallingException.java

@@ -13,6 +13,8 @@
 package com.epam.cme.mdp3.sbe.schema;
 
 public class SchemaUnmarshallingException extends Exception {
+    private static final long serialVersionUID = 1944148130312471541L;
+
     public SchemaUnmarshallingException() {
         super();
     }

mbp-only/build.gradle

@@ -7,7 +7,7 @@ plugins {
     id "me.champeau.gradle.jmh" version "0.3.1"
 }
 group = 'com.epam.cme'
-version = '2.0.2'
+version = '2.1.0'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8