From 89c43d88a12d3b4ed53b35a6eeed2e7b9bb3ad34 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Tue, 13 May 2014 13:41:04 -0400 Subject: [PATCH] Change serialization version number implementation --- .../autopsy/examples/SampleModuleIngestJobSettings.java | 5 +++-- .../autopsy/ingest/IngestModuleIngestJobSettings.java | 8 +++++--- .../autopsy/ingest/NoIngestModuleIngestJobSettings.java | 5 +++-- .../FileExtMismatchDetectorModuleSettings.java | 5 +++-- .../modules/filetypeid/FileTypeIdModuleSettings.java | 5 +++-- .../autopsy/hashdatabase/HashLookupModuleSettings.java | 5 +++-- .../autopsy/keywordsearch/KeywordSearchJobSettings.java | 5 +++-- 7 files changed, 23 insertions(+), 15 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/examples/SampleModuleIngestJobSettings.java b/Core/src/org/sleuthkit/autopsy/examples/SampleModuleIngestJobSettings.java index 83339dbc6f..7f415d3948 100755 --- a/Core/src/org/sleuthkit/autopsy/examples/SampleModuleIngestJobSettings.java +++ b/Core/src/org/sleuthkit/autopsy/examples/SampleModuleIngestJobSettings.java @@ -37,6 +37,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; */ public class SampleModuleIngestJobSettings implements IngestModuleIngestJobSettings { + private static final long serialVersionUID = 1L; private boolean skipKnownFiles = true; SampleModuleIngestJobSettings() { @@ -47,8 +48,8 @@ public class SampleModuleIngestJobSettings implements IngestModuleIngestJobSetti } @Override - public String getVersionNumber() { - return "1.0"; //NON-NLS + public long getVersionNumber() { + return serialVersionUID; } void setSkipKnownFiles(boolean enabled) { diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleIngestJobSettings.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleIngestJobSettings.java index b68186b17f..67d051d86a 100755 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleIngestJobSettings.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleIngestJobSettings.java @@ -28,9 +28,11 @@ import java.io.Serializable; public interface IngestModuleIngestJobSettings extends Serializable { /** - * Returns the version number of the settings object. + * Returns the version number of the settings object. The version number + * should be a private final static long per the documentation of the + * Serializable interface. * - * @return A version number string. + * @return A serialization version number. */ - String getVersionNumber(); + long getVersionNumber(); } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/NoIngestModuleIngestJobSettings.java b/Core/src/org/sleuthkit/autopsy/ingest/NoIngestModuleIngestJobSettings.java index 4c92cfc3ee..df850092f5 100755 --- a/Core/src/org/sleuthkit/autopsy/ingest/NoIngestModuleIngestJobSettings.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/NoIngestModuleIngestJobSettings.java @@ -24,11 +24,12 @@ package org.sleuthkit.autopsy.ingest; */ public final class NoIngestModuleIngestJobSettings implements IngestModuleIngestJobSettings { + private static final long serialVersionUID = 1L; private final String setting = "None"; //NON-NLS @Override - public String getVersionNumber() { - return "1.0"; //NON-NLS + public long getVersionNumber() { + return serialVersionUID; } /** diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchDetectorModuleSettings.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchDetectorModuleSettings.java index 7a88433067..a894fe60a6 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchDetectorModuleSettings.java +++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchDetectorModuleSettings.java @@ -25,6 +25,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; */ final class FileExtMismatchDetectorModuleSettings implements IngestModuleIngestJobSettings { + private static final long serialVersionUID = 1L; private boolean skipFilesWithNoExtension = true; private boolean skipFilesWithTextPlainMimeType = false; @@ -37,8 +38,8 @@ final class FileExtMismatchDetectorModuleSettings implements IngestModuleIngestJ } @Override - public String getVersionNumber() { - return "1.0"; //NON-NLS + public long getVersionNumber() { + return serialVersionUID; } void setSkipFilesWithNoExtension(boolean enabled) { diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleSettings.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleSettings.java index f62cab64dc..c472596be4 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleSettings.java +++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleSettings.java @@ -25,6 +25,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; */ public class FileTypeIdModuleSettings implements IngestModuleIngestJobSettings { + private static final long serialVersionUID = 1L; private volatile boolean skipKnownFiles = true; FileTypeIdModuleSettings() { @@ -35,8 +36,8 @@ public class FileTypeIdModuleSettings implements IngestModuleIngestJobSettings { } @Override - public String getVersionNumber() { - return "1.0"; //NON-NLS + public long getVersionNumber() { + return serialVersionUID; } void setSkipKnownFiles(boolean enabled) { diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleSettings.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleSettings.java index 76edf6c184..bd2d0bc1d8 100755 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleSettings.java +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleSettings.java @@ -28,6 +28,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; */ final class HashLookupModuleSettings implements IngestModuleIngestJobSettings { + private static final long serialVersionUID = 1L; private final HashSet namesOfEnabledKnownHashSets = new HashSet<>(); private final HashSet namesOfEnabledKnownBadHashSets = new HashSet<>(); private boolean shouldCalculateHashes = true; @@ -39,8 +40,8 @@ final class HashLookupModuleSettings implements IngestModuleIngestJobSettings { } @Override - public String getVersionNumber() { - return "1.0"; //NON-NLS + public long getVersionNumber() { + return serialVersionUID; } boolean shouldCalculateHashes() { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettings.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettings.java index 729c922102..1ce3a6b657 100755 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettings.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettings.java @@ -28,6 +28,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; */ final class KeywordSearchJobSettings implements IngestModuleIngestJobSettings { + private static final long serialVersionUID = 1L; private final HashSet namesOfEnabledKeywordLists = new HashSet<>(); KeywordSearchJobSettings(List namesOfEnabledKeywordLists) { @@ -35,8 +36,8 @@ final class KeywordSearchJobSettings implements IngestModuleIngestJobSettings { } @Override - public String getVersionNumber() { - return "1.0"; //NON-NLS + public long getVersionNumber() { + return serialVersionUID; } boolean isKeywordListEnabled(String keywordListName) {