Skip to content

Commit 8e8b64c

Browse files
committed
modify and add customer FileSystemAccessor
1 parent 217f749 commit 8e8b64c

32 files changed

+515
-101
lines changed

common/src/main/java/com/robin/comm/util/xls/ExcelProcessor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,7 @@ public static Object readValue(Cell cell, String type, DateTimeFormatter format,
232232
break;
233233
case Const.META_TYPE_BIGINT:
234234
if (!StringUtils.isEmpty(str)) {
235-
Double d = Double.valueOf(str);
236-
strCell = d.longValue();
235+
strCell = Double.valueOf(str).longValue();
237236
} else {
238237
strCell = 0L;
239238
}

common/src/main/java/com/robin/core/fileaccess/iterator/AbstractFileIterator.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,8 @@ public String getIdentifier() {
144144
public AbstractFileSystemAccessor getFileSystemAccessor(){
145145
return accessUtil;
146146
}
147+
148+
public void setAccessUtil(AbstractFileSystemAccessor accessUtil) {
149+
this.accessUtil = accessUtil;
150+
}
147151
}

common/src/main/java/com/robin/core/fileaccess/iterator/AbstractResIterator.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.robin.core.fileaccess.iterator;
22

33
import com.robin.core.base.exception.OperationNotSupportException;
4+
import com.robin.core.fileaccess.fs.AbstractFileSystemAccessor;
45
import com.robin.core.fileaccess.meta.DataCollectionMeta;
56
import com.robin.core.fileaccess.meta.DataSetColumnMeta;
67
import org.slf4j.Logger;
@@ -51,4 +52,9 @@ public void setReader(BufferedReader reader) {
5152
public void setInputStream(InputStream inputStream) {
5253
throw new OperationNotSupportException("");
5354
}
55+
56+
@Override
57+
public void setAccessUtil(AbstractFileSystemAccessor accessUtil) {
58+
throw new OperationNotSupportException("");
59+
}
5460
}

common/src/main/java/com/robin/core/fileaccess/iterator/ArffFileIterator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.google.common.collect.Lists;
44
import com.robin.core.base.util.Const;
5+
import com.robin.core.fileaccess.fs.AbstractFileSystemAccessor;
56
import com.robin.core.fileaccess.meta.DataCollectionMeta;
67
import com.robin.core.fileaccess.meta.DataSetColumnMeta;
78
import org.springframework.util.CollectionUtils;

common/src/main/java/com/robin/core/fileaccess/iterator/IResourceIterator.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
package com.robin.core.fileaccess.iterator;
2+
import com.robin.core.fileaccess.fs.AbstractFileSystemAccessor;
3+
24
import java.io.BufferedReader;
35
import java.io.Closeable;
46
import java.io.InputStream;
@@ -11,4 +13,5 @@ public interface IResourceIterator extends Iterator<Map<String,Object>>, Closeab
1113
String getIdentifier();
1214
void setInputStream(InputStream inputStream);
1315
void setReader(BufferedReader reader);
16+
void setAccessUtil(AbstractFileSystemAccessor accessUtil);
1417
}

common/src/main/java/com/robin/core/fileaccess/iterator/JsonFileIterator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.google.gson.stream.JsonReader;
1919
import com.robin.core.base.util.Const;
2020
import com.robin.core.convert.util.ConvertUtil;
21+
import com.robin.core.fileaccess.fs.AbstractFileSystemAccessor;
2122
import com.robin.core.fileaccess.meta.DataCollectionMeta;
2223
import com.robin.core.fileaccess.meta.DataSetColumnMeta;
2324
import org.springframework.util.CollectionUtils;

common/src/main/java/com/robin/core/fileaccess/iterator/PlainTextFileIterator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.robin.core.base.util.Const;
1919
import com.robin.core.base.util.StringUtils;
2020
import com.robin.core.convert.util.ConvertUtil;
21+
import com.robin.core.fileaccess.fs.AbstractFileSystemAccessor;
2122
import com.robin.core.fileaccess.meta.DataCollectionMeta;
2223
import com.robin.core.fileaccess.meta.DataSetColumnMeta;
2324
import org.springframework.util.ObjectUtils;

common/src/main/java/com/robin/core/fileaccess/iterator/TextFileIteratorFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ public static AbstractFileIterator getProcessReaderIterator(DataCollectionMeta c
4949
Class<? extends IResourceIterator> iterclass=fileIterMap.get(fileType);
5050
try {
5151
if (!ObjectUtils.isEmpty(iterclass)) {
52-
iterator = (AbstractFileIterator) iterclass.getConstructor(DataCollectionMeta.class, AbstractFileSystemAccessor.class).newInstance(colmeta,utils);
52+
iterator = (AbstractFileIterator) iterclass.getConstructor(DataCollectionMeta.class).newInstance(colmeta);
53+
iterator.setAccessUtil(utils);
5354
}
5455
iterator.beforeProcess();
5556
}catch (Exception ex){

common/src/main/java/com/robin/core/fileaccess/iterator/XmlFileIterator.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import com.robin.core.base.util.Const;
1919
import com.robin.core.convert.util.ConvertUtil;
20+
import com.robin.core.fileaccess.fs.AbstractFileSystemAccessor;
2021
import com.robin.core.fileaccess.meta.DataCollectionMeta;
2122
import com.robin.core.fileaccess.meta.DataSetColumnMeta;
2223

@@ -44,7 +45,10 @@ public XmlFileIterator(){
4445
public XmlFileIterator(DataCollectionMeta metaList) {
4546
super(metaList);
4647
identifier= Const.FILEFORMATSTR.XML.getValue();
47-
48+
}
49+
public XmlFileIterator(DataCollectionMeta metaList, AbstractFileSystemAccessor accessor) {
50+
super(metaList,accessor);
51+
identifier= Const.FILEFORMATSTR.XML.getValue();
4852
}
4953
@Override
5054
public void beforeProcess() {

common/src/main/java/com/robin/core/fileaccess/writer/AbstractQueueWriter.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.robin.core.base.exception.OperationNotSupportException;
44
import com.robin.core.base.util.Const;
55
import com.robin.core.base.util.ResourceConst;
6+
import com.robin.core.fileaccess.fs.AbstractFileSystemAccessor;
67
import com.robin.core.fileaccess.meta.DataCollectionMeta;
78
import com.twitter.bijection.Injection;
89
import com.twitter.bijection.avro.GenericAvroCodecs;
@@ -86,4 +87,8 @@ public void setOutputStream(OutputStream outputStream){
8687
throw new OperationNotSupportException("");
8788
}
8889

90+
@Override
91+
public void setAccessUtil(AbstractFileSystemAccessor accessUtil) {
92+
throw new OperationNotSupportException("");
93+
}
8994
}

0 commit comments

Comments
 (0)