From e8debf68bc0f469554db8b32abc661c11f3a158e Mon Sep 17 00:00:00 2001 From: Djaytan <26904516+Djaytan@users.noreply.github.com> Date: Sun, 12 Feb 2023 16:28:14 +0100 Subject: [PATCH] feat(config): use HOCON format instead of YAML The motivation to change the config format come from a limitation of Configurate about YAML format. It is not possible to serialize a YAML content with comments whereas this is a requirement for the project. More details can be found here about Configurate and YAML module: https://github.com/SpongePowered/Configurate/pull/175 --- pom.xml | 2 +- .../patch-place-break-config/pom.xml | 2 +- .../patchplacebreak/config/ConfigManager.java | 2 +- .../serialization/ConfigLoaderFactory.java | 7 ++- .../serialization/ConfigSerializer.java | 6 +-- .../config/ConfigManagerTest.java | 14 +++--- .../ConfigValidatingPropertiesTest.java | 15 +++--- ...onnectionPoolValidatingPropertiesTest.java | 31 ++++++------ .../CredentialsValidatingPropertiesTest.java | 36 +++++++------- .../DataSourceValidatingPropertiesTest.java | 33 ++++++------- .../DbmsHostValidatingPropertiesTest.java | 35 +++++++------- .../DbmsServerValidatingPropertiesTest.java | 31 ++++++------ .../serialization/ConfigSerializerTest.java | 8 ++-- ...nCreatingConfig_withIOExceptionThrown.conf | 1 + ...enCreatingConfig_withIOExceptionThrown.yml | 1 - ...tingOne_andWithDefaultOne_beingEmpty.conf} | 0 ...ngOne_andWithDefaultOne_beingNotEmpty.conf | 1 + ...ingOne_andWithDefaultOne_beingNotEmpty.yml | 1 - ...ValidatingConfig_withEmptyConfigFile.conf} | 0 ...alidatingConfig_withInvalidConfigFile.conf | 21 +++++++++ ...ValidatingConfig_withInvalidConfigFile.yml | 16 ------- ...ithMissingRequiredFieldsInConfigFile.conf} | 2 +- ...alidatingConfig_withNominalConfigFile.conf | 25 ++++++++++ ...ValidatingConfig_withNominalConfigFile.yml | 20 -------- ...> whenDeserializing_withEmptyContent.conf} | 0 ...henDeserializing_withIsValidatedField.conf | 21 +++++++++ ...whenDeserializing_withIsValidatedField.yml | 16 ------- ...whenDeserializing_withUnexpectedField.conf | 21 +++++++++ .../whenDeserializing_withUnexpectedField.yml | 16 ------- .../whenDeserializing_withValidValues.conf | 20 ++++++++ .../whenDeserializing_withValidValues.yml | 15 ------ ...> whenDeserializing_withEmptyContent.conf} | 0 ...henDeserializing_withIsValidatedField.conf | 3 ++ ...whenDeserializing_withIsValidatedField.yml | 3 -- ...ing_withMissingConnectionTimeoutField.conf | 1 + ...zing_withMissingConnectionTimeoutField.yml | 1 - ...eserializing_withMissingPoolSizeField.conf | 1 + ...Deserializing_withMissingPoolSizeField.yml | 1 - ...whenDeserializing_withUnexpectedField.conf | 3 ++ .../whenDeserializing_withUnexpectedField.yml | 3 -- .../whenDeserializing_withValidValues.conf | 2 + .../whenDeserializing_withValidValues.yml | 2 - ...> whenDeserializing_withEmptyContent.conf} | 0 ...henDeserializing_withIsValidatedField.conf | 3 ++ ...whenDeserializing_withIsValidatedField.yml | 3 -- ...eserializing_withMissingPasswordField.conf | 1 + ...Deserializing_withMissingPasswordField.yml | 1 - ...eserializing_withMissingUsernameField.conf | 1 + ...Deserializing_withMissingUsernameField.yml | 1 - ...whenDeserializing_withUnexpectedField.conf | 3 ++ .../whenDeserializing_withUnexpectedField.yml | 3 -- .../whenDeserializing_withValidValues.conf | 2 + .../whenDeserializing_withValidValues.yml | 2 - ...> whenDeserializing_withEmptyContent.conf} | 0 ...henDeserializing_withIsValidatedField.conf | 19 ++++++++ ...whenDeserializing_withIsValidatedField.yml | 15 ------ ...lizing_withMissingConnectionPoolField.conf | 14 ++++++ ...alizing_withMissingConnectionPoolField.yml | 11 ----- ...erializing_withMissingDbmsServerField.conf | 7 +++ ...serializing_withMissingDbmsServerField.yml | 6 --- ...enDeserializing_withMissingTableField.conf | 17 +++++++ ...henDeserializing_withMissingTableField.yml | 13 ----- ...henDeserializing_withMissingTypeField.conf | 17 +++++++ ...whenDeserializing_withMissingTypeField.yml | 13 ----- ...whenDeserializing_withUnexpectedField.conf | 19 ++++++++ .../whenDeserializing_withUnexpectedField.yml | 15 ------ .../whenDeserializing_withValidValues.conf | 18 +++++++ .../whenDeserializing_withValidValues.yml | 14 ------ ...> whenDeserializing_withEmptyContent.conf} | 0 ...henDeserializing_withIsValidatedField.conf | 4 ++ ...whenDeserializing_withIsValidatedField.yml | 4 -- ...eserializing_withMissingHostnameField.conf | 2 + ...Deserializing_withMissingHostnameField.yml | 2 - ...ializing_withMissingIsSslEnabledField.conf | 2 + ...rializing_withMissingIsSslEnabledField.yml | 2 - ...henDeserializing_withMissingPortField.conf | 2 + ...whenDeserializing_withMissingPortField.yml | 2 - ...whenDeserializing_withUnexpectedField.conf | 4 ++ .../whenDeserializing_withUnexpectedField.yml | 4 -- .../whenDeserializing_withValidValues.conf | 3 ++ .../whenDeserializing_withValidValues.yml | 3 -- ...> whenDeserializing_withEmptyContent.conf} | 0 ...henDeserializing_withIsValidatedField.conf | 11 +++++ ...whenDeserializing_withIsValidatedField.yml | 9 ---- ...rializing_withMissingCredentialsField.conf | 6 +++ ...erializing_withMissingCredentialsField.yml | 5 -- ...eserializing_withMissingDatabaseField.conf | 9 ++++ ...Deserializing_withMissingDatabaseField.yml | 7 --- ...henDeserializing_withMissingHostField.conf | 5 ++ ...whenDeserializing_withMissingHostField.yml | 4 -- ...whenDeserializing_withUnexpectedField.conf | 11 +++++ .../whenDeserializing_withUnexpectedField.yml | 9 ---- .../whenDeserializing_withValidValues.conf | 10 ++++ .../whenDeserializing_withValidValues.yml | 8 ---- ...whenDeserializing_withCamelCaseFields.conf | 3 ++ .../whenDeserializing_withCamelCaseFields.yml | 3 -- ...whenDeserializing_withKebabCaseFields.conf | 3 ++ .../whenDeserializing_withKebabCaseFields.yml | 3 -- ...=> whenSerializing_withNominalValues.conf} | 6 +-- .../resources/{config.yml => config.conf} | 47 +++++++++---------- 100 files changed, 455 insertions(+), 395 deletions(-) create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withIOExceptionThrown.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withIOExceptionThrown.yml rename src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/{whenCreatingConfig_withoutExistingOne_andWithDefaultOne_beingEmpty.yml => whenCreatingConfig_withoutExistingOne_andWithDefaultOne_beingEmpty.conf} (100%) create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withoutExistingOne_andWithDefaultOne_beingNotEmpty.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withoutExistingOne_andWithDefaultOne_beingNotEmpty.yml rename src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/{whenReadingAndValidatingConfig_withEmptyConfigFile.yml => whenReadingAndValidatingConfig_withEmptyConfigFile.conf} (100%) create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withInvalidConfigFile.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withInvalidConfigFile.yml rename src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/{whenReadingAndValidatingConfig_withMissingRequiredFieldsInConfigFile.yml => whenReadingAndValidatingConfig_withMissingRequiredFieldsInConfigFile.conf} (68%) create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withNominalConfigFile.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withNominalConfigFile.yml rename src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/{whenDeserializing_withEmptyContent.yml => whenDeserializing_withEmptyContent.conf} (100%) create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withValidValues.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withValidValues.yml rename src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/{whenDeserializing_withEmptyContent.yml => whenDeserializing_withEmptyContent.conf} (100%) create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withMissingConnectionTimeoutField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withMissingConnectionTimeoutField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withMissingPoolSizeField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withMissingPoolSizeField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withValidValues.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withValidValues.yml rename src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/{whenDeserializing_withEmptyContent.yml => whenDeserializing_withEmptyContent.conf} (100%) create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withMissingPasswordField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withMissingPasswordField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withMissingUsernameField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withMissingUsernameField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withValidValues.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withValidValues.yml rename src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/{whenDeserializing_withEmptyContent.yml => whenDeserializing_withEmptyContent.conf} (100%) create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingConnectionPoolField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingConnectionPoolField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingDbmsServerField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingDbmsServerField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingTableField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingTableField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingTypeField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingTypeField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withValidValues.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withValidValues.yml rename src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/{whenDeserializing_withEmptyContent.yml => whenDeserializing_withEmptyContent.conf} (100%) create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingHostnameField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingHostnameField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingIsSslEnabledField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingIsSslEnabledField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingPortField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingPortField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withValidValues.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withValidValues.yml rename src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/{whenDeserializing_withEmptyContent.yml => whenDeserializing_withEmptyContent.conf} (100%) create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingCredentialsField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingCredentialsField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingDatabaseField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingDatabaseField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingHostField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingHostField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withValidValues.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withValidValues.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenDeserializing_withCamelCaseFields.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenDeserializing_withCamelCaseFields.yml create mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenDeserializing_withKebabCaseFields.conf delete mode 100644 src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenDeserializing_withKebabCaseFields.yml rename src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/{whenSerializing_withNominalValues.yml => whenSerializing_withNominalValues.conf} (68%) rename src/patch-place-break/patch-place-break-core/src/main/resources/{config.yml => config.conf} (76%) diff --git a/pom.xml b/pom.xml index 767de3292..5fcb8ad8f 100644 --- a/pom.xml +++ b/pom.xml @@ -272,7 +272,7 @@ org.spongepowered - configurate-yaml + configurate-hocon ${configurate.version} diff --git a/src/patch-place-break/patch-place-break-config/pom.xml b/src/patch-place-break/patch-place-break-config/pom.xml index b57804bf4..981a5de07 100644 --- a/src/patch-place-break/patch-place-break-config/pom.xml +++ b/src/patch-place-break/patch-place-break-config/pom.xml @@ -79,7 +79,7 @@ org.spongepowered - configurate-yaml + configurate-hocon compile diff --git a/src/patch-place-break/patch-place-break-config/src/main/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManager.java b/src/patch-place-break/patch-place-break-config/src/main/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManager.java index 3d94a28b9..ce8d54a1e 100644 --- a/src/patch-place-break/patch-place-break-config/src/main/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManager.java +++ b/src/patch-place-break/patch-place-break-config/src/main/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManager.java @@ -56,7 +56,7 @@ @Singleton public class ConfigManager { - public static final String CONFIG_FILE_NAME = "config.yml"; + public static final String CONFIG_FILE_NAME = "config.conf"; private final ClassLoader classLoader; private final Path configFile; diff --git a/src/patch-place-break/patch-place-break-config/src/main/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigLoaderFactory.java b/src/patch-place-break/patch-place-break-config/src/main/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigLoaderFactory.java index ef98d9074..8ffca4212 100644 --- a/src/patch-place-break/patch-place-break-config/src/main/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigLoaderFactory.java +++ b/src/patch-place-break/patch-place-break-config/src/main/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigLoaderFactory.java @@ -30,12 +30,11 @@ import org.apache.commons.io.IOUtils; import org.spongepowered.configurate.CommentedConfigurationNode; +import org.spongepowered.configurate.hocon.HoconConfigurationLoader; import org.spongepowered.configurate.loader.ConfigurationLoader; import org.spongepowered.configurate.loader.HeaderMode; import org.spongepowered.configurate.objectmapping.ObjectMapper; import org.spongepowered.configurate.util.NamingSchemes; -import org.spongepowered.configurate.yaml.NodeStyle; -import org.spongepowered.configurate.yaml.YamlConfigurationLoader; import lombok.NonNull; @@ -66,8 +65,8 @@ private ConfigLoaderFactory() { String configHeader = createConfigHeader(); - return YamlConfigurationLoader.builder().path(configFile).nodeStyle(NodeStyle.BLOCK) - .headerMode(HeaderMode.PRESET) + return HoconConfigurationLoader.builder().path(configFile).prettyPrinting(true) + .emitComments(true).emitJsonCompatible(false).headerMode(HeaderMode.PRESET) .defaultOptions( opts -> opts.serializers(builder -> builder.registerAnnotatedObjects(customFactory)) .header(configHeader)) diff --git a/src/patch-place-break/patch-place-break-config/src/main/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializer.java b/src/patch-place-break/patch-place-break-config/src/main/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializer.java index 322a4b7f1..a90783395 100644 --- a/src/patch-place-break/patch-place-break-config/src/main/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializer.java +++ b/src/patch-place-break/patch-place-break-config/src/main/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializer.java @@ -52,8 +52,8 @@ public final class ConfigSerializer { * @param object The object to serialize. * @throws ConfigSerializationException If something prevent the serialization. */ - public void serialize(@NonNull Path destConfigFile, Object object) { - + public void serialize(@NonNull Path destConfigFile, @NonNull Object object) + throws ConfigSerializationException { try { ConfigurationLoader loader = ConfigLoaderFactory.createLoader(destConfigFile); @@ -62,7 +62,7 @@ public void serialize(@NonNull Path destConfigFile, Object object) { throw ConfigSerializationException.failToSerialize(); } - ConfigurationNode configurationNode = loader.createNode(node -> node.set(object)); + CommentedConfigurationNode configurationNode = loader.createNode(node -> node.set(object)); loader.save(configurationNode); } catch (IOException e) { throw ConfigSerializationException.failToSerialize(e); diff --git a/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest.java b/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest.java index 899c80ea7..0715752f3 100644 --- a/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest.java +++ b/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest.java @@ -115,7 +115,7 @@ void withExistingConfigFile_shouldDoNothing() throws IOException { @DisplayName("With IOException thrown") void withIOExceptionThrown_shouldThrowException() throws IOException { // Given - String defaultConfigFileName = "whenCreatingConfig_withIOExceptionThrown.yml"; + String defaultConfigFileName = "whenCreatingConfig_withIOExceptionThrown.conf"; Path defaultConfigFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), defaultConfigFileName); @@ -163,7 +163,7 @@ class AndWithDefaultOne { void beingNotEmpty_thenShouldNotThrow() throws IOException { // Given String defaultConfigFileName = - "whenCreatingConfig_withoutExistingOne_andWithDefaultOne_beingNotEmpty.yml"; + "whenCreatingConfig_withoutExistingOne_andWithDefaultOne_beingNotEmpty.conf"; Path defaultConfigFile = TestResourcesHelper .getClassResourceAsAbsolutePath(this.getClass(), defaultConfigFileName); @@ -182,7 +182,7 @@ void beingNotEmpty_thenShouldNotThrow() throws IOException { void beingEmpty_thenShouldThrowConfigException() throws IOException { // Given String defaultConfigFileName = - "whenCreatingConfig_withoutExistingOne_andWithDefaultOne_beingEmpty.yml"; + "whenCreatingConfig_withoutExistingOne_andWithDefaultOne_beingEmpty.conf"; Path defaultConfigFile = TestResourcesHelper .getClassResourceAsAbsolutePath(this.getClass(), defaultConfigFileName); @@ -208,7 +208,7 @@ class WhenReadingAndValidatingConfig { @DisplayName("With nominal config file") void withNominalConfigFile_shouldSuccess() throws IOException { // Given - String nominalConfigFileName = "whenReadingAndValidatingConfig_withNominalConfigFile.yml"; + String nominalConfigFileName = "whenReadingAndValidatingConfig_withNominalConfigFile.conf"; Path nominalConfigFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), nominalConfigFileName); Files.copy(nominalConfigFile, configFile); @@ -229,7 +229,7 @@ void withNominalConfigFile_shouldSuccess() throws IOException { void withMissingRequiredFieldsInConfigFile_shouldThrowException() throws IOException { // Given String invalidConfigFileName = - "whenReadingAndValidatingConfig_withMissingRequiredFieldsInConfigFile.yml"; + "whenReadingAndValidatingConfig_withMissingRequiredFieldsInConfigFile.conf"; Path invalidConfigFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), invalidConfigFileName); Files.copy(invalidConfigFile, configFile); @@ -246,7 +246,7 @@ void withMissingRequiredFieldsInConfigFile_shouldThrowException() throws IOExcep @DisplayName("With invalid config file") void withInvalidConfigFile_shouldThrowException() throws IOException { // Given - String invalidConfigFileName = "whenReadingAndValidatingConfig_withInvalidConfigFile.yml"; + String invalidConfigFileName = "whenReadingAndValidatingConfig_withInvalidConfigFile.conf"; Path invalidConfigFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), invalidConfigFileName); Files.copy(invalidConfigFile, configFile); @@ -262,7 +262,7 @@ void withInvalidConfigFile_shouldThrowException() throws IOException { @DisplayName("With empty config file") void withEmptyConfigFile_shouldThrowException() throws IOException { // Given - String emptyConfigFileName = "whenReadingAndValidatingConfig_withEmptyConfigFile.yml"; + String emptyConfigFileName = "whenReadingAndValidatingConfig_withEmptyConfigFile.conf"; Path emptyConfigFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), emptyConfigFileName); Files.copy(emptyConfigFile, configFile); diff --git a/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest.java b/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest.java index 7c7ed7c20..9969faffc 100644 --- a/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest.java +++ b/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest.java @@ -58,6 +58,7 @@ import fr.djaytan.minecraft.jobsreborn.patchplacebreak.internal.storage.api.properties.DbmsHostProperties; import fr.djaytan.minecraft.jobsreborn.patchplacebreak.internal.storage.api.properties.DbmsServerProperties; import jakarta.validation.ConstraintViolation; +import lombok.NonNull; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -230,8 +231,8 @@ class WhenDeserializingFromYaml { @ParameterizedTest(name = "{index} - {0}") @MethodSource @DisplayName("With valid content") - void withValidContent_shouldMatchExpectedValue(String yamlFileName, - ConfigValidatingProperties expectedValue) { + void withValidContent_shouldMatchExpectedValue(@NonNull String yamlFileName, + @NonNull ConfigValidatingProperties expectedValue) { // Given Path yamlFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), yamlFileName); @@ -244,9 +245,9 @@ void withValidContent_shouldMatchExpectedValue(String yamlFileName, assertThat(optionalConfigValidatingProperties).isPresent().get().isEqualTo(expectedValue); } - private Stream withValidContent_shouldMatchExpectedValue() { + private @NonNull Stream withValidContent_shouldMatchExpectedValue() { return Stream.of( - Arguments.of(Named.of("With valid values", "whenDeserializing_withValidValues.yml"), + Arguments.of(Named.of("With valid values", "whenDeserializing_withValidValues.conf"), ConfigValidatingProperties .of(DataSourceValidatingProperties.of(DataSourceType.MYSQL, "patch_place_break", DbmsServerValidatingProperties.of( @@ -254,7 +255,7 @@ private Stream withValidContent_shouldMatchExpectedValue() { CredentialsValidatingProperties.of("foo", "bar"), "patch_database"), ConnectionPoolValidatingProperties.of(60000, 10)))), Arguments.of( - Named.of("With unexpected field", "whenDeserializing_withUnexpectedField.yml"), + Named.of("With unexpected field", "whenDeserializing_withUnexpectedField.conf"), ConfigValidatingProperties .of(DataSourceValidatingProperties.of(DataSourceType.MYSQL, "patch_place_break", DbmsServerValidatingProperties.of( @@ -262,7 +263,7 @@ private Stream withValidContent_shouldMatchExpectedValue() { CredentialsValidatingProperties.of("foo", "bar"), "patch_database"), ConnectionPoolValidatingProperties.of(60000, 10)))), Arguments.of( - Named.of("With 'isValidated' field", "whenDeserializing_withIsValidatedField.yml"), + Named.of("With 'isValidated' field", "whenDeserializing_withIsValidatedField.conf"), ConfigValidatingProperties .of(DataSourceValidatingProperties.of(DataSourceType.MYSQL, "patch_place_break", DbmsServerValidatingProperties.of( @@ -275,7 +276,7 @@ private Stream withValidContent_shouldMatchExpectedValue() { @DisplayName("With empty content") void withEmptyContent_shouldGenerateNullValue() { // Given - String yamlFileName = "whenDeserializing_withEmptyContent.yml"; + String yamlFileName = "whenDeserializing_withEmptyContent.conf"; Path yamlFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), yamlFileName); diff --git a/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest.java b/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest.java index a5f4cbcab..85a31911d 100644 --- a/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest.java +++ b/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest.java @@ -56,6 +56,7 @@ import fr.djaytan.minecraft.jobsreborn.patchplacebreak.config.testutils.ValidatorTestWrapper; import fr.djaytan.minecraft.jobsreborn.patchplacebreak.internal.storage.api.properties.ConnectionPoolProperties; import jakarta.validation.ConstraintViolation; +import lombok.NonNull; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -209,7 +210,7 @@ void withValidValues_shouldNotGenerateConstraintViolations(long validConnectionT assertThat(constraintViolations).isEmpty(); } - private Stream withValidValues_shouldNotGenerateConstraintViolations() { + private @NonNull Stream withValidValues_shouldNotGenerateConstraintViolations() { return Stream.of(Arguments.of(Named.of("Highest allowed value", 600000)), Arguments.of(Named.of("Lowest allowed value", 1))); } @@ -236,7 +237,7 @@ void withInvalidValues_shouldGenerateConstraintViolations(long invalidConnection .equals("connectionTimeout")); } - private Stream withInvalidValues_shouldGenerateConstraintViolations() { + private @NonNull Stream withInvalidValues_shouldGenerateConstraintViolations() { return Stream.of(Arguments.of(Named.of("Null value", 0)), Arguments.of(Named.of("Too high value", 600001))); } @@ -263,7 +264,7 @@ void withValidValues_shouldNotGenerateConstraintViolations(int validPoolSize) { assertThat(constraintViolations).isEmpty(); } - private Stream withValidValues_shouldNotGenerateConstraintViolations() { + private @NonNull Stream withValidValues_shouldNotGenerateConstraintViolations() { return Stream.of(Arguments.of(Named.of("Highest allowed value", 100)), Arguments.of(Named.of("Lowest allowed value", 1))); } @@ -290,7 +291,7 @@ void withInvalidValues_shouldGenerateConstraintViolations(int invalidPoolSize) { .equals("poolSize")); } - private Stream withInvalidValues_shouldGenerateConstraintViolations() { + private @NonNull Stream withInvalidValues_shouldGenerateConstraintViolations() { return Stream.of(Arguments.of(Named.of("Null value", 0)), Arguments.of(Named.of("Too high value", 101))); } @@ -305,8 +306,8 @@ class WhenDeserializingFromYaml { @ParameterizedTest(name = "{index} - {0}") @MethodSource @DisplayName("With valid content") - void withValidContent_shouldMatchExpectedValue(String yamlFileName, - ConnectionPoolValidatingProperties expectedValue) { + void withValidContent_shouldMatchExpectedValue(@NonNull String yamlFileName, + @NonNull ConnectionPoolValidatingProperties expectedValue) { // Given Path yamlFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), yamlFileName); @@ -321,22 +322,22 @@ void withValidContent_shouldMatchExpectedValue(String yamlFileName, .isEqualTo(expectedValue); } - private Stream withValidContent_shouldMatchExpectedValue() { + private @NonNull Stream withValidContent_shouldMatchExpectedValue() { return Stream.of( - Arguments.of(Named.of("With valid values", "whenDeserializing_withValidValues.yml"), + Arguments.of(Named.of("With valid values", "whenDeserializing_withValidValues.conf"), ConnectionPoolValidatingProperties.of(60000, 10)), Arguments.of( - Named.of("With unexpected field", "whenDeserializing_withUnexpectedField.yml"), + Named.of("With unexpected field", "whenDeserializing_withUnexpectedField.conf"), ConnectionPoolValidatingProperties.of(60000, 10)), Arguments.of( - Named.of("With 'isValidated' field", "whenDeserializing_withIsValidatedField.yml"), + Named.of("With 'isValidated' field", "whenDeserializing_withIsValidatedField.conf"), ConnectionPoolValidatingProperties.of(60000, 10))); } @ParameterizedTest(name = "{index} - {0}") @MethodSource @DisplayName("With invalid content") - void withInvalidContent_shouldThrowException(String yamlFileName) { + void withInvalidContent_shouldThrowException(@NonNull String yamlFileName) { // Given Path yamlFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), yamlFileName); @@ -350,19 +351,19 @@ void withInvalidContent_shouldThrowException(String yamlFileName) { .hasCauseExactlyInstanceOf(SerializationException.class); } - private Stream withInvalidContent_shouldThrowException() { + private @NonNull Stream withInvalidContent_shouldThrowException() { return Stream.of( Arguments.of(Named.of("With missing 'connectionTimeout' field", - "whenDeserializing_withMissingConnectionTimeoutField.yml")), + "whenDeserializing_withMissingConnectionTimeoutField.conf")), Arguments.of(Named.of("With missing 'poolSize' field", - "whenDeserializing_withMissingPoolSizeField.yml"))); + "whenDeserializing_withMissingPoolSizeField.conf"))); } @Test @DisplayName("With empty content") void withEmptyContent_shouldGenerateNullValue() { // Given - String yamlFileName = "whenDeserializing_withEmptyContent.yml"; + String yamlFileName = "whenDeserializing_withEmptyContent.conf"; Path yamlFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), yamlFileName); diff --git a/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest.java b/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest.java index d5f0d31cf..aa6fc6d01 100644 --- a/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest.java +++ b/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest.java @@ -57,6 +57,7 @@ import fr.djaytan.minecraft.jobsreborn.patchplacebreak.config.testutils.ValidatorTestWrapper; import fr.djaytan.minecraft.jobsreborn.patchplacebreak.internal.storage.api.properties.CredentialsProperties; import jakarta.validation.ConstraintViolation; +import lombok.NonNull; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -194,7 +195,7 @@ class UsernameField { @ParameterizedTest(name = "{index} - {0}") @MethodSource @DisplayName("With valid values") - void withValidValues_shouldNotGenerateConstraintViolations(String validUsername) { + void withValidValues_shouldNotGenerateConstraintViolations(@NonNull String validUsername) { // Given CredentialsValidatingProperties credentialsValidatingProperties = CredentialsValidatingProperties.of(validUsername, "bar"); @@ -207,7 +208,7 @@ void withValidValues_shouldNotGenerateConstraintViolations(String validUsername) assertThat(constraintViolations).isEmpty(); } - private Stream withValidValues_shouldNotGenerateConstraintViolations() { + private @NonNull Stream withValidValues_shouldNotGenerateConstraintViolations() { return Stream.of(Arguments.of(Named.of("Longest allowed value", Strings.repeat("s", 32))), Arguments.of(Named.of("Shortest allowed value", "s"))); } @@ -234,7 +235,7 @@ void withInvalidValues_shouldGenerateConstraintViolations(String invalidUsername .equals("username")); } - private Stream withInvalidValues_shouldGenerateConstraintViolations() { + private @NonNull Stream withInvalidValues_shouldGenerateConstraintViolations() { return Stream.of(Arguments.of(Named.of("Null value", null)), Arguments.of(Named.of("Empty value", "")), Arguments.of(Named.of("Blank value", " ")), Arguments.of(Named.of("Too long value", Strings.repeat("s", 33)))); @@ -262,10 +263,7 @@ void withValidValues_shouldNotGenerateConstraintViolations(String validPassword) assertThat(constraintViolations).isEmpty(); } - /* - * Note: No check are done for blank values. - */ - private Stream withValidValues_shouldNotGenerateConstraintViolations() { + private @NonNull Stream withValidValues_shouldNotGenerateConstraintViolations() { return Stream.of(Arguments.of(Named.of("Longest allowed value", Strings.repeat("s", 128))), Arguments.of(Named.of("Shortest allowed value", "")), Arguments.of(Named.of("Blank value", " "))); @@ -293,7 +291,7 @@ void withInvalidValues_shouldGenerateConstraintViolations(String invalidPassword .equals("password")); } - private Stream withInvalidValues_shouldGenerateConstraintViolations() { + private @NonNull Stream withInvalidValues_shouldGenerateConstraintViolations() { return Stream.of(Arguments.of(Named.of("Null value", null)), Arguments.of(Named.of("Too long value", Strings.repeat("s", 129)))); } @@ -308,8 +306,8 @@ class WhenDeserializingFromYaml { @ParameterizedTest(name = "{index} - {0}") @MethodSource @DisplayName("With valid content") - void withValidContent_shouldMatchExpectedValue(String yamlFileName, - CredentialsValidatingProperties expectedValue) { + void withValidContent_shouldMatchExpectedValue(@NonNull String yamlFileName, + @NonNull CredentialsValidatingProperties expectedValue) { // Given Path yamlFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), yamlFileName); @@ -323,22 +321,22 @@ void withValidContent_shouldMatchExpectedValue(String yamlFileName, .isEqualTo(expectedValue); } - private Stream withValidContent_shouldMatchExpectedValue() { + private @NonNull Stream withValidContent_shouldMatchExpectedValue() { return Stream.of( - Arguments.of(Named.of("With valid values", "whenDeserializing_withValidValues.yml"), + Arguments.of(Named.of("With valid values", "whenDeserializing_withValidValues.conf"), CredentialsValidatingProperties.of("foo", "bar")), Arguments.of( - Named.of("With unexpected field", "whenDeserializing_withUnexpectedField.yml"), + Named.of("With unexpected field", "whenDeserializing_withUnexpectedField.conf"), CredentialsValidatingProperties.of("foo", "bar")), Arguments.of( - Named.of("With 'isValidated' field", "whenDeserializing_withIsValidatedField.yml"), + Named.of("With 'isValidated' field", "whenDeserializing_withIsValidatedField.conf"), CredentialsValidatingProperties.of("foo", "bar"))); } @ParameterizedTest(name = "{index} - {0}") @MethodSource @DisplayName("With invalid content") - void withInvalidContent_shouldThrowException(String yamlFileName) { + void withInvalidContent_shouldThrowException(@NonNull String yamlFileName) { // Given Path yamlFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), yamlFileName); @@ -352,19 +350,19 @@ void withInvalidContent_shouldThrowException(String yamlFileName) { .hasCauseExactlyInstanceOf(SerializationException.class); } - private Stream withInvalidContent_shouldThrowException() { + private @NonNull Stream withInvalidContent_shouldThrowException() { return Stream.of( Arguments.of(Named.of("With missing 'username' field", - "whenDeserializing_withMissingUsernameField.yml")), + "whenDeserializing_withMissingUsernameField.conf")), Arguments.of(Named.of("With missing 'password' field", - "whenDeserializing_withMissingPasswordField.yml"))); + "whenDeserializing_withMissingPasswordField.conf"))); } @Test @DisplayName("With empty content") void withEmptyContent_shouldGenerateNullValue() { // Given - String yamlFileName = "whenDeserializing_withEmptyContent.yml"; + String yamlFileName = "whenDeserializing_withEmptyContent.conf"; Path yamlFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), yamlFileName); diff --git a/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest.java b/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest.java index 6cf5235c2..c8ed7c2a2 100644 --- a/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest.java +++ b/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest.java @@ -62,6 +62,7 @@ import fr.djaytan.minecraft.jobsreborn.patchplacebreak.internal.storage.api.properties.DbmsHostProperties; import fr.djaytan.minecraft.jobsreborn.patchplacebreak.internal.storage.api.properties.DbmsServerProperties; import jakarta.validation.ConstraintViolation; +import lombok.NonNull; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -246,7 +247,7 @@ class TableField { @ParameterizedTest(name = "{index} - {0}") @MethodSource @DisplayName("With valid values") - void withValidValues_shouldNotGenerateConstraintViolations(String validTable) { + void withValidValues_shouldNotGenerateConstraintViolations(@NonNull String validTable) { // Given DataSourceValidatingProperties dataSourceValidatingProperties = DataSourceValidatingProperties.of(DataSourceType.MYSQL, validTable, @@ -263,7 +264,7 @@ void withValidValues_shouldNotGenerateConstraintViolations(String validTable) { assertThat(constraintViolations).isEmpty(); } - private Stream withValidValues_shouldNotGenerateConstraintViolations() { + private @NonNull Stream withValidValues_shouldNotGenerateConstraintViolations() { return Stream.of(Arguments.of(Named.of("Longest allowed value", Strings.repeat("s", 128))), Arguments.of(Named.of("Shortest allowed value", "s"))); } @@ -294,7 +295,7 @@ void withInvalidValues_shouldGenerateConstraintViolations(String invalidTable) { .equals("table")); } - private Stream withInvalidValues_shouldGenerateConstraintViolations() { + private @NonNull Stream withInvalidValues_shouldGenerateConstraintViolations() { return Stream.of(Arguments.of(Named.of("Null value", null)), Arguments.of(Named.of("Too long value", Strings.repeat("s", 129))), Arguments.of(Named.of("Empty and too short value", "")), @@ -311,8 +312,8 @@ class WhenDeserializingFromYaml { @ParameterizedTest(name = "{index} - {0}") @MethodSource @DisplayName("With valid content") - void withValidContent_shouldMatchExpectedValue(String yamlFileName, - DataSourceValidatingProperties expectedValue) { + void withValidContent_shouldMatchExpectedValue(@NonNull String yamlFileName, + @NonNull DataSourceValidatingProperties expectedValue) { // Given Path yamlFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), yamlFileName); @@ -325,23 +326,23 @@ void withValidContent_shouldMatchExpectedValue(String yamlFileName, assertThat(optionalDataSourceValidatingProperties).isPresent().get().isEqualTo(expectedValue); } - private Stream withValidContent_shouldMatchExpectedValue() { + private @NonNull Stream withValidContent_shouldMatchExpectedValue() { return Stream.of( - Arguments.of(Named.of("With valid values", "whenDeserializing_withValidValues.yml"), + Arguments.of(Named.of("With valid values", "whenDeserializing_withValidValues.conf"), DataSourceValidatingProperties.of(DataSourceType.MYSQL, "patch_place_break", DbmsServerValidatingProperties.of( DbmsHostValidatingProperties.of("example.com", 1234, true), CredentialsValidatingProperties.of("foo", "bar"), "patch_database"), ConnectionPoolValidatingProperties.of(60000, 10))), Arguments.of( - Named.of("With unexpected field", "whenDeserializing_withUnexpectedField.yml"), + Named.of("With unexpected field", "whenDeserializing_withUnexpectedField.conf"), DataSourceValidatingProperties.of(DataSourceType.MYSQL, "patch_place_break", DbmsServerValidatingProperties.of( DbmsHostValidatingProperties.of("example.com", 1234, true), CredentialsValidatingProperties.of("foo", "bar"), "patch_database"), ConnectionPoolValidatingProperties.of(60000, 10))), Arguments.of( - Named.of("With 'isValidated' field", "whenDeserializing_withIsValidatedField.yml"), + Named.of("With 'isValidated' field", "whenDeserializing_withIsValidatedField.conf"), DataSourceValidatingProperties.of(DataSourceType.MYSQL, "patch_place_break", DbmsServerValidatingProperties.of( DbmsHostValidatingProperties.of("example.com", 1234, true), @@ -352,7 +353,7 @@ private Stream withValidContent_shouldMatchExpectedValue() { @ParameterizedTest(name = "{index} - {0}") @MethodSource @DisplayName("With invalid content") - void withInvalidContent_shouldThrowException(String yamlFileName) { + void withInvalidContent_shouldThrowException(@NonNull String yamlFileName) { // Given Path yamlFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), yamlFileName); @@ -366,23 +367,23 @@ void withInvalidContent_shouldThrowException(String yamlFileName) { .hasCauseExactlyInstanceOf(SerializationException.class); } - private Stream withInvalidContent_shouldThrowException() { + private @NonNull Stream withInvalidContent_shouldThrowException() { return Stream.of( Arguments.of( - Named.of("With missing 'type' field", "whenDeserializing_withMissingTypeField.yml")), + Named.of("With missing 'type' field", "whenDeserializing_withMissingTypeField.conf")), Arguments.of(Named.of("With missing 'table' field", - "whenDeserializing_withMissingTableField.yml")), + "whenDeserializing_withMissingTableField.conf")), Arguments.of(Named.of("With missing 'dbmsServer' field", - "whenDeserializing_withMissingDbmsServerField.yml")), + "whenDeserializing_withMissingDbmsServerField.conf")), Arguments.of(Named.of("With missing 'connectionPool' field", - "whenDeserializing_withMissingConnectionPoolField.yml"))); + "whenDeserializing_withMissingConnectionPoolField.conf"))); } @Test @DisplayName("With empty content") void withEmptyContent_shouldGenerateNullValue() { // Given - String yamlFileName = "whenDeserializing_withEmptyContent.yml"; + String yamlFileName = "whenDeserializing_withEmptyContent.conf"; Path yamlFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), yamlFileName); diff --git a/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest.java b/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest.java index 46698747a..ae3a0ae4a 100644 --- a/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest.java +++ b/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest.java @@ -57,6 +57,7 @@ import fr.djaytan.minecraft.jobsreborn.patchplacebreak.config.testutils.ValidatorTestWrapper; import fr.djaytan.minecraft.jobsreborn.patchplacebreak.internal.storage.api.properties.DbmsHostProperties; import jakarta.validation.ConstraintViolation; +import lombok.NonNull; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -201,7 +202,7 @@ class HostnameField { @ParameterizedTest(name = "{index} - {0}") @MethodSource @DisplayName("With valid values") - void withValidValues_shouldNotGenerateConstraintViolations(String validHostname) { + void withValidValues_shouldNotGenerateConstraintViolations(@NonNull String validHostname) { // Given DbmsHostValidatingProperties dbmsHostValidatingProperties = DbmsHostValidatingProperties.of(validHostname, 1234, true); @@ -218,7 +219,7 @@ void withValidValues_shouldNotGenerateConstraintViolations(String validHostname) * We accept most invalid values here. More details given * in the DbmsHostValidatingProperties class. */ - private Stream withValidValues_shouldNotGenerateConstraintViolations() { + private @NonNull Stream withValidValues_shouldNotGenerateConstraintViolations() { return Stream.of(Arguments.of(Named.of("Nominal IPv4 address", "92.0.2.146")), Arguments .of(Named.of("Nominal IPv6 address", "2001:db8:3333:4444:5555:6666:7777:8888")), @@ -251,7 +252,7 @@ void withInvalidValues_shouldGenerateConstraintViolations(String invalidHostname .equals("hostname")); } - private Stream withInvalidValues_shouldGenerateConstraintViolations() { + private @NonNull Stream withInvalidValues_shouldGenerateConstraintViolations() { return Stream.of(Arguments.of(Named.of("Null value", null)), Arguments.of(Named.of("Empty value", "")), Arguments.of(Named.of("Blank value", " ")), Arguments.of(Named.of("Too long value", Strings.repeat("s", 256)))); @@ -279,7 +280,7 @@ void withValidValues_shouldNotGenerateConstraintViolations(int validPort) { assertThat(constraintViolations).isEmpty(); } - private Stream withValidValues_shouldNotGenerateConstraintViolations() { + private @NonNull Stream withValidValues_shouldNotGenerateConstraintViolations() { return Stream.of(Arguments.of(Named.of("Highest possible value", 65535)), Arguments.of(Named.of("Lowest possible value", 1))); } @@ -306,7 +307,7 @@ void withInvalidValues_shouldGenerateConstraintViolations(int invalidPort) { .equals("port")); } - private Stream withInvalidValues_shouldGenerateConstraintViolations() { + private @NonNull Stream withInvalidValues_shouldGenerateConstraintViolations() { return Stream.of(Arguments.of(Named.of("Port n°0", 0)), Arguments.of(Named.of("Too high port", 65536)), Arguments.of(Named.of("Too low port", -1))); @@ -322,8 +323,8 @@ class WhenDeserializingFromYaml { @ParameterizedTest(name = "{index} - {0}") @MethodSource @DisplayName("With valid content") - void withValidContent_shouldMatchExpectedValue(String yamlFileName, - DbmsHostValidatingProperties expectedValue) { + void withValidContent_shouldMatchExpectedValue(@NonNull String yamlFileName, + @NonNull DbmsHostValidatingProperties expectedValue) { // Given Path yamlFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), yamlFileName); @@ -336,22 +337,22 @@ void withValidContent_shouldMatchExpectedValue(String yamlFileName, assertThat(optionalHostValidatingProperties).isPresent().get().isEqualTo(expectedValue); } - private Stream withValidContent_shouldMatchExpectedValue() { + private @NonNull Stream withValidContent_shouldMatchExpectedValue() { return Stream.of( - Arguments.of(Named.of("With valid values", "whenDeserializing_withValidValues.yml"), + Arguments.of(Named.of("With valid values", "whenDeserializing_withValidValues.conf"), DbmsHostValidatingProperties.of("example.com", 1234, true)), Arguments.of( - Named.of("With unexpected field", "whenDeserializing_withUnexpectedField.yml"), + Named.of("With unexpected field", "whenDeserializing_withUnexpectedField.conf"), DbmsHostValidatingProperties.of("example.com", 1234, true)), Arguments.of( - Named.of("With 'isValidated' field", "whenDeserializing_withIsValidatedField.yml"), + Named.of("With 'isValidated' field", "whenDeserializing_withIsValidatedField.conf"), DbmsHostValidatingProperties.of("example.com", 1234, true))); } @ParameterizedTest(name = "{index} - {0}") @MethodSource @DisplayName("With invalid content") - void withInvalidContent_shouldThrowException(String yamlFileName) { + void withInvalidContent_shouldThrowException(@NonNull String yamlFileName) { // Given Path yamlFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), yamlFileName); @@ -365,21 +366,21 @@ void withInvalidContent_shouldThrowException(String yamlFileName) { .hasCauseExactlyInstanceOf(SerializationException.class); } - private Stream withInvalidContent_shouldThrowException() { + private @NonNull Stream withInvalidContent_shouldThrowException() { return Stream.of( Arguments.of(Named.of("With missing 'hostname' field", - "whenDeserializing_withMissingHostnameField.yml")), + "whenDeserializing_withMissingHostnameField.conf")), Arguments.of( - Named.of("With missing 'port' field", "whenDeserializing_withMissingPortField.yml")), + Named.of("With missing 'port' field", "whenDeserializing_withMissingPortField.conf")), Arguments.of(Named.of("With missing 'isSslEnabled' field", - "whenDeserializing_withMissingIsSslEnabledField.yml"))); + "whenDeserializing_withMissingIsSslEnabledField.conf"))); } @Test @DisplayName("With empty content") void withEmptyContent_shouldGenerateNullValue() { // Given - String yamlFileName = "whenDeserializing_withEmptyContent.yml"; + String yamlFileName = "whenDeserializing_withEmptyContent.conf"; Path yamlFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), yamlFileName); diff --git a/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest.java b/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest.java index fc3693718..17e56cf91 100644 --- a/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest.java +++ b/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest.java @@ -59,6 +59,7 @@ import fr.djaytan.minecraft.jobsreborn.patchplacebreak.internal.storage.api.properties.DbmsHostProperties; import fr.djaytan.minecraft.jobsreborn.patchplacebreak.internal.storage.api.properties.DbmsServerProperties; import jakarta.validation.ConstraintViolation; +import lombok.NonNull; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -224,7 +225,7 @@ class DatabaseField { @ParameterizedTest(name = "{index} - {0}") @MethodSource @DisplayName("With valid values") - void withValidValues_shouldNotGenerateConstraintViolations(String validDatabase) { + void withValidValues_shouldNotGenerateConstraintViolations(@NonNull String validDatabase) { // Given DbmsServerValidatingProperties dbmsServerValidatingProperties = DbmsServerValidatingProperties.of( @@ -239,7 +240,7 @@ void withValidValues_shouldNotGenerateConstraintViolations(String validDatabase) assertThat(constraintViolations).isEmpty(); } - private Stream withValidValues_shouldNotGenerateConstraintViolations() { + private @NonNull Stream withValidValues_shouldNotGenerateConstraintViolations() { return Stream.of(Arguments.of(Named.of("Longest allowed value", Strings.repeat("s", 128))), Arguments.of(Named.of("Shortest allowed value", "s"))); } @@ -268,7 +269,7 @@ void withInvalidValues_shouldGenerateConstraintViolations(String invalidDatabase .equals("database")); } - private Stream withInvalidValues_shouldGenerateConstraintViolations() { + private @NonNull Stream withInvalidValues_shouldGenerateConstraintViolations() { return Stream.of(Arguments.of(Named.of("Null value", null)), Arguments.of(Named.of("Too long value", Strings.repeat("s", 129))), Arguments.of(Named.of("Empty and too short value", "")), @@ -285,8 +286,8 @@ class WhenDeserializingFromYaml { @ParameterizedTest(name = "{index} - {0}") @MethodSource @DisplayName("With valid content") - void withValidContent_shouldMatchExpectedValue(String yamlFileName, - DbmsServerValidatingProperties expectedValue) { + void withValidContent_shouldMatchExpectedValue(@NonNull String yamlFileName, + @NonNull DbmsServerValidatingProperties expectedValue) { // Given Path yamlFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), yamlFileName); @@ -299,19 +300,19 @@ void withValidContent_shouldMatchExpectedValue(String yamlFileName, assertThat(optionalDbmsServerValidatingProperties).isPresent().get().isEqualTo(expectedValue); } - private Stream withValidContent_shouldMatchExpectedValue() { + private @NonNull Stream withValidContent_shouldMatchExpectedValue() { return Stream.of( - Arguments.of(Named.of("With valid values", "whenDeserializing_withValidValues.yml"), + Arguments.of(Named.of("With valid values", "whenDeserializing_withValidValues.conf"), DbmsServerValidatingProperties.of( DbmsHostValidatingProperties.of("example.com", 1234, true), CredentialsValidatingProperties.of("foo", "bar"), "patch_database")), Arguments.of( - Named.of("With unexpected field", "whenDeserializing_withUnexpectedField.yml"), + Named.of("With unexpected field", "whenDeserializing_withUnexpectedField.conf"), DbmsServerValidatingProperties.of( DbmsHostValidatingProperties.of("example.com", 1234, true), CredentialsValidatingProperties.of("foo", "bar"), "patch_database")), Arguments.of( - Named.of("With 'isValidated' field", "whenDeserializing_withIsValidatedField.yml"), + Named.of("With 'isValidated' field", "whenDeserializing_withIsValidatedField.conf"), DbmsServerValidatingProperties.of( DbmsHostValidatingProperties.of("example.com", 1234, true), CredentialsValidatingProperties.of("foo", "bar"), "patch_database"))); @@ -320,7 +321,7 @@ private Stream withValidContent_shouldMatchExpectedValue() { @ParameterizedTest(name = "{index} - {0}") @MethodSource @DisplayName("With invalid content") - void withInvalidContent_shouldThrowException(String yamlFileName) { + void withInvalidContent_shouldThrowException(@NonNull String yamlFileName) { // Given Path yamlFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), yamlFileName); @@ -334,21 +335,21 @@ void withInvalidContent_shouldThrowException(String yamlFileName) { .hasCauseExactlyInstanceOf(SerializationException.class); } - private Stream withInvalidContent_shouldThrowException() { + private @NonNull Stream withInvalidContent_shouldThrowException() { return Stream.of( Arguments.of( - Named.of("With missing 'host' field", "whenDeserializing_withMissingHostField.yml")), + Named.of("With missing 'host' field", "whenDeserializing_withMissingHostField.conf")), Arguments.of(Named.of("With missing 'credentials' field", - "whenDeserializing_withMissingCredentialsField.yml")), + "whenDeserializing_withMissingCredentialsField.conf")), Arguments.of(Named.of("With missing 'database' field", - "whenDeserializing_withMissingDatabaseField.yml"))); + "whenDeserializing_withMissingDatabaseField.conf"))); } @Test @DisplayName("With empty content") void withEmptyContent_shouldGenerateNullValue() { // Given - String yamlFileName = "whenDeserializing_withEmptyContent.yml"; + String yamlFileName = "whenDeserializing_withEmptyContent.conf"; Path yamlFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), yamlFileName); diff --git a/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest.java b/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest.java index 63962ece9..3b1e09eaf 100644 --- a/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest.java +++ b/src/patch-place-break/patch-place-break-config/src/test/java/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest.java @@ -73,7 +73,7 @@ class WhenSerializing { @SneakyThrows void withNominalValues_shouldCreateAndFillYamlFile() { // Given - Path targetFileLocation = imfs.getPath("test.yml"); + Path targetFileLocation = imfs.getPath("test.conf"); DbmsHostValidatingProperties dbmsHostValidatingProperties = DbmsHostValidatingProperties.of("example.com", 1234, true); @@ -81,7 +81,7 @@ void withNominalValues_shouldCreateAndFillYamlFile() { configSerializer.serialize(targetFileLocation, dbmsHostValidatingProperties); // Then - String expectedYamlFile = "whenSerializing_withNominalValues.yml"; + String expectedYamlFile = "whenSerializing_withNominalValues.conf"; String expectedYaml = TestResourcesHelper.getClassResourceAsString(this.getClass(), expectedYamlFile, false); String actualYaml = new String(Files.readAllBytes(targetFileLocation)); @@ -97,7 +97,7 @@ class WhenDeserializing { @DisplayName("With camelCase fields") void withCamelCaseFields_shouldSuccess() { // Given - String yamlFileName = "whenDeserializing_withCamelCaseFields.yml"; + String yamlFileName = "whenDeserializing_withCamelCaseFields.conf"; Path yamlFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), yamlFileName); @@ -114,7 +114,7 @@ void withCamelCaseFields_shouldSuccess() { @DisplayName("With kebab-case fields") void withKebabCaseFields_shouldThrowException() { // Given - String yamlFileName = "whenDeserializing_withKebabCaseFields.yml"; + String yamlFileName = "whenDeserializing_withKebabCaseFields.conf"; Path yamlFile = TestResourcesHelper.getClassResourceAsAbsolutePath(this.getClass(), yamlFileName); diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withIOExceptionThrown.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withIOExceptionThrown.conf new file mode 100644 index 000000000..35b22aef2 --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withIOExceptionThrown.conf @@ -0,0 +1 @@ +test = "test" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withIOExceptionThrown.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withIOExceptionThrown.yml deleted file mode 100644 index e5239010e..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withIOExceptionThrown.yml +++ /dev/null @@ -1 +0,0 @@ -test: test diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withoutExistingOne_andWithDefaultOne_beingEmpty.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withoutExistingOne_andWithDefaultOne_beingEmpty.conf similarity index 100% rename from src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withoutExistingOne_andWithDefaultOne_beingEmpty.yml rename to src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withoutExistingOne_andWithDefaultOne_beingEmpty.conf diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withoutExistingOne_andWithDefaultOne_beingNotEmpty.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withoutExistingOne_andWithDefaultOne_beingNotEmpty.conf new file mode 100644 index 000000000..35b22aef2 --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withoutExistingOne_andWithDefaultOne_beingNotEmpty.conf @@ -0,0 +1 @@ +test = "test" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withoutExistingOne_andWithDefaultOne_beingNotEmpty.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withoutExistingOne_andWithDefaultOne_beingNotEmpty.yml deleted file mode 100644 index e5239010e..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenCreatingConfig_withoutExistingOne_andWithDefaultOne_beingNotEmpty.yml +++ /dev/null @@ -1 +0,0 @@ -test: test diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withEmptyConfigFile.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withEmptyConfigFile.conf similarity index 100% rename from src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withEmptyConfigFile.yml rename to src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withEmptyConfigFile.conf diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withInvalidConfigFile.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withInvalidConfigFile.conf new file mode 100644 index 000000000..9c2c63422 --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withInvalidConfigFile.conf @@ -0,0 +1,21 @@ +dataSource = { + type = "SQLITE" + table = "patch_place_break_tag" + dbmsServer = { + host = { + hostname = "localhost" + # CONSTRAINT VIOLATION HERE + port = -1 + isSslEnabled = true + } + credentials = { + username = "username" + password = "password" + } + database = "database" + } + connectionPool = { + connectionTimeout = 30000 + poolSize = 10 + } +} diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withInvalidConfigFile.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withInvalidConfigFile.yml deleted file mode 100644 index 6da3f715c..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withInvalidConfigFile.yml +++ /dev/null @@ -1,16 +0,0 @@ -dataSource: - type: 'SQLITE' - table: 'patch_place_break_tag' - dbmsServer: - host: - hostname: 'localhost' - # CONSTRAINT VIOLATION HERE - port: -1 - isSslEnabled: true - credentials: - username: 'username' - password: 'password' - database: 'database' - connectionPool: - connectionTimeout: 30000 - poolSize: 10 diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withMissingRequiredFieldsInConfigFile.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withMissingRequiredFieldsInConfigFile.conf similarity index 68% rename from src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withMissingRequiredFieldsInConfigFile.yml rename to src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withMissingRequiredFieldsInConfigFile.conf index b5d6a586b..9d4682a34 100644 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withMissingRequiredFieldsInConfigFile.yml +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withMissingRequiredFieldsInConfigFile.conf @@ -1,3 +1,3 @@ # This is a test config file -dataSource: +dataSource {} diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withNominalConfigFile.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withNominalConfigFile.conf new file mode 100644 index 000000000..b5a61f024 --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withNominalConfigFile.conf @@ -0,0 +1,25 @@ +# This is a test config file + +dataSource = { + # One comment + type = "SQLITE" + table = "patch_place_break_tag" + # Another comment + dbmsServer = { + host = { + hostname = "localhost" + port = 3306 + isSslEnabled = true + } + credentials = { + username = "username" + password = "password" + } + database = "database" + } + connectionPool = { + # Yet another comment + connectionTimeout = 30000 + poolSize = 10 + } +} diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withNominalConfigFile.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withNominalConfigFile.yml deleted file mode 100644 index cad1c43c5..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/ConfigManagerTest/whenReadingAndValidatingConfig_withNominalConfigFile.yml +++ /dev/null @@ -1,20 +0,0 @@ -# This is a test config file - -dataSource: - # One comment - type: 'SQLITE' - table: 'patch_place_break_tag' - # Another comment - dbmsServer: - host: - hostname: 'localhost' - port: 3306 - isSslEnabled: true - credentials: - username: 'username' - password: 'password' - database: 'database' - connectionPool: - # Yet another comment - connectionTimeout: 30000 - poolSize: 10 diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withEmptyContent.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withEmptyContent.conf similarity index 100% rename from src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withEmptyContent.yml rename to src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withEmptyContent.conf diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf new file mode 100644 index 000000000..6c55b8ec7 --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf @@ -0,0 +1,21 @@ +dataSource = { + type = "MYSQL" + table = "patch_place_break" + dbmsServer = { + host = { + hostname = "example.com" + port = 1234 + isSslEnabled = true + } + credentials = { + username = "foo" + password = "bar" + } + database = "patch_database" + } + connectionPool = { + connectionTimeout = 60000 + poolSize = 10 + } +} +isValidated = true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml deleted file mode 100644 index 610bfef7c..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml +++ /dev/null @@ -1,16 +0,0 @@ -dataSource: - type: "MYSQL" - table: "patch_place_break" - dbmsServer: - host: - hostname: "example.com" - port: 1234 - isSslEnabled: true - credentials: - username: "foo" - password: "bar" - database: "patch_database" - connectionPool: - connectionTimeout: 60000 - poolSize: 10 -isValidated: true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf new file mode 100644 index 000000000..3911242a3 --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf @@ -0,0 +1,21 @@ +dataSource = { + type = "MYSQL" + table = "patch_place_break" + dbmsServer = { + host = { + hostname = "example.com" + port = 1234 + isSslEnabled = true + } + credentials = { + username = "foo" + password = "bar" + } + database = "patch_database" + } + connectionPool = { + connectionTimeout = 60000 + poolSize = 10 + } +} +unexpectedField = "test" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml deleted file mode 100644 index c6b495d9e..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml +++ /dev/null @@ -1,16 +0,0 @@ -dataSource: - type: "MYSQL" - table: "patch_place_break" - dbmsServer: - host: - hostname: "example.com" - port: 1234 - isSslEnabled: true - credentials: - username: "foo" - password: "bar" - database: "patch_database" - connectionPool: - connectionTimeout: 60000 - poolSize: 10 -unexpectedField: test diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withValidValues.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withValidValues.conf new file mode 100644 index 000000000..f35db538a --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withValidValues.conf @@ -0,0 +1,20 @@ +dataSource = { + type = "MYSQL" + table = "patch_place_break" + dbmsServer = { + host = { + hostname = "example.com" + port = 1234 + isSslEnabled = true + } + credentials = { + username = "foo" + password = "bar" + } + database = "patch_database" + } + connectionPool = { + connectionTimeout = 60000 + poolSize = 10 + } +} diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withValidValues.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withValidValues.yml deleted file mode 100644 index 21d2b0d9c..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConfigValidatingPropertiesTest/whenDeserializing_withValidValues.yml +++ /dev/null @@ -1,15 +0,0 @@ -dataSource: - type: "MYSQL" - table: "patch_place_break" - dbmsServer: - host: - hostname: "example.com" - port: 1234 - isSslEnabled: true - credentials: - username: "foo" - password: "bar" - database: "patch_database" - connectionPool: - connectionTimeout: 60000 - poolSize: 10 diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withEmptyContent.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withEmptyContent.conf similarity index 100% rename from src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withEmptyContent.yml rename to src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withEmptyContent.conf diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf new file mode 100644 index 000000000..605ef2f5b --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf @@ -0,0 +1,3 @@ +connectionTimeout = 60000 +poolSize = 10 +isValidated = true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml deleted file mode 100644 index 7e98cd349..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml +++ /dev/null @@ -1,3 +0,0 @@ -connectionTimeout: 60000 -poolSize: 10 -isValidated: true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withMissingConnectionTimeoutField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withMissingConnectionTimeoutField.conf new file mode 100644 index 000000000..f27b5270d --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withMissingConnectionTimeoutField.conf @@ -0,0 +1 @@ +poolSize = 10 diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withMissingConnectionTimeoutField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withMissingConnectionTimeoutField.yml deleted file mode 100644 index a70789b44..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withMissingConnectionTimeoutField.yml +++ /dev/null @@ -1 +0,0 @@ -poolSize: 10 diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withMissingPoolSizeField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withMissingPoolSizeField.conf new file mode 100644 index 000000000..5a4c85e98 --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withMissingPoolSizeField.conf @@ -0,0 +1 @@ +connectionTimeout = 60000 diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withMissingPoolSizeField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withMissingPoolSizeField.yml deleted file mode 100644 index d5613caa6..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withMissingPoolSizeField.yml +++ /dev/null @@ -1 +0,0 @@ -connectionTimeout: 60000 diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf new file mode 100644 index 000000000..4c97adffa --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf @@ -0,0 +1,3 @@ +connectionTimeout = 60000 +poolSize = 10 +unexpectedField = "test" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml deleted file mode 100644 index 3c99baa51..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml +++ /dev/null @@ -1,3 +0,0 @@ -connectionTimeout: 60000 -poolSize: 10 -unexpectedField: test diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withValidValues.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withValidValues.conf new file mode 100644 index 000000000..69b7960ae --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withValidValues.conf @@ -0,0 +1,2 @@ +connectionTimeout = 60000 +poolSize = 10 diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withValidValues.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withValidValues.yml deleted file mode 100644 index a51909431..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/ConnectionPoolValidatingPropertiesTest/whenDeserializing_withValidValues.yml +++ /dev/null @@ -1,2 +0,0 @@ -connectionTimeout: 60000 -poolSize: 10 diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withEmptyContent.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withEmptyContent.conf similarity index 100% rename from src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withEmptyContent.yml rename to src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withEmptyContent.conf diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf new file mode 100644 index 000000000..b9222213a --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf @@ -0,0 +1,3 @@ +username = "foo" +password = "bar" +isValidated = true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml deleted file mode 100644 index 25b2fb39d..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml +++ /dev/null @@ -1,3 +0,0 @@ -username: "foo" -password: "bar" -isValidated: true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withMissingPasswordField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withMissingPasswordField.conf new file mode 100644 index 000000000..dcc7d81a9 --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withMissingPasswordField.conf @@ -0,0 +1 @@ +username = "foo" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withMissingPasswordField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withMissingPasswordField.yml deleted file mode 100644 index bea2e28d3..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withMissingPasswordField.yml +++ /dev/null @@ -1 +0,0 @@ -username: "foo" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withMissingUsernameField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withMissingUsernameField.conf new file mode 100644 index 000000000..7c17354ea --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withMissingUsernameField.conf @@ -0,0 +1 @@ +password = "bar" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withMissingUsernameField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withMissingUsernameField.yml deleted file mode 100644 index 7491b91b7..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withMissingUsernameField.yml +++ /dev/null @@ -1 +0,0 @@ -password: "bar" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf new file mode 100644 index 000000000..9333088ba --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf @@ -0,0 +1,3 @@ +username = "foo" +password = "bar" +unexpectedField = "test" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml deleted file mode 100644 index 87e719a6a..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml +++ /dev/null @@ -1,3 +0,0 @@ -username: "foo" -password: "bar" -unexpectedField: test diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withValidValues.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withValidValues.conf new file mode 100644 index 000000000..3c962ef50 --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withValidValues.conf @@ -0,0 +1,2 @@ +username = "foo" +password = "bar" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withValidValues.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withValidValues.yml deleted file mode 100644 index bb09fc011..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/CredentialsValidatingPropertiesTest/whenDeserializing_withValidValues.yml +++ /dev/null @@ -1,2 +0,0 @@ -username: "foo" -password: "bar" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withEmptyContent.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withEmptyContent.conf similarity index 100% rename from src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withEmptyContent.yml rename to src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withEmptyContent.conf diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf new file mode 100644 index 000000000..1cd7f77e3 --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf @@ -0,0 +1,19 @@ +type = "MYSQL" +table = "patch_place_break" +dbmsServer = { + host = { + hostname = "example.com" + port = 1234 + isSslEnabled = true + } + credentials = { + username = "foo" + password = "bar" + } + database = "patch_database" +} +connectionPool = { + connectionTimeout = 60000 + poolSize = 10 +} +isValidated = true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml deleted file mode 100644 index f34e91ef8..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml +++ /dev/null @@ -1,15 +0,0 @@ -type: "MYSQL" -table: "patch_place_break" -dbmsServer: - host: - hostname: "example.com" - port: 1234 - isSslEnabled: true - credentials: - username: "foo" - password: "bar" - database: "patch_database" -connectionPool: - connectionTimeout: 60000 - poolSize: 10 -isValidated: true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingConnectionPoolField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingConnectionPoolField.conf new file mode 100644 index 000000000..f31b2a24e --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingConnectionPoolField.conf @@ -0,0 +1,14 @@ +type = "MYSQL" +table = "patch_place_break" +dbmsServer = { + host = { + hostname = "example.com" + port = 1234 + isSslEnabled = true + } + credentials = { + username = "foo" + password = "bar" + } + database = "patch_database" +} diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingConnectionPoolField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingConnectionPoolField.yml deleted file mode 100644 index d6d5aaab9..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingConnectionPoolField.yml +++ /dev/null @@ -1,11 +0,0 @@ -type: "MYSQL" -table: "patch_place_break" -dbmsServer: - host: - hostname: "example.com" - port: 1234 - isSslEnabled: true - credentials: - username: "foo" - password: "bar" - database: "patch_database" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingDbmsServerField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingDbmsServerField.conf new file mode 100644 index 000000000..c7e9c837e --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingDbmsServerField.conf @@ -0,0 +1,7 @@ +type = "MYSQL" +table = "patch_place_break" +connectionPool = { + connectionTimeout = 60000 + poolSize = 10 +} + diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingDbmsServerField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingDbmsServerField.yml deleted file mode 100644 index 7cf737ef1..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingDbmsServerField.yml +++ /dev/null @@ -1,6 +0,0 @@ -type: "MYSQL" -table: "patch_place_break" -connectionPool: - connectionTimeout: 60000 - poolSize: 10 - diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingTableField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingTableField.conf new file mode 100644 index 000000000..1ef15e4ab --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingTableField.conf @@ -0,0 +1,17 @@ +type = "MYSQL" +dbmsServer = { + host = { + hostname = "example.com" + port = 1234 + isSslEnabled = true + } + credentials = { + username = "foo" + password = "bar" + } + database = "patch_database" +} +connectionPool = { + connectionTimeout = 60000 + poolSize = 10 +} diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingTableField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingTableField.yml deleted file mode 100644 index 0b58e6fa8..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingTableField.yml +++ /dev/null @@ -1,13 +0,0 @@ -type: "MYSQL" -dbmsServer: - host: - hostname: "example.com" - port: 1234 - isSslEnabled: true - credentials: - username: "foo" - password: "bar" - database: "patch_database" -connectionPool: - connectionTimeout: 60000 - poolSize: 10 diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingTypeField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingTypeField.conf new file mode 100644 index 000000000..ffafadff5 --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingTypeField.conf @@ -0,0 +1,17 @@ +table = "patch_place_break" +dbmsServer = { + host = { + hostname = "example.com" + port = 1234 + isSslEnabled = true + } + credentials = { + username = "foo" + password = "bar" + } + database = "patch_database" +} +connectionPool = { + connectionTimeout = 60000 + poolSize = 10 +} diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingTypeField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingTypeField.yml deleted file mode 100644 index 950d69c65..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withMissingTypeField.yml +++ /dev/null @@ -1,13 +0,0 @@ -table: "patch_place_break" -dbmsServer: - host: - hostname: "example.com" - port: 1234 - isSslEnabled: true - credentials: - username: "foo" - password: "bar" - database: "patch_database" -connectionPool: - connectionTimeout: 60000 - poolSize: 10 diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf new file mode 100644 index 000000000..67642bdb0 --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf @@ -0,0 +1,19 @@ +type = "MYSQL" +table = "patch_place_break" +dbmsServer = { + host = { + hostname = "example.com" + port = 1234 + isSslEnabled = true + } + credentials = { + username = "foo" + password = "bar" + } + database = "patch_database" +} +connectionPool = { + connectionTimeout = 60000 + poolSize = 10 +} +unexpectedField = "test" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml deleted file mode 100644 index c7813868c..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml +++ /dev/null @@ -1,15 +0,0 @@ -type: "MYSQL" -table: "patch_place_break" -dbmsServer: - host: - hostname: "example.com" - port: 1234 - isSslEnabled: true - credentials: - username: "foo" - password: "bar" - database: "patch_database" -connectionPool: - connectionTimeout: 60000 - poolSize: 10 -unexpectedField: test diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withValidValues.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withValidValues.conf new file mode 100644 index 000000000..73b326b9c --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withValidValues.conf @@ -0,0 +1,18 @@ +type = "MYSQL" +table = "patch_place_break" +dbmsServer = { + host = { + hostname = "example.com" + port = 1234 + isSslEnabled = true + } + credentials = { + username = "foo" + password = "bar" + } + database = "patch_database" +} +connectionPool = { + connectionTimeout = 60000 + poolSize = 10 +} diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withValidValues.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withValidValues.yml deleted file mode 100644 index 32c8e61a8..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DataSourceValidatingPropertiesTest/whenDeserializing_withValidValues.yml +++ /dev/null @@ -1,14 +0,0 @@ -type: "MYSQL" -table: "patch_place_break" -dbmsServer: - host: - hostname: "example.com" - port: 1234 - isSslEnabled: true - credentials: - username: "foo" - password: "bar" - database: "patch_database" -connectionPool: - connectionTimeout: 60000 - poolSize: 10 diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withEmptyContent.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withEmptyContent.conf similarity index 100% rename from src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withEmptyContent.yml rename to src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withEmptyContent.conf diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf new file mode 100644 index 000000000..89a895b93 --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf @@ -0,0 +1,4 @@ +hostname = "example.com" +port = 1234 +isSslEnabled = true +isValidated = true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml deleted file mode 100644 index d7f1e537e..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml +++ /dev/null @@ -1,4 +0,0 @@ -hostname: "example.com" -port: 1234 -isSslEnabled: true -isValidated: true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingHostnameField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingHostnameField.conf new file mode 100644 index 000000000..cdf03febd --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingHostnameField.conf @@ -0,0 +1,2 @@ +port = 1234 +isSslEnabled = true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingHostnameField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingHostnameField.yml deleted file mode 100644 index c874b0f35..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingHostnameField.yml +++ /dev/null @@ -1,2 +0,0 @@ -port: 1234 -isSslEnabled: true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingIsSslEnabledField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingIsSslEnabledField.conf new file mode 100644 index 000000000..69b12d3f7 --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingIsSslEnabledField.conf @@ -0,0 +1,2 @@ +hostname = "example.com" +port = 1234 diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingIsSslEnabledField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingIsSslEnabledField.yml deleted file mode 100644 index 31eb124a9..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingIsSslEnabledField.yml +++ /dev/null @@ -1,2 +0,0 @@ -hostname: "example.com" -port: 1234 diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingPortField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingPortField.conf new file mode 100644 index 000000000..82d475947 --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingPortField.conf @@ -0,0 +1,2 @@ +hostname = "example.com" +isSslEnabled = true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingPortField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingPortField.yml deleted file mode 100644 index 2964d253b..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withMissingPortField.yml +++ /dev/null @@ -1,2 +0,0 @@ -hostname: "example.com" -isSslEnabled: true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf new file mode 100644 index 000000000..07dcf8f6b --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf @@ -0,0 +1,4 @@ +hostname = "example.com" +port = 1234 +isSslEnabled = true +unexpectedField = "test" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml deleted file mode 100644 index 4610f8602..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml +++ /dev/null @@ -1,4 +0,0 @@ -hostname: "example.com" -port: 1234 -isSslEnabled: true -unexpectedField: test diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withValidValues.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withValidValues.conf new file mode 100644 index 000000000..e036d001d --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withValidValues.conf @@ -0,0 +1,3 @@ +hostname = "example.com" +port = 1234 +isSslEnabled = true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withValidValues.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withValidValues.yml deleted file mode 100644 index 7befaba35..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsHostValidatingPropertiesTest/whenDeserializing_withValidValues.yml +++ /dev/null @@ -1,3 +0,0 @@ -hostname: "example.com" -port: 1234 -isSslEnabled: true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withEmptyContent.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withEmptyContent.conf similarity index 100% rename from src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withEmptyContent.yml rename to src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withEmptyContent.conf diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf new file mode 100644 index 000000000..d92336f64 --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withIsValidatedField.conf @@ -0,0 +1,11 @@ +host = { + hostname = "example.com" + port = 1234 + isSslEnabled = true +} +credentials = { + username = "foo" + password = "bar" +} +database = "patch_database" +isValidated = true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml deleted file mode 100644 index 116ae6989..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withIsValidatedField.yml +++ /dev/null @@ -1,9 +0,0 @@ -host: - hostname: "example.com" - port: 1234 - isSslEnabled: true -credentials: - username: "foo" - password: "bar" -database: "patch_database" -isValidated: true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingCredentialsField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingCredentialsField.conf new file mode 100644 index 000000000..7e178484a --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingCredentialsField.conf @@ -0,0 +1,6 @@ +host = { + hostname = "example.com" + port = 1234 + isSslEnabled = true +} +database = "patch_database" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingCredentialsField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingCredentialsField.yml deleted file mode 100644 index cf17b8678..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingCredentialsField.yml +++ /dev/null @@ -1,5 +0,0 @@ -host: - hostname: "example.com" - port: 1234 - isSslEnabled: true -database: "patch_database" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingDatabaseField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingDatabaseField.conf new file mode 100644 index 000000000..da7967934 --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingDatabaseField.conf @@ -0,0 +1,9 @@ +host = { + hostname = "example.com" + port = 1234 + isSslEnabled = true +} +credentials = { + username = "foo" + password = "bar" +} diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingDatabaseField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingDatabaseField.yml deleted file mode 100644 index d49a7ff52..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingDatabaseField.yml +++ /dev/null @@ -1,7 +0,0 @@ -host: - hostname: "example.com" - port: 1234 - isSslEnabled: true -credentials: - username: "foo" - password: "bar" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingHostField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingHostField.conf new file mode 100644 index 000000000..20ee429cf --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingHostField.conf @@ -0,0 +1,5 @@ +credentials = { + username = "foo" + password = "bar" +} +database = "patch_database" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingHostField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingHostField.yml deleted file mode 100644 index 7bd88b17e..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withMissingHostField.yml +++ /dev/null @@ -1,4 +0,0 @@ -credentials: - username: "foo" - password: "bar" -database: "patch_database" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf new file mode 100644 index 000000000..bb166860b --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withUnexpectedField.conf @@ -0,0 +1,11 @@ +host = { + hostname = "example.com" + port = 1234 + isSslEnabled = true +} +credentials = { + username = "foo" + password = "bar" +} +database = "patch_database" +unexpectedField = "test" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml deleted file mode 100644 index c85fbddc0..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withUnexpectedField.yml +++ /dev/null @@ -1,9 +0,0 @@ -host: - hostname: "example.com" - port: 1234 - isSslEnabled: true -credentials: - username: "foo" - password: "bar" -database: "patch_database" -unexpectedField: test diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withValidValues.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withValidValues.conf new file mode 100644 index 000000000..eb852365a --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withValidValues.conf @@ -0,0 +1,10 @@ +host = { + hostname = "example.com" + port = 1234 + isSslEnabled = true +} +credentials = { + username = "foo" + password = "bar" +} +database = "patch_database" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withValidValues.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withValidValues.yml deleted file mode 100644 index 669a5bf53..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/annotated/DbmsServerValidatingPropertiesTest/whenDeserializing_withValidValues.yml +++ /dev/null @@ -1,8 +0,0 @@ -host: - hostname: "example.com" - port: 1234 - isSslEnabled: true -credentials: - username: "foo" - password: "bar" -database: "patch_database" diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenDeserializing_withCamelCaseFields.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenDeserializing_withCamelCaseFields.conf new file mode 100644 index 000000000..e036d001d --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenDeserializing_withCamelCaseFields.conf @@ -0,0 +1,3 @@ +hostname = "example.com" +port = 1234 +isSslEnabled = true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenDeserializing_withCamelCaseFields.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenDeserializing_withCamelCaseFields.yml deleted file mode 100644 index 7befaba35..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenDeserializing_withCamelCaseFields.yml +++ /dev/null @@ -1,3 +0,0 @@ -hostname: "example.com" -port: 1234 -isSslEnabled: true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenDeserializing_withKebabCaseFields.conf b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenDeserializing_withKebabCaseFields.conf new file mode 100644 index 000000000..dae93292c --- /dev/null +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenDeserializing_withKebabCaseFields.conf @@ -0,0 +1,3 @@ +hostname = "example.com" +port = 1234 +is-ssl-enabled = true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenDeserializing_withKebabCaseFields.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenDeserializing_withKebabCaseFields.yml deleted file mode 100644 index 0cf9d6845..000000000 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenDeserializing_withKebabCaseFields.yml +++ /dev/null @@ -1,3 +0,0 @@ -hostname: "example.com" -port: 1234 -is-ssl-enabled: true diff --git a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenSerializing_withNominalValues.yml b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenSerializing_withNominalValues.conf similarity index 68% rename from src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenSerializing_withNominalValues.yml rename to src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenSerializing_withNominalValues.conf index 294c87281..902500203 100644 --- a/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenSerializing_withNominalValues.yml +++ b/src/patch-place-break/patch-place-break-config/src/test/resources/fr/djaytan/minecraft/jobsreborn/patchplacebreak/config/serialization/ConfigSerializerTest/whenSerializing_withNominalValues.conf @@ -2,6 +2,6 @@ # A patch place-break extension for JobsReborn # (by Djaytan) -hostname: example.com -port: 1234 -isSslEnabled: true +hostname="example.com" +isSslEnabled=true +port=1234 diff --git a/src/patch-place-break/patch-place-break-core/src/main/resources/config.yml b/src/patch-place-break/patch-place-break-core/src/main/resources/config.conf similarity index 76% rename from src/patch-place-break/patch-place-break-core/src/main/resources/config.yml rename to src/patch-place-break/patch-place-break-core/src/main/resources/config.conf index 35aaae207..8ece602bc 100644 --- a/src/patch-place-break/patch-place-break-core/src/main/resources/config.yml +++ b/src/patch-place-break/patch-place-break-core/src/main/resources/config.conf @@ -1,58 +1,57 @@ -################################## -### JobsReborn-PatchPlaceBreak ### -################################## +# JobsReborn-PatchPlaceBreak +# A patch place-break extension for JobsReborn +# (by Djaytan) # Define where to store and retrieve data -dataSource: +dataSource = { # The type of datasource to use # Available types: # - SQLITE: use a local file as database (easy setup) # - MYSQL: use a MySQL database server (better performances) - type: 'SQLITE' - + type = "SQLITE" # The table where data will be stored # Value can't be empty or blank - table: 'patch_place_break_tag' - + table = "patch_place_break_tag" # The DBMS server properties for connection establishment # Not applicable for SQLite - dbmsServer: + dbmsServer = { # Host properties of the DBMS server - host: + host = { # Hostname (an IP address (IPv4/IPv6) or a domain name) # Value can't be empty or blank - hostname: 'localhost' + hostname = "localhost" # Port # Accepted range values: [1-65535] - port: 3306 + port = 3306 # Whether an SSL/TLS communication must be established at connection time (more secure) # Only boolean values accepted (true|false) - isSslEnabled: true - + isSslEnabled = true + } # Credentials for authentication with the DBMS server - credentials: + credentials = { # Under behalf of who user to connect on the DBMS server # Value can't be empty or blank - username: 'username' + username = "username" # Password of the user (optional but highly recommended) - password: 'password' - + password = "password" + } # The database to use on DBMS server # Value can't be empty or blank - database: 'database' - + database = "database" + } # Connection pool properties # This is reserved for advanced usage only # Change these settings only if you know what you are doing - connectionPool: + connectionPool = { # The connection timeout in milliseconds # Corresponds to the maximum time the connection pool will wait to acquire a new connection # from the DBMS server # Not applicable for SQLite # Accepted range values: [1-600000] - connectionTimeout: 30000 - + connectionTimeout = 30000 # The number of DBMS connections in the pool # Could be best determined by the executing environment # Accepted range values: [1-100] - poolSize: 10 + poolSize = 10 + } +}