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

Start structural port from Spring Boot to Undertow

Browse Source
This commit is contained in:
Max Dor
2018-12-25 05:32:00 +01:00
parent df44428a85
commit 05493da27c
195 changed files with 3313 additions and 2079 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/io/kamax/mxisd/config/sql/SqlConfig.java
View File

@@ -24,14 +24,13 @@ import io.kamax.mxisd.util.GsonUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.PostConstruct;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
public abstract class SqlConfig {
private transient Logger log = LoggerFactory.getLogger(SqlConfig.class);
private transient final Logger log = LoggerFactory.getLogger(SqlConfig.class);
public static class Query {
@@ -283,7 +282,6 @@ public abstract class SqlConfig {
protected abstract String getProviderName();
@PostConstruct
public void build() {
if (getAuth().isEnabled() == null) {
getAuth().setEnabled(isEnabled());

6
src/main/java/io/kamax/mxisd/config/sql/generic/GenericSqlProviderConfig.java
View File

@@ -21,13 +21,7 @@
package io.kamax.mxisd.config.sql.generic;
import io.kamax.mxisd.config.sql.SqlConfig;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
@Configuration
@ConfigurationProperties("sql")
@Primary
public class GenericSqlProviderConfig extends SqlConfig {
@Override

11
src/main/java/io/kamax/mxisd/config/sql/synapse/SynapseSqlProviderConfig.java
View File

@@ -23,13 +23,7 @@ package io.kamax.mxisd.config.sql.synapse;
import io.kamax.mxisd.backend.sql.synapse.SynapseQueries;
import io.kamax.mxisd.config.sql.SqlConfig;
import org.apache.commons.lang.StringUtils;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import javax.annotation.PostConstruct;
@Configuration
@ConfigurationProperties("synapseSql")
public class SynapseSqlProviderConfig extends SqlConfig {
@Override
@@ -37,8 +31,9 @@ public class SynapseSqlProviderConfig extends SqlConfig {
return "Synapse SQL";
}
@PostConstruct
public void doBuild() {
public void build() {
super.build();
getAuth().setEnabled(false); // Synapse does the auth, we only act as a directory/identity service.
// FIXME check that the DB is not the mxisd one