refactor: easy to read

Author: sean-k1

src/main/java/com/github/shyiko/mysql/binlog/event/deserialization/TableMapEventDataDeserializer.java

@@ -57,7 +57,7 @@ public TableMapEventData deserialize(ByteArrayInputStream inputStream) throws IO
         return eventData;
     }
 
-    private List<Integer> numericColumnIndex(byte[] types){
+    private List<Integer> numericColumnIndex(byte[] types) {
         ArrayList<Integer> numericColumnIndexList = new ArrayList<>();
         for (int i = 0; i < types.length; i++) {
             switch (ColumnType.byCode(types[i] & 0xff)) {
@@ -78,6 +78,7 @@ private List<Integer> numericColumnIndex(byte[] types){
         }
         return numericColumnIndexList;
     }
+
     private int numericColumnCount(byte[] types) {
         int count = 0;
         for (int i = 0; i < types.length; i++) {
@@ -103,7 +104,7 @@ private int numericColumnCount(byte[] types) {
     private int[] readMetadata(ByteArrayInputStream inputStream, byte[] columnTypes) throws IOException {
         int[] metadata = new int[columnTypes.length];
         for (int i = 0; i < columnTypes.length; i++) {
-            switch(ColumnType.byCode(columnTypes[i] & 0xFF)) {
+            switch (ColumnType.byCode(columnTypes[i] & 0xFF)) {
                 case FLOAT:
                 case DOUBLE:
                 case BLOB:

src/main/java/com/github/shyiko/mysql/binlog/event/deserialization/TableMapEventMetadataDeserializer.java

@@ -69,7 +69,8 @@ public TableMapEventMetadata deserialize(ByteArrayInputStream inputStream, int n
             switch (fieldType) {
                 case SIGNEDNESS:
                     result.setSignedness(
-                        convertColumnOrder(readBooleanList(inputStream, nNumericColumns), numericColumIdxList));
+                        convertColumnOrder(readBooleanList(inputStream, nNumericColumns), nColumns,
+                                           numericColumIdxList));
                     break;
                 case DEFAULT_CHARSET:
                     result.setDefaultCharset(readDefaultCharset(inputStream));
@@ -112,22 +113,21 @@ public TableMapEventMetadata deserialize(ByteArrayInputStream inputStream, int n
         return result;
     }
 
-    private static BitSet convertColumnOrder(BitSet numericOrderBitSet, List<Integer> numericColumIdxList) {
+    private static BitSet convertColumnOrder(BitSet numericOrderBitSet, int nColumns,
+                                             List<Integer> numericColumIdxList) {
         // Case SIGNEDNESS The order of indices in the Inputstream corresponds to the order of numeric columns
-        // So we need to map the index to all columns index (include non numeric type columns)
-        Map<Integer, Integer> mappingColumnOrderMap = new HashMap<>();
-
-        for (int numericColumnOrder = 0; numericColumnOrder < numericColumIdxList.size();
-             numericColumnOrder++) {
-            int allColumnIndex = numericColumIdxList.get(numericColumnOrder);
-            mappingColumnOrderMap.put(numericColumnOrder, allColumnIndex);
-        }
+        // So we need to change the index to all columns index (include non numeric type columns)
 
         BitSet columnOrderBitSet = new BitSet();
-        for (int i = 0; i < numericOrderBitSet.length(); i++) {
-            int numericColumnOrder = numericOrderBitSet.nextSetBit(i);
-            int allColumnIndex = mappingColumnOrderMap.get(numericColumnOrder);
-            columnOrderBitSet.set(allColumnIndex);
+        int position = 0;
+        for (int columnIndex = 0; columnIndex < nColumns; columnIndex++) {
+            if (numericColumIdxList.contains(columnIndex)) {
+                if (numericOrderBitSet.get(position++)) {
+                    columnOrderBitSet.set(columnIndex);
+                }
+
+            }
+
         }
         return columnOrderBitSet;
     }
@@ -206,15 +206,16 @@ private enum MetadataFieldType {
         ENUM_AND_SET_DEFAULT_CHARSET(10),   // Charsets of ENUM and SET columns
         ENUM_AND_SET_COLUMN_CHARSET(11),    // Charsets of ENUM and SET columns
         VISIBILITY(12),                     // Column visibility (8.0.23 and newer)
-        UNKNOWN_METADATA_FIELD_TYPE(128);   // Returned with binlog-row-metadata=FULL from MySQL 8.0 in some cases
+        UNKNOWN_METADATA_FIELD_TYPE(
+            128);   // Returned with binlog-row-metadata=FULL from MySQL 8.0 in some cases
 
         private final int code;
 
         private MetadataFieldType(int code) {
             this.code = code;
         }
 
-        public int getCode() { return code; }
+        public int getCode() {return code;}
 
         private static final Map<Integer, MetadataFieldType> INDEX_BY_CODE;