From b904c37dd2b41783e8406b73584dd2bc99c56051 Mon Sep 17 00:00:00 2001 From: millmanorama Date: Wed, 14 Dec 2016 13:31:58 +0100 Subject: [PATCH] remove more unneeded ContentStreams and cleanup logging --- .../keywordsearch/ArtifactExtractor.java | 80 +------------------ .../keywordsearch/FileTextExtractor.java | 73 ----------------- .../keywordsearch/HtmlTextExtractor.java | 8 -- .../keywordsearch/StringsTextExtractor.java | 6 -- .../autopsy/keywordsearch/TextExtractor.java | 7 +- .../keywordsearch/TikaTextExtractor.java | 5 +- 6 files changed, 11 insertions(+), 168 deletions(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ArtifactExtractor.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ArtifactExtractor.java index 60f21f2a44..712d551cc5 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ArtifactExtractor.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ArtifactExtractor.java @@ -18,19 +18,15 @@ */ package org.sleuthkit.autopsy.keywordsearch; -import java.io.ByteArrayInputStream; -import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; +import java.util.logging.Level; import org.apache.commons.io.IOUtils; -import org.apache.solr.common.util.ContentStream; import org.openide.util.Exceptions; -import org.openide.util.NbBundle; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.datamodel.ContentUtils; -import static org.sleuthkit.autopsy.keywordsearch.Bundle.ByteArtifactStream_getSrcInfo_text; import org.sleuthkit.datamodel.AbstractFile; import org.sleuthkit.datamodel.BlackboardArtifact; import org.sleuthkit.datamodel.BlackboardAttribute; @@ -39,6 +35,7 @@ import org.sleuthkit.datamodel.SleuthkitCase; import org.sleuthkit.datamodel.TskCoreException; public class ArtifactExtractor extends TextExtractor { + static final private Logger logger = Logger.getLogger(ArtifactExtractor.class.getName()); static Content getDataSource(BlackboardArtifact artifact) throws TskCoreException { Content dataSource; @@ -76,9 +73,8 @@ public class ArtifactExtractor extends TextExtractor { @Override void logWarning(String msg, Exception ex) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + logger.log(Level.WARNING, msg, ex); //NON-NLS } } - @Override Void newAppendixProvider() { return null; @@ -122,7 +118,6 @@ public class ArtifactExtractor extends TextExtractor { return null; } - return IOUtils.toInputStream(artifactContents); } @@ -137,75 +132,8 @@ public class ArtifactExtractor extends TextExtractor { return source.getArtifactID(); } - - @Override String getName(BlackboardArtifact source) { - return source.getDisplayName(); - } - - static private class ByteArtifactStream implements ContentStream { - - //input - private final byte[] content; //extracted subcontent - private long contentSize; - private final BlackboardArtifact aContent; //origin - - private final InputStream stream; - - private static final Logger logger = Logger.getLogger(ByteArtifactStream.class.getName()); - - public ByteArtifactStream(byte[] content, long contentSize, BlackboardArtifact aContent) { - this.content = content; - this.aContent = aContent; - stream = new ByteArrayInputStream(content, 0, (int) contentSize); - } - - public byte[] getByteContent() { - return content; - } - - public BlackboardArtifact getSourceContent() { - return aContent; - } - - @Override - public String getContentType() { - return "text/plain;charset=" + Server.DEFAULT_INDEXED_TEXT_CHARSET.name(); //NON-NLS - } - - @Override - public String getName() { - return aContent.getDisplayName(); - } - - @Override - public Reader getReader() throws IOException { - return new InputStreamReader(stream); - - } - - @Override - public Long getSize() { - return contentSize; - } - - @Override - @NbBundle.Messages("ByteArtifactStream.getSrcInfo.text=Artifact:{0}") - public String getSourceInfo() { - return ByteArtifactStream_getSrcInfo_text(aContent.getArtifactID()); - } - - @Override - public InputStream getStream() throws IOException { - return stream; - } - - @Override - protected void finalize() throws Throwable { - super.finalize(); - - stream.close(); - } + return source.getDisplayName() + "_" + source.getArtifactID(); } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/FileTextExtractor.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/FileTextExtractor.java index 37d2e49b96..bec832f8df 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/FileTextExtractor.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/FileTextExtractor.java @@ -18,17 +18,8 @@ */ package org.sleuthkit.autopsy.keywordsearch; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; import java.util.Arrays; import java.util.List; -import org.apache.solr.common.util.ContentStream; -import org.openide.util.NbBundle; -import org.sleuthkit.autopsy.coreutils.Logger; -import org.sleuthkit.datamodel.AbstractContent; import org.sleuthkit.datamodel.AbstractFile; /** @@ -120,68 +111,4 @@ abstract class FileTextExtractor extends TextExtractor { - private static final Logger logger = Logger.getLogger(HtmlTextExtractor.class.getName()); - static final int MAX_EXTR_TEXT_CHARS = 512 * 1024; private static final int MAX_SIZE = 50000000; @@ -58,10 +54,6 @@ class HtmlTextExtractor extends FileTextExtractor { HtmlTextExtractor() { } - @Override - void logWarning(final String msg, Exception ex) { - logger.log(Level.WARNING, msg, ex); //NON-NLS - } @Override boolean isContentTypeSpecific() { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/StringsTextExtractor.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/StringsTextExtractor.java index ddc7d06362..165bcd7591 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/StringsTextExtractor.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/StringsTextExtractor.java @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.logging.Level; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.StringExtract; import org.sleuthkit.autopsy.coreutils.StringExtract.StringExtractUnicodeTable.SCRIPT; @@ -40,7 +39,6 @@ import org.sleuthkit.datamodel.TskException; */ class StringsTextExtractor extends FileTextExtractor { - private static final Logger logger = Logger.getLogger(StringsTextExtractor.class.getName()); private static final long MAX_STRING_CHUNK_SIZE = 1 * 1024 * 1024L; private final List