ITQC/gls_docs
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New api

Browse Source
This commit is contained in:
Fabian Märki
2019-02-14 16:19:06 +01:00
parent cce7b4f4fb
commit 911fe46d28
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java
View File

@ -6,13 +6,16 @@ import java.util.EnumMap;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.annotation.Resource; import javax.annotation.Resource;
import org.apache.commons.lang3.tuple.Pair;
import org.msgpack.jackson.dataformat.MessagePackFactory; import org.msgpack.jackson.dataformat.MessagePackFactory;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -430,7 +433,8 @@ public class QueryRestConfig { // extends WebMvcConfigurerAdapter {
final String newDefaultProtocol = "https"; final String newDefaultProtocol = "https";
final String newDefaultHost = "data-api.psi.ch"; final String newDefaultHost = "data-api.psi.ch";
LOGGER.warn("\nSet back to 443!\n#####");
LOGGER.warn("\nSet back to 443!\n#####");
final int newDefaultPort = 8080; final int newDefaultPort = 8080;
// this should be overwritten // this should be overwritten
final String newDefaultPath = ""; final String newDefaultPath = "";
@ -450,11 +454,25 @@ public class QueryRestConfig { // extends WebMvcConfigurerAdapter {
@Bean(name = BEAN_NAME_QUERY_SERVER_BACKENDS) @Bean(name = BEAN_NAME_QUERY_SERVER_BACKENDS)
@Lazy @Lazy
public Map<Backend, String> queryServerBackends() { public Map<Backend, String> queryServerBackends() {
final BiFunction<String, String, BackendType> typeCreator = final BiFunction<String, Pair<String, String>, BackendType> typeCreator =
(name, queryServer) -> new DomainBackendType(name, queryServer); (name, serverAddresses) -> new DomainBackendType(
name,
serverAddresses.getLeft(),
serverAddresses.getRight());
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
final List<String> queryServerAddresses = final List<String> queryServerAddresses =
context.getBean(QueryRestConfig.BEAN_NAME_QUERY_SERVER_ADDRESSES, List.class); context.getBean(QueryRestConfig.BEAN_NAME_QUERY_SERVER_ADDRESSES, List.class);
return RestHelper.getBackends(context, queryServerAddresses, typeCreator); return RestHelper.getBackends(
context,
queryServerAddresses.stream()
.map(queryServer -> Pair.of(queryServer, null)),
serverAddresses -> serverAddresses.getLeft(),
DomainConfig.PATH_BACKENDS_BY_ID,
typeCreator)
.entrySet()
.stream()
.collect(Collectors.toMap(
Entry::getKey,
entry -> entry.getValue().getLeft()));
} }
} }