Move selection strategies to util package and implement UserIdSelectionStrategy

pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionBuilder.java

@@ -43,14 +43,14 @@ import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
 import org.pgpainless.exception.SecretKeyNotFoundException;
 import org.pgpainless.key.OpenPgpV4Fingerprint;
 import org.pgpainless.key.protection.SecretKeyRingProtector;
-import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
-import org.pgpainless.key.selection.key.SecretKeySelectionStrategy;
-import org.pgpainless.key.selection.key.impl.EncryptionKeySelectionStrategy;
-import org.pgpainless.key.selection.key.impl.NoRevocation;
-import org.pgpainless.key.selection.key.impl.SignatureKeySelectionStrategy;
-import org.pgpainless.key.selection.key.util.And;
-import org.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy;
-import org.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy;
+import org.pgpainless.util.selection.key.PublicKeySelectionStrategy;
+import org.pgpainless.util.selection.key.SecretKeySelectionStrategy;
+import org.pgpainless.util.selection.key.impl.EncryptionKeySelectionStrategy;
+import org.pgpainless.util.selection.key.impl.NoRevocation;
+import org.pgpainless.util.selection.key.impl.SignatureKeySelectionStrategy;
+import org.pgpainless.util.selection.key.impl.And;
+import org.pgpainless.util.selection.keyring.PublicKeyRingSelectionStrategy;
+import org.pgpainless.util.selection.keyring.SecretKeyRingSelectionStrategy;
 import org.pgpainless.util.MultiMap;
 import org.pgpainless.util.Passphrase;
 

pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionBuilderInterface.java

@@ -33,8 +33,8 @@ import org.pgpainless.decryption_verification.OpenPgpMetadata;
 import org.pgpainless.exception.SecretKeyNotFoundException;
 import org.pgpainless.key.protection.SecretKeyRingProtector;
 import org.pgpainless.key.protection.UnprotectedKeysProtector;
-import org.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy;
-import org.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy;
+import org.pgpainless.util.selection.keyring.PublicKeyRingSelectionStrategy;
+import org.pgpainless.util.selection.keyring.SecretKeyRingSelectionStrategy;
 import org.pgpainless.util.MultiMap;
 import org.pgpainless.util.Passphrase;
 
@@ -218,7 +218,7 @@ public interface EncryptionBuilderInterface {
         DocumentType signWith(@Nonnull SecretKeyRingProtector decryptor, @Nonnull PGPSecretKeyRing... keyRings);
 
         /**
-         * Pass in a map of secret keys for signing, as well as a {@link org.pgpainless.key.selection.key.SecretKeySelectionStrategy}
+         * Pass in a map of secret keys for signing, as well as a {@link org.pgpainless.util.selection.key.SecretKeySelectionStrategy}
          * that is used to determine suitable secret keys.
          * If the keys are locked by a password, the provided {@link SecretKeyRingProtector} will be used to unlock the keys.
          *

pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java

@@ -17,6 +17,7 @@ package org.pgpainless.key.info;
 
 import static org.pgpainless.key.util.SignatureUtils.getLatestValidSignature;
 import static org.pgpainless.key.util.SignatureUtils.sortByCreationTimeAscending;
+import static org.pgpainless.util.CollectionUtils.iteratorToList;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -376,13 +377,4 @@ public class KeyRingInfo {
         }
         return self.getCreationTime().after(binding.getCreationTime()) ? self : binding;
     }
-
-    private static <I> List<I> iteratorToList(Iterator<I> iterator) {
-        List<I> items = new ArrayList<>();
-        while (iterator.hasNext()) {
-            Object o = iterator.next();
-            items.add((I) o);
-        }
-        return items;
-    }
 }

pgpainless-core/src/main/java/org/pgpainless/util/BCUtil.java

@@ -40,10 +40,10 @@ import org.bouncycastle.openpgp.PGPSignatureSubpacketVector;
 import org.bouncycastle.openpgp.PGPUtil;
 import org.bouncycastle.util.io.Streams;
 import org.pgpainless.algorithm.KeyFlag;
-import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
-import org.pgpainless.key.selection.key.impl.NoRevocation;
-import org.pgpainless.key.selection.key.impl.KeyBelongsToKeyRing;
-import org.pgpainless.key.selection.key.util.And;
+import org.pgpainless.util.selection.key.PublicKeySelectionStrategy;
+import org.pgpainless.util.selection.key.impl.NoRevocation;
+import org.pgpainless.util.selection.key.impl.KeyBelongsToKeyRing;
+import org.pgpainless.util.selection.key.impl.And;
 
 public class BCUtil {
 

pgpainless-core/src/main/java/org/pgpainless/util/CollectionUtils.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021 Paul Schaub.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.pgpainless.util;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class CollectionUtils {
+
+    public static <I> List<I> iteratorToList(Iterator<I> iterator) {
+        List<I> items = new ArrayList<>();
+        while (iterator.hasNext()) {
+            Object o = iterator.next();
+            items.add((I) o);
+        }
+        return items;
+    }
+}

pgpainless-core/src/main/java/org/pgpainless/util/selection/key/KeySelectionStrategy.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.key;
+package org.pgpainless.util.selection.key;
 
 import java.util.Set;
 import javax.annotation.Nonnull;

pgpainless-core/src/main/java/org/pgpainless/util/selection/key/PublicKeySelectionStrategy.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.key;
+package org.pgpainless.util.selection.key;
 
 import java.util.HashSet;
 import java.util.Iterator;

pgpainless-core/src/main/java/org/pgpainless/util/selection/key/SecretKeySelectionStrategy.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.key;
+package org.pgpainless.util.selection.key;
 
 import java.util.HashSet;
 import java.util.Iterator;

pgpainless-core/src/main/java/org/pgpainless/util/selection/key/impl/And.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.key.util;
+package org.pgpainless.util.selection.key.impl;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -22,8 +22,8 @@ import javax.annotation.Nonnull;
 
 import org.bouncycastle.openpgp.PGPPublicKey;
 import org.bouncycastle.openpgp.PGPSecretKey;
-import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
-import org.pgpainless.key.selection.key.SecretKeySelectionStrategy;
+import org.pgpainless.util.selection.key.PublicKeySelectionStrategy;
+import org.pgpainless.util.selection.key.SecretKeySelectionStrategy;
 
 public class And {
 

pgpainless-core/src/main/java/org/pgpainless/util/selection/key/impl/EncryptionKeySelectionStrategy.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.key.impl;
+package org.pgpainless.util.selection.key.impl;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -22,7 +22,7 @@ import javax.annotation.Nonnull;
 import org.bouncycastle.openpgp.PGPPublicKey;
 import org.pgpainless.algorithm.KeyFlag;
 import org.pgpainless.algorithm.PublicKeyAlgorithm;
-import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
+import org.pgpainless.util.selection.key.PublicKeySelectionStrategy;
 
 /**
  * Key Selection Strategy that only accepts {@link PGPPublicKey}s which are capable of encryption.

pgpainless-core/src/main/java/org/pgpainless/util/selection/key/impl/HasAllKeyFlagSelectionStrategy.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.key.impl;
+package org.pgpainless.util.selection.key.impl;
 
 import java.util.Iterator;
 
@@ -21,8 +21,8 @@ import org.bouncycastle.openpgp.PGPPublicKey;
 import org.bouncycastle.openpgp.PGPSecretKey;
 import org.bouncycastle.openpgp.PGPSignature;
 import org.pgpainless.algorithm.KeyFlag;
-import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
-import org.pgpainless.key.selection.key.SecretKeySelectionStrategy;
+import org.pgpainless.util.selection.key.PublicKeySelectionStrategy;
+import org.pgpainless.util.selection.key.SecretKeySelectionStrategy;
 
 /**
  * Selection Strategy that accepts a key if it carries all of the specified key flags.

pgpainless-core/src/main/java/org/pgpainless/util/selection/key/impl/HasAnyKeyFlagSelectionStrategy.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.key.impl;
+package org.pgpainless.util.selection.key.impl;
 
 import java.util.Iterator;
 
@@ -21,8 +21,8 @@ import org.bouncycastle.openpgp.PGPPublicKey;
 import org.bouncycastle.openpgp.PGPSecretKey;
 import org.bouncycastle.openpgp.PGPSignature;
 import org.pgpainless.algorithm.KeyFlag;
-import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
-import org.pgpainless.key.selection.key.SecretKeySelectionStrategy;
+import org.pgpainless.util.selection.key.PublicKeySelectionStrategy;
+import org.pgpainless.util.selection.key.SecretKeySelectionStrategy;
 
 /**
  * Selection Strategies that accept a key if it carries at least one of the given key flags.

pgpainless-core/src/main/java/org/pgpainless/util/selection/key/impl/KeyBelongsToKeyRing.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.key.impl;
+package org.pgpainless.util.selection.key.impl;
 
 import javax.annotation.Nonnull;
 import java.util.Arrays;
@@ -25,7 +25,7 @@ import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.openpgp.PGPPublicKey;
 import org.bouncycastle.openpgp.PGPSignature;
 import org.pgpainless.implementation.ImplementationFactory;
-import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
+import org.pgpainless.util.selection.key.PublicKeySelectionStrategy;
 
 public class KeyBelongsToKeyRing {
 

pgpainless-core/src/main/java/org/pgpainless/util/selection/key/impl/NoRevocation.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.key.impl;
+package org.pgpainless.util.selection.key.impl;
 
 import javax.annotation.Nonnull;
 
 import org.bouncycastle.openpgp.PGPPublicKey;
 import org.bouncycastle.openpgp.PGPSecretKey;
-import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
-import org.pgpainless.key.selection.key.SecretKeySelectionStrategy;
+import org.pgpainless.util.selection.key.PublicKeySelectionStrategy;
+import org.pgpainless.util.selection.key.SecretKeySelectionStrategy;
 
 /**
  * Key Selection Strategies that do accept only keys, which have no revocation.

pgpainless-core/src/main/java/org/pgpainless/util/selection/key/impl/Or.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.key.util;
+package org.pgpainless.util.selection.key.impl;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -22,8 +22,8 @@ import javax.annotation.Nonnull;
 
 import org.bouncycastle.openpgp.PGPPublicKey;
 import org.bouncycastle.openpgp.PGPSecretKey;
-import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
-import org.pgpainless.key.selection.key.SecretKeySelectionStrategy;
+import org.pgpainless.util.selection.key.PublicKeySelectionStrategy;
+import org.pgpainless.util.selection.key.SecretKeySelectionStrategy;
 
 public class Or {
 

pgpainless-core/src/main/java/org/pgpainless/util/selection/key/impl/SignatureKeySelectionStrategy.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.key.impl;
+package org.pgpainless.util.selection.key.impl;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -22,7 +22,7 @@ import javax.annotation.Nonnull;
 import org.bouncycastle.openpgp.PGPSecretKey;
 import org.pgpainless.algorithm.KeyFlag;
 import org.pgpainless.algorithm.PublicKeyAlgorithm;
-import org.pgpainless.key.selection.key.SecretKeySelectionStrategy;
+import org.pgpainless.util.selection.key.SecretKeySelectionStrategy;
 
 /**
  * Key Selection Strategy that only accepts {@link PGPSecretKey}s which are capable of signing.

pgpainless-core/src/main/java/org/pgpainless/util/selection/key/impl/package-info.java

@@ -16,4 +16,4 @@
 /**
  * Implementations of Key Selection Strategies.
  */
-package org.pgpainless.key.selection.key.impl;
+package org.pgpainless.util.selection.key.impl;

pgpainless-core/src/main/java/org/pgpainless/util/selection/key/package-info.java

@@ -16,4 +16,4 @@
 /**
  * Different Key Selection Strategies.
  */
-package org.pgpainless.key.selection.key;
+package org.pgpainless.util.selection.key;

pgpainless-core/src/main/java/org/pgpainless/util/selection/keyring/KeyRingSelectionStrategy.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.keyring;
+package org.pgpainless.util.selection.keyring;
 
 import java.util.Set;
 

pgpainless-core/src/main/java/org/pgpainless/util/selection/keyring/PublicKeyRingSelectionStrategy.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.keyring;
+package org.pgpainless.util.selection.keyring;
 
 import javax.annotation.Nonnull;
 import java.util.HashSet;

pgpainless-core/src/main/java/org/pgpainless/util/selection/keyring/SecretKeyRingSelectionStrategy.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.keyring;
+package org.pgpainless.util.selection.keyring;
 
 import javax.annotation.Nonnull;
 import java.util.HashSet;

pgpainless-core/src/main/java/org/pgpainless/util/selection/keyring/impl/Email.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.keyring.impl;
+package org.pgpainless.util.selection.keyring.impl;
 
 public class Email {
 

pgpainless-core/src/main/java/org/pgpainless/util/selection/keyring/impl/ExactUserId.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.keyring.impl;
+package org.pgpainless.util.selection.keyring.impl;
 
 import java.util.Iterator;
 
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
-import org.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy;
-import org.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy;
+import org.pgpainless.util.selection.keyring.PublicKeyRingSelectionStrategy;
+import org.pgpainless.util.selection.keyring.SecretKeyRingSelectionStrategy;
 
 public class ExactUserId {
 

pgpainless-core/src/main/java/org/pgpainless/util/selection/keyring/impl/PartialUserId.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.keyring.impl;
+package org.pgpainless.util.selection.keyring.impl;
 
 import javax.annotation.Nonnull;
 import java.util.Iterator;
 
 import org.bouncycastle.openpgp.PGPPublicKey;
 import org.bouncycastle.openpgp.PGPSecretKey;
-import org.pgpainless.key.selection.key.PublicKeySelectionStrategy;
-import org.pgpainless.key.selection.key.SecretKeySelectionStrategy;
+import org.pgpainless.util.selection.key.PublicKeySelectionStrategy;
+import org.pgpainless.util.selection.key.SecretKeySelectionStrategy;
 
 public class PartialUserId {
 

pgpainless-core/src/main/java/org/pgpainless/util/selection/keyring/impl/Whitelist.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.keyring.impl;
+package org.pgpainless.util.selection.keyring.impl;
 
 import java.util.Map;
 import java.util.Set;
 
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
-import org.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy;
-import org.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy;
+import org.pgpainless.util.selection.keyring.PublicKeyRingSelectionStrategy;
+import org.pgpainless.util.selection.keyring.SecretKeyRingSelectionStrategy;
 import org.pgpainless.util.MultiMap;
 
 public class Whitelist {

pgpainless-core/src/main/java/org/pgpainless/util/selection/keyring/impl/Wildcard.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.keyring.impl;
+package org.pgpainless.util.selection.keyring.impl;
 
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
-import org.pgpainless.key.selection.keyring.PublicKeyRingSelectionStrategy;
-import org.pgpainless.key.selection.keyring.SecretKeyRingSelectionStrategy;
+import org.pgpainless.util.selection.keyring.PublicKeyRingSelectionStrategy;
+import org.pgpainless.util.selection.keyring.SecretKeyRingSelectionStrategy;
 
 public class Wildcard {
 

pgpainless-core/src/main/java/org/pgpainless/util/selection/keyring/impl/XMPP.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.keyring.impl;
+package org.pgpainless.util.selection.keyring.impl;
 
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
 import org.bouncycastle.openpgp.PGPSecretKeyRing;

pgpainless-core/src/main/java/org/pgpainless/util/selection/keyring/impl/package-info.java

@@ -16,4 +16,4 @@
 /**
  * Implementations of Key Ring Selection Strategies.
  */
-package org.pgpainless.key.selection.keyring.impl;
+package org.pgpainless.util.selection.keyring.impl;

pgpainless-core/src/main/java/org/pgpainless/util/selection/keyring/package-info.java

@@ -16,4 +16,4 @@
 /**
  * Different Key Ring Selection Strategies.
  */
-package org.pgpainless.key.selection.keyring;
+package org.pgpainless.util.selection.keyring;

pgpainless-core/src/main/java/org/pgpainless/util/selection/userid/UserIdSelectionStrategy.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright 2021 Paul Schaub.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.pgpainless.util.selection.userid;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bouncycastle.openpgp.PGPKeyRing;
+import org.pgpainless.PGPainless;
+
+public abstract class UserIdSelectionStrategy {
+
+    protected abstract boolean accept(String userId);
+
+    public List<String> selectUserIds(PGPKeyRing keyRing) {
+        List<String> userIds = PGPainless.inspectKeyRing(keyRing).getValidUserIds();
+        return selectUserIds(userIds);
+    }
+
+    public List<String> selectUserIds(List<String> userIds) {
+        List<String> selected = new ArrayList<>();
+        for (String userId : userIds) {
+            if (accept(userId)) {
+                selected.add(userId);
+            }
+        }
+        return selected;
+    }
+
+    public String firstMatch(PGPKeyRing keyRing) {
+        return firstMatch(selectUserIds(keyRing));
+    }
+
+    public String firstMatch(List<String> userIds) {
+        for (String userId : userIds) {
+            if (accept(userId)) {
+                return userId;
+            }
+        }
+        return null;
+    }
+
+    public static UserIdSelectionStrategy containsSubstring(String query) {
+        return new UserIdSelectionStrategy() {
+            @Override
+            protected boolean accept(String userId) {
+                return userId.contains(query);
+            }
+        };
+    }
+
+    public static UserIdSelectionStrategy exactMatch(String query) {
+        return new UserIdSelectionStrategy() {
+            @Override
+            protected boolean accept(String userId) {
+                return userId.equals(query);
+            }
+        };
+    }
+
+    public static UserIdSelectionStrategy startsWith(String substring) {
+        return new UserIdSelectionStrategy() {
+            @Override
+            protected boolean accept(String userId) {
+                return userId.startsWith(substring);
+            }
+        };
+    }
+
+    public static UserIdSelectionStrategy containsEmailAddress(String email) {
+        return containsSubstring(email.matches("^<.+>$") ? email : '<' + email + '>');
+    }
+}

pgpainless-core/src/main/java/org/pgpainless/util/selection/userid/package-info.java

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 /**
- * Implementations of utility Key Selection Strategies.
+ * UserID selection strategies.
  */
-package org.pgpainless.key.selection.key.util;
+package org.pgpainless.util.selection.userid;

pgpainless-core/src/test/java/org/pgpainless/util/selection/key/AndOrSelectionStrategyTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.key;
+package org.pgpainless.util.selection.key;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -28,9 +28,9 @@ import org.bouncycastle.openpgp.PGPSecretKeyRing;
 import org.junit.jupiter.api.Test;
 import org.pgpainless.algorithm.KeyFlag;
 import org.pgpainless.key.TestKeys;
-import org.pgpainless.key.selection.key.impl.EncryptionKeySelectionStrategy;
-import org.pgpainless.key.selection.key.impl.HasAnyKeyFlagSelectionStrategy;
-import org.pgpainless.key.selection.key.util.Or;
+import org.pgpainless.util.selection.key.impl.EncryptionKeySelectionStrategy;
+import org.pgpainless.util.selection.key.impl.HasAnyKeyFlagSelectionStrategy;
+import org.pgpainless.util.selection.key.impl.Or;
 
 public class AndOrSelectionStrategyTest {
 

pgpainless-core/src/test/java/org/pgpainless/util/selection/key/KeyBelongsToKeyRingTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.key;
+package org.pgpainless.util.selection.key;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -29,7 +29,7 @@ import org.bouncycastle.openpgp.PGPSecretKeyRing;
 import org.junit.jupiter.api.Test;
 import org.pgpainless.PGPainless;
 import org.pgpainless.key.TestKeys;
-import org.pgpainless.key.selection.key.impl.KeyBelongsToKeyRing;
+import org.pgpainless.util.selection.key.impl.KeyBelongsToKeyRing;
 
 public class KeyBelongsToKeyRingTest {
 

pgpainless-core/src/test/java/org/pgpainless/util/selection/key/KeyFlagBasedSelectionStrategyTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.key;
+package org.pgpainless.util.selection.key;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -39,8 +39,8 @@ import org.pgpainless.key.generation.type.KeyType;
 import org.pgpainless.key.generation.type.ecc.EllipticCurve;
 import org.pgpainless.key.generation.type.eddsa.EdDSACurve;
 import org.pgpainless.key.generation.type.xdh.XDHCurve;
-import org.pgpainless.key.selection.key.impl.HasAllKeyFlagSelectionStrategy;
-import org.pgpainless.key.selection.key.impl.HasAnyKeyFlagSelectionStrategy;
+import org.pgpainless.util.selection.key.impl.HasAllKeyFlagSelectionStrategy;
+import org.pgpainless.util.selection.key.impl.HasAnyKeyFlagSelectionStrategy;
 import org.pgpainless.key.util.KeyRingUtils;
 
 public class KeyFlagBasedSelectionStrategyTest {

pgpainless-core/src/test/java/org/pgpainless/util/selection/keyring/EmailKeyRingSelectionStrategyTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.keyring;
+package org.pgpainless.util.selection.keyring;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -25,7 +25,7 @@ import org.bouncycastle.openpgp.PGPPublicKey;
 import org.bouncycastle.openpgp.PGPSecretKey;
 import org.junit.jupiter.api.Test;
 import org.pgpainless.key.TestKeys;
-import org.pgpainless.key.selection.keyring.impl.Email;
+import org.pgpainless.util.selection.keyring.impl.Email;
 
 public class EmailKeyRingSelectionStrategyTest {
 

pgpainless-core/src/test/java/org/pgpainless/util/selection/keyring/KeyRingsFromCollectionTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.keyring;
+package org.pgpainless.util.selection.keyring;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -30,7 +30,7 @@ import org.bouncycastle.openpgp.PGPSecretKeyRing;
 import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
 import org.junit.jupiter.api.Test;
 import org.pgpainless.key.TestKeys;
-import org.pgpainless.key.selection.keyring.impl.ExactUserId;
+import org.pgpainless.util.selection.keyring.impl.ExactUserId;
 import org.pgpainless.util.MultiMap;
 
 public class KeyRingsFromCollectionTest {

pgpainless-core/src/test/java/org/pgpainless/util/selection/keyring/WhitelistKeyRingSelectionStrategyTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.keyring;
+package org.pgpainless.util.selection.keyring;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -29,7 +29,7 @@ import org.bouncycastle.openpgp.PGPPublicKeyRing;
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
 import org.junit.jupiter.api.Test;
 import org.pgpainless.key.TestKeys;
-import org.pgpainless.key.selection.keyring.impl.Whitelist;
+import org.pgpainless.util.selection.keyring.impl.Whitelist;
 
 public class WhitelistKeyRingSelectionStrategyTest {
 

pgpainless-core/src/test/java/org/pgpainless/util/selection/keyring/WildcardKeyRingSelectionStrategyTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.keyring;
+package org.pgpainless.util.selection.keyring;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -24,7 +24,7 @@ import org.bouncycastle.openpgp.PGPPublicKeyRing;
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
 import org.junit.jupiter.api.Test;
 import org.pgpainless.key.TestKeys;
-import org.pgpainless.key.selection.keyring.impl.Wildcard;
+import org.pgpainless.util.selection.keyring.impl.Wildcard;
 
 public class WildcardKeyRingSelectionStrategyTest {
 

pgpainless-core/src/test/java/org/pgpainless/util/selection/keyring/XmppKeyRingSelectionStrategyTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.selection.keyring;
+package org.pgpainless.util.selection.keyring;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -25,7 +25,7 @@ import org.bouncycastle.openpgp.PGPPublicKeyRing;
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
 import org.junit.jupiter.api.Test;
 import org.pgpainless.key.TestKeys;
-import org.pgpainless.key.selection.keyring.impl.XMPP;
+import org.pgpainless.util.selection.keyring.impl.XMPP;
 
 public class XmppKeyRingSelectionStrategyTest {