Commit Graph

2999 Commits

Author SHA1 Message Date
Rsl1122
3f9f50de69 BooleanProvider store transaction 2019-03-18 14:11:27 +02:00
Rsl1122
7c04725ce8 plan_extension_user_values table information 2019-03-18 13:09:53 +02:00
Rsl1122
3cff8bbf1d plan_extension_providers table information 2019-03-18 13:09:27 +02:00
Rsl1122
1e374291ef String provider extra info 2019-03-18 13:09:00 +02:00
Rsl1122
74218f90cb Storage of Provider icons 2019-03-18 12:52:00 +02:00
Rsl1122
590d5c0e64 Player data gathering for all providers:
- Incremental condition resolution of BooleanProvider conditions
- Gathering of Number and String values
- Gathering and disambiguation between double and percentage providers.
2019-03-18 12:47:39 +02:00
Rsl1122
f10c2352df Simplified Provider method calling:
- Added an enum for each method kind
  - Moved parameter resolution to the end of the chain, right before
    invoking the method.
  - The enum is used for storage in DataProviders for easier access.
- ProviderInformation created as early as possible
2019-03-17 17:52:20 +02:00
Rsl1122
c5b28fe3f9 Storage of plugin info, icon and tabs of DataExtension 2019-03-17 11:56:33 +02:00
Rsl1122
41f5ce4853 Small amount of code cleanup 2019-03-14 16:57:10 +02:00
Rsl1122
b52d113e2e Provider Extraction + priority to Providers:
Implemented methods for extracting each kind of Provider annotation
related method information to a DataProvider.

DataProviders required some duplicate code due to type erasure of the
parameter class.

----

Added Display-priority to Providers, highest value is placed top most.

InvalidateMethod annotations are now extracted.
2019-03-14 16:53:05 +02:00
Rsl1122
305d0fd77c Begun work on extracting data providers 2019-03-13 12:59:33 +02:00
Rsl1122
a52954dbb8 Method names used as provider identifiers 2019-03-13 10:50:54 +02:00
Rsl1122
245c083237 Refactored ExtensionExtractor, Added Group parameter 2019-03-11 12:30:21 +02:00
Rsl1122
aa8fe70e1f Validation class for annotations 2019-03-06 17:56:47 +02:00
Rsl1122
98847a5b71 Retention and Target to Providers 2019-03-06 16:54:41 +02:00
Rsl1122
b396602135 Added StringProvider 2019-03-06 16:40:55 +02:00
Rsl1122
605f28f12c Added PercentageProvider 2019-03-06 16:36:40 +02:00
Rsl1122
1fb62cc1cc Added DoubleProvider 2019-03-06 16:32:34 +02:00
Rsl1122
c6f3d7b59b Added NumberProvider 2019-03-06 16:30:12 +02:00
Rsl1122
53216a4e1c Added BooleanProvider annotation 2019-03-06 16:22:10 +02:00
Rsl1122
b5bf859b78 Merge branch 'development' into extension-api 2019-03-06 15:58:19 +02:00
Rsl1122
972e54a351 Merge branch 'master' into development 2019-03-06 15:55:39 +02:00
dependabot[bot]
01eb4ead44 Bump mockito-core from 2.24.5 to 2.25.0 in /Plan
Bumps [mockito-core](https://github.com/mockito/mockito) from 2.24.5 to 2.25.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.24.5...v2.25.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-06 12:34:13 +00:00
dependabot[bot]
c6ad91241d Bump mockito-junit-jupiter from 2.24.5 to 2.25.0 in /Plan
Bumps [mockito-junit-jupiter](https://github.com/mockito/mockito) from 2.24.5 to 2.25.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.24.5...v2.25.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-06 12:20:43 +00:00
Risto Lahtela
f281f26543
[Merge] Version 4.7.1 (#950) 2019-03-06 10:25:26 +02:00
Risto Lahtela
302f36ab7f
Update versions.txt 2019-03-06 10:24:37 +02:00
Rsl1122
37a1d53251 Version bump to 4.7.1 2019-03-06 10:14:53 +02:00
Rsl1122
19f85afea3 [#948] Fixed Server JSON export 2019-03-05 16:47:55 +02:00
dependabot[bot]
ddf4414348 Bump nucleus-api from 1.8.3-S7.1 to 1.9.0-S7.1 in /PlanPluginBridge
Bumps nucleus-api from 1.8.3-S7.1 to 1.9.0-S7.1.

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-05 12:21:22 +00:00
Risto Lahtela
8cccd4d4d6
Update versions.txt 2019-03-05 14:15:23 +02:00
Rsl1122
423d9c88a0 [#943] Removed unnecessary Server UUID column from some queries 2019-03-05 13:36:29 +02:00
Rsl1122
a235bda099 [#942] Reproduced & fixed WorldMap error
Error was caused by two different unknown geolocations ("Local Machine",
"Not Known") mapping to null due to missing Geo code (eg. 'FIN')
2019-03-04 10:31:22 +02:00
Rsl1122
5f2e097ac3 Information annotations for DataExtension API 2019-03-03 21:21:04 +02:00
Rsl1122
b4a3feddf5 Plan api module 2019-03-03 21:21:04 +02:00
Risto Lahtela
0f32c030e6
Update versions.txt 2019-03-03 19:42:29 +02:00
Risto Lahtela
45b33e49e0
[Merge] 4.7.0 (#941) 2019-03-03 19:41:32 +02:00
Risto Lahtela
720bfafb02
Merge branch 'master' into development 2019-03-03 19:40:53 +02:00
Rsl1122
cc4af67412 Fixed /server page back button 2019-03-03 19:15:37 +02:00
Rsl1122
d2551a206d Fixed concurrent modification on FileWatcher 2019-03-03 19:12:48 +02:00
Rsl1122
1f341c0921 Version bump to 4.7.0 2019-03-03 19:11:50 +02:00
Rsl1122
016e1dc4bc PluginData related error message clarification 2019-03-03 18:59:27 +02:00
Rsl1122
1c4938a3db [#934, #939] Attempt to fix broken databases 2019-03-03 18:46:28 +02:00
Risto Lahtela
d9c2934104
Update versions.txt 2019-03-01 11:32:49 +02:00
Rsl1122
fd2e45b204 Test against #934 on MySQL 2019-03-01 11:14:21 +02:00
Rsl1122
c9c696e71d [#935] Made GenerateAnalysisPageRequest run analysis async 2019-03-01 10:26:56 +02:00
Rsl1122
ad2208d7ff [Vuln] Login now blocked for 90s after 5 failed attempts. 2019-03-01 10:16:13 +02:00
Rsl1122
75782562f9 Fixed authentication message showing '/' 2019-03-01 09:41:41 +02:00
Rsl1122
6806e6c98e [#937] Fixed nested transactions that query database.
Nested transactions, Transaction#executeOther(Transaction), where the
inner transaction performed a query ran into NPE since the Database
used for the query had not been defined.
2019-02-28 19:18:17 +02:00
Rsl1122
5eef819308 Fixed bad default value in bungee config 2019-02-28 19:14:52 +02:00
Rsl1122
93e7410ad2 Fix PlanConfig constructor usage in tests 2019-02-28 17:52:05 +02:00