From abf21f58eedf14beeee7566bcf6acef706878e08 Mon Sep 17 00:00:00 2001
From: millmanorama <millmanorama@gmail.com>
Date: Wed, 14 Dec 2016 13:04:36 +0100
Subject: [PATCH] remove obsolete and unused ContentStreams

---
 .../AbstractFileStringContentStream.java      | 92 -------------------
 .../keywordsearch/ArtifactExtractor.java      |  9 +-
 .../keywordsearch/FileTextExtractor.java      |  9 --
 .../autopsy/keywordsearch/Ingester.java       | 90 ------------------
 .../autopsy/keywordsearch/TextExtractor.java  |  3 -
 5 files changed, 1 insertion(+), 202 deletions(-)
 delete mode 100644 KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java
deleted file mode 100644
index e8a7efdde0..0000000000
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2011-2016 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.keywordsearch;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-
-import org.openide.util.NbBundle;
-import org.apache.solr.common.util.ContentStream;
-import org.sleuthkit.datamodel.AbstractContent;
-import org.sleuthkit.datamodel.AbstractFile;
-
-/**
- * Wrapper over InputStream that implements ContentStream to feed to Solr.
- */
-class AbstractFileStringContentStream implements ContentStream {
-    //input
-
-    private final AbstractFile content;
-    private final Charset charset;
-    //converted
-    private final InputStream stream;
-
-    public AbstractFileStringContentStream(AbstractFile content, Charset charset, InputStream inputStream) {
-        this.content = content;
-        this.charset = charset;
-        this.stream = inputStream;
-    }
-
-    public AbstractContent getSourceContent() {
-        return content;
-    }
-
-    @Override
-    public String getContentType() {
-        return "text/plain;charset=" + charset.name(); //NON-NLS
-    }
-
-    @Override
-    public String getName() {
-        return content.getName();
-    }
-
-    @Override
-    public Reader getReader() throws IOException {
-        return new InputStreamReader(stream);
-
-    }
-
-    @Override
-    public Long getSize() {
-        //return convertedLength;
-        throw new UnsupportedOperationException(
-                NbBundle.getMessage(this.getClass(), "AbstractFileStringContentStream.getSize.exception.msg"));
-    }
-
-    @Override
-    public String getSourceInfo() {
-        return NbBundle.getMessage(this.getClass(), "AbstractFileStringContentStream.getSrcInfo.text", content.getId());
-    }
-
-    @Override
-    public InputStream getStream() throws IOException {
-        return stream;
-    }
-
-    @Override
-    protected void finalize() throws Throwable {
-        super.finalize();
-
-        stream.close();
-    }
-}
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ArtifactExtractor.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ArtifactExtractor.java
index 6d5c019111..60f21f2a44 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ArtifactExtractor.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ArtifactExtractor.java
@@ -108,6 +108,7 @@ public class ArtifactExtractor extends TextExtractor<Void, BlackboardArtifact> {
                 switch (attribute.getValueType()) {
                     case DATETIME:
                         artifactContents.append(ContentUtils.getStringTime(attribute.getValueLong(), dataSource));
+                        break;
                     default:
                         artifactContents.append(attribute.getDisplayString());
                 }
@@ -136,15 +137,7 @@ public class ArtifactExtractor extends TextExtractor<Void, BlackboardArtifact> {
         return source.getArtifactID();
     }
 
-    @Override
-    ContentStream getContentStream(byte[] encodedBytes, int length, BlackboardArtifact source) {
-        return new ByteArtifactStream(encodedBytes, length, source);
-    }
 
-    @Override
-    ContentStream getNullStream(BlackboardArtifact source) {
-        return new Ingester.NullArtifactStream(source);
-    }
 
     @Override
     String getName(BlackboardArtifact source) {
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/FileTextExtractor.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/FileTextExtractor.java
index e076b8ccd2..37d2e49b96 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/FileTextExtractor.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/FileTextExtractor.java
@@ -115,15 +115,6 @@ abstract class FileTextExtractor<AppendixProvider> extends TextExtractor<Appendi
         return source.getId();
     }
 
-    @Override
-    ContentStream getContentStream(byte[] encodedBytes, int length, AbstractFile source) {
-        return new ByteContentStream(encodedBytes, length, source);
-    }
-
-    @Override
-    ContentStream getNullStream(AbstractFile source) {
-        return new Ingester.NullContentStream(source);
-    }
 
     @Override
     String getName(AbstractFile source) {
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
index 74c74988ca..b83f830b04 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
@@ -18,7 +18,6 @@
  */
 package org.sleuthkit.autopsy.keywordsearch;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
@@ -28,13 +27,11 @@ import java.util.Map;
 import java.util.logging.Level;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.common.SolrInputDocument;
-import org.apache.solr.common.util.ContentStream;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.TextUtil;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
 import org.sleuthkit.autopsy.ingest.IngestJobContext;
-import org.sleuthkit.datamodel.AbstractContent;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.Content;
@@ -266,7 +263,6 @@ class Ingester {
                 String chunkId = Server.getChunkIdString(sourceID, numChunks + 1);
                 fields.put(Server.Schema.ID.toString(), chunkId);
                 try {
-                    ContentStream bcs = extractor.getContentStream(encodedBytes, encodedBytes.length, source);
                     try {
                         indexChunk(encodedBytes, sourceName, fields, encodedBytes.length);
                     } catch (Exception ex) {
@@ -413,92 +409,6 @@ class Ingester {
         }
     }
 
-    /**
-     * ContentStream associated with FsContent, but forced with no content
-     */
-    static class NullContentStream implements ContentStream {
-
-        AbstractContent aContent;
-
-        NullContentStream(AbstractContent aContent) {
-            this.aContent = aContent;
-        }
-
-        @Override
-        public String getName() {
-            return aContent.getName();
-        }
-
-        @Override
-        public String getSourceInfo() {
-            return NbBundle.getMessage(this.getClass(), "Ingester.NullContentStream.getSrcInfo.text", aContent.getId());
-        }
-
-        @Override
-        public String getContentType() {
-            return null;
-        }
-
-        @Override
-        public Long getSize() {
-            return 0L;
-        }
-
-        @Override
-        public InputStream getStream() throws IOException {
-            return new ByteArrayInputStream(new byte[0]);
-        }
-
-        @Override
-        public Reader getReader() throws IOException {
-            throw new UnsupportedOperationException(
-                    NbBundle.getMessage(this.getClass(), "Ingester.NullContentStream.getReader"));
-        }
-    }
-
-    /**
-     * ContentStream associated with Artifact, but forced with no content
-     */
-    static class NullArtifactStream implements ContentStream {
-
-        BlackboardArtifact aContent;
-
-        NullArtifactStream(BlackboardArtifact aContent) {
-            this.aContent = aContent;
-        }
-
-        @Override
-        public String getName() {
-            return aContent.getDisplayName() + "_" + aContent.getArtifactID();
-        }
-
-        @NbBundle.Messages("Ingester.NullArtifactStream.getSrcInfo.text=File:{0})\n")
-        @Override
-        public String getSourceInfo() {
-            return Bundle.Ingester_NullArtifactStream_getSrcInfo_text(aContent.getArtifactID());
-        }
-
-        @Override
-        public String getContentType() {
-            return null;
-        }
-
-        @Override
-        public Long getSize() {
-            return 0L;
-        }
-
-        @Override
-        public InputStream getStream() throws IOException {
-            return new ByteArrayInputStream(new byte[0]);
-        }
-
-        @Override
-        public Reader getReader() throws IOException {
-            throw new UnsupportedOperationException(
-                    NbBundle.getMessage(this.getClass(), "Ingester.NullContentStream.getReader"));
-        }
-    }
 
     /**
      * Indicates that there was an error with the specific ingest operation, but
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TextExtractor.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TextExtractor.java
index bbb52582e4..1e5eef2d18 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TextExtractor.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TextExtractor.java
@@ -20,7 +20,6 @@ package org.sleuthkit.autopsy.keywordsearch;
 
 import java.io.InputStream;
 import java.io.Reader;
-import org.apache.solr.common.util.ContentStream;
 import org.sleuthkit.datamodel.SleuthkitVisitableItem;
 
 abstract class TextExtractor<AppendixProvider, TextSource extends SleuthkitVisitableItem> {
@@ -41,7 +40,5 @@ abstract class TextExtractor<AppendixProvider, TextSource extends SleuthkitVisit
 
     abstract long getID(TextSource source);
 
-    abstract ContentStream getContentStream(byte[] encodedBytes, int length, TextSource source);
     abstract String getName(TextSource source);
-    abstract ContentStream getNullStream(TextSource source);
 }