add list of status authorized when one was not authorized. (#75)

Co-authored-by: thomas loubrieu <thomas.loubrieu@jpl.nasa.gov>
NASA-PDS · Feb 7, 2024 · a5fbf47 · a5fbf47
1 parent 35fc53c
commit a5fbf47
Showing 1 changed file with 96 additions and 105 deletions.
diff --git a/src/main/java/gov/nasa/pds/registry/mgr/cmd/data/SetArchiveStatusCmd.java b/src/main/java/gov/nasa/pds/registry/mgr/cmd/data/SetArchiveStatusCmd.java
@@ -17,118 +17,109 @@
 
 
 /**
- * A CLI command to set PDS label archive status in Elasticsearch registry index.
- * Status can be updated by LidVid or PackageId.
+ * A CLI command to set PDS label archive status in Elasticsearch registry index. Status can be
+ * updated by LidVid or PackageId.
  * 
  * @author karpenko
  */
-public class SetArchiveStatusCmd implements CliCommand
-{
-    private Set<String> statusNames; 
-
-    /**
-     * Constructor
-     */
-    public SetArchiveStatusCmd()
-    {
-        statusNames = new TreeSet<>();
-        statusNames.add("staged");
-        statusNames.add("archived");
-        statusNames.add("certified");
-        statusNames.add("restricted");
+public class SetArchiveStatusCmd implements CliCommand {
+  private Set<String> statusNames;
+
+  /**
+   * Constructor
+   */
+  public SetArchiveStatusCmd() {
+    statusNames = new TreeSet<>();
+    statusNames.add("staged");
+    statusNames.add("archived");
+    statusNames.add("certified");
+    statusNames.add("restricted");
+  }
+
+
+  @Override
+  public void run(CommandLine cmdLine) throws Exception {
+    if (cmdLine.hasOption("help")) {
+      printHelp();
+      return;
+    }
+
+    String esUrl = cmdLine.getOptionValue("es", "http://localhost:9200");
+    String indexName = cmdLine.getOptionValue("index", Constants.DEFAULT_REGISTRY_INDEX);
+    String authPath = cmdLine.getOptionValue("auth");
+
+    String status = getStatus(cmdLine);
+
+    String lidvid = cmdLine.getOptionValue("lidvid");
+    if (lidvid == null)
+      throw new Exception("Missing required parameter '-lidvid'");
+
+    RestClient client = null;
+
+    try {
+      // Call Elasticsearch
+      client = EsClientFactory.createRestClient(esUrl, authPath);
+      ProductDao dao = new ProductDao(client, indexName);
+      ProductService srv = new ProductService(dao);
+
+      srv.updateArchveStatus(lidvid, status);
+    } catch (ResponseException ex) {
+      throw new Exception(EsUtils.extractErrorMessage(ex));
+    } finally {
+      CloseUtils.close(client);
     }
-
-
-    @Override
-    public void run(CommandLine cmdLine) throws Exception
-    {
-        if(cmdLine.hasOption("help"))
-        {
-            printHelp();
-            return;
-        }
-
-        String esUrl = cmdLine.getOptionValue("es", "http://localhost:9200");
-        String indexName = cmdLine.getOptionValue("index", Constants.DEFAULT_REGISTRY_INDEX);
-        String authPath = cmdLine.getOptionValue("auth");
-
-        String status = getStatus(cmdLine);
-
-        String lidvid = cmdLine.getOptionValue("lidvid");
-        if(lidvid == null) throw new Exception("Missing required parameter '-lidvid'");
-
-        RestClient client = null;
-
-        try
-        {
-            // Call Elasticsearch
-            client = EsClientFactory.createRestClient(esUrl, authPath);
-            ProductDao dao = new ProductDao(client, indexName);
-            ProductService srv = new ProductService(dao);
-
-            srv.updateArchveStatus(lidvid, status);
-        }
-        catch(ResponseException ex)
-        {
-            throw new Exception(EsUtils.extractErrorMessage(ex));
-        }
-        finally
-        {
-            CloseUtils.close(client);
-        }
+  }
+
+
+  /**
+   * Get value of "-status" command-line parameter. Throw exception if invalid status is passed.
+   * 
+   * @param cmdLine
+   * @return valid status value
+   * @throws Exception Throw exception if invalid status is passed.
+   */
+  private String getStatus(CommandLine cmdLine) throws Exception {
+    String tmp = cmdLine.getOptionValue("status");
+    if (tmp == null) {
+      throw new Exception("Missing required parameter '-status'");
     }
 
-
-    /**
-     * Get value of "-status" command-line parameter. 
-     * Throw exception if invalid status is passed.
-     * @param cmdLine
-     * @return valid status value
-     * @throws Exception Throw exception if invalid status is passed.
-     */
-    private String getStatus(CommandLine cmdLine) throws Exception
-    {
-        String tmp = cmdLine.getOptionValue("status");
-        if(tmp == null) 
-        {
-            throw new Exception("Missing required parameter '-status'");
-        }
-
-        String status = tmp.toLowerCase();
-        if(!statusNames.contains(status))
-        {
-            throw new Exception("Invalid '-status' parameter value: '" + tmp + "'");
-        }
-
-        return status;
+    String status = tmp.toLowerCase();
+    if (!statusNames.contains(status)) {
+      String authorized_status = String.join(", ", this.statusNames);
+      throw new Exception("Invalid '-status' parameter value: '" + tmp + "'. Authorized values are "
+          + authorized_status + ".");
     }
-
-
-    /**
-     * Print help screen
-     */
-    public void printHelp()
-    {
-        System.out.println("Usage: registry-manager set-archive-status <options>");
-
-        System.out.println();
-        System.out.println("Set product archive status");
-        System.out.println();
-        System.out.println("Required parameters:");
-        System.out.println("  -status <status>   One of the following values:");
-
-        for(String name: statusNames)
-        {
-            System.out.println("     " + name);
-        }
-
-        System.out.println("  -lidvid <id>    Update archive status of a document with given LIDVID.");
-        System.out.println("                  For a collection also update primary references from collection inventory.");
-        System.out.println("Optional parameters:");
-        System.out.println("  -auth <file>    Authentication config file");
-        System.out.println("  -es <url>       Elasticsearch URL. Default is http://localhost:9200");
-        System.out.println("  -index <name>   Elasticsearch index name. Default is 'registry'");
-        System.out.println();
+    // Authorized values are " + String.join(", ", this.statusNames)
+
+    return status;
+  }
+
+
+  /**
+   * Print help screen
+   */
+  public void printHelp() {
+    System.out.println("Usage: registry-manager set-archive-status <options>");
+
+    System.out.println();
+    System.out.println("Set product archive status");
+    System.out.println();
+    System.out.println("Required parameters:");
+    System.out.println("  -status <status>   One of the following values:");
+
+    for (String name : statusNames) {
+      System.out.println("     " + name);
     }
 
+    System.out.println("  -lidvid <id>    Update archive status of a document with given LIDVID.");
+    System.out.println(
+        "                  For a collection also update primary references from collection inventory.");
+    System.out.println("Optional parameters:");
+    System.out.println("  -auth <file>    Authentication config file");
+    System.out.println("  -es <url>       Elasticsearch URL. Default is http://localhost:9200");
+    System.out.println("  -index <name>   Elasticsearch index name. Default is 'registry'");
+    System.out.println();
+  }
+
 }