Finished
This commit is contained in:
@@ -1,11 +1,9 @@
|
||||
package org.openautonomousconnection.insserver;
|
||||
|
||||
import dev.unlegitdqrk.unlegitlibrary.file.ConfigurationManager;
|
||||
import org.openautonomousconnection.protocol.side.ins.ProtocolINSServer;
|
||||
import org.openautonomousconnection.protocol.versions.v1_0_0.beta.INSRecord;
|
||||
import org.openautonomousconnection.protocol.versions.v1_0_0.beta.INSRecordType;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.security.cert.CertificateException;
|
||||
import java.sql.*;
|
||||
@@ -37,6 +35,14 @@ public final class DatabaseINSServer extends ProtocolINSServer {
|
||||
this.jdbcPassword = jdbcPassword;
|
||||
}
|
||||
|
||||
private static int safeInt(int v) {
|
||||
return v;
|
||||
}
|
||||
|
||||
private static String safeString(String s) {
|
||||
return s == null ? "" : s;
|
||||
}
|
||||
|
||||
private Connection openConnection() throws SQLException {
|
||||
return DriverManager.getConnection(jdbcUrl, jdbcUser, jdbcPassword);
|
||||
}
|
||||
@@ -211,14 +217,6 @@ public final class DatabaseINSServer extends ProtocolINSServer {
|
||||
.thenComparing(r -> safeString(r.value), String.CASE_INSENSITIVE_ORDER);
|
||||
}
|
||||
|
||||
private static int safeInt(int v) {
|
||||
return v;
|
||||
}
|
||||
|
||||
private static String safeString(String s) {
|
||||
return s == null ? "" : s;
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads all records of a given type for (infoname_id, subname_id).
|
||||
*
|
||||
|
||||
@@ -17,7 +17,8 @@ import java.util.Scanner;
|
||||
|
||||
public class Main {
|
||||
public static final CommandPermission PERMISSION_ALL = new CommandPermission("all", 1);
|
||||
private static final CommandExecutor commandExecutor = new CommandExecutor("INS", PERMISSION_ALL) {};
|
||||
private static final CommandExecutor commandExecutor = new CommandExecutor("INS", PERMISSION_ALL) {
|
||||
};
|
||||
@Getter
|
||||
private static CommandManager commandManager;
|
||||
|
||||
@@ -68,8 +69,8 @@ public class Main {
|
||||
config.saveProperties();
|
||||
}
|
||||
|
||||
if (!config.isSet("ins.frontend")) {
|
||||
config.set("ins.frontend", "INS FRONTEND SITE (HOST)");
|
||||
if (!config.isSet("ins.ins.frontend")) {
|
||||
config.set("ins.ins.frontend", "INS FRONTEND SITE (HOST)");
|
||||
config.saveProperties();
|
||||
}
|
||||
|
||||
@@ -80,7 +81,7 @@ public class Main {
|
||||
int tcpPort = config.getInt("port");
|
||||
|
||||
String info = config.getString("ins.info");
|
||||
String frontend = config.getString("ins.frontend");
|
||||
String frontend = config.getString("ins.ins.frontend");
|
||||
|
||||
DatabaseINSServer server = new DatabaseINSServer(info, frontend, url, user, password);
|
||||
protocolBridge = new ProtocolBridge(server, values, ProtocolVersion.PV_1_0_0_BETA, new File("logs"));
|
||||
|
||||
@@ -2,8 +2,6 @@ package org.openautonomousconnection.insserver.commands;
|
||||
|
||||
import dev.unlegitdqrk.unlegitlibrary.command.Command;
|
||||
import dev.unlegitdqrk.unlegitlibrary.command.CommandExecutor;
|
||||
import dev.unlegitdqrk.unlegitlibrary.command.CommandManager;
|
||||
import dev.unlegitdqrk.unlegitlibrary.command.CommandPermission;
|
||||
import org.openautonomousconnection.insserver.Main;
|
||||
|
||||
import javax.management.InstanceAlreadyExistsException;
|
||||
|
||||
Reference in New Issue
Block a user