From 7690b542ab104b502113247c1d9d753a07f9bec0 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Sun, 28 Jul 2019 12:27:29 +0200
Subject: [PATCH] Add type parameters where possible

---
 .../key/selection/keyring/impl/PartialUserId.java           | 4 ++--
 .../src/main/java/org/pgpainless/util/BCUtil.java           | 6 +++---
 .../src/main/java/org/pgpainless/util/MultiMap.java         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/PartialUserId.java b/pgpainless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/PartialUserId.java
index 9e67a8dd..2efdcd98 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/PartialUserId.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/PartialUserId.java
@@ -43,8 +43,8 @@ public class PartialUserId {
 
         @Override
         public boolean accept(String identifier, @Nonnull PGPSecretKey key) {
-            for (Iterator userIds = key.getUserIDs(); userIds.hasNext(); ) {
-                String userId = (String) userIds.next();
+            for (Iterator<String> userIds = key.getUserIDs(); userIds.hasNext(); ) {
+                String userId = userIds.next();
                 if (userId.contains(identifier)) {
                     return true;
                 }
diff --git a/pgpainless-core/src/main/java/org/pgpainless/util/BCUtil.java b/pgpainless-core/src/main/java/org/pgpainless/util/BCUtil.java
index 65558e3f..44359fea 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/util/BCUtil.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/util/BCUtil.java
@@ -216,9 +216,9 @@ public class BCUtil {
     }
 
     public static PGPPublicKey getMasterKeyFrom(@Nonnull PGPKeyRing ring) {
-        Iterator it = ring.getPublicKeys();
+        Iterator<PGPPublicKey> it = ring.getPublicKeys();
         while (it.hasNext()) {
-            PGPPublicKey k = (PGPPublicKey) it.next();
+            PGPPublicKey k = it.next();
             if (k.isMasterKey()) {
                 // There can only be one master key, so we can immediately return
                 return k;
@@ -235,7 +235,7 @@ public class BCUtil {
 
             boolean signingKey = false;
 
-            Iterator sit = k.getSignatures();
+            Iterator<?> sit = k.getSignatures();
             while (sit.hasNext()) {
                 Object n = sit.next();
                 if (!(n instanceof PGPSignature)) {
diff --git a/pgpainless-core/src/main/java/org/pgpainless/util/MultiMap.java b/pgpainless-core/src/main/java/org/pgpainless/util/MultiMap.java
index 8cdc8e5e..d9b7c584 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/util/MultiMap.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/util/MultiMap.java
@@ -125,7 +125,7 @@ public class MultiMap<K, V> {
             return true;
         }
 
-        return map.equals(((MultiMap) o).map);
+        return map.equals(((MultiMap<?, ?>) o).map);
     }
 
     @Override