diff --git a/bindings/java/doxygen/Doxyfile b/bindings/java/doxygen/Doxyfile
index d10f4c37dd729cb895bbb29c194fb0ae3638b241..aaf864421b52d7360770338d405df7e4ce2b2921 100644
--- a/bindings/java/doxygen/Doxyfile
+++ b/bindings/java/doxygen/Doxyfile
@@ -765,8 +765,9 @@ INPUT = main.dox \
artifact_catalog.dox \
insert_and_update_database.dox \
communications.dox \
- db_schema_8_6.dox \
- ../src
+ schema/schema_list.dox \
+ schema/db_schema_8_6.dox \
+ ../src
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
diff --git a/bindings/java/doxygen/main.dox b/bindings/java/doxygen/main.dox
index 234245d78768d7aacc30f6a4531a08785424c526..b49013b516d9adce62cb84f32d8414bf7769edce 100644
--- a/bindings/java/doxygen/main.dox
+++ b/bindings/java/doxygen/main.dox
@@ -46,6 +46,7 @@ The Sleuth Kit has its own database schema that is shared with Autopsy and other
- Database Schema Documentation:
- \subpage db_schema_8_6_page
+ - \subpage db_schema_page "Older schemas"
- Refer to \subpage query_database_page if you are going to use one of the SleuthkitCase methods that requires you to specify a query.
- Refer to \subpage insert_and_update_database_page if you are a Sleuth Kit developer and want to avoid database issues.
diff --git a/bindings/java/doxygen/db_schema_8_6.dox b/bindings/java/doxygen/schema/db_schema_8_6.dox
similarity index 99%
rename from bindings/java/doxygen/db_schema_8_6.dox
rename to bindings/java/doxygen/schema/db_schema_8_6.dox
index 0197b0b88a57da8e89d892ff0f1051bb54a83dd7..987e56e31fc6c1c442a7a40dbc4006bad5bdac28 100644
--- a/bindings/java/doxygen/db_schema_8_6.dox
+++ b/bindings/java/doxygen/schema/db_schema_8_6.dox
@@ -18,6 +18,12 @@ Some general notes on this schema:
- The Blackboard is used to store artifacts, which contain attributes (name/value pairs). Artifacts are used to store data types that do not have more formal tables. Module writers can make whatever artifact types they want. See \ref mod_bbpage for more details.
- The Sleuth Kit will make virtual files to span the unallocated space. They will have a naming format of 'Unalloc_[PARENT-OBJECT-ID]_[BYTE-START]_[BYTE-END]'.
+# Schema Information
+
+- <b>Autopsy versions: </b> Autopsy 4.18
+- <b>Changes from version 8.5:</b>
+ - New column for SHA-256 hash in tsk_files
+
# General Information Tables
## tsk_db_info
diff --git a/bindings/java/doxygen/schema/schema_list.dox b/bindings/java/doxygen/schema/schema_list.dox
new file mode 100644
index 0000000000000000000000000000000000000000..54a0b37f8393c3dd6d7555feb42e357c5ada25cc
--- /dev/null
+++ b/bindings/java/doxygen/schema/schema_list.dox
@@ -0,0 +1,14 @@
+/*! \page db_schema_page TSK & Autopsy Database Schemas
+
+This page contians links to the documention for selected versions of the TSK & Autopsy database schema.
+
+- Current Schema
+ - \subpage db_schema_8_6_page
+
+- Older Schemas
+ - <a href="https://wiki.sleuthkit.org/index.php?title=Database_v7.2_Schema">Schema version 7.2</a>
+ - <a href="https://wiki.sleuthkit.org/index.php?title=SQLite_Database_v6_Schema">Schema version 6</a>
+ - <a href="https://wiki.sleuthkit.org/index.php?title=SQLite_Database_v3_Schema">Schema version 3</a>
+ - <a href="https://wiki.sleuthkit.org/index.php?title=SQLite_Database_v2_Schema">Schema version 2</a>
+
+*/
\ No newline at end of file
diff --git a/bindings/java/src/org/sleuthkit/datamodel/AnalysisResultAdded.java b/bindings/java/src/org/sleuthkit/datamodel/AnalysisResultAdded.java
index 87c17ea4c747108d24627420d76e478d66f22a66..a58cb9580185c90105b43cd0cdfd2d43aa0354c6 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/AnalysisResultAdded.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/AnalysisResultAdded.java
@@ -1,4 +1,4 @@
-/**
+/*
* Sleuth Kit Data Model
*
* Copyright 2020 Basis Technology Corp.
diff --git a/bindings/java/src/org/sleuthkit/datamodel/Blackboard.java b/bindings/java/src/org/sleuthkit/datamodel/Blackboard.java
index b5194021a5b2d81ac01fddfb2fc127e8a5bc33d2..d546943744cc263dfce9ee3369f3a20c187a51df 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Blackboard.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/Blackboard.java
@@ -242,17 +242,17 @@ public List<AnalysisResult> getAnalysisResults(long objId, int artifactTypeId) t
return getAnalysisResultsWhere(whereClause);
}
- /**
- * Get all analysis results of a given type, for a given data source.
- *
- * @param dataSourceObjId Data source to look under.
- * @param artifactTypeId Type of results to get.
- *
- * @return list of analysis results.
- *
- * @throws TskCoreException exception thrown if a critical error occurs
- * within TSK core.
- */
+// /**
+// * Get all analysis results of a given type, for a given data source.
+// *
+// * @param dataSourceObjId Data source to look under.
+// * @param artifactTypeId Type of results to get.
+// *
+// * @return list of analysis results.
+// *
+// * @throws TskCoreException exception thrown if a critical error occurs
+// * within TSK core.
+// */
// To keep the public API footprint minimal and necessary, this API is commented out
// till Autopsy implements and intgerates the concept of AnalysisResults.
diff --git a/bindings/java/src/org/sleuthkit/datamodel/HostManager.java b/bindings/java/src/org/sleuthkit/datamodel/HostManager.java
index 83f676fca811760b4474dd903a3f3ba72b9fb9e2..fb0114fe9c366f656029b6c64beec18af60b09e6 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/HostManager.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/HostManager.java
@@ -291,9 +291,9 @@ Set<Host> getHosts() throws TskCoreException {
*
* @param dataSource The data source to look up the host for.
*
- * @return Optional with host. Optional.empty if no matching host is found.
+ * @return The host for this data source (will not be null).
*
- * @throws TskCoreException
+ * @throws TskCoreException if no host is found or an error occurs.
*/
Host getHost(DataSource dataSource) throws TskCoreException {
diff --git a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
index 10530f2d45b2566c1eb50d17f5f74b48ea68f5d5..61bd32ebed8dc6a1bf86d8f68ff77367b8985f72 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
@@ -7610,6 +7610,7 @@ public LocalFile addLocalFile(String fileName, String localPath,
* @param atime The accessed time of the file
* @param mtime The modified time of the file.
* @param md5 The MD5 hash of the file
+ * @param sha256 the SHA-256 hash of the file.
* @param known The known status of the file (can be null)
* @param mimeType The MIME type of the file
* @param isFile True, unless the file is a directory.