Merge pull request #60 from ad19900913/master

完善数据序列化与反序列化时的错误提示

Author: quhongwei

rdf-file-core/src/main/java/com/alipay/rdf/file/codec/RowColumnHorizontalCodec.java

@@ -55,9 +55,9 @@ public static String serialize(BeanMapWrapper bmw, FileConfig fileConfig, RowDef
         }
 
         for (int i = 0; i < columnMetas.size(); i++) {
+            FileColumnMeta columnMeta = columnMetas.get(i);
+            FuncContext ctx = new FuncContext();
             try {
-                FileColumnMeta columnMeta = columnMetas.get(i);
-                FuncContext ctx = new FuncContext();
                 ctx.codecType = CodecType.SERIALIZE;
                 ctx.field = bmw.getProperty(columnMeta.getName());
                 ctx.columnMeta = columnMeta;
@@ -71,13 +71,13 @@ public static String serialize(BeanMapWrapper bmw, FileConfig fileConfig, RowDef
             } catch (RdfFileException e) {
                 throw new RdfFileException(
                     "rdf-file#RowColumnHorizontalCodec.serialize serialize row=" + bmw.getBean()
-                                           + ", fileConfig=" + fileConfig + ", 将数据序列到文件出错."
+                                           + ", fileConfig=" + fileConfig + ", 将数据序列到文件出错. 错误列信息: columnMeta=" + columnMeta + ", field=" + ctx.field + ", errorMsg="
                                            + e.getMessage(),
                     e, e.getErrorEnum());
             } catch (Throwable e) {
                 throw new RdfFileException(
                     "rdf-file#RowColumnHorizontalCodec.serialize row=" + bmw.getBean()
-                                           + ", fileConfig=" + fileConfig + ", 将数据序列到文件出错.",
+                                           + ", fileConfig=" + fileConfig + ", 将数据序列到文件出错. 错误列信息: columnMeta=" + columnMeta + ", field=" + ctx.field,
                     e, RdfErrorEnum.SERIALIZE_ERROR);
             }
         }
@@ -124,9 +124,9 @@ public static <T> T deserialize(BeanMapWrapper bmw, FileConfig fileConfig, Strin
         int endIndex = fileMeta.isEndWithSplit(rowType) ? column.length - 1 : column.length;
 
         for (int i = statIndex; i < endIndex; i++) {
+            FileColumnMeta columnMeta = columnMetas.get(i - statIndex);
+            FuncContext ctx = new FuncContext();
             try {
-                FileColumnMeta columnMeta = columnMetas.get(i - statIndex);
-                FuncContext ctx = new FuncContext();
                 ctx.codecType = CodecType.DESERIALIZE;
                 ctx.field = column[i];
                 ctx.columnMeta = columnMeta;
@@ -135,11 +135,12 @@ public static <T> T deserialize(BeanMapWrapper bmw, FileConfig fileConfig, Strin
             } catch (RdfFileException e) {
                 throw new RdfFileException(
                     "rdf-file#RowColumnHorizontalCodec.deserialize line=" + line + ", fileConfig="
-                                           + fileConfig + ", 将数据反序列到对象出错. " + e.getMessage(),
+                                           + fileConfig + ", 将数据反序列到对象出错. 错误列信息:field=" + ctx.field + ", columnMeta=" + columnMeta + ", errorMsg="
+                            + e.getMessage(),
                     e, e.getErrorEnum());
             } catch (Throwable e) {
                 throw new RdfFileException("rdf-file#RowColumnHorizontalCodec.deserialize line="
-                                           + line + ", fileConfig=" + fileConfig + ", 将数据反序列到对象出错.",
+                                           + line + ", fileConfig=" + fileConfig + ", 将数据反序列到对象出错. 错误列信息:field=" + ctx.field + ", columnMeta=" + columnMeta,
                     e, RdfErrorEnum.DESERIALIZE_ERROR);
             }
         }