Use service loader.

Author: dkocher

hub/src/main/java/cloud/katta/protocols/s3/S3AssumeRoleProtocol.java

@@ -16,7 +16,6 @@ public class S3AssumeRoleProtocol extends S3Protocol {
 
     // Token exchange
     public static final String OAUTH_TOKENEXCHANGE = "oauth.tokenexchange";
-    public static final String OAUTH_TOKENEXCHANGE_VAULT = "oauth.tokenexchange.vault";
 
     // STS assume role with web identity resource name
     public static final String S3_ASSUMEROLE_ROLEARN_WEBIDENTITY = Profile.STS_ROLE_ARN_PROPERTY_KEY;
@@ -25,16 +24,6 @@ public class S3AssumeRoleProtocol extends S3Protocol {
     public static final String S3_ASSUMEROLE_ROLEARN_TAG = "s3.assumerole.rolearn.tag";
     public static final String S3_ASSUMEROLE_ROLEARN_CREATE_BUCKET = "s3.assumerole.rolearn.createbucket";
 
-    private final String authorization;
-
-    public S3AssumeRoleProtocol() {
-        this("AuthorizationCode");
-    }
-
-    public S3AssumeRoleProtocol(final String authorization) {
-        this.authorization = authorization;
-    }
-
     @Override
     public String getIdentifier() {
         return "s3-assumerole";
@@ -50,11 +39,6 @@ public String getPrefix() {
         return String.format("%s.%s", S3AssumeRoleProtocol.class.getPackage().getName(), "S3AssumeRole");
     }
 
-    @Override
-    public String getAuthorization() {
-        return authorization;
-    }
-
     @Override
     @SuppressWarnings("unchecked")
     public <T> T getFeature(final Class<T> type) {

hub/src/test/java/cloud/katta/testsetup/AbstractHubTest.java

@@ -9,6 +9,7 @@
 import ch.cyberduck.core.preferences.Preferences;
 import ch.cyberduck.core.preferences.PreferencesFactory;
 import ch.cyberduck.core.profiles.LocalProfilesFinder;
+import ch.cyberduck.core.serviceloader.AnnotationAutoServiceLoader;
 import ch.cyberduck.core.ssl.DefaultX509KeyManager;
 import ch.cyberduck.core.ssl.DefaultX509TrustManager;
 import ch.cyberduck.core.vault.VaultRegistryFactory;
@@ -28,11 +29,9 @@
 
 import cloud.katta.core.DeviceSetupCallback;
 import cloud.katta.model.AccountKeyAndDeviceName;
-import cloud.katta.protocols.hub.HubProtocol;
 import cloud.katta.protocols.hub.HubSession;
 import cloud.katta.protocols.hub.HubUVFVault;
 import cloud.katta.protocols.hub.HubVaultRegistry;
-import cloud.katta.protocols.s3.S3AssumeRoleProtocol;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -165,17 +164,10 @@ private static String staticSetupCode() {
 
     protected static HubSession setupConnection(final HubTestConfig.Setup setup) throws Exception {
         final ProtocolFactory factory = ProtocolFactory.get();
-        // ProtocolFactory.get() is static, the profiles contains OAuth token URL, leads to invalid grant exceptions when this changes during class loading lifetime (e.g. if the same storage profile ID is deployed to the LOCAL and the HYBRID hub).
-        for(final Protocol protocol : factory.find()) {
-            if(protocol instanceof Profile) {
-                factory.unregister((Profile) protocol);
-            }
-        }
         // Register parent protocol definitions
-        factory.register(
-                new HubProtocol(),
-                new S3AssumeRoleProtocol("PasswordGrant")
-        );
+        for(Protocol p : new AnnotationAutoServiceLoader<Protocol>().load(Protocol.class)) {
+            factory.register(p);
+        }
         // Load bundled profiles
         factory.load(new LocalProfilesFinder(factory, new Local(AbstractHubTest.class.getResource("/").toURI().getPath())));
         assertNotNull(factory.forName("hub"));