Fix lookup entry types in enums (#5209)

* Fix lookup entry types in enums Make master work again!!! * fix checkstyle * fix checkstyle and fix type comparison to lower case * simplify remove generics
JabRef · Aug 24, 2019 · b00fc22 · b00fc22
1 parent 4477a13
commit b00fc22
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 15 deletions.
diff --git a/src/main/java/org/jabref/model/entry/types/EntryType.java b/src/main/java/org/jabref/model/entry/types/EntryType.java
@@ -10,4 +10,5 @@ public interface EntryType {
     String getName();
 
     String getDisplayName();
+
 }
diff --git a/src/main/java/org/jabref/model/entry/types/EntryTypeFactory.java b/src/main/java/org/jabref/model/entry/types/EntryTypeFactory.java
@@ -1,7 +1,12 @@
 package org.jabref.model.entry.types;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+
 import org.jabref.model.entry.BibEntryType;
-import org.jabref.model.util.OptionalUtil;
 
 public class EntryTypeFactory {
 
@@ -22,10 +27,10 @@ public static boolean isEqualNameAndFieldBased(BibEntryType type1, BibEntryType
         } else if ((type1 == null) || (type2 == null)) {
             return false;
         } else {
-            return type1.getType().equals(type2.getType())
-                    && type1.getRequiredFields().equals(type2.getRequiredFields())
-                    && type1.getOptionalFields().equals(type2.getOptionalFields())
-                    && type1.getSecondaryOptionalFields().equals(type2.getSecondaryOptionalFields());
+            return Objects.equals(type1.getType(), type2.getType())
+                   && Objects.equals(type1.getRequiredFields(), type2.getRequiredFields())
+                   && Objects.equals(type1.getOptionalFields(), type2.getOptionalFields())
+                   && Objects.equals(type1.getSecondaryOptionalFields(), type2.getSecondaryOptionalFields());
         }
     }
 
@@ -42,6 +47,10 @@ private static boolean isBiblatex(EntryType type) {
     }
 
     public static EntryType parse(String typeName) {
-        return OptionalUtil.orElse(StandardEntryType.fromName(typeName), new UnknownEntryType(typeName));
+
+        List<EntryType> types = new ArrayList<>(Arrays.<EntryType> asList(StandardEntryType.values()));
+        types.addAll(Arrays.<EntryType> asList(IEEETranEntryType.values()));
+
+        return types.stream().filter(type -> type.getName().equals(typeName.toLowerCase(Locale.ENGLISH))).findFirst().orElse(new UnknownEntryType(typeName));
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/types/StandardEntryType.java b/src/main/java/org/jabref/model/entry/types/StandardEntryType.java
@@ -1,8 +1,6 @@
 package org.jabref.model.entry.types;
 
-import java.util.Arrays;
 import java.util.Locale;
-import java.util.Optional;
 
 public enum StandardEntryType implements EntryType {
     // BibTeX
@@ -44,12 +42,6 @@ public enum StandardEntryType implements EntryType {
         this.displayName = displayName;
     }
 
-    public static Optional<StandardEntryType> fromName(String name) {
-        return Arrays.stream(StandardEntryType.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
-    }
-
     @Override
     public String getName() {
         return displayName.toLowerCase(Locale.ENGLISH);

diff --git a/src/main/java/org/jabref/model/entry/types/UnknownEntryType.java b/src/main/java/org/jabref/model/entry/types/UnknownEntryType.java
@@ -34,7 +34,7 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if ((o == null) || (getClass() != o.getClass())) {
             return false;
         }
         UnknownEntryType that = (UnknownEntryType) o;

diff --git a/src/test/java/org/jabref/model/entry/EntryTypeFactoryTest.java b/src/test/java/org/jabref/model/entry/EntryTypeFactoryTest.java
@@ -0,0 +1,18 @@
+package org.jabref.model.entry;
+
+import org.jabref.model.entry.types.EntryType;
+import org.jabref.model.entry.types.EntryTypeFactory;
+import org.jabref.model.entry.types.IEEETranEntryType;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class EntryTypeFactoryTest {
+
+    @Test
+    public void testParseEntryTypePatent() {
+        EntryType patent = IEEETranEntryType.Patent;
+        assertEquals(patent, EntryTypeFactory.parse("patent"));
+    }
+}