[NCL-5611] Fixing MultiValuedMapProtobufWrapper various issues

project-ncl · Aug 17, 2021 · 550091e · 550091e
1 parent 7ee24b5
commit 550091e
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/core/src/main/java/org/jboss/pnc/build/finder/protobuf/MultiValuedMapProtobufWrapper.java b/core/src/main/java/org/jboss/pnc/build/finder/protobuf/MultiValuedMapProtobufWrapper.java
@@ -16,7 +16,6 @@
 package org.jboss.pnc.build.finder.protobuf;
 
 import java.util.Collection;
-import java.util.List;
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections4.MultiValuedMap;
@@ -32,7 +31,7 @@
  * @param <V> The value type
  */
 public class MultiValuedMapProtobufWrapper<K, V> extends HashSetValuedHashMap<K, V> {
-    private static final long serialVersionUID = 20211111L;
+    private static final long serialVersionUID = -4929571021288563518L;
 
     /**
      * Constructor wrapping around the MultiValuedMap
@@ -49,13 +48,13 @@ public MultiValuedMapProtobufWrapper(MultiValuedMap<K, V> map) {
      * @param entries
      */
     @ProtoFactory
-    MultiValuedMapProtobufWrapper(List<MultiValuedMapProtobufEntry<K, V>> entries) {
+    MultiValuedMapProtobufWrapper(Collection<MultiValuedMapProtobufEntry<K, V>> entries) {
         super();
         entries.forEach(a -> this.putAll(a.key, a.values));
     }
 
     @ProtoField(number = 1)
-    List<MultiValuedMapProtobufEntry<K, V>> getEntries() {
+    Collection<MultiValuedMapProtobufEntry<K, V>> getEntries() {
         return this.asMap()
                 .entrySet()
                 .stream()
@@ -76,12 +75,12 @@ List<MultiValuedMapProtobufEntry<K, V>> getEntries() {
      * @see ProtobufSerializer
      */
     static class MultiValuedMapProtobufEntry<K, V> {
-
         private K key;
         private Collection<V> values;
 
         // Required by Protostream
         MultiValuedMapProtobufEntry() {
+
         }
 
         MultiValuedMapProtobufEntry(K key, Collection<V> values) {
@@ -91,7 +90,7 @@ static class MultiValuedMapProtobufEntry<K, V> {
 
         @SuppressWarnings("unchecked")
         @ProtoFactory
-        MultiValuedMapProtobufEntry(WrappedMessage key, List<WrappedMessage> values) {
+        MultiValuedMapProtobufEntry(WrappedMessage key, Collection<WrappedMessage> values) {
             this.key = (K) key.getValue();
             this.values = values.stream().map(a -> (V) a.getValue()).collect(Collectors.toList());
         }
@@ -102,7 +101,7 @@ WrappedMessage getKey() {
         }
 
         @ProtoField(number = 2)
-        List<WrappedMessage> getValues() {
+        Collection<WrappedMessage> getValues() {
             return this.values.stream().map(WrappedMessage::new).collect(Collectors.toList());
         }
     }