You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2017/08/23 08:35:58 UTC
svn commit: r1805869 - in
/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser:
MigrationCliArguments.java MigrationOptions.java OptionParserFactory.java
Author: tomekr
Date: Wed Aug 23 08:35:58 2017
New Revision: 1805869
URL: http://svn.apache.org/viewvc?rev=1805869&view=rev
Log:
OAK-6573: The --src-external-ds option does not mandate argument but reads it later
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationCliArguments.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationCliArguments.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationCliArguments.java?rev=1805869&r1=1805868&r2=1805869&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationCliArguments.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationCliArguments.java Wed Aug 23 08:35:58 2017
@@ -52,6 +52,10 @@ public final class MigrationCliArguments
return (Integer) options.valueOf(optionName);
}
+ public Boolean getBooleanOption(String optionName) {
+ return (Boolean) options.valueOf(optionName);
+ }
+
public String[] getOptionList(String optionName) {
String option = getOption(optionName);
if (option == null) {
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java?rev=1805869&r1=1805868&r2=1805869&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java Wed Aug 23 08:35:58 2017
@@ -153,8 +153,7 @@ public class MigrationOptions {
this.dstS3Config = args.getOption(OptionParserFactory.DST_S3_CONFIG);
if (args.hasOption(OptionParserFactory.SRC_EXTERNAL_BLOBS)) {
- this.srcExternalBlobs = Boolean
- .valueOf(OptionParserFactory.SRC_EXTERNAL_BLOBS);
+ this.srcExternalBlobs = args.getBooleanOption(OptionParserFactory.SRC_EXTERNAL_BLOBS);
} else {
this.srcExternalBlobs = null;
}
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java?rev=1805869&r1=1805868&r2=1805869&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java Wed Aug 23 08:35:58 2017
@@ -122,7 +122,8 @@ public class OptionParserFactory {
op.accepts(DST_S3_CONFIG, "Configuration file for the target S3DataStore").withRequiredArg()
.ofType(String.class);
op.accepts(IGNORE_MISSING_BINARIES, "Don't break the migration if some binaries are missing");
- op.accepts(SRC_EXTERNAL_BLOBS, "Flag specifying if the source Store has external references or not");
+ op.accepts(SRC_EXTERNAL_BLOBS, "Flag specifying if the source Store has external references or not")
+ .withRequiredArg().ofType(Boolean.class);
}
private static void addRdbOptions(OptionParser op) {