Skip to content

Commit efb1a4d

Browse files
committed
Modify deprecated warning
1 parent c1fc7b9 commit efb1a4d

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

data-loader/cli/src/main/java/com/scalar/db/dataloader/cli/command/dataexport/ExportCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ private void warnAboutIgnoredDeprecatedOptions() {
160160
+ DEPRECATED_INCLUDE_METADATA_OPTION
161161
+ " option is deprecated and no longer has any effect. "
162162
+ "Use the 'scalar.db.consensus_commit.include_metadata.enabled' configuration property "
163-
+ "in your ScalarDB properties file to control whether transaction metadata is included in read operations.|@");
163+
+ "in your ScalarDB properties file to control whether transaction metadata is included in scan operations.|@");
164164

165165
logger.warn(warning);
166166
}

data-loader/cli/src/main/java/com/scalar/db/dataloader/cli/command/dataexport/ExportCommandOptions.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,16 @@ public class ExportCommandOptions {
7272
protected FileFormat outputFormat;
7373

7474
/**
75-
* @deprecated As of release 3.16.2 This option is no longer used and will be removed in release.
76-
* The option is not fully removed as it will break backwards 4.0.0.
75+
* @deprecated As of release 3.17.0 This option is no longer used and will be removed in release
76+
* 4.0.0. The option is not fully removed as users who might already have there scripts or
77+
* commands pre-set might pass the argument and when passed if not supported, picocli will
78+
* throw an error. We want to avoid that and instead just show a warning.
7779
*/
7880
@Deprecated
7981
@CommandLine.Option(
8082
names = {"--include-metadata", "-m"},
8183
description =
82-
"Deprecated: This option is no longer used. Please use scalar.db.consensus_commit.include_metadata.enabled to control whether transaction metadata is included in read operations.",
84+
"Deprecated: This option is no longer used. Please use scalar.db.consensus_commit.include_metadata.enabled to control whether transaction metadata is included in scan operations.",
8385
defaultValue = "false",
8486
hidden = true)
8587
protected boolean includeTransactionMetadata;

0 commit comments

Comments
 (0)