0

35 Commits
v1.2.1 ... v1.9

Author SHA1 Message Date
2fc1bf36c1 update version 2021-01-03 00:24:06 +03:00
eb5396b891 Merge branch 'develop' 2021-01-03 00:23:40 +03:00
5315a4ad94 Merge branch 'feature/scheduler' into develop 2021-01-03 00:23:17 +03:00
bd91b19114 ScheduleManager: отложенное выполнение задач 2021-01-03 00:22:55 +03:00
e36d0fd75d Merge branch 'dev/refactory' into develop 2021-01-03 00:02:15 +03:00
f9f6fbc541 Merge branch 'feature/jdbctemplate' into develop 2021-01-03 00:01:39 +03:00
395b0a015f add tests for JdbcTemplate 2021-01-03 00:00:29 +03:00
c0c1ede462 add JdbcTemplate
like Spring Data
2021-01-02 20:27:11 +03:00
e12d005a25 update version 2021-01-02 14:39:35 +03:00
6e50fc278e Merge branch 'develop' 2021-01-02 14:39:18 +03:00
5f2e208453 Merge branch 'feature/scheduler' into develop 2021-01-02 14:39:05 +03:00
b3aec1716a add ScheduleTask 2021-01-02 14:38:41 +03:00
c20df9af24 ScheduleManager: move to another package 2021-01-02 14:26:54 +03:00
0165a7d424 move AssetsManager to another package 2021-01-02 03:01:28 +03:00
c8866af418 update version 2021-01-02 02:52:42 +03:00
359dbba09a Merge branch 'develop' 2021-01-02 02:52:19 +03:00
c513d6990a Merge branch 'feature/effects' into develop 2021-01-02 02:51:45 +03:00
6155bb0d42 EffectsHelper: add spawn particle 2021-01-02 02:51:07 +03:00
5514753f31 add EffectsHelper 2021-01-02 02:46:38 +03:00
e4b1b40104 update version 2021-01-02 01:46:21 +03:00
73f044ab8b Merge branch 'develop' 2021-01-02 01:45:58 +03:00
001cc6d2ce Merge branch 'feature/commands' into develop 2021-01-02 01:31:12 +03:00
45dc6b86b4 CommandManager: add simple register 2021-01-02 01:28:11 +03:00
72c858db2d add CommandManager 2021-01-02 01:24:09 +03:00
32b868df22 update version 2021-01-01 22:08:31 +03:00
3a66dffa10 Merge branch 'develop' 2021-01-01 22:08:17 +03:00
1bb5eee5cf Merge branch 'feature/i18n' into develop 2021-01-01 22:07:41 +03:00
a34145a621 Merge branch 'feature/event-context' into develop 2021-01-01 22:07:35 +03:00
0a5fd7a155 I18n: add support multi lang. 2021-01-01 22:05:54 +03:00
481fd84ecb add I18n 2021-01-01 21:43:08 +03:00
603aec8e45 GhastTools: change scope getPlugin method 2021-01-01 19:00:53 +03:00
fa0159e7c7 fix SuppressWarnings 2021-01-01 18:58:14 +03:00
4e4a6272ba EventContext: add cancelEvent method 2021-01-01 18:57:12 +03:00
cfd68bb45e add XLog 2020-12-31 15:31:50 +03:00
97d6ef8b47 refactoring EventManager 2020-12-31 14:59:50 +03:00
27 changed files with 1170 additions and 100 deletions

View File

@@ -14,9 +14,12 @@ repositories {
mavenLocal()
mavenCentral()
maven { url 'https://hub.spigotmc.org/nexus/content/groups/public' }
maven { url 'https://dmx-mc-project.gitlab.io/maven-repository/' }
}
ext {
junitVersion = '5.5.2'
libs = [
bukkit: [lib: 'org.bukkit:bukkit:1.12.2-R0.1-SNAPSHOT', exclude: [
'com.google.code.gson:gson',
@@ -24,7 +27,19 @@ ext {
'commons-lang:commons-lang',
'org.yaml:snakeyaml'
]],
lombok: 'org.projectlombok:lombok:1.18.12'
commons_text: 'org.apache.commons:commons-text:1.9',
lombok: 'org.projectlombok:lombok:1.18.12',
reflection_object: 'ru.dmitriymx:reflection-object:1.0-BETA',
mysql: 'mysql:mysql-connector-java:8.0.22',
test: [
junit5: [
"org.junit.jupiter:junit-jupiter-api:$junitVersion",
"org.junit.jupiter:junit-jupiter-engine:$junitVersion"
],
mock: ['org.mockito:mockito-core:1.10.19'],
h2db: 'com.h2database:h2:1.4.200'
]
]
}
@@ -37,9 +52,30 @@ def compileOnly2(library) {
}
}
def testImplementation2(library) {
dependencies.testImplementation library.lib, {
library.exclude.each { String excludeLibStr ->
String[] excludeLib = excludeLibStr.split(':')
exclude group: excludeLib[0], module: excludeLib[1]
}
}
}
dependencies {
compileOnly libs.lombok
annotationProcessor libs.lombok
compileOnly2 libs.bukkit
compileOnly libs.mysql
implementation libs.commons_text
implementation libs.reflection_object
testImplementation libs.test.junit5
testImplementation libs.test.mock
testImplementation2 libs.bukkit
testImplementation libs.test.h2db
}
test {
useJUnitPlatform()
}

View File

@@ -1,3 +1,3 @@
projectGroup=ghast
projectName=ghast-tools
projectVersion=1.2.1
projectVersion=1.9

View File

@@ -0,0 +1,27 @@
package ghast;
import lombok.experimental.UtilityClass;
import org.bukkit.Location;
import org.bukkit.Particle;
import org.bukkit.Sound;
import org.bukkit.SoundCategory;
import org.bukkit.util.Vector;
@UtilityClass
@SuppressWarnings("unused")
public class EffectsHelper {
public void playSound(Location location, Sound sound, float pitch) {
location.getWorld().playSound(location, sound, SoundCategory.MASTER, 1.0f, pitch);
}
public void particle(Location location, Particle particle, double dx, double dy, double dz, double speed, int amount) {
location.getWorld().spawnParticle(particle, location, amount, dx, dy, dz, speed);
}
//TODO нужно проверить
public void particle(Location location, Particle particle, Vector vector, double speed, int amount) {
particle(location, particle, vector.getX(), vector.getY(), vector.getZ(), speed, amount);
}
}

View File

@@ -0,0 +1,71 @@
package ghast;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.bukkit.Bukkit;
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import java.util.HashMap;
import java.util.Map;
import java.util.function.BooleanSupplier;
import java.util.function.Consumer;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@SuppressWarnings("unused")
public class EventContext implements Listener {
private static final BooleanSupplier EMPTY_FILTER = () -> true;
private static final Consumer<Cancellable> CANCEL_EVENT = event -> event.setCancelled(true);
private final Map<Class<? extends Event>, Consumer<?>> eventMap = new HashMap<>();
private BooleanSupplier filter = EMPTY_FILTER;
public EventContext filter(BooleanSupplier filter) {
this.filter = (filter != null ? filter : EMPTY_FILTER);
return this;
}
public <T extends Event> EventContext onEvent(Class<T> eventType, EventPriority eventPriority, Consumer<T> consumer) {
if (consumer == null) {
eventMap.remove(eventType);
} else {
eventMap.put(eventType, consumer);
bukkitRegisterEvent(eventType, eventPriority);
}
return this;
}
public <T extends Event> EventContext onEvent(Class<T> eventType, Consumer<T> consumer) {
return onEvent(eventType, EventPriority.NORMAL, consumer);
}
public <T extends Event & Cancellable> EventContext cancelEvent(Class<T> eventType, EventPriority eventPriority) {
eventMap.put(eventType, CANCEL_EVENT);
bukkitRegisterEvent(eventType, eventPriority);
return this;
}
public <T extends Event & Cancellable> EventContext cancelEvent(Class<T> eventType) {
return cancelEvent(eventType, EventPriority.NORMAL);
}
private void bukkitRegisterEvent(Class<? extends Event> eventType, EventPriority eventPriority) {
Bukkit.getPluginManager().registerEvent(eventType, this, eventPriority,
this::eventExecute, GhastTools.getPlugin());
}
@SuppressWarnings({ "unchecked", "rawtypes" })
private void eventExecute(Listener listener, Event event) {
Consumer consumer = eventMap.get(event.getClass());
if (consumer != null && filter.getAsBoolean()) {
consumer.accept(event);
}
}
public static EventContext create() {
return new EventContext();
}
}

View File

@@ -1,66 +0,0 @@
package ghast;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.experimental.UtilityClass;
import org.bukkit.Bukkit;
import org.bukkit.event.Event;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import java.util.HashMap;
import java.util.Map;
import java.util.function.BooleanSupplier;
import java.util.function.Consumer;
@UtilityClass
@SuppressWarnings("unused")
public class EventManager {
public Builder createContext() {
return new Builder();
}
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
public static class Builder {
private static final BooleanSupplier EMPTY_FILTER = () -> true;
private final EventContext eventContext = new EventContext();
public Builder filter(BooleanSupplier filter) {
eventContext.setFilter(filter != null ? filter : EMPTY_FILTER);
return this;
}
public <T extends Event> Builder onEvent(Class<T> eventType, EventPriority eventPriority, Consumer<T> consumer) {
eventContext.getEventMap().put(eventType, consumer);
Bukkit.getPluginManager().registerEvent(eventType, eventContext, eventPriority,
eventContext::eventExecute, GhastTools.getPlugin());
return this;
}
public <T extends Event> Builder onEvent(Class<T> eventType, Consumer<T> consumer) {
return onEvent(eventType, EventPriority.NORMAL, consumer);
}
}
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
@Getter(AccessLevel.PRIVATE)
@Setter(AccessLevel.PRIVATE)
private static class EventContext implements Listener {
private final Map<Class<? extends Event>, Consumer<?>> eventMap = new HashMap<>();
private BooleanSupplier filter;
@SuppressWarnings({ "unchecked", "rawtypes" })
private void eventExecute(Listener listener, Event event) {
Consumer consumer = eventMap.get(event.getClass());
if (consumer != null && filter.getAsBoolean()) {
consumer.accept(event);
}
}
}
}

View File

@@ -1,5 +1,6 @@
package ghast;
import ghast.assets.AssetsManager;
import lombok.experimental.UtilityClass;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.Plugin;
@@ -23,6 +24,20 @@ public class GhastTools {
}
}
@SuppressWarnings("java:S112")
public Plugin getPlugin() {
if (refPlugin == null) {
throw new RuntimeException("Plugin not set.");
}
Plugin plugin = refPlugin.get();
if (plugin == null) {
throw new RuntimeException("Plugin not set.");
}
return plugin;
}
@SuppressWarnings("java:S112")
public YamlConfiguration loadConfig(boolean saveDefault) {
if (saveDefault) {
@@ -39,18 +54,4 @@ public class GhastTools {
public YamlConfiguration loadConfig() {
return loadConfig(true);
}
@SuppressWarnings("java:S112")
Plugin getPlugin() {
if (refPlugin == null) {
throw new RuntimeException("Plugin not set.");
}
Plugin plugin = refPlugin.get();
if (plugin == null) {
throw new RuntimeException("Plugin not set.");
}
return plugin;
}
}

View File

@@ -0,0 +1,91 @@
package ghast;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Table;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.experimental.UtilityClass;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.StringSubstitutor;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
import java.util.HashMap;
import java.util.Map;
@UtilityClass
@SuppressWarnings("unused")
public class I18n {
private final String DEFAULT_LANG = "en";
private final Table<String/*Lang*/, String/*Key*/, String/*Template|Message*/> messagesMap = HashBasedTable.create();
//region Load messages
@SuppressWarnings("java:S112")
public void loadMessages(String lang, Reader reader) {
Map<String, String> map = messagesMap.row(lang.toLowerCase());
try {
BufferedReader bufferedReader = new BufferedReader(reader);
String line;
while ((line = bufferedReader.readLine()) != null) {
String[] split = line.split("=", 2);
map.put(split[0].trim().toLowerCase(), split[1].trim());
}
} catch (IOException e) {
throw new RuntimeException("Error load messages: " + e.getMessage(), e);
}
}
public void loadMessages(String lang, Map<String, String> messages) {
Map<String, String> map = messagesMap.row(lang.toLowerCase());
messages.forEach((k, v) -> map.put(k.toLowerCase(), v));
}
public void loadMessages(Reader reader) {
loadMessages(DEFAULT_LANG, reader);
}
public void loadMessages(Map<String, String> messages) {
loadMessages(DEFAULT_LANG, messages);
}
//endregion
//region Get message
public String get(String lang, String key) {
return messagesMap.row(lang.toLowerCase()).getOrDefault(key.toLowerCase(), StringUtils.EMPTY);
}
public String get(String lang, String key, Map<String, Object> params) {
return StringSubstitutor.replace(get(lang, key.toLowerCase()), params, "{", "}");
}
public String get(String key) {
return get(DEFAULT_LANG, key);
}
public String get(String key, Map<String, Object> params) {
return get(DEFAULT_LANG, key, params);
}
//endregion
public ParamBuilder paramBuilder() {
return new ParamBuilder();
}
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public static class ParamBuilder {
private final Map<String, Object> params = new HashMap<>();
public ParamBuilder add(String key, Object value) {
params.put(key, value);
return this;
}
public Map<String, Object> build() {
return params;
}
}
}

View File

@@ -0,0 +1,77 @@
package ghast;
import lombok.experimental.UtilityClass;
import java.util.logging.Level;
import static java.text.MessageFormat.format;
@UtilityClass
@SuppressWarnings("unused")
public class XLog {
//region Debug
public void debug(String pattern, Object... objects) {
if (objects.length > 1 && objects[objects.length - 1] instanceof Throwable) {
Throwable throwable = (Throwable) objects[objects.length - 1];
Object[] values = new Object[objects.length - 1];
System.arraycopy(objects, 0, values, 0, values.length);
debug(format(pattern, values), throwable);
} else {
debug(format(pattern, objects));
}
}
public void debug(String message, Throwable throwable) {
GhastTools.getPlugin().getLogger().log(Level.FINE, message, throwable);
}
public void debug(String message) {
GhastTools.getPlugin().getLogger().fine(message);
}
//endregion
//region Info
public void info(String pattern, Object... objects) {
info(format(pattern, objects));
}
public void info(String message) {
GhastTools.getPlugin().getLogger().info(message);
}
//endregion
//region Warning
public void warn(String pattern, Object... objects) {
warn(format(pattern, objects));
}
public void warn(String message) {
GhastTools.getPlugin().getLogger().warning(message);
}
//endregion
//region Error
public void error(String pattern, Object... objects) {
if (objects.length > 1 && objects[objects.length - 1] instanceof Throwable) {
Throwable throwable = (Throwable) objects[objects.length - 1];
Object[] values = new Object[objects.length - 1];
System.arraycopy(objects, 0, values, 0, values.length);
error(format(pattern, values), throwable);
} else {
error(format(pattern, objects));
}
}
public void error(String message) {
GhastTools.getPlugin().getLogger().severe(message);
}
public void error(String message, Throwable throwable) {
GhastTools.getPlugin().getLogger().log(Level.SEVERE, message, throwable);
}
//endregion
}

View File

@@ -1,4 +1,4 @@
package ghast;
package ghast.assets;
public class AssetsException extends RuntimeException {

View File

@@ -1,5 +1,6 @@
package ghast;
package ghast.assets;
import ghast.GhastTools;
import lombok.experimental.UtilityClass;
import org.bukkit.plugin.Plugin;

View File

@@ -0,0 +1,8 @@
package ghast.command;
import org.bukkit.command.CommandSender;
public interface CommandExecuter {
void execute(CommandSender sender, String[] args);
}

View File

@@ -0,0 +1,71 @@
package ghast.command;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
import lombok.experimental.UtilityClass;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import ru.dmitriymx.reflection.ReflectionObject;
@UtilityClass
@SuppressWarnings("unused")
public class CommandManager {
public Builder create(String name) {
return new Builder(name);
}
public void register(String name, CommandExecuter executer) {
create(name).executer(executer).register();
}
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
public static class Builder {
private final String name;
private CommandExecuter executer;
private ErrorConsumer errorConsumer;
private Boolean onlyPlayer;
private String deniedMessage;
public Builder executer(CommandExecuter executer) {
this.executer = executer;
return this;
}
public Builder onError(ErrorConsumer errorConsumer) {
this.errorConsumer = errorConsumer;
return this;
}
public Builder useOnlyPlayer(String deniedMessage) {
this.onlyPlayer = true;
this.deniedMessage = deniedMessage;
return this;
}
public Builder useOnlyPlayer() {
return useOnlyPlayer(null);
}
public Builder useOnlyConsole(String deniedMessage) {
this.onlyPlayer = false;
this.deniedMessage = deniedMessage;
return this;
}
public Builder useOnlyConsole() {
return useOnlyConsole(null);
}
public void register() {
//TODO для Paper такие "извращения" не требуются. Нужно продумать.
new ReflectionObject(Bukkit.getServer())
.method("getCommandMap").invoke()
.method("register", String.class, Command.class).invoke(
name, new CommandWrapper(name, this.onlyPlayer, this.deniedMessage,
this.executer, this.errorConsumer)
);
}
}
}

View File

@@ -0,0 +1,71 @@
package ghast.command;
import ghast.XLog;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.command.defaults.BukkitCommand;
import org.bukkit.entity.Player;
class CommandWrapper extends BukkitCommand {
private static final String DEFAULT_DENIED_MESSAGE_PLAYERS = ChatColor.RED + "This command use only players";
private static final String DEFAULT_DENIED_MESSAGE_CONSOLE = ChatColor.RED + "This command use only in console";
private static final ErrorConsumer DEFAULT_ERROR_CONSUMER =
(sender, commandName, args, exception) -> {
sender.sendMessage(String.format("%sError execute command '%s'!", ChatColor.RED, commandName));
XLog.error("Error execute command ''{0}'' with args ''{1}''",
commandName, String.join(" ", args), exception);
};
private final CommandExecuter executer;
private final ErrorConsumer errorConsumer;
private final Boolean onlyPlayer;
private String deniedMessage;
protected CommandWrapper(String name, Boolean onlyPlayer, String deniedMessage,
CommandExecuter executer, ErrorConsumer errorConsumer) {
super(name);
this.onlyPlayer = onlyPlayer;
this.executer = executer;
if (onlyPlayer != null) {
if (deniedMessage == null) {
this.deniedMessage = Boolean.TRUE.equals(onlyPlayer) ? DEFAULT_DENIED_MESSAGE_PLAYERS
: DEFAULT_DENIED_MESSAGE_CONSOLE;
} else {
this.deniedMessage = deniedMessage;
}
}
if(errorConsumer == null) {
this.errorConsumer = DEFAULT_ERROR_CONSUMER;
} else {
this.errorConsumer = errorConsumer;
}
}
@Override
@SuppressWarnings("java:S1066")
public boolean execute(CommandSender commandSender, String commandName, String[] args) {
if (Boolean.TRUE.equals(onlyPlayer)) {
if (!(commandSender instanceof Player)) {
commandSender.sendMessage(deniedMessage);
return true;
}
} else if (Boolean.FALSE.equals(onlyPlayer)) { // use console only
if (commandSender instanceof Player) {
commandSender.sendMessage(deniedMessage);
return true;
}
}
try {
executer.execute(commandSender, args);
return true;
} catch (Exception e) {
errorConsumer.accept(commandSender, commandName, args, e);
return false;
}
}
}

View File

@@ -0,0 +1,8 @@
package ghast.command;
import org.bukkit.command.CommandSender;
public interface ErrorConsumer {
void accept(CommandSender sender, String commandName, String[] args, Exception exception);
}

View File

@@ -0,0 +1,10 @@
package ghast.database;
import java.sql.SQLException;
public class CannotGetJdbcConnectionException extends DataAccessException {
public CannotGetJdbcConnectionException(String msg, SQLException ex) {
super(msg, ex);
}
}

View File

@@ -0,0 +1,28 @@
package ghast.database;
import lombok.Getter;
@SuppressWarnings("java:S1165")
@Getter
public class DataAccessException extends RuntimeException {
private String sql;
public DataAccessException(String msg) {
super(msg);
}
public DataAccessException(String msg, String sql) {
this(msg);
this.sql = sql;
}
public DataAccessException(String msg, Throwable cause) {
super(msg, cause);
}
public DataAccessException(String msg, String sql, Throwable cause) {
this(msg, cause);
this.sql = sql;
}
}

View File

@@ -0,0 +1,8 @@
package ghast.database;
public class EmptyResultDataAccessException extends IncorrectResultSizeDataAccessException {
public EmptyResultDataAccessException(int expectedSize) {
super(expectedSize);
}
}

View File

@@ -0,0 +1,8 @@
package ghast.database;
public class IncorrectResultSizeDataAccessException extends DataAccessException {
public IncorrectResultSizeDataAccessException(int expectedSize) {
super("Incorrect result size: expected " + expectedSize);
}
}

View File

@@ -0,0 +1,23 @@
package ghast.database;
import java.util.List;
import java.util.Map;
public interface JdbcOperations {
void execute(String sql) throws DataAccessException;
<T> T query(String sql, ResultSetExtractor<T> rse) throws DataAccessException;
<T> List<T> query(String sql, RowMapper<T> rowMapper) throws DataAccessException;
<T> T queryForObject(String sql, RowMapper<T> rowMapper) throws DataAccessException;
Map<String, Object> queryForMap(String sql) throws DataAccessException;
List<Map<String, Object>> queryForList(String sql) throws DataAccessException;
int update(String sql) throws DataAccessException;
int delete(String sql) throws DataAccessException;
}

View File

@@ -0,0 +1,237 @@
package ghast.database;
import ghast.XLog;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import javax.sql.DataSource;
import java.sql.*;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@NoArgsConstructor
@Getter
@Setter
public class JdbcTemplate implements JdbcOperations {
private DataSource dataSource;
public JdbcTemplate(DataSource dataSource) {
setDataSource(dataSource);
}
@Override
public void execute(String sql) throws DataAccessException {
XLog.debug("Execute SQL: {0}", sql);
Connection connection = openConnection();
Statement statement = null;
try {
statement = connection.createStatement();
statement.execute(sql);
} catch (SQLException e) {
throw new DataAccessException("Error execute SQL", sql, e);
} finally {
closeStatement(statement);
closeConnection(connection);
}
}
@Override
public <T> T query(String sql, ResultSetExtractor<T> rse) throws DataAccessException {
XLog.debug("Execute SQL: {0}", sql);
Connection connection = openConnection();
Statement statement = null;
ResultSet resultSet = null;
try {
statement = connection.createStatement();
resultSet = statement.executeQuery(sql);
return rse.extractData(resultSet);
} catch (SQLException e) {
throw new DataAccessException("Error execute SQL", sql, e);
} finally {
closeResultSet(resultSet);
closeStatement(statement);
closeConnection(connection);
}
}
@Override
public <T> List<T> query(String sql, final RowMapper<T> rowMapper) throws DataAccessException {
return query(sql, rs -> {
List<T> resultList = new ArrayList<>();
int rowNum = 0;
while (rs.next()) {
resultList.add(rowMapper.mapRow(rs, rowNum++));
}
return resultList;
});
}
@Override
public <T> T queryForObject(String sql, RowMapper<T> rowMapper) throws DataAccessException {
return query(sql, rs -> {
if (rs.next()) {
T resultObj = rowMapper.mapRow(rs, 0);
if (rs.next()) {
throw new IncorrectResultSizeDataAccessException(1);
}
return resultObj;
} else {
throw new EmptyResultDataAccessException(1);
}
});
}
@Override
public Map<String, Object> queryForMap(String sql) throws DataAccessException {
return queryForObject(sql, (rs, rowNum) -> {
ResultSetMetaData metaData = rs.getMetaData();
int columnCount = metaData.getColumnCount();
Map<String, Object> resultMap = new LinkedHashMap<>(columnCount);
for (int i = 1; i <= columnCount; i++) {
String key = lookupColumnName(metaData, i);
Object value = getResultSetRawValue(rs, i);
resultMap.put(key, value);
}
return resultMap;
});
}
@Override
public List<Map<String, Object>> queryForList(String sql) throws DataAccessException {
return query(sql, (rs, rowNum) -> {
ResultSetMetaData metaData = rs.getMetaData();
int columnCount = metaData.getColumnCount();
Map<String, Object> resultMap = new LinkedHashMap<>(columnCount);
for (int i = 1; i <= columnCount; i++) {
String key = lookupColumnName(metaData, i);
Object value = getResultSetRawValue(rs, i);
resultMap.put(key, value);
}
return resultMap;
});
}
@Override
public int update(String sql) throws DataAccessException {
XLog.debug("Execute SQL: {0}", sql);
Connection connection = openConnection();
Statement statement = null;
try {
statement = connection.createStatement();
int rows = statement.executeUpdate(sql);
XLog.debug("Affected {0} rows", rows);
return rows;
} catch (SQLException e) {
XLog.error("Error execute SQL: {0}", e.getMessage(), e);
return 0;
} finally {
closeStatement(statement);
closeConnection(connection);
}
}
@Override
public int delete(String sql) throws DataAccessException {
return update(sql);
}
private Connection openConnection() {
try {
return getDataSource().getConnection();
}
catch (SQLException ex) {
throw new CannotGetJdbcConnectionException("Could not get JDBC Connection", ex);
}
}
private String lookupColumnName(ResultSetMetaData resultSetMetaData, int columnIndex) throws SQLException {
String name = resultSetMetaData.getColumnLabel(columnIndex);
if (name == null || name.isEmpty()) {
name = resultSetMetaData.getColumnName(columnIndex);
}
return name;
}
private Object getResultSetRawValue(ResultSet resultSet, int index) throws SQLException {
Object obj = resultSet.getObject(index);
String className = null;
if (obj != null) {
className = obj.getClass().getName();
}
if (obj instanceof Blob) {
Blob blob = (Blob) obj;
obj = blob.getBytes(1, (int) blob.length());
} else if (obj instanceof Clob) {
Clob clob = (Clob) obj;
obj = clob.getSubString(1, (int) clob.length());
} else if ("oracle.sql.TIMESTAMP".equals(className) || "oracle.sql.TIMESTAMPTZ".equals(className)) {
obj = resultSet.getTimestamp(index);
} else if (className != null && className.startsWith("oracle.sql.DATE")) {
String metaDataClassName = resultSet.getMetaData().getColumnClassName(index);
if ("java.sql.Timestamp".equals(metaDataClassName) || "oracle.sql.TIMESTAMP".equals(metaDataClassName)) {
obj = resultSet.getTimestamp(index);
}
else {
obj = resultSet.getDate(index);
}
} else if (obj instanceof Date) {
if ("java.sql.Timestamp".equals(resultSet.getMetaData().getColumnClassName(index))) {
obj = resultSet.getTimestamp(index);
}
}
return obj;
}
private void closeResultSet(ResultSet resultSet) {
if (resultSet != null) {
try {
resultSet.close();
} catch (SQLException e) {
XLog.debug("Could not close JDBC ResultSet", e);
} catch (Exception e) {
XLog.debug("Unexpected exception on closing JDBC ResultSet", e);
}
}
}
private void closeStatement(Statement statement) {
if (statement != null) {
try {
statement.close();
} catch (SQLException e) {
XLog.debug("Could not close JDBC Statement", e);
} catch (Exception e) {
XLog.debug("Unexpected exception on closing JDBC Statement", e);
}
}
}
private void closeConnection(Connection con) {
if (con == null) {
return;
}
try {
con.close();
} catch (SQLException e) {
XLog.debug("Could not close JDBC Connection", e);
} catch (Exception e) {
XLog.debug("Unexpected exception on closing JDBC Connection", e);
}
}
}

View File

@@ -0,0 +1,9 @@
package ghast.database;
import java.sql.ResultSet;
import java.sql.SQLException;
public interface ResultSetExtractor<T> {
T extractData(ResultSet rs) throws SQLException, DataAccessException;
}

View File

@@ -0,0 +1,9 @@
package ghast.database;
import java.sql.ResultSet;
import java.sql.SQLException;
public interface RowMapper<T> {
T mapRow(ResultSet rs, int rowNum) throws SQLException;
}

View File

@@ -0,0 +1,33 @@
package ghast.scheduler;
import lombok.RequiredArgsConstructor;
import org.bukkit.scheduler.BukkitTask;
import java.util.function.Supplier;
@RequiredArgsConstructor
public class BukkitScheduleTask implements ScheduleTask {
private final Supplier<BukkitTask> generator;
private BukkitTask bukkitTask;
@Override
public void start() {
if (isCanceled()) {
bukkitTask = generator.get();
}
}
@Override
public boolean isCanceled() {
return bukkitTask == null || bukkitTask.isCancelled();
}
@Override
public void cancel() {
if (bukkitTask != null) {
bukkitTask.cancel();
bukkitTask = null;
}
}
}

View File

@@ -0,0 +1,33 @@
package ghast.scheduler;
import lombok.RequiredArgsConstructor;
import java.util.concurrent.Future;
import java.util.function.Supplier;
@RequiredArgsConstructor
public class JavaScheduleTask implements ScheduleTask {
private final Supplier<Future<?>> generator;
private Future<?> future;
@Override
public void start() {
if (future == null || future.isDone()) {
future = generator.get();
}
}
@Override
public boolean isCanceled() {
return future == null || future.isCancelled();
}
@Override
public void cancel() {
if (future != null) {
future.cancel(true);
future = null;
}
}
}

View File

@@ -1,6 +1,7 @@
package ghast;
package ghast.scheduler;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import ghast.GhastTools;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.experimental.UtilityClass;
@@ -45,48 +46,68 @@ public class ScheduleManager {
return this;
}
public void execute(Runnable runnable) {
public ScheduleTask create(Runnable runnable) {
if (useBukkitScheduler) {
createBukkitSchedule(runnable);
return createBukkitSchedule(runnable);
} else {
createSchedule(runnable);
return createSchedule(runnable);
}
}
private void createBukkitSchedule(Runnable runnable) {
public ScheduleTask execute(Runnable runnable) {
ScheduleTask scheduleTask = create(runnable);
scheduleTask.start();
return scheduleTask;
}
private ScheduleTask createBukkitSchedule(Runnable runnable) {
BukkitScheduler bukkitScheduler = Bukkit.getScheduler();
BukkitScheduleTask resultTask;
if (this.afterMs == null && this.everyMs == null) {
bukkitScheduler.runTask(GhastTools.getPlugin(), runnable);
resultTask = new BukkitScheduleTask(() -> bukkitScheduler.runTask(GhastTools.getPlugin(), runnable));
} else if (this.everyMs != null) {
long everyTicks = this.everyMs / MS_PER_ONE_TICK;
long afterTicks = this.afterMs != null ? this.afterMs / MS_PER_ONE_TICK : 0;
bukkitScheduler.runTaskTimer(GhastTools.getPlugin(), runnable, afterTicks, everyTicks);
resultTask = new BukkitScheduleTask(() ->
bukkitScheduler.runTaskTimer(GhastTools.getPlugin(), runnable, afterTicks, everyTicks));
} else {
long ticks = this.afterMs / MS_PER_ONE_TICK;
bukkitScheduler.runTaskLater(GhastTools.getPlugin(), runnable, ticks);
resultTask = new BukkitScheduleTask(() ->
bukkitScheduler.runTaskLater(GhastTools.getPlugin(), runnable, ticks));
}
return resultTask;
}
private void createSchedule(Runnable runnable) {
private ScheduleTask createSchedule(Runnable runnable) {
ExecutorService executorService;
JavaScheduleTask resultTask;
if (this.afterMs == null && this.everyMs == null) {
executorService = Executors.newSingleThreadExecutor(THREAD_FACTORY);
executorService.execute(runnable);
resultTask = new JavaScheduleTask(() -> executorService.submit(runnable));
} else if (this.everyMs != null) {
ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(1, THREAD_FACTORY);
scheduledExecutorService.scheduleAtFixedRate(runnable,
this.afterMs != null ? this.afterMs : 0,
everyMs, TimeUnit.MILLISECONDS);
ScheduledExecutorService scheduledExecutorService
= Executors.newScheduledThreadPool(1, THREAD_FACTORY);
resultTask = new JavaScheduleTask(() ->
scheduledExecutorService.scheduleAtFixedRate(runnable,
this.afterMs != null ? this.afterMs : 0,
everyMs, TimeUnit.MILLISECONDS));
executorService = scheduledExecutorService;
} else {
ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(1, THREAD_FACTORY);
scheduledExecutorService.schedule(runnable, afterMs, TimeUnit.MILLISECONDS);
ScheduledExecutorService scheduledExecutorService
= Executors.newScheduledThreadPool(1, THREAD_FACTORY);
resultTask = new JavaScheduleTask(() ->
scheduledExecutorService.schedule(runnable, afterMs, TimeUnit.MILLISECONDS));
executorService = scheduledExecutorService;
}
executorService.shutdown();
return resultTask;
}
}
}

View File

@@ -0,0 +1,10 @@
package ghast.scheduler;
public interface ScheduleTask {
void start();
boolean isCanceled();
void cancel();
}

View File

@@ -0,0 +1,245 @@
package ghast.database;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import ghast.GhastTools;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.bukkit.plugin.Plugin;
import org.h2.jdbcx.JdbcDataSource;
import org.junit.jupiter.api.*;
import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.text.MessageFormat;
import java.util.List;
import java.util.Map;
import java.util.StringJoiner;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
class JdbcTemplateTest {
static final String JDBC_USER = "sa";
static final String JDBC_PASSWORD = "";
static final String JDBC_DB_NAME = "in_mem_db";
static final String JDBC_URL = "jdbc:h2:mem:" + JDBC_DB_NAME + ";DB_CLOSE_DELAY=-1";
static final String TABLE_NAME = "TEST_TABLE";
static final String COLUMN_ID = "ID";
static final String COLUMN_NAME = "C_NAME";
static final String COLUMN_VALUE = "C_VALUE";
static final Object[][] DATA = new Object[][]{
{ "Player 1", 100 }, { "Player 2", 250 },
{ "Player 3", 0 }, { "Player 4", 780 }
};
static DataSource dataSource;
JdbcTemplate jdbcTemplate;
@BeforeAll
static void beforeAll() {
Logger logger = Logger.getLogger(JdbcTemplateTest.class.getName());
Plugin mockPlugin = mock(Plugin.class);
when(mockPlugin.getLogger()).thenReturn(logger);
GhastTools.setPlugin(mockPlugin);
JdbcDataSource jdbcDataSource = new JdbcDataSource();
jdbcDataSource.setUser(JDBC_USER);
jdbcDataSource.setPassword(JDBC_PASSWORD);
jdbcDataSource.setURL(JDBC_URL);
dataSource = jdbcDataSource;
}
@BeforeEach
void before() {
jdbcTemplate = new JdbcTemplate(dataSource);
createTable();
String sql_head = MessageFormat.format("INSERT INTO {0} ({1}, {2}) VALUES ",
TABLE_NAME, COLUMN_NAME, COLUMN_VALUE);
StringJoiner sql_sj = new StringJoiner(", ");
for (Object[] datum : DATA) {
sql_sj.add(MessageFormat.format("( ''{0}'', {1} )", datum[0], datum[1]));
}
jdbcTemplate.execute(sql_head + sql_sj.toString());
}
@AfterEach
void after() {
dropTable();
}
@Test
void testQuery_Single() {
String sql = MessageFormat.format("SELECT {2} FROM {0} WHERE {1} LIKE ''{3}''",
TABLE_NAME, COLUMN_NAME, COLUMN_VALUE, DATA[0][0]);
Integer value = jdbcTemplate.query(sql, rs -> {
if (rs.next()) {
return rs.getInt(1);
} else {
return null;
}
});
assertEquals(DATA[0][1], value);
}
@Test
void testQuery_List() {
String sql = MessageFormat.format("SELECT {2} FROM {0} WHERE {1} LIKE ''{3}'' OR {1} LIKE ''{4}''",
TABLE_NAME, COLUMN_NAME, COLUMN_VALUE, DATA[0][0], DATA[1][0]);
List<Integer> listValues = jdbcTemplate.query(sql, (rs, rowNum) -> rs.getInt(1));
assertIterableEquals(Lists.newArrayList(DATA[0][1], DATA[1][1]), listValues);
}
@Test
void testQueryForObject() {
class Player {
String name;
int value;
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof Player)) return false;
Player player = (Player) o;
return new EqualsBuilder().append(value, player.value).append(name, player.name).isEquals();
}
@Override
public int hashCode() {
return new HashCodeBuilder(17, 37).append(name).append(value).toHashCode();
}
}
String sql = MessageFormat.format("SELECT {1}, {2} FROM {0} WHERE {1} LIKE ''{3}''",
TABLE_NAME, COLUMN_NAME, COLUMN_VALUE, DATA[0][0]);
Player actualPlayer = jdbcTemplate.queryForObject(sql, (rs, rowNum) -> {
Player player0 = new Player();
player0.name = rs.getString(COLUMN_NAME);
player0.value = rs.getInt(COLUMN_VALUE);
return player0;
});
Player expectedPlayer = new Player();
expectedPlayer.name = (String) DATA[0][0];
expectedPlayer.value = (int) DATA[0][1];
assertEquals(expectedPlayer, actualPlayer);
}
@Test
void testQueryForMap() {
String sql = MessageFormat.format("SELECT {1}, {2} FROM {0} WHERE {1} LIKE ''{3}''",
TABLE_NAME, COLUMN_NAME, COLUMN_VALUE, DATA[0][0]);
Map<String, Object> actualMap = jdbcTemplate.queryForMap(sql);
Map<String, Object> expectedMap = ImmutableMap.of(
COLUMN_NAME, DATA[0][0],
COLUMN_VALUE, DATA[0][1]);
assertIterableEquals(expectedMap.entrySet(), actualMap.entrySet());
}
@Test
void testQueryForList() {
String sql = MessageFormat.format("SELECT {1}, {2} FROM {0}",
TABLE_NAME, COLUMN_NAME, COLUMN_VALUE);
List<Map<String, Object>> actualMapList = jdbcTemplate.queryForList(sql);
List<Map<String, Object>> expectedMapList = Stream.of(DATA)
.map(datum -> ImmutableMap.of(COLUMN_NAME, datum[0], COLUMN_VALUE, datum[1]))
.collect(Collectors.toList());
assertIterableEquals(expectedMapList, actualMapList);
}
@Test
void testUpdate() {
String newName = "Player X";
String sql = MessageFormat.format("UPDATE {0} SET {1} = ''{3}'' WHERE {1} LIKE ''{2}''",
TABLE_NAME, COLUMN_NAME, DATA[0][0], newName);
int rows = jdbcTemplate.update(sql);
assertEquals(1, rows);
sql = MessageFormat.format("SELECT {2} FROM {0} WHERE {1} LIKE ''{3}''",
TABLE_NAME, COLUMN_NAME, COLUMN_VALUE, newName);
Integer value = jdbcTemplate.query(sql, rs -> {
if (rs.next()) {
return rs.getInt(1);
} else {
return null;
}
});
assertEquals(DATA[0][1], value);
}
private void createTable() {
jdbcTemplate.execute("CREATE TABLE " + TABLE_NAME + " (" +
COLUMN_ID + " bigint auto_increment," +
COLUMN_NAME + " varchar(16)," +
COLUMN_VALUE + " integer)");
}
private void dropTable() {
jdbcTemplate.execute("DROP TABLE IF EXISTS " + TABLE_NAME);
}
@Nested
class JdbcTemplateTest_ExecuteTestCase {
@BeforeEach
void before() {
jdbcTemplate = new JdbcTemplate(dataSource);
dropTable();
}
@AfterEach
void after() {
dropTable();
}
@Test
void test() throws ClassNotFoundException, IllegalAccessException, InstantiationException, SQLException {
createTable();
//region Check result
Class.forName("org.h2.Driver").newInstance();
Connection connection = DriverManager.getConnection(JDBC_URL, JDBC_USER, JDBC_PASSWORD);
ResultSet resultSet = connection.getMetaData().getTables(JDBC_DB_NAME.toUpperCase(), "PUBLIC",
TABLE_NAME.toUpperCase(), new String[]{"TABLE"});
assertTrue(resultSet.next());
resultSet.close();
connection.close();
//endregion
}
}
}