Change serialization version number implementation

This commit is contained in:
Richard Cordovano 2014-05-13 13:41:04 -04:00
parent 0d5258feca
commit 89c43d88a1
7 changed files with 23 additions and 15 deletions

View File

@ -37,6 +37,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
*/ */
public class SampleModuleIngestJobSettings implements IngestModuleIngestJobSettings { public class SampleModuleIngestJobSettings implements IngestModuleIngestJobSettings {
private static final long serialVersionUID = 1L;
private boolean skipKnownFiles = true; private boolean skipKnownFiles = true;
SampleModuleIngestJobSettings() { SampleModuleIngestJobSettings() {
@ -47,8 +48,8 @@ public class SampleModuleIngestJobSettings implements IngestModuleIngestJobSetti
} }
@Override @Override
public String getVersionNumber() { public long getVersionNumber() {
return "1.0"; //NON-NLS return serialVersionUID;
} }
void setSkipKnownFiles(boolean enabled) { void setSkipKnownFiles(boolean enabled) {

View File

@ -28,9 +28,11 @@ import java.io.Serializable;
public interface IngestModuleIngestJobSettings extends 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();
} }

View File

@ -24,11 +24,12 @@ package org.sleuthkit.autopsy.ingest;
*/ */
public final class NoIngestModuleIngestJobSettings implements IngestModuleIngestJobSettings { public final class NoIngestModuleIngestJobSettings implements IngestModuleIngestJobSettings {
private static final long serialVersionUID = 1L;
private final String setting = "None"; //NON-NLS private final String setting = "None"; //NON-NLS
@Override @Override
public String getVersionNumber() { public long getVersionNumber() {
return "1.0"; //NON-NLS return serialVersionUID;
} }
/** /**

View File

@ -25,6 +25,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
*/ */
final class FileExtMismatchDetectorModuleSettings implements IngestModuleIngestJobSettings { final class FileExtMismatchDetectorModuleSettings implements IngestModuleIngestJobSettings {
private static final long serialVersionUID = 1L;
private boolean skipFilesWithNoExtension = true; private boolean skipFilesWithNoExtension = true;
private boolean skipFilesWithTextPlainMimeType = false; private boolean skipFilesWithTextPlainMimeType = false;
@ -37,8 +38,8 @@ final class FileExtMismatchDetectorModuleSettings implements IngestModuleIngestJ
} }
@Override @Override
public String getVersionNumber() { public long getVersionNumber() {
return "1.0"; //NON-NLS return serialVersionUID;
} }
void setSkipFilesWithNoExtension(boolean enabled) { void setSkipFilesWithNoExtension(boolean enabled) {

View File

@ -25,6 +25,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
*/ */
public class FileTypeIdModuleSettings implements IngestModuleIngestJobSettings { public class FileTypeIdModuleSettings implements IngestModuleIngestJobSettings {
private static final long serialVersionUID = 1L;
private volatile boolean skipKnownFiles = true; private volatile boolean skipKnownFiles = true;
FileTypeIdModuleSettings() { FileTypeIdModuleSettings() {
@ -35,8 +36,8 @@ public class FileTypeIdModuleSettings implements IngestModuleIngestJobSettings {
} }
@Override @Override
public String getVersionNumber() { public long getVersionNumber() {
return "1.0"; //NON-NLS return serialVersionUID;
} }
void setSkipKnownFiles(boolean enabled) { void setSkipKnownFiles(boolean enabled) {

View File

@ -28,6 +28,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
*/ */
final class HashLookupModuleSettings implements IngestModuleIngestJobSettings { final class HashLookupModuleSettings implements IngestModuleIngestJobSettings {
private static final long serialVersionUID = 1L;
private final HashSet<String> namesOfEnabledKnownHashSets = new HashSet<>(); private final HashSet<String> namesOfEnabledKnownHashSets = new HashSet<>();
private final HashSet<String> namesOfEnabledKnownBadHashSets = new HashSet<>(); private final HashSet<String> namesOfEnabledKnownBadHashSets = new HashSet<>();
private boolean shouldCalculateHashes = true; private boolean shouldCalculateHashes = true;
@ -39,8 +40,8 @@ final class HashLookupModuleSettings implements IngestModuleIngestJobSettings {
} }
@Override @Override
public String getVersionNumber() { public long getVersionNumber() {
return "1.0"; //NON-NLS return serialVersionUID;
} }
boolean shouldCalculateHashes() { boolean shouldCalculateHashes() {

View File

@ -28,6 +28,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
*/ */
final class KeywordSearchJobSettings implements IngestModuleIngestJobSettings { final class KeywordSearchJobSettings implements IngestModuleIngestJobSettings {
private static final long serialVersionUID = 1L;
private final HashSet<String> namesOfEnabledKeywordLists = new HashSet<>(); private final HashSet<String> namesOfEnabledKeywordLists = new HashSet<>();
KeywordSearchJobSettings(List<String> namesOfEnabledKeywordLists) { KeywordSearchJobSettings(List<String> namesOfEnabledKeywordLists) {
@ -35,8 +36,8 @@ final class KeywordSearchJobSettings implements IngestModuleIngestJobSettings {
} }
@Override @Override
public String getVersionNumber() { public long getVersionNumber() {
return "1.0"; //NON-NLS return serialVersionUID;
} }
boolean isKeywordListEnabled(String keywordListName) { boolean isKeywordListEnabled(String keywordListName) {