mirror of
https://github.com/ebean-orm/ebean.git
synced 2024-04-21 10:51:47 +00:00
Refactor internals, reduce the number of loggers used and simplify
This commit is contained in:
@@ -20,7 +20,7 @@ import java.util.Properties;
|
||||
*/
|
||||
public class AutoConfigureForTesting implements AutoConfigure {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(AutoConfigureForTesting.class);
|
||||
private static final Logger log = LoggerFactory.getLogger("io.ebean.test");
|
||||
|
||||
/**
|
||||
* System property that can override the platform. mvn clean test -Ddb=sqlserver
|
||||
|
||||
@@ -13,7 +13,7 @@ import java.util.Properties;
|
||||
*/
|
||||
class Config {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(Config.class);
|
||||
private static final Logger log = LoggerFactory.getLogger("io.ebean.test");
|
||||
|
||||
/**
|
||||
* Common optional docker parameters that we just transfer to docker properties.
|
||||
|
||||
@@ -14,7 +14,7 @@ import static java.util.concurrent.CompletableFuture.runAsync;
|
||||
|
||||
public class PlatformAutoConfig {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(PlatformAutoConfig.class);
|
||||
private static final Logger log = LoggerFactory.getLogger("io.ebean.test");
|
||||
|
||||
/**
|
||||
* Known platforms we can setup locally or via docker container.
|
||||
|
||||
@@ -14,7 +14,7 @@ import java.util.Properties;
|
||||
*/
|
||||
public class ProviderAutoConfig {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(ProviderAutoConfig.class);
|
||||
private static final Logger log = LoggerFactory.getLogger("io.ebean.test");
|
||||
|
||||
private final DatabaseConfig config;
|
||||
private final Properties properties;
|
||||
@@ -56,23 +56,29 @@ public class ProviderAutoConfig {
|
||||
String msg(int providerSetFlag) {
|
||||
String msg = msgProvider(providerSetFlag);
|
||||
String usage = msgUsage(providerSetFlag);
|
||||
return "for testing purposes "+msg+" has been configured. Use io.ebean.test.UserContext to "+usage+" in tests.";
|
||||
return "For testing purposes " + msg + " has been configured. Use io.ebean.test.UserContext to " + usage + " in tests.";
|
||||
}
|
||||
|
||||
private String msgProvider(int providerSetFlag) {
|
||||
switch (providerSetFlag) {
|
||||
case 1: return "a current user provider";
|
||||
case 2: return "a current tenant provider";
|
||||
case 3: return "a current user and tenant provider";
|
||||
case 1:
|
||||
return "a current user provider";
|
||||
case 2:
|
||||
return "a current tenant provider";
|
||||
case 3:
|
||||
return "a current user and tenant provider";
|
||||
}
|
||||
return "[unexpected??]";
|
||||
}
|
||||
|
||||
private String msgUsage(int providerSetFlag) {
|
||||
switch (providerSetFlag) {
|
||||
case 1: return "set current user";
|
||||
case 2: return "set current tenant";
|
||||
case 3: return "set current user and tenant";
|
||||
case 1:
|
||||
return "set current user";
|
||||
case 2:
|
||||
return "set current tenant";
|
||||
case 3:
|
||||
return "set current user and tenant";
|
||||
}
|
||||
return "[unexpected??]";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user