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

Commit c583fd5

Browse files
committed
#77 Loading schemas now ignores .* files by default
1 parent 41e6bd7 commit c583fd5

File tree

5 files changed

+30
-10
lines changed

5 files changed

+30
-10
lines changed

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,4 +200,24 @@ public boolean isLogFileUris() {
200200
public void setLogFileUris(boolean logFileUris) {
201201
this.logFileUris = logFileUris;
202202
}
203+
204+
public DocumentFileReader getDocumentFileReader() {
205+
return documentFileReader;
206+
}
207+
208+
public BatchWriter getBatchWriter() {
209+
return batchWriter;
210+
}
211+
212+
public TokenReplacer getTokenReplacer() {
213+
return tokenReplacer;
214+
}
215+
216+
public List<FileFilter> getFileFilters() {
217+
return fileFilters;
218+
}
219+
220+
public List<DocumentFileProcessor> getDocumentFileProcessors() {
221+
return documentFileProcessors;
222+
}
203223
}

src/main/java/com/marklogic/client/ext/modulesloader/impl/AssetFileLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public AssetFileLoader(BatchWriter batchWriter, ModulesManager modulesManager) {
3232
}
3333

3434
protected void initializeAssetFileLoader(ModulesManager modulesManager) {
35-
addFileFilter(new AssetFileFilter());
35+
addFileFilter(new DefaultFileFilter());
3636
addDocumentFileProcessor(new ExtDocumentFileProcessor());
3737
if (modulesManager != null) {
3838
addDocumentFileProcessor(new ModulesManagerDocumentFileProcessor(modulesManager));

src/main/java/com/marklogic/client/ext/modulesloader/impl/AssetFileFilter.java renamed to src/main/java/com/marklogic/client/ext/modulesloader/impl/DefaultFileFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* Simple implementation that accepts every file and ignores anything starting with ".".
88
*/
9-
public class AssetFileFilter implements FileFilter {
9+
public class DefaultFileFilter implements FileFilter {
1010

1111
@Override
1212
public boolean accept(File f) {

src/main/java/com/marklogic/client/ext/schemasloader/impl/DefaultSchemasLoader.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import com.marklogic.client.DatabaseClient;
44
import com.marklogic.client.ext.batch.BatchWriter;
55
import com.marklogic.client.ext.file.GenericFileLoader;
6-
import com.marklogic.client.ext.file.DefaultDocumentFileReader;
76
import com.marklogic.client.ext.file.DocumentFile;
7+
import com.marklogic.client.ext.modulesloader.impl.DefaultFileFilter;
88
import com.marklogic.client.ext.schemasloader.SchemasLoader;
99

1010
import java.util.List;
@@ -20,7 +20,7 @@ public class DefaultSchemasLoader extends GenericFileLoader implements SchemasLo
2020
*/
2121
public DefaultSchemasLoader(DatabaseClient databaseClient) {
2222
super(databaseClient);
23-
initializeDocumentFileReader();
23+
initializeDefaultSchemasLoader();
2424
}
2525

2626
/**
@@ -30,16 +30,16 @@ public DefaultSchemasLoader(DatabaseClient databaseClient) {
3030
*/
3131
public DefaultSchemasLoader(BatchWriter batchWriter) {
3232
super(batchWriter);
33-
initializeDocumentFileReader();
33+
initializeDefaultSchemasLoader();
3434
}
3535

3636
/**
37-
* Configures and sets a DefaultDocumentFileReader with a TDE-specific file processor.
37+
* Adds the DocumentFileProcessors and FileFilters specific to loading schemas, which will then be used to construct
38+
* a DocumentFileReader by the parent class.
3839
*/
39-
protected void initializeDocumentFileReader() {
40-
DefaultDocumentFileReader reader = new DefaultDocumentFileReader();
41-
reader.addDocumentFileProcessor(new TdeDocumentFileProcessor());
42-
setDocumentFileReader(reader);
40+
protected void initializeDefaultSchemasLoader() {
41+
addDocumentFileProcessor(new TdeDocumentFileProcessor());
42+
addFileFilter(new DefaultFileFilter());
4343
}
4444

4545
/**

src/test/resources/schemas/.do-not-load

Whitespace-only changes.

0 commit comments

Comments
 (0)