Skip to content

Fix legacy property overrrides. #2528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
afranken merged 1 commit into from
Jul 25, 2025
Merged

Fix legacy property overrrides. #2528

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions server/src/main/java/com/adobe/testing/s3mock/S3MockApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ public class S3MockApplication {
/**
* Property name for passing a comma-separated list of buckets that are to be created at startup.
*/
public static final String PROP_INITIAL_BUCKETS = "com.adobe.testing.s3mock.domain.initialBuckets";
public static final String PROP_INITIAL_BUCKETS = "com.adobe.testing.s3mock.store.initialBuckets";
private static final String LEGACY_PROP_INITIAL_BUCKETS = "initialBuckets";

/**
* Property name for passing a root directory to use. If omitted a default temp-dir will be used.
*/
public static final String PROP_ROOT_DIRECTORY = "com.adobe.testing.s3mock.domain.root";
public static final String PROP_ROOT_DIRECTORY = "com.adobe.testing.s3mock.store.root";
private static final String LEGACY_PROP_ROOT_DIRECTORY = "root";

/**
Expand Down Expand Up @@ -212,9 +212,9 @@ private static Map<String, Object> translateLegacyProperties(Map<String, Object>
translateLegacyProperty(translated, PROP_ROOT_DIRECTORY, LEGACY_PROP_ROOT_DIRECTORY);
translateLegacyProperty(translated, PROP_INITIAL_BUCKETS, LEGACY_PROP_INITIAL_BUCKETS);
translateLegacyProperty(translated,
"com.adobe.testing.s3mock.domain.retainFilesOnExit", "retainFilesOnExit");
"com.adobe.testing.s3mock.store.retainFilesOnExit", "retainFilesOnExit");
translateLegacyProperty(translated,
"com.adobe.testing.s3mock.domain.validKmsKeys", "validKmsKeys");
"com.adobe.testing.s3mock.store.validKmsKeys", "validKmsKeys");
translateLegacyProperty(translated,
"com.adobe.testing.s3mock.httpPort", "http.port");
return translated;
Expand Down