add new project Messages to list projects

Author: vladak

src/org/opensolaris/opengrok/configuration/RuntimeEnvironment.java

@@ -438,11 +438,11 @@ public Map<String,Project> getProjects() {
     }
 
     /**
-     * Get descriptions of all projects.
+     * Get names of all projects.
      *
-     * @return a list containing descriptions of all projects.
+     * @return a list containing names of all projects.
      */
-    public List<String> getProjectDescriptions() {
+    public List<String> getProjectNames() {
         return getProjectList().stream().
             map(Project::getName).collect(Collectors.toList());
     }
@@ -2013,7 +2013,7 @@ public void refreshSearcherManagerMap() {
         for (Map.Entry<String, SearcherManager> entry : searcherManagerMap.entrySet()) {
             // If a project is gone, close the corresponding SearcherManager
             // so that it cannot produce new IndexSearcher objects.
-            if (!getProjectDescriptions().contains(entry.getKey())) {
+            if (!getProjectNames().contains(entry.getKey())) {
                 try {
                     LOGGER.log(Level.FINE,
                         "closing SearcherManager for project" + entry.getKey());

src/org/opensolaris/opengrok/configuration/messages/ProjectMessage.java

@@ -30,6 +30,7 @@
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import org.opensolaris.opengrok.configuration.Project;
 import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
@@ -234,6 +235,11 @@ protected byte[] applyMessage(RuntimeEnvironment env) throws Exception {
 
                 env.refreshDateForLastIndexRun();
                 break;
+            case "list":
+                return (env.getProjectNames().stream().collect(Collectors.joining("\n")).getBytes());
+            case "list-indexed":
+                return (env.getProjectList().stream().filter(p -> p.isIndexed()).
+                        map(p -> p.getName()).collect(Collectors.joining("\n")).getBytes());
         }
 
         return ("command \"" + getText() + "\" for projects " +
@@ -247,21 +253,24 @@ protected byte[] applyMessage(RuntimeEnvironment env) throws Exception {
      */
     @Override
     public void validate() throws Exception {
-        if (getTags().isEmpty()) {
-            throw new Exception("The message must contain a tag (project name(s))");        
-        }
-
         String command = getText();
+
         // Text field carries the command.
         if (command == null) {
             throw new Exception("The message must contain a text - \"add\", \"delete\" or \"indexed\"");
         }
         if (command.compareTo("add") != 0 &&
             command.compareTo("delete") != 0 &&
+            command.compareTo("list") != 0 &&
+            command.compareTo("list-indexed") != 0 &&
             command.compareTo("indexed") != 0) {
             throw new Exception("The message must contain either 'add', 'delete' or 'indexed' text");
         }
 
+        if (!command.contains("list") && getTags().isEmpty()) {
+            throw new Exception("The message must contain a tag (project name(s))");        
+        }
+
         super.validate();
     }
 }

test/org/opensolaris/opengrok/configuration/ProjectTest.java

@@ -128,7 +128,7 @@ public void testGetProjectDescriptions() {
         RuntimeEnvironment env = RuntimeEnvironment.getInstance();
         env.setProjects(projects);
 
-        List<String> descs = env.getProjectDescriptions();
+        List<String> descs = env.getProjectNames();
         assertTrue(descs.contains("foo"));
         assertTrue(descs.contains("bar"));
         assertFalse(descs.contains("foobar"));

test/org/opensolaris/opengrok/configuration/messages/ProjectMessageTest.java

@@ -29,12 +29,10 @@
 import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.Assert;
 import static org.junit.Assert.assertTrue;
 import org.junit.Assume;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.opensolaris.opengrok.configuration.Project;
 import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
@@ -311,4 +309,33 @@ public void testIndexed() throws Exception {
         Assert.assertTrue("current version should be refreshed",
                 ri.getCurrentVersion().contains("c78fa757c524"));
     }
+
+    @Test
+    public void testList() throws Exception {
+        // Add a project
+        Message m = new ProjectMessage();
+        m.setText("add");
+        m.addTag("mercurial");
+        m.apply(env);
+
+        // Mark it as indexed.
+        m.setText("indexed");
+        m.apply(env);
+
+        // Add another project.
+        m.setText("add");
+        m.addTag("git");
+        m.apply(env);
+
+        m.setTags(new TreeSet<String>());
+        m.setText("list");
+        String out = new String(m.apply(env));
+        Assert.assertTrue(out.contains("mercurial"));
+        Assert.assertTrue(out.contains("git"));
+
+        m.setText("list-indexed");
+        out = new String(m.apply(env));
+        Assert.assertTrue(out.contains("mercurial"));
+        Assert.assertFalse(out.contains("git"));
+    }
 }

tools/Messages

@@ -66,13 +66,15 @@ Usage()
     echo "       - \"auth\"     tag requires \"reload\" text and"
     echo "                    reloads all authorization plugins."
     echo "    project:"
-    echo "     - project names to be added are specified as <tags>"
+    echo "     - project names to be added/deleted/indexed are specified as <tags>"
     echo "     - command is specified in message <text>:"
     echo "       - \"add\" - adds project(s) and its repositories to the configuration."
     echo "                   If the project already exists, refresh list of its repositories."
     echo "       - \"delete\" - removes project(s) and its repositores from the configuration"
     echo "                      Also deletes its data under data root (but not the source code)."
     echo "       - \"indexed\" - mark the project(s) as indexed so it becomes visible in the UI"
+    echo "       - \"list\" - list all projects (both indexed and not indexed)"
+    echo "       - \"list-indexed\" - list indexed projects"
     echo "    normal:"
     echo "     - assign a <text> to the main page or a project"
     echo "     - can be more precise with <tags> (for specific project)"