trueog/Staff-OG-Legacy
Archived
2
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update gradle to 8.14.3, add formatting

Browse Source
This commit is contained in:
NotAlexNoyle committed 2025-08-15 16:45:41 -04:00
1 parent 0cd5f83311
commit 748b5fd8b8
61 files changed
+3261 -1122
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build.gradle.kts
+73 -39
View File
@@ -1,52 +1,59 @@
/* This is free and unencumbered software released into the public domain */
/* ------------------------------ Plugins ------------------------------ */
plugins {
id("java") // Tell gradle this is a java project.
id("java-library") // Import helper for source-based libraries.
id("com.diffplug.spotless") version "7.0.4" // Import auto-formatter.
id("com.gradleup.shadow") version "8.3.6" // Import shadow API.
eclipse // Import eclipse plugin for IDE integration.
id("java") // Import Java plugin.
id("java-library") // Import Java Library plugin.
id("com.diffplug.spotless") version "7.0.4" // Import Spotless plugin.
id("com.gradleup.shadow") version "8.3.6" // Import Shadow plugin.
id("checkstyle") // Import Checkstyle plugin.
eclipse // Import Eclipse plugin.
kotlin("jvm") version "2.1.21" // Import Kotlin JVM plugin.
id("io.freefair.lombok") version "8.13.1" // Automatic lombok support.
}
/* --------------------------- JDK / Kotlin ---------------------------- */
java {
sourceCompatibility = JavaVersion.VERSION_17
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
vendor.set(JvmVendorSpec.GRAAL_VM)
sourceCompatibility = JavaVersion.VERSION_17 // Compile with JDK 17 compatibility.
toolchain { // Select Java toolchain.
languageVersion.set(JavaLanguageVersion.of(17)) // Use JDK 17.
vendor.set(JvmVendorSpec.GRAAL_VM) // Use GraalVM CE.
}
}
group = "uk.hotten.staffog" // Declare bundle identifier.
kotlin { jvmToolchain(17) }
version = "1.0-beta" // Declare plugin version (will be in .jar).
/* ----------------------------- Metadata ------------------------------ */
group = "net.trueog.staff-og" // Declare bundle identifier.
version = "1.0" // Declare plugin version (will be in .jar).
val apiVersion = "1.19" // Declare minecraft server target version.
/* ----------------------------- Resources ----------------------------- */
tasks.named<ProcessResources>("processResources") {
val props = mapOf("version" to version, "apiVersion" to apiVersion)
inputs.properties(props) // Indicates to rerun if version changes.
filesMatching("plugin.yml") { expand(props) }
from("LICENSE") { // Bundle license into .jars.
into("/")
}
from("LICENSE") { into("/") } // Bundle licenses into jarfiles.
}
/* ---------------------------- Repos ---------------------------------- */
repositories {
mavenCentral()
gradlePluginPortal()
maven { url = uri("https://repo.purpurmc.org/snapshots") }
maven { url = uri("https://repo.purpurmc.org/snapshots") }
maven { url = uri("https://jitpack.io") }
mavenCentral() // Import the Maven Central Maven Repository.
gradlePluginPortal() // Import the Gradle Plugin Portal Maven Repository.
maven { url = uri("https://repo.purpurmc.org/snapshots") } // Import the PurpurMC Maven Repository.
maven { url = uri("https://jitpack.io") } // Import the Jitpack Maven Repository.
}
/* ---------------------- Java project deps ---------------------------- */
dependencies {
compileOnly("com.google.code.gson:gson:2.10.1") // Import google gson API.
compileOnly("commons-io:commons-io:2.11.0") // Import google commons API.
compileOnly("org.apache.commons:commons-pool2:2.11.1") // Import apache commons API.
compileOnly("jakarta.xml.bind:jakarta.xml.bind-api:4.0.0") // Import jakarta xml bind API.
compileOnly("mysql:mysql-connector-java:8.0.32") // Import mysql connector API.
compileOnly("org.purpurmc.purpur:purpur-api:1.19.4-R0.1-SNAPSHOT") // Declare purpur API version to be packaged.
compileOnly("org.purpurmc.purpur:purpur-api:1.19.4-R0.1-SNAPSHOT") // Declare Purpur API version to be packaged.
compileOnly("com.github.MilkBowl:VaultAPI:1.7") // Import Vault API.
implementation("org.jooq:jooq:3.18.4") // Import jooq API.
implementation("org.reactivestreams:reactive-streams:1.0.4") // Import reactive streams API.
@@ -55,7 +62,9 @@ dependencies {
implementation("org.mariadb:r2dbc-mariadb:1.3.0") // Import R2DBC driver.
}
// Utility functions
/* ---------------------- Utility functions ---------------------------- */
// Update the plugin.yml version.
fun revertPluginYmlVersion() {
val yaml = file("src/main/resources/plugin.yml")
val lines = yaml.readLines().toMutableList()
@@ -94,11 +103,13 @@ val updatePluginYmlVersion =
}
}
/* ---------------------- Reproducible jars ---------------------------- */
tasks.withType<AbstractArchiveTask>().configureEach { // Ensure reproducible .jars
isPreserveFileTimestamps = false
isReproducibleFileOrder = true
}
/* ----------------------------- Shadow -------------------------------- */
tasks.shadowJar {
archiveClassifier.set(currentGitBranch())
from("LICENSE") { into("/") }
@@ -124,29 +135,52 @@ tasks.build {
dependsOn(tasks.shadowJar)
}
tasks.jar { archiveClassifier.set("part") }
tasks.jar { archiveClassifier.set("part") } // Applies to root jarfile only.
tasks.build { dependsOn(tasks.spotlessApply, tasks.shadowJar) } // Build depends on spotless and shadow.
/* --------------------------- Javac opts ------------------------------- */
tasks.withType<JavaCompile>().configureEach {
options.compilerArgs.add("-parameters")
options.compilerArgs.add("-Xlint:deprecation") // Triggers deprecation warning messages.
options.encoding = "UTF-8"
options.isFork = true
}
java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
vendor = JvmVendorSpec.GRAAL_VM
}
options.compilerArgs.add("-parameters") // Enable reflection for java code.
options.isFork = true // Run javac in its own process.
options.compilerArgs.add("-Xlint:deprecation") // Trigger deprecation warning messages.
options.encoding = "UTF-8" // Use UTF-8 file encoding.
}
/* ----------------------------- Auto Formatting ------------------------ */
spotless {
java {
removeUnusedImports()
palantirJavaFormat()
eclipse().configFile("config/formatter/eclipse-java-formatter.xml") // Eclipse java formatting.
leadingTabsToSpaces() // Convert leftover leading tabs to spaces.
removeUnusedImports() // Remove imports that aren't being called.
}
kotlinGradle {
ktfmt().kotlinlangStyle().configure { it.setMaxWidth(120) }
target("build.gradle.kts", "settings.gradle.kts")
ktfmt().kotlinlangStyle().configure { it.setMaxWidth(120) } // JetBrains Kotlin formatting.
target("build.gradle.kts", "settings.gradle.kts") // Gradle files to format.
}
}
checkstyle {
toolVersion = "10.18.1" // Declare checkstyle version to use.
configFile = file("config/checkstyle/checkstyle.xml") // Point checkstyle to config file.
isIgnoreFailures = true // Don't fail the build if checkstyle does not pass.
isShowViolations = true // Show the violations in any IDE with the checkstyle plugin.
}
tasks.named("compileJava") {
dependsOn("spotlessApply") // Run spotless before compiling with the JDK.
}
tasks.named("spotlessCheck") {
dependsOn("spotlessApply") // Run spotless before checking if spotless ran.
}
/* ------------------------------ Eclipse SHIM ------------------------- */
// This can't be put in eclipse.gradle.kts because Gradle is weird.
subprojects {
apply(plugin = "java-library")
apply(plugin = "eclipse")
eclipse.project.name = "${project.name}-${rootProject.name}"
tasks.withType<Jar>().configureEach { archiveBaseName.set("${project.name}-${rootProject.name}") }
}
config/checkstyle/checkstyle.xml
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd">
<module name="Checker">
<module name="FileTabCharacter">
<property name="eachLine" value="true"/>
<property name="severity" value="error"/>
</module>
<module name="TreeWalker">
<module name="FinalLocalVariable"/>
<module name="AvoidStarImport"/>
<module name="Indentation">
<property name="severity" value="ignore"/>
</module>
</module>
<module name="RegexpSingleline">
<property name="format" value="\borg\.junit\.jupiter\.api\.Assertions\.fail\s*\(\s*&quot;Not yet implemented&quot;\s*\)\s*;"/>
<property name="message" value="Remove placeholder fail() and implement the test."/>
<property name="ignoreCase" value="true"/>
<property name="severity" value="warning"/>
</module>
<module name="RegexpSingleline">
<property name="format" value="(?&lt;!\w)fail\s*\(\s*&quot;Not yet implemented&quot;\s*\)\s*;"/>
<property name="message" value="Remove placeholder fail() and implement the test."/>
<property name="severity" value="warning"/>
</module>
</module>
config/formatter/eclipse-java-formatter.xml
+404
View File
@@ -0,0 +1,404 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<profiles version="23">
<profile kind="CodeFormatterProfile" name="TrueOG Network Formatting" version="23">
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.align_with_spaces" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
<setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_record_components" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant" value="49"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_annotations" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="49"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_constructor" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_declaration" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="49"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="49"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="49"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.join_line_comments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow" value="20"/>
<setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="49"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_assertion_message" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
</profile>
</profiles>
gradle/wrapper/gradle-wrapper.properties
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
src/main/java/uk/hotten/staffog/StaffOGPlugin.java
+7 -2
View File
@@ -47,6 +47,7 @@ public class StaffOGPlugin extends JavaPlugin {
Console.error("Vault not found. Plugin will be disabled.");
getServer().getPluginManager().disablePlugin(this);
}
reportWebAddress = this.getConfig().getString("reportWebAddress");
@@ -71,6 +72,7 @@ public class StaffOGPlugin extends JavaPlugin {
databaseManager.setStatEntry("server_status", "online");
Console.info("Staff-OG is ready!");
}
@Override
@@ -79,15 +81,16 @@ public class StaffOGPlugin extends JavaPlugin {
DatabaseManager.getInstance().setStatEntry("server_status", "offline");
DatabaseManager.getInstance().setStatEntry("player_count", "0");
DatabaseManager.getInstance().setStatEntry("staff_count", "0");
}
private boolean setupVaultPerms() {
RegisteredServiceProvider<Permission> rsp =
getServer().getServicesManager().getRegistration(Permission.class);
RegisteredServiceProvider<Permission> rsp = getServer().getServicesManager().getRegistration(Permission.class);
vaultPerms = rsp.getProvider();
return vaultPerms != null;
}
// Class constructor.
@@ -95,5 +98,7 @@ public class StaffOGPlugin extends JavaPlugin {
// Pass instance of main to other classes.
return plugin;
}
}
src/main/java/uk/hotten/staffog/commands/ChatReportCommand.java
+18 -18
View File
@@ -20,12 +20,14 @@ public class ChatReportCommand implements CommandExecutor {
sender.sendMessage("ERROR: Only players can run this command!");
return true;
}
if (args == null || args.length < 2) {
Message.staffOGMessage(player, "&6Correct Usage: &e/chatreport <player> <reason>");
return true;
}
PunishManager pm = PunishManager.getInstance();
@@ -33,6 +35,7 @@ public class ChatReportCommand implements CommandExecutor {
Message.staffOGMessage(player, ("&c" + args[0] + " has not used chat in the past two minutes."));
return true;
}
UUID reported = pm.getUUIDFromChatReport(args[0]);
@@ -46,39 +49,36 @@ public class ChatReportCommand implements CommandExecutor {
Message.staffOGMessage(player, "&c Failed to generate chat report. Please try again.");
return true;
}
String staffReportId =
pm.createReportFromCR(player.getUniqueId(), reported, Integer.parseInt(chatReportId), reason);
String staffReportId = pm.createReportFromCR(player.getUniqueId(), reported, Integer.parseInt(chatReportId),
reason);
if (staffReportId == null) {
Message.staffOGMessage(
player,
Message.staffOGMessage(player,
("&cFailed to create a report to staff, however a chat log was successfully exported with ID "
+ "&f"
+ "#" + chatReportId + "&c"
+ "&f" + "#" + chatReportId + "&c"
+ ". Please create a manual report quoting this Chat Report ID on " + "&f"
+ StaffOGPlugin.getReportWebAddress()));
} else {
Message.staffOGMessage(
player,
("&a Thanks for your report! Your report reference is " + "&f"
+ "#" + staffReportId + "&a" + ". Your chat report ID is " + "&f"
+ "#" + chatReportId + "&a" + " and has been included in your report."));
Message.staffOGMessage(player,
("&a Thanks for your report! Your report reference is " + "&f" + "#" + staffReportId + "&a"
+ ". Your chat report ID is " + "&f" + "#" + chatReportId + "&a"
+ " and has been included in your report."));
Message.staffOGMessage(
player,
("&2" + "You can check the status of your report at " + "&f"
Message.staffOGMessage(player, ("&2" + "You can check the status of your report at " + "&f"
+ StaffOGPlugin.getReportWebAddress()));
Message.staffBroadcast(Message.formatNotification(
"REPORT",
"New Mutable Offences report #" + staffReportId + " by " + player.getName() + " against "
+ args[0]));
Message.staffBroadcast(Message.formatNotification("REPORT", "New Mutable Offences report #" + staffReportId
+ " by " + player.getName() + " against " + args[0]));
}
return true;
}
}
src/main/java/uk/hotten/staffog/commands/KickCommand.java
+9 -2
View File
@@ -20,6 +20,7 @@ public class KickCommand implements CommandExecutor {
Message.staffOGMessage((Player) sender, "&6Correct Usage: &e/kick <player> [reason]");
return true;
}
Player toKick = Bukkit.getServer().getPlayer(args[0]);
@@ -27,28 +28,34 @@ public class KickCommand implements CommandExecutor {
Message.staffOGMessage((Player) sender, ("&c" + args[0] + " is not online!"));
return true;
}
KickPunishEntry entry = new KickPunishEntry();
entry.setUuid(toKick.getUniqueId());
entry.setName(toKick.getName());
entry.setPlayer(toKick);
entry.setByUuid(
(sender instanceof Player) ? ((Player) sender).getUniqueId().toString() : "NCP");
entry.setByUuid((sender instanceof Player) ? ((Player) sender).getUniqueId().toString() : "NCP");
entry.setByName((sender instanceof Player) ? ((Player) sender).getName() : "NCP");
entry.setTime(System.currentTimeMillis());
if (args.length >= 2) {
ArrayList<String> preReason = new ArrayList<>(Arrays.asList(args));
preReason.remove(0);
String reason = String.join(" ", preReason);
entry.setReason(reason);
} else {
entry.setReason("No reason specified");
}
PunishManager.getInstance().newKickPunishment(entry);
Message.staffOGMessage((Player) sender, ("&7" + "You have kicked " + entry.getName() + "."));
return true;
}
}
src/main/java/uk/hotten/staffog/commands/LinkPanelCommand.java
+12 -4
View File
@@ -13,10 +13,12 @@ public class LinkPanelCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
if (!(sender instanceof Player player)) {
sender.sendMessage("ERROR: Only players can run this command!");
return true;
}
SecurityManager sm = SecurityManager.getInstance();
@@ -25,6 +27,7 @@ public class LinkPanelCommand implements CommandExecutor {
Message.staffOGMessage(player, "&cRequired data is missing, please re-log.");
return true;
}
StaffIPInfo ipInfo = sm.getStaffIPInfos().get(player.getUniqueId());
@@ -32,6 +35,7 @@ public class LinkPanelCommand implements CommandExecutor {
Message.staffOGMessage(player, ("&6Your IP has already been verified on the panel."));
return true;
}
String doesHaveCode = sm.doesPlayerHaveLinkCode(player.getUniqueId());
@@ -39,18 +43,22 @@ public class LinkPanelCommand implements CommandExecutor {
Message.staffOGMessage(player, ("&6Your activation code is &e" + doesHaveCode));
return true;
}
String code = sm.createLinkCode(
player.getUniqueId(), StaffOGPlugin.getVaultPerms().has(player, "staffog.paneladmin"));
String code = sm.createLinkCode(player.getUniqueId(),
StaffOGPlugin.getVaultPerms().has(player, "staffog.paneladmin"));
if (code == null) {
Message.staffOGMessage(
player, ("&cERROR: Failed to create activation code. Please contact an administrator."));
Message.staffOGMessage(player,
("&cERROR: Failed to create activation code. Please contact an administrator."));
return true;
}
Message.staffOGMessage(player, ("&6Your activation code is: &e" + code));
return true;
}
}
src/main/java/uk/hotten/staffog/commands/PermPunishCommand.java
+12 -9
View File
@@ -24,6 +24,7 @@ public class PermPunishCommand implements CommandExecutor {
Message.staffOGMessage((Player) sender, ("&6Correct Usage: &e/" + label + " <player> <reason>"));
return true;
}
PunishType commandType;
@@ -39,6 +40,7 @@ public class PermPunishCommand implements CommandExecutor {
Message.staffOGMessage((Player) sender, ("&cERROR: Unsupported type for command."));
return true;
}
UUID uuid = PunishManager.getInstance().getUUIDFromName(args[0]);
@@ -46,17 +48,16 @@ public class PermPunishCommand implements CommandExecutor {
Message.staffOGMessage((Player) sender, ("&c" + args[0] + " has never joined the server!"));
return true;
}
PunishEntry isPunished = PunishManager.getInstance().checkActivePunishment(commandType, uuid);
if (isPunished != null) {
Message.staffOGMessage(
(Player) sender,
("&c" + args[0] + " is already " + commandType.getBroadcastMessage() + " for "
+ TimeUtils.formatMillisecondTime(isPunished.calculateRemaining()))
+ ".");
Message.staffOGMessage((Player) sender, ("&c" + args[0] + " is already " + commandType.getBroadcastMessage()
+ " for " + TimeUtils.formatMillisecondTime(isPunished.calculateRemaining())) + ".");
return true;
}
OfflinePlayer player = Bukkit.getServer().getOfflinePlayer(uuid);
@@ -67,9 +68,10 @@ public class PermPunishCommand implements CommandExecutor {
if (player.isOnline()) {
entry.setPlayer(player.getPlayer());
}
entry.setByUuid(
(sender instanceof Player) ? ((Player) sender).getUniqueId().toString() : "NCP");
entry.setByUuid((sender instanceof Player) ? ((Player) sender).getUniqueId().toString() : "NCP");
entry.setByName((sender instanceof Player) ? ((Player) sender).getName() : "NCP");
entry.setTime(System.currentTimeMillis());
entry.setUntil(-1);
@@ -83,9 +85,10 @@ public class PermPunishCommand implements CommandExecutor {
PunishManager.getInstance().newPunishment(entry);
Message.staffOGMessage(
(Player) sender,
Message.staffOGMessage((Player) sender,
("&7You have " + commandType.getBroadcastMessage() + " " + entry.getName() + " for permanent."));
return true;
}
}
src/main/java/uk/hotten/staffog/commands/TempPunishCommand.java
+29 -15
View File
@@ -24,9 +24,10 @@ public class TempPunishCommand implements CommandExecutor {
if (args == null || args.length < 4) {
Message.staffOGMessage(
(Player) sender, ("&6Correct Usage: &e/" + label + " <player> <unit> <amount> <reason>"));
Message.staffOGMessage((Player) sender,
("&6Correct Usage: &e/" + label + " <player> <unit> <amount> <reason>"));
return true;
}
int amount;
@@ -38,37 +39,49 @@ public class TempPunishCommand implements CommandExecutor {
Message.staffOGMessage((Player) sender, ("&cERROR: The amount of units must be a number!"));
return true;
}
Date currentTime = new Date(System.currentTimeMillis());
long untilTime;
switch (args[1].toLowerCase()) {
case "d": {
untilTime = DateUtils.addDays(currentTime, amount).getTime();
break;
}
case "w": {
untilTime = DateUtils.addWeeks(currentTime, amount).getTime();
break;
}
case "m": {
untilTime = DateUtils.addMonths(currentTime, amount).getTime();
break;
}
case "y": {
untilTime = DateUtils.addYears(currentTime, amount).getTime();
break;
}
default: {
Message.staffOGMessage(
(Player) sender,
Message.staffOGMessage((Player) sender,
("&cERROR: Invalid time unit. &6Please supply: &e(d)ay, (w)eek, (m)onth or (y)ear&6."));
return true;
}
}
PunishType commandType;
@@ -84,6 +97,7 @@ public class TempPunishCommand implements CommandExecutor {
Message.staffOGMessage((Player) sender, ("&cERROR: Unsupported type for command."));
return true;
}
UUID uuid = PunishManager.getInstance().getUUIDFromName(args[0]);
@@ -91,17 +105,16 @@ public class TempPunishCommand implements CommandExecutor {
Message.staffOGMessage((Player) sender, ("&c" + args[0] + " has never joined the server!"));
return true;
}
PunishEntry isPunished = PunishManager.getInstance().checkActivePunishment(commandType, uuid);
if (isPunished != null) {
Message.staffOGMessage(
(Player) sender,
("&c" + args[0] + " is already " + commandType.getBroadcastMessage() + " for "
+ TimeUtils.formatMillisecondTime(isPunished.calculateRemaining()))
+ ".");
Message.staffOGMessage((Player) sender, ("&c" + args[0] + " is already " + commandType.getBroadcastMessage()
+ " for " + TimeUtils.formatMillisecondTime(isPunished.calculateRemaining())) + ".");
return true;
}
OfflinePlayer player = Bukkit.getServer().getOfflinePlayer(uuid);
@@ -113,9 +126,10 @@ public class TempPunishCommand implements CommandExecutor {
if (player.isOnline()) {
entry.setPlayer(player.getPlayer());
}
entry.setByUuid(
(sender instanceof Player) ? ((Player) sender).getUniqueId().toString() : "NCP");
entry.setByUuid((sender instanceof Player) ? ((Player) sender).getUniqueId().toString() : "NCP");
entry.setByName((sender instanceof Player) ? ((Player) sender).getName() : "NCP");
entry.setTime(currentTime.getTime());
entry.setUntil(untilTime);
@@ -130,10 +144,10 @@ public class TempPunishCommand implements CommandExecutor {
PunishManager.getInstance().newPunishment(entry);
Message.staffOGMessage(
(Player) sender,
("&7" + "You have " + commandType.getBroadcastMessage() + " " + entry.getName() + " for "
+ TimeUtils.formatMillisecondTime(entry.calculateDuration()) + "."));
Message.staffOGMessage((Player) sender, ("&7" + "You have " + commandType.getBroadcastMessage() + " "
+ entry.getName() + " for " + TimeUtils.formatMillisecondTime(entry.calculateDuration()) + "."));
return true;
}
}
src/main/java/uk/hotten/staffog/commands/UnpunishCommand.java
+11 -6
View File
@@ -21,6 +21,7 @@ public class UnpunishCommand implements CommandExecutor {
Message.staffOGMessage((Player) sender, ("&6Correct Usage: &e/" + label + " <player> <reason>"));
return true;
}
PunishType commandType;
@@ -36,6 +37,7 @@ public class UnpunishCommand implements CommandExecutor {
Message.staffOGMessage((Player) sender, ("&cERROR: Unsupported type for command."));
return true;
}
UUID uuid = PunishManager.getInstance().getUUIDFromName(args[0]);
@@ -43,18 +45,19 @@ public class UnpunishCommand implements CommandExecutor {
Message.staffOGMessage((Player) sender, ("&e" + args[0] + " has never joined the server!"));
return true;
}
PunishEntry entry = PunishManager.getInstance().checkActivePunishment(commandType, uuid);
if (entry == null) {
Message.staffOGMessage(
(Player) sender, ("&c" + args[0] + " is not currently " + commandType.getBroadcastMessage() + "."));
Message.staffOGMessage((Player) sender,
("&c" + args[0] + " is not currently " + commandType.getBroadcastMessage() + "."));
return true;
}
entry.setRemovedUuid(
(sender instanceof Player) ? ((Player) sender).getUniqueId().toString() : "Console");
entry.setRemovedUuid((sender instanceof Player) ? ((Player) sender).getUniqueId().toString() : "Console");
entry.setRemovedName((sender instanceof Player) ? ((Player) sender).getName() : "Console");
ArrayList<String> preReason = new ArrayList<>(Arrays.asList(args));
@@ -63,9 +66,11 @@ public class UnpunishCommand implements CommandExecutor {
entry.setRemovedReason(reason);
PunishManager.getInstance().removePunishment(entry);
Message.staffOGMessage(
(Player) sender, ("&7You have un" + commandType.getBroadcastMessage() + " " + entry.getName() + "."));
Message.staffOGMessage((Player) sender,
("&7You have un" + commandType.getBroadcastMessage() + " " + entry.getName() + "."));
return true;
}
}
src/main/java/uk/hotten/staffog/data/DataEventListener.java
+7 -3
View File
@@ -14,12 +14,14 @@ public class DataEventListener implements Listener {
public void onJoin(PlayerJoinEvent event) {
updatePlayerCounts();
}
@EventHandler
public void onQuit(PlayerQuitEvent event) {
Bukkit.getServer().getScheduler().runTaskLater(DatabaseManager.getPlugin(), this::updatePlayerCounts, 10);
}
private void updatePlayerCounts() {
@@ -27,9 +29,7 @@ public class DataEventListener implements Listener {
DatabaseManager dbm = DatabaseManager.getInstance();
// All players
dbm.setStatEntry(
"player_count",
String.valueOf(Bukkit.getServer().getOnlinePlayers().size()));
dbm.setStatEntry("player_count", String.valueOf(Bukkit.getServer().getOnlinePlayers().size()));
// Staff
int amount = 0;
@@ -38,9 +38,13 @@ public class DataEventListener implements Listener {
if (StaffOGPlugin.getVaultPerms().has(p, "staffog.isstaff")) {
amount++;
}
}
dbm.setStatEntry("staff_count", String.valueOf(amount));
}
}
src/main/java/uk/hotten/staffog/data/DatabaseManager.java
+164 -94
View File
@@ -27,26 +27,37 @@ public class DatabaseManager {
private int port;
public DatabaseManager(JavaPlugin plugin) {
DatabaseManager.plugin = plugin;
instance = this;
String sqlType = plugin.getConfig().getString("sqlType");
if (sqlType == null) {
Console.error("NO SQL TYPE SELECTED. DEFAULTING TO MYSQL.");
driver = "com.mysql.jdbc.Driver";
driverUrl = "mysql";
} else {
if (sqlType.equalsIgnoreCase("mysql")) {
driver = "com.mysql.jdbc.Driver";
driverUrl = "mysql";
} else if (sqlType.equals("mariadb")) {
driver = "org.mariadb.jdbc.Driver";
driverUrl = "mariadb";
} else {
Console.error("INVALID SQL TYPE, PLEASE USE EITHER MYSQL OR MARIADB. DEFAULTING TO MYSQL.");
driver = "com.mysql.jdbc.Driver";
driverUrl = "mysql";
}
}
host = plugin.getConfig().getString("sqlHost");
@@ -57,7 +68,8 @@ public class DatabaseManager {
plugin.getServer().getPluginManager().registerEvents(new DataEventListener(), plugin);
for (PunishType pt : PunishType.values()) checkPunishmentTable(pt.getTable());
for (PunishType pt : PunishType.values())
checkPunishmentTable(pt.getTable());
checkKickTable();
checkNameHistoryTable();
checkTaskTable();
@@ -69,357 +81,411 @@ public class DatabaseManager {
checkAppealTable();
checkReportTable();
checkChatReportTable();
}
public Connection createConnection() throws SQLException, ClassNotFoundException {
synchronized (this) {
Class.forName(driver);
return DriverManager.getConnection(
"jdbc:" + driverUrl + "://" + host + ":" + port + "/" + database + "?userSSL=false",
username,
"jdbc:" + driverUrl + "://" + host + ":" + port + "/" + database + "?userSSL=false", username,
password);
}
}
private void checkPunishmentTable(String table) {
try (Connection connection = createConnection()) {
DatabaseMetaData meta = connection.getMetaData();
ResultSet resultSet = meta.getTables(null, null, table, new String[] {"TABLE"});
ResultSet resultSet = meta.getTables(null, null, table, new String[] { "TABLE" });
if (resultSet.next()) {
return;
}
// Table does not exist
Statement statement = connection.createStatement();
String sql = "CREATE TABLE `" + table + "` (" + " `id` bigint(20) NOT NULL AUTO_INCREMENT,"
+ " `uuid` varchar(36) NOT NULL,"
+ " `reason` varchar(2048) NOT NULL,"
+ " `by_uuid` varchar(36) DEFAULT NULL,"
+ " `by_name` varchar(128) DEFAULT NULL,"
+ " `removed_uuid` varchar(36) DEFAULT NULL,"
+ " `removed_name` varchar(128) DEFAULT NULL,"
+ " `removed_reason` varchar(2048) DEFAULT NULL,"
+ " `removed_time` bigint(20) DEFAULT NULL,"
+ " `time` bigint(20) NOT NULL,"
+ " `until` bigint(20) NOT NULL,"
+ " `active` bit(1) NOT NULL,"
+ " PRIMARY KEY (`id`)"
+ ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4";
+ " `uuid` varchar(36) NOT NULL," + " `reason` varchar(2048) NOT NULL,"
+ " `by_uuid` varchar(36) DEFAULT NULL," + " `by_name` varchar(128) DEFAULT NULL,"
+ " `removed_uuid` varchar(36) DEFAULT NULL," + " `removed_name` varchar(128) DEFAULT NULL,"
+ " `removed_reason` varchar(2048) DEFAULT NULL," + " `removed_time` bigint(20) DEFAULT NULL,"
+ " `time` bigint(20) NOT NULL," + " `until` bigint(20) NOT NULL," + " `active` bit(1) NOT NULL,"
+ " PRIMARY KEY (`id`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4";
statement.executeUpdate(sql);
Console.info("Created '" + table + "' table, was missing.");
} catch (Exception e) {
Console.error("Failed to check '" + table + "' table.");
e.printStackTrace();
}
}
private void checkKickTable() {
try (Connection connection = createConnection()) {
DatabaseMetaData meta = connection.getMetaData();
ResultSet resultSet = meta.getTables(null, null, "staffog_kick", new String[] {"TABLE"});
ResultSet resultSet = meta.getTables(null, null, "staffog_kick", new String[] { "TABLE" });
if (resultSet.next()) {
return;
}
// Table does not exist
Statement statement = connection.createStatement();
String sql = "CREATE TABLE `staffog_kick` (" + " `id` bigint(20) NOT NULL AUTO_INCREMENT,"
+ " `uuid` varchar(36) NOT NULL,"
+ " `reason` varchar(2048) NOT NULL,"
+ " `by_uuid` varchar(36) NOT NULL,"
+ " `by_name` varchar(128) NOT NULL,"
+ " `time` bigint(20) NOT NULL,"
+ " PRIMARY KEY (`id`)"
+ " `uuid` varchar(36) NOT NULL," + " `reason` varchar(2048) NOT NULL,"
+ " `by_uuid` varchar(36) NOT NULL," + " `by_name` varchar(128) NOT NULL,"
+ " `time` bigint(20) NOT NULL," + " PRIMARY KEY (`id`)"
+ ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4";
statement.executeUpdate(sql);
Console.info("Created 'staffog_kick' table, was missing.");
} catch (Exception e) {
Console.error("Failed to check 'staffog_kick' table.");
e.printStackTrace();
}
}
private void checkNameHistoryTable() {
try (Connection connection = createConnection()) {
DatabaseMetaData meta = connection.getMetaData();
ResultSet resultSet = meta.getTables(null, null, "staffog_history", new String[] {"TABLE"});
ResultSet resultSet = meta.getTables(null, null, "staffog_history", new String[] { "TABLE" });
if (resultSet.next()) {
return;
}
// Table does not exist
Statement statement = connection.createStatement();
String sql = "CREATE TABLE `staffog_history` (" + " `id` int NOT NULL AUTO_INCREMENT,"
+ " `date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,"
+ " `name` varchar(16) NOT NULL,"
+ " `uuid` varchar(36) NOT NULL,"
+ " PRIMARY KEY (`id`)"
+ " `date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP," + " `name` varchar(16) NOT NULL,"
+ " `uuid` varchar(36) NOT NULL," + " PRIMARY KEY (`id`)"
+ ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4";
statement.executeUpdate(sql);
Console.info("Created 'staffog_history' table, was missing.");
} catch (Exception e) {
Console.error("Failed to check 'staffog_history' table.");
e.printStackTrace();
}
}
private void checkTaskTable() {
try (Connection connection = createConnection()) {
DatabaseMetaData meta = connection.getMetaData();
ResultSet resultSet = meta.getTables(null, null, "staffog_task", new String[] {"TABLE"});
ResultSet resultSet = meta.getTables(null, null, "staffog_task", new String[] { "TABLE" });
if (resultSet.next()) {
return;
}
// Table does not exist
Statement statement = connection.createStatement();
String sql = "CREATE TABLE `staffog_task` (" + " `id` int(11) NOT NULL AUTO_INCREMENT,"
+ " `task` varchar(2048) NOT NULL,"
+ " `data` varchar(2048) NOT NULL,"
+ " PRIMARY KEY (`id`)"
+ " `task` varchar(2048) NOT NULL," + " `data` varchar(2048) NOT NULL," + " PRIMARY KEY (`id`)"
+ ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4";
statement.executeUpdate(sql);
Console.info("Created 'staffog_task' table, was missing.");
} catch (Exception e) {
Console.error("Failed to check 'staffog_task' table.");
e.printStackTrace();
}
}
private void checkStatTable() {
try (Connection connection = createConnection()) {
DatabaseMetaData meta = connection.getMetaData();
ResultSet resultSet = meta.getTables(null, null, "staffog_stat", new String[] {"TABLE"});
ResultSet resultSet = meta.getTables(null, null, "staffog_stat", new String[] { "TABLE" });
if (resultSet.next()) {
return;
}
// Table does not exist
Statement statement = connection.createStatement();
String sql = "CREATE TABLE `staffog_stat` (" + " `name` varchar(2048) NOT NULL,"
+ " `stat` varchar(2048) NOT NULL,"
+ " UNIQUE KEY `name` (`name`) USING HASH"
+ " `stat` varchar(2048) NOT NULL," + " UNIQUE KEY `name` (`name`) USING HASH"
+ ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4";
statement.executeUpdate(sql);
Console.info("Created 'staffog_stat' table, was missing.");
} catch (Exception e) {
Console.error("Failed to check 'staffog_stat' table.");
e.printStackTrace();
}
}
private boolean doesStatIncludeEntry(String entry) {
try (Connection connection = createConnection()) {
DSLContext dsl = DSL.using(connection);
return dsl.fetchExists(dsl.selectFrom(STAFFOG_STAT).where(STAFFOG_STAT.NAME.eq(entry)));
} catch (Exception e) {
e.printStackTrace();
return false;
}
}
public void setStatEntry(String entry, String stat) {
try (Connection connection = createConnection()) {
DSLContext dsl = DSL.using(connection);
if (!doesStatIncludeEntry(entry)) {
dsl.insertInto(STAFFOG_STAT)
.set(STAFFOG_STAT.NAME, entry)
.set(STAFFOG_STAT.STAT, stat)
.execute();
dsl.insertInto(STAFFOG_STAT).set(STAFFOG_STAT.NAME, entry).set(STAFFOG_STAT.STAT, stat).execute();
} else {
dsl.update(STAFFOG_STAT)
.set(STAFFOG_STAT.STAT, stat)
.where(STAFFOG_STAT.NAME.eq(entry))
.execute();
dsl.update(STAFFOG_STAT).set(STAFFOG_STAT.STAT, stat).where(STAFFOG_STAT.NAME.eq(entry)).execute();
}
} catch (Exception e) {
e.printStackTrace();
}
}
private void checkWebTable() {
try (Connection connection = createConnection()) {
DatabaseMetaData meta = connection.getMetaData();
ResultSet resultSet = meta.getTables(null, null, "staffog_web", new String[] {"TABLE"});
ResultSet resultSet = meta.getTables(null, null, "staffog_web", new String[] { "TABLE" });
if (resultSet.next()) {
return;
}
// Table does not exist
Statement statement = connection.createStatement();
String sql = "CREATE TABLE `staffog_web` (" + " `id` int(11) NOT NULL AUTO_INCREMENT,"
+ " `username` varchar(128) NOT NULL,"
+ " `uuid` varchar(36) NOT NULL,"
+ " `password` varchar(2048) NOT NULL,"
+ " `active` bit(1) NOT NULL DEFAULT b'1',"
+ " `admin` bit(1) NOT NULL,"
+ " PRIMARY KEY (`id`),"
+ " UNIQUE KEY `username` (`username`,`uuid`)"
+ ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4";
+ " `username` varchar(128) NOT NULL," + " `uuid` varchar(36) NOT NULL,"
+ " `password` varchar(2048) NOT NULL," + " `active` bit(1) NOT NULL DEFAULT b'1',"
+ " `admin` bit(1) NOT NULL," + " PRIMARY KEY (`id`),"
+ " UNIQUE KEY `username` (`username`,`uuid`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4";
statement.executeUpdate(sql);
Console.info("Created 'staffog_web' table, was missing.");
} catch (Exception e) {
Console.error("Failed to check 'staffog_web' table.");
e.printStackTrace();
}
}
private void checkLinkCodeTable() {
try (Connection connection = createConnection()) {
DatabaseMetaData meta = connection.getMetaData();
ResultSet resultSet = meta.getTables(null, null, "staffog_linkcode", new String[] {"TABLE"});
ResultSet resultSet = meta.getTables(null, null, "staffog_linkcode", new String[] { "TABLE" });
if (resultSet.next()) {
return;
}
// Table does not exist
Statement statement = connection.createStatement();
String sql = "CREATE TABLE `staffog_linkcode` (" + " `uuid` varchar(36) NOT NULL,"
+ " `code` varchar(5) NOT NULL,"
+ " `admin` bit(1) NOT NULL,"
+ " UNIQUE KEY `uuid` (`uuid`)"
+ " `code` varchar(5) NOT NULL," + " `admin` bit(1) NOT NULL," + " UNIQUE KEY `uuid` (`uuid`)"
+ ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4";
statement.executeUpdate(sql);
Console.info("Created 'staffog_linkcode' table, was missing.");
} catch (Exception e) {
Console.error("Failed to check 'staffog_linkcode' table.");
e.printStackTrace();
}
}
private void checkStaffIpTable() {
try (Connection connection = createConnection()) {
DatabaseMetaData meta = connection.getMetaData();
ResultSet resultSet = meta.getTables(null, null, "staffog_staffip", new String[] {"TABLE"});
ResultSet resultSet = meta.getTables(null, null, "staffog_staffip", new String[] { "TABLE" });
if (resultSet.next()) {
return;
}
// Table does not exist
Statement statement = connection.createStatement();
String sql = "CREATE TABLE `staffog_staffip` (" + " `id` int(11) NOT NULL AUTO_INCREMENT,"
+ " `ip` varchar(15) NOT NULL,"
+ " `uuid` varchar(36) NOT NULL,"
+ " `initial` bit(1) NOT NULL,"
+ " `panel_acknowledged` bit(1) NOT NULL,"
+ " `panel_verified` bit(1) NOT NULL,"
+ " `game_verified` bit(1) NOT NULL,"
+ " PRIMARY KEY (`id`)"
+ " `ip` varchar(15) NOT NULL," + " `uuid` varchar(36) NOT NULL," + " `initial` bit(1) NOT NULL,"
+ " `panel_acknowledged` bit(1) NOT NULL," + " `panel_verified` bit(1) NOT NULL,"
+ " `game_verified` bit(1) NOT NULL," + " PRIMARY KEY (`id`)"
+ ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4";
statement.executeUpdate(sql);
Console.info("Created 'staffog_staffip' table, was missing.");
} catch (Exception e) {
Console.error("Failed to check 'staffog_staffip' table.");
e.printStackTrace();
}
}
private void checkAuditTable() {
try (Connection connection = createConnection()) {
DatabaseMetaData meta = connection.getMetaData();
ResultSet resultSet = meta.getTables(null, null, "staffog_audit", new String[] {"TABLE"});
ResultSet resultSet = meta.getTables(null, null, "staffog_audit", new String[] { "TABLE" });
if (resultSet.next()) {
return;
}
// Table does not exist
Statement statement = connection.createStatement();
String sql = "CREATE TABLE `staffog_audit` (" + " `id` int(11) NOT NULL AUTO_INCREMENT,"
+ " `type` varchar(2048) NOT NULL,"
+ " `data` varchar(2048) NOT NULL,"
+ " `time` bigint(20) NOT NULL,"
+ " PRIMARY KEY (`id`)"
+ " `type` varchar(2048) NOT NULL," + " `data` varchar(2048) NOT NULL,"
+ " `time` bigint(20) NOT NULL," + " PRIMARY KEY (`id`)"
+ ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4";
statement.executeUpdate(sql);
Console.info("Created 'staffog_audit' table, was missing.");
} catch (Exception e) {
Console.error("Failed to check 'staffog_audit' table.");
e.printStackTrace();
}
}
private void checkAppealTable() {
try (Connection connection = createConnection()) {
DatabaseMetaData meta = connection.getMetaData();
ResultSet resultSet = meta.getTables(null, null, "staffog_appeal", new String[] {"TABLE"});
ResultSet resultSet = meta.getTables(null, null, "staffog_appeal", new String[] { "TABLE" });
if (resultSet.next()) {
return;
}
// Table does not exist
Statement statement = connection.createStatement();
String sql = "CREATE TABLE `staffog_appeal` (" + " `id` int NOT NULL AUTO_INCREMENT,"
+ " `uuid` varchar(36) COLLATE utf8mb4_general_ci NOT NULL,"
+ " `time` bigint NOT NULL,"
+ " `type` varchar(128) COLLATE utf8mb4_general_ci NOT NULL,"
+ " `pid` int NOT NULL,"
+ " `uuid` varchar(36) COLLATE utf8mb4_general_ci NOT NULL," + " `time` bigint NOT NULL,"
+ " `type` varchar(128) COLLATE utf8mb4_general_ci NOT NULL," + " `pid` int NOT NULL,"
+ " `reason` varchar(2048) COLLATE utf8mb4_general_ci NOT NULL,"
+ " `evidence` varchar(2048) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '[]',"
+ " `open` bit(1) NOT NULL DEFAULT b'1',"
+ " `assigned` varchar(36) COLLATE utf8mb4_general_ci DEFAULT NULL,"
+ " `verdict` bit(1) DEFAULT NULL,"
+ " `verdict_time` bigint DEFAULT NULL,"
+ " `comment` varchar(2048) COLLATE utf8mb4_general_ci DEFAULT NULL,"
+ " PRIMARY KEY (`id`)"
+ " `verdict` bit(1) DEFAULT NULL," + " `verdict_time` bigint DEFAULT NULL,"
+ " `comment` varchar(2048) COLLATE utf8mb4_general_ci DEFAULT NULL," + " PRIMARY KEY (`id`)"
+ ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4";
statement.executeUpdate(sql);
Console.info("Created 'staffog_appeal' table, was missing.");
} catch (Exception e) {
Console.error("Failed to check 'staffog_appeal' table.");
e.printStackTrace();
}
}
private void checkReportTable() {
try (Connection connection = createConnection()) {
DatabaseMetaData meta = connection.getMetaData();
ResultSet resultSet = meta.getTables(null, null, "staffog_report", new String[] {"TABLE"});
ResultSet resultSet = meta.getTables(null, null, "staffog_report", new String[] { "TABLE" });
if (resultSet.next()) {
return;
}
// Table does not exist
@@ -427,55 +493,59 @@ public class DatabaseManager {
String sql = "CREATE TABLE `staffog_report` (" + " `id` int NOT NULL AUTO_INCREMENT,"
+ " `uuid` varchar(36) COLLATE utf8mb4_general_ci NOT NULL,"
+ " `by_uuid` varchar(36) COLLATE utf8mb4_general_ci NOT NULL,"
+ " `time` bigint NOT NULL,"
+ " `by_uuid` varchar(36) COLLATE utf8mb4_general_ci NOT NULL," + " `time` bigint NOT NULL,"
+ " `type` varchar(128) COLLATE utf8mb4_general_ci NOT NULL,"
+ " `reason` varchar(2048) COLLATE utf8mb4_general_ci NOT NULL,"
+ " `evidence` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '[]',"
+ " `crid` int DEFAULT NULL,"
+ " `open` bit(1) NOT NULL DEFAULT b'1',"
+ " `crid` int DEFAULT NULL," + " `open` bit(1) NOT NULL DEFAULT b'1',"
+ " `assigned` varchar(36) COLLATE utf8mb4_general_ci DEFAULT NULL,"
+ " `verdict` bit(1) DEFAULT NULL,"
+ " `verdict_time` bigint DEFAULT NULL,"
+ " `comment` varchar(2048) COLLATE utf8mb4_general_ci DEFAULT NULL,"
+ " PRIMARY KEY (`id`)"
+ " `verdict` bit(1) DEFAULT NULL," + " `verdict_time` bigint DEFAULT NULL,"
+ " `comment` varchar(2048) COLLATE utf8mb4_general_ci DEFAULT NULL," + " PRIMARY KEY (`id`)"
+ ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4";
statement.executeUpdate(sql);
Console.info("Created 'staffog_report' table, was missing.");
} catch (Exception e) {
Console.error("Failed to check 'staffog_report' table.");
e.printStackTrace();
}
}
private void checkChatReportTable() {
try (Connection connection = createConnection()) {
DatabaseMetaData meta = connection.getMetaData();
ResultSet resultSet = meta.getTables(null, null, "staffog_chatreport", new String[] {"TABLE"});
ResultSet resultSet = meta.getTables(null, null, "staffog_chatreport", new String[] { "TABLE" });
if (resultSet.next()) {
return;
}
// Table does not exist
Statement statement = connection.createStatement();
String sql = "CREATE TABLE `staffog_chatreport` (" + " `id` int(11) NOT NULL AUTO_INCREMENT,"
+ " `uuid` varchar(36) NOT NULL,"
+ " `by_uuid` varchar(36) NOT NULL,"
+ " `time` bigint(20) NOT NULL,"
+ " `messages` varchar(2048) NOT NULL,"
+ " PRIMARY KEY (`id`)"
+ " `uuid` varchar(36) NOT NULL," + " `by_uuid` varchar(36) NOT NULL,"
+ " `time` bigint(20) NOT NULL," + " `messages` varchar(2048) NOT NULL," + " PRIMARY KEY (`id`)"
+ ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4";
statement.executeUpdate(sql);
Console.info("Created 'staffog_chatreport' table, was missing.");
} catch (Exception error) {
Console.error("Failed to check 'staffog_chatreport' table.");
error.printStackTrace();
}
}
}
src/main/java/uk/hotten/staffog/data/jooq/DefaultCatalog.java
+10 -5
View File
@@ -9,7 +9,7 @@ import org.jooq.impl.CatalogImpl;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class DefaultCatalog extends CatalogImpl {
private static final long serialVersionUID = 1L;
@@ -28,19 +28,24 @@ public class DefaultCatalog extends CatalogImpl {
* No further instances allowed
*/
private DefaultCatalog() {
super("");
}
@Override
public final List<Schema> getSchemas() {
return Arrays.asList(Staffog.STAFFOG);
}
/**
* A reference to the 3.18 minor release of the code generator. If this
* doesn't compile, it's because the runtime library uses an older minor
* release, namely: 3.18. You can turn off the generation of this reference
* by specifying /configuration/generator/generate/jooqVersionReference
* A reference to the 3.18 minor release of the code generator. If this doesn't
* compile, it's because the runtime library uses an older minor release,
* namely: 3.18. You can turn off the generation of this reference by specifying
* /configuration/generator/generate/jooqVersionReference
*/
private static final String REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_18;
}
src/main/java/uk/hotten/staffog/data/jooq/Keys.java
+41 -67
View File
@@ -31,79 +31,53 @@ import uk.hotten.staffog.data.jooq.tables.records.StaffogWebRecord;
/**
* A class modeling foreign key relationships and constraints of tables in
* Staff-OG.
* This class was generated by jOOQ.
* Staff-OG. This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Keys {
// -------------------------------------------------------------------------
// UNIQUE and PRIMARY KEY definitions
// -------------------------------------------------------------------------
public static final UniqueKey<StaffogAppealRecord> KEY_STAFFOG_APPEAL_PRIMARY = Internal.createUniqueKey(
StaffogAppeal.STAFFOG_APPEAL,
DSL.name("KEY_staffog_appeal_PRIMARY"),
new TableField[] {StaffogAppeal.STAFFOG_APPEAL.ID},
true);
public static final UniqueKey<StaffogAuditRecord> KEY_STAFFOG_AUDIT_PRIMARY = Internal.createUniqueKey(
StaffogAudit.STAFFOG_AUDIT,
DSL.name("KEY_staffog_audit_PRIMARY"),
new TableField[] {StaffogAudit.STAFFOG_AUDIT.ID},
true);
public static final UniqueKey<StaffogBanRecord> KEY_STAFFOG_BAN_PRIMARY = Internal.createUniqueKey(
StaffogBan.STAFFOG_BAN,
DSL.name("KEY_staffog_ban_PRIMARY"),
new TableField[] {StaffogBan.STAFFOG_BAN.ID},
true);
public static final UniqueKey<StaffogAppealRecord> KEY_STAFFOG_APPEAL_PRIMARY = Internal
.createUniqueKey(StaffogAppeal.STAFFOG_APPEAL, DSL.name("KEY_staffog_appeal_PRIMARY"), new TableField[]
{ StaffogAppeal.STAFFOG_APPEAL.ID }, true);
public static final UniqueKey<StaffogAuditRecord> KEY_STAFFOG_AUDIT_PRIMARY = Internal
.createUniqueKey(StaffogAudit.STAFFOG_AUDIT, DSL.name("KEY_staffog_audit_PRIMARY"), new TableField[]
{ StaffogAudit.STAFFOG_AUDIT.ID }, true);
public static final UniqueKey<StaffogBanRecord> KEY_STAFFOG_BAN_PRIMARY = Internal
.createUniqueKey(StaffogBan.STAFFOG_BAN, DSL.name("KEY_staffog_ban_PRIMARY"), new TableField[]
{ StaffogBan.STAFFOG_BAN.ID }, true);
public static final UniqueKey<StaffogChatreportRecord> KEY_STAFFOG_CHATREPORT_PRIMARY = Internal.createUniqueKey(
StaffogChatreport.STAFFOG_CHATREPORT,
DSL.name("KEY_staffog_chatreport_PRIMARY"),
new TableField[] {StaffogChatreport.STAFFOG_CHATREPORT.ID},
true);
public static final UniqueKey<StaffogHistoryRecord> KEY_STAFFOG_HISTORY_PRIMARY = Internal.createUniqueKey(
StaffogHistory.STAFFOG_HISTORY,
DSL.name("KEY_staffog_history_PRIMARY"),
new TableField[] {StaffogHistory.STAFFOG_HISTORY.ID},
true);
public static final UniqueKey<StaffogKickRecord> KEY_STAFFOG_KICK_PRIMARY = Internal.createUniqueKey(
StaffogKick.STAFFOG_KICK,
DSL.name("KEY_staffog_kick_PRIMARY"),
new TableField[] {StaffogKick.STAFFOG_KICK.ID},
true);
public static final UniqueKey<StaffogLinkcodeRecord> KEY_STAFFOG_LINKCODE_UUID = Internal.createUniqueKey(
StaffogLinkcode.STAFFOG_LINKCODE,
DSL.name("KEY_staffog_linkcode_uuid"),
new TableField[] {StaffogLinkcode.STAFFOG_LINKCODE.UUID},
true);
public static final UniqueKey<StaffogMuteRecord> KEY_STAFFOG_MUTE_PRIMARY = Internal.createUniqueKey(
StaffogMute.STAFFOG_MUTE,
DSL.name("KEY_staffog_mute_PRIMARY"),
new TableField[] {StaffogMute.STAFFOG_MUTE.ID},
true);
public static final UniqueKey<StaffogReportRecord> KEY_STAFFOG_REPORT_PRIMARY = Internal.createUniqueKey(
StaffogReport.STAFFOG_REPORT,
DSL.name("KEY_staffog_report_PRIMARY"),
new TableField[] {StaffogReport.STAFFOG_REPORT.ID},
true);
public static final UniqueKey<StaffogStaffipRecord> KEY_STAFFOG_STAFFIP_PRIMARY = Internal.createUniqueKey(
StaffogStaffip.STAFFOG_STAFFIP,
DSL.name("KEY_staffog_staffip_PRIMARY"),
new TableField[] {StaffogStaffip.STAFFOG_STAFFIP.ID},
true);
public static final UniqueKey<StaffogTaskRecord> KEY_STAFFOG_TASK_PRIMARY = Internal.createUniqueKey(
StaffogTask.STAFFOG_TASK,
DSL.name("KEY_staffog_task_PRIMARY"),
new TableField[] {StaffogTask.STAFFOG_TASK.ID},
true);
public static final UniqueKey<StaffogWebRecord> KEY_STAFFOG_WEB_PRIMARY = Internal.createUniqueKey(
StaffogWeb.STAFFOG_WEB,
DSL.name("KEY_staffog_web_PRIMARY"),
new TableField[] {StaffogWeb.STAFFOG_WEB.ID},
true);
public static final UniqueKey<StaffogWebRecord> KEY_STAFFOG_WEB_USERNAME = Internal.createUniqueKey(
StaffogWeb.STAFFOG_WEB,
DSL.name("KEY_staffog_web_username"),
new TableField[] {StaffogWeb.STAFFOG_WEB.USERNAME, StaffogWeb.STAFFOG_WEB.UUID},
true);
StaffogChatreport.STAFFOG_CHATREPORT, DSL.name("KEY_staffog_chatreport_PRIMARY"), new TableField[]
{ StaffogChatreport.STAFFOG_CHATREPORT.ID }, true);
public static final UniqueKey<StaffogHistoryRecord> KEY_STAFFOG_HISTORY_PRIMARY = Internal
.createUniqueKey(StaffogHistory.STAFFOG_HISTORY, DSL.name("KEY_staffog_history_PRIMARY"), new TableField[]
{ StaffogHistory.STAFFOG_HISTORY.ID }, true);
public static final UniqueKey<StaffogKickRecord> KEY_STAFFOG_KICK_PRIMARY = Internal
.createUniqueKey(StaffogKick.STAFFOG_KICK, DSL.name("KEY_staffog_kick_PRIMARY"), new TableField[]
{ StaffogKick.STAFFOG_KICK.ID }, true);
public static final UniqueKey<StaffogLinkcodeRecord> KEY_STAFFOG_LINKCODE_UUID = Internal
.createUniqueKey(StaffogLinkcode.STAFFOG_LINKCODE, DSL.name("KEY_staffog_linkcode_uuid"), new TableField[]
{ StaffogLinkcode.STAFFOG_LINKCODE.UUID }, true);
public static final UniqueKey<StaffogMuteRecord> KEY_STAFFOG_MUTE_PRIMARY = Internal
.createUniqueKey(StaffogMute.STAFFOG_MUTE, DSL.name("KEY_staffog_mute_PRIMARY"), new TableField[]
{ StaffogMute.STAFFOG_MUTE.ID }, true);
public static final UniqueKey<StaffogReportRecord> KEY_STAFFOG_REPORT_PRIMARY = Internal
.createUniqueKey(StaffogReport.STAFFOG_REPORT, DSL.name("KEY_staffog_report_PRIMARY"), new TableField[]
{ StaffogReport.STAFFOG_REPORT.ID }, true);
public static final UniqueKey<StaffogStaffipRecord> KEY_STAFFOG_STAFFIP_PRIMARY = Internal
.createUniqueKey(StaffogStaffip.STAFFOG_STAFFIP, DSL.name("KEY_staffog_staffip_PRIMARY"), new TableField[]
{ StaffogStaffip.STAFFOG_STAFFIP.ID }, true);
public static final UniqueKey<StaffogTaskRecord> KEY_STAFFOG_TASK_PRIMARY = Internal
.createUniqueKey(StaffogTask.STAFFOG_TASK, DSL.name("KEY_staffog_task_PRIMARY"), new TableField[]
{ StaffogTask.STAFFOG_TASK.ID }, true);
public static final UniqueKey<StaffogWebRecord> KEY_STAFFOG_WEB_PRIMARY = Internal
.createUniqueKey(StaffogWeb.STAFFOG_WEB, DSL.name("KEY_staffog_web_PRIMARY"), new TableField[]
{ StaffogWeb.STAFFOG_WEB.ID }, true);
public static final UniqueKey<StaffogWebRecord> KEY_STAFFOG_WEB_USERNAME = Internal
.createUniqueKey(StaffogWeb.STAFFOG_WEB, DSL.name("KEY_staffog_web_username"), new TableField[]
{ StaffogWeb.STAFFOG_WEB.USERNAME, StaffogWeb.STAFFOG_WEB.UUID }, true);
}
src/main/java/uk/hotten/staffog/data/jooq/Staffog.java
+12 -14
View File
@@ -22,7 +22,7 @@ import uk.hotten.staffog.data.jooq.tables.StaffogWeb;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Staffog extends SchemaImpl {
private static final long serialVersionUID = 1L;
@@ -101,29 +101,27 @@ public class Staffog extends SchemaImpl {
* No further instances allowed
*/
private Staffog() {
super("staffog", null);
}
@Override
public Catalog getCatalog() {
return DefaultCatalog.DEFAULT_CATALOG;
}
@Override
public final List<Table<?>> getTables() {
return Arrays.asList(
StaffogAppeal.STAFFOG_APPEAL,
StaffogAudit.STAFFOG_AUDIT,
StaffogBan.STAFFOG_BAN,
StaffogChatreport.STAFFOG_CHATREPORT,
StaffogHistory.STAFFOG_HISTORY,
StaffogKick.STAFFOG_KICK,
StaffogLinkcode.STAFFOG_LINKCODE,
StaffogMute.STAFFOG_MUTE,
StaffogReport.STAFFOG_REPORT,
StaffogStaffip.STAFFOG_STAFFIP,
StaffogStat.STAFFOG_STAT,
StaffogTask.STAFFOG_TASK,
return Arrays.asList(StaffogAppeal.STAFFOG_APPEAL, StaffogAudit.STAFFOG_AUDIT, StaffogBan.STAFFOG_BAN,
StaffogChatreport.STAFFOG_CHATREPORT, StaffogHistory.STAFFOG_HISTORY, StaffogKick.STAFFOG_KICK,
StaffogLinkcode.STAFFOG_LINKCODE, StaffogMute.STAFFOG_MUTE, StaffogReport.STAFFOG_REPORT,
StaffogStaffip.STAFFOG_STAFFIP, StaffogStat.STAFFOG_STAT, StaffogTask.STAFFOG_TASK,
StaffogWeb.STAFFOG_WEB);
}
}
src/main/java/uk/hotten/staffog/data/jooq/Tables.java
+2 -1
View File
@@ -17,7 +17,7 @@ import uk.hotten.staffog.data.jooq.tables.StaffogWeb;
/**
* Convenience access to all tables in staffog.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Tables {
/**
@@ -84,4 +84,5 @@ public class Tables {
* The table <code>staffog.staffog_web</code>.
*/
public static final StaffogWeb STAFFOG_WEB = StaffogWeb.STAFFOG_WEB;
}
src/main/java/uk/hotten/staffog/data/jooq/tables/StaffogAppeal.java
+71 -67
View File
@@ -25,7 +25,7 @@ import uk.hotten.staffog.data.jooq.tables.records.StaffogAppealRecord;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogAppeal extends TableImpl<StaffogAppealRecord> {
private static final long serialVersionUID = 1L;
@@ -40,148 +40,168 @@ public class StaffogAppeal extends TableImpl<StaffogAppealRecord> {
*/
@Override
public Class<StaffogAppealRecord> getRecordType() {
return StaffogAppealRecord.class;
}
/**
* The column <code>staffog.staffog_appeal.id</code>.
*/
public final TableField<StaffogAppealRecord, Integer> ID =
createField(DSL.name("id"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
public final TableField<StaffogAppealRecord, Integer> ID = createField(DSL.name("id"),
SQLDataType.INTEGER.nullable(false).identity(true), this, "");
/**
* The column <code>staffog.staffog_appeal.uuid</code>.
*/
public final TableField<StaffogAppealRecord, String> UUID =
createField(DSL.name("uuid"), SQLDataType.VARCHAR(36).nullable(false), this, "");
public final TableField<StaffogAppealRecord, String> UUID = createField(DSL.name("uuid"),
SQLDataType.VARCHAR(36).nullable(false), this, "");
/**
* The column <code>staffog.staffog_appeal.time</code>.
*/
public final TableField<StaffogAppealRecord, Long> TIME =
createField(DSL.name("time"), SQLDataType.BIGINT.nullable(false), this, "");
public final TableField<StaffogAppealRecord, Long> TIME = createField(DSL.name("time"),
SQLDataType.BIGINT.nullable(false), this, "");
/**
* The column <code>staffog.staffog_appeal.type</code>.
*/
public final TableField<StaffogAppealRecord, String> TYPE =
createField(DSL.name("type"), SQLDataType.VARCHAR(128).nullable(false), this, "");
public final TableField<StaffogAppealRecord, String> TYPE = createField(DSL.name("type"),
SQLDataType.VARCHAR(128).nullable(false), this, "");
/**
* The column <code>staffog.staffog_appeal.pid</code>.
*/
public final TableField<StaffogAppealRecord, Integer> PID =
createField(DSL.name("pid"), SQLDataType.INTEGER.nullable(false), this, "");
public final TableField<StaffogAppealRecord, Integer> PID = createField(DSL.name("pid"),
SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>staffog.staffog_appeal.reason</code>.
*/
public final TableField<StaffogAppealRecord, String> REASON =
createField(DSL.name("reason"), SQLDataType.VARCHAR(2048).nullable(false), this, "");
public final TableField<StaffogAppealRecord, String> REASON = createField(DSL.name("reason"),
SQLDataType.VARCHAR(2048).nullable(false), this, "");
/**
* The column <code>staffog.staffog_appeal.evidence</code>.
*/
public final TableField<StaffogAppealRecord, String> EVIDENCE = createField(
DSL.name("evidence"),
SQLDataType.VARCHAR(2048).nullable(false).defaultValue(DSL.inline("[]", SQLDataType.VARCHAR)),
this,
"");
public final TableField<StaffogAppealRecord, String> EVIDENCE = createField(DSL.name("evidence"),
SQLDataType.VARCHAR(2048).nullable(false).defaultValue(DSL.inline("[]", SQLDataType.VARCHAR)), this, "");
/**
* The column <code>staffog.staffog_appeal.open</code>.
*/
public final TableField<StaffogAppealRecord, Boolean> OPEN = createField(
DSL.name("open"),
SQLDataType.BIT.nullable(false).defaultValue(DSL.inline("b'1'", SQLDataType.BIT)),
this,
"");
public final TableField<StaffogAppealRecord, Boolean> OPEN = createField(DSL.name("open"),
SQLDataType.BIT.nullable(false).defaultValue(DSL.inline("b'1'", SQLDataType.BIT)), this, "");
/**
* The column <code>staffog.staffog_appeal.assigned</code>.
*/
public final TableField<StaffogAppealRecord, String> ASSIGNED =
createField(DSL.name("assigned"), SQLDataType.VARCHAR(36), this, "");
public final TableField<StaffogAppealRecord, String> ASSIGNED = createField(DSL.name("assigned"),
SQLDataType.VARCHAR(36), this, "");
/**
* The column <code>staffog.staffog_appeal.verdict</code>.
*/
public final TableField<StaffogAppealRecord, Boolean> VERDICT =
createField(DSL.name("verdict"), SQLDataType.BIT, this, "");
public final TableField<StaffogAppealRecord, Boolean> VERDICT = createField(DSL.name("verdict"), SQLDataType.BIT,
this, "");
/**
* The column <code>staffog.staffog_appeal.verdict_time</code>.
*/
public final TableField<StaffogAppealRecord, Long> VERDICT_TIME =
createField(DSL.name("verdict_time"), SQLDataType.BIGINT, this, "");
public final TableField<StaffogAppealRecord, Long> VERDICT_TIME = createField(DSL.name("verdict_time"),
SQLDataType.BIGINT, this, "");
/**
* The column <code>staffog.staffog_appeal.comment</code>.
*/
public final TableField<StaffogAppealRecord, String> COMMENT =
createField(DSL.name("comment"), SQLDataType.VARCHAR(2048), this, "");
public final TableField<StaffogAppealRecord, String> COMMENT = createField(DSL.name("comment"),
SQLDataType.VARCHAR(2048), this, "");
private StaffogAppeal(Name alias, Table<StaffogAppealRecord> aliased) {
this(alias, aliased, null);
}
private StaffogAppeal(Name alias, Table<StaffogAppealRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
* Create an aliased <code>staffog.staffog_appeal</code> table reference
*/
public StaffogAppeal(String alias) {
this(DSL.name(alias), STAFFOG_APPEAL);
}
/**
* Create an aliased <code>staffog.staffog_appeal</code> table reference
*/
public StaffogAppeal(Name alias) {
this(alias, STAFFOG_APPEAL);
}
/**
* Create a <code>staffog.staffog_appeal</code> table reference
*/
public StaffogAppeal() {
this(DSL.name("staffog_appeal"), null);
}
public <O extends Record> StaffogAppeal(Table<O> child, ForeignKey<O, StaffogAppealRecord> key) {
super(child, key, STAFFOG_APPEAL);
}
@Override
public Schema getSchema() {
return aliased() ? null : Staffog.STAFFOG;
}
@Override
public Identity<StaffogAppealRecord, Integer> getIdentity() {
return (Identity<StaffogAppealRecord, Integer>) super.getIdentity();
}
@Override
public UniqueKey<StaffogAppealRecord> getPrimaryKey() {
return Keys.KEY_STAFFOG_APPEAL_PRIMARY;
}
@Override
public StaffogAppeal as(String alias) {
return new StaffogAppeal(DSL.name(alias), this);
}
@Override
public StaffogAppeal as(Name alias) {
return new StaffogAppeal(alias, this);
}
@Override
public StaffogAppeal as(Table<?> alias) {
return new StaffogAppeal(alias.getQualifiedName(), this);
}
/**
@@ -189,7 +209,9 @@ public class StaffogAppeal extends TableImpl<StaffogAppealRecord> {
*/
@Override
public StaffogAppeal rename(String name) {
return new StaffogAppeal(DSL.name(name), null);
}
/**
@@ -197,7 +219,9 @@ public class StaffogAppeal extends TableImpl<StaffogAppealRecord> {
*/
@Override
public StaffogAppeal rename(Name name) {
return new StaffogAppeal(name, null);
}
/**
@@ -205,7 +229,9 @@ public class StaffogAppeal extends TableImpl<StaffogAppealRecord> {
*/
@Override
public StaffogAppeal rename(Table<?> name) {
return new StaffogAppeal(name.getQualifiedName(), null);
}
// -------------------------------------------------------------------------
@@ -213,54 +239,32 @@ public class StaffogAppeal extends TableImpl<StaffogAppealRecord> {
// -------------------------------------------------------------------------
@Override
public Row12<Integer, String, Long, String, Integer, String, String, Boolean, String, Boolean, Long, String>
fieldsRow() {
public Row12<Integer, String, Long, String, Integer, String, String, Boolean, String, Boolean, Long, String> fieldsRow() {
return (Row12) super.fieldsRow();
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Function)}.
*/
public <U> SelectField<U> mapping(
Function12<
? super Integer,
? super String,
? super Long,
? super String,
? super Integer,
? super String,
? super String,
? super Boolean,
? super String,
? super Boolean,
? super Long,
? super String,
? extends U>
from) {
Function12<? super Integer, ? super String, ? super Long, ? super String, ? super Integer, ? super String, ? super String, ? super Boolean, ? super String, ? super Boolean, ? super Long, ? super String, ? extends U> from)
{
return convertFrom(Records.mapping(from));
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Class,
* Function)}.
* Convenience mapping calling {@link SelectField#convertFrom(Class, Function)}.
*/
public <U> SelectField<U> mapping(
Class<U> toType,
Function12<
? super Integer,
? super String,
? super Long,
? super String,
? super Integer,
? super String,
? super String,
? super Boolean,
? super String,
? super Boolean,
? super Long,
? super String,
? extends U>
from) {
public <U> SelectField<U> mapping(Class<U> toType,
Function12<? super Integer, ? super String, ? super Long, ? super String, ? super Integer, ? super String, ? super String, ? super Boolean, ? super String, ? super Boolean, ? super Long, ? super String, ? extends U> from)
{
return convertFrom(toType, Records.mapping(from));
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/StaffogAudit.java
+54 -15
View File
@@ -25,7 +25,7 @@ import uk.hotten.staffog.data.jooq.tables.records.StaffogAuditRecord;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogAudit extends TableImpl<StaffogAuditRecord> {
private static final long serialVersionUID = 1L;
@@ -40,94 +40,120 @@ public class StaffogAudit extends TableImpl<StaffogAuditRecord> {
*/
@Override
public Class<StaffogAuditRecord> getRecordType() {
return StaffogAuditRecord.class;
}
/**
* The column <code>staffog.staffog_audit.id</code>.
*/
public final TableField<StaffogAuditRecord, Integer> ID =
createField(DSL.name("id"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
public final TableField<StaffogAuditRecord, Integer> ID = createField(DSL.name("id"),
SQLDataType.INTEGER.nullable(false).identity(true), this, "");
/**
* The column <code>staffog.staffog_audit.type</code>.
*/
public final TableField<StaffogAuditRecord, String> TYPE =
createField(DSL.name("type"), SQLDataType.VARCHAR(2048).nullable(false), this, "");
public final TableField<StaffogAuditRecord, String> TYPE = createField(DSL.name("type"),
SQLDataType.VARCHAR(2048).nullable(false), this, "");
/**
* The column <code>staffog.staffog_audit.data</code>.
*/
public final TableField<StaffogAuditRecord, String> DATA =
createField(DSL.name("data"), SQLDataType.VARCHAR(2048).nullable(false), this, "");
public final TableField<StaffogAuditRecord, String> DATA = createField(DSL.name("data"),
SQLDataType.VARCHAR(2048).nullable(false), this, "");
/**
* The column <code>staffog.staffog_audit.time</code>.
*/
public final TableField<StaffogAuditRecord, Long> TIME =
createField(DSL.name("time"), SQLDataType.BIGINT.nullable(false), this, "");
public final TableField<StaffogAuditRecord, Long> TIME = createField(DSL.name("time"),
SQLDataType.BIGINT.nullable(false), this, "");
private StaffogAudit(Name alias, Table<StaffogAuditRecord> aliased) {
this(alias, aliased, null);
}
private StaffogAudit(Name alias, Table<StaffogAuditRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
* Create an aliased <code>staffog.staffog_audit</code> table reference
*/
public StaffogAudit(String alias) {
this(DSL.name(alias), STAFFOG_AUDIT);
}
/**
* Create an aliased <code>staffog.staffog_audit</code> table reference
*/
public StaffogAudit(Name alias) {
this(alias, STAFFOG_AUDIT);
}
/**
* Create a <code>staffog.staffog_audit</code> table reference
*/
public StaffogAudit() {
this(DSL.name("staffog_audit"), null);
}
public <O extends Record> StaffogAudit(Table<O> child, ForeignKey<O, StaffogAuditRecord> key) {
super(child, key, STAFFOG_AUDIT);
}
@Override
public Schema getSchema() {
return aliased() ? null : Staffog.STAFFOG;
}
@Override
public Identity<StaffogAuditRecord, Integer> getIdentity() {
return (Identity<StaffogAuditRecord, Integer>) super.getIdentity();
}
@Override
public UniqueKey<StaffogAuditRecord> getPrimaryKey() {
return Keys.KEY_STAFFOG_AUDIT_PRIMARY;
}
@Override
public StaffogAudit as(String alias) {
return new StaffogAudit(DSL.name(alias), this);
}
@Override
public StaffogAudit as(Name alias) {
return new StaffogAudit(alias, this);
}
@Override
public StaffogAudit as(Table<?> alias) {
return new StaffogAudit(alias.getQualifiedName(), this);
}
/**
@@ -135,7 +161,9 @@ public class StaffogAudit extends TableImpl<StaffogAuditRecord> {
*/
@Override
public StaffogAudit rename(String name) {
return new StaffogAudit(DSL.name(name), null);
}
/**
@@ -143,7 +171,9 @@ public class StaffogAudit extends TableImpl<StaffogAuditRecord> {
*/
@Override
public StaffogAudit rename(Name name) {
return new StaffogAudit(name, null);
}
/**
@@ -151,7 +181,9 @@ public class StaffogAudit extends TableImpl<StaffogAuditRecord> {
*/
@Override
public StaffogAudit rename(Table<?> name) {
return new StaffogAudit(name.getQualifiedName(), null);
}
// -------------------------------------------------------------------------
@@ -160,24 +192,31 @@ public class StaffogAudit extends TableImpl<StaffogAuditRecord> {
@Override
public Row4<Integer, String, String, Long> fieldsRow() {
return (Row4) super.fieldsRow();
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Function)}.
*/
public <U> SelectField<U> mapping(
Function4<? super Integer, ? super String, ? super String, ? super Long, ? extends U> from) {
Function4<? super Integer, ? super String, ? super String, ? super Long, ? extends U> from)
{
return convertFrom(Records.mapping(from));
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Class,
* Function)}.
* Convenience mapping calling {@link SelectField#convertFrom(Class, Function)}.
*/
public <U> SelectField<U> mapping(
Class<U> toType,
Function4<? super Integer, ? super String, ? super String, ? super Long, ? extends U> from) {
public <U> SelectField<U> mapping(Class<U> toType,
Function4<? super Integer, ? super String, ? super String, ? super Long, ? extends U> from)
{
return convertFrom(toType, Records.mapping(from));
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/StaffogBan.java
+70 -59
View File
@@ -25,7 +25,7 @@ import uk.hotten.staffog.data.jooq.tables.records.StaffogBanRecord;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogBan extends TableImpl<StaffogBanRecord> {
private static final long serialVersionUID = 1L;
@@ -40,142 +40,168 @@ public class StaffogBan extends TableImpl<StaffogBanRecord> {
*/
@Override
public Class<StaffogBanRecord> getRecordType() {
return StaffogBanRecord.class;
}
/**
* The column <code>staffog.staffog_ban.id</code>.
*/
public final TableField<StaffogBanRecord, Long> ID =
createField(DSL.name("id"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
public final TableField<StaffogBanRecord, Long> ID = createField(DSL.name("id"),
SQLDataType.BIGINT.nullable(false).identity(true), this, "");
/**
* The column <code>staffog.staffog_ban.uuid</code>.
*/
public final TableField<StaffogBanRecord, String> UUID =
createField(DSL.name("uuid"), SQLDataType.VARCHAR(36).nullable(false), this, "");
public final TableField<StaffogBanRecord, String> UUID = createField(DSL.name("uuid"),
SQLDataType.VARCHAR(36).nullable(false), this, "");
/**
* The column <code>staffog.staffog_ban.reason</code>.
*/
public final TableField<StaffogBanRecord, String> REASON =
createField(DSL.name("reason"), SQLDataType.VARCHAR(2048).nullable(false), this, "");
public final TableField<StaffogBanRecord, String> REASON = createField(DSL.name("reason"),
SQLDataType.VARCHAR(2048).nullable(false), this, "");
/**
* The column <code>staffog.staffog_ban.by_uuid</code>.
*/
public final TableField<StaffogBanRecord, String> BY_UUID =
createField(DSL.name("by_uuid"), SQLDataType.VARCHAR(36), this, "");
public final TableField<StaffogBanRecord, String> BY_UUID = createField(DSL.name("by_uuid"),
SQLDataType.VARCHAR(36), this, "");
/**
* The column <code>staffog.staffog_ban.by_name</code>.
*/
public final TableField<StaffogBanRecord, String> BY_NAME =
createField(DSL.name("by_name"), SQLDataType.VARCHAR(128), this, "");
public final TableField<StaffogBanRecord, String> BY_NAME = createField(DSL.name("by_name"),
SQLDataType.VARCHAR(128), this, "");
/**
* The column <code>staffog.staffog_ban.removed_uuid</code>.
*/
public final TableField<StaffogBanRecord, String> REMOVED_UUID =
createField(DSL.name("removed_uuid"), SQLDataType.VARCHAR(36), this, "");
public final TableField<StaffogBanRecord, String> REMOVED_UUID = createField(DSL.name("removed_uuid"),
SQLDataType.VARCHAR(36), this, "");
/**
* The column <code>staffog.staffog_ban.removed_name</code>.
*/
public final TableField<StaffogBanRecord, String> REMOVED_NAME =
createField(DSL.name("removed_name"), SQLDataType.VARCHAR(128), this, "");
public final TableField<StaffogBanRecord, String> REMOVED_NAME = createField(DSL.name("removed_name"),
SQLDataType.VARCHAR(128), this, "");
/**
* The column <code>staffog.staffog_ban.removed_reason</code>.
*/
public final TableField<StaffogBanRecord, String> REMOVED_REASON =
createField(DSL.name("removed_reason"), SQLDataType.VARCHAR(2048), this, "");
public final TableField<StaffogBanRecord, String> REMOVED_REASON = createField(DSL.name("removed_reason"),
SQLDataType.VARCHAR(2048), this, "");
/**
* The column <code>staffog.staffog_ban.removed_time</code>.
*/
public final TableField<StaffogBanRecord, Long> REMOVED_TIME =
createField(DSL.name("removed_time"), SQLDataType.BIGINT, this, "");
public final TableField<StaffogBanRecord, Long> REMOVED_TIME = createField(DSL.name("removed_time"),
SQLDataType.BIGINT, this, "");
/**
* The column <code>staffog.staffog_ban.time</code>.
*/
public final TableField<StaffogBanRecord, Long> TIME =
createField(DSL.name("time"), SQLDataType.BIGINT.nullable(false), this, "");
public final TableField<StaffogBanRecord, Long> TIME = createField(DSL.name("time"),
SQLDataType.BIGINT.nullable(false), this, "");
/**
* The column <code>staffog.staffog_ban.until</code>.
*/
public final TableField<StaffogBanRecord, Long> UNTIL =
createField(DSL.name("until"), SQLDataType.BIGINT.nullable(false), this, "");
public final TableField<StaffogBanRecord, Long> UNTIL = createField(DSL.name("until"),
SQLDataType.BIGINT.nullable(false), this, "");
/**
* The column <code>staffog.staffog_ban.active</code>.
*/
public final TableField<StaffogBanRecord, Boolean> ACTIVE =
createField(DSL.name("active"), SQLDataType.BIT.nullable(false), this, "");
public final TableField<StaffogBanRecord, Boolean> ACTIVE = createField(DSL.name("active"),
SQLDataType.BIT.nullable(false), this, "");
private StaffogBan(Name alias, Table<StaffogBanRecord> aliased) {
this(alias, aliased, null);
}
private StaffogBan(Name alias, Table<StaffogBanRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
* Create an aliased <code>staffog.staffog_ban</code> table reference
*/
public StaffogBan(String alias) {
this(DSL.name(alias), STAFFOG_BAN);
}
/**
* Create an aliased <code>staffog.staffog_ban</code> table reference
*/
public StaffogBan(Name alias) {
this(alias, STAFFOG_BAN);
}
/**
* Create a <code>staffog.staffog_ban</code> table reference
*/
public StaffogBan() {
this(DSL.name("staffog_ban"), null);
}
public <O extends Record> StaffogBan(Table<O> child, ForeignKey<O, StaffogBanRecord> key) {
super(child, key, STAFFOG_BAN);
}
@Override
public Schema getSchema() {
return aliased() ? null : Staffog.STAFFOG;
}
@Override
public Identity<StaffogBanRecord, Long> getIdentity() {
return (Identity<StaffogBanRecord, Long>) super.getIdentity();
}
@Override
public UniqueKey<StaffogBanRecord> getPrimaryKey() {
return Keys.KEY_STAFFOG_BAN_PRIMARY;
}
@Override
public StaffogBan as(String alias) {
return new StaffogBan(DSL.name(alias), this);
}
@Override
public StaffogBan as(Name alias) {
return new StaffogBan(alias, this);
}
@Override
public StaffogBan as(Table<?> alias) {
return new StaffogBan(alias.getQualifiedName(), this);
}
/**
@@ -183,7 +209,9 @@ public class StaffogBan extends TableImpl<StaffogBanRecord> {
*/
@Override
public StaffogBan rename(String name) {
return new StaffogBan(DSL.name(name), null);
}
/**
@@ -191,7 +219,9 @@ public class StaffogBan extends TableImpl<StaffogBanRecord> {
*/
@Override
public StaffogBan rename(Name name) {
return new StaffogBan(name, null);
}
/**
@@ -199,7 +229,9 @@ public class StaffogBan extends TableImpl<StaffogBanRecord> {
*/
@Override
public StaffogBan rename(Table<?> name) {
return new StaffogBan(name.getQualifiedName(), null);
}
// -------------------------------------------------------------------------
@@ -208,52 +240,31 @@ public class StaffogBan extends TableImpl<StaffogBanRecord> {
@Override
public Row12<Long, String, String, String, String, String, String, String, Long, Long, Long, Boolean> fieldsRow() {
return (Row12) super.fieldsRow();
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Function)}.
*/
public <U> SelectField<U> mapping(
Function12<
? super Long,
? super String,
? super String,
? super String,
? super String,
? super String,
? super String,
? super String,
? super Long,
? super Long,
? super Long,
? super Boolean,
? extends U>
from) {
Function12<? super Long, ? super String, ? super String, ? super String, ? super String, ? super String, ? super String, ? super String, ? super Long, ? super Long, ? super Long, ? super Boolean, ? extends U> from)
{
return convertFrom(Records.mapping(from));
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Class,
* Function)}.
* Convenience mapping calling {@link SelectField#convertFrom(Class, Function)}.
*/
public <U> SelectField<U> mapping(
Class<U> toType,
Function12<
? super Long,
? super String,
? super String,
? super String,
? super String,
? super String,
? super String,
? super String,
? super Long,
? super Long,
? super Long,
? super Boolean,
? extends U>
from) {
public <U> SelectField<U> mapping(Class<U> toType,
Function12<? super Long, ? super String, ? super String, ? super String, ? super String, ? super String, ? super String, ? super String, ? super Long, ? super Long, ? super Long, ? super Boolean, ? extends U> from)
{
return convertFrom(toType, Records.mapping(from));
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/StaffogChatreport.java
+56 -19
View File
@@ -25,7 +25,7 @@ import uk.hotten.staffog.data.jooq.tables.records.StaffogChatreportRecord;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogChatreport extends TableImpl<StaffogChatreportRecord> {
private static final long serialVersionUID = 1L;
@@ -40,100 +40,126 @@ public class StaffogChatreport extends TableImpl<StaffogChatreportRecord> {
*/
@Override
public Class<StaffogChatreportRecord> getRecordType() {
return StaffogChatreportRecord.class;
}
/**
* The column <code>staffog.staffog_chatreport.id</code>.
*/
public final TableField<StaffogChatreportRecord, Integer> ID =
createField(DSL.name("id"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
public final TableField<StaffogChatreportRecord, Integer> ID = createField(DSL.name("id"),
SQLDataType.INTEGER.nullable(false).identity(true), this, "");
/**
* The column <code>staffog.staffog_chatreport.uuid</code>.
*/
public final TableField<StaffogChatreportRecord, String> UUID =
createField(DSL.name("uuid"), SQLDataType.VARCHAR(36).nullable(false), this, "");
public final TableField<StaffogChatreportRecord, String> UUID = createField(DSL.name("uuid"),
SQLDataType.VARCHAR(36).nullable(false), this, "");
/**
* The column <code>staffog.staffog_chatreport.by_uuid</code>.
*/
public final TableField<StaffogChatreportRecord, String> BY_UUID =
createField(DSL.name("by_uuid"), SQLDataType.VARCHAR(36).nullable(false), this, "");
public final TableField<StaffogChatreportRecord, String> BY_UUID = createField(DSL.name("by_uuid"),
SQLDataType.VARCHAR(36).nullable(false), this, "");
/**
* The column <code>staffog.staffog_chatreport.time</code>.
*/
public final TableField<StaffogChatreportRecord, Long> TIME =
createField(DSL.name("time"), SQLDataType.BIGINT.nullable(false), this, "");
public final TableField<StaffogChatreportRecord, Long> TIME = createField(DSL.name("time"),
SQLDataType.BIGINT.nullable(false), this, "");
/**
* The column <code>staffog.staffog_chatreport.messages</code>.
*/
public final TableField<StaffogChatreportRecord, String> MESSAGES =
createField(DSL.name("messages"), SQLDataType.VARCHAR(2048).nullable(false), this, "");
public final TableField<StaffogChatreportRecord, String> MESSAGES = createField(DSL.name("messages"),
SQLDataType.VARCHAR(2048).nullable(false), this, "");
private StaffogChatreport(Name alias, Table<StaffogChatreportRecord> aliased) {
this(alias, aliased, null);
}
private StaffogChatreport(Name alias, Table<StaffogChatreportRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
* Create an aliased <code>staffog.staffog_chatreport</code> table reference
*/
public StaffogChatreport(String alias) {
this(DSL.name(alias), STAFFOG_CHATREPORT);
}
/**
* Create an aliased <code>staffog.staffog_chatreport</code> table reference
*/
public StaffogChatreport(Name alias) {
this(alias, STAFFOG_CHATREPORT);
}
/**
* Create a <code>staffog.staffog_chatreport</code> table reference
*/
public StaffogChatreport() {
this(DSL.name("staffog_chatreport"), null);
}
public <O extends Record> StaffogChatreport(Table<O> child, ForeignKey<O, StaffogChatreportRecord> key) {
super(child, key, STAFFOG_CHATREPORT);
}
@Override
public Schema getSchema() {
return aliased() ? null : Staffog.STAFFOG;
}
@Override
public Identity<StaffogChatreportRecord, Integer> getIdentity() {
return (Identity<StaffogChatreportRecord, Integer>) super.getIdentity();
}
@Override
public UniqueKey<StaffogChatreportRecord> getPrimaryKey() {
return Keys.KEY_STAFFOG_CHATREPORT_PRIMARY;
}
@Override
public StaffogChatreport as(String alias) {
return new StaffogChatreport(DSL.name(alias), this);
}
@Override
public StaffogChatreport as(Name alias) {
return new StaffogChatreport(alias, this);
}
@Override
public StaffogChatreport as(Table<?> alias) {
return new StaffogChatreport(alias.getQualifiedName(), this);
}
/**
@@ -141,7 +167,9 @@ public class StaffogChatreport extends TableImpl<StaffogChatreportRecord> {
*/
@Override
public StaffogChatreport rename(String name) {
return new StaffogChatreport(DSL.name(name), null);
}
/**
@@ -149,7 +177,9 @@ public class StaffogChatreport extends TableImpl<StaffogChatreportRecord> {
*/
@Override
public StaffogChatreport rename(Name name) {
return new StaffogChatreport(name, null);
}
/**
@@ -157,7 +187,9 @@ public class StaffogChatreport extends TableImpl<StaffogChatreportRecord> {
*/
@Override
public StaffogChatreport rename(Table<?> name) {
return new StaffogChatreport(name.getQualifiedName(), null);
}
// -------------------------------------------------------------------------
@@ -166,26 +198,31 @@ public class StaffogChatreport extends TableImpl<StaffogChatreportRecord> {
@Override
public Row5<Integer, String, String, Long, String> fieldsRow() {
return (Row5) super.fieldsRow();
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Function)}.
*/
public <U> SelectField<U> mapping(
Function5<? super Integer, ? super String, ? super String, ? super Long, ? super String, ? extends U>
from) {
Function5<? super Integer, ? super String, ? super String, ? super Long, ? super String, ? extends U> from)
{
return convertFrom(Records.mapping(from));
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Class,
* Function)}.
* Convenience mapping calling {@link SelectField#convertFrom(Class, Function)}.
*/
public <U> SelectField<U> mapping(
Class<U> toType,
Function5<? super Integer, ? super String, ? super String, ? super Long, ? super String, ? extends U>
from) {
public <U> SelectField<U> mapping(Class<U> toType,
Function5<? super Integer, ? super String, ? super String, ? super Long, ? super String, ? extends U> from)
{
return convertFrom(toType, Records.mapping(from));
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/StaffogHistory.java
+55 -19
View File
@@ -26,7 +26,7 @@ import uk.hotten.staffog.data.jooq.tables.records.StaffogHistoryRecord;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogHistory extends TableImpl<StaffogHistoryRecord> {
private static final long serialVersionUID = 1L;
@@ -41,99 +41,122 @@ public class StaffogHistory extends TableImpl<StaffogHistoryRecord> {
*/
@Override
public Class<StaffogHistoryRecord> getRecordType() {
return StaffogHistoryRecord.class;
}
/**
* The column <code>staffog.staffog_history.id</code>.
*/
public final TableField<StaffogHistoryRecord, Integer> ID =
createField(DSL.name("id"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
public final TableField<StaffogHistoryRecord, Integer> ID = createField(DSL.name("id"),
SQLDataType.INTEGER.nullable(false).identity(true), this, "");
/**
* The column <code>staffog.staffog_history.date</code>.
*/
public final TableField<StaffogHistoryRecord, LocalDateTime> DATE = createField(
DSL.name("date"),
SQLDataType.LOCALDATETIME(0)
.nullable(false)
public final TableField<StaffogHistoryRecord, LocalDateTime> DATE = createField(DSL.name("date"),
SQLDataType.LOCALDATETIME(0).nullable(false)
.defaultValue(DSL.field(DSL.raw("CURRENT_TIMESTAMP"), SQLDataType.LOCALDATETIME)),
this,
"");
this, "");
/**
* The column <code>staffog.staffog_history.name</code>.
*/
public final TableField<StaffogHistoryRecord, String> NAME =
createField(DSL.name("name"), SQLDataType.VARCHAR(16).nullable(false), this, "");
public final TableField<StaffogHistoryRecord, String> NAME = createField(DSL.name("name"),
SQLDataType.VARCHAR(16).nullable(false), this, "");
/**
* The column <code>staffog.staffog_history.uuid</code>.
*/
public final TableField<StaffogHistoryRecord, String> UUID =
createField(DSL.name("uuid"), SQLDataType.VARCHAR(36).nullable(false), this, "");
public final TableField<StaffogHistoryRecord, String> UUID = createField(DSL.name("uuid"),
SQLDataType.VARCHAR(36).nullable(false), this, "");
private StaffogHistory(Name alias, Table<StaffogHistoryRecord> aliased) {
this(alias, aliased, null);
}
private StaffogHistory(Name alias, Table<StaffogHistoryRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
* Create an aliased <code>staffog.staffog_history</code> table reference
*/
public StaffogHistory(String alias) {
this(DSL.name(alias), STAFFOG_HISTORY);
}
/**
* Create an aliased <code>staffog.staffog_history</code> table reference
*/
public StaffogHistory(Name alias) {
this(alias, STAFFOG_HISTORY);
}
/**
* Create a <code>staffog.staffog_history</code> table reference
*/
public StaffogHistory() {
this(DSL.name("staffog_history"), null);
}
public <O extends Record> StaffogHistory(Table<O> child, ForeignKey<O, StaffogHistoryRecord> key) {
super(child, key, STAFFOG_HISTORY);
}
@Override
public Schema getSchema() {
return aliased() ? null : Staffog.STAFFOG;
}
@Override
public Identity<StaffogHistoryRecord, Integer> getIdentity() {
return (Identity<StaffogHistoryRecord, Integer>) super.getIdentity();
}
@Override
public UniqueKey<StaffogHistoryRecord> getPrimaryKey() {
return Keys.KEY_STAFFOG_HISTORY_PRIMARY;
}
@Override
public StaffogHistory as(String alias) {
return new StaffogHistory(DSL.name(alias), this);
}
@Override
public StaffogHistory as(Name alias) {
return new StaffogHistory(alias, this);
}
@Override
public StaffogHistory as(Table<?> alias) {
return new StaffogHistory(alias.getQualifiedName(), this);
}
/**
@@ -141,7 +164,9 @@ public class StaffogHistory extends TableImpl<StaffogHistoryRecord> {
*/
@Override
public StaffogHistory rename(String name) {
return new StaffogHistory(DSL.name(name), null);
}
/**
@@ -149,7 +174,9 @@ public class StaffogHistory extends TableImpl<StaffogHistoryRecord> {
*/
@Override
public StaffogHistory rename(Name name) {
return new StaffogHistory(name, null);
}
/**
@@ -157,7 +184,9 @@ public class StaffogHistory extends TableImpl<StaffogHistoryRecord> {
*/
@Override
public StaffogHistory rename(Table<?> name) {
return new StaffogHistory(name.getQualifiedName(), null);
}
// -------------------------------------------------------------------------
@@ -166,24 +195,31 @@ public class StaffogHistory extends TableImpl<StaffogHistoryRecord> {
@Override
public Row4<Integer, LocalDateTime, String, String> fieldsRow() {
return (Row4) super.fieldsRow();
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Function)}.
*/
public <U> SelectField<U> mapping(
Function4<? super Integer, ? super LocalDateTime, ? super String, ? super String, ? extends U> from) {
Function4<? super Integer, ? super LocalDateTime, ? super String, ? super String, ? extends U> from)
{
return convertFrom(Records.mapping(from));
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Class,
* Function)}.
* Convenience mapping calling {@link SelectField#convertFrom(Class, Function)}.
*/
public <U> SelectField<U> mapping(
Class<U> toType,
Function4<? super Integer, ? super LocalDateTime, ? super String, ? super String, ? extends U> from) {
public <U> SelectField<U> mapping(Class<U> toType,
Function4<? super Integer, ? super LocalDateTime, ? super String, ? super String, ? extends U> from)
{
return convertFrom(toType, Records.mapping(from));
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/StaffogKick.java
+58 -35
View File
@@ -25,7 +25,7 @@ import uk.hotten.staffog.data.jooq.tables.records.StaffogKickRecord;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogKick extends TableImpl<StaffogKickRecord> {
private static final long serialVersionUID = 1L;
@@ -40,106 +40,132 @@ public class StaffogKick extends TableImpl<StaffogKickRecord> {
*/
@Override
public Class<StaffogKickRecord> getRecordType() {
return StaffogKickRecord.class;
}
/**
* The column <code>staffog.staffog_kick.id</code>.
*/
public final TableField<StaffogKickRecord, Long> ID =
createField(DSL.name("id"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
public final TableField<StaffogKickRecord, Long> ID = createField(DSL.name("id"),
SQLDataType.BIGINT.nullable(false).identity(true), this, "");
/**
* The column <code>staffog.staffog_kick.uuid</code>.
*/
public final TableField<StaffogKickRecord, String> UUID =
createField(DSL.name("uuid"), SQLDataType.VARCHAR(36).nullable(false), this, "");
public final TableField<StaffogKickRecord, String> UUID = createField(DSL.name("uuid"),
SQLDataType.VARCHAR(36).nullable(false), this, "");
/**
* The column <code>staffog.staffog_kick.reason</code>.
*/
public final TableField<StaffogKickRecord, String> REASON =
createField(DSL.name("reason"), SQLDataType.VARCHAR(2048).nullable(false), this, "");
public final TableField<StaffogKickRecord, String> REASON = createField(DSL.name("reason"),
SQLDataType.VARCHAR(2048).nullable(false), this, "");
/**
* The column <code>staffog.staffog_kick.by_uuid</code>.
*/
public final TableField<StaffogKickRecord, String> BY_UUID =
createField(DSL.name("by_uuid"), SQLDataType.VARCHAR(36).nullable(false), this, "");
public final TableField<StaffogKickRecord, String> BY_UUID = createField(DSL.name("by_uuid"),
SQLDataType.VARCHAR(36).nullable(false), this, "");
/**
* The column <code>staffog.staffog_kick.by_name</code>.
*/
public final TableField<StaffogKickRecord, String> BY_NAME =
createField(DSL.name("by_name"), SQLDataType.VARCHAR(128).nullable(false), this, "");
public final TableField<StaffogKickRecord, String> BY_NAME = createField(DSL.name("by_name"),
SQLDataType.VARCHAR(128).nullable(false), this, "");
/**
* The column <code>staffog.staffog_kick.time</code>.
*/
public final TableField<StaffogKickRecord, Long> TIME =
createField(DSL.name("time"), SQLDataType.BIGINT.nullable(false), this, "");
public final TableField<StaffogKickRecord, Long> TIME = createField(DSL.name("time"),
SQLDataType.BIGINT.nullable(false), this, "");
private StaffogKick(Name alias, Table<StaffogKickRecord> aliased) {
this(alias, aliased, null);
}
private StaffogKick(Name alias, Table<StaffogKickRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
* Create an aliased <code>staffog.staffog_kick</code> table reference
*/
public StaffogKick(String alias) {
this(DSL.name(alias), STAFFOG_KICK);
}
/**
* Create an aliased <code>staffog.staffog_kick</code> table reference
*/
public StaffogKick(Name alias) {
this(alias, STAFFOG_KICK);
}
/**
* Create a <code>staffog.staffog_kick</code> table reference
*/
public StaffogKick() {
this(DSL.name("staffog_kick"), null);
}
public <O extends Record> StaffogKick(Table<O> child, ForeignKey<O, StaffogKickRecord> key) {
super(child, key, STAFFOG_KICK);
}
@Override
public Schema getSchema() {
return aliased() ? null : Staffog.STAFFOG;
}
@Override
public Identity<StaffogKickRecord, Long> getIdentity() {
return (Identity<StaffogKickRecord, Long>) super.getIdentity();
}
@Override
public UniqueKey<StaffogKickRecord> getPrimaryKey() {
return Keys.KEY_STAFFOG_KICK_PRIMARY;
}
@Override
public StaffogKick as(String alias) {
return new StaffogKick(DSL.name(alias), this);
}
@Override
public StaffogKick as(Name alias) {
return new StaffogKick(alias, this);
}
@Override
public StaffogKick as(Table<?> alias) {
return new StaffogKick(alias.getQualifiedName(), this);
}
/**
@@ -147,7 +173,9 @@ public class StaffogKick extends TableImpl<StaffogKickRecord> {
*/
@Override
public StaffogKick rename(String name) {
return new StaffogKick(DSL.name(name), null);
}
/**
@@ -155,7 +183,9 @@ public class StaffogKick extends TableImpl<StaffogKickRecord> {
*/
@Override
public StaffogKick rename(Name name) {
return new StaffogKick(name, null);
}
/**
@@ -163,7 +193,9 @@ public class StaffogKick extends TableImpl<StaffogKickRecord> {
*/
@Override
public StaffogKick rename(Table<?> name) {
return new StaffogKick(name.getQualifiedName(), null);
}
// -------------------------------------------------------------------------
@@ -172,40 +204,31 @@ public class StaffogKick extends TableImpl<StaffogKickRecord> {
@Override
public Row6<Long, String, String, String, String, Long> fieldsRow() {
return (Row6) super.fieldsRow();
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Function)}.
*/
public <U> SelectField<U> mapping(
Function6<
? super Long,
? super String,
? super String,
? super String,
? super String,
? super Long,
? extends U>
from) {
Function6<? super Long, ? super String, ? super String, ? super String, ? super String, ? super Long, ? extends U> from)
{
return convertFrom(Records.mapping(from));
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Class,
* Function)}.
* Convenience mapping calling {@link SelectField#convertFrom(Class, Function)}.
*/
public <U> SelectField<U> mapping(
Class<U> toType,
Function6<
? super Long,
? super String,
? super String,
? super String,
? super String,
? super Long,
? extends U>
from) {
public <U> SelectField<U> mapping(Class<U> toType,
Function6<? super Long, ? super String, ? super String, ? super String, ? super String, ? super Long, ? extends U> from)
{
return convertFrom(toType, Records.mapping(from));
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/StaffogLinkcode.java
+48 -11
View File
@@ -26,7 +26,7 @@ import uk.hotten.staffog.data.jooq.tables.records.StaffogLinkcodeRecord;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogLinkcode extends TableImpl<StaffogLinkcodeRecord> {
private static final long serialVersionUID = 1L;
@@ -41,83 +41,107 @@ public class StaffogLinkcode extends TableImpl<StaffogLinkcodeRecord> {
*/
@Override
public Class<StaffogLinkcodeRecord> getRecordType() {
return StaffogLinkcodeRecord.class;
}
/**
* The column <code>staffog.staffog_linkcode.uuid</code>.
*/
public final TableField<StaffogLinkcodeRecord, String> UUID =
createField(DSL.name("uuid"), SQLDataType.VARCHAR(36).nullable(false), this, "");
public final TableField<StaffogLinkcodeRecord, String> UUID = createField(DSL.name("uuid"),
SQLDataType.VARCHAR(36).nullable(false), this, "");
/**
* The column <code>staffog.staffog_linkcode.code</code>.
*/
public final TableField<StaffogLinkcodeRecord, String> CODE =
createField(DSL.name("code"), SQLDataType.VARCHAR(5).nullable(false), this, "");
public final TableField<StaffogLinkcodeRecord, String> CODE = createField(DSL.name("code"),
SQLDataType.VARCHAR(5).nullable(false), this, "");
/**
* The column <code>staffog.staffog_linkcode.admin</code>.
*/
public final TableField<StaffogLinkcodeRecord, Boolean> ADMIN =
createField(DSL.name("admin"), SQLDataType.BIT.nullable(false), this, "");
public final TableField<StaffogLinkcodeRecord, Boolean> ADMIN = createField(DSL.name("admin"),
SQLDataType.BIT.nullable(false), this, "");
private StaffogLinkcode(Name alias, Table<StaffogLinkcodeRecord> aliased) {
this(alias, aliased, null);
}
private StaffogLinkcode(Name alias, Table<StaffogLinkcodeRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
* Create an aliased <code>staffog.staffog_linkcode</code> table reference
*/
public StaffogLinkcode(String alias) {
this(DSL.name(alias), STAFFOG_LINKCODE);
}
/**
* Create an aliased <code>staffog.staffog_linkcode</code> table reference
*/
public StaffogLinkcode(Name alias) {
this(alias, STAFFOG_LINKCODE);
}
/**
* Create a <code>staffog.staffog_linkcode</code> table reference
*/
public StaffogLinkcode() {
this(DSL.name("staffog_linkcode"), null);
}
public <O extends Record> StaffogLinkcode(Table<O> child, ForeignKey<O, StaffogLinkcodeRecord> key) {
super(child, key, STAFFOG_LINKCODE);
}
@Override
public Schema getSchema() {
return aliased() ? null : Staffog.STAFFOG;
}
@Override
public List<UniqueKey<StaffogLinkcodeRecord>> getUniqueKeys() {
return Arrays.asList(Keys.KEY_STAFFOG_LINKCODE_UUID);
}
@Override
public StaffogLinkcode as(String alias) {
return new StaffogLinkcode(DSL.name(alias), this);
}
@Override
public StaffogLinkcode as(Name alias) {
return new StaffogLinkcode(alias, this);
}
@Override
public StaffogLinkcode as(Table<?> alias) {
return new StaffogLinkcode(alias.getQualifiedName(), this);
}
/**
@@ -125,7 +149,9 @@ public class StaffogLinkcode extends TableImpl<StaffogLinkcodeRecord> {
*/
@Override
public StaffogLinkcode rename(String name) {
return new StaffogLinkcode(DSL.name(name), null);
}
/**
@@ -133,7 +159,9 @@ public class StaffogLinkcode extends TableImpl<StaffogLinkcodeRecord> {
*/
@Override
public StaffogLinkcode rename(Name name) {
return new StaffogLinkcode(name, null);
}
/**
@@ -141,7 +169,9 @@ public class StaffogLinkcode extends TableImpl<StaffogLinkcodeRecord> {
*/
@Override
public StaffogLinkcode rename(Table<?> name) {
return new StaffogLinkcode(name.getQualifiedName(), null);
}
// -------------------------------------------------------------------------
@@ -150,22 +180,29 @@ public class StaffogLinkcode extends TableImpl<StaffogLinkcodeRecord> {
@Override
public Row3<String, String, Boolean> fieldsRow() {
return (Row3) super.fieldsRow();
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Function)}.
*/
public <U> SelectField<U> mapping(Function3<? super String, ? super String, ? super Boolean, ? extends U> from) {
return convertFrom(Records.mapping(from));
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Class,
* Function)}.
* Convenience mapping calling {@link SelectField#convertFrom(Class, Function)}.
*/
public <U> SelectField<U> mapping(
Class<U> toType, Function3<? super String, ? super String, ? super Boolean, ? extends U> from) {
public <U> SelectField<U> mapping(Class<U> toType,
Function3<? super String, ? super String, ? super Boolean, ? extends U> from)
{
return convertFrom(toType, Records.mapping(from));
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/StaffogMute.java
+70 -59
View File
@@ -25,7 +25,7 @@ import uk.hotten.staffog.data.jooq.tables.records.StaffogMuteRecord;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogMute extends TableImpl<StaffogMuteRecord> {
private static final long serialVersionUID = 1L;
@@ -40,142 +40,168 @@ public class StaffogMute extends TableImpl<StaffogMuteRecord> {
*/
@Override
public Class<StaffogMuteRecord> getRecordType() {
return StaffogMuteRecord.class;
}
/**
* The column <code>staffog.staffog_mute.id</code>.
*/
public final TableField<StaffogMuteRecord, Long> ID =
createField(DSL.name("id"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
public final TableField<StaffogMuteRecord, Long> ID = createField(DSL.name("id"),
SQLDataType.BIGINT.nullable(false).identity(true), this, "");
/**
* The column <code>staffog.staffog_mute.uuid</code>.
*/
public final TableField<StaffogMuteRecord, String> UUID =
createField(DSL.name("uuid"), SQLDataType.VARCHAR(36).nullable(false), this, "");
public final TableField<StaffogMuteRecord, String> UUID = createField(DSL.name("uuid"),
SQLDataType.VARCHAR(36).nullable(false), this, "");
/**
* The column <code>staffog.staffog_mute.reason</code>.
*/
public final TableField<StaffogMuteRecord, String> REASON =
createField(DSL.name("reason"), SQLDataType.VARCHAR(2048).nullable(false), this, "");
public final TableField<StaffogMuteRecord, String> REASON = createField(DSL.name("reason"),
SQLDataType.VARCHAR(2048).nullable(false), this, "");
/**
* The column <code>staffog.staffog_mute.by_uuid</code>.
*/
public final TableField<StaffogMuteRecord, String> BY_UUID =
createField(DSL.name("by_uuid"), SQLDataType.VARCHAR(36), this, "");
public final TableField<StaffogMuteRecord, String> BY_UUID = createField(DSL.name("by_uuid"),
SQLDataType.VARCHAR(36), this, "");
/**
* The column <code>staffog.staffog_mute.by_name</code>.
*/
public final TableField<StaffogMuteRecord, String> BY_NAME =
createField(DSL.name("by_name"), SQLDataType.VARCHAR(128), this, "");
public final TableField<StaffogMuteRecord, String> BY_NAME = createField(DSL.name("by_name"),
SQLDataType.VARCHAR(128), this, "");
/**
* The column <code>staffog.staffog_mute.removed_uuid</code>.
*/
public final TableField<StaffogMuteRecord, String> REMOVED_UUID =
createField(DSL.name("removed_uuid"), SQLDataType.VARCHAR(36), this, "");
public final TableField<StaffogMuteRecord, String> REMOVED_UUID = createField(DSL.name("removed_uuid"),
SQLDataType.VARCHAR(36), this, "");
/**
* The column <code>staffog.staffog_mute.removed_name</code>.
*/
public final TableField<StaffogMuteRecord, String> REMOVED_NAME =
createField(DSL.name("removed_name"), SQLDataType.VARCHAR(128), this, "");
public final TableField<StaffogMuteRecord, String> REMOVED_NAME = createField(DSL.name("removed_name"),
SQLDataType.VARCHAR(128), this, "");
/**
* The column <code>staffog.staffog_mute.removed_reason</code>.
*/
public final TableField<StaffogMuteRecord, String> REMOVED_REASON =
createField(DSL.name("removed_reason"), SQLDataType.VARCHAR(2048), this, "");
public final TableField<StaffogMuteRecord, String> REMOVED_REASON = createField(DSL.name("removed_reason"),
SQLDataType.VARCHAR(2048), this, "");
/**
* The column <code>staffog.staffog_mute.removed_time</code>.
*/
public final TableField<StaffogMuteRecord, Long> REMOVED_TIME =
createField(DSL.name("removed_time"), SQLDataType.BIGINT, this, "");
public final TableField<StaffogMuteRecord, Long> REMOVED_TIME = createField(DSL.name("removed_time"),
SQLDataType.BIGINT, this, "");
/**
* The column <code>staffog.staffog_mute.time</code>.
*/
public final TableField<StaffogMuteRecord, Long> TIME =
createField(DSL.name("time"), SQLDataType.BIGINT.nullable(false), this, "");
public final TableField<StaffogMuteRecord, Long> TIME = createField(DSL.name("time"),
SQLDataType.BIGINT.nullable(false), this, "");
/**
* The column <code>staffog.staffog_mute.until</code>.
*/
public final TableField<StaffogMuteRecord, Long> UNTIL =
createField(DSL.name("until"), SQLDataType.BIGINT.nullable(false), this, "");
public final TableField<StaffogMuteRecord, Long> UNTIL = createField(DSL.name("until"),
SQLDataType.BIGINT.nullable(false), this, "");
/**
* The column <code>staffog.staffog_mute.active</code>.
*/
public final TableField<StaffogMuteRecord, Boolean> ACTIVE =
createField(DSL.name("active"), SQLDataType.BIT.nullable(false), this, "");
public final TableField<StaffogMuteRecord, Boolean> ACTIVE = createField(DSL.name("active"),
SQLDataType.BIT.nullable(false), this, "");
private StaffogMute(Name alias, Table<StaffogMuteRecord> aliased) {
this(alias, aliased, null);
}
private StaffogMute(Name alias, Table<StaffogMuteRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
* Create an aliased <code>staffog.staffog_mute</code> table reference
*/
public StaffogMute(String alias) {
this(DSL.name(alias), STAFFOG_MUTE);
}
/**
* Create an aliased <code>staffog.staffog_mute</code> table reference
*/
public StaffogMute(Name alias) {
this(alias, STAFFOG_MUTE);
}
/**
* Create a <code>staffog.staffog_mute</code> table reference
*/
public StaffogMute() {
this(DSL.name("staffog_mute"), null);
}
public <O extends Record> StaffogMute(Table<O> child, ForeignKey<O, StaffogMuteRecord> key) {
super(child, key, STAFFOG_MUTE);
}
@Override
public Schema getSchema() {
return aliased() ? null : Staffog.STAFFOG;
}
@Override
public Identity<StaffogMuteRecord, Long> getIdentity() {
return (Identity<StaffogMuteRecord, Long>) super.getIdentity();
}
@Override
public UniqueKey<StaffogMuteRecord> getPrimaryKey() {
return Keys.KEY_STAFFOG_MUTE_PRIMARY;
}
@Override
public StaffogMute as(String alias) {
return new StaffogMute(DSL.name(alias), this);
}
@Override
public StaffogMute as(Name alias) {
return new StaffogMute(alias, this);
}
@Override
public StaffogMute as(Table<?> alias) {
return new StaffogMute(alias.getQualifiedName(), this);
}
/**
@@ -183,7 +209,9 @@ public class StaffogMute extends TableImpl<StaffogMuteRecord> {
*/
@Override
public StaffogMute rename(String name) {
return new StaffogMute(DSL.name(name), null);
}
/**
@@ -191,7 +219,9 @@ public class StaffogMute extends TableImpl<StaffogMuteRecord> {
*/
@Override
public StaffogMute rename(Name name) {
return new StaffogMute(name, null);
}
/**
@@ -199,7 +229,9 @@ public class StaffogMute extends TableImpl<StaffogMuteRecord> {
*/
@Override
public StaffogMute rename(Table<?> name) {
return new StaffogMute(name.getQualifiedName(), null);
}
// -------------------------------------------------------------------------
@@ -208,52 +240,31 @@ public class StaffogMute extends TableImpl<StaffogMuteRecord> {
@Override
public Row12<Long, String, String, String, String, String, String, String, Long, Long, Long, Boolean> fieldsRow() {
return (Row12) super.fieldsRow();
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Function)}.
*/
public <U> SelectField<U> mapping(
Function12<
? super Long,
? super String,
? super String,
? super String,
? super String,
? super String,
? super String,
? super String,
? super Long,
? super Long,
? super Long,
? super Boolean,
? extends U>
from) {
Function12<? super Long, ? super String, ? super String, ? super String, ? super String, ? super String, ? super String, ? super String, ? super Long, ? super Long, ? super Long, ? super Boolean, ? extends U> from)
{
return convertFrom(Records.mapping(from));
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Class,
* Function)}.
* Convenience mapping calling {@link SelectField#convertFrom(Class, Function)}.
*/
public <U> SelectField<U> mapping(
Class<U> toType,
Function12<
? super Long,
? super String,
? super String,
? super String,
? super String,
? super String,
? super String,
? super String,
? super Long,
? super Long,
? super Long,
? super Boolean,
? extends U>
from) {
public <U> SelectField<U> mapping(Class<U> toType,
Function12<? super Long, ? super String, ? super String, ? super String, ? super String, ? super String, ? super String, ? super String, ? super Long, ? super Long, ? super Long, ? super Boolean, ? extends U> from)
{
return convertFrom(toType, Records.mapping(from));
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/StaffogReport.java
+73 -71
View File
@@ -25,7 +25,7 @@ import uk.hotten.staffog.data.jooq.tables.records.StaffogReportRecord;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogReport extends TableImpl<StaffogReportRecord> {
private static final long serialVersionUID = 1L;
@@ -40,154 +40,174 @@ public class StaffogReport extends TableImpl<StaffogReportRecord> {
*/
@Override
public Class<StaffogReportRecord> getRecordType() {
return StaffogReportRecord.class;
}
/**
* The column <code>staffog.staffog_report.id</code>.
*/
public final TableField<StaffogReportRecord, Integer> ID =
createField(DSL.name("id"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
public final TableField<StaffogReportRecord, Integer> ID = createField(DSL.name("id"),
SQLDataType.INTEGER.nullable(false).identity(true), this, "");
/**
* The column <code>staffog.staffog_report.uuid</code>.
*/
public final TableField<StaffogReportRecord, String> UUID =
createField(DSL.name("uuid"), SQLDataType.VARCHAR(36).nullable(false), this, "");
public final TableField<StaffogReportRecord, String> UUID = createField(DSL.name("uuid"),
SQLDataType.VARCHAR(36).nullable(false), this, "");
/**
* The column <code>staffog.staffog_report.by_uuid</code>.
*/
public final TableField<StaffogReportRecord, String> BY_UUID =
createField(DSL.name("by_uuid"), SQLDataType.VARCHAR(36).nullable(false), this, "");
public final TableField<StaffogReportRecord, String> BY_UUID = createField(DSL.name("by_uuid"),
SQLDataType.VARCHAR(36).nullable(false), this, "");
/**
* The column <code>staffog.staffog_report.time</code>.
*/
public final TableField<StaffogReportRecord, Long> TIME =
createField(DSL.name("time"), SQLDataType.BIGINT.nullable(false), this, "");
public final TableField<StaffogReportRecord, Long> TIME = createField(DSL.name("time"),
SQLDataType.BIGINT.nullable(false), this, "");
/**
* The column <code>staffog.staffog_report.type</code>.
*/
public final TableField<StaffogReportRecord, String> TYPE =
createField(DSL.name("type"), SQLDataType.VARCHAR(128).nullable(false), this, "");
public final TableField<StaffogReportRecord, String> TYPE = createField(DSL.name("type"),
SQLDataType.VARCHAR(128).nullable(false), this, "");
/**
* The column <code>staffog.staffog_report.reason</code>.
*/
public final TableField<StaffogReportRecord, String> REASON =
createField(DSL.name("reason"), SQLDataType.VARCHAR(2048).nullable(false), this, "");
public final TableField<StaffogReportRecord, String> REASON = createField(DSL.name("reason"),
SQLDataType.VARCHAR(2048).nullable(false), this, "");
/**
* The column <code>staffog.staffog_report.evidence</code>.
*/
public final TableField<StaffogReportRecord, String> EVIDENCE = createField(
DSL.name("evidence"),
SQLDataType.VARCHAR(2048).defaultValue(DSL.inline("[]", SQLDataType.VARCHAR)),
this,
"");
public final TableField<StaffogReportRecord, String> EVIDENCE = createField(DSL.name("evidence"),
SQLDataType.VARCHAR(2048).defaultValue(DSL.inline("[]", SQLDataType.VARCHAR)), this, "");
/**
* The column <code>staffog.staffog_report.crid</code>.
*/
public final TableField<StaffogReportRecord, Integer> CRID =
createField(DSL.name("crid"), SQLDataType.INTEGER, this, "");
public final TableField<StaffogReportRecord, Integer> CRID = createField(DSL.name("crid"), SQLDataType.INTEGER,
this, "");
/**
* The column <code>staffog.staffog_report.open</code>.
*/
public final TableField<StaffogReportRecord, Boolean> OPEN = createField(
DSL.name("open"),
SQLDataType.BIT.nullable(false).defaultValue(DSL.inline("b'1'", SQLDataType.BIT)),
this,
"");
public final TableField<StaffogReportRecord, Boolean> OPEN = createField(DSL.name("open"),
SQLDataType.BIT.nullable(false).defaultValue(DSL.inline("b'1'", SQLDataType.BIT)), this, "");
/**
* The column <code>staffog.staffog_report.assigned</code>.
*/
public final TableField<StaffogReportRecord, String> ASSIGNED =
createField(DSL.name("assigned"), SQLDataType.VARCHAR(36), this, "");
public final TableField<StaffogReportRecord, String> ASSIGNED = createField(DSL.name("assigned"),
SQLDataType.VARCHAR(36), this, "");
/**
* The column <code>staffog.staffog_report.verdict</code>.
*/
public final TableField<StaffogReportRecord, Boolean> VERDICT =
createField(DSL.name("verdict"), SQLDataType.BIT, this, "");
public final TableField<StaffogReportRecord, Boolean> VERDICT = createField(DSL.name("verdict"), SQLDataType.BIT,
this, "");
/**
* The column <code>staffog.staffog_report.verdict_time</code>.
*/
public final TableField<StaffogReportRecord, Long> VERDICT_TIME =
createField(DSL.name("verdict_time"), SQLDataType.BIGINT, this, "");
public final TableField<StaffogReportRecord, Long> VERDICT_TIME = createField(DSL.name("verdict_time"),
SQLDataType.BIGINT, this, "");
/**
* The column <code>staffog.staffog_report.comment</code>.
*/
public final TableField<StaffogReportRecord, String> COMMENT =
createField(DSL.name("comment"), SQLDataType.VARCHAR(2048), this, "");
public final TableField<StaffogReportRecord, String> COMMENT = createField(DSL.name("comment"),
SQLDataType.VARCHAR(2048), this, "");
private StaffogReport(Name alias, Table<StaffogReportRecord> aliased) {
this(alias, aliased, null);
}
private StaffogReport(Name alias, Table<StaffogReportRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
* Create an aliased <code>staffog.staffog_report</code> table reference
*/
public StaffogReport(String alias) {
this(DSL.name(alias), STAFFOG_REPORT);
}
/**
* Create an aliased <code>staffog.staffog_report</code> table reference
*/
public StaffogReport(Name alias) {
this(alias, STAFFOG_REPORT);
}
/**
* Create a <code>staffog.staffog_report</code> table reference
*/
public StaffogReport() {
this(DSL.name("staffog_report"), null);
}
public <O extends Record> StaffogReport(Table<O> child, ForeignKey<O, StaffogReportRecord> key) {
super(child, key, STAFFOG_REPORT);
}
@Override
public Schema getSchema() {
return aliased() ? null : Staffog.STAFFOG;
}
@Override
public Identity<StaffogReportRecord, Integer> getIdentity() {
return (Identity<StaffogReportRecord, Integer>) super.getIdentity();
}
@Override
public UniqueKey<StaffogReportRecord> getPrimaryKey() {
return Keys.KEY_STAFFOG_REPORT_PRIMARY;
}
@Override
public StaffogReport as(String alias) {
return new StaffogReport(DSL.name(alias), this);
}
@Override
public StaffogReport as(Name alias) {
return new StaffogReport(alias, this);
}
@Override
public StaffogReport as(Table<?> alias) {
return new StaffogReport(alias.getQualifiedName(), this);
}
/**
@@ -195,7 +215,9 @@ public class StaffogReport extends TableImpl<StaffogReportRecord> {
*/
@Override
public StaffogReport rename(String name) {
return new StaffogReport(DSL.name(name), null);
}
/**
@@ -203,7 +225,9 @@ public class StaffogReport extends TableImpl<StaffogReportRecord> {
*/
@Override
public StaffogReport rename(Name name) {
return new StaffogReport(name, null);
}
/**
@@ -211,7 +235,9 @@ public class StaffogReport extends TableImpl<StaffogReportRecord> {
*/
@Override
public StaffogReport rename(Table<?> name) {
return new StaffogReport(name.getQualifiedName(), null);
}
// -------------------------------------------------------------------------
@@ -219,56 +245,32 @@ public class StaffogReport extends TableImpl<StaffogReportRecord> {
// -------------------------------------------------------------------------
@Override
public Row13<Integer, String, String, Long, String, String, String, Integer, Boolean, String, Boolean, Long, String>
fieldsRow() {
public Row13<Integer, String, String, Long, String, String, String, Integer, Boolean, String, Boolean, Long, String> fieldsRow() {
return (Row13) super.fieldsRow();
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Function)}.
*/
public <U> SelectField<U> mapping(
Function13<
? super Integer,
? super String,
? super String,
? super Long,
? super String,
? super String,
? super String,
? super Integer,
? super Boolean,
? super String,
? super Boolean,
? super Long,
? super String,
? extends U>
from) {
Function13<? super Integer, ? super String, ? super String, ? super Long, ? super String, ? super String, ? super String, ? super Integer, ? super Boolean, ? super String, ? super Boolean, ? super Long, ? super String, ? extends U> from)
{
return convertFrom(Records.mapping(from));
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Class,
* Function)}.
* Convenience mapping calling {@link SelectField#convertFrom(Class, Function)}.
*/
public <U> SelectField<U> mapping(
Class<U> toType,
Function13<
? super Integer,
? super String,
? super String,
? super Long,
? super String,
? super String,
? super String,
? super Integer,
? super Boolean,
? super String,
? super Boolean,
? super Long,
? super String,
? extends U>
from) {
public <U> SelectField<U> mapping(Class<U> toType,
Function13<? super Integer, ? super String, ? super String, ? super Long, ? super String, ? super String, ? super String, ? super Integer, ? super Boolean, ? super String, ? super Boolean, ? super Long, ? super String, ? extends U> from)
{
return convertFrom(toType, Records.mapping(from));
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/StaffogStaffip.java
+60 -39
View File
@@ -25,7 +25,7 @@ import uk.hotten.staffog.data.jooq.tables.records.StaffogStaffipRecord;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogStaffip extends TableImpl<StaffogStaffipRecord> {
private static final long serialVersionUID = 1L;
@@ -40,112 +40,138 @@ public class StaffogStaffip extends TableImpl<StaffogStaffipRecord> {
*/
@Override
public Class<StaffogStaffipRecord> getRecordType() {
return StaffogStaffipRecord.class;
}
/**
* The column <code>staffog.staffog_staffip.id</code>.
*/
public final TableField<StaffogStaffipRecord, Integer> ID =
createField(DSL.name("id"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
public final TableField<StaffogStaffipRecord, Integer> ID = createField(DSL.name("id"),
SQLDataType.INTEGER.nullable(false).identity(true), this, "");
/**
* The column <code>staffog.staffog_staffip.ip</code>.
*/
public final TableField<StaffogStaffipRecord, String> IP =
createField(DSL.name("ip"), SQLDataType.VARCHAR(15).nullable(false), this, "");
public final TableField<StaffogStaffipRecord, String> IP = createField(DSL.name("ip"),
SQLDataType.VARCHAR(15).nullable(false), this, "");
/**
* The column <code>staffog.staffog_staffip.uuid</code>.
*/
public final TableField<StaffogStaffipRecord, String> UUID =
createField(DSL.name("uuid"), SQLDataType.VARCHAR(36).nullable(false), this, "");
public final TableField<StaffogStaffipRecord, String> UUID = createField(DSL.name("uuid"),
SQLDataType.VARCHAR(36).nullable(false), this, "");
/**
* The column <code>staffog.staffog_staffip.initial</code>.
*/
public final TableField<StaffogStaffipRecord, Boolean> INITIAL =
createField(DSL.name("initial"), SQLDataType.BIT.nullable(false), this, "");
public final TableField<StaffogStaffipRecord, Boolean> INITIAL = createField(DSL.name("initial"),
SQLDataType.BIT.nullable(false), this, "");
/**
* The column <code>staffog.staffog_staffip.panel_acknowledged</code>.
*/
public final TableField<StaffogStaffipRecord, Boolean> PANEL_ACKNOWLEDGED =
createField(DSL.name("panel_acknowledged"), SQLDataType.BIT.nullable(false), this, "");
public final TableField<StaffogStaffipRecord, Boolean> PANEL_ACKNOWLEDGED = createField(
DSL.name("panel_acknowledged"), SQLDataType.BIT.nullable(false), this, "");
/**
* The column <code>staffog.staffog_staffip.panel_verified</code>.
*/
public final TableField<StaffogStaffipRecord, Boolean> PANEL_VERIFIED =
createField(DSL.name("panel_verified"), SQLDataType.BIT.nullable(false), this, "");
public final TableField<StaffogStaffipRecord, Boolean> PANEL_VERIFIED = createField(DSL.name("panel_verified"),
SQLDataType.BIT.nullable(false), this, "");
/**
* The column <code>staffog.staffog_staffip.game_verified</code>.
*/
public final TableField<StaffogStaffipRecord, Boolean> GAME_VERIFIED =
createField(DSL.name("game_verified"), SQLDataType.BIT.nullable(false), this, "");
public final TableField<StaffogStaffipRecord, Boolean> GAME_VERIFIED = createField(DSL.name("game_verified"),
SQLDataType.BIT.nullable(false), this, "");
private StaffogStaffip(Name alias, Table<StaffogStaffipRecord> aliased) {
this(alias, aliased, null);
}
private StaffogStaffip(Name alias, Table<StaffogStaffipRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
* Create an aliased <code>staffog.staffog_staffip</code> table reference
*/
public StaffogStaffip(String alias) {
this(DSL.name(alias), STAFFOG_STAFFIP);
}
/**
* Create an aliased <code>staffog.staffog_staffip</code> table reference
*/
public StaffogStaffip(Name alias) {
this(alias, STAFFOG_STAFFIP);
}
/**
* Create a <code>staffog.staffog_staffip</code> table reference
*/
public StaffogStaffip() {
this(DSL.name("staffog_staffip"), null);
}
public <O extends Record> StaffogStaffip(Table<O> child, ForeignKey<O, StaffogStaffipRecord> key) {
super(child, key, STAFFOG_STAFFIP);
}
@Override
public Schema getSchema() {
return aliased() ? null : Staffog.STAFFOG;
}
@Override
public Identity<StaffogStaffipRecord, Integer> getIdentity() {
return (Identity<StaffogStaffipRecord, Integer>) super.getIdentity();
}
@Override
public UniqueKey<StaffogStaffipRecord> getPrimaryKey() {
return Keys.KEY_STAFFOG_STAFFIP_PRIMARY;
}
@Override
public StaffogStaffip as(String alias) {
return new StaffogStaffip(DSL.name(alias), this);
}
@Override
public StaffogStaffip as(Name alias) {
return new StaffogStaffip(alias, this);
}
@Override
public StaffogStaffip as(Table<?> alias) {
return new StaffogStaffip(alias.getQualifiedName(), this);
}
/**
@@ -153,7 +179,9 @@ public class StaffogStaffip extends TableImpl<StaffogStaffipRecord> {
*/
@Override
public StaffogStaffip rename(String name) {
return new StaffogStaffip(DSL.name(name), null);
}
/**
@@ -161,7 +189,9 @@ public class StaffogStaffip extends TableImpl<StaffogStaffipRecord> {
*/
@Override
public StaffogStaffip rename(Name name) {
return new StaffogStaffip(name, null);
}
/**
@@ -169,7 +199,9 @@ public class StaffogStaffip extends TableImpl<StaffogStaffipRecord> {
*/
@Override
public StaffogStaffip rename(Table<?> name) {
return new StaffogStaffip(name.getQualifiedName(), null);
}
// -------------------------------------------------------------------------
@@ -178,42 +210,31 @@ public class StaffogStaffip extends TableImpl<StaffogStaffipRecord> {
@Override
public Row7<Integer, String, String, Boolean, Boolean, Boolean, Boolean> fieldsRow() {
return (Row7) super.fieldsRow();
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Function)}.
*/
public <U> SelectField<U> mapping(
Function7<
? super Integer,
? super String,
? super String,
? super Boolean,
? super Boolean,
? super Boolean,
? super Boolean,
? extends U>
from) {
Function7<? super Integer, ? super String, ? super String, ? super Boolean, ? super Boolean, ? super Boolean, ? super Boolean, ? extends U> from)
{
return convertFrom(Records.mapping(from));
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Class,
* Function)}.
* Convenience mapping calling {@link SelectField#convertFrom(Class, Function)}.
*/
public <U> SelectField<U> mapping(
Class<U> toType,
Function7<
? super Integer,
? super String,
? super String,
? super Boolean,
? super Boolean,
? super Boolean,
? super Boolean,
? extends U>
from) {
public <U> SelectField<U> mapping(Class<U> toType,
Function7<? super Integer, ? super String, ? super String, ? super Boolean, ? super Boolean, ? super Boolean, ? super Boolean, ? extends U> from)
{
return convertFrom(toType, Records.mapping(from));
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/StaffogStat.java
+41 -7
View File
@@ -22,7 +22,7 @@ import uk.hotten.staffog.data.jooq.tables.records.StaffogStatRecord;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogStat extends TableImpl<StaffogStatRecord> {
private static final long serialVersionUID = 1L;
@@ -37,72 +37,94 @@ public class StaffogStat extends TableImpl<StaffogStatRecord> {
*/
@Override
public Class<StaffogStatRecord> getRecordType() {
return StaffogStatRecord.class;
}
/**
* The column <code>staffog.staffog_stat.name</code>.
*/
public final TableField<StaffogStatRecord, String> NAME =
createField(DSL.name("name"), SQLDataType.VARCHAR(2048).nullable(false), this, "");
public final TableField<StaffogStatRecord, String> NAME = createField(DSL.name("name"),
SQLDataType.VARCHAR(2048).nullable(false), this, "");
/**
* The column <code>staffog.staffog_stat.stat</code>.
*/
public final TableField<StaffogStatRecord, String> STAT =
createField(DSL.name("stat"), SQLDataType.VARCHAR(2048).nullable(false), this, "");
public final TableField<StaffogStatRecord, String> STAT = createField(DSL.name("stat"),
SQLDataType.VARCHAR(2048).nullable(false), this, "");
private StaffogStat(Name alias, Table<StaffogStatRecord> aliased) {
this(alias, aliased, null);
}
private StaffogStat(Name alias, Table<StaffogStatRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
* Create an aliased <code>staffog.staffog_stat</code> table reference
*/
public StaffogStat(String alias) {
this(DSL.name(alias), STAFFOG_STAT);
}
/**
* Create an aliased <code>staffog.staffog_stat</code> table reference
*/
public StaffogStat(Name alias) {
this(alias, STAFFOG_STAT);
}
/**
* Create a <code>staffog.staffog_stat</code> table reference
*/
public StaffogStat() {
this(DSL.name("staffog_stat"), null);
}
public <O extends Record> StaffogStat(Table<O> child, ForeignKey<O, StaffogStatRecord> key) {
super(child, key, STAFFOG_STAT);
}
@Override
public Schema getSchema() {
return aliased() ? null : Staffog.STAFFOG;
}
@Override
public StaffogStat as(String alias) {
return new StaffogStat(DSL.name(alias), this);
}
@Override
public StaffogStat as(Name alias) {
return new StaffogStat(alias, this);
}
@Override
public StaffogStat as(Table<?> alias) {
return new StaffogStat(alias.getQualifiedName(), this);
}
/**
@@ -110,7 +132,9 @@ public class StaffogStat extends TableImpl<StaffogStatRecord> {
*/
@Override
public StaffogStat rename(String name) {
return new StaffogStat(DSL.name(name), null);
}
/**
@@ -118,7 +142,9 @@ public class StaffogStat extends TableImpl<StaffogStatRecord> {
*/
@Override
public StaffogStat rename(Name name) {
return new StaffogStat(name, null);
}
/**
@@ -126,7 +152,9 @@ public class StaffogStat extends TableImpl<StaffogStatRecord> {
*/
@Override
public StaffogStat rename(Table<?> name) {
return new StaffogStat(name.getQualifiedName(), null);
}
// -------------------------------------------------------------------------
@@ -135,21 +163,27 @@ public class StaffogStat extends TableImpl<StaffogStatRecord> {
@Override
public Row2<String, String> fieldsRow() {
return (Row2) super.fieldsRow();
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Function)}.
*/
public <U> SelectField<U> mapping(Function2<? super String, ? super String, ? extends U> from) {
return convertFrom(Records.mapping(from));
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Class,
* Function)}.
* Convenience mapping calling {@link SelectField#convertFrom(Class, Function)}.
*/
public <U> SelectField<U> mapping(Class<U> toType, Function2<? super String, ? super String, ? extends U> from) {
return convertFrom(toType, Records.mapping(from));
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/StaffogTask.java
+50 -11
View File
@@ -25,7 +25,7 @@ import uk.hotten.staffog.data.jooq.tables.records.StaffogTaskRecord;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogTask extends TableImpl<StaffogTaskRecord> {
private static final long serialVersionUID = 1L;
@@ -40,88 +40,114 @@ public class StaffogTask extends TableImpl<StaffogTaskRecord> {
*/
@Override
public Class<StaffogTaskRecord> getRecordType() {
return StaffogTaskRecord.class;
}
/**
* The column <code>staffog.staffog_task.id</code>.
*/
public final TableField<StaffogTaskRecord, Integer> ID =
createField(DSL.name("id"), SQLDataType.INTEGER.nullable(false).identity(true), this, "");
public final TableField<StaffogTaskRecord, Integer> ID = createField(DSL.name("id"),
SQLDataType.INTEGER.nullable(false).identity(true), this, "");
/**
* The column <code>staffog.staffog_task.task</code>.
*/
public final TableField<StaffogTaskRecord, String> TASK =
createField(DSL.name("task"), SQLDataType.VARCHAR(2048).nullable(false), this, "");
public final TableField<StaffogTaskRecord, String> TASK = createField(DSL.name("task"),
SQLDataType.VARCHAR(2048).nullable(false), this, "");
/**
* The column <code>staffog.staffog_task.data</code>.
*/
public final TableField<StaffogTaskRecord, String> DATA =
createField(DSL.name("data"), SQLDataType.VARCHAR(2048).nullable(false), this, "");
public final TableField<StaffogTaskRecord, String> DATA = createField(DSL.name("data"),
SQLDataType.VARCHAR(2048).nullable(false), this, "");
private StaffogTask(Name alias, Table<StaffogTaskRecord> aliased) {
this(alias, aliased, null);
}
private StaffogTask(Name alias, Table<StaffogTaskRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
* Create an aliased <code>staffog.staffog_task</code> table reference
*/
public StaffogTask(String alias) {
this(DSL.name(alias), STAFFOG_TASK);
}
/**
* Create an aliased <code>staffog.staffog_task</code> table reference
*/
public StaffogTask(Name alias) {
this(alias, STAFFOG_TASK);
}
/**
* Create a <code>staffog.staffog_task</code> table reference
*/
public StaffogTask() {
this(DSL.name("staffog_task"), null);
}
public <O extends Record> StaffogTask(Table<O> child, ForeignKey<O, StaffogTaskRecord> key) {
super(child, key, STAFFOG_TASK);
}
@Override
public Schema getSchema() {
return aliased() ? null : Staffog.STAFFOG;
}
@Override
public Identity<StaffogTaskRecord, Integer> getIdentity() {
return (Identity<StaffogTaskRecord, Integer>) super.getIdentity();
}
@Override
public UniqueKey<StaffogTaskRecord> getPrimaryKey() {
return Keys.KEY_STAFFOG_TASK_PRIMARY;
}
@Override
public StaffogTask as(String alias) {
return new StaffogTask(DSL.name(alias), this);
}
@Override
public StaffogTask as(Name alias) {
return new StaffogTask(alias, this);
}
@Override
public StaffogTask as(Table<?> alias) {
return new StaffogTask(alias.getQualifiedName(), this);
}
/**
@@ -129,7 +155,9 @@ public class StaffogTask extends TableImpl<StaffogTaskRecord> {
*/
@Override
public StaffogTask rename(String name) {
return new StaffogTask(DSL.name(name), null);
}
/**
@@ -137,7 +165,9 @@ public class StaffogTask extends TableImpl<StaffogTaskRecord> {
*/
@Override
public StaffogTask rename(Name name) {
return new StaffogTask(name, null);
}
/**
@@ -145,7 +175,9 @@ public class StaffogTask extends TableImpl<StaffogTaskRecord> {
*/
@Override
public StaffogTask rename(Table<?> name) {
return new StaffogTask(name.getQualifiedName(), null);
}
// -------------------------------------------------------------------------
@@ -154,22 +186,29 @@ public class StaffogTask extends TableImpl<StaffogTaskRecord> {
@Override
public Row3<Integer, String, String> fieldsRow() {
return (Row3) super.fieldsRow();
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Function)}.
*/
public <U> SelectField<U> mapping(Function3<? super Integer, ? super String, ? super String, ? extends U> from) {
return convertFrom(Records.mapping(from));
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Class,
* Function)}.
* Convenience mapping calling {@link SelectField#convertFrom(Class, Function)}.
*/
public <U> SelectField<U> mapping(
Class<U> toType, Function3<? super Integer, ? super String, ? super String, ? extends U> from) {
public <U> SelectField<U> mapping(Class<U> toType,
Function3<? super Integer, ? super String, ? super String, ? extends U> from)
{
return convertFrom(toType, Records.mapping(from));
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/StaffogWeb.java
+58 -38
View File
@@ -26,7 +26,7 @@ import uk.hotten.staffog.data.jooq.tables.records.StaffogWebRecord;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogWeb extends TableImpl<StaffogWebRecord> {
private static final long serialVersionUID = 1L;
@@ -41,109 +41,132 @@ public class StaffogWeb extends TableImpl<StaffogWebRecord> {
*/
@Override
public Class<StaffogWebRecord> getRecordType() {
return StaffogWebRecord.class;
}
/**
* The column <code>staffog.staffog_web.id</code>.
*/
public final TableField<StaffogWebRecord, Integer> ID =
createField(DSL.name("id"), SQLDataType.INTEGER.nullable(false), this, "");
public final TableField<StaffogWebRecord, Integer> ID = createField(DSL.name("id"),
SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>staffog.staffog_web.username</code>.
*/
public final TableField<StaffogWebRecord, String> USERNAME =
createField(DSL.name("username"), SQLDataType.VARCHAR(128).nullable(false), this, "");
public final TableField<StaffogWebRecord, String> USERNAME = createField(DSL.name("username"),
SQLDataType.VARCHAR(128).nullable(false), this, "");
/**
* The column <code>staffog.staffog_web.uuid</code>.
*/
public final TableField<StaffogWebRecord, String> UUID =
createField(DSL.name("uuid"), SQLDataType.VARCHAR(36).nullable(false), this, "");
public final TableField<StaffogWebRecord, String> UUID = createField(DSL.name("uuid"),
SQLDataType.VARCHAR(36).nullable(false), this, "");
/**
* The column <code>staffog.staffog_web.password</code>.
*/
public final TableField<StaffogWebRecord, String> PASSWORD =
createField(DSL.name("password"), SQLDataType.VARCHAR(2048).nullable(false), this, "");
public final TableField<StaffogWebRecord, String> PASSWORD = createField(DSL.name("password"),
SQLDataType.VARCHAR(2048).nullable(false), this, "");
/**
* The column <code>staffog.staffog_web.active</code>.
*/
public final TableField<StaffogWebRecord, Boolean> ACTIVE = createField(
DSL.name("active"),
SQLDataType.BIT.nullable(false).defaultValue(DSL.inline("b'1'", SQLDataType.BIT)),
this,
"");
public final TableField<StaffogWebRecord, Boolean> ACTIVE = createField(DSL.name("active"),
SQLDataType.BIT.nullable(false).defaultValue(DSL.inline("b'1'", SQLDataType.BIT)), this, "");
/**
* The column <code>staffog.staffog_web.admin</code>.
*/
public final TableField<StaffogWebRecord, Boolean> ADMIN =
createField(DSL.name("admin"), SQLDataType.BIT.nullable(false), this, "");
public final TableField<StaffogWebRecord, Boolean> ADMIN = createField(DSL.name("admin"),
SQLDataType.BIT.nullable(false), this, "");
private StaffogWeb(Name alias, Table<StaffogWebRecord> aliased) {
this(alias, aliased, null);
}
private StaffogWeb(Name alias, Table<StaffogWebRecord> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
}
/**
* Create an aliased <code>staffog.staffog_web</code> table reference
*/
public StaffogWeb(String alias) {
this(DSL.name(alias), STAFFOG_WEB);
}
/**
* Create an aliased <code>staffog.staffog_web</code> table reference
*/
public StaffogWeb(Name alias) {
this(alias, STAFFOG_WEB);
}
/**
* Create a <code>staffog.staffog_web</code> table reference
*/
public StaffogWeb() {
this(DSL.name("staffog_web"), null);
}
public <O extends Record> StaffogWeb(Table<O> child, ForeignKey<O, StaffogWebRecord> key) {
super(child, key, STAFFOG_WEB);
}
@Override
public Schema getSchema() {
return aliased() ? null : Staffog.STAFFOG;
}
@Override
public UniqueKey<StaffogWebRecord> getPrimaryKey() {
return Keys.KEY_STAFFOG_WEB_PRIMARY;
}
@Override
public List<UniqueKey<StaffogWebRecord>> getUniqueKeys() {
return Arrays.asList(Keys.KEY_STAFFOG_WEB_USERNAME);
}
@Override
public StaffogWeb as(String alias) {
return new StaffogWeb(DSL.name(alias), this);
}
@Override
public StaffogWeb as(Name alias) {
return new StaffogWeb(alias, this);
}
@Override
public StaffogWeb as(Table<?> alias) {
return new StaffogWeb(alias.getQualifiedName(), this);
}
/**
@@ -151,7 +174,9 @@ public class StaffogWeb extends TableImpl<StaffogWebRecord> {
*/
@Override
public StaffogWeb rename(String name) {
return new StaffogWeb(DSL.name(name), null);
}
/**
@@ -159,7 +184,9 @@ public class StaffogWeb extends TableImpl<StaffogWebRecord> {
*/
@Override
public StaffogWeb rename(Name name) {
return new StaffogWeb(name, null);
}
/**
@@ -167,7 +194,9 @@ public class StaffogWeb extends TableImpl<StaffogWebRecord> {
*/
@Override
public StaffogWeb rename(Table<?> name) {
return new StaffogWeb(name.getQualifiedName(), null);
}
// -------------------------------------------------------------------------
@@ -176,40 +205,31 @@ public class StaffogWeb extends TableImpl<StaffogWebRecord> {
@Override
public Row6<Integer, String, String, String, Boolean, Boolean> fieldsRow() {
return (Row6) super.fieldsRow();
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Function)}.
*/
public <U> SelectField<U> mapping(
Function6<
? super Integer,
? super String,
? super String,
? super String,
? super Boolean,
? super Boolean,
? extends U>
from) {
Function6<? super Integer, ? super String, ? super String, ? super String, ? super Boolean, ? super Boolean, ? extends U> from)
{
return convertFrom(Records.mapping(from));
}
/**
* Convenience mapping calling {@link SelectField#convertFrom(Class,
* Function)}.
* Convenience mapping calling {@link SelectField#convertFrom(Class, Function)}.
*/
public <U> SelectField<U> mapping(
Class<U> toType,
Function6<
? super Integer,
? super String,
? super String,
? super String,
? super Boolean,
? super Boolean,
? extends U>
from) {
public <U> SelectField<U> mapping(Class<U> toType,
Function6<? super Integer, ? super String, ? super String, ? super String, ? super Boolean, ? super Boolean, ? extends U> from)
{
return convertFrom(toType, Records.mapping(from));
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/records/StaffogAppealRecord.java
+168 -34
View File
@@ -10,10 +10,10 @@ import uk.hotten.staffog.data.jooq.tables.StaffogAppeal;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
public class StaffogAppealRecord extends UpdatableRecordImpl<StaffogAppealRecord>
implements Record12<
Integer, String, Long, String, Integer, String, String, Boolean, String, Boolean, Long, String> {
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogAppealRecord extends UpdatableRecordImpl<StaffogAppealRecord> implements
Record12<Integer, String, Long, String, Integer, String, String, Boolean, String, Boolean, Long, String>
{
private static final long serialVersionUID = 1L;
@@ -21,168 +21,216 @@ public class StaffogAppealRecord extends UpdatableRecordImpl<StaffogAppealRecord
* Setter for <code>staffog.staffog_appeal.id</code>.
*/
public void setId(Integer value) {
set(0, value);
}
/**
* Getter for <code>staffog.staffog_appeal.id</code>.
*/
public Integer getId() {
return (Integer) get(0);
}
/**
* Setter for <code>staffog.staffog_appeal.uuid</code>.
*/
public void setUuid(String value) {
set(1, value);
}
/**
* Getter for <code>staffog.staffog_appeal.uuid</code>.
*/
public String getUuid() {
return (String) get(1);
}
/**
* Setter for <code>staffog.staffog_appeal.time</code>.
*/
public void setTime(Long value) {
set(2, value);
}
/**
* Getter for <code>staffog.staffog_appeal.time</code>.
*/
public Long getTime() {
return (Long) get(2);
}
/**
* Setter for <code>staffog.staffog_appeal.type</code>.
*/
public void setType(String value) {
set(3, value);
}
/**
* Getter for <code>staffog.staffog_appeal.type</code>.
*/
public String getType() {
return (String) get(3);
}
/**
* Setter for <code>staffog.staffog_appeal.pid</code>.
*/
public void setPid(Integer value) {
set(4, value);
}
/**
* Getter for <code>staffog.staffog_appeal.pid</code>.
*/
public Integer getPid() {
return (Integer) get(4);
}
/**
* Setter for <code>staffog.staffog_appeal.reason</code>.
*/
public void setReason(String value) {
set(5, value);
}
/**
* Getter for <code>staffog.staffog_appeal.reason</code>.
*/
public String getReason() {
return (String) get(5);
}
/**
* Setter for <code>staffog.staffog_appeal.evidence</code>.
*/
public void setEvidence(String value) {
set(6, value);
}
/**
* Getter for <code>staffog.staffog_appeal.evidence</code>.
*/
public String getEvidence() {
return (String) get(6);
}
/**
* Setter for <code>staffog.staffog_appeal.open</code>.
*/
public void setOpen(Boolean value) {
set(7, value);
}
/**
* Getter for <code>staffog.staffog_appeal.open</code>.
*/
public Boolean getOpen() {
return (Boolean) get(7);
}
/**
* Setter for <code>staffog.staffog_appeal.assigned</code>.
*/
public void setAssigned(String value) {
set(8, value);
}
/**
* Getter for <code>staffog.staffog_appeal.assigned</code>.
*/
public String getAssigned() {
return (String) get(8);
}
/**
* Setter for <code>staffog.staffog_appeal.verdict</code>.
*/
public void setVerdict(Boolean value) {
set(9, value);
}
/**
* Getter for <code>staffog.staffog_appeal.verdict</code>.
*/
public Boolean getVerdict() {
return (Boolean) get(9);
}
/**
* Setter for <code>staffog.staffog_appeal.verdict_time</code>.
*/
public void setVerdictTime(Long value) {
set(10, value);
}
/**
* Getter for <code>staffog.staffog_appeal.verdict_time</code>.
*/
public Long getVerdictTime() {
return (Long) get(10);
}
/**
* Setter for <code>staffog.staffog_appeal.comment</code>.
*/
public void setComment(String value) {
set(11, value);
}
/**
* Getter for <code>staffog.staffog_appeal.comment</code>.
*/
public String getComment() {
return (String) get(11);
}
// -------------------------------------------------------------------------
@@ -191,7 +239,9 @@ public class StaffogAppealRecord extends UpdatableRecordImpl<StaffogAppealRecord
@Override
public Record1<Integer> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
@@ -199,283 +249,372 @@ public class StaffogAppealRecord extends UpdatableRecordImpl<StaffogAppealRecord
// -------------------------------------------------------------------------
@Override
public Row12<Integer, String, Long, String, Integer, String, String, Boolean, String, Boolean, Long, String>
fieldsRow() {
public Row12<Integer, String, Long, String, Integer, String, String, Boolean, String, Boolean, Long, String> fieldsRow() {
return (Row12) super.fieldsRow();
}
@Override
public Row12<Integer, String, Long, String, Integer, String, String, Boolean, String, Boolean, Long, String>
valuesRow() {
public Row12<Integer, String, Long, String, Integer, String, String, Boolean, String, Boolean, Long, String> valuesRow() {
return (Row12) super.valuesRow();
}
@Override
public Field<Integer> field1() {
return StaffogAppeal.STAFFOG_APPEAL.ID;
}
@Override
public Field<String> field2() {
return StaffogAppeal.STAFFOG_APPEAL.UUID;
}
@Override
public Field<Long> field3() {
return StaffogAppeal.STAFFOG_APPEAL.TIME;
}
@Override
public Field<String> field4() {
return StaffogAppeal.STAFFOG_APPEAL.TYPE;
}
@Override
public Field<Integer> field5() {
return StaffogAppeal.STAFFOG_APPEAL.PID;
}
@Override
public Field<String> field6() {
return StaffogAppeal.STAFFOG_APPEAL.REASON;
}
@Override
public Field<String> field7() {
return StaffogAppeal.STAFFOG_APPEAL.EVIDENCE;
}
@Override
public Field<Boolean> field8() {
return StaffogAppeal.STAFFOG_APPEAL.OPEN;
}
@Override
public Field<String> field9() {
return StaffogAppeal.STAFFOG_APPEAL.ASSIGNED;
}
@Override
public Field<Boolean> field10() {
return StaffogAppeal.STAFFOG_APPEAL.VERDICT;
}
@Override
public Field<Long> field11() {
return StaffogAppeal.STAFFOG_APPEAL.VERDICT_TIME;
}
@Override
public Field<String> field12() {
return StaffogAppeal.STAFFOG_APPEAL.COMMENT;
}
@Override
public Integer component1() {
return getId();
}
@Override
public String component2() {
return getUuid();
}
@Override
public Long component3() {
return getTime();
}
@Override
public String component4() {
return getType();
}
@Override
public Integer component5() {
return getPid();
}
@Override
public String component6() {
return getReason();
}
@Override
public String component7() {
return getEvidence();
}
@Override
public Boolean component8() {
return getOpen();
}
@Override
public String component9() {
return getAssigned();
}
@Override
public Boolean component10() {
return getVerdict();
}
@Override
public Long component11() {
return getVerdictTime();
}
@Override
public String component12() {
return getComment();
}
@Override
public Integer value1() {
return getId();
}
@Override
public String value2() {
return getUuid();
}
@Override
public Long value3() {
return getTime();
}
@Override
public String value4() {
return getType();
}
@Override
public Integer value5() {
return getPid();
}
@Override
public String value6() {
return getReason();
}
@Override
public String value7() {
return getEvidence();
}
@Override
public Boolean value8() {
return getOpen();
}
@Override
public String value9() {
return getAssigned();
}
@Override
public Boolean value10() {
return getVerdict();
}
@Override
public Long value11() {
return getVerdictTime();
}
@Override
public String value12() {
return getComment();
}
@Override
public StaffogAppealRecord value1(Integer value) {
setId(value);
return this;
}
@Override
public StaffogAppealRecord value2(String value) {
setUuid(value);
return this;
}
@Override
public StaffogAppealRecord value3(Long value) {
setTime(value);
return this;
}
@Override
public StaffogAppealRecord value4(String value) {
setType(value);
return this;
}
@Override
public StaffogAppealRecord value5(Integer value) {
setPid(value);
return this;
}
@Override
public StaffogAppealRecord value6(String value) {
setReason(value);
return this;
}
@Override
public StaffogAppealRecord value7(String value) {
setEvidence(value);
return this;
}
@Override
public StaffogAppealRecord value8(Boolean value) {
setOpen(value);
return this;
}
@Override
public StaffogAppealRecord value9(String value) {
setAssigned(value);
return this;
}
@Override
public StaffogAppealRecord value10(Boolean value) {
setVerdict(value);
return this;
}
@Override
public StaffogAppealRecord value11(Long value) {
setVerdictTime(value);
return this;
}
@Override
public StaffogAppealRecord value12(String value) {
setComment(value);
return this;
}
@Override
public StaffogAppealRecord values(
Integer value1,
String value2,
Long value3,
String value4,
Integer value5,
String value6,
String value7,
Boolean value8,
String value9,
Boolean value10,
Long value11,
String value12) {
public StaffogAppealRecord values(Integer value1, String value2, Long value3, String value4, Integer value5,
String value6, String value7, Boolean value8, String value9, Boolean value10, Long value11, String value12)
{
value1(value1);
value2(value2);
value3(value3);
@@ -489,6 +628,7 @@ public class StaffogAppealRecord extends UpdatableRecordImpl<StaffogAppealRecord
value11(value11);
value12(value12);
return this;
}
// -------------------------------------------------------------------------
@@ -499,25 +639,17 @@ public class StaffogAppealRecord extends UpdatableRecordImpl<StaffogAppealRecord
* Create a detached StaffogAppealRecord
*/
public StaffogAppealRecord() {
super(StaffogAppeal.STAFFOG_APPEAL);
}
/**
* Create a detached, initialized StaffogAppealRecord
*/
public StaffogAppealRecord(
Integer id,
String uuid,
Long time,
String type,
Integer pid,
String reason,
String evidence,
Boolean open,
String assigned,
Boolean verdict,
Long verdictTime,
String comment) {
public StaffogAppealRecord(Integer id, String uuid, Long time, String type, Integer pid, String reason,
String evidence, Boolean open, String assigned, Boolean verdict, Long verdictTime, String comment)
{
super(StaffogAppeal.STAFFOG_APPEAL);
@@ -534,5 +666,7 @@ public class StaffogAppealRecord extends UpdatableRecordImpl<StaffogAppealRecord
setVerdictTime(verdictTime);
setComment(comment);
resetChangedOnNotNull();
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/records/StaffogAuditRecord.java
+64 -2
View File
@@ -10,9 +10,10 @@ import uk.hotten.staffog.data.jooq.tables.StaffogAudit;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogAuditRecord extends UpdatableRecordImpl<StaffogAuditRecord>
implements Record4<Integer, String, String, Long> {
implements Record4<Integer, String, String, Long>
{
private static final long serialVersionUID = 1L;
@@ -20,56 +21,72 @@ public class StaffogAuditRecord extends UpdatableRecordImpl<StaffogAuditRecord>
* Setter for <code>staffog.staffog_audit.id</code>.
*/
public void setId(Integer value) {
set(0, value);
}
/**
* Getter for <code>staffog.staffog_audit.id</code>.
*/
public Integer getId() {
return (Integer) get(0);
}
/**
* Setter for <code>staffog.staffog_audit.type</code>.
*/
public void setType(String value) {
set(1, value);
}
/**
* Getter for <code>staffog.staffog_audit.type</code>.
*/
public String getType() {
return (String) get(1);
}
/**
* Setter for <code>staffog.staffog_audit.data</code>.
*/
public void setData(String value) {
set(2, value);
}
/**
* Getter for <code>staffog.staffog_audit.data</code>.
*/
public String getData() {
return (String) get(2);
}
/**
* Setter for <code>staffog.staffog_audit.time</code>.
*/
public void setTime(Long value) {
set(3, value);
}
/**
* Getter for <code>staffog.staffog_audit.time</code>.
*/
public Long getTime() {
return (Long) get(3);
}
// -------------------------------------------------------------------------
@@ -78,7 +95,9 @@ public class StaffogAuditRecord extends UpdatableRecordImpl<StaffogAuditRecord>
@Override
public Record1<Integer> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
@@ -87,105 +106,143 @@ public class StaffogAuditRecord extends UpdatableRecordImpl<StaffogAuditRecord>
@Override
public Row4<Integer, String, String, Long> fieldsRow() {
return (Row4) super.fieldsRow();
}
@Override
public Row4<Integer, String, String, Long> valuesRow() {
return (Row4) super.valuesRow();
}
@Override
public Field<Integer> field1() {
return StaffogAudit.STAFFOG_AUDIT.ID;
}
@Override
public Field<String> field2() {
return StaffogAudit.STAFFOG_AUDIT.TYPE;
}
@Override
public Field<String> field3() {
return StaffogAudit.STAFFOG_AUDIT.DATA;
}
@Override
public Field<Long> field4() {
return StaffogAudit.STAFFOG_AUDIT.TIME;
}
@Override
public Integer component1() {
return getId();
}
@Override
public String component2() {
return getType();
}
@Override
public String component3() {
return getData();
}
@Override
public Long component4() {
return getTime();
}
@Override
public Integer value1() {
return getId();
}
@Override
public String value2() {
return getType();
}
@Override
public String value3() {
return getData();
}
@Override
public Long value4() {
return getTime();
}
@Override
public StaffogAuditRecord value1(Integer value) {
setId(value);
return this;
}
@Override
public StaffogAuditRecord value2(String value) {
setType(value);
return this;
}
@Override
public StaffogAuditRecord value3(String value) {
setData(value);
return this;
}
@Override
public StaffogAuditRecord value4(Long value) {
setTime(value);
return this;
}
@Override
public StaffogAuditRecord values(Integer value1, String value2, String value3, Long value4) {
value1(value1);
value2(value2);
value3(value3);
value4(value4);
return this;
}
// -------------------------------------------------------------------------
@@ -196,13 +253,16 @@ public class StaffogAuditRecord extends UpdatableRecordImpl<StaffogAuditRecord>
* Create a detached StaffogAuditRecord
*/
public StaffogAuditRecord() {
super(StaffogAudit.STAFFOG_AUDIT);
}
/**
* Create a detached, initialized StaffogAuditRecord
*/
public StaffogAuditRecord(Integer id, String type, String data, Long time) {
super(StaffogAudit.STAFFOG_AUDIT);
setId(id);
@@ -210,5 +270,7 @@ public class StaffogAuditRecord extends UpdatableRecordImpl<StaffogAuditRecord>
setData(data);
setTime(time);
resetChangedOnNotNull();
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/records/StaffogBanRecord.java
+165 -28
View File
@@ -10,9 +10,10 @@ import uk.hotten.staffog.data.jooq.tables.StaffogBan;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogBanRecord extends UpdatableRecordImpl<StaffogBanRecord>
implements Record12<Long, String, String, String, String, String, String, String, Long, Long, Long, Boolean> {
implements Record12<Long, String, String, String, String, String, String, String, Long, Long, Long, Boolean>
{
private static final long serialVersionUID = 1L;
@@ -20,168 +21,216 @@ public class StaffogBanRecord extends UpdatableRecordImpl<StaffogBanRecord>
* Setter for <code>staffog.staffog_ban.id</code>.
*/
public void setId(Long value) {
set(0, value);
}
/**
* Getter for <code>staffog.staffog_ban.id</code>.
*/
public Long getId() {
return (Long) get(0);
}
/**
* Setter for <code>staffog.staffog_ban.uuid</code>.
*/
public void setUuid(String value) {
set(1, value);
}
/**
* Getter for <code>staffog.staffog_ban.uuid</code>.
*/
public String getUuid() {
return (String) get(1);
}
/**
* Setter for <code>staffog.staffog_ban.reason</code>.
*/
public void setReason(String value) {
set(2, value);
}
/**
* Getter for <code>staffog.staffog_ban.reason</code>.
*/
public String getReason() {
return (String) get(2);
}
/**
* Setter for <code>staffog.staffog_ban.by_uuid</code>.
*/
public void setByUuid(String value) {
set(3, value);
}
/**
* Getter for <code>staffog.staffog_ban.by_uuid</code>.
*/
public String getByUuid() {
return (String) get(3);
}
/**
* Setter for <code>staffog.staffog_ban.by_name</code>.
*/
public void setByName(String value) {
set(4, value);
}
/**
* Getter for <code>staffog.staffog_ban.by_name</code>.
*/
public String getByName() {
return (String) get(4);
}
/**
* Setter for <code>staffog.staffog_ban.removed_uuid</code>.
*/
public void setRemovedUuid(String value) {
set(5, value);
}
/**
* Getter for <code>staffog.staffog_ban.removed_uuid</code>.
*/
public String getRemovedUuid() {
return (String) get(5);
}
/**
* Setter for <code>staffog.staffog_ban.removed_name</code>.
*/
public void setRemovedName(String value) {
set(6, value);
}
/**
* Getter for <code>staffog.staffog_ban.removed_name</code>.
*/
public String getRemovedName() {
return (String) get(6);
}
/**
* Setter for <code>staffog.staffog_ban.removed_reason</code>.
*/
public void setRemovedReason(String value) {
set(7, value);
}
/**
* Getter for <code>staffog.staffog_ban.removed_reason</code>.
*/
public String getRemovedReason() {
return (String) get(7);
}
/**
* Setter for <code>staffog.staffog_ban.removed_time</code>.
*/
public void setRemovedTime(Long value) {
set(8, value);
}
/**
* Getter for <code>staffog.staffog_ban.removed_time</code>.
*/
public Long getRemovedTime() {
return (Long) get(8);
}
/**
* Setter for <code>staffog.staffog_ban.time</code>.
*/
public void setTime(Long value) {
set(9, value);
}
/**
* Getter for <code>staffog.staffog_ban.time</code>.
*/
public Long getTime() {
return (Long) get(9);
}
/**
* Setter for <code>staffog.staffog_ban.until</code>.
*/
public void setUntil(Long value) {
set(10, value);
}
/**
* Getter for <code>staffog.staffog_ban.until</code>.
*/
public Long getUntil() {
return (Long) get(10);
}
/**
* Setter for <code>staffog.staffog_ban.active</code>.
*/
public void setActive(Boolean value) {
set(11, value);
}
/**
* Getter for <code>staffog.staffog_ban.active</code>.
*/
public Boolean getActive() {
return (Boolean) get(11);
}
// -------------------------------------------------------------------------
@@ -190,7 +239,9 @@ public class StaffogBanRecord extends UpdatableRecordImpl<StaffogBanRecord>
@Override
public Record1<Long> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
@@ -199,280 +250,371 @@ public class StaffogBanRecord extends UpdatableRecordImpl<StaffogBanRecord>
@Override
public Row12<Long, String, String, String, String, String, String, String, Long, Long, Long, Boolean> fieldsRow() {
return (Row12) super.fieldsRow();
}
@Override
public Row12<Long, String, String, String, String, String, String, String, Long, Long, Long, Boolean> valuesRow() {
return (Row12) super.valuesRow();
}
@Override
public Field<Long> field1() {
return StaffogBan.STAFFOG_BAN.ID;
}
@Override
public Field<String> field2() {
return StaffogBan.STAFFOG_BAN.UUID;
}
@Override
public Field<String> field3() {
return StaffogBan.STAFFOG_BAN.REASON;
}
@Override
public Field<String> field4() {
return StaffogBan.STAFFOG_BAN.BY_UUID;
}
@Override
public Field<String> field5() {
return StaffogBan.STAFFOG_BAN.BY_NAME;
}
@Override
public Field<String> field6() {
return StaffogBan.STAFFOG_BAN.REMOVED_UUID;
}
@Override
public Field<String> field7() {
return StaffogBan.STAFFOG_BAN.REMOVED_NAME;
}
@Override
public Field<String> field8() {
return StaffogBan.STAFFOG_BAN.REMOVED_REASON;
}
@Override
public Field<Long> field9() {
return StaffogBan.STAFFOG_BAN.REMOVED_TIME;
}
@Override
public Field<Long> field10() {
return StaffogBan.STAFFOG_BAN.TIME;
}
@Override
public Field<Long> field11() {
return StaffogBan.STAFFOG_BAN.UNTIL;
}
@Override
public Field<Boolean> field12() {
return StaffogBan.STAFFOG_BAN.ACTIVE;
}
@Override
public Long component1() {
return getId();
}
@Override
public String component2() {
return getUuid();
}
@Override
public String component3() {
return getReason();
}
@Override
public String component4() {
return getByUuid();
}
@Override
public String component5() {
return getByName();
}
@Override
public String component6() {
return getRemovedUuid();
}
@Override
public String component7() {
return getRemovedName();
}
@Override
public String component8() {
return getRemovedReason();
}
@Override
public Long component9() {
return getRemovedTime();
}
@Override
public Long component10() {
return getTime();
}
@Override
public Long component11() {
return getUntil();
}
@Override
public Boolean component12() {
return getActive();
}
@Override
public Long value1() {
return getId();
}
@Override
public String value2() {
return getUuid();
}
@Override
public String value3() {
return getReason();
}
@Override
public String value4() {
return getByUuid();
}
@Override
public String value5() {
return getByName();
}
@Override
public String value6() {
return getRemovedUuid();
}
@Override
public String value7() {
return getRemovedName();
}
@Override
public String value8() {
return getRemovedReason();
}
@Override
public Long value9() {
return getRemovedTime();
}
@Override
public Long value10() {
return getTime();
}
@Override
public Long value11() {
return getUntil();
}
@Override
public Boolean value12() {
return getActive();
}
@Override
public StaffogBanRecord value1(Long value) {
setId(value);
return this;
}
@Override
public StaffogBanRecord value2(String value) {
setUuid(value);
return this;
}
@Override
public StaffogBanRecord value3(String value) {
setReason(value);
return this;
}
@Override
public StaffogBanRecord value4(String value) {
setByUuid(value);
return this;
}
@Override
public StaffogBanRecord value5(String value) {
setByName(value);
return this;
}
@Override
public StaffogBanRecord value6(String value) {
setRemovedUuid(value);
return this;
}
@Override
public StaffogBanRecord value7(String value) {
setRemovedName(value);
return this;
}
@Override
public StaffogBanRecord value8(String value) {
setRemovedReason(value);
return this;
}
@Override
public StaffogBanRecord value9(Long value) {
setRemovedTime(value);
return this;
}
@Override
public StaffogBanRecord value10(Long value) {
setTime(value);
return this;
}
@Override
public StaffogBanRecord value11(Long value) {
setUntil(value);
return this;
}
@Override
public StaffogBanRecord value12(Boolean value) {
setActive(value);
return this;
}
@Override
public StaffogBanRecord values(
Long value1,
String value2,
String value3,
String value4,
String value5,
String value6,
String value7,
String value8,
Long value9,
Long value10,
Long value11,
Boolean value12) {
public StaffogBanRecord values(Long value1, String value2, String value3, String value4, String value5,
String value6, String value7, String value8, Long value9, Long value10, Long value11, Boolean value12)
{
value1(value1);
value2(value2);
value3(value3);
@@ -486,6 +628,7 @@ public class StaffogBanRecord extends UpdatableRecordImpl<StaffogBanRecord>
value11(value11);
value12(value12);
return this;
}
// -------------------------------------------------------------------------
@@ -496,25 +639,17 @@ public class StaffogBanRecord extends UpdatableRecordImpl<StaffogBanRecord>
* Create a detached StaffogBanRecord
*/
public StaffogBanRecord() {
super(StaffogBan.STAFFOG_BAN);
}
/**
* Create a detached, initialized StaffogBanRecord
*/
public StaffogBanRecord(
Long id,
String uuid,
String reason,
String byUuid,
String byName,
String removedUuid,
String removedName,
String removedReason,
Long removedTime,
Long time,
Long until,
Boolean active) {
public StaffogBanRecord(Long id, String uuid, String reason, String byUuid, String byName, String removedUuid,
String removedName, String removedReason, Long removedTime, Long time, Long until, Boolean active)
{
super(StaffogBan.STAFFOG_BAN);
@@ -531,5 +666,7 @@ public class StaffogBanRecord extends UpdatableRecordImpl<StaffogBanRecord>
setUntil(until);
setActive(active);
resetChangedOnNotNull();
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/records/StaffogChatreportRecord.java
+75 -2
View File
@@ -10,9 +10,10 @@ import uk.hotten.staffog.data.jooq.tables.StaffogChatreport;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogChatreportRecord extends UpdatableRecordImpl<StaffogChatreportRecord>
implements Record5<Integer, String, String, Long, String> {
implements Record5<Integer, String, String, Long, String>
{
private static final long serialVersionUID = 1L;
@@ -20,70 +21,90 @@ public class StaffogChatreportRecord extends UpdatableRecordImpl<StaffogChatrepo
* Setter for <code>staffog.staffog_chatreport.id</code>.
*/
public void setId(Integer value) {
set(0, value);
}
/**
* Getter for <code>staffog.staffog_chatreport.id</code>.
*/
public Integer getId() {
return (Integer) get(0);
}
/**
* Setter for <code>staffog.staffog_chatreport.uuid</code>.
*/
public void setUuid(String value) {
set(1, value);
}
/**
* Getter for <code>staffog.staffog_chatreport.uuid</code>.
*/
public String getUuid() {
return (String) get(1);
}
/**
* Setter for <code>staffog.staffog_chatreport.by_uuid</code>.
*/
public void setByUuid(String value) {
set(2, value);
}
/**
* Getter for <code>staffog.staffog_chatreport.by_uuid</code>.
*/
public String getByUuid() {
return (String) get(2);
}
/**
* Setter for <code>staffog.staffog_chatreport.time</code>.
*/
public void setTime(Long value) {
set(3, value);
}
/**
* Getter for <code>staffog.staffog_chatreport.time</code>.
*/
public Long getTime() {
return (Long) get(3);
}
/**
* Setter for <code>staffog.staffog_chatreport.messages</code>.
*/
public void setMessages(String value) {
set(4, value);
}
/**
* Getter for <code>staffog.staffog_chatreport.messages</code>.
*/
public String getMessages() {
return (String) get(4);
}
// -------------------------------------------------------------------------
@@ -92,7 +113,9 @@ public class StaffogChatreportRecord extends UpdatableRecordImpl<StaffogChatrepo
@Override
public Record1<Integer> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
@@ -101,127 +124,173 @@ public class StaffogChatreportRecord extends UpdatableRecordImpl<StaffogChatrepo
@Override
public Row5<Integer, String, String, Long, String> fieldsRow() {
return (Row5) super.fieldsRow();
}
@Override
public Row5<Integer, String, String, Long, String> valuesRow() {
return (Row5) super.valuesRow();
}
@Override
public Field<Integer> field1() {
return StaffogChatreport.STAFFOG_CHATREPORT.ID;
}
@Override
public Field<String> field2() {
return StaffogChatreport.STAFFOG_CHATREPORT.UUID;
}
@Override
public Field<String> field3() {
return StaffogChatreport.STAFFOG_CHATREPORT.BY_UUID;
}
@Override
public Field<Long> field4() {
return StaffogChatreport.STAFFOG_CHATREPORT.TIME;
}
@Override
public Field<String> field5() {
return StaffogChatreport.STAFFOG_CHATREPORT.MESSAGES;
}
@Override
public Integer component1() {
return getId();
}
@Override
public String component2() {
return getUuid();
}
@Override
public String component3() {
return getByUuid();
}
@Override
public Long component4() {
return getTime();
}
@Override
public String component5() {
return getMessages();
}
@Override
public Integer value1() {
return getId();
}
@Override
public String value2() {
return getUuid();
}
@Override
public String value3() {
return getByUuid();
}
@Override
public Long value4() {
return getTime();
}
@Override
public String value5() {
return getMessages();
}
@Override
public StaffogChatreportRecord value1(Integer value) {
setId(value);
return this;
}
@Override
public StaffogChatreportRecord value2(String value) {
setUuid(value);
return this;
}
@Override
public StaffogChatreportRecord value3(String value) {
setByUuid(value);
return this;
}
@Override
public StaffogChatreportRecord value4(Long value) {
setTime(value);
return this;
}
@Override
public StaffogChatreportRecord value5(String value) {
setMessages(value);
return this;
}
@Override
public StaffogChatreportRecord values(Integer value1, String value2, String value3, Long value4, String value5) {
value1(value1);
value2(value2);
value3(value3);
value4(value4);
value5(value5);
return this;
}
// -------------------------------------------------------------------------
@@ -232,7 +301,9 @@ public class StaffogChatreportRecord extends UpdatableRecordImpl<StaffogChatrepo
* Create a detached StaffogChatreportRecord
*/
public StaffogChatreportRecord() {
super(StaffogChatreport.STAFFOG_CHATREPORT);
}
/**
@@ -248,5 +319,7 @@ public class StaffogChatreportRecord extends UpdatableRecordImpl<StaffogChatrepo
setTime(time);
setMessages(messages);
resetChangedOnNotNull();
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/records/StaffogHistoryRecord.java
+63 -2
View File
@@ -11,9 +11,10 @@ import uk.hotten.staffog.data.jooq.tables.StaffogHistory;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogHistoryRecord extends UpdatableRecordImpl<StaffogHistoryRecord>
implements Record4<Integer, LocalDateTime, String, String> {
implements Record4<Integer, LocalDateTime, String, String>
{
private static final long serialVersionUID = 1L;
@@ -21,56 +22,72 @@ public class StaffogHistoryRecord extends UpdatableRecordImpl<StaffogHistoryReco
* Setter for <code>staffog.staffog_history.id</code>.
*/
public void setId(Integer value) {
set(0, value);
}
/**
* Getter for <code>staffog.staffog_history.id</code>.
*/
public Integer getId() {
return (Integer) get(0);
}
/**
* Setter for <code>staffog.staffog_history.date</code>.
*/
public void setDate(LocalDateTime value) {
set(1, value);
}
/**
* Getter for <code>staffog.staffog_history.date</code>.
*/
public LocalDateTime getDate() {
return (LocalDateTime) get(1);
}
/**
* Setter for <code>staffog.staffog_history.name</code>.
*/
public void setName(String value) {
set(2, value);
}
/**
* Getter for <code>staffog.staffog_history.name</code>.
*/
public String getName() {
return (String) get(2);
}
/**
* Setter for <code>staffog.staffog_history.uuid</code>.
*/
public void setUuid(String value) {
set(3, value);
}
/**
* Getter for <code>staffog.staffog_history.uuid</code>.
*/
public String getUuid() {
return (String) get(3);
}
// -------------------------------------------------------------------------
@@ -79,7 +96,9 @@ public class StaffogHistoryRecord extends UpdatableRecordImpl<StaffogHistoryReco
@Override
public Record1<Integer> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
@@ -88,105 +107,143 @@ public class StaffogHistoryRecord extends UpdatableRecordImpl<StaffogHistoryReco
@Override
public Row4<Integer, LocalDateTime, String, String> fieldsRow() {
return (Row4) super.fieldsRow();
}
@Override
public Row4<Integer, LocalDateTime, String, String> valuesRow() {
return (Row4) super.valuesRow();
}
@Override
public Field<Integer> field1() {
return StaffogHistory.STAFFOG_HISTORY.ID;
}
@Override
public Field<LocalDateTime> field2() {
return StaffogHistory.STAFFOG_HISTORY.DATE;
}
@Override
public Field<String> field3() {
return StaffogHistory.STAFFOG_HISTORY.NAME;
}
@Override
public Field<String> field4() {
return StaffogHistory.STAFFOG_HISTORY.UUID;
}
@Override
public Integer component1() {
return getId();
}
@Override
public LocalDateTime component2() {
return getDate();
}
@Override
public String component3() {
return getName();
}
@Override
public String component4() {
return getUuid();
}
@Override
public Integer value1() {
return getId();
}
@Override
public LocalDateTime value2() {
return getDate();
}
@Override
public String value3() {
return getName();
}
@Override
public String value4() {
return getUuid();
}
@Override
public StaffogHistoryRecord value1(Integer value) {
setId(value);
return this;
}
@Override
public StaffogHistoryRecord value2(LocalDateTime value) {
setDate(value);
return this;
}
@Override
public StaffogHistoryRecord value3(String value) {
setName(value);
return this;
}
@Override
public StaffogHistoryRecord value4(String value) {
setUuid(value);
return this;
}
@Override
public StaffogHistoryRecord values(Integer value1, LocalDateTime value2, String value3, String value4) {
value1(value1);
value2(value2);
value3(value3);
value4(value4);
return this;
}
// -------------------------------------------------------------------------
@@ -197,7 +254,9 @@ public class StaffogHistoryRecord extends UpdatableRecordImpl<StaffogHistoryReco
* Create a detached StaffogHistoryRecord
*/
public StaffogHistoryRecord() {
super(StaffogHistory.STAFFOG_HISTORY);
}
/**
@@ -212,5 +271,7 @@ public class StaffogHistoryRecord extends UpdatableRecordImpl<StaffogHistoryReco
setName(name);
setUuid(uuid);
resetChangedOnNotNull();
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/records/StaffogKickRecord.java
+90 -4
View File
@@ -10,9 +10,10 @@ import uk.hotten.staffog.data.jooq.tables.StaffogKick;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogKickRecord extends UpdatableRecordImpl<StaffogKickRecord>
implements Record6<Long, String, String, String, String, Long> {
implements Record6<Long, String, String, String, String, Long>
{
private static final long serialVersionUID = 1L;
@@ -20,84 +21,108 @@ public class StaffogKickRecord extends UpdatableRecordImpl<StaffogKickRecord>
* Setter for <code>staffog.staffog_kick.id</code>.
*/
public void setId(Long value) {
set(0, value);
}
/**
* Getter for <code>staffog.staffog_kick.id</code>.
*/
public Long getId() {
return (Long) get(0);
}
/**
* Setter for <code>staffog.staffog_kick.uuid</code>.
*/
public void setUuid(String value) {
set(1, value);
}
/**
* Getter for <code>staffog.staffog_kick.uuid</code>.
*/
public String getUuid() {
return (String) get(1);
}
/**
* Setter for <code>staffog.staffog_kick.reason</code>.
*/
public void setReason(String value) {
set(2, value);
}
/**
* Getter for <code>staffog.staffog_kick.reason</code>.
*/
public String getReason() {
return (String) get(2);
}
/**
* Setter for <code>staffog.staffog_kick.by_uuid</code>.
*/
public void setByUuid(String value) {
set(3, value);
}
/**
* Getter for <code>staffog.staffog_kick.by_uuid</code>.
*/
public String getByUuid() {
return (String) get(3);
}
/**
* Setter for <code>staffog.staffog_kick.by_name</code>.
*/
public void setByName(String value) {
set(4, value);
}
/**
* Getter for <code>staffog.staffog_kick.by_name</code>.
*/
public String getByName() {
return (String) get(4);
}
/**
* Setter for <code>staffog.staffog_kick.time</code>.
*/
public void setTime(Long value) {
set(5, value);
}
/**
* Getter for <code>staffog.staffog_kick.time</code>.
*/
public Long getTime() {
return (Long) get(5);
}
// -------------------------------------------------------------------------
@@ -106,7 +131,9 @@ public class StaffogKickRecord extends UpdatableRecordImpl<StaffogKickRecord>
@Override
public Record1<Long> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
@@ -115,143 +142,197 @@ public class StaffogKickRecord extends UpdatableRecordImpl<StaffogKickRecord>
@Override
public Row6<Long, String, String, String, String, Long> fieldsRow() {
return (Row6) super.fieldsRow();
}
@Override
public Row6<Long, String, String, String, String, Long> valuesRow() {
return (Row6) super.valuesRow();
}
@Override
public Field<Long> field1() {
return StaffogKick.STAFFOG_KICK.ID;
}
@Override
public Field<String> field2() {
return StaffogKick.STAFFOG_KICK.UUID;
}
@Override
public Field<String> field3() {
return StaffogKick.STAFFOG_KICK.REASON;
}
@Override
public Field<String> field4() {
return StaffogKick.STAFFOG_KICK.BY_UUID;
}
@Override
public Field<String> field5() {
return StaffogKick.STAFFOG_KICK.BY_NAME;
}
@Override
public Field<Long> field6() {
return StaffogKick.STAFFOG_KICK.TIME;
}
@Override
public Long component1() {
return getId();
}
@Override
public String component2() {
return getUuid();
}
@Override
public String component3() {
return getReason();
}
@Override
public String component4() {
return getByUuid();
}
@Override
public String component5() {
return getByName();
}
@Override
public Long component6() {
return getTime();
}
@Override
public Long value1() {
return getId();
}
@Override
public String value2() {
return getUuid();
}
@Override
public String value3() {
return getReason();
}
@Override
public String value4() {
return getByUuid();
}
@Override
public String value5() {
return getByName();
}
@Override
public Long value6() {
return getTime();
}
@Override
public StaffogKickRecord value1(Long value) {
setId(value);
return this;
}
@Override
public StaffogKickRecord value2(String value) {
setUuid(value);
return this;
}
@Override
public StaffogKickRecord value3(String value) {
setReason(value);
return this;
}
@Override
public StaffogKickRecord value4(String value) {
setByUuid(value);
return this;
}
@Override
public StaffogKickRecord value5(String value) {
setByName(value);
return this;
}
@Override
public StaffogKickRecord value6(Long value) {
setTime(value);
return this;
}
@Override
public StaffogKickRecord values(
Long value1, String value2, String value3, String value4, String value5, Long value6) {
public StaffogKickRecord values(Long value1, String value2, String value3, String value4, String value5,
Long value6)
{
value1(value1);
value2(value2);
value3(value3);
@@ -259,6 +340,7 @@ public class StaffogKickRecord extends UpdatableRecordImpl<StaffogKickRecord>
value5(value5);
value6(value6);
return this;
}
// -------------------------------------------------------------------------
@@ -269,7 +351,9 @@ public class StaffogKickRecord extends UpdatableRecordImpl<StaffogKickRecord>
* Create a detached StaffogKickRecord
*/
public StaffogKickRecord() {
super(StaffogKick.STAFFOG_KICK);
}
/**
@@ -286,5 +370,7 @@ public class StaffogKickRecord extends UpdatableRecordImpl<StaffogKickRecord>
setByName(byName);
setTime(time);
resetChangedOnNotNull();
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/records/StaffogLinkcodeRecord.java
+49 -2
View File
@@ -9,9 +9,10 @@ import uk.hotten.staffog.data.jooq.tables.StaffogLinkcode;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogLinkcodeRecord extends TableRecordImpl<StaffogLinkcodeRecord>
implements Record3<String, String, Boolean> {
implements Record3<String, String, Boolean>
{
private static final long serialVersionUID = 1L;
@@ -19,42 +20,54 @@ public class StaffogLinkcodeRecord extends TableRecordImpl<StaffogLinkcodeRecord
* Setter for <code>staffog.staffog_linkcode.uuid</code>.
*/
public void setUuid(String value) {
set(0, value);
}
/**
* Getter for <code>staffog.staffog_linkcode.uuid</code>.
*/
public String getUuid() {
return (String) get(0);
}
/**
* Setter for <code>staffog.staffog_linkcode.code</code>.
*/
public void setCode(String value) {
set(1, value);
}
/**
* Getter for <code>staffog.staffog_linkcode.code</code>.
*/
public String getCode() {
return (String) get(1);
}
/**
* Setter for <code>staffog.staffog_linkcode.admin</code>.
*/
public void setAdmin(Boolean value) {
set(2, value);
}
/**
* Getter for <code>staffog.staffog_linkcode.admin</code>.
*/
public Boolean getAdmin() {
return (Boolean) get(2);
}
// -------------------------------------------------------------------------
@@ -63,83 +76,113 @@ public class StaffogLinkcodeRecord extends TableRecordImpl<StaffogLinkcodeRecord
@Override
public Row3<String, String, Boolean> fieldsRow() {
return (Row3) super.fieldsRow();
}
@Override
public Row3<String, String, Boolean> valuesRow() {
return (Row3) super.valuesRow();
}
@Override
public Field<String> field1() {
return StaffogLinkcode.STAFFOG_LINKCODE.UUID;
}
@Override
public Field<String> field2() {
return StaffogLinkcode.STAFFOG_LINKCODE.CODE;
}
@Override
public Field<Boolean> field3() {
return StaffogLinkcode.STAFFOG_LINKCODE.ADMIN;
}
@Override
public String component1() {
return getUuid();
}
@Override
public String component2() {
return getCode();
}
@Override
public Boolean component3() {
return getAdmin();
}
@Override
public String value1() {
return getUuid();
}
@Override
public String value2() {
return getCode();
}
@Override
public Boolean value3() {
return getAdmin();
}
@Override
public StaffogLinkcodeRecord value1(String value) {
setUuid(value);
return this;
}
@Override
public StaffogLinkcodeRecord value2(String value) {
setCode(value);
return this;
}
@Override
public StaffogLinkcodeRecord value3(Boolean value) {
setAdmin(value);
return this;
}
@Override
public StaffogLinkcodeRecord values(String value1, String value2, Boolean value3) {
value1(value1);
value2(value2);
value3(value3);
return this;
}
// -------------------------------------------------------------------------
@@ -150,7 +193,9 @@ public class StaffogLinkcodeRecord extends TableRecordImpl<StaffogLinkcodeRecord
* Create a detached StaffogLinkcodeRecord
*/
public StaffogLinkcodeRecord() {
super(StaffogLinkcode.STAFFOG_LINKCODE);
}
/**
@@ -164,5 +209,7 @@ public class StaffogLinkcodeRecord extends TableRecordImpl<StaffogLinkcodeRecord
setCode(code);
setAdmin(admin);
resetChangedOnNotNull();
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/records/StaffogMuteRecord.java
+165 -28
View File
@@ -10,9 +10,10 @@ import uk.hotten.staffog.data.jooq.tables.StaffogMute;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogMuteRecord extends UpdatableRecordImpl<StaffogMuteRecord>
implements Record12<Long, String, String, String, String, String, String, String, Long, Long, Long, Boolean> {
implements Record12<Long, String, String, String, String, String, String, String, Long, Long, Long, Boolean>
{
private static final long serialVersionUID = 1L;
@@ -20,168 +21,216 @@ public class StaffogMuteRecord extends UpdatableRecordImpl<StaffogMuteRecord>
* Setter for <code>staffog.staffog_mute.id</code>.
*/
public void setId(Long value) {
set(0, value);
}
/**
* Getter for <code>staffog.staffog_mute.id</code>.
*/
public Long getId() {
return (Long) get(0);
}
/**
* Setter for <code>staffog.staffog_mute.uuid</code>.
*/
public void setUuid(String value) {
set(1, value);
}
/**
* Getter for <code>staffog.staffog_mute.uuid</code>.
*/
public String getUuid() {
return (String) get(1);
}
/**
* Setter for <code>staffog.staffog_mute.reason</code>.
*/
public void setReason(String value) {
set(2, value);
}
/**
* Getter for <code>staffog.staffog_mute.reason</code>.
*/
public String getReason() {
return (String) get(2);
}
/**
* Setter for <code>staffog.staffog_mute.by_uuid</code>.
*/
public void setByUuid(String value) {
set(3, value);
}
/**
* Getter for <code>staffog.staffog_mute.by_uuid</code>.
*/
public String getByUuid() {
return (String) get(3);
}
/**
* Setter for <code>staffog.staffog_mute.by_name</code>.
*/
public void setByName(String value) {
set(4, value);
}
/**
* Getter for <code>staffog.staffog_mute.by_name</code>.
*/
public String getByName() {
return (String) get(4);
}
/**
* Setter for <code>staffog.staffog_mute.removed_uuid</code>.
*/
public void setRemovedUuid(String value) {
set(5, value);
}
/**
* Getter for <code>staffog.staffog_mute.removed_uuid</code>.
*/
public String getRemovedUuid() {
return (String) get(5);
}
/**
* Setter for <code>staffog.staffog_mute.removed_name</code>.
*/
public void setRemovedName(String value) {
set(6, value);
}
/**
* Getter for <code>staffog.staffog_mute.removed_name</code>.
*/
public String getRemovedName() {
return (String) get(6);
}
/**
* Setter for <code>staffog.staffog_mute.removed_reason</code>.
*/
public void setRemovedReason(String value) {
set(7, value);
}
/**
* Getter for <code>staffog.staffog_mute.removed_reason</code>.
*/
public String getRemovedReason() {
return (String) get(7);
}
/**
* Setter for <code>staffog.staffog_mute.removed_time</code>.
*/
public void setRemovedTime(Long value) {
set(8, value);
}
/**
* Getter for <code>staffog.staffog_mute.removed_time</code>.
*/
public Long getRemovedTime() {
return (Long) get(8);
}
/**
* Setter for <code>staffog.staffog_mute.time</code>.
*/
public void setTime(Long value) {
set(9, value);
}
/**
* Getter for <code>staffog.staffog_mute.time</code>.
*/
public Long getTime() {
return (Long) get(9);
}
/**
* Setter for <code>staffog.staffog_mute.until</code>.
*/
public void setUntil(Long value) {
set(10, value);
}
/**
* Getter for <code>staffog.staffog_mute.until</code>.
*/
public Long getUntil() {
return (Long) get(10);
}
/**
* Setter for <code>staffog.staffog_mute.active</code>.
*/
public void setActive(Boolean value) {
set(11, value);
}
/**
* Getter for <code>staffog.staffog_mute.active</code>.
*/
public Boolean getActive() {
return (Boolean) get(11);
}
// -------------------------------------------------------------------------
@@ -190,7 +239,9 @@ public class StaffogMuteRecord extends UpdatableRecordImpl<StaffogMuteRecord>
@Override
public Record1<Long> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
@@ -199,280 +250,371 @@ public class StaffogMuteRecord extends UpdatableRecordImpl<StaffogMuteRecord>
@Override
public Row12<Long, String, String, String, String, String, String, String, Long, Long, Long, Boolean> fieldsRow() {
return (Row12) super.fieldsRow();
}
@Override
public Row12<Long, String, String, String, String, String, String, String, Long, Long, Long, Boolean> valuesRow() {
return (Row12) super.valuesRow();
}
@Override
public Field<Long> field1() {
return StaffogMute.STAFFOG_MUTE.ID;
}
@Override
public Field<String> field2() {
return StaffogMute.STAFFOG_MUTE.UUID;
}
@Override
public Field<String> field3() {
return StaffogMute.STAFFOG_MUTE.REASON;
}
@Override
public Field<String> field4() {
return StaffogMute.STAFFOG_MUTE.BY_UUID;
}
@Override
public Field<String> field5() {
return StaffogMute.STAFFOG_MUTE.BY_NAME;
}
@Override
public Field<String> field6() {
return StaffogMute.STAFFOG_MUTE.REMOVED_UUID;
}
@Override
public Field<String> field7() {
return StaffogMute.STAFFOG_MUTE.REMOVED_NAME;
}
@Override
public Field<String> field8() {
return StaffogMute.STAFFOG_MUTE.REMOVED_REASON;
}
@Override
public Field<Long> field9() {
return StaffogMute.STAFFOG_MUTE.REMOVED_TIME;
}
@Override
public Field<Long> field10() {
return StaffogMute.STAFFOG_MUTE.TIME;
}
@Override
public Field<Long> field11() {
return StaffogMute.STAFFOG_MUTE.UNTIL;
}
@Override
public Field<Boolean> field12() {
return StaffogMute.STAFFOG_MUTE.ACTIVE;
}
@Override
public Long component1() {
return getId();
}
@Override
public String component2() {
return getUuid();
}
@Override
public String component3() {
return getReason();
}
@Override
public String component4() {
return getByUuid();
}
@Override
public String component5() {
return getByName();
}
@Override
public String component6() {
return getRemovedUuid();
}
@Override
public String component7() {
return getRemovedName();
}
@Override
public String component8() {
return getRemovedReason();
}
@Override
public Long component9() {
return getRemovedTime();
}
@Override
public Long component10() {
return getTime();
}
@Override
public Long component11() {
return getUntil();
}
@Override
public Boolean component12() {
return getActive();
}
@Override
public Long value1() {
return getId();
}
@Override
public String value2() {
return getUuid();
}
@Override
public String value3() {
return getReason();
}
@Override
public String value4() {
return getByUuid();
}
@Override
public String value5() {
return getByName();
}
@Override
public String value6() {
return getRemovedUuid();
}
@Override
public String value7() {
return getRemovedName();
}
@Override
public String value8() {
return getRemovedReason();
}
@Override
public Long value9() {
return getRemovedTime();
}
@Override
public Long value10() {
return getTime();
}
@Override
public Long value11() {
return getUntil();
}
@Override
public Boolean value12() {
return getActive();
}
@Override
public StaffogMuteRecord value1(Long value) {
setId(value);
return this;
}
@Override
public StaffogMuteRecord value2(String value) {
setUuid(value);
return this;
}
@Override
public StaffogMuteRecord value3(String value) {
setReason(value);
return this;
}
@Override
public StaffogMuteRecord value4(String value) {
setByUuid(value);
return this;
}
@Override
public StaffogMuteRecord value5(String value) {
setByName(value);
return this;
}
@Override
public StaffogMuteRecord value6(String value) {
setRemovedUuid(value);
return this;
}
@Override
public StaffogMuteRecord value7(String value) {
setRemovedName(value);
return this;
}
@Override
public StaffogMuteRecord value8(String value) {
setRemovedReason(value);
return this;
}
@Override
public StaffogMuteRecord value9(Long value) {
setRemovedTime(value);
return this;
}
@Override
public StaffogMuteRecord value10(Long value) {
setTime(value);
return this;
}
@Override
public StaffogMuteRecord value11(Long value) {
setUntil(value);
return this;
}
@Override
public StaffogMuteRecord value12(Boolean value) {
setActive(value);
return this;
}
@Override
public StaffogMuteRecord values(
Long value1,
String value2,
String value3,
String value4,
String value5,
String value6,
String value7,
String value8,
Long value9,
Long value10,
Long value11,
Boolean value12) {
public StaffogMuteRecord values(Long value1, String value2, String value3, String value4, String value5,
String value6, String value7, String value8, Long value9, Long value10, Long value11, Boolean value12)
{
value1(value1);
value2(value2);
value3(value3);
@@ -486,6 +628,7 @@ public class StaffogMuteRecord extends UpdatableRecordImpl<StaffogMuteRecord>
value11(value11);
value12(value12);
return this;
}
// -------------------------------------------------------------------------
@@ -496,25 +639,17 @@ public class StaffogMuteRecord extends UpdatableRecordImpl<StaffogMuteRecord>
* Create a detached StaffogMuteRecord
*/
public StaffogMuteRecord() {
super(StaffogMute.STAFFOG_MUTE);
}
/**
* Create a detached, initialized StaffogMuteRecord
*/
public StaffogMuteRecord(
Long id,
String uuid,
String reason,
String byUuid,
String byName,
String removedUuid,
String removedName,
String removedReason,
Long removedTime,
Long time,
Long until,
Boolean active) {
public StaffogMuteRecord(Long id, String uuid, String reason, String byUuid, String byName, String removedUuid,
String removedName, String removedReason, Long removedTime, Long time, Long until, Boolean active)
{
super(StaffogMute.STAFFOG_MUTE);
@@ -531,5 +666,7 @@ public class StaffogMuteRecord extends UpdatableRecordImpl<StaffogMuteRecord>
setUntil(until);
setActive(active);
resetChangedOnNotNull();
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/records/StaffogReportRecord.java
+182 -48
View File
@@ -10,22 +10,10 @@ import uk.hotten.staffog.data.jooq.tables.StaffogReport;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
public class StaffogReportRecord extends UpdatableRecordImpl<StaffogReportRecord>
implements Record13<
Integer,
String,
String,
Long,
String,
String,
String,
Integer,
Boolean,
String,
Boolean,
Long,
String> {
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogReportRecord extends UpdatableRecordImpl<StaffogReportRecord> implements
Record13<Integer, String, String, Long, String, String, String, Integer, Boolean, String, Boolean, Long, String>
{
private static final long serialVersionUID = 1L;
@@ -33,182 +21,234 @@ public class StaffogReportRecord extends UpdatableRecordImpl<StaffogReportRecord
* Setter for <code>staffog.staffog_report.id</code>.
*/
public void setId(Integer value) {
set(0, value);
}
/**
* Getter for <code>staffog.staffog_report.id</code>.
*/
public Integer getId() {
return (Integer) get(0);
}
/**
* Setter for <code>staffog.staffog_report.uuid</code>.
*/
public void setUuid(String value) {
set(1, value);
}
/**
* Getter for <code>staffog.staffog_report.uuid</code>.
*/
public String getUuid() {
return (String) get(1);
}
/**
* Setter for <code>staffog.staffog_report.by_uuid</code>.
*/
public void setByUuid(String value) {
set(2, value);
}
/**
* Getter for <code>staffog.staffog_report.by_uuid</code>.
*/
public String getByUuid() {
return (String) get(2);
}
/**
* Setter for <code>staffog.staffog_report.time</code>.
*/
public void setTime(Long value) {
set(3, value);
}
/**
* Getter for <code>staffog.staffog_report.time</code>.
*/
public Long getTime() {
return (Long) get(3);
}
/**
* Setter for <code>staffog.staffog_report.type</code>.
*/
public void setType(String value) {
set(4, value);
}
/**
* Getter for <code>staffog.staffog_report.type</code>.
*/
public String getType() {
return (String) get(4);
}
/**
* Setter for <code>staffog.staffog_report.reason</code>.
*/
public void setReason(String value) {
set(5, value);
}
/**
* Getter for <code>staffog.staffog_report.reason</code>.
*/
public String getReason() {
return (String) get(5);
}
/**
* Setter for <code>staffog.staffog_report.evidence</code>.
*/
public void setEvidence(String value) {
set(6, value);
}
/**
* Getter for <code>staffog.staffog_report.evidence</code>.
*/
public String getEvidence() {
return (String) get(6);
}
/**
* Setter for <code>staffog.staffog_report.crid</code>.
*/
public void setCrid(Integer value) {
set(7, value);
}
/**
* Getter for <code>staffog.staffog_report.crid</code>.
*/
public Integer getCrid() {
return (Integer) get(7);
}
/**
* Setter for <code>staffog.staffog_report.open</code>.
*/
public void setOpen(Boolean value) {
set(8, value);
}
/**
* Getter for <code>staffog.staffog_report.open</code>.
*/
public Boolean getOpen() {
return (Boolean) get(8);
}
/**
* Setter for <code>staffog.staffog_report.assigned</code>.
*/
public void setAssigned(String value) {
set(9, value);
}
/**
* Getter for <code>staffog.staffog_report.assigned</code>.
*/
public String getAssigned() {
return (String) get(9);
}
/**
* Setter for <code>staffog.staffog_report.verdict</code>.
*/
public void setVerdict(Boolean value) {
set(10, value);
}
/**
* Getter for <code>staffog.staffog_report.verdict</code>.
*/
public Boolean getVerdict() {
return (Boolean) get(10);
}
/**
* Setter for <code>staffog.staffog_report.verdict_time</code>.
*/
public void setVerdictTime(Long value) {
set(11, value);
}
/**
* Getter for <code>staffog.staffog_report.verdict_time</code>.
*/
public Long getVerdictTime() {
return (Long) get(11);
}
/**
* Setter for <code>staffog.staffog_report.comment</code>.
*/
public void setComment(String value) {
set(12, value);
}
/**
* Getter for <code>staffog.staffog_report.comment</code>.
*/
public String getComment() {
return (String) get(12);
}
// -------------------------------------------------------------------------
@@ -217,7 +257,9 @@ public class StaffogReportRecord extends UpdatableRecordImpl<StaffogReportRecord
@Override
public Record1<Integer> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
@@ -225,305 +267,402 @@ public class StaffogReportRecord extends UpdatableRecordImpl<StaffogReportRecord
// -------------------------------------------------------------------------
@Override
public Row13<Integer, String, String, Long, String, String, String, Integer, Boolean, String, Boolean, Long, String>
fieldsRow() {
public Row13<Integer, String, String, Long, String, String, String, Integer, Boolean, String, Boolean, Long, String> fieldsRow() {
return (Row13) super.fieldsRow();
}
@Override
public Row13<Integer, String, String, Long, String, String, String, Integer, Boolean, String, Boolean, Long, String>
valuesRow() {
public Row13<Integer, String, String, Long, String, String, String, Integer, Boolean, String, Boolean, Long, String> valuesRow() {
return (Row13) super.valuesRow();
}
@Override
public Field<Integer> field1() {
return StaffogReport.STAFFOG_REPORT.ID;
}
@Override
public Field<String> field2() {
return StaffogReport.STAFFOG_REPORT.UUID;
}
@Override
public Field<String> field3() {
return StaffogReport.STAFFOG_REPORT.BY_UUID;
}
@Override
public Field<Long> field4() {
return StaffogReport.STAFFOG_REPORT.TIME;
}
@Override
public Field<String> field5() {
return StaffogReport.STAFFOG_REPORT.TYPE;
}
@Override
public Field<String> field6() {
return StaffogReport.STAFFOG_REPORT.REASON;
}
@Override
public Field<String> field7() {
return StaffogReport.STAFFOG_REPORT.EVIDENCE;
}
@Override
public Field<Integer> field8() {
return StaffogReport.STAFFOG_REPORT.CRID;
}
@Override
public Field<Boolean> field9() {
return StaffogReport.STAFFOG_REPORT.OPEN;
}
@Override
public Field<String> field10() {
return StaffogReport.STAFFOG_REPORT.ASSIGNED;
}
@Override
public Field<Boolean> field11() {
return StaffogReport.STAFFOG_REPORT.VERDICT;
}
@Override
public Field<Long> field12() {
return StaffogReport.STAFFOG_REPORT.VERDICT_TIME;
}
@Override
public Field<String> field13() {
return StaffogReport.STAFFOG_REPORT.COMMENT;
}
@Override
public Integer component1() {
return getId();
}
@Override
public String component2() {
return getUuid();
}
@Override
public String component3() {
return getByUuid();
}
@Override
public Long component4() {
return getTime();
}
@Override
public String component5() {
return getType();
}
@Override
public String component6() {
return getReason();
}
@Override
public String component7() {
return getEvidence();
}
@Override
public Integer component8() {
return getCrid();
}
@Override
public Boolean component9() {
return getOpen();
}
@Override
public String component10() {
return getAssigned();
}
@Override
public Boolean component11() {
return getVerdict();
}
@Override
public Long component12() {
return getVerdictTime();
}
@Override
public String component13() {
return getComment();
}
@Override
public Integer value1() {
return getId();
}
@Override
public String value2() {
return getUuid();
}
@Override
public String value3() {
return getByUuid();
}
@Override
public Long value4() {
return getTime();
}
@Override
public String value5() {
return getType();
}
@Override
public String value6() {
return getReason();
}
@Override
public String value7() {
return getEvidence();
}
@Override
public Integer value8() {
return getCrid();
}
@Override
public Boolean value9() {
return getOpen();
}
@Override
public String value10() {
return getAssigned();
}
@Override
public Boolean value11() {
return getVerdict();
}
@Override
public Long value12() {
return getVerdictTime();
}
@Override
public String value13() {
return getComment();
}
@Override
public StaffogReportRecord value1(Integer value) {
setId(value);
return this;
}
@Override
public StaffogReportRecord value2(String value) {
setUuid(value);
return this;
}
@Override
public StaffogReportRecord value3(String value) {
setByUuid(value);
return this;
}
@Override
public StaffogReportRecord value4(Long value) {
setTime(value);
return this;
}
@Override
public StaffogReportRecord value5(String value) {
setType(value);
return this;
}
@Override
public StaffogReportRecord value6(String value) {
setReason(value);
return this;
}
@Override
public StaffogReportRecord value7(String value) {
setEvidence(value);
return this;
}
@Override
public StaffogReportRecord value8(Integer value) {
setCrid(value);
return this;
}
@Override
public StaffogReportRecord value9(Boolean value) {
setOpen(value);
return this;
}
@Override
public StaffogReportRecord value10(String value) {
setAssigned(value);
return this;
}
@Override
public StaffogReportRecord value11(Boolean value) {
setVerdict(value);
return this;
}
@Override
public StaffogReportRecord value12(Long value) {
setVerdictTime(value);
return this;
}
@Override
public StaffogReportRecord value13(String value) {
setComment(value);
return this;
}
@Override
public StaffogReportRecord values(
Integer value1,
String value2,
String value3,
Long value4,
String value5,
String value6,
String value7,
Integer value8,
Boolean value9,
String value10,
Boolean value11,
Long value12,
String value13) {
public StaffogReportRecord values(Integer value1, String value2, String value3, Long value4, String value5,
String value6, String value7, Integer value8, Boolean value9, String value10, Boolean value11, Long value12,
String value13)
{
value1(value1);
value2(value2);
value3(value3);
@@ -538,6 +677,7 @@ public class StaffogReportRecord extends UpdatableRecordImpl<StaffogReportRecord
value12(value12);
value13(value13);
return this;
}
// -------------------------------------------------------------------------
@@ -548,26 +688,18 @@ public class StaffogReportRecord extends UpdatableRecordImpl<StaffogReportRecord
* Create a detached StaffogReportRecord
*/
public StaffogReportRecord() {
super(StaffogReport.STAFFOG_REPORT);
}
/**
* Create a detached, initialized StaffogReportRecord
*/
public StaffogReportRecord(
Integer id,
String uuid,
String byUuid,
Long time,
String type,
String reason,
String evidence,
Integer crid,
Boolean open,
String assigned,
Boolean verdict,
Long verdictTime,
String comment) {
public StaffogReportRecord(Integer id, String uuid, String byUuid, Long time, String type, String reason,
String evidence, Integer crid, Boolean open, String assigned, Boolean verdict, Long verdictTime,
String comment)
{
super(StaffogReport.STAFFOG_REPORT);
@@ -585,5 +717,7 @@ public class StaffogReportRecord extends UpdatableRecordImpl<StaffogReportRecord
setVerdictTime(verdictTime);
setComment(comment);
resetChangedOnNotNull();
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/records/StaffogStaffipRecord.java
+105 -18
View File
@@ -10,9 +10,10 @@ import uk.hotten.staffog.data.jooq.tables.StaffogStaffip;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogStaffipRecord extends UpdatableRecordImpl<StaffogStaffipRecord>
implements Record7<Integer, String, String, Boolean, Boolean, Boolean, Boolean> {
implements Record7<Integer, String, String, Boolean, Boolean, Boolean, Boolean>
{
private static final long serialVersionUID = 1L;
@@ -20,98 +21,126 @@ public class StaffogStaffipRecord extends UpdatableRecordImpl<StaffogStaffipReco
* Setter for <code>staffog.staffog_staffip.id</code>.
*/
public void setId(Integer value) {
set(0, value);
}
/**
* Getter for <code>staffog.staffog_staffip.id</code>.
*/
public Integer getId() {
return (Integer) get(0);
}
/**
* Setter for <code>staffog.staffog_staffip.ip</code>.
*/
public void setIp(String value) {
set(1, value);
}
/**
* Getter for <code>staffog.staffog_staffip.ip</code>.
*/
public String getIp() {
return (String) get(1);
}
/**
* Setter for <code>staffog.staffog_staffip.uuid</code>.
*/
public void setUuid(String value) {
set(2, value);
}
/**
* Getter for <code>staffog.staffog_staffip.uuid</code>.
*/
public String getUuid() {
return (String) get(2);
}
/**
* Setter for <code>staffog.staffog_staffip.initial</code>.
*/
public void setInitial(Boolean value) {
set(3, value);
}
/**
* Getter for <code>staffog.staffog_staffip.initial</code>.
*/
public Boolean getInitial() {
return (Boolean) get(3);
}
/**
* Setter for <code>staffog.staffog_staffip.panel_acknowledged</code>.
*/
public void setPanelAcknowledged(Boolean value) {
set(4, value);
}
/**
* Getter for <code>staffog.staffog_staffip.panel_acknowledged</code>.
*/
public Boolean getPanelAcknowledged() {
return (Boolean) get(4);
}
/**
* Setter for <code>staffog.staffog_staffip.panel_verified</code>.
*/
public void setPanelVerified(Boolean value) {
set(5, value);
}
/**
* Getter for <code>staffog.staffog_staffip.panel_verified</code>.
*/
public Boolean getPanelVerified() {
return (Boolean) get(5);
}
/**
* Setter for <code>staffog.staffog_staffip.game_verified</code>.
*/
public void setGameVerified(Boolean value) {
set(6, value);
}
/**
* Getter for <code>staffog.staffog_staffip.game_verified</code>.
*/
public Boolean getGameVerified() {
return (Boolean) get(6);
}
// -------------------------------------------------------------------------
@@ -120,7 +149,9 @@ public class StaffogStaffipRecord extends UpdatableRecordImpl<StaffogStaffipReco
@Override
public Record1<Integer> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
@@ -129,170 +160,226 @@ public class StaffogStaffipRecord extends UpdatableRecordImpl<StaffogStaffipReco
@Override
public Row7<Integer, String, String, Boolean, Boolean, Boolean, Boolean> fieldsRow() {
return (Row7) super.fieldsRow();
}
@Override
public Row7<Integer, String, String, Boolean, Boolean, Boolean, Boolean> valuesRow() {
return (Row7) super.valuesRow();
}
@Override
public Field<Integer> field1() {
return StaffogStaffip.STAFFOG_STAFFIP.ID;
}
@Override
public Field<String> field2() {
return StaffogStaffip.STAFFOG_STAFFIP.IP;
}
@Override
public Field<String> field3() {
return StaffogStaffip.STAFFOG_STAFFIP.UUID;
}
@Override
public Field<Boolean> field4() {
return StaffogStaffip.STAFFOG_STAFFIP.INITIAL;
}
@Override
public Field<Boolean> field5() {
return StaffogStaffip.STAFFOG_STAFFIP.PANEL_ACKNOWLEDGED;
}
@Override
public Field<Boolean> field6() {
return StaffogStaffip.STAFFOG_STAFFIP.PANEL_VERIFIED;
}
@Override
public Field<Boolean> field7() {
return StaffogStaffip.STAFFOG_STAFFIP.GAME_VERIFIED;
}
@Override
public Integer component1() {
return getId();
}
@Override
public String component2() {
return getIp();
}
@Override
public String component3() {
return getUuid();
}
@Override
public Boolean component4() {
return getInitial();
}
@Override
public Boolean component5() {
return getPanelAcknowledged();
}
@Override
public Boolean component6() {
return getPanelVerified();
}
@Override
public Boolean component7() {
return getGameVerified();
}
@Override
public Integer value1() {
return getId();
}
@Override
public String value2() {
return getIp();
}
@Override
public String value3() {
return getUuid();
}
@Override
public Boolean value4() {
return getInitial();
}
@Override
public Boolean value5() {
return getPanelAcknowledged();
}
@Override
public Boolean value6() {
return getPanelVerified();
}
@Override
public Boolean value7() {
return getGameVerified();
}
@Override
public StaffogStaffipRecord value1(Integer value) {
setId(value);
return this;
}
@Override
public StaffogStaffipRecord value2(String value) {
setIp(value);
return this;
}
@Override
public StaffogStaffipRecord value3(String value) {
setUuid(value);
return this;
}
@Override
public StaffogStaffipRecord value4(Boolean value) {
setInitial(value);
return this;
}
@Override
public StaffogStaffipRecord value5(Boolean value) {
setPanelAcknowledged(value);
return this;
}
@Override
public StaffogStaffipRecord value6(Boolean value) {
setPanelVerified(value);
return this;
}
@Override
public StaffogStaffipRecord value7(Boolean value) {
setGameVerified(value);
return this;
}
@Override
public StaffogStaffipRecord values(
Integer value1,
String value2,
String value3,
Boolean value4,
Boolean value5,
Boolean value6,
Boolean value7) {
public StaffogStaffipRecord values(Integer value1, String value2, String value3, Boolean value4, Boolean value5,
Boolean value6, Boolean value7)
{
value1(value1);
value2(value2);
value3(value3);
@@ -301,6 +388,7 @@ public class StaffogStaffipRecord extends UpdatableRecordImpl<StaffogStaffipReco
value6(value6);
value7(value7);
return this;
}
// -------------------------------------------------------------------------
@@ -311,20 +399,17 @@ public class StaffogStaffipRecord extends UpdatableRecordImpl<StaffogStaffipReco
* Create a detached StaffogStaffipRecord
*/
public StaffogStaffipRecord() {
super(StaffogStaffip.STAFFOG_STAFFIP);
}
/**
* Create a detached, initialized StaffogStaffipRecord
*/
public StaffogStaffipRecord(
Integer id,
String ip,
String uuid,
Boolean initial,
Boolean panelAcknowledged,
Boolean panelVerified,
Boolean gameVerified) {
public StaffogStaffipRecord(Integer id, String ip, String uuid, Boolean initial, Boolean panelAcknowledged,
Boolean panelVerified, Boolean gameVerified)
{
super(StaffogStaffip.STAFFOG_STAFFIP);
@@ -336,5 +421,7 @@ public class StaffogStaffipRecord extends UpdatableRecordImpl<StaffogStaffipReco
setPanelVerified(panelVerified);
setGameVerified(gameVerified);
resetChangedOnNotNull();
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/records/StaffogStatRecord.java
+35 -1
View File
@@ -9,7 +9,7 @@ import uk.hotten.staffog.data.jooq.tables.StaffogStat;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogStatRecord extends TableRecordImpl<StaffogStatRecord> implements Record2<String, String> {
private static final long serialVersionUID = 1L;
@@ -18,28 +18,36 @@ public class StaffogStatRecord extends TableRecordImpl<StaffogStatRecord> implem
* Setter for <code>staffog.staffog_stat.name</code>.
*/
public void setName(String value) {
set(0, value);
}
/**
* Getter for <code>staffog.staffog_stat.name</code>.
*/
public String getName() {
return (String) get(0);
}
/**
* Setter for <code>staffog.staffog_stat.stat</code>.
*/
public void setStat(String value) {
set(1, value);
}
/**
* Getter for <code>staffog.staffog_stat.stat</code>.
*/
public String getStat() {
return (String) get(1);
}
// -------------------------------------------------------------------------
@@ -48,61 +56,83 @@ public class StaffogStatRecord extends TableRecordImpl<StaffogStatRecord> implem
@Override
public Row2<String, String> fieldsRow() {
return (Row2) super.fieldsRow();
}
@Override
public Row2<String, String> valuesRow() {
return (Row2) super.valuesRow();
}
@Override
public Field<String> field1() {
return StaffogStat.STAFFOG_STAT.NAME;
}
@Override
public Field<String> field2() {
return StaffogStat.STAFFOG_STAT.STAT;
}
@Override
public String component1() {
return getName();
}
@Override
public String component2() {
return getStat();
}
@Override
public String value1() {
return getName();
}
@Override
public String value2() {
return getStat();
}
@Override
public StaffogStatRecord value1(String value) {
setName(value);
return this;
}
@Override
public StaffogStatRecord value2(String value) {
setStat(value);
return this;
}
@Override
public StaffogStatRecord values(String value1, String value2) {
value1(value1);
value2(value2);
return this;
}
// -------------------------------------------------------------------------
@@ -113,7 +143,9 @@ public class StaffogStatRecord extends TableRecordImpl<StaffogStatRecord> implem
* Create a detached StaffogStatRecord
*/
public StaffogStatRecord() {
super(StaffogStat.STAFFOG_STAT);
}
/**
@@ -126,5 +158,7 @@ public class StaffogStatRecord extends TableRecordImpl<StaffogStatRecord> implem
setName(name);
setStat(stat);
resetChangedOnNotNull();
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/records/StaffogTaskRecord.java
+51 -2
View File
@@ -10,9 +10,10 @@ import uk.hotten.staffog.data.jooq.tables.StaffogTask;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogTaskRecord extends UpdatableRecordImpl<StaffogTaskRecord>
implements Record3<Integer, String, String> {
implements Record3<Integer, String, String>
{
private static final long serialVersionUID = 1L;
@@ -20,42 +21,54 @@ public class StaffogTaskRecord extends UpdatableRecordImpl<StaffogTaskRecord>
* Setter for <code>staffog.staffog_task.id</code>.
*/
public void setId(Integer value) {
set(0, value);
}
/**
* Getter for <code>staffog.staffog_task.id</code>.
*/
public Integer getId() {
return (Integer) get(0);
}
/**
* Setter for <code>staffog.staffog_task.task</code>.
*/
public void setTask(String value) {
set(1, value);
}
/**
* Getter for <code>staffog.staffog_task.task</code>.
*/
public String getTask() {
return (String) get(1);
}
/**
* Setter for <code>staffog.staffog_task.data</code>.
*/
public void setData(String value) {
set(2, value);
}
/**
* Getter for <code>staffog.staffog_task.data</code>.
*/
public String getData() {
return (String) get(2);
}
// -------------------------------------------------------------------------
@@ -64,7 +77,9 @@ public class StaffogTaskRecord extends UpdatableRecordImpl<StaffogTaskRecord>
@Override
public Record1<Integer> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
@@ -73,83 +88,113 @@ public class StaffogTaskRecord extends UpdatableRecordImpl<StaffogTaskRecord>
@Override
public Row3<Integer, String, String> fieldsRow() {
return (Row3) super.fieldsRow();
}
@Override
public Row3<Integer, String, String> valuesRow() {
return (Row3) super.valuesRow();
}
@Override
public Field<Integer> field1() {
return StaffogTask.STAFFOG_TASK.ID;
}
@Override
public Field<String> field2() {
return StaffogTask.STAFFOG_TASK.TASK;
}
@Override
public Field<String> field3() {
return StaffogTask.STAFFOG_TASK.DATA;
}
@Override
public Integer component1() {
return getId();
}
@Override
public String component2() {
return getTask();
}
@Override
public String component3() {
return getData();
}
@Override
public Integer value1() {
return getId();
}
@Override
public String value2() {
return getTask();
}
@Override
public String value3() {
return getData();
}
@Override
public StaffogTaskRecord value1(Integer value) {
setId(value);
return this;
}
@Override
public StaffogTaskRecord value2(String value) {
setTask(value);
return this;
}
@Override
public StaffogTaskRecord value3(String value) {
setData(value);
return this;
}
@Override
public StaffogTaskRecord values(Integer value1, String value2, String value3) {
value1(value1);
value2(value2);
value3(value3);
return this;
}
// -------------------------------------------------------------------------
@@ -160,7 +205,9 @@ public class StaffogTaskRecord extends UpdatableRecordImpl<StaffogTaskRecord>
* Create a detached StaffogTaskRecord
*/
public StaffogTaskRecord() {
super(StaffogTask.STAFFOG_TASK);
}
/**
@@ -174,5 +221,7 @@ public class StaffogTaskRecord extends UpdatableRecordImpl<StaffogTaskRecord>
setTask(task);
setData(data);
resetChangedOnNotNull();
}
}
src/main/java/uk/hotten/staffog/data/jooq/tables/records/StaffogWebRecord.java
+90 -4
View File
@@ -10,9 +10,10 @@ import uk.hotten.staffog.data.jooq.tables.StaffogWeb;
/**
* This class was generated by jOOQ.
*/
@SuppressWarnings({"all", "unchecked", "rawtypes"})
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class StaffogWebRecord extends UpdatableRecordImpl<StaffogWebRecord>
implements Record6<Integer, String, String, String, Boolean, Boolean> {
implements Record6<Integer, String, String, String, Boolean, Boolean>
{
private static final long serialVersionUID = 1L;
@@ -20,84 +21,108 @@ public class StaffogWebRecord extends UpdatableRecordImpl<StaffogWebRecord>
* Setter for <code>staffog.staffog_web.id</code>.
*/
public void setId(Integer value) {
set(0, value);
}
/**
* Getter for <code>staffog.staffog_web.id</code>.
*/
public Integer getId() {
return (Integer) get(0);
}
/**
* Setter for <code>staffog.staffog_web.username</code>.
*/
public void setUsername(String value) {
set(1, value);
}
/**
* Getter for <code>staffog.staffog_web.username</code>.
*/
public String getUsername() {
return (String) get(1);
}
/**
* Setter for <code>staffog.staffog_web.uuid</code>.
*/
public void setUuid(String value) {
set(2, value);
}
/**
* Getter for <code>staffog.staffog_web.uuid</code>.
*/
public String getUuid() {
return (String) get(2);
}
/**
* Setter for <code>staffog.staffog_web.password</code>.
*/
public void setPassword(String value) {
set(3, value);
}
/**
* Getter for <code>staffog.staffog_web.password</code>.
*/
public String getPassword() {
return (String) get(3);
}
/**
* Setter for <code>staffog.staffog_web.active</code>.
*/
public void setActive(Boolean value) {
set(4, value);
}
/**
* Getter for <code>staffog.staffog_web.active</code>.
*/
public Boolean getActive() {
return (Boolean) get(4);
}
/**
* Setter for <code>staffog.staffog_web.admin</code>.
*/
public void setAdmin(Boolean value) {
set(5, value);
}
/**
* Getter for <code>staffog.staffog_web.admin</code>.
*/
public Boolean getAdmin() {
return (Boolean) get(5);
}
// -------------------------------------------------------------------------
@@ -106,7 +131,9 @@ public class StaffogWebRecord extends UpdatableRecordImpl<StaffogWebRecord>
@Override
public Record1<Integer> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
@@ -115,143 +142,197 @@ public class StaffogWebRecord extends UpdatableRecordImpl<StaffogWebRecord>
@Override
public Row6<Integer, String, String, String, Boolean, Boolean> fieldsRow() {
return (Row6) super.fieldsRow();
}
@Override
public Row6<Integer, String, String, String, Boolean, Boolean> valuesRow() {
return (Row6) super.valuesRow();
}
@Override
public Field<Integer> field1() {
return StaffogWeb.STAFFOG_WEB.ID;
}
@Override
public Field<String> field2() {
return StaffogWeb.STAFFOG_WEB.USERNAME;
}
@Override
public Field<String> field3() {
return StaffogWeb.STAFFOG_WEB.UUID;
}
@Override
public Field<String> field4() {
return StaffogWeb.STAFFOG_WEB.PASSWORD;
}
@Override
public Field<Boolean> field5() {
return StaffogWeb.STAFFOG_WEB.ACTIVE;
}
@Override
public Field<Boolean> field6() {
return StaffogWeb.STAFFOG_WEB.ADMIN;
}
@Override
public Integer component1() {
return getId();
}
@Override
public String component2() {
return getUsername();
}
@Override
public String component3() {
return getUuid();
}
@Override
public String component4() {
return getPassword();
}
@Override
public Boolean component5() {
return getActive();
}
@Override
public Boolean component6() {
return getAdmin();
}
@Override
public Integer value1() {
return getId();
}
@Override
public String value2() {
return getUsername();
}
@Override
public String value3() {
return getUuid();
}
@Override
public String value4() {
return getPassword();
}
@Override
public Boolean value5() {
return getActive();
}
@Override
public Boolean value6() {
return getAdmin();
}
@Override
public StaffogWebRecord value1(Integer value) {
setId(value);
return this;
}
@Override
public StaffogWebRecord value2(String value) {
setUsername(value);
return this;
}
@Override
public StaffogWebRecord value3(String value) {
setUuid(value);
return this;
}
@Override
public StaffogWebRecord value4(String value) {
setPassword(value);
return this;
}
@Override
public StaffogWebRecord value5(Boolean value) {
setActive(value);
return this;
}
@Override
public StaffogWebRecord value6(Boolean value) {
setAdmin(value);
return this;
}
@Override
public StaffogWebRecord values(
Integer value1, String value2, String value3, String value4, Boolean value5, Boolean value6) {
public StaffogWebRecord values(Integer value1, String value2, String value3, String value4, Boolean value5,
Boolean value6)
{
value1(value1);
value2(value2);
value3(value3);
@@ -259,6 +340,7 @@ public class StaffogWebRecord extends UpdatableRecordImpl<StaffogWebRecord>
value5(value5);
value6(value6);
return this;
}
// -------------------------------------------------------------------------
@@ -269,7 +351,9 @@ public class StaffogWebRecord extends UpdatableRecordImpl<StaffogWebRecord>
* Create a detached StaffogWebRecord
*/
public StaffogWebRecord() {
super(StaffogWeb.STAFFOG_WEB);
}
/**
@@ -286,5 +370,7 @@ public class StaffogWebRecord extends UpdatableRecordImpl<StaffogWebRecord>
setActive(active);
setAdmin(admin);
resetChangedOnNotNull();
}
}
src/main/java/uk/hotten/staffog/punish/PunishEventListener.java
+20 -20
View File
@@ -20,8 +20,8 @@ public class PunishEventListener implements Listener {
@EventHandler
public void onJoin(PlayerJoinEvent event) {
PunishManager.getInstance()
.checkNameToUuid(event.getPlayer().getName(), event.getPlayer().getUniqueId());
PunishManager.getInstance().checkNameToUuid(event.getPlayer().getName(), event.getPlayer().getUniqueId());
}
@EventHandler
@@ -29,15 +29,13 @@ public class PunishEventListener implements Listener {
PunishEntry entry = PunishManager.getInstance().checkActivePunishment(PunishType.BAN, event.getUniqueId());
if (entry == null) return;
if (entry == null)
return;
event.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_BANNED);
String messageString = "&cYou have been banned for: \n" + "&f"
+ entry.getReason() + "\n\n" + "&c"
+ "Your ban "
+ (entry.getUntil() == -1
? "does not expire."
String messageString = "&cYou have been banned for: \n" + "&f" + entry.getReason() + "\n\n" + "&c" + "Your ban "
+ (entry.getUntil() == -1 ? "does not expire."
: "will expire in:\n" + "&f" + TimeUtils.formatMillisecondTime(entry.calculateRemaining()));
// Create a MiniMessage instance.
@@ -46,29 +44,29 @@ public class PunishEventListener implements Listener {
Component kickMessage = miniMessage.deserialize(messageString);
event.kickMessage(kickMessage);
}
@EventHandler
public void onAsyncChat(AsyncChatEvent event) {
PunishEntry entry = PunishManager.getInstance()
.checkActivePunishment(PunishType.MUTE, event.getPlayer().getUniqueId());
PunishEntry entry = PunishManager.getInstance().checkActivePunishment(PunishType.MUTE,
event.getPlayer().getUniqueId());
if (entry != null) {
event.setCancelled(true);
event.getPlayer().sendMessage(Message.format("&c" + "You have been muted for " + "&6" + entry.getReason()));
event.getPlayer()
.sendMessage(Message.format("&c" + "Your mute "
+ (entry.getUntil() == -1
event.getPlayer().sendMessage(Message.format("&c" + "Your mute " + (entry.getUntil() == -1
? "does not expire."
: "will expire in: " + "&f"
+ TimeUtils.formatMillisecondTime(entry.calculateRemaining()))));
: "will expire in: " + "&f" + TimeUtils.formatMillisecondTime(entry.calculateRemaining()))));
} else {
return;
}
}
@EventHandler(priority = EventPriority.HIGHEST)
@@ -77,17 +75,19 @@ public class PunishEventListener implements Listener {
if (event.isCancelled()) {
return;
}
String eventMessage = MiniMessage.miniMessage().serialize(event.message());
PunishManager pm = PunishManager.getInstance();
ChatReportEntry entry = new ChatReportEntry(
event.getPlayer().getUniqueId(), event.getPlayer().getName(), eventMessage, System.currentTimeMillis());
ChatReportEntry entry = new ChatReportEntry(event.getPlayer().getUniqueId(), event.getPlayer().getName(),
eventMessage, System.currentTimeMillis());
pm.getChatReportEntries().add(entry);
Bukkit.getServer()
.getScheduler()
.runTaskLater(pm.getPlugin(), () -> pm.getChatReportEntries().remove(entry), 2400); // remove 2m later
Bukkit.getServer().getScheduler().runTaskLater(pm.getPlugin(), () -> pm.getChatReportEntries().remove(entry),
2400); // remove 2m later
}
}
src/main/java/uk/hotten/staffog/punish/PunishManager.java
+157 -116
View File
@@ -44,115 +44,116 @@ public class PunishManager {
private ArrayList<ChatReportEntry> chatReportEntries;
public PunishManager(JavaPlugin plugin) {
this.plugin = plugin;
instance = this;
chatReportEntries = new ArrayList<>();
plugin.getServer().getPluginManager().registerEvents(new PunishEventListener(), plugin);
}
public void checkNameToUuid(String name, UUID uuid) {
try (Connection connection = DatabaseManager.getInstance().createConnection()) {
DSLContext dsl = DSL.using(connection);
boolean exists = dsl.fetchExists(dsl.select(STAFFOG_HISTORY.ID)
.from(STAFFOG_HISTORY)
.where(STAFFOG_HISTORY.UUID.eq(uuid.toString()))
.and(STAFFOG_HISTORY.NAME.eq(name)));
boolean exists = dsl.fetchExists(dsl.select(STAFFOG_HISTORY.ID).from(STAFFOG_HISTORY)
.where(STAFFOG_HISTORY.UUID.eq(uuid.toString())).and(STAFFOG_HISTORY.NAME.eq(name)));
if (exists) {
return;
}
dsl.insertInto(STAFFOG_HISTORY)
.set(STAFFOG_HISTORY.UUID, uuid.toString())
.set(STAFFOG_HISTORY.NAME, name)
dsl.insertInto(STAFFOG_HISTORY).set(STAFFOG_HISTORY.UUID, uuid.toString()).set(STAFFOG_HISTORY.NAME, name)
.execute();
} catch (Exception error) {
Console.error("Failed to check username to uuid.");
error.printStackTrace();
}
}
public String getNameFromUUID(UUID uuid) {
try (Connection connection = DatabaseManager.getInstance().createConnection()) {
DSLContext dsl = DSL.using(connection);
return dsl.select(STAFFOG_HISTORY.NAME)
.from(STAFFOG_HISTORY)
.where(STAFFOG_HISTORY.UUID.eq(uuid.toString()))
.orderBy(STAFFOG_HISTORY.ID.desc())
.limit(1)
return dsl.select(STAFFOG_HISTORY.NAME).from(STAFFOG_HISTORY)
.where(STAFFOG_HISTORY.UUID.eq(uuid.toString())).orderBy(STAFFOG_HISTORY.ID.desc()).limit(1)
.fetchOne(STAFFOG_HISTORY.NAME);
} catch (Exception error) {
Console.error("Failed to get name from uuid. " + uuid.toString());
error.printStackTrace();
return null;
}
}
public UUID getUUIDFromName(String name) {
try (Connection connection = DatabaseManager.getInstance().createConnection()) {
DSLContext dsl = DSL.using(connection);
String uuidString = dsl.select(STAFFOG_HISTORY.UUID)
.from(STAFFOG_HISTORY)
.where(STAFFOG_HISTORY.NAME.eq(name))
.orderBy(STAFFOG_HISTORY.ID.desc())
.limit(1)
String uuidString = dsl.select(STAFFOG_HISTORY.UUID).from(STAFFOG_HISTORY)
.where(STAFFOG_HISTORY.NAME.eq(name)).orderBy(STAFFOG_HISTORY.ID.desc()).limit(1)
.fetchOne(STAFFOG_HISTORY.UUID);
if (uuidString == null) return null;
if (uuidString == null)
return null;
return UUID.fromString(uuidString);
} catch (Exception error) {
Console.error("Failed to get name from name. " + name);
error.printStackTrace();
return null;
}
}
public void newPunishment(PunishEntry entry) {
try (Connection connection = DatabaseManager.getInstance().createConnection()) {
DSLContext dsl = DSL.using(connection);
if (entry.getType() == PunishType.BAN) {
dsl.insertInto(STAFFOG_BAN)
.set(STAFFOG_BAN.UUID, entry.getUuid().toString())
.set(STAFFOG_BAN.REASON, entry.getReason())
.set(STAFFOG_BAN.BY_UUID, entry.getByUuid())
.set(STAFFOG_BAN.BY_NAME, entry.getByName())
.set(STAFFOG_BAN.TIME, entry.getTime())
.set(STAFFOG_BAN.UNTIL, entry.getUntil())
.set(STAFFOG_BAN.ACTIVE, entry.isActive())
.execute();
dsl.insertInto(STAFFOG_BAN).set(STAFFOG_BAN.UUID, entry.getUuid().toString())
.set(STAFFOG_BAN.REASON, entry.getReason()).set(STAFFOG_BAN.BY_UUID, entry.getByUuid())
.set(STAFFOG_BAN.BY_NAME, entry.getByName()).set(STAFFOG_BAN.TIME, entry.getTime())
.set(STAFFOG_BAN.UNTIL, entry.getUntil()).set(STAFFOG_BAN.ACTIVE, entry.isActive()).execute();
} else {
dsl.insertInto(STAFFOG_MUTE)
.set(STAFFOG_MUTE.UUID, entry.getUuid().toString())
.set(STAFFOG_MUTE.REASON, entry.getReason())
.set(STAFFOG_MUTE.BY_UUID, entry.getByUuid())
.set(STAFFOG_MUTE.BY_NAME, entry.getByName())
.set(STAFFOG_MUTE.TIME, entry.getTime())
.set(STAFFOG_MUTE.UNTIL, entry.getUntil())
.set(STAFFOG_MUTE.ACTIVE, entry.isActive())
.execute();
dsl.insertInto(STAFFOG_MUTE).set(STAFFOG_MUTE.UUID, entry.getUuid().toString())
.set(STAFFOG_MUTE.REASON, entry.getReason()).set(STAFFOG_MUTE.BY_UUID, entry.getByUuid())
.set(STAFFOG_MUTE.BY_NAME, entry.getByName()).set(STAFFOG_MUTE.TIME, entry.getTime())
.set(STAFFOG_MUTE.UNTIL, entry.getUntil()).set(STAFFOG_MUTE.ACTIVE, entry.isActive()).execute();
}
String duration = TimeUtils.formatMillisecondTime(entry.calculateDuration());
if (entry.getPlayer() != null && entry.getPlayer().isOnline()) {
switch (entry.getType()) {
case BAN -> {
String messageString = ("&c" + "You have been banned for:\n" + "&f"
+ entry.getReason() + "\n\n" + "&c"
+ "Your ban "
+ (entry.getUntil() == -1
? "does not expire."
String messageString = ("&c" + "You have been banned for:\n" + "&f" + entry.getReason() + "\n\n"
+ "&c" + "Your ban " + (entry.getUntil() == -1 ? "does not expire."
: "will expire in: \n" + "&f" + duration));
// Create a MiniMessage instance.
@@ -161,47 +162,52 @@ public class PunishManager {
Component kickMessage = miniMessage.deserialize(messageString);
entry.getPlayer().kick(kickMessage);
}
case MUTE -> {
entry.getPlayer()
.sendMessage(Message.format("&cYou have been muted for &f" + entry.getReason()));
entry.getPlayer()
.sendMessage(Message.format("&cYour mute "
+ (entry.getUntil() == -1
? "does not expire."
entry.getPlayer().sendMessage(
Message.format("&cYour mute " + (entry.getUntil() == -1 ? "does not expire."
: "will expire in: \n" + "&f" + duration)));
}
}
}
Message.staffBroadcast(Message.formatNotification(
entry.getType().toString(),
"New " + entry.getType().toString().toLowerCase()
+ " on " + entry.getName() + " for "
+ duration + " by " + entry.getByName()));
}
}
Message.staffBroadcast(Message.formatNotification(entry.getType().toString(),
"New " + entry.getType().toString().toLowerCase() + " on " + entry.getName() + " for " + duration
+ " by " + entry.getByName()));
SecurityManager.getInstance().checkAndDeactivateStaffAccount(entry.getUuid());
} catch (Exception error) {
Console.error("Failed to create punishment.");
error.printStackTrace();
}
}
public PunishEntry getPunishment(PunishType type, int id) {
try (Connection connection = DatabaseManager.getInstance().createConnection()) {
PunishEntry entry = new PunishEntry(type);
DSLContext dsl = DSL.using(connection);
if (type == PunishType.BAN) {
StaffogBanRecord record = dsl.select(STAFFOG_BAN.asterisk())
.from(STAFFOG_BAN)
.where(STAFFOG_BAN.ID.eq((long) id))
.fetchOneInto(STAFFOG_BAN);
StaffogBanRecord record = dsl.select(STAFFOG_BAN.asterisk()).from(STAFFOG_BAN)
.where(STAFFOG_BAN.ID.eq((long) id)).fetchOneInto(STAFFOG_BAN);
if (record == null) {
return null;
}
entry.setId(record.getId());
@@ -214,18 +220,21 @@ public class PunishManager {
entry.setUntil(record.getUntil());
entry.setActive(record.getActive());
if (!entry.isActive()) {
entry.setRemovedUuid(record.getRemovedUuid());
entry.setRemovedName(record.getRemovedName());
entry.setRemovedTime(record.getRemovedTime());
entry.setRemovedReason(record.getRemovedReason());
}
} else {
StaffogMuteRecord record = dsl.select(STAFFOG_MUTE.asterisk())
.from(STAFFOG_MUTE)
.where(STAFFOG_MUTE.ID.eq((long) id))
.fetchOneInto(STAFFOG_MUTE);
if (record == null) return null;
StaffogMuteRecord record = dsl.select(STAFFOG_MUTE.asterisk()).from(STAFFOG_MUTE)
.where(STAFFOG_MUTE.ID.eq((long) id)).fetchOneInto(STAFFOG_MUTE);
if (record == null)
return null;
entry.setId(record.getId());
entry.setUuid(UUID.fromString(record.getUuid()));
@@ -237,40 +246,49 @@ public class PunishManager {
entry.setUntil(record.getUntil());
entry.setActive(record.getActive());
if (!entry.isActive()) {
entry.setRemovedUuid(record.getRemovedUuid());
entry.setRemovedName(record.getRemovedName());
entry.setRemovedTime(record.getRemovedTime());
entry.setRemovedReason(record.getRemovedReason());
}
}
if (entry.checkDurationOver()) {
expirePunishment(entry);
return null;
}
return entry;
} catch (Exception error) {
Console.error("Failed to get punishment info for id " + id);
error.printStackTrace();
return null;
}
}
public PunishEntry checkActivePunishment(PunishType type, UUID uuid) {
try (Connection connection = DatabaseManager.getInstance().createConnection()) {
PunishEntry entry = new PunishEntry(type);
DSLContext dsl = DSL.using(connection);
if (type == PunishType.BAN) {
StaffogBanRecord record = dsl.select(STAFFOG_BAN.asterisk())
.from(STAFFOG_BAN)
.where(STAFFOG_BAN.UUID.eq(uuid.toString()))
.and(STAFFOG_BAN.ACTIVE.eq(true))
StaffogBanRecord record = dsl.select(STAFFOG_BAN.asterisk()).from(STAFFOG_BAN)
.where(STAFFOG_BAN.UUID.eq(uuid.toString())).and(STAFFOG_BAN.ACTIVE.eq(true))
.fetchOneInto(STAFFOG_BAN);
if (record == null) return null;
if (record == null)
return null;
entry.setId(record.getId());
entry.setUuid(UUID.fromString(record.getUuid()));
@@ -281,14 +299,15 @@ public class PunishManager {
entry.setTime(record.getTime());
entry.setUntil(record.getUntil());
entry.setActive(record.getActive());
} else {
StaffogMuteRecord record = dsl.select(STAFFOG_MUTE.asterisk())
.from(STAFFOG_MUTE)
.where(STAFFOG_MUTE.UUID.eq(uuid.toString()))
.and(STAFFOG_MUTE.ACTIVE.eq(true))
StaffogMuteRecord record = dsl.select(STAFFOG_MUTE.asterisk()).from(STAFFOG_MUTE)
.where(STAFFOG_MUTE.UUID.eq(uuid.toString())).and(STAFFOG_MUTE.ACTIVE.eq(true))
.fetchOneInto(STAFFOG_MUTE);
if (record == null) return null;
if (record == null)
return null;
entry.setId(record.getId());
entry.setUuid(UUID.fromString(record.getUuid()));
@@ -299,73 +318,83 @@ public class PunishManager {
entry.setTime(record.getTime());
entry.setUntil(record.getUntil());
entry.setActive(record.getActive());
}
if (entry.checkDurationOver()) {
expirePunishment(entry);
return null;
}
return entry;
} catch (Exception error) {
Console.error("Failed to get punishment info for " + uuid);
error.printStackTrace();
return null;
}
}
public void expirePunishment(PunishEntry entry) {
entry.setRemovedUuid("Expired");
entry.setRemovedName("Expired");
entry.setRemovedReason("Punishment Expired");
entry.setActive(false);
removePunishment(entry);
}
public void removePunishment(PunishEntry entry) {
entry.setActive(false);
entry.setRemovedTime(System.currentTimeMillis());
try (Connection connection = DatabaseManager.getInstance().createConnection()) {
if (entry.getName() == null) entry.setName(getNameFromUUID(entry.getUuid()));
if (entry.getName() == null)
entry.setName(getNameFromUUID(entry.getUuid()));
DSLContext dsl = DSL.using(connection);
if (entry.getType() == PunishType.BAN) {
dsl.update(STAFFOG_BAN)
.set(STAFFOG_BAN.REMOVED_UUID, entry.getRemovedUuid())
dsl.update(STAFFOG_BAN).set(STAFFOG_BAN.REMOVED_UUID, entry.getRemovedUuid())
.set(STAFFOG_BAN.REMOVED_NAME, entry.getRemovedName())
.set(STAFFOG_BAN.REMOVED_REASON, entry.getRemovedReason())
.set(STAFFOG_BAN.REMOVED_TIME, entry.getRemovedTime())
.set(STAFFOG_BAN.ACTIVE, false)
.where(STAFFOG_BAN.ID.eq(entry.getId()))
.execute();
.set(STAFFOG_BAN.REMOVED_TIME, entry.getRemovedTime()).set(STAFFOG_BAN.ACTIVE, false)
.where(STAFFOG_BAN.ID.eq(entry.getId())).execute();
} else {
dsl.update(STAFFOG_MUTE)
.set(STAFFOG_MUTE.REMOVED_UUID, entry.getRemovedUuid())
dsl.update(STAFFOG_MUTE).set(STAFFOG_MUTE.REMOVED_UUID, entry.getRemovedUuid())
.set(STAFFOG_MUTE.REMOVED_NAME, entry.getRemovedName())
.set(STAFFOG_MUTE.REMOVED_REASON, entry.getRemovedReason())
.set(STAFFOG_MUTE.REMOVED_TIME, entry.getRemovedTime())
.set(STAFFOG_MUTE.ACTIVE, false)
.where(STAFFOG_MUTE.ID.eq(entry.getId()))
.execute();
.set(STAFFOG_MUTE.REMOVED_TIME, entry.getRemovedTime()).set(STAFFOG_MUTE.ACTIVE, false)
.where(STAFFOG_MUTE.ID.eq(entry.getId())).execute();
}
if (entry.getType() == PunishType.MUTE && Bukkit.getServer().getPlayer(entry.getUuid()) != null) {
Bukkit.getServer().getPlayer(entry.getUuid()).sendMessage(Message.format("&aYou have been unmuted."));
}
Message.staffBroadcast(Message.formatNotification(
"UN" + entry.getType(),
entry.getName() + " has been un" + entry.getType().getBroadcastMessage() + " by "
+ entry.getRemovedName()));
Message.staffBroadcast(Message.formatNotification("UN" + entry.getType(), entry.getName() + " has been un"
+ entry.getType().getBroadcastMessage() + " by " + entry.getRemovedName()));
} catch (Exception error) {
Console.error("Failed to remove punishment.");
error.printStackTrace();
}
}
public void visualRemovePunishment(PunishEntry entry) {
@@ -373,30 +402,26 @@ public class PunishManager {
if (entry.getType() == PunishType.MUTE && Bukkit.getServer().getPlayer(entry.getUuid()) != null) {
Bukkit.getServer().getPlayer(entry.getUuid()).sendMessage(Message.format("&aYou have been unmuted."));
}
Message.staffBroadcast(Message.formatNotification(
"UN" + entry.getType(),
entry.getName() + " has been un" + entry.getType().getBroadcastMessage() + " by "
+ entry.getRemovedName()));
Message.staffBroadcast(Message.formatNotification("UN" + entry.getType(), entry.getName() + " has been un"
+ entry.getType().getBroadcastMessage() + " by " + entry.getRemovedName()));
}
public void newKickPunishment(KickPunishEntry entry) {
try (Connection connection = DatabaseManager.getInstance().createConnection()) {
DSLContext dsl = DSL.using(connection);
dsl.insertInto(STAFFOG_KICK)
.set(STAFFOG_KICK.UUID, entry.getUuid().toString())
.set(STAFFOG_KICK.REASON, entry.getReason())
.set(STAFFOG_KICK.BY_UUID, entry.getByUuid())
.set(STAFFOG_KICK.BY_NAME, entry.getByName())
.set(STAFFOG_KICK.TIME, entry.getTime())
.execute();
dsl.insertInto(STAFFOG_KICK).set(STAFFOG_KICK.UUID, entry.getUuid().toString())
.set(STAFFOG_KICK.REASON, entry.getReason()).set(STAFFOG_KICK.BY_UUID, entry.getByUuid())
.set(STAFFOG_KICK.BY_NAME, entry.getByName()).set(STAFFOG_KICK.TIME, entry.getTime()).execute();
if (entry.getPlayer() != null && entry.getPlayer().isOnline()) {
String messageString = "&cYou have been kicked for:\n" + "&f"
+ entry.getReason() + "\n\n" + "&c"
String messageString = "&cYou have been kicked for:\n" + "&f" + entry.getReason() + "\n\n" + "&c"
+ "Please read our rules when you rejoin by running /rules";
// Create a MiniMessage instance.
@@ -405,6 +430,7 @@ public class PunishManager {
Component kickMessage = miniMessage.deserialize(messageString);
entry.getPlayer().kick(kickMessage);
}
Message.staffBroadcast(
@@ -414,30 +440,45 @@ public class PunishManager {
Console.error("Failed to create kick punishment.");
error.printStackTrace();
}
}
public boolean isIncludedInCurrentChatReport(String name) {
for (ChatReportEntry entry : chatReportEntries) {
if (name.equalsIgnoreCase(entry.getName())) {
return true;
}
}
return false;
}
public UUID getUUIDFromChatReport(String name) {
for (ChatReportEntry entry : chatReportEntries) {
if (name.equalsIgnoreCase(entry.getName())) {
return entry.getUuid();
}
}
return null;
}
public String exportChatReport(UUID by, UUID reported) {
Gson gson = new Gson();
String data = gson.toJson(chatReportEntries);
@@ -445,40 +486,40 @@ public class PunishManager {
DSLContext dsl = DSL.using(connection);
StaffogChatreportRecord record = dsl.insertInto(STAFFOG_CHATREPORT)
.set(STAFFOG_CHATREPORT.UUID, reported.toString())
.set(STAFFOG_CHATREPORT.BY_UUID, by.toString())
.set(STAFFOG_CHATREPORT.TIME, System.currentTimeMillis())
.set(STAFFOG_CHATREPORT.MESSAGES, data)
.returning(STAFFOG_CHATREPORT.ID)
.fetchOne();
.set(STAFFOG_CHATREPORT.UUID, reported.toString()).set(STAFFOG_CHATREPORT.BY_UUID, by.toString())
.set(STAFFOG_CHATREPORT.TIME, System.currentTimeMillis()).set(STAFFOG_CHATREPORT.MESSAGES, data)
.returning(STAFFOG_CHATREPORT.ID).fetchOne();
return "" + record.getId();
} catch (Exception error) {
error.printStackTrace();
return null;
}
}
public String createReportFromCR(UUID by, UUID reported, int crid, String reason) {
try (Connection connection = DatabaseManager.getInstance().createConnection()) {
DSLContext dsl = DSL.using(connection);
StaffogReportRecord record = dsl.insertInto(STAFFOG_REPORT)
.set(STAFFOG_REPORT.UUID, reported.toString())
.set(STAFFOG_REPORT.BY_UUID, by.toString())
.set(STAFFOG_REPORT.TIME, System.currentTimeMillis())
.set(STAFFOG_REPORT.TYPE, "CHAT")
.set(STAFFOG_REPORT.REASON, reason)
.set(STAFFOG_REPORT.CRID, crid)
.returning(STAFFOG_REPORT.ID)
.fetchOne();
StaffogReportRecord record = dsl.insertInto(STAFFOG_REPORT).set(STAFFOG_REPORT.UUID, reported.toString())
.set(STAFFOG_REPORT.BY_UUID, by.toString()).set(STAFFOG_REPORT.TIME, System.currentTimeMillis())
.set(STAFFOG_REPORT.TYPE, "CHAT").set(STAFFOG_REPORT.REASON, reason).set(STAFFOG_REPORT.CRID, crid)
.returning(STAFFOG_REPORT.ID).fetchOne();
return "" + record.getId();
} catch (Exception error) {
error.printStackTrace();
return null;
}
}
}
src/main/java/uk/hotten/staffog/punish/data/ChatReportEntry.java
+2
View File
@@ -23,5 +23,7 @@ public class ChatReportEntry {
this.name = name;
this.message = message;
this.time = time;
}
}
src/main/java/uk/hotten/staffog/punish/data/KickPunishEntry.java
+1
View File
@@ -39,4 +39,5 @@ public class KickPunishEntry {
@Getter
@Setter
private long time;
}
src/main/java/uk/hotten/staffog/punish/data/PunishEntry.java
+10
View File
@@ -74,6 +74,7 @@ public class PunishEntry {
public PunishEntry(PunishType type) {
this.type = type;
}
public long calculateDuration() {
@@ -81,9 +82,11 @@ public class PunishEntry {
if (until == -1) {
return -1;
}
return until - time;
}
public long calculateRemaining() {
@@ -91,9 +94,11 @@ public class PunishEntry {
if (until == -1) {
return -1;
}
return until - System.currentTimeMillis();
}
public boolean checkDurationOver() {
@@ -101,9 +106,11 @@ public class PunishEntry {
if (until == -1) {
return false;
}
return (calculateRemaining() <= 0);
}
public String calculateUntilDate() {
@@ -111,10 +118,13 @@ public class PunishEntry {
if (until == -1) {
return "forever";
}
Date date = new Date(until);
return TimeUtils.notificationTimeFormat.format(date);
}
}
src/main/java/uk/hotten/staffog/punish/data/PunishType.java
+4 -2
View File
@@ -3,8 +3,8 @@ package uk.hotten.staffog.punish.data;
import lombok.Getter;
public enum PunishType {
BAN("staffog_ban", "banned"),
MUTE("staffog_mute", "muted");
BAN("staffog_ban", "banned"), MUTE("staffog_mute", "muted");
@Getter
private String table;
@@ -16,5 +16,7 @@ public enum PunishType {
this.table = table;
this.broadcastMessage = broadcastMessage;
}
}
src/main/java/uk/hotten/staffog/security/SecurityEventListener.java
+9 -2
View File
@@ -22,6 +22,7 @@ public class SecurityEventListener implements Listener {
if (!StaffOGPlugin.getVaultPerms().playerHas("world", Bukkit.getOfflinePlayer(uuid), "staffog.panelaccess")) {
return;
}
String ip = event.getAddress().getHostAddress();
@@ -31,14 +32,15 @@ public class SecurityEventListener implements Listener {
StaffIPInfo ipInfo = new StaffIPInfo(-1, uuid, ip, true, false, false, true);
sm.createIpEntry(ipInfo);
return;
}
StaffIPInfo ipInfo =
sm.isIpRecognised(event.getUniqueId(), event.getAddress().getHostAddress());
StaffIPInfo ipInfo = sm.isIpRecognised(event.getUniqueId(), event.getAddress().getHostAddress());
if (ipInfo == null) {
ipInfo = new StaffIPInfo(-1, uuid, ip, false, false, false, true);
sm.createIpEntry(ipInfo);
}
// Only challenge a new IP if the users's panel account is already set up.
@@ -57,20 +59,25 @@ public class SecurityEventListener implements Listener {
event.kickMessage(kickMessage);
return;
}
if (!ipInfo.isGameVerified()) {
ipInfo.setGameVerified(true);
sm.updateIpEntry(ipInfo);
}
sm.getStaffIPInfos().put(uuid, ipInfo);
}
@EventHandler
public void onQuit(PlayerQuitEvent event) {
SecurityManager.getInstance().getStaffIPInfos().remove(event.getPlayer().getUniqueId());
}
}
src/main/java/uk/hotten/staffog/security/SecurityManager.java
+62 -44
View File
@@ -27,39 +27,40 @@ public class SecurityManager {
private HashMap<UUID, StaffIPInfo> staffIPInfos;
public SecurityManager(JavaPlugin plugin) {
instance = this;
staffIPInfos = new HashMap<>();
plugin.getServer().getPluginManager().registerEvents(new SecurityEventListener(), plugin);
}
public StaffIPInfo isIpRecognised(UUID uuid, String ip) {
try (Connection connection = DatabaseManager.getInstance().createConnection()) {
DSLContext dsl = DSL.using(connection);
StaffogStaffipRecord record = dsl.select(STAFFOG_STAFFIP.asterisk())
.from(STAFFOG_STAFFIP)
.where(STAFFOG_STAFFIP.UUID.eq(uuid.toString()))
.and(STAFFOG_STAFFIP.IP.eq(ip))
StaffogStaffipRecord record = dsl.select(STAFFOG_STAFFIP.asterisk()).from(STAFFOG_STAFFIP)
.where(STAFFOG_STAFFIP.UUID.eq(uuid.toString())).and(STAFFOG_STAFFIP.IP.eq(ip))
.fetchOneInto(STAFFOG_STAFFIP);
if (record == null) {
return null;
}
return new StaffIPInfo(
record.getId(),
UUID.fromString(record.getUuid()),
record.getIp(),
record.getInitial(),
record.getPanelAcknowledged(),
record.getPanelVerified(),
return new StaffIPInfo(record.getId(), UUID.fromString(record.getUuid()), record.getIp(),
record.getInitial(), record.getPanelAcknowledged(), record.getPanelVerified(),
record.getGameVerified());
} catch (Exception error) {
error.printStackTrace();
return null;
}
}
public boolean isUserAccountCreated(UUID id, String ip) {
@@ -67,10 +68,8 @@ public class SecurityManager {
try (Connection connection = DatabaseManager.getInstance().createConnection()) {
DSLContext dsl = DSL.using(connection);
StaffogStaffipRecord record = dsl.select(STAFFOG_STAFFIP.asterisk())
.from(STAFFOG_STAFFIP)
.where(STAFFOG_STAFFIP.UUID.eq(id.toString()))
.and(STAFFOG_STAFFIP.IP.eq(ip))
StaffogStaffipRecord record = dsl.select(STAFFOG_STAFFIP.asterisk()).from(STAFFOG_STAFFIP)
.where(STAFFOG_STAFFIP.UUID.eq(id.toString())).and(STAFFOG_STAFFIP.IP.eq(ip))
.fetchOneInto(STAFFOG_STAFFIP);
if (record == null) {
@@ -80,6 +79,7 @@ public class SecurityManager {
} else {
return record.getPanelVerified();
}
} catch (Exception e) {
@@ -87,92 +87,107 @@ public class SecurityManager {
e.printStackTrace();
return false;
}
}
public boolean hasUUIDGotIp(UUID uuid) {
try (Connection connection = DatabaseManager.getInstance().createConnection()) {
DSLContext dsl = DSL.using(connection);
return dsl.fetchExists(dsl.selectFrom(STAFFOG_STAFFIP).where(STAFFOG_STAFFIP.UUID.eq(uuid.toString())));
} catch (Exception error) {
error.printStackTrace();
return false;
}
}
public void createIpEntry(StaffIPInfo info) {
try (Connection connection = DatabaseManager.getInstance().createConnection()) {
DSLContext dsl = DSL.using(connection);
dsl.insertInto(STAFFOG_STAFFIP)
.set(STAFFOG_STAFFIP.IP, info.getIp())
.set(STAFFOG_STAFFIP.UUID, info.getUuid().toString())
.set(STAFFOG_STAFFIP.INITIAL, info.isInitial())
dsl.insertInto(STAFFOG_STAFFIP).set(STAFFOG_STAFFIP.IP, info.getIp())
.set(STAFFOG_STAFFIP.UUID, info.getUuid().toString()).set(STAFFOG_STAFFIP.INITIAL, info.isInitial())
.set(STAFFOG_STAFFIP.PANEL_ACKNOWLEDGED, info.isPanelAcknowledged())
.set(STAFFOG_STAFFIP.PANEL_VERIFIED, info.isPanelVerified())
.set(STAFFOG_STAFFIP.GAME_VERIFIED, info.isGameVerified())
.execute();
.set(STAFFOG_STAFFIP.GAME_VERIFIED, info.isGameVerified()).execute();
} catch (Exception error) {
Console.error("Failed to create ip entry.");
error.printStackTrace();
}
}
public void updateIpEntry(StaffIPInfo info) {
try (Connection connection = DatabaseManager.getInstance().createConnection()) {
DSLContext dsl = DSL.using(connection);
dsl.update(STAFFOG_STAFFIP)
.set(STAFFOG_STAFFIP.IP, info.getIp())
.set(STAFFOG_STAFFIP.UUID, info.getUuid().toString())
.set(STAFFOG_STAFFIP.INITIAL, info.isInitial())
dsl.update(STAFFOG_STAFFIP).set(STAFFOG_STAFFIP.IP, info.getIp())
.set(STAFFOG_STAFFIP.UUID, info.getUuid().toString()).set(STAFFOG_STAFFIP.INITIAL, info.isInitial())
.set(STAFFOG_STAFFIP.PANEL_ACKNOWLEDGED, info.isPanelAcknowledged())
.set(STAFFOG_STAFFIP.PANEL_VERIFIED, info.isPanelVerified())
.set(STAFFOG_STAFFIP.GAME_VERIFIED, info.isGameVerified())
.where(STAFFOG_STAFFIP.ID.eq(info.getId()))
.execute();
.where(STAFFOG_STAFFIP.ID.eq(info.getId())).execute();
} catch (Exception error) {
Console.error("Failed to update ip entry.");
error.printStackTrace();
}
}
private boolean doesLinkCodeExist(String code) {
try (Connection connection = DatabaseManager.getInstance().createConnection()) {
DSLContext dsl = DSL.using(connection);
return dsl.fetchExists(dsl.selectFrom(STAFFOG_LINKCODE).where(STAFFOG_LINKCODE.CODE.eq(code)));
} catch (Exception error) {
error.printStackTrace();
return false;
}
}
public String doesPlayerHaveLinkCode(UUID uuid) {
try (Connection connection = DatabaseManager.getInstance().createConnection()) {
DSLContext dsl = DSL.using(connection);
StaffogLinkcodeRecord record = dsl.select(STAFFOG_LINKCODE.asterisk())
.from(STAFFOG_LINKCODE)
.where(STAFFOG_LINKCODE.UUID.eq(uuid.toString()))
.fetchOneInto(STAFFOG_LINKCODE);
StaffogLinkcodeRecord record = dsl.select(STAFFOG_LINKCODE.asterisk()).from(STAFFOG_LINKCODE)
.where(STAFFOG_LINKCODE.UUID.eq(uuid.toString())).fetchOneInto(STAFFOG_LINKCODE);
if (record == null) {
return null;
}
return record.getCode();
} catch (Exception error) {
error.printStackTrace();
return null;
}
}
public String createLinkCode(UUID uuid, boolean admin) {
@@ -189,30 +204,33 @@ public class SecurityManager {
// add Character one by one in end of sb
sb.append(possibleChars.charAt(index));
}
if (!doesLinkCodeExist(sb.toString())) {
code = sb.toString();
}
}
try (Connection connection = DatabaseManager.getInstance().createConnection()) {
DSLContext dsl = DSL.using(connection);
dsl.insertInto(STAFFOG_LINKCODE)
.set(STAFFOG_LINKCODE.UUID, uuid.toString())
.set(STAFFOG_LINKCODE.CODE, code)
.set(STAFFOG_LINKCODE.ADMIN, admin)
.execute();
dsl.insertInto(STAFFOG_LINKCODE).set(STAFFOG_LINKCODE.UUID, uuid.toString())
.set(STAFFOG_LINKCODE.CODE, code).set(STAFFOG_LINKCODE.ADMIN, admin).execute();
} catch (Exception error) {
Console.error("Failed to create link code.");
error.printStackTrace();
return null;
}
return code;
}
public void checkAndDeactivateStaffAccount(UUID uuid) {
@@ -221,21 +239,21 @@ public class SecurityManager {
DSLContext dsl = DSL.using(connection);
StaffogWebRecord record = dsl.select(STAFFOG_WEB.asterisk())
.from(STAFFOG_WEB)
.where(STAFFOG_WEB.UUID.eq(uuid.toString()))
.fetchOneInto(STAFFOG_WEB);
StaffogWebRecord record = dsl.select(STAFFOG_WEB.asterisk()).from(STAFFOG_WEB)
.where(STAFFOG_WEB.UUID.eq(uuid.toString())).fetchOneInto(STAFFOG_WEB);
if (record == null) return;
if (record == null)
return;
dsl.update(STAFFOG_WEB)
.set(STAFFOG_WEB.ACTIVE, false)
.where(STAFFOG_WEB.UUID.eq(uuid.toString()))
dsl.update(STAFFOG_WEB).set(STAFFOG_WEB.ACTIVE, false).where(STAFFOG_WEB.UUID.eq(uuid.toString()))
.execute();
} catch (Exception error) {
error.printStackTrace();
}
}
}
src/main/java/uk/hotten/staffog/security/data/StaffIPInfo.java
+6 -8
View File
@@ -31,14 +31,9 @@ public class StaffIPInfo {
@Setter
private boolean gameVerified;
public StaffIPInfo(
int id,
UUID uuid,
String ip,
boolean initial,
boolean panelAcknowledged,
boolean panelVerified,
boolean gameVerified) {
public StaffIPInfo(int id, UUID uuid, String ip, boolean initial, boolean panelAcknowledged, boolean panelVerified,
boolean gameVerified)
{
this.id = id;
this.uuid = uuid;
@@ -47,6 +42,7 @@ public class StaffIPInfo {
this.panelAcknowledged = panelAcknowledged;
this.panelVerified = panelVerified;
this.gameVerified = gameVerified;
}
public StaffIPInfo(int id, UUID uuid, String ip) {
@@ -57,5 +53,7 @@ public class StaffIPInfo {
this.initial = false;
this.panelVerified = false;
this.gameVerified = false;
}
}
src/main/java/uk/hotten/staffog/tasks/TaskManager.java
+33 -16
View File
@@ -28,31 +28,38 @@ public class TaskManager {
this.plugin = plugin;
plugin.getServer()
.getScheduler()
.runTaskTimerAsynchronously(
plugin,
() -> {
plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, () -> {
for (TaskEntry entry : checkForTasks()) {
switch (entry.getTask()) {
case "unpunish": {
processUnpunish(entry);
deleteTask(entry.getId());
break;
}
case "newreport": {
processNewReport(entry);
deleteTask(entry.getId());
}
case "newappeal": {
processNewAppeal(entry);
deleteTask(entry.getId());
}
}
}
},
0,
200);
}, 0, 200);
}
private ArrayList<TaskEntry> checkForTasks() {
@@ -62,16 +69,17 @@ public class TaskManager {
ArrayList<TaskEntry> toReturn = new ArrayList<>();
DSLContext dsl = DSL.using(connection);
Result<StaffogTaskRecord> result = dsl.select(Tables.STAFFOG_TASK.asterisk())
.from(Tables.STAFFOG_TASK)
Result<StaffogTaskRecord> result = dsl.select(Tables.STAFFOG_TASK.asterisk()).from(Tables.STAFFOG_TASK)
.fetchInto(Tables.STAFFOG_TASK);
for (StaffogTaskRecord record : result) {
TaskEntry entry = new TaskEntry();
entry.setId(record.getId());
entry.setTask(record.getTask());
entry.setData(record.getData());
toReturn.add(entry);
}
return toReturn;
@@ -80,7 +88,9 @@ public class TaskManager {
error.printStackTrace();
return new ArrayList<>();
}
}
private void processUnpunish(TaskEntry entry) {
@@ -88,6 +98,7 @@ public class TaskManager {
if (!entry.getTask().equals("unpunish")) {
return;
}
Gson gson = new Gson();
@@ -95,6 +106,7 @@ public class TaskManager {
PunishEntry punishEntry = PunishManager.getInstance().getPunishment(task.getType(), task.getId());
PunishManager.getInstance().visualRemovePunishment(punishEntry);
}
private void processNewReport(TaskEntry entry) {
@@ -102,15 +114,15 @@ public class TaskManager {
if (!entry.getTask().equals("newreport")) {
return;
}
Gson gson = new Gson();
NewReportTask task = gson.fromJson(entry.getData(), NewReportTask.class);
Message.staffBroadcast(Message.formatNotification(
"REPORT",
"New " + task.getType() + " report #" + task.getId() + " by " + task.getBy() + " against "
+ task.getOffender()));
Message.staffBroadcast(Message.formatNotification("REPORT", "New " + task.getType() + " report #" + task.getId()
+ " by " + task.getBy() + " against " + task.getOffender()));
}
private void processNewAppeal(TaskEntry entry) {
@@ -118,13 +130,15 @@ public class TaskManager {
if (!entry.getTask().equals("newappeal")) {
return;
}
Gson gson = new Gson();
NewAppealTask task = gson.fromJson(entry.getData(), NewAppealTask.class);
Message.staffBroadcast(Message.formatNotification(
"APPEAL", "New " + task.getType().toLowerCase() + " appeal #" + task.getId() + " by " + task.getBy()));
Message.staffBroadcast(Message.formatNotification("APPEAL",
"New " + task.getType().toLowerCase() + " appeal #" + task.getId() + " by " + task.getBy()));
}
private void deleteTask(int id) {
@@ -137,6 +151,9 @@ public class TaskManager {
} catch (Exception error) {
error.printStackTrace();
}
}
}
src/main/java/uk/hotten/staffog/tasks/data/NewAppealTask.java
+1
View File
@@ -16,4 +16,5 @@ public class NewAppealTask {
@Getter
@Setter
private String type;
}
src/main/java/uk/hotten/staffog/tasks/data/NewReportTask.java
+1
View File
@@ -20,4 +20,5 @@ public class NewReportTask {
@Getter
@Setter
private String type;
}
src/main/java/uk/hotten/staffog/tasks/data/TaskEntry.java
+1
View File
@@ -16,4 +16,5 @@ public class TaskEntry {
@Getter
@Setter
private String data;
}
src/main/java/uk/hotten/staffog/tasks/data/UnpunishTask.java
+2
View File
@@ -18,5 +18,7 @@ public class UnpunishTask {
this.type = PunishType.valueOf(type);
this.id = id;
}
}
src/main/java/uk/hotten/staffog/utils/Console.java
+4
View File
@@ -7,15 +7,19 @@ public class Console {
public static void info(String message) {
Bukkit.getServer().getConsoleSender().sendMessage("[Staff-OG] " + message);
}
public static void warn(String message) {
Bukkit.getServer().getConsoleSender().sendMessage("[Staff-OG: WARNING] " + message);
}
public static void error(String message) {
Bukkit.getServer().getConsoleSender().sendMessage("[Staff-OG: ERROR] " + message);
}
}
src/main/java/uk/hotten/staffog/utils/Message.java
+22 -2
View File
@@ -10,26 +10,33 @@ public class Message {
public static String format(String message) {
return "" + "&7" + "[" + "&e" + "Staff-OG" + "&7" + "] " + "&r" + message;
}
public static String formatNotification(String prefix, String message) {
return "" + "&c" + prefix.toUpperCase() + " | " + "&B" + "Notification " + "&8" + "> " + "&r" + message;
}
public static void staffBroadcast(String message) {
Bukkit.getServer().getOnlinePlayers().forEach(p -> {
if (p.hasPermission("staffog.seebroadcast")) staffOGMessage(p, message);
if (p.hasPermission("staffog.seebroadcast"))
staffOGMessage(p, message);
});
staffOGMessage(Bukkit.getServer().getConsoleSender(), message);
}
// Sends a formatted message to the player (including name replacement).
public static void staffOGMessage(CommandSender p, String message) {
p.sendMessage(legacySerializerAnyCase(format(message)));
}
public static TextComponent legacySerializerAnyCase(String subject) {
@@ -41,7 +48,9 @@ public class Message {
if (c == '&') {
count++;
}
}
// Create an array to store the positions of '&' characters
@@ -55,30 +64,38 @@ public class Message {
if (isUpperBukkitCode(subject.charAt(i + 1))) {
subject = replaceCharAtIndex(subject, (i + 1), Character.toLowerCase(subject.charAt(i + 1)));
}
positions[index++] = i;
}
}
return LegacyComponentSerializer.legacyAmpersand().deserialize(subject);
}
private static boolean isUpperBukkitCode(char input) {
char[] bukkitColorCodes = {'A', 'B', 'C', 'D', 'E', 'F', 'K', 'L', 'M', 'N', 'O', 'R'};
char[] bukkitColorCodes = { 'A', 'B', 'C', 'D', 'E', 'F', 'K', 'L', 'M', 'N', 'O', 'R' };
boolean match = false;
// Loop through each character in the array.
for (char c : bukkitColorCodes) {
// Check if the current character in the array is equal to the input character.
if (c == input) {
match = true;
}
}
return match;
}
private static String replaceCharAtIndex(String original, int index, char newChar) {
@@ -88,9 +105,12 @@ public class Message {
// Create a new string with the replaced character
return original.substring(0, index) + newChar + original.substring(index + 1);
}
// If the index is invalid, return the original string
return original;
}
}
src/main/java/uk/hotten/staffog/utils/TimeUtils.java
+13 -6
View File
@@ -15,7 +15,9 @@ public class TimeUtils {
public static DateFormat notificationTimeFormat = new SimpleDateFormat("dd-MM-yy");
public static String formatMillisecondTime(long millis) {
if (millis == -1) return "permanent";
if (millis == -1)
return "permanent";
// create the list
List<TimeUnit> units = new ArrayList<TimeUnit>(EnumSet.allOf(TimeUnit.class));
@@ -38,22 +40,27 @@ public class TimeUtils {
// put the result in the map
result.put(unit, diff);
}
if (millis > 86400000) {
result.remove(TimeUnit.MINUTES);
result.remove(TimeUnit.SECONDS);
}
for (Map.Entry<TimeUnit, Long> entry : result.entrySet()) {
if (entry.getValue() == 0) continue;
toReturn.append(entry.getValue())
.append(" ")
.append(entry.getKey().name().toLowerCase())
.append(" ");
if (entry.getValue() == 0)
continue;
toReturn.append(entry.getValue()).append(" ").append(entry.getKey().name().toLowerCase()).append(" ");
}
return toReturn.toString().trim();
}
}
src/main/resources/plugin.yml
+1 -1
View File
@@ -1,6 +1,6 @@
name: Staff-OG
main: uk.hotten.staffog.StaffOGPlugin
version: 1.0-beta
version: 1.0
api-version: 1.19
author: Gxorge
description: Punishment system for TrueOG.