Start structural port from Spring Boot to Undertow

src/main/java/io/kamax/mxisd/auth/AuthManager.java

@@ -37,6 +37,7 @@ import io.kamax.mxisd.auth.provider.AuthenticatorProvider;
 import io.kamax.mxisd.auth.provider.BackendAuthResult;
 import io.kamax.mxisd.config.AuthenticationConfig;
 import io.kamax.mxisd.config.MatrixConfig;
+import io.kamax.mxisd.config.MxisdConfig;
 import io.kamax.mxisd.dns.ClientDnsOverwrite;
 import io.kamax.mxisd.exception.RemoteLoginException;
 import io.kamax.mxisd.invitation.InvitationManager;
@@ -53,8 +54,6 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.net.URI;
@@ -63,7 +62,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-@Service
 public class AuthManager {
 
     private static final String TypeKey = "type";
@@ -74,8 +72,8 @@ public class AuthManager {
     private static final String UserIdTypeValue = "m.id.user";
     private static final String ThreepidTypeValue = "m.id.thirdparty";
 
-    private final Logger log = LoggerFactory.getLogger(AuthManager.class);
-    private final Gson gson = GsonUtil.get();
+    private transient final Logger log = LoggerFactory.getLogger(AuthManager.class);
+    private final Gson gson = GsonUtil.get(); // FIXME replace
 
     private List<AuthenticatorProvider> providers;
     private MatrixConfig mxCfg;
@@ -85,18 +83,16 @@ public class AuthManager {
     private LookupStrategy strategy;
     private CloseableHttpClient client;
 
-    @Autowired
     public AuthManager(
-            AuthenticationConfig cfg,
-            MatrixConfig mxCfg,
-            List<AuthenticatorProvider> providers,
+            MxisdConfig cfg,
+            List<? extends AuthenticatorProvider> providers,
             LookupStrategy strategy,
             InvitationManager invMgr,
             ClientDnsOverwrite dns,
             CloseableHttpClient client
     ) {
-        this.cfg = cfg;
-        this.mxCfg = mxCfg;
+        this.cfg = cfg.getAuth();
+        this.mxCfg = cfg.getMatrix();
         this.providers = new ArrayList<>(providers);
         this.strategy = strategy;
         this.invMgr = invMgr;

src/main/java/io/kamax/mxisd/auth/AuthProviders.java

@@ -0,0 +1,42 @@
+/*
+ * mxisd - Matrix Identity Server Daemon
+ * Copyright (C) 2017 Kamax Sarl
+ *
+ * https://www.kamax.io/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package io.kamax.mxisd.auth;
+
+import io.kamax.mxisd.auth.provider.AuthenticatorProvider;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+public class AuthProviders {
+
+    private static final List<Supplier<? extends AuthenticatorProvider>> suppliers = new ArrayList<>();
+
+    public static void register(Supplier<? extends AuthenticatorProvider> supplier) {
+        suppliers.add(supplier);
+    }
+
+    public static List<? extends AuthenticatorProvider> get() {
+        return suppliers.stream().map(Supplier::get).collect(Collectors.toList());
+    }
+
+}