Polishing.

neo4j · Apr 21, 2020 · f8f8200 · f8f8200
1 parent 4fdda0b
commit f8f8200
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/core/src/main/java/org/neo4j/ogm/autoindex/AutoIndex.java b/core/src/main/java/org/neo4j/ogm/autoindex/AutoIndex.java
@@ -26,6 +26,7 @@
 import java.util.Arrays;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -348,24 +349,16 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-
         AutoIndex autoIndex = (AutoIndex) o;
-
-        // Probably incorrect - comparing Object[] arrays with Arrays.equals
-        if (!Arrays.equals(properties, autoIndex.properties)) {
-            return false;
-        }
-        if (!owningType.equals(autoIndex.owningType)) {
-            return false;
-        }
-        return type == autoIndex.type;
+        return Arrays.equals(properties, autoIndex.properties) &&
+            owningType.equals(autoIndex.owningType) &&
+            type == autoIndex.type;
     }
 
     @Override
     public int hashCode() {
-        int result = Arrays.hashCode(properties);
-        result = 31 * result + owningType.hashCode();
-        result = 31 * result + type.hashCode();
+        int result = Objects.hash(owningType, type);
+        result = 31 * result + Arrays.hashCode(properties);
         return result;
     }
 

diff --git a/core/src/main/java/org/neo4j/ogm/metadata/ClassInfo.java b/core/src/main/java/org/neo4j/ogm/metadata/ClassInfo.java
@@ -806,7 +806,7 @@ Class<?> getTypeParameterDescriptorForRelationship(String relationshipType, Dire
      * @return If this class contains any fields/properties annotated with @Index.
      */
     public boolean containsIndexes() {
-        return !getIndexFields().isEmpty() || !getCompositeIndexes().isEmpty();
+        return !(getIndexFields().isEmpty() && getCompositeIndexes().isEmpty());
     }
 
     /**

diff --git a/...tegration-tests/src/test/java/org/neo4j/ogm/metadata/reflect/EntityAccessManagerTest.java b/...tegration-tests/src/test/java/org/neo4j/ogm/metadata/reflect/EntityAccessManagerTest.java
@@ -215,7 +215,7 @@ public void shouldPreferMethodBasedAccessToFieldAccessWhenReadingFromObjectsWith
         ClassInfo classInfo = this.domainInfo.getClass(DummyDomainObject.class.getName());
 
         DummyDomainObject domainObject = new DummyDomainObject();
-        domainObject.nonAnnotatedTestProperty = new Double(30.16);
+        domainObject.nonAnnotatedTestProperty = 30.16;
 
         FieldInfo objectAccess = classInfo.getFieldInfo("nonAnnotatedTestProperty");
         assertThat(objectAccess).as("The resultant object accessor shouldn't be null").isNotNull();