Merge pull request #1889 from vladak/RepositoryInfo_equals

override RepositoryInfo.equals() so that removeAll() works for Projec…

Author: tarzanek

src/org/opensolaris/opengrok/history/RepositoryInfo.java

@@ -24,6 +24,7 @@
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
+import java.util.Objects;
 import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
 import org.opensolaris.opengrok.util.ClassUtil;
 
@@ -215,4 +216,27 @@ public String getCurrentVersion() {
     public void setCurrentVersion(String currentVersion) {
         this.currentVersion = currentVersion;
     }
+    
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof RepositoryInfo)) {
+            return false;
+        }
+        
+        RepositoryInfo ri = (RepositoryInfo) obj;
+        
+        // Directory paths should be unique.
+        if (ri.getDirectoryNameRelative() != null && this.getDirectoryNameRelative() != null) {
+            return ri.getDirectoryNameRelative().equals(this.getDirectoryNameRelative());
+        } else {
+            return (ri.getDirectoryNameRelative() == null && this.getDirectoryNameRelative() == null);
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 89 * hash + Objects.hashCode(this.directoryNameRelative);
+        return hash;
+    }
 }

test/org/opensolaris/opengrok/history/RepositoryInfoTest.java

@@ -0,0 +1,55 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * See LICENSE.txt included in this distribution for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at LICENSE.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package org.opensolaris.opengrok.history;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import org.junit.Before;
+import org.junit.Test;
+import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
+
+/**
+ *
+ * @author Vladimir Kotal
+ */
+public class RepositoryInfoTest {
+    @Before
+    public void setUp() {
+        RuntimeEnvironment.getInstance().setSourceRoot("/src");
+    }
+    
+    @Test
+    public void testEquals() {
+        String repoDirectory = "/src/foo";
+        
+        RepositoryInfo ri1 = new RepositoryInfo();
+        ri1.setDirectoryName(repoDirectory);
+        ri1.setBranch("branch1");
+        
+        RepositoryInfo ri2 = new RepositoryInfo();
+        assertNotEquals(ri1, ri2);
+        
+        ri2.setDirectoryName(repoDirectory);
+        assertEquals(ri1, ri2);
+    }
+}