Fix empty string indexing of Doctrine repository class; "THashSet contract violation - 25 reports & coming" #985

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineUtil.java

@@ -153,7 +153,12 @@ private static String getAnnotationRepositoryClass(@NotNull PhpDocTag phpDocTag,
         String text = phpDocAttributeList.getText();
         Matcher matcher = Pattern.compile("repositoryClass\\s*=\\s*\"([^\"]*)\"").matcher(text);
         if (matcher.find()) {
-            return matcher.group(1);
+            String value = matcher.group(1);
+            if(StringUtils.isBlank(value)) {
+                return null;
+            }
+
+            return value;
         }
 
         // repositoryClass=Foobar::class
@@ -201,7 +206,13 @@ private static Collection<Pair<String, String>> getClassRepositoryPair(@NotNull
                 continue;
             }
 
-            String repositoryClass = YamlHelper.getYamlKeyValueAsString(yamlKey, "repositoryClass");
+            String repositoryClassValue = YamlHelper.getYamlKeyValueAsString(yamlKey, "repositoryClass");
+
+            // check blank condition
+            String repositoryClass = null;
+            if(StringUtils.isNotBlank(repositoryClassValue)) {
+                repositoryClass = repositoryClassValue;
+            }
 
             // fine repositoryClass exists a valid metadata file
             if(!iAmMetadataFile && repositoryClass != null) {

src/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModel.java

@@ -23,6 +23,11 @@ public DoctrineModel(@NotNull String clazz) {
         this.clazz = clazz;
     }
 
+    public DoctrineModel(@NotNull String clazz, @Nullable String repositoryClass) {
+        this.clazz = clazz;
+        this.repositoryClass = repositoryClass;
+    }
+
     @NotNull
     public String getClassName() {
         return this.clazz;
@@ -33,18 +38,21 @@ public String getRepositoryClass() {
         return repositoryClass;
     }
 
-    public DoctrineModel setRepositoryClass(@Nullable String repositoryClass) {
-        this.repositoryClass = repositoryClass;
-        return this;
-    }
-
     @Override
     public int hashCode() {
-        return new HashCodeBuilder()
-            .append(this.clazz)
-            .append(this.repositoryClass)
-            .toHashCode()
-        ;
+        HashCodeBuilder hash = new HashCodeBuilder()
+            .append(this.clazz);
+
+        String repositoryClass = this.repositoryClass;
+
+        // null != ""
+        if(repositoryClass == null) {
+            repositoryClass = "null";
+        }
+
+        hash.append(repositoryClass);
+
+        return hash.toHashCode();
     }
 
     @Override

src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/DoctrineMetadataFileStubIndex.java

@@ -54,7 +54,8 @@ public Map<String, DoctrineModelSerializable> map(@NotNull FileContent fileConte
                 if(first == null || first.length() == 0) {
                     continue;
                 }
-                map.put(first, new DoctrineModel(first).setRepositoryClass(pair.getSecond()));
+
+                map.put(first, new DoctrineModel(first, pair.getSecond()));
             }
 
             return map;

tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dict/DoctrineModelTest.java

@@ -0,0 +1,27 @@
+package fr.adrienbrault.idea.symfony2plugin.tests.doctrine.dict;
+
+import fr.adrienbrault.idea.symfony2plugin.doctrine.dict.DoctrineModel;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author Daniel Espendiller <daniel@espendiller.net>
+ */
+public class DoctrineModelTest extends Assert {
+    @Test
+    public void testObjectEqualsCheck() {
+        assertTrue(new DoctrineModel("foobar").equals(new DoctrineModel("foobar")));
+        assertEquals(new DoctrineModel("foobar").hashCode(), new DoctrineModel("foobar").hashCode());
+
+        assertFalse(new DoctrineModel("foobar").equals(new DoctrineModel("foobar", "foo")));
+        assertNotEquals(new DoctrineModel("foobar").hashCode(), new DoctrineModel("foobar", "foo").hashCode());
+
+        assertTrue(new DoctrineModel("foobar", "apple").equals(new DoctrineModel("foobar", "apple")));
+        assertEquals(new DoctrineModel("foobar", "apple").hashCode(), new DoctrineModel("foobar", "apple").hashCode());
+
+        assertFalse(new DoctrineModel("foobar", null).equals(new DoctrineModel("foobar", "")));
+        assertNotEquals(new DoctrineModel("foobar", null).hashCode(), new DoctrineModel("foobar", "").hashCode());
+        assertNotEquals(new DoctrineModel("foobar", "").hashCode(), new DoctrineModel("foobar", null).hashCode());
+        assertNotEquals(new DoctrineModel("foobar", "").hashCode(), new DoctrineModel("foobar").hashCode());
+    }
+}