Flip equals statements in converter implementations to prevent NPE

Author: alb3rtino

mod-erm-usage-counter50/src/main/java/org/olf/erm/usage/counter50/converter/dr/DRD1Converter.java

@@ -28,7 +28,7 @@ public class DRD1Converter extends DRConverterBase {
 
   private static final Predicate<COUNTERDatabaseUsage> filter =
       u ->
-          u.getAccessMethod().equals(AccessMethodEnum.REGULAR)
+          AccessMethodEnum.REGULAR.equals(u.getAccessMethod())
               && u.getPerformance().stream()
                   .anyMatch(p -> p.getInstance().stream().anyMatch(hasMetricType));
 

mod-erm-usage-counter50/src/main/java/org/olf/erm/usage/counter50/converter/tr/TRB1Converter.java

@@ -26,9 +26,9 @@ public class TRB1Converter extends TRConverterBase {
 
   private static final Predicate<COUNTERTitleUsage> filter =
       u ->
-          u.getDataType().equals(DataTypeEnum.BOOK)
-              && u.getAccessMethod().equals(AccessMethodEnum.REGULAR)
-              && u.getAccessType().equals(AccessTypeEnum.CONTROLLED)
+          DataTypeEnum.BOOK.equals(u.getDataType())
+              && AccessMethodEnum.REGULAR.equals(u.getAccessMethod())
+              && AccessTypeEnum.CONTROLLED.equals(u.getAccessType())
               && u.getPerformance().stream()
                   .anyMatch(p -> p.getInstance().stream().anyMatch(hasMetricType));
 

mod-erm-usage-counter50/src/main/java/org/olf/erm/usage/counter50/converter/tr/TRB3Converter.java

@@ -31,8 +31,8 @@ public class TRB3Converter extends TRConverterBase {
 
   private static final Predicate<COUNTERTitleUsage> filter =
       u ->
-          u.getDataType().equals(DataTypeEnum.BOOK)
-              && u.getAccessMethod().equals(AccessMethodEnum.REGULAR)
+          DataTypeEnum.BOOK.equals(u.getDataType())
+              && AccessMethodEnum.REGULAR.equals(u.getAccessMethod())
               && u.getPerformance().stream()
                   .anyMatch(p -> p.getInstance().stream().anyMatch(hasMetricType));
 

mod-erm-usage-counter50/src/main/java/org/olf/erm/usage/counter50/converter/tr/TRJ1Converter.java

@@ -26,9 +26,9 @@ public class TRJ1Converter extends TRConverterBase {
 
   private static final Predicate<COUNTERTitleUsage> filter =
       u ->
-          u.getDataType().equals(DataTypeEnum.JOURNAL)
-              && u.getAccessMethod().equals(AccessMethodEnum.REGULAR)
-              && u.getAccessType().equals(AccessTypeEnum.CONTROLLED)
+          DataTypeEnum.JOURNAL.equals(u.getDataType())
+              && AccessMethodEnum.REGULAR.equals(u.getAccessMethod())
+              && AccessTypeEnum.CONTROLLED.equals(u.getAccessType())
               && u.getPerformance().stream()
                   .anyMatch(p -> p.getInstance().stream().anyMatch(hasMetricType));
 

mod-erm-usage-counter50/src/main/java/org/olf/erm/usage/counter50/converter/tr/TRJ3Converter.java

@@ -30,8 +30,8 @@ public class TRJ3Converter extends TRConverterBase {
 
   private static final Predicate<COUNTERTitleUsage> filter =
       u ->
-          u.getDataType().equals(DataTypeEnum.JOURNAL)
-              && u.getAccessMethod().equals(AccessMethodEnum.REGULAR)
+          DataTypeEnum.JOURNAL.equals(u.getDataType())
+              && AccessMethodEnum.REGULAR.equals(u.getAccessMethod())
               && u.getPerformance().stream()
                   .anyMatch(p -> p.getInstance().stream().anyMatch(hasMetricType));
 

mod-erm-usage-counter50/src/main/java/org/olf/erm/usage/counter50/converter/tr/TRJ4Converter.java

@@ -27,9 +27,9 @@ public class TRJ4Converter extends TRConverterBase {
 
   private static final Predicate<COUNTERTitleUsage> filter =
       u ->
-          u.getDataType().equals(DataTypeEnum.JOURNAL)
-              && u.getAccessMethod().equals(AccessMethodEnum.REGULAR)
-              && u.getAccessType().equals(AccessTypeEnum.CONTROLLED)
+          DataTypeEnum.JOURNAL.equals(u.getDataType())
+              && AccessMethodEnum.REGULAR.equals(u.getAccessMethod())
+              && AccessTypeEnum.CONTROLLED.equals(u.getAccessType())
               && u.getPerformance().stream()
                   .anyMatch(p -> p.getInstance().stream().anyMatch(hasMetricType));