Use a collection that can hold null values for groupByAttributes

Author: alb3rtino

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

@@ -4,6 +4,7 @@
 import static java.util.stream.Collectors.reducing;
 import static java.util.stream.Collectors.toList;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
@@ -18,7 +19,7 @@ public abstract class DRConverterBase implements Converter<COUNTERDatabaseReport
 
   protected Function<COUNTERDatabaseUsage, List<Object>> getGroupByAttributes() {
     return u ->
-        List.of(
+        Arrays.asList(
             u.getDatabase(), u.getPlatform(), u.getItemID(), u.getPublisher(), u.getPublisherID());
   }
 

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

@@ -4,6 +4,7 @@
 import static java.util.stream.Collectors.reducing;
 import static java.util.stream.Collectors.toList;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
@@ -18,7 +19,8 @@ public abstract class TRConverterBase implements Converter<COUNTERTitleReport> {
 
   protected Function<COUNTERTitleUsage, List<Object>> getGroupByAttributes() {
     return u ->
-        List.of(u.getTitle(), u.getItemID(), u.getPlatform(), u.getPublisher(), u.getPublisherID());
+        Arrays.asList(
+            u.getTitle(), u.getItemID(), u.getPlatform(), u.getPublisher(), u.getPublisherID());
   }
 
   protected List<COUNTERTitleUsage> createNewReportItems(

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

@@ -2,6 +2,7 @@
 
 import static java.util.stream.Collectors.toList;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -63,7 +64,7 @@ public class TRJ3Converter extends TRConverterBase {
   @Override
   public Function<COUNTERTitleUsage, List<Object>> getGroupByAttributes() {
     return u ->
-        List.of(
+        Arrays.asList(
             u.getTitle(),
             u.getItemID(),
             u.getPlatform(),

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

@@ -2,6 +2,7 @@
 
 import static java.util.stream.Collectors.toList;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -63,7 +64,7 @@ public class TRJ4Converter extends TRConverterBase {
   @Override
   public Function<COUNTERTitleUsage, List<Object>> getGroupByAttributes() {
     return u ->
-        List.of(
+        Arrays.asList(
             u.getTitle(),
             u.getItemID(),
             u.getPlatform(),