adding a constructor with name and optional pattern for a group (#1593)

fixes #1555

Author: tulinkry

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

@@ -68,6 +68,21 @@ public class Group implements Comparable<Group>, Nameable {
     private Set<Project> repositories = new TreeSet<>();
     private Set<Group> parents;
 
+    /**
+     * No-arg constructor is needed for deserialization.
+     */
+    public Group() {
+    }
+
+    public Group(String name) {
+        this(name, "");
+    }
+
+    public Group(String name, String pattern) {
+        this.name = name;
+        this.setPattern(pattern);
+    }
+
     public Set<Project> getProjects() {
         return projects;
     }
@@ -198,7 +213,7 @@ public String getPattern() {
      * @param pattern the regexp pattern for this group
      * @throws PatternSyntaxException when the pattern is invalid
      */
-    public void setPattern(String pattern) throws PatternSyntaxException {
+    public final void setPattern(String pattern) throws PatternSyntaxException {
         this.compiledPattern = Pattern.compile("(" + pattern + ")");
         this.pattern = pattern;
     }

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

@@ -289,9 +289,7 @@ public boolean call(Group g) {
      * @return false if parent group was not found, true otherwise
      */
     private static boolean modifyGroup(Set<Group> groups, String groupname, String grouppattern, String parent) {
-        Group g = new Group();
-        g.setName(groupname);
-        g.setPattern(grouppattern);
+        Group g = new Group(groupname, grouppattern);
 
         if (updateGroup(groups, groupname, grouppattern)) {
             return true;

test/org/opensolaris/opengrok/authorization/AuthorizationFrameworkTest.java

@@ -700,14 +700,12 @@ static private Project createUnallowedProject() {
     }
 
     static private Group createAllowedGroup() {
-        Group g = new Group();
-        g.setName("allowed" + "_" + "group_" + random.nextInt());
+        Group g = new Group("allowed" + "_" + "group_" + random.nextInt());
         return g;
     }
 
     static private Group createUnallowedGroup() {
-        Group g = new Group();
-        g.setName("not_allowed" + "_" + "group_" + random.nextInt());
+        Group g = new Group("not_allowed" + "_" + "group_" + random.nextInt());
         return g;
     }
 

test/org/opensolaris/opengrok/authorization/AuthorizationPluginClassLoaderTest.java

@@ -150,8 +150,7 @@ public void testFalsePlugin() {
 
         IAuthorizationPlugin plugin = getNewInstance(clazz);
 
-        Group g = new Group();
-        g.setName("group1");
+        Group g = new Group("group1");
         Project p = new Project("project1");
 
         Assert.assertFalse(
@@ -171,8 +170,7 @@ public void testTruePlugin() {
 
         IAuthorizationPlugin plugin = getNewInstance(clazz);
 
-        Group g = new Group();
-        g.setName("group1");
+        Group g = new Group("group1");
         Project p = new Project("project1");
 
         Assert.assertTrue(

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

@@ -114,9 +114,7 @@ private void testPattern(String pattern, boolean valid) {
 
     @Test
     public void basicTest() {
-        Group g = new Group();
-        g.setName("Random name");
-        g.setPattern("abcd");
+        Group g = new Group("Random name", "abcd");
 
         assertTrue(g.getName().equals("Random name"));
         assertTrue(g.getPattern().equals("abcd"));
@@ -154,15 +152,9 @@ public void basicTest() {
 
     @Test
     public void subgroupsTest() {
-        Group g1 = new Group();
-        g1.setName("Random name");
-        g1.setPattern("abcd");
-        Group g2 = new Group();
-        g2.setName("Random name2");
-        g2.setPattern("efgh");
-        Group g3 = new Group();
-        g3.setName("Random name3");
-        g3.setPattern("xyz");
+        Group g1 = new Group("Random name", "abcd");
+        Group g2 = new Group("Random name2", "efgh");
+        Group g3 = new Group("Random name3", "xyz");
 
         g1.getSubgroups().add(g2);
         g1.getSubgroups().add(g3);
@@ -197,12 +189,8 @@ public void subgroupsTest() {
 
     @Test
     public void projectTest() {
-        Group random1 = new Group();
-        random1.setName("Random name");
-        random1.setPattern("abcd");
-        Group random2 = new Group();
-        random2.setName("Random name2");
-        random2.setPattern("efgh");
+        Group random1 = new Group("Random name", "abcd");
+        Group random2 = new Group("Random name2", "efgh");
 
         random1.getSubgroups().add(random2);
 

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

@@ -156,9 +156,7 @@ public void testGroups() throws IOException {
         assertNotNull(instance.getGroups());
         assertEquals(0, instance.getGroups().size());
 
-        Group g = new Group();
-        g.setName("Random");
-        g.setPattern("xyz.*");
+        Group g = new Group("Random", "xyz.*");
 
         instance.getGroups().add(g);
         assertEquals(1, instance.getGroups().size());

test/org/opensolaris/opengrok/web/ProjectHelperTest.java

@@ -80,8 +80,7 @@ public void testSynchronization() {
         Project p = new Project("some random name not in any group");
 
         // group
-        Group g = new Group();
-        g.setName("some random name of a group");
+        Group g = new Group("some random name of a group");
 
         // repository
         Project repo = new Project("some random name not in any other group");

test/org/opensolaris/opengrok/web/ProjectHelperTestBase.java

@@ -116,8 +116,7 @@ protected static void createGroups(
             List<Group> grps) {
 
         for (int i = start; i < start + cnt; i++) {
-            Group g = new Group();
-            g.setName((allowed ? "allowed_" : "") + "group_" + i);
+            Group g = new Group((allowed ? "allowed_" : "") + "group_" + i);
             String pattern = "";
 
             pattern += createProject(i, 1, true, false, false, rps, prjs, map).getName() + "|";