Skip to content

Commit b57648f

Browse files
quhongweiquhongwei
authored
Merge pull request #54 from alipay/20200710-bugfix
20200710 bugfix
2 parents c195e55 + d8ef921 commit b57648f

32 files changed

+1032486
-106
lines changed

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<url>https://github.com/alipay/rdf-file</url>
1212

1313
<properties>
14-
<rdf.file.core.version>2.2.6</rdf.file.core.version>
15-
<rdf.file.oss.version>2.2.6</rdf.file.oss.version>
16-
<rdf.file.sftp.version>2.2.6</rdf.file.sftp.version>
14+
<rdf.file.core.version>2.2.7</rdf.file.core.version>
15+
<rdf.file.oss.version>2.2.7</rdf.file.oss.version>
16+
<rdf.file.sftp.version>2.2.7</rdf.file.sftp.version>
1717
</properties>
1818

1919
<modules>

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
public class BodyCodec implements FileCodec {
3030
public static BodyCodec instance = new BodyCodec();
3131

32-
/**
33-
* @see hongwei.quhw.file.codec.FileCodec#serialize(Object, ProtocolFileWriter.quhw.file.common.CommonFileWriter)
34-
*/
3532
@Override
3633
public void serialize(Object bean, FileConfig config, FileWriter writer,
3734
Map<ProcessorTypeEnum, List<RdfFileProcessorSpi>> processors) {
@@ -56,9 +53,6 @@ public void serialize(Object bean, FileConfig config, FileWriter writer,
5653
RowsCodec.serialize(bean, config, writer, processors, FileDataTypeEnum.BODY);
5754
}
5855

59-
/**
60-
* @see hongwei.quhw.file.codec.FileCodec#deserialize(ProtocolFileReader.quhw.file.common.CommonFileReader)
61-
*/
6256
@Override
6357
public <T> T deserialize(Class<?> clazz, FileConfig config, FileReader reader,
6458
Map<ProcessorTypeEnum, List<RdfFileProcessorSpi>> processors) {

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
public class HeaderCodec implements FileCodec {
2929
public static HeaderCodec instance = new HeaderCodec();
3030

31-
/**
32-
* @see hongwei.quhw.file.codec.FileCodec#serialize(Object, hongwei.quhw.file.common.ProtocolFileWriter)
33-
*/
3431
@Override
3532
public void serialize(Object bean, FileConfig config, FileWriter writer,
3633
Map<ProcessorTypeEnum, List<RdfFileProcessorSpi>> processors) {
@@ -55,9 +52,6 @@ public void serialize(Object bean, FileConfig config, FileWriter writer,
5552
RowsCodec.serialize(bean, config, writer, processors, FileDataTypeEnum.HEAD);
5653
}
5754

58-
/**
59-
* @see hongwei.quhw.file.codec.FileCodec#deserialize(hongwei.quhw.file.common.ProtocolFileReader)
60-
*/
6155
@Override
6256
public <T> T deserialize(Class<?> clazz, FileConfig config, FileReader reader,
6357
Map<ProcessorTypeEnum, List<RdfFileProcessorSpi>> processors) {

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
public class TailCodec implements FileCodec {
2828
public static TailCodec instance = new TailCodec();
2929

30-
/**
31-
* @see hongwei.quhw.file.codec.FileCodec#serialize(Object, hongwei.quhw.file.common.ProtocolFileWriter)
32-
*/
3330
@Override
3431
public void serialize(Object bean, FileConfig fileConfig, FileWriter writer,
3532
Map<ProcessorTypeEnum, List<RdfFileProcessorSpi>> processors) {
@@ -54,9 +51,6 @@ public void serialize(Object bean, FileConfig fileConfig, FileWriter writer,
5451
RowsCodec.serialize(bean, fileConfig, writer, processors, FileDataTypeEnum.TAIL);
5552
}
5653

57-
/**
58-
* @see hongwei.quhw.file.codec.FileCodec#deserialize(hongwei.quhw.file.common.ProtocolFileReader)
59-
*/
6054
@Override
6155
public <T> T deserialize(Class<?> clazz, FileConfig fileConfig, FileReader reader,
6256
Map<ProcessorTypeEnum, List<RdfFileProcessorSpi>> processors) {

‎rdf-file-core/src/main/java/com/alipay/rdf/file/common/ProtocolFileWriter.java‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,7 @@ public void init(FileConfig fileConfig) {
6363
}
6464
}
6565

66-
/**
67-
* @see hongwei.quhw.file.interfaces.FileWriter#writeHead(java.lang.Object)
68-
*/
69-
@Override
66+
@Override
7067
public void writeHead(Object headBean) {
7168
ensureOpen();
7269
HeaderCodec.instance.serialize(headBean, fileConfig, this, processors);
@@ -76,9 +73,6 @@ public void writeHead(Object headBean) {
7673
new BizData(RdfFileConstants.DATA, headBean));
7774
}
7875

79-
/**
80-
* @see hongwei.quhw.file.interfaces.FileWriter#writeRow(java.lang.Object)
81-
*/
8276
@Override
8377
public void writeRow(Object rowBean) {
8478
ProcessExecutor.execute(ProcessorTypeEnum.BEFORE_WRITE_ROW, processors, fileConfig);
@@ -92,9 +86,6 @@ public void writeRow(Object rowBean) {
9286
new BizData(RdfFileConstants.DATA, rowBean));
9387
}
9488

95-
/**
96-
* @see hongwei.quhw.file.interfaces.FileWriter#writeTail(java.lang.Object)
97-
*/
9889
@Override
9990
public void writeTail(Object tailBean) {
10091
ensureOpen();
@@ -105,9 +96,6 @@ public void writeTail(Object tailBean) {
10596
new BizData(RdfFileConstants.DATA, tailBean));
10697
}
10798

108-
/**
109-
* @see hongwei.quhw.file.interfaces.FileWriter#close()
110-
*/
11199
@Override
112100
public void close() {
113101
close(true);
@@ -159,6 +147,7 @@ public Summary getSummary() {
159147
public void append(InputStream in) {
160148
RdfFileUtil.assertNotNull(in, "ProtocolFileWriter.append(inputsream == null) ",
161149
RdfErrorEnum.ILLEGAL_ARGUMENT);
150+
ensureOpen();
162151
writer.append(in);
163152
}
164153

‎rdf-file-core/src/main/java/com/alipay/rdf/file/common/RawFileWriter.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ public Summary getSummary() {
8181

8282
@Override
8383
public void append(InputStream in) {
84+
ensureOpen();
8485
writer.append(in);
8586
}
8687

‎rdf-file-core/src/main/java/com/alipay/rdf/file/format/AColumnFormat.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,13 @@
1919
public class AColumnFormat implements RdfFileFormatSpi {
2020
private static final Pattern DIGITAL_REG = Pattern.compile("^[0-9]*$");
2121

22-
/**
23-
* @see RdfFileFormatSpi.quhw.file.format.RdfFormat#serialize(java.lang.String, hongwei.quhw.file.meta.FileColumnMeta)
24-
*/
2522
@Override
2623
public String serialize(String field, FileColumnMeta columnMeta, FileConfig fileConfig) {
2724
check(field, columnMeta);
2825
return RdfFileUtil.alignLeftBlank(field, columnMeta.getRange().getFirstAttr(),
2926
RdfFileUtil.getFileEncoding(fileConfig));
3027
}
3128

32-
/**
33-
* @see RdfFileFormatSpi.quhw.file.format.RdfFormat#deserialize(java.lang.String, hongwei.quhw.file.meta.FileColumnMeta)
34-
*/
3529
@Override
3630
public String deserialize(String field, FileColumnMeta columnMeta, FileConfig fileConfig) {
3731
field = field.trim();

‎rdf-file-core/src/main/java/com/alipay/rdf/file/format/CColumnFormat.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,12 @@
2323
*/
2424
public class CColumnFormat implements RdfFileFormatSpi {
2525

26-
/**
27-
* @see hongwei.quhw.file.format.RdfFileFormatSpi#serialize(java.lang.String, hongwei.quhw.file.meta.FileColumnMeta)
28-
*/
2926
@Override
3027
public String serialize(String field, FileColumnMeta columnMeta, FileConfig fileConfig) {
3128
return RdfFileUtil.alignLeftBlank(field, columnMeta.getRange().getFirstAttr(),
3229
RdfFileUtil.getFileEncoding(fileConfig));
3330
}
3431

35-
/**
36-
* @see hongwei.quhw.file.format.RdfFileFormatSpi#deserialize(java.lang.String, hongwei.quhw.file.meta.FileColumnMeta)
37-
*/
3832
@Override
3933
public String deserialize(String field, FileColumnMeta columnMeta, FileConfig fileConfig) {
4034
return field.trim();

‎rdf-file-core/src/main/java/com/alipay/rdf/file/format/CIfDefinedColumnFormat.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
*/
2727
public class CIfDefinedColumnFormat extends RawFormat implements RdfFileFormatSpi {
2828

29-
/**
30-
* @see hongwei.quhw.file.format.RdfFileFormatSpi#serialize(java.lang.String, hongwei.quhw.file.meta.FileColumnMeta)
31-
*/
3229
@Override
3330
public String serialize(String field, FileColumnMeta columnMeta, FileConfig fileConfig) {
3431
if (null != columnMeta.getRange()) {
@@ -39,9 +36,6 @@ public String serialize(String field, FileColumnMeta columnMeta, FileConfig file
3936
return super.serialize(field, columnMeta, fileConfig);
4037
}
4138

42-
/**
43-
* @see hongwei.quhw.file.format.RdfFileFormatSpi#deserialize(java.lang.String, hongwei.quhw.file.meta.FileColumnMeta)
44-
*/
4539
@Override
4640
public String deserialize(String field, FileColumnMeta columnMeta, FileConfig fileConfig) {
4741
return field.trim();

‎rdf-file-core/src/main/java/com/alipay/rdf/file/format/NColumnFormat.java‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
*/
2929
public class NColumnFormat implements RdfFileFormatSpi {
3030

31-
/**
32-
* @see hongwei.quhw.file.format.RdfFileFormatSpi#serialize(java.lang.String, hongwei.quhw.file.meta.FileColumnMeta)
33-
*/
3431
@Override
3532
public String serialize(String field, FileColumnMeta colMeta, FileConfig fileConfig) {
3633
//空补零
@@ -39,12 +36,14 @@ public String serialize(String field, FileColumnMeta colMeta, FileConfig fileCon
3936
} else {
4037
try {
4138
BigInteger value = new BigDecimal(field.toString().trim())
42-
.multiply(new BigDecimal(
43-
RdfFileUtil.alignLeft("1", colMeta.getRange().getSecondAttr() + 1, "0")))
44-
.toBigInteger();
39+
.multiply(new BigDecimal(RdfFileUtil.alignLeft("1", colMeta.getRange().getSecondAttr() + 1, "0"))).toBigInteger();
4540

46-
field = RdfFileUtil.alignRight(String.valueOf(value),
47-
colMeta.getRange().getFirstAttr(), '0');
41+
//负数
42+
if (value.compareTo(new BigInteger("0")) < 0) {
43+
field = RdfFileUtil.alignRight(String.valueOf(value.negate()), colMeta.getRange().getFirstAttr(), '0', true);
44+
} else {
45+
field = RdfFileUtil.alignRight(String.valueOf(value), colMeta.getRange().getFirstAttr(), '0');
46+
}
4847
} catch (NumberFormatException e) {
4948
throw new RdfFileException("rdf-file#NColumnFormat field = " + field
5049
+ ", columnName=" + colMeta.getName() + " 数组转换出错",
@@ -55,18 +54,13 @@ public String serialize(String field, FileColumnMeta colMeta, FileConfig fileCon
5554
return field;
5655
}
5756

58-
/**
59-
* @see hongwei.quhw.file.format.RdfFileFormatSpi#deserialize(java.lang.String, hongwei.quhw.file.meta.FileColumnMeta)
60-
*/
6157
@Override
6258
public String deserialize(String field, FileColumnMeta colMeta, FileConfig fileConfig) {
6359
//数值型补位为0 不可能StringUtils.isBlank(field)
6460
BigDecimal value = null;
6561
//有小数点
6662
if (colMeta.getRange().getSecondAttr() > 0) {
67-
value = new BigDecimal(field).divide(new BigDecimal(
68-
RdfFileUtil.alignLeft("1", colMeta.getRange().getSecondAttr() + 1, "0")));
69-
63+
value = new BigDecimal(field).divide(new BigDecimal(RdfFileUtil.alignLeft("1", colMeta.getRange().getSecondAttr() + 1, "0")));
7064
} else {
7165
value = new BigDecimal(field);
7266
}

0 commit comments

Comments
 (0)