Start structural port from Spring Boot to Undertow

src/main/java/io/kamax/mxisd/backend/wordpress/WordpressAuthProvider.java

@@ -28,17 +28,13 @@ import io.kamax.mxisd.auth.provider.BackendAuthResult;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
-@Component
 public class WordpressAuthProvider implements AuthenticatorProvider {
 
-    private final Logger log = LoggerFactory.getLogger(WordpressAuthProvider.class);
+    private transient final Logger log = LoggerFactory.getLogger(WordpressAuthProvider.class);
 
     private WordpressRestBackend wordpress;
 
-    @Autowired
     public WordpressAuthProvider(WordpressRestBackend wordpress) {
         this.wordpress = wordpress;
     }

src/main/java/io/kamax/mxisd/backend/wordpress/WordpressDirectoryProvider.java

@@ -23,13 +23,11 @@ package io.kamax.mxisd.backend.wordpress;
 import io.kamax.matrix.MatrixID;
 import io.kamax.mxisd.config.MatrixConfig;
 import io.kamax.mxisd.config.wordpress.WordpressConfig;
-import io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchResult;
 import io.kamax.mxisd.directory.IDirectoryProvider;
 import io.kamax.mxisd.exception.InternalServerError;
+import io.kamax.mxisd.http.io.UserDirectorySearchResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -37,16 +35,14 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Optional;
 
-@Component
 public class WordpressDirectoryProvider implements IDirectoryProvider {
 
-    private final Logger log = LoggerFactory.getLogger(WordpressDirectoryProvider.class);
+    private transient final Logger log = LoggerFactory.getLogger(WordpressDirectoryProvider.class);
 
     private WordpressConfig cfg;
     private WordressSqlBackend wordpress;
     private MatrixConfig mxCfg;
 
-    @Autowired
     public WordpressDirectoryProvider(WordpressConfig cfg, WordressSqlBackend wordpress, MatrixConfig mxCfg) {
         this.cfg = cfg;
         this.wordpress = wordpress;

src/main/java/io/kamax/mxisd/backend/wordpress/WordpressRestBackend.java

@@ -34,15 +34,12 @@ 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.Component;
 
 import java.io.IOException;
 
-@Component
 public class WordpressRestBackend {
 
-    private final Logger log = LoggerFactory.getLogger(WordpressRestBackend.class);
+    private transient final Logger log = LoggerFactory.getLogger(WordpressRestBackend.class);
     private final String jsonPath = "/wp-json";
     private final String jwtPath = "/jwt-auth/v1";
 
@@ -54,7 +51,6 @@ public class WordpressRestBackend {
 
     private String token;
 
-    @Autowired
     public WordpressRestBackend(WordpressConfig cfg, CloseableHttpClient client) {
         this.cfg = cfg;
         this.client = client;

src/main/java/io/kamax/mxisd/backend/wordpress/WordpressStoreSupplier.java

@@ -0,0 +1,48 @@
+/*
+ * mxisd - Matrix Identity Server Daemon
+ * Copyright (C) 2018 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.backend.wordpress;
+
+import io.kamax.mxisd.Mxisd;
+import io.kamax.mxisd.auth.AuthProviders;
+import io.kamax.mxisd.backend.IdentityStoreSupplier;
+import io.kamax.mxisd.config.MatrixConfig;
+import io.kamax.mxisd.config.wordpress.WordpressConfig;
+import io.kamax.mxisd.directory.DirectoryProviders;
+import io.kamax.mxisd.lookup.ThreePidProviders;
+
+public class WordpressStoreSupplier implements IdentityStoreSupplier {
+
+    @Override
+    public void accept(Mxisd m) {
+        WordpressConfig wpCfg = m.getConfig().getWordpress();
+        MatrixConfig mxCfg = m.getConfig().getMatrix();
+
+        if (m.getConfig().getWordpress().isEnabled()) {
+            WordpressRestBackend restBackend = new WordpressRestBackend(wpCfg, m.getHttpClient());
+            WordressSqlBackend sqlBackend = new WordressSqlBackend(wpCfg);
+
+            AuthProviders.register(() -> new WordpressAuthProvider(restBackend));
+            DirectoryProviders.register(() -> new WordpressDirectoryProvider(wpCfg, sqlBackend, mxCfg));
+            ThreePidProviders.register(() -> new WordpressThreePidProvider(mxCfg, wpCfg, sqlBackend));
+        }
+    }
+
+}

src/main/java/io/kamax/mxisd/backend/wordpress/WordpressThreePidProvider.java

@@ -31,8 +31,6 @@ import io.kamax.mxisd.lookup.ThreePidMapping;
 import io.kamax.mxisd.lookup.provider.IThreePidProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -42,16 +40,14 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
-@Component
 public class WordpressThreePidProvider implements IThreePidProvider {
 
-    private final Logger log = LoggerFactory.getLogger(WordpressThreePidProvider.class);
+    private transient final Logger log = LoggerFactory.getLogger(WordpressThreePidProvider.class);
 
     private MatrixConfig mxCfg;
     private WordpressConfig cfg;
     private WordressSqlBackend wordpress;
 
-    @Autowired
     public WordpressThreePidProvider(MatrixConfig mxCfg, WordpressConfig cfg, WordressSqlBackend wordpress) {
         this.mxCfg = mxCfg;
         this.cfg = cfg;

src/main/java/io/kamax/mxisd/backend/wordpress/WordressSqlBackend.java

@@ -24,22 +24,17 @@ import com.mchange.v2.c3p0.ComboPooledDataSource;
 import io.kamax.mxisd.config.wordpress.WordpressConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 
-@Component
 public class WordressSqlBackend {
 
-    private Logger log = LoggerFactory.getLogger(WordressSqlBackend.class);
+    private transient final Logger log = LoggerFactory.getLogger(WordressSqlBackend.class);
 
     private WordpressConfig cfg;
-
     private ComboPooledDataSource ds;
 
-    @Autowired
     public WordressSqlBackend(WordpressConfig cfg) {
         this.cfg = cfg;