diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoIngestModuleFactory.java b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoIngestModuleFactory.java index 39c80abefc..22ce22f65f 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoIngestModuleFactory.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoIngestModuleFactory.java @@ -121,14 +121,14 @@ public class CentralRepoIngestModuleFactory extends IngestModuleFactoryAdapter { throw new IllegalArgumentException("Expected settings argument to be an instance of IngestSettings"); } - @Override - public boolean isDataArtifactIngestModuleFactory() { - return true; - } - - @Override - public DataArtifactIngestModule createDataArtifactIngestModule(IngestModuleIngestJobSettings settings) { - return new CentralRepoDataArtifactIngestModule(); - } +// @Override +// public boolean isDataArtifactIngestModuleFactory() { +// return true; +// } +// +// @Override +// public DataArtifactIngestModule createDataArtifactIngestModule(IngestModuleIngestJobSettings settings) { +// return new CentralRepoDataArtifactIngestModule(); +// } } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/DataArtifactIngestPipeline.java b/Core/src/org/sleuthkit/autopsy/ingest/DataArtifactIngestPipeline.java index 824d7d7fe9..a25485a352 100755 --- a/Core/src/org/sleuthkit/autopsy/ingest/DataArtifactIngestPipeline.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/DataArtifactIngestPipeline.java @@ -44,10 +44,10 @@ final class DataArtifactIngestPipeline extends IngestTaskPipeline> acceptModuleTemplate(IngestModuleTemplate template) { Optional> module = Optional.empty(); - if (template.isDataArtifactIngestModuleTemplate()) { - DataArtifactIngestModule ingestModule = template.createDataArtifactIngestModule(); - module = Optional.of(new DataArtifactIngestPipelineModule(ingestModule, template.getModuleName())); - } +// if (template.isDataArtifactIngestModuleTemplate()) { +// DataArtifactIngestModule ingestModule = template.createDataArtifactIngestModule(); +// module = Optional.of(new DataArtifactIngestPipelineModule(ingestModule, template.getModuleName())); +// } return module; } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobPipeline.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobPipeline.java index c68dde5911..bdaaa9f3a9 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobPipeline.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobPipeline.java @@ -368,9 +368,9 @@ final class IngestJobPipeline { if (template.isFileIngestModuleTemplate()) { addModuleTemplateToSortingMap(javaFileModuleTemplates, jythonFileModuleTemplates, template); } - if (template.isDataArtifactIngestModuleTemplate()) { - addModuleTemplateToSortingMap(javaArtifactModuleTemplates, jythonArtifactModuleTemplates, template); - } +// if (template.isDataArtifactIngestModuleTemplate()) { +// addModuleTemplateToSortingMap(javaArtifactModuleTemplates, jythonArtifactModuleTemplates, template); +// } } /** @@ -616,13 +616,13 @@ final class IngestJobPipeline { type = IngestModuleType.MULTIPLE; } } - if (moduleTemplate.isDataArtifactIngestModuleTemplate()) { - if (type == null) { - type = IngestModuleType.DATA_ARTIFACT; - } else { - type = IngestModuleType.MULTIPLE; - } - } +// if (moduleTemplate.isDataArtifactIngestModuleTemplate()) { +// if (type == null) { +// type = IngestModuleType.DATA_ARTIFACT; +// } else { +// type = IngestModuleType.MULTIPLE; +// } +// } return type; } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettings.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettings.java index 7de83ded4c..8f2db29849 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettings.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettings.java @@ -318,7 +318,7 @@ public final class IngestJobSettings { // Add modules that are going to be used for this ingest depending on type. for (IngestModuleFactory moduleFactory : allModuleFactories) { - if (moduleFactory.isDataArtifactIngestModuleFactory() || ingestType.equals(IngestType.ALL_MODULES)) { + if (/*moduleFactory.isDataArtifactIngestModuleFactory() ||*/ ingestType.equals(IngestType.ALL_MODULES)) { moduleFactories.add(moduleFactory); } else if (this.ingestType.equals(IngestType.DATA_SOURCE_ONLY) && moduleFactory.isDataSourceIngestModuleFactory()) { moduleFactories.add(moduleFactory); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactory.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactory.java index e473086d18..15fb96eded 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactory.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactory.java @@ -228,7 +228,7 @@ public interface IngestModuleFactory { * * @return A file ingest module instance. */ - default FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings ingestOptions) { + default FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings settings) { throw new UnsupportedOperationException(); } @@ -238,9 +238,9 @@ public interface IngestModuleFactory { * * @return True or false. */ - default boolean isDataArtifactIngestModuleFactory() { - return false; - } +// default boolean isDataArtifactIngestModuleFactory() { +// return false; +// } /** * Creates a data artifact ingest module instance. @@ -267,8 +267,8 @@ public interface IngestModuleFactory { * * @return A file ingest module instance. */ - default DataArtifactIngestModule createDataArtifactIngestModule(IngestModuleIngestJobSettings settings) { - throw new UnsupportedOperationException(); - } +// default DataArtifactIngestModule createDataArtifactIngestModule(IngestModuleIngestJobSettings settings) { +// throw new UnsupportedOperationException(); +// } } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleTemplate.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleTemplate.java index 26285f6439..0bb947c1cd 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleTemplate.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleTemplate.java @@ -85,13 +85,13 @@ public final class IngestModuleTemplate { return moduleFactory.createFileIngestModule(settings); } - public boolean isDataArtifactIngestModuleTemplate() { - return moduleFactory.isDataArtifactIngestModuleFactory(); - } +// public boolean isDataArtifactIngestModuleTemplate() { +// return moduleFactory.isDataArtifactIngestModuleFactory(); +// } - public DataArtifactIngestModule createDataArtifactIngestModule() { - return moduleFactory.createDataArtifactIngestModule(settings); - } +// public DataArtifactIngestModule createDataArtifactIngestModule() { +// return moduleFactory.createDataArtifactIngestModule(settings); +// } public void setEnabled(boolean enabled) { this.enabled = enabled;