Commit Graph

2003 Commits

Author SHA1 Message Date
dependabot[bot]
23226b8aff
Bump maven-shade-plugin from 3.2.0 to 3.2.1 in /Plan/bukkit
Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/apache/maven-shade-plugin/releases)
- [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.2.0...maven-shade-plugin-3.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12 06:47:59 +00:00
dependabot[bot]
fd6fae091b
Merge pull request #800 from Rsl1122/dependabot/maven/Plan/development/org.apache.maven.plugins-maven-compiler-plugin-3.8.0 2018-11-12 06:46:08 +00:00
dependabot[bot]
f3cb6866fb
Merge pull request #801 from Rsl1122/dependabot/maven/Plan/development/org.jacoco-jacoco-maven-plugin-0.8.2 2018-11-12 06:45:20 +00:00
dependabot[bot]
007d5019e7
Merge pull request #802 from Rsl1122/dependabot/maven/Plan/development/org.apache.maven.plugins-maven-jar-plugin-3.1.0 2018-11-12 06:44:25 +00:00
dependabot[bot]
8bb1361bbc
Merge pull request #803 from Rsl1122/dependabot/maven/Plan/development/org.xerial-sqlite-jdbc-3.25.2 2018-11-12 06:43:54 +00:00
dependabot[bot]
3b7c4b7f07
Merge pull request #804 from Rsl1122/dependabot/maven/Plan/plugin/development/org.apache.maven.plugins-maven-shade-plugin-3.2.1 2018-11-12 06:42:48 +00:00
dependabot[bot]
8ea1b36f0e
Merge pull request #805 from Rsl1122/dependabot/maven/Plan/common/development/org.apache.maven.plugins-maven-shade-plugin-3.2.1 2018-11-12 06:42:02 +00:00
dependabot[bot]
0b7249b3be
Merge pull request #806 from Rsl1122/dependabot/maven/Plan/sponge/development/org.apache.maven.plugins-maven-shade-plugin-3.2.1 2018-11-12 06:41:34 +00:00
dependabot[bot]
f07d1ddf40
Merge pull request #807 from Rsl1122/dependabot/maven/Plan/velocity/development/org.apache.maven.plugins-maven-shade-plugin-3.2.1 2018-11-12 06:40:53 +00:00
dependabot[bot]
d924d2e65b
Bump maven-shade-plugin from 3.2.0 to 3.2.1 in /Plan/bungeecord
Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/apache/maven-shade-plugin/releases)
- [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.2.0...maven-shade-plugin-3.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12 06:10:24 +00:00
dependabot[bot]
15f42a203e
Bump maven-shade-plugin from 3.2.0 to 3.2.1 in /Plan/velocity
Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/apache/maven-shade-plugin/releases)
- [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.2.0...maven-shade-plugin-3.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12 06:09:17 +00:00
dependabot[bot]
52a2b5cdad
Bump maven-shade-plugin from 3.2.0 to 3.2.1 in /Plan/sponge
Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/apache/maven-shade-plugin/releases)
- [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.2.0...maven-shade-plugin-3.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12 06:07:53 +00:00
dependabot[bot]
3abd2ef0b8
Bump maven-shade-plugin from 3.2.0 to 3.2.1 in /Plan/common
Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/apache/maven-shade-plugin/releases)
- [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.2.0...maven-shade-plugin-3.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12 06:05:33 +00:00
dependabot[bot]
16cc098b2c
Bump maven-shade-plugin from 3.2.0 to 3.2.1 in /Plan/plugin
Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/apache/maven-shade-plugin/releases)
- [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.2.0...maven-shade-plugin-3.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12 05:48:50 +00:00
dependabot[bot]
ea2768a979
Bump sqlite-jdbc from 3.23.1 to 3.25.2 in /Plan
Bumps [sqlite-jdbc](https://github.com/xerial/sqlite-jdbc) from 3.23.1 to 3.25.2.
- [Release notes](https://github.com/xerial/sqlite-jdbc/releases)
- [Changelog](https://github.com/xerial/sqlite-jdbc/blob/master/CHANGELOG)
- [Commits](https://github.com/xerial/sqlite-jdbc/compare/3.23.1...3.25.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12 05:44:52 +00:00
dependabot[bot]
a1609df5df
Bump maven-jar-plugin from 3.0.2 to 3.1.0 in /Plan
Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.0.2 to 3.1.0.
- [Release notes](https://github.com/apache/maven-jar-plugin/releases)
- [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.0.2...maven-jar-plugin-3.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12 05:44:46 +00:00
dependabot[bot]
fbc0cecba2
Bump jacoco-maven-plugin from 0.8.0 to 0.8.2 in /Plan
Bumps [jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.0 to 0.8.2.
- [Release notes](https://github.com/jacoco/jacoco/releases)
- [Commits](https://github.com/jacoco/jacoco/compare/v0.8.0...v0.8.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12 05:38:33 +00:00
dependabot[bot]
07dda3c09d
Bump maven-compiler-plugin from 3.7.0 to 3.8.0 in /Plan
Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.7.0 to 3.8.0.
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.7.0...maven-compiler-plugin-3.8.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12 05:37:37 +00:00
Rsl1122
95bd33e3c4 Commented on empty blocks 2018-11-11 21:38:27 +02:00
Rsl1122
61016e1fef DBType enum constant name format 2018-11-11 21:22:37 +02:00
Rsl1122
d9cc79814f Made PlanSponge use PluginLogger on enable 2018-11-11 21:19:15 +02:00
Rsl1122
bfd0cb4957 Removed duplicate class variable in ServerInfoSystem
logger is already defined in InfoSystem
2018-11-11 21:17:42 +02:00
Rsl1122
9801aa584b Simplified TPSBuilder
Removed nested classes that created an inheritance tree 9 deep.
2018-11-11 21:14:49 +02:00
Rsl1122
bdd4d4c333 Removed duplicated code: PlanProxyCommand
PlanBungeeCommand and PlanVelocityCommand were the same, and should
stay the same, with exception of the name.
So new module that defines the name of the main command was created and
now the duplicate code could be removed.
2018-11-11 21:09:22 +02:00
Rsl1122
9eaa350758 [Typo] Fix typo in license headers LGNU -> GNU 2018-11-11 20:55:44 +02:00
Rsl1122
8d596b416a [Smell] Fix smells in CommonDBTest
- Introduced HtmlUtilities class accessible from PlanSystem, for
  utilities that may need injecting otherwise.
- Used the new HtmlUtilities class for constructing
  AnalysisContainer.Factory for an ignored test (Smell)
- Fixed the test that was now failing by removing AnalysisKeys.BAN_DATA

- Inverted a test condition that was flipped

- Changed some calls to TestConstants to class variables in CommonDBTest
2018-11-11 20:50:46 +02:00
Rsl1122
e87a22ce59 [Smell] Useless null check
- Expression here is now always true and so can be removed
2018-11-11 20:19:55 +02:00
Rsl1122
6b3d07dac1 [Smell] Improper InterruptedException handling
- Fixes thread interruption if interrupted during WebServer shutdown
- Fixes thread interruption if interrupted during Processing shutdown
2018-11-11 20:17:50 +02:00
dependabot[bot]
c513e08728
Merge pull request #796 from Rsl1122/dependabot/maven/Plan/velocity/development/org.apache.maven.plugins-maven-compiler-plugin-3.8.0 2018-11-11 12:34:03 +00:00
dependabot[bot]
7d9b1b4ac6
Bump maven-compiler-plugin from 3.7.0 to 3.8.0 in /Plan/sponge
Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.7.0 to 3.8.0.
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.7.0...maven-compiler-plugin-3.8.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-11 12:30:28 +00:00
dependabot[bot]
7dcc3de571
Bump maven-compiler-plugin from 3.7.0 to 3.8.0 in /Plan/velocity
Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.7.0 to 3.8.0.
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.7.0...maven-compiler-plugin-3.8.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-11 12:30:20 +00:00
dependabot[bot]
ef61885c22
Merge pull request #793 from Rsl1122/dependabot/maven/Plan/development/com.maxmind.geoip2-geoip2-2.12.0 2018-11-11 11:20:20 +00:00
dependabot[bot]
b3bf6a1a8b
Merge pull request #792 from Rsl1122/dependabot/maven/Plan/development/org.mockito-mockito-core-2.23.0 2018-11-11 11:19:51 +00:00
dependabot[bot]
ba52cdef38
Bump geoip2 from 2.9.0 to 2.12.0 in /Plan
Bumps [geoip2](https://github.com/maxmind/GeoIP2-java) from 2.9.0 to 2.12.0.
- [Release notes](https://github.com/maxmind/GeoIP2-java/releases)
- [Changelog](https://github.com/maxmind/GeoIP2-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/maxmind/GeoIP2-java/compare/v2.9.0...v2.12.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-11 11:15:32 +00:00
dependabot[bot]
2144553a1e
Bump mockito-core from 2.13.0 to 2.23.0 in /Plan
Bumps [mockito-core](https://github.com/mockito/mockito) from 2.13.0 to 2.23.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.13.0...v2.23.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-11 11:15:25 +00:00
dependabot[bot]
601f74c789
Merge pull request #788 from Rsl1122/dependabot/maven/Plan/development/org.apache.commons-commons-text-1.6 2018-11-11 11:10:14 +00:00
dependabot[bot]
45ffcb94c2
Bump commons-text from 1.3 to 1.6 in /Plan
Bumps commons-text from 1.3 to 1.6.

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-11 11:05:52 +00:00
dependabot[bot]
2f51687230
Bump maven-javadoc-plugin from 2.10.4 to 3.0.1 in /Plan
Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 2.10.4 to 3.0.1.
- [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
- [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-2.10.4...maven-javadoc-plugin-3.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-11 11:03:54 +00:00
Risto Lahtela
ebaffcab5e
[Merge] Module split (#786)
* Moved project files to 'common'-module

This is done so that refactoring into multiple smaller modules is easier
as the IDE will not attempt to move tests incorrectly when moving things
between different modules

* Created 'bukkit' module

Following classes were removed during the operation:
- BukkitServerInfo (Renamed to ServerServerInfo)
- SpongeServerInfo (could use ServerServerInfo)
- Hastebin (not viable on every platform, unused)
- HastebinTest
- MockPlayers (unused, bukkit specific)

Changes to classes:
- Renamed Importer to BukkitImporter (contained bukkit related impl.)
- Extracted Importer interface from BukkitImporter
- Turned BukkitPlanModule and BukkitClassBindingModule to interfaces by
  using @Binds annotation
- Added Status class since PlayersOnlineListener had a boolean,
  that stated if kicks were counted.

This commit completes split partially and was not pushed on commit.

* Created 'sponge' module

Changes to classes:
- Turned ServerSuperClassBindingModule, SuperClassBindingModule,
  SpongePlanModule and SpongeClassBindingModule to interfaces by
  using @Binds annotation
- Renamed SystemObjectBindingModule to SystemObjectProvidingModule
- Removed sponge related calls in ServerProperties
- Made EmptyImportSystem injectable

This commit completes split partially and was not pushed on commit.

* Changed shade configuration

Further tweaks required.

* Created 'bungeecord' module

Changes to classes:
- Removed use of BungeePingTimerTask in VelocityTaskSystem
- Removed use of RedisBungee in VelocityServerProperties
- Fixed bukkit command.commands.RegisterCommandFilter package

Changes to project structure:
- Dependency versions now in main pom via dependencyManagement
- Repositories now defined in main pom

* Created 'velocity' module

Changes to classes:
- Made RawDataResponse use Gson via reflection since it is no longer
  available in dependencies of 'common' module

* Created 'plugin' module

This module is for creating a single deployment artifact and testing of
system interactions.

Fixes to tests:
- Reflection no longer fails to initialize if Bukkit.getServer() is null
- PingCountTimerBukkit no longer fails to be created if Reflection fails
- Removed unnecessary @AfterClass from H2Test
- Jar resource path fixes to Mocker

* Shading configuration

org.slf4j classes are relocated in 'common', 'bukkit' & 'bungeecord'.
In 'sponge' & 'velocity' they are not relocated, allowing injection
as plugin logger, while using slf4j-nop for HikariCP logging.

This allows single release artifact.

* Removed 'Icon' from .gitignore

* Attempt to fix test resources

Because all jar resources are located in 'common', an attempt to fetch
them is made to common/target/Plan-common.jar, which for some reason
is a bad path.

This attempts to remedy that by creating a temporary file from an
InputStream, read with Class#getResourceAsStream

Ignored HTTPSWebServerAuthTest as the certificate path was invalid for
some reason.
2018-11-11 12:55:09 +02:00
RoboMWM
b9ae627388 Don't create dependency-reduced-pom (#781)
Since this plugin always generates one on compile, and since it's tracked in the git repo people have to revert their copy in order to pull changes.
2018-11-04 21:53:50 +02:00
Rsl1122
244c621abe [V] 4.5.1 version bump 2018-11-04 19:52:06 +02:00
Rsl1122
48ccd6d099 [#772] Fix ShutdownHook registration
This solves session saving on server shutdown, as previous solution has
proven to work just fine.
2018-11-04 19:42:58 +02:00
Fuzzlemann
81533718cd [Fix] Test & /raw/server/ improvements (#776) by Fuzzlemann
* Optimizing the loading of the network page and raw server data page

-> Loads the nicknames in bulk instead of one by one
-> Performance gain with the raw data 45719ms vs 10054ms
-> Scales up with more even more users

* Adding UsersTable#getUUIDsAndNamesByID so when you want to get the UUID and the player name you do not have to execute UsersTable#getPlayerNames and UsersTable#getUUIDsByID
-> Performance improvements

* Fixes the test failures

* Renamed method names so they correctly show the real DB used
True fix of the tests (no fail after ~3500 passes)
  -> Implementation of TestRunnableFactory
  -> Removal of the timeout on CommonDBTest#testSaveCommandUse which is way too sensitive to the testing environment (disk speed, etc.)
2018-11-03 22:09:12 +02:00
Fuzzlemann
471a830c9f [New] H2 Db Support + improvements (#774) by Fuzzlemann
* Adding H2 Database Support

* Making HtmlCompressor a constant so it is not created new each time it is used.
Note: It is thread-safe (see: https://code.google.com/archive/p/htmlcompressor/ "HtmlCompressor and XmlCompressor classes are considered thread safe* and can be used in multi-thread environment")

* Adds the H2 Database to the used libraries in the README.md

* Changes all invalid license headers

* Refactors many methods into an enum named DBType
These methods are:
 -> getName()
 -> getConfigName()
 -> supportsMySQLQueries()

 to a check if the DBType is H2

* KeepAliveTask splitted into separate class to remove duplicate code

* Fixes compilation error

* Refactors Database Tests into one Common class with all generic Database Tests and specific Database Tests

* Fixes some JavaDocs

* Adds license headers

* Optimizing comparisons to enum comparisons
2018-11-03 16:49:55 +02:00
Rsl1122
798a0e77eb Merge remote-tracking branch 'origin/development' into development 2018-10-29 19:46:30 +02:00
Rsl1122
81fc6a20d4 [#771] Fix Bukkit based servers TPS 2018-10-29 19:46:19 +02:00
Fuzzlemann
91d8731ab5 [Merge] Median and DecimalFormatter improvements (#765) by Fuzzlemann
* Generified Median.java
* Improves performance when comparing Integers because of Collection -> Stream -> List conversion removal. Instead of Median.forInt or Median.forLong Median.forList can be used.
* Now every type of number can be compared
* Storing DecimalFormat rather than creating a new DecimalFormat object each time it's applied
* Added JavaDocs for Median.java
2018-10-29 14:42:50 +02:00
Sprungente
7d8bc3f2ad German Locale enhancements (#766) by Sprungente 2018-10-28 10:22:37 +02:00
Rsl1122
acfa885a0d [Fix] Fix ping method usage on Paper 2018-10-28 10:20:16 +02:00
Risto Lahtela
916a0d3aed
[License] Updated license headers (#767) 2018-10-28 10:10:56 +02:00