diff --git a/extensions/data-transfer/portability-data-transfer-microsoft/src/main/java/org/datatransferproject/transfer/microsoft/MicrosoftTransmogrificationConfig.java b/extensions/data-transfer/portability-data-transfer-microsoft/src/main/java/org/datatransferproject/transfer/microsoft/MicrosoftTransmogrificationConfig.java index 1071b1e9f..8055f7992 100644 --- a/extensions/data-transfer/portability-data-transfer-microsoft/src/main/java/org/datatransferproject/transfer/microsoft/MicrosoftTransmogrificationConfig.java +++ b/extensions/data-transfer/portability-data-transfer-microsoft/src/main/java/org/datatransferproject/transfer/microsoft/MicrosoftTransmogrificationConfig.java @@ -8,8 +8,8 @@ public class MicrosoftTransmogrificationConfig extends TransmogrificationConfig OneDrive has forbidden characters for file names: https://support.office.com/en-us/article/invalid-file-names-and-file-types-in-onedrive-onedrive-for-business-and-sharepoint-64883a5d-228e-48f5-b3d2-eb39e07630fa#invalidcharacters */ - private final String PHOTO_TITLE_FORBIDDEN_CHARACTERS = "~\"#%&*:<>?/\\{|}."; - private final String ALBUM_NAME_FORBIDDEN_CHARACTERS = "~\"#%&*:<>?/\\{|}."; + private static final String PHOTO_TITLE_FORBIDDEN_CHARACTERS = "~\"#%&*:<>?/\\{|}"; + private static final String ALBUM_NAME_FORBIDDEN_CHARACTERS = "~\"#%&*:<>?/\\{|}"; /** We need to override the methods diff --git a/extensions/data-transfer/portability-data-transfer-smugmug/src/main/java/org/datatransferproject/transfer/smugmug/SmugMugTransmogrificationConfig.java b/extensions/data-transfer/portability-data-transfer-smugmug/src/main/java/org/datatransferproject/transfer/smugmug/SmugMugTransmogrificationConfig.java index 03839daf0..5abc9dfdb 100644 --- a/extensions/data-transfer/portability-data-transfer-smugmug/src/main/java/org/datatransferproject/transfer/smugmug/SmugMugTransmogrificationConfig.java +++ b/extensions/data-transfer/portability-data-transfer-smugmug/src/main/java/org/datatransferproject/transfer/smugmug/SmugMugTransmogrificationConfig.java @@ -5,10 +5,10 @@ // This class defines transmogrification paramaters for SmugMug imports public class SmugMugTransmogrificationConfig extends TransmogrificationConfig { // Smugmug doesn't allow photos to exist outside of a folder - private final boolean ALBUM_ALLOW_ROOT_PHOTOS = false; + private static final boolean ALBUM_ALLOW_ROOT_PHOTOS = false; // Album size specified here: // https://github.com/google/data-transfer-project/pull/805/files - private final int ALBUM_MAX_SIZE = 5000; + private static final int ALBUM_MAX_SIZE = 5000; /** We need to override the methods diff --git a/portability-types-common/src/main/java/org/datatransferproject/types/common/models/TransmogrificationConfig.java b/portability-types-common/src/main/java/org/datatransferproject/types/common/models/TransmogrificationConfig.java index 8d493597c..ed15d3abe 100644 --- a/portability-types-common/src/main/java/org/datatransferproject/types/common/models/TransmogrificationConfig.java +++ b/portability-types-common/src/main/java/org/datatransferproject/types/common/models/TransmogrificationConfig.java @@ -5,15 +5,15 @@ These defaults represent no-chnage transmogrifications. */ public class TransmogrificationConfig { - private final String PHOTO_TITLE_FORBIDDEN_CHARACTERS = ""; - private final char PHOTO_TITLE_REPLACEMENT_CHARACTER = '_'; - private final int PHOTO_TITLE_MAX_LENGTH = -1; - - private final String ALBUM_NAME_FORBIDDEN_CHARACTERS = ""; - private final char ALBUM_NAME_REPLACEMENT_CHARACTER = '_'; - private final int ALBUM_NAME_MAX_LENGTH = -1; - private final boolean ALBUM_ALLOW_ROOT_PHOTOS = true; - private final int ALBUM_MAX_SIZE = -1; + private static final String PHOTO_TITLE_FORBIDDEN_CHARACTERS = ""; + private static final char PHOTO_TITLE_REPLACEMENT_CHARACTER = '_'; + private static final int PHOTO_TITLE_MAX_LENGTH = -1; + + private static final String ALBUM_NAME_FORBIDDEN_CHARACTERS = ""; + private static final char ALBUM_NAME_REPLACEMENT_CHARACTER = '_'; + private static final int ALBUM_NAME_MAX_LENGTH = -1; + private static final boolean ALBUM_ALLOW_ROOT_PHOTOS = true; + private static final int ALBUM_MAX_SIZE = -1; public String getPhotoTitleForbiddenCharacters() { return PHOTO_TITLE_FORBIDDEN_CHARACTERS;