/*
 * Autopsy Forensic Browser
 *
 * Copyright 2011 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.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.util.logging.Logger;
import org.apache.solr.common.util.ContentStream;
import org.sleuthkit.autopsy.datamodel.AbstractFileStringStream.Encoding;
import org.sleuthkit.datamodel.AbstractContent;
import org.sleuthkit.datamodel.FsContent;

/**
 * Stream of bytes representing string with specified encoding
 * to feed into Solr as ContentStream
 */
public class ByteContentStream implements ContentStream {   
    //input
    private byte[] content; //extracted subcontent
    private long contentSize;
    private AbstractContent aContent; //origin
    private Encoding encoding;
    
    private InputStream stream;

    private static Logger logger = Logger.getLogger(FsContentStringContentStream.class.getName());

    public ByteContentStream(byte [] content, long contentSize, AbstractContent aContent, Encoding encoding) {
        this.content = content;
        this.aContent = aContent;
        this.encoding = encoding;
        stream = new ByteArrayInputStream(content, 0, (int)contentSize);
    }

    public byte[] getByteContent() {
        return content;
    }
    
    public AbstractContent getSourceContent() {
        return aContent;
    }


    @Override
    public String getContentType() {
        return "text/plain;charset=" + encoding.toString();
    }

    @Override
    public String getName() {
        return aContent.getName();
    }

    @Override
    public Reader getReader() throws IOException {
        return new InputStreamReader(stream);

    }

    @Override
    public Long getSize() {
        return contentSize;
    }

    @Override
    public String getSourceInfo() {
        return "File:" + aContent.getId();
    }

    @Override
    public InputStream getStream() throws IOException {
        return stream;
    }

    @Override
    protected void finalize() throws Throwable {
        super.finalize();
        
        stream.close();
    }
    
    

}

@@ -1554,23 +1554,12 @@
 ger(
-FsContentString
+Byte
 Cont

fix class name