cqrenet/mxids
3
0
Fork 0
Code Pull Requests 10 Actions Releases Activity

Continue structural port from Spring Boot to Undertow

Browse Source
This commit is contained in:
Max Dor
2018-12-30 05:28:05 +01:00
parent 6a376db322
commit 7ad985fead
85 changed files with 1019 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/io/kamax/mxisd/directory/DirectoryManager.java
View File

@@ -43,8 +43,8 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.net.URI;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
public class DirectoryManager {
@@ -53,13 +53,13 @@ public class DirectoryManager {
private DirectoryConfig cfg;
private ClientDnsOverwrite dns;
private CloseableHttpClient client;
private List<IDirectoryProvider> providers;
private List<DirectoryProvider> providers;
public DirectoryManager(DirectoryConfig cfg, ClientDnsOverwrite dns, CloseableHttpClient client, List<? extends IDirectoryProvider> providers) {
public DirectoryManager(DirectoryConfig cfg, ClientDnsOverwrite dns, CloseableHttpClient client, List<? extends DirectoryProvider> providers) {
this.cfg = cfg;
this.dns = dns;
this.client = client;
this.providers = providers.stream().filter(IDirectoryProvider::isEnabled).collect(Collectors.toList());
this.providers = new ArrayList<>(providers);
log.info("Directory providers:");
this.providers.forEach(p -> log.info("\t- {}", p.getClass().getName()));
@@ -111,7 +111,7 @@ public class DirectoryManager {
}
}
for (IDirectoryProvider provider : providers) {
for (DirectoryProvider provider : providers) {
log.info("Using Directory provider {}", provider.getClass().getSimpleName());
UserDirectorySearchResult resultProvider = provider.searchByDisplayName(query);
log.info("Display name: found {} match(es) for '{}'", resultProvider.getResults().size(), query);

4
src/main/java/io/kamax/mxisd/directory/IDirectoryProvider.java → src/main/java/io/kamax/mxisd/directory/DirectoryProvider.java
View File

@@ -22,9 +22,7 @@ package io.kamax.mxisd.directory;
import io.kamax.mxisd.http.io.UserDirectorySearchResult;
public interface IDirectoryProvider {
boolean isEnabled();
public interface DirectoryProvider {
UserDirectorySearchResult searchByDisplayName(String query);

6
src/main/java/io/kamax/mxisd/directory/DirectoryProviders.java
View File

@@ -27,13 +27,13 @@ import java.util.stream.Collectors;
public class DirectoryProviders {
private static final List<Supplier<? extends IDirectoryProvider>> suppliers = new ArrayList<>();
private static final List<Supplier<? extends DirectoryProvider>> suppliers = new ArrayList<>();
public static void register(Supplier<? extends IDirectoryProvider> supplier) {
public static void register(Supplier<? extends DirectoryProvider> supplier) {
suppliers.add(supplier);
}
public static List<? extends IDirectoryProvider> get() {
public static List<? extends DirectoryProvider> get() {
return suppliers.stream().map(Supplier::get).collect(Collectors.toList());
}