Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit 3df8b94

Browse files
committed
#86 Can now specify a pattern for filename modules to load
more rename
1 parent 7762b9d commit 3df8b94

File tree

3 files changed

+197
-76
lines changed

3 files changed

+197
-76
lines changed

src/main/java/com/marklogic/client/ext/file/GenericFileLoader.java

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ public GenericFileLoader(BatchWriter batchWriter) {
6565
*/
6666
public List<DocumentFile> loadFiles(String... paths) {
6767
batchWriter.initialize();
68-
if (documentFileReader == null) {
69-
documentFileReader = buildDocumentFileReader();
70-
}
68+
initializeDocumentFileReader();
7169

7270
List<DocumentFile> documentFiles = documentFileReader.readDocumentFiles(paths);
7371
if (documentFiles != null && !documentFiles.isEmpty()) {
@@ -90,20 +88,20 @@ public List<DocumentFile> loadFiles(String... paths) {
9088
/**
9189
* If no DocumentFileReader is set, this will construct a DefaultDocumentFileReader, which is then configured based
9290
* on several properties of this class.
93-
*
94-
* @return
9591
*/
96-
protected DocumentFileReader buildDocumentFileReader() {
97-
DefaultDocumentFileReader reader = new DefaultDocumentFileReader();
92+
public void initializeDocumentFileReader() {
93+
if (this.documentFileReader == null) {
94+
DefaultDocumentFileReader reader = new DefaultDocumentFileReader();
9895

99-
if (fileFilters != null) {
100-
for (FileFilter filter : fileFilters) {
101-
reader.addFileFilter(filter);
96+
if (fileFilters != null) {
97+
for (FileFilter filter : fileFilters) {
98+
reader.addFileFilter(filter);
99+
}
102100
}
103-
}
104101

105-
prepareAbstractDocumentFileReader(reader);
106-
return reader;
102+
prepareAbstractDocumentFileReader(reader);
103+
this.documentFileReader = reader;
104+
}
107105
}
108106

109107
/**

0 commit comments

Comments
 (0)