Update the fix based on PR #10542.

Author: hani-fouladgar

hadoop-hdds/cli-common/src/main/java/org/apache/hadoop/hdds/cli/DeprecatedCliOption.java

@@ -23,7 +23,8 @@
 import java.util.Objects;
 
 /**
- * Emits warnings when deprecated CLI option aliases are used.
+ * Emits warnings when deprecated CLI option aliases are used
+ * and return the recommended replacement option.
  */
 public final class DeprecatedCliOption {
 

hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStartSubcommand.java

@@ -55,49 +55,25 @@ public class ContainerBalancerStartSubcommand extends ScmSubcommand {
           "'20' for 20%%).")
   private Optional<Integer> maxDatanodesPercentageToInvolvePerIteration;
 
-  /** For backward compatibility. */
-  @Deprecated
-  @SuppressWarnings("DeprecatedIsStillUsed")
-  @Option(names = "--maxDatanodesPercentageToInvolvePerIteration", hidden = true)
-  private Optional<Integer> deprecatedMaxDatanodesPercentage;
-
   @Option(names = {"-s", "--max-size-to-move-per-iteration-in-gb"},
       description = "Maximum size that can be moved per iteration of " +
           "balancing. The value should be positive, with a default of 500 " +
           "(specify '500' for 500GB).")
   private Optional<Long> maxSizeToMovePerIterationInGB;
 
-  /** For backward compatibility. */
-  @Deprecated
-  @SuppressWarnings("DeprecatedIsStillUsed")
-  @Option(names = "--maxSizeToMovePerIterationInGB", hidden = true)
-  private Optional<Long> deprecatedMaxSizeToMovePerIterationInGB;
-
   @Option(names = {"-e", "--max-size-entering-target-in-gb"},
       description = "Maximum size that can enter a target datanode while " +
           "balancing. This is the sum of data from multiple sources. The value " +
           "should be positive, with a default of 26 (specify '26' for 26GB).")
   private Optional<Long> maxSizeEnteringTargetInGB;
 
-  /** For backward compatibility. */
-  @Deprecated
-  @SuppressWarnings("DeprecatedIsStillUsed")
-  @Option(names = "--maxSizeEnteringTargetInGB", hidden = true)
-  private Optional<Long> deprecatedMaxSizeEnteringTargetInGB;
-
   @Option(names = {"-l", "--max-size-leaving-source-in-gb"},
       description = "Maximum size that can leave a source datanode while " +
           "balancing. This is the sum of data moving to multiple targets. " +
           "The value should be positive, with a default of 26 " +
           "(specify '26' for 26GB).")
   private Optional<Long> maxSizeLeavingSourceInGB;
 
-  /** For backward compatibility. */
-  @Deprecated
-  @SuppressWarnings("DeprecatedIsStillUsed")
-  @Option(names = "--maxSizeLeavingSourceInGB", hidden = true)
-  private Optional<Long> deprecatedMaxSizeLeavingSourceInGB;
-
   @Option(names = {"--balancing-iteration-interval-minutes"},
       description = "The interval period in minutes between each iteration of Container Balancer. " +
           "The value should be positive, with a default of 70 (specify '70' for 70 minutes).")
@@ -154,43 +130,13 @@ public class ContainerBalancerStartSubcommand extends ScmSubcommand {
           "(specify \"1,2,3\" for container IDs).")
   private Optional<String> includeContainers;
 
-  private Optional<Integer> resolveMaxDatanodesPercentageToInvolvePerIteration() {
-    if (maxDatanodesPercentageToInvolvePerIteration != null
-        && maxDatanodesPercentageToInvolvePerIteration.isPresent()) {
-      return maxDatanodesPercentageToInvolvePerIteration;
-    }
-    return deprecatedMaxDatanodesPercentage;
-  }
-
-  private Optional<Long> resolveMaxSizeToMovePerIterationInGB() {
-    if (maxSizeToMovePerIterationInGB != null
-        && maxSizeToMovePerIterationInGB.isPresent()) {
-      return maxSizeToMovePerIterationInGB;
-    }
-    return deprecatedMaxSizeToMovePerIterationInGB;
-  }
-
-  private Optional<Long> resolveMaxSizeEnteringTargetInGB() {
-    if (maxSizeEnteringTargetInGB != null && maxSizeEnteringTargetInGB.isPresent()) {
-      return maxSizeEnteringTargetInGB;
-    }
-    return deprecatedMaxSizeEnteringTargetInGB;
-  }
-
-  private Optional<Long> resolveMaxSizeLeavingSourceInGB() {
-    if (maxSizeLeavingSourceInGB != null && maxSizeLeavingSourceInGB.isPresent()) {
-      return maxSizeLeavingSourceInGB;
-    }
-    return deprecatedMaxSizeLeavingSourceInGB;
-  }
-
   @Override
   public void execute(ScmClient scmClient) throws IOException {
     StartContainerBalancerResponseProto response = scmClient.
         startContainerBalancer(threshold, iterations,
-        resolveMaxDatanodesPercentageToInvolvePerIteration(),
-        resolveMaxSizeToMovePerIterationInGB(), resolveMaxSizeEnteringTargetInGB(),
-        resolveMaxSizeLeavingSourceInGB(), balancingInterval, moveTimeout,
+        maxDatanodesPercentageToInvolvePerIteration,
+        maxSizeToMovePerIterationInGB, maxSizeEnteringTargetInGB,
+        maxSizeLeavingSourceInGB, balancingInterval, moveTimeout,
         moveReplicationTimeout, networkTopologyEnable, includeNodes,
         excludeNodes, excludeContainers, includeContainers);
     if (response.getStart()) {

hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/CreatePipelineSubcommand.java

@@ -38,67 +38,35 @@ public class CreatePipelineSubcommand extends ScmSubcommand {
   @CommandLine.Option(
       names = {"-t", "--replication-type"},
       description = "Replication type is RATIS.",
+      defaultValue = "RATIS",
       hidden = true
   )
   private HddsProtos.ReplicationType type;
 
-  /** For backward compatibility. */
-  @Deprecated
-  @SuppressWarnings("DeprecatedIsStillUsed")
-  @CommandLine.Option(names = "--replicationType", hidden = true)
-  private HddsProtos.ReplicationType deprecatedReplicationType;
-
-  @CommandLine.Option(
+   @CommandLine.Option(
       names = {"-f", "--replication-factor"},
-      description = "Replication factor for RATIS (ONE, THREE)."
+      description = "Replication factor for RATIS (ONE, THREE).",
+      defaultValue = "ONE"
   )
   private HddsProtos.ReplicationFactor factor;
 
-  /** For backward compatibility. */
-  @Deprecated
-  @SuppressWarnings("DeprecatedIsStillUsed")
-  @CommandLine.Option(names = "--replicationFactor", hidden = true)
-  private HddsProtos.ReplicationFactor deprecatedReplicationFactor;
-
-  private HddsProtos.ReplicationType getReplicationType() {
-    if (type != null) {
-      return type;
-    }
-    if (deprecatedReplicationType != null) {
-      return deprecatedReplicationType;
-    }
-    return HddsProtos.ReplicationType.RATIS;
-  }
-
-  private HddsProtos.ReplicationFactor getReplicationFactor() {
-    if (factor != null) {
-      return factor;
-    }
-    if (deprecatedReplicationFactor != null) {
-      return deprecatedReplicationFactor;
-    }
-    return HddsProtos.ReplicationFactor.ONE;
-  }
-
   @Override
   public void execute(ScmClient scmClient) throws IOException {
-    HddsProtos.ReplicationType resolvedType = getReplicationType();
-    HddsProtos.ReplicationFactor resolvedFactor = getReplicationFactor();
     // Once we support creating EC containers/pipelines from the client, the
     // client should check if SCM is able to fulfil the request, and
     // understands an EcReplicationConfig. For that we also need to have SCM's
     // version here from ScmInfo response.
     // As I see there is no way to specify ECReplicationConfig properly here
     // so failing the request if type is EC, seems to be safe.
-    if (resolvedType == HddsProtos.ReplicationType.CHAINED
-        || resolvedType == HddsProtos.ReplicationType.EC
-        || resolvedType == HddsProtos.ReplicationType.STAND_ALONE) {
-      throw new IllegalArgumentException(resolvedType.name()
+    if (type == HddsProtos.ReplicationType.CHAINED
+        || type == HddsProtos.ReplicationType.EC
+        || type == HddsProtos.ReplicationType.STAND_ALONE) {
+      throw new IllegalArgumentException(type.name()
           + " is not supported yet.");
     }
     Pipeline pipeline = scmClient.createReplicationPipeline(
-        resolvedType,
-        resolvedFactor,
+        type,
+        factor,
         HddsProtos.NodePool.getDefaultInstance());
 
     if (pipeline != null) {

hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ListPipelinesSubcommand.java

@@ -63,12 +63,7 @@ public void execute(ScmClient scmClient) throws IOException {
     if (replicationFilter.isPresent()) {
       stream = stream.filter(replicationFilter.get());
     }
-<<<<<<< HEAD
     if (!Strings.isNullOrEmpty(state)) {
-=======
-    String effectiveState = getState();
-    if (!Strings.isNullOrEmpty(effectiveState)) {
->>>>>>> a71ff80348 (Remove conflicts and refactor the code to use DeprecatedCliOption class)
       stream = stream.filter(p -> p.getPipelineState().toString()
           .compareToIgnoreCase(state) == 0);
     }

hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/TransferOmLeaderSubCommand.java

@@ -46,27 +46,15 @@ static class TransferOption {
     )
     private String omNodeId;
 
-    /** For backward compatibility. */
-    @Deprecated
-    @SuppressWarnings("DeprecatedIsStillUsed")
-    @CommandLine.Option(names = "--newLeaderId", hidden = true)
-    private String deprecatedOmNodeId;
-
     @CommandLine.Option(names = {"-r", "--random"},
         description = "Randomly choose a follower to transfer leadership.")
     private boolean isRandom;
-
-    String getOmNodeId() {
-      return omNodeId != null ? omNodeId : deprecatedOmNodeId;
-    }
   }
 
   @Override
   public Void call() throws Exception {
     if (configGroup.isRandom) {
       configGroup.omNodeId = "";
-    } else {
-      configGroup.omNodeId = configGroup.getOmNodeId();
     }
     try (OzoneManagerProtocol client = omServiceOption.newClient()) {
       client.transferLeadership(configGroup.omNodeId);

hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/TransferScmLeaderSubCommand.java

@@ -52,19 +52,9 @@ static class TransferOption {
     )
     private String scmId;
 
-    /** For backward compatibility. */
-    @Deprecated
-    @SuppressWarnings("DeprecatedIsStillUsed")
-    @CommandLine.Option(names = "--newLeaderId", hidden = true)
-    private String deprecatedScmId;
-
     @CommandLine.Option(names = {"-r", "--random"},
         description = "Randomly choose a follower to transfer leadership.")
     private boolean isRandom;
-
-    String getScmId() {
-      return scmId != null ? scmId : deprecatedScmId;
-    }
   }
 
   @Override
@@ -73,8 +63,6 @@ public Void call() throws Exception {
         parent.getParent().getOzoneConf());
     if (configGroup.isRandom) {
       configGroup.scmId = "";
-    } else {
-      configGroup.scmId = configGroup.getScmId();
     }
     client.transferLeadership(configGroup.scmId);
     System.out.println("Transfer leadership successfully to " +

hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/ldb/DBScanner.java

@@ -90,14 +90,13 @@ public class DBScanner extends AbstractSubcommand implements Callable<Void> {
 
   private static final Logger LOG = LoggerFactory.getLogger(DBScanner.class);
   private static final String SCHEMA_V3 = "V3";
-  private static final String DEFAULT_DN_DB_SCHEMA_VERSION = "V3";
 
   @CommandLine.ParentCommand
   private RDBParser parent;
 
-  @CommandLine.ArgGroup(multiplicity = "1")
-  private ColumnFamilyOption columnFamilyOption;
-
+  @CommandLine.Option(names = {"--column-family", "--cf"},
+      required = true,
+      description = "Table name")
   private String tableName;
 
   @CommandLine.Option(names = {"--with-keys"},
@@ -139,15 +138,10 @@ public class DBScanner extends AbstractSubcommand implements Callable<Void> {
   private String filter;
 
   @CommandLine.Option(names = {"--dn-schema", "-d"},
-      description = "Datanode DB Schema Version: V1/V2/V3")
+      description = "Datanode DB Schema Version: V1/V2/V3",
+      defaultValue = "V3")
   private String dnDBSchemaVersion;
 
-  /** For backward compatibility. */
-  @Deprecated
-  @SuppressWarnings("DeprecatedIsStillUsed")
-  @CommandLine.Option(names = "--dnSchema", hidden = true)
-  private String deprecatedDnDBSchemaVersion;
-
   @CommandLine.Option(names = {"--container-id", "--cid"},
       description = "Container ID. Applicable if datanode DB Schema is V3",
       defaultValue = "-1")
@@ -188,37 +182,8 @@ public class DBScanner extends AbstractSubcommand implements Callable<Void> {
   private static volatile boolean exception;
   private static final long FIRST_SEQUENCE_ID = 0L;
 
-  static class ColumnFamilyOption {
-    @CommandLine.Option(names = {"--column-family", "--cf"},
-        description = "Table name",
-        required = true)
-    private String tableName;
-
-    /** For backward compatibility. */
-    @Deprecated
-    @SuppressWarnings("DeprecatedIsStillUsed")
-    @CommandLine.Option(names = "--column_family", hidden = true, required = true)
-    private String deprecatedTableName;
-
-    String getTableName() {
-      return tableName != null ? tableName : deprecatedTableName;
-    }
-  }
-
-  private String getDnDBSchemaVersion() {
-    if (dnDBSchemaVersion != null) {
-      return dnDBSchemaVersion;
-    }
-    if (deprecatedDnDBSchemaVersion != null) {
-      return deprecatedDnDBSchemaVersion;
-    }
-    return DEFAULT_DN_DB_SCHEMA_VERSION;
-  }
-
   @Override
   public Void call() throws Exception {
-    tableName = columnFamilyOption.getTableName();
-    dnDBSchemaVersion = getDnDBSchemaVersion();
     fileSuffix = 0;
     globalCount = 0;
     List<ColumnFamilyDescriptor> cfDescList =